|
|
@ -49,6 +49,7 @@ import ru.ulstu.utils.timetable.model.Lesson;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.mail.MessagingException;
|
|
|
|
import javax.mail.MessagingException;
|
|
|
|
import java.text.ParseException;
|
|
|
|
import java.text.ParseException;
|
|
|
|
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Calendar;
|
|
|
|
import java.util.Calendar;
|
|
|
|
import java.util.Collections;
|
|
|
|
import java.util.Collections;
|
|
|
@ -413,15 +414,16 @@ public class UserService implements UserDetailsService {
|
|
|
|
activityRepository.save(activities);
|
|
|
|
activityRepository.save(activities);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Map<Date, Integer> getUsersActivity(Integer userId, Date dateFrom, Date dateTo) {
|
|
|
|
public Map<String, Integer> getUsersActivity(Integer userId, Date dateFrom, Date dateTo) {
|
|
|
|
List<Activity> activities = activityRepository.getByUserAndDateInterval(userId, dateFrom, dateTo);
|
|
|
|
List<Activity> activities = activityRepository.getByUserAndDateInterval(userId, dateFrom, dateTo);
|
|
|
|
Map<Date, Integer> dateActivities = new HashMap<>();
|
|
|
|
Map<String, Integer> dateActivities = new HashMap<>();
|
|
|
|
|
|
|
|
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
|
for (Activity activity : activities) {
|
|
|
|
for (Activity activity : activities) {
|
|
|
|
if (!dateActivities.containsKey(activity.getDate())) {
|
|
|
|
String dt = formatter.format(activity.getDate());
|
|
|
|
dateActivities.put(activity.getDate(), 1);
|
|
|
|
if (!dateActivities.containsKey(dt)) {
|
|
|
|
|
|
|
|
dateActivities.put(dt, 1);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
dateActivities.put(activity.getDate(), dateActivities.get(activity.getDate()) + 1);
|
|
|
|
dateActivities.put(dt, dateActivities.get(dt) + 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return dateActivities;
|
|
|
|
return dateActivities;
|
|
|
|