merged with dev

src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java

@@ -29,4 +29,8 @@ public interface ConferenceRepository extends JpaRepository<Conference, Integer>
     @Override
     @Query("SELECT title FROM Conference c WHERE (c.title = :name) AND (:id IS NULL OR c.id != :id) ")
     String findByNameAndNotId(@Param("name") String name, @Param("id") Integer id);
+
+    @Query("SELECT c FROM Conference c LEFT JOIN c.users u WHERE (:user IS NULL OR u.user = :user) " +
+            "AND (u.participation = 'INTRAMURAL') AND (c.beginDate <= CURRENT_DATE) AND (c.endDate >= CURRENT_DATE)")
+    Conference findActiveByUser(@Param("user") User user);
 }

src/main/java/ru/ulstu/conference/service/ConferenceService.java

@@ -313,4 +313,8 @@ public class ConferenceService extends BaseService {
                 .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))
                 .collect(Collectors.toList()));
     }
+
+    public Conference getActiveConferenceByUser(User user) {
+        return conferenceRepository.findActiveByUser(user);
+    }
 }

src/main/java/ru/ulstu/conference/service/ConferenceUserService.java

@@ -43,6 +43,4 @@ public class ConferenceUserService {
         newUser = conferenceUserRepository.save(newUser);
         return newUser;
     }
-
-
 }

src/main/java/ru/ulstu/deadline/model/Deadline.java

@@ -4,11 +4,15 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.user.model.User;
 
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 @Entity
@@ -20,6 +24,11 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
+    @OneToMany(targetEntity = User.class, fetch = FetchType.EAGER)
+    private List<User> executors;
+
+    private Boolean done;
+
     public Deadline() {
     }
 
@@ -28,13 +37,24 @@ public class Deadline extends BaseEntity {
         this.description = description;
     }
 
+    public Deadline(Date deadlineDate, String description, List<User> executors, Boolean done) {
+        this.date = deadlineDate;
+        this.description = description;
+        this.executors = executors;
+        this.done = done;
+    }
+
     @JsonCreator
     public Deadline(@JsonProperty("id") Integer id,
                     @JsonProperty("description") String description,
-                    @JsonProperty("date") Date date) {
+                    @JsonProperty("date") Date date,
+                    @JsonProperty("executors") List<User> executors,
+                    @JsonProperty("done") Boolean done) {
         this.setId(id);
         this.description = description;
         this.date = date;
+        this.executors = executors;
+        this.done = done;
     }
 
     public String getDescription() {
@@ -53,6 +73,22 @@ public class Deadline extends BaseEntity {
         this.date = date;
     }
 
+    public List<User> getExecutors() {
+        return executors;
+    }
+
+    public void setExecutors(List<User> executors) {
+        this.executors = executors;
+    }
+
+    public Boolean getDone() {
+        return done;
+    }
+
+    public void setDone(Boolean done) {
+        this.done = done;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -72,11 +108,13 @@ public class Deadline extends BaseEntity {
         }
         return getId().equals(deadline.getId()) &&
                 description.equals(deadline.description) &&
-                date.equals(deadline.date);
+                date.equals(deadline.date) &&
+                executors.equals(deadline.executors) &&
+                done.equals(deadline.done);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), description, date);
+        return Objects.hash(super.hashCode(), description, date, executors, done);
     }
 }

src/main/java/ru/ulstu/deadline/service/DeadlineService.java

@@ -30,6 +30,8 @@ public class DeadlineService {
         Deadline updateDeadline = deadlineRepository.findOne(deadline.getId());
         updateDeadline.setDate(deadline.getDate());
         updateDeadline.setDescription(deadline.getDescription());
+        updateDeadline.setExecutors(deadline.getExecutors());
+        updateDeadline.setDone(deadline.getDone());
         deadlineRepository.save(updateDeadline);
         return updateDeadline;
     }
@@ -39,6 +41,8 @@ public class DeadlineService {
         Deadline newDeadline = new Deadline();
         newDeadline.setDate(deadline.getDate());
         newDeadline.setDescription(deadline.getDescription());
+        newDeadline.setExecutors(deadline.getExecutors());
+        newDeadline.setDone(deadline.getDone());
         newDeadline = deadlineRepository.save(newDeadline);
         return newDeadline;
     }

src/main/java/ru/ulstu/project/controller/ProjectController.java

@@ -14,6 +14,7 @@ import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.service.ProjectService;
+import ru.ulstu.user.model.User;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
@@ -80,12 +81,24 @@ public class ProjectController {
         return "/projects/project";
     }
 
+    @PostMapping(value = "/project", params = "removeDeadline")
+    public String removeDeadline(ProjectDto projectDto,
+                                 @RequestParam(value = "removeDeadline") Integer deadlineId) {
+        projectService.removeDeadline(projectDto, deadlineId);
+        return "/projects/project";
+    }
+
     @GetMapping("/delete/{project-id}")
     public String delete(@PathVariable("project-id") Integer projectId) throws IOException {
         projectService.delete(projectId);
         return String.format("redirect:%s", "/projects/projects");
     }
 
+    @ModelAttribute("allExecutors")
+    public List<User> getAllExecutors(ProjectDto projectDto) {
+        return projectService.getProjectExecutors(projectDto);
+    }
+
     private void filterEmptyDeadlines(ProjectDto projectDto) {
         projectDto.setDeadlines(projectDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !isEmpty(dto.getDescription()))

src/main/java/ru/ulstu/project/model/Project.java

@@ -12,7 +12,9 @@ import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
+import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.validation.constraints.NotNull;
@@ -29,11 +31,11 @@ public class Project extends BaseEntity implements UserActivity {
     }
 
     public enum ProjectStatus {
-        APPLICATION("Заявка"),
+        TECHNICAL_TASK("Техническое задание"),
-        ON_COMPETITION("Отправлен на конкурс"),
+        OPEN("Открыт"),
-        SUCCESSFUL_PASSAGE("Успешное прохождение"),
         IN_WORK("В работе"),
-        COMPLETED("Завершен"),
+        CERTIFICATE_ISSUED("Оформление свидетельства"),
+        CLOSED("Закрыт"),
         FAILED("Провалены сроки");
 
         private String statusName;
@@ -51,7 +53,7 @@ public class Project extends BaseEntity implements UserActivity {
     private String title;
 
     @Enumerated(value = EnumType.STRING)
-    private ProjectStatus status = ProjectStatus.APPLICATION;
+    private ProjectStatus status = ProjectStatus.TECHNICAL_TASK;
 
     @NotNull
     private String description;
@@ -71,6 +73,9 @@ public class Project extends BaseEntity implements UserActivity {
     @JoinColumn(name = "file_id")
     private FileData application;
 
+    @ManyToMany(fetch = FetchType.LAZY)
+    private List<User> executors = new ArrayList<>();
+
     public String getTitle() {
         return title;
     }
@@ -126,4 +131,18 @@ public class Project extends BaseEntity implements UserActivity {
     public void setApplication(FileData application) {
         this.application = application;
     }
+
+    public List<User> getExecutors() {
+        return executors;
+    }
+
+    public void setExecutors(List<User> executors) {
+        this.executors = executors;
+    }
+
+    @Override
+    public Set<User> getUsers() {
+        Set<User> users = new HashSet<User>(getExecutors());
+        return users;
+    }
 }

src/main/java/ru/ulstu/project/model/ProjectDto.java

@@ -3,11 +3,19 @@ package ru.ulstu.project.model;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.hibernate.validator.constraints.NotEmpty;
+import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.grant.model.GrantDto;
+import ru.ulstu.user.model.User;
+import ru.ulstu.user.model.UserDto;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static ru.ulstu.core.util.StreamApiUtils.convert;
 
 public class ProjectDto {
     private Integer id;
@@ -20,6 +28,11 @@ public class ProjectDto {
     private GrantDto grant;
     private String repository;
     private String applicationFileName;
+    private List<Integer> removedDeadlineIds = new ArrayList<>();
+    private Set<Integer> executorIds;
+    private List<UserDto> executors;
+
+    private final static int MAX_EXECUTORS_LENGTH = 40;
 
     public ProjectDto() {
     }
@@ -35,7 +48,9 @@ public class ProjectDto {
                       @JsonProperty("description") String description,
                       @JsonProperty("grant") GrantDto grant,
                       @JsonProperty("repository") String repository,
-                      @JsonProperty("deadlines") List<Deadline> deadlines) {
+                      @JsonProperty("deadlines") List<Deadline> deadlines,
+                      @JsonProperty("executorIds") Set<Integer> executorIds,
+                      @JsonProperty("executors") List<UserDto> executors) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -44,10 +59,13 @@ public class ProjectDto {
         this.repository = repository;
         this.deadlines = deadlines;
         this.applicationFileName = null;
+        this.executorIds = executorIds;
+        this.executors = executors;
     }
 
 
     public ProjectDto(Project project) {
+        Set<User> users = new HashSet<User>(project.getExecutors());
         this.id = project.getId();
         this.title = project.getTitle();
         this.status = project.getStatus();
@@ -56,6 +74,8 @@ public class ProjectDto {
         this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant());
         this.repository = project.getRepository();
         this.deadlines = project.getDeadlines();
+        this.executorIds = convert(users, user -> user.getId());
+        this.executors = convert(project.getExecutors(), UserDto::new);
     }
 
     public Integer getId() {
@@ -121,4 +141,35 @@ public class ProjectDto {
     public void setApplicationFileName(String applicationFileName) {
         this.applicationFileName = applicationFileName;
     }
+
+    public List<Integer> getRemovedDeadlineIds() {
+        return removedDeadlineIds;
+    }
+
+    public void setRemovedDeadlineIds(List<Integer> removedDeadlineIds) {
+        this.removedDeadlineIds = removedDeadlineIds;
+    }
+
+    public Set<Integer> getExecutorIds() {
+        return executorIds;
+    }
+
+    public void setExecutorIds(Set<Integer> executorIds) {
+        this.executorIds = executorIds;
+    }
+
+    public List<UserDto> getExecutors() {
+        return executors;
+    }
+
+    public void setExecutors(List<UserDto> executors) {
+        this.executors = executors;
+    }
+
+    public String getExecutorsString() {
+        return StringUtils.abbreviate(executors
+                .stream()
+                .map(executor -> executor.getLastName())
+                .collect(Collectors.joining(", ")), MAX_EXECUTORS_LENGTH);
+    }
 }

src/main/java/ru/ulstu/project/service/ProjectService.java

@@ -10,6 +10,8 @@ import ru.ulstu.ping.service.PingService;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
 import ru.ulstu.project.repository.ProjectRepository;
+import ru.ulstu.user.model.User;
+import ru.ulstu.user.service.UserService;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -17,7 +19,7 @@ import java.util.List;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
 import static ru.ulstu.core.util.StreamApiUtils.convert;
-import static ru.ulstu.project.model.Project.ProjectStatus.APPLICATION;
+import static ru.ulstu.project.model.Project.ProjectStatus.TECHNICAL_TASK;
 
 @Service
 public class ProjectService {
@@ -27,17 +29,20 @@ public class ProjectService {
     private final DeadlineService deadlineService;
     private final GrantRepository grantRepository;
     private final FileService fileService;
+    private final UserService userService;
     private final PingService pingService;
 
     public ProjectService(ProjectRepository projectRepository,
                           DeadlineService deadlineService,
                           GrantRepository grantRepository,
                           FileService fileService,
+                          UserService userService,
                           PingService pingService) {
         this.projectRepository = projectRepository;
         this.deadlineService = deadlineService;
         this.grantRepository = grantRepository;
         this.fileService = fileService;
+        this.userService = userService;
         this.pingService = pingService;
     }
 
@@ -87,7 +92,7 @@ public class ProjectService {
 
     private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
         project.setDescription(projectDto.getDescription());
-        project.setStatus(projectDto.getStatus() == null ? APPLICATION : projectDto.getStatus());
+        project.setStatus(projectDto.getStatus() == null ? TECHNICAL_TASK : projectDto.getStatus());
         project.setTitle(projectDto.getTitle());
         if (projectDto.getGrant() != null && projectDto.getGrant().getId() != null) {
             project.setGrant(grantRepository.findOne(projectDto.getGrant().getId()));
@@ -108,10 +113,22 @@ public class ProjectService {
         }
     }
 
+    public void removeDeadline(ProjectDto projectDto, Integer deadlineId) {
+        if (deadlineId != null) {
+            projectDto.getRemovedDeadlineIds().add(deadlineId);
+        }
+        projectDto.getDeadlines().remove((int) deadlineId);
+    }
+
     public Project findById(Integer id) {
         return projectRepository.findOne(id);
     }
 
+    public List<User> getProjectExecutors(ProjectDto projectDto) {
+        List<User> users = userService.findAll();
+        return users;
+    }
+
     @Transactional
     public void ping(int projectId) throws IOException {
         pingService.addPing(findById(projectId));

src/main/java/ru/ulstu/user/controller/UserMvcController.java

@@ -53,6 +53,11 @@ public class UserMvcController extends OdinController<UserListDto, UserDto> {
         modelMap.addAttribute("userDto", userService.updateUserInformation(user, userDto));
     }
 
+    @GetMapping("/dashboard")
+    public void getUsersDashboard(ModelMap modelMap) {
+        modelMap.addAllAttributes(userService.getUsersInfo());
+    }
+
     @ModelAttribute("allUsers")
     public List<User> getAllUsers() {
         return userService.findAll();

src/main/java/ru/ulstu/user/model/UserInfoNow.java

@@ -0,0 +1,50 @@
+package ru.ulstu.user.model;
+
+import ru.ulstu.conference.model.Conference;
+import ru.ulstu.utils.timetable.model.Lesson;
+
+public class UserInfoNow {
+    private Lesson lesson;
+    private Conference conference;
+    private User user;
+    private boolean isOnline;
+
+    public UserInfoNow(Lesson lesson, Conference conference, User user, boolean isOnline) {
+        this.lesson = lesson;
+        this.conference = conference;
+        this.user = user;
+        this.isOnline = isOnline;
+    }
+
+    public Lesson getLesson() {
+        return lesson;
+    }
+
+    public void setLesson(Lesson lesson) {
+        this.lesson = lesson;
+    }
+
+    public Conference getConference() {
+        return conference;
+    }
+
+    public void setConference(Conference conference) {
+        this.conference = conference;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public boolean isOnline() {
+        return isOnline;
+    }
+
+    public void setOnline(boolean online) {
+        isOnline = online;
+    }
+}

src/main/java/ru/ulstu/user/repository/UserSessionRepository.java

@@ -1,6 +1,7 @@
 package ru.ulstu.user.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import ru.ulstu.user.model.User;
 import ru.ulstu.user.model.UserSession;
 
 import java.util.Date;
@@ -10,4 +11,6 @@ public interface UserSessionRepository extends JpaRepository<UserSession, Intege
     UserSession findOneBySessionId(String sessionId);
 
     List<UserSession> findAllByLogoutTimeIsNullAndLoginTimeBefore(Date date);
+
+    List<UserSession> findAllByUserAndLogoutTimeIsNullAndLoginTimeBefore(User user, Date date);
 }

src/main/java/ru/ulstu/user/service/UserService.java

@@ -14,6 +14,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
+import ru.ulstu.conference.service.ConferenceService;
 import ru.ulstu.configuration.ApplicationProperties;
 import ru.ulstu.core.error.EntityIdIsNullException;
 import ru.ulstu.core.jpa.OffsetablePageRequest;
@@ -34,6 +35,7 @@ import ru.ulstu.user.error.UserResetKeyError;
 import ru.ulstu.user.error.UserSendingMailException;
 import ru.ulstu.user.model.User;
 import ru.ulstu.user.model.UserDto;
+import ru.ulstu.user.model.UserInfoNow;
 import ru.ulstu.user.model.UserListDto;
 import ru.ulstu.user.model.UserResetPasswordDto;
 import ru.ulstu.user.model.UserRole;
@@ -42,8 +44,13 @@ import ru.ulstu.user.model.UserRoleDto;
 import ru.ulstu.user.repository.UserRepository;
 import ru.ulstu.user.repository.UserRoleRepository;
 import ru.ulstu.user.util.UserUtils;
+import ru.ulstu.utils.timetable.TimetableService;
+import ru.ulstu.utils.timetable.errors.TimetableClientException;
+import ru.ulstu.utils.timetable.model.Lesson;
 
 import javax.mail.MessagingException;
+import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -67,6 +74,9 @@ public class UserService implements UserDetailsService {
     private final UserMapper userMapper;
     private final MailService mailService;
     private final ApplicationProperties applicationProperties;
+    private final TimetableService timetableService;
+    private final ConferenceService conferenceService;
+    private final UserSessionService userSessionService;
     private final PingService pingService;
 
     public UserService(UserRepository userRepository,
@@ -75,13 +85,18 @@ public class UserService implements UserDetailsService {
                        UserMapper userMapper,
                        MailService mailService,
                        ApplicationProperties applicationProperties,
-                       @Lazy PingService pingService) {
+                       @Lazy PingService pingService,
+                       @Lazy ConferenceService conferenceRepository,
+                       @Lazy UserSessionService userSessionService) throws ParseException {
         this.userRepository = userRepository;
         this.passwordEncoder = passwordEncoder;
         this.userRoleRepository = userRoleRepository;
         this.userMapper = userMapper;
         this.mailService = mailService;
         this.applicationProperties = applicationProperties;
+        this.conferenceService = conferenceRepository;
+        this.timetableService = new TimetableService();
+        this.userSessionService = userSessionService;
         this.pingService = pingService;
     }
 
@@ -361,6 +376,27 @@ public class UserService implements UserDetailsService {
         return userRepository.findOneByLoginIgnoreCase(login);
     }
 
+    public Map<String, Object> getUsersInfo() {
+        List<UserInfoNow> usersInfoNow = new ArrayList<>();
+        String err = "";
+
+        for (User user : userRepository.findAll()) {
+            Lesson lesson = null;
+            try {
+                lesson = timetableService.getCurrentLesson(user.getUserAbbreviate());
+            } catch (TimetableClientException e) {
+                err = "Не удалось загрузить расписание";
+            }
+            usersInfoNow.add(new UserInfoNow(
+                    lesson,
+                    conferenceService.getActiveConferenceByUser(user),
+                    user,
+                    userSessionService.isOnline(user))
+            );
+        }
+        return ImmutableMap.of("users", usersInfoNow, "error", err);
+    }
+
     public Map<String, Integer> getActivitiesPings(Integer userId,
                                                    String activityName) {
         User user = null;

src/main/java/ru/ulstu/user/service/UserSessionService.java

@@ -14,6 +14,8 @@ import ru.ulstu.user.model.UserSession;
 import ru.ulstu.user.model.UserSessionListDto;
 import ru.ulstu.user.repository.UserSessionRepository;
 
+import java.util.Date;
+
 import static ru.ulstu.core.util.StreamApiUtils.convert;
 
 @Service
@@ -58,4 +60,8 @@ public class UserSessionService {
     public User getUserBySessionId(String sessionId) {
         return userSessionRepository.findOneBySessionId(sessionId).getUser();
     }
+
+    public boolean isOnline(User user) {
+        return !userSessionRepository.findAllByUserAndLogoutTimeIsNullAndLoginTimeBefore(user, new Date()).isEmpty();
+    }
 }

src/main/java/ru/ulstu/utils/timetable/TimetableService.java

@@ -0,0 +1,98 @@
+package ru.ulstu.utils.timetable;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+import ru.ulstu.core.util.DateUtils;
+import ru.ulstu.utils.timetable.errors.TimetableClientException;
+import ru.ulstu.utils.timetable.model.Lesson;
+import ru.ulstu.utils.timetable.model.TimetableResponse;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+public class TimetableService {
+    private static final String TIMETABLE_URL = "http://timetable.athene.tech/api/1.0/timetable?filter=%s";
+    private SimpleDateFormat lessonTimeFormat = new SimpleDateFormat("hh:mm");
+
+    private long[] lessonsStarts = new long[] {
+            lessonTimeFormat.parse("8:00:00").getTime(),
+            lessonTimeFormat.parse("9:40:00").getTime(),
+            lessonTimeFormat.parse("11:30:00").getTime(),
+            lessonTimeFormat.parse("13:10:00").getTime(),
+            lessonTimeFormat.parse("14:50:00").getTime(),
+            lessonTimeFormat.parse("16:30:00").getTime(),
+            lessonTimeFormat.parse("18:10:00").getTime(),
+    };
+
+    public TimetableService() throws ParseException {
+    }
+
+    private int getCurrentDay() {
+        Calendar calendar = Calendar.getInstance();
+        int day = calendar.get(Calendar.DAY_OF_WEEK);
+        return (day + 5) % 7;
+    }
+
+    private int getCurrentLessonNumber() {
+        long lessonDuration = 90 * 60000;
+        Date now = new Date();
+        long timeNow = now.getTime() % (24 * 60 * 60 * 1000L);
+
+        for (int i = 0; i < lessonsStarts.length; i++) {
+            if (timeNow > lessonsStarts[i] && timeNow < lessonsStarts[i] + lessonDuration) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    private int getCurrentWeek() {
+        Date currentDate = Calendar.getInstance().getTime();
+        currentDate = DateUtils.clearTime(currentDate);
+
+        Calendar firstJan = Calendar.getInstance();
+        firstJan.set(Calendar.MONTH, 0);
+        firstJan.set(Calendar.DAY_OF_MONTH, 1);
+
+         return (int) Math.round(Math.ceil((((currentDate.getTime() - firstJan.getTime().getTime()) / 86400000)
+                 + DateUtils.addDays(firstJan.getTime(), 1).getTime() / 7) % 2));
+    }
+
+    private TimetableResponse getTimetableForUser(String userFIO) throws RestClientException {
+        RestTemplate restTemplate = new RestTemplate();
+        return restTemplate.getForObject(String.format(TIMETABLE_URL, userFIO), TimetableResponse.class);
+    }
+
+    public Lesson getCurrentLesson(String userFio)  {
+        TimetableResponse response;
+        try {
+            response = getTimetableForUser(userFio);
+        } catch (RestClientException e) {
+            e.printStackTrace();
+            throw new TimetableClientException(userFio);
+        }
+
+        int lessonNumber = getCurrentLessonNumber();
+        if (lessonNumber < 0) {
+            return null;
+        }
+
+        List<Lesson> lessons = response
+                .getResponse()
+                .getWeeks()
+                .get(getCurrentWeek())
+                .getDays()
+                .get(getCurrentDay())
+                .getLessons()
+                .get(lessonNumber);
+
+        if (lessons.size() == 0) {
+            return null;
+        }
+        return new ObjectMapper().convertValue(lessons.get(0), Lesson.class);
+    }
+}

src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java

@@ -0,0 +1,7 @@
+package ru.ulstu.utils.timetable.errors;
+
+public class TimetableClientException extends RuntimeException {
+    public TimetableClientException(String message) {
+        super(message);
+    }
+}

src/main/java/ru/ulstu/utils/timetable/model/Day.java

@@ -0,0 +1,28 @@
+package ru.ulstu.utils.timetable.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class Day  {
+
+    private Integer day;
+    private List<List<Lesson>> lessons = new ArrayList<>();
+
+    public Integer getDay() {
+        return day;
+    }
+
+    public void setDay(Integer day) {
+        this.day = day;
+    }
+
+    public List<List<Lesson>> getLessons() {
+        return lessons;
+    }
+
+    public void setLessons(List<List<Lesson>> lessons) {
+        this.lessons = lessons;
+    }
+}
+

src/main/java/ru/ulstu/utils/timetable/model/Lesson.java

@@ -0,0 +1,24 @@
+package ru.ulstu.utils.timetable.model;
+
+public class Lesson  {
+    private String group;
+    private String nameOfLesson;
+    private String teacher;
+    private String room;
+
+    public String getGroup() {
+        return group;
+    }
+
+    public String getNameOfLesson() {
+        return nameOfLesson;
+    }
+
+    public String getTeacher() {
+        return teacher;
+    }
+
+    public String getRoom() {
+        return room;
+    }
+}

src/main/java/ru/ulstu/utils/timetable/model/Response.java

@@ -0,0 +1,17 @@
+package ru.ulstu.utils.timetable.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Response {
+
+    private List<Week> weeks = new ArrayList<>();
+
+    public List<Week> getWeeks() {
+        return weeks;
+    }
+
+    public void setWeeks(List<Week> weeks) {
+        this.weeks = weeks;
+    }
+}

src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java

@@ -0,0 +1,22 @@
+package ru.ulstu.utils.timetable.model;
+
+public class TimetableResponse  {
+    private Response response;
+    private String error;
+
+    public Response getResponse() {
+        return response;
+    }
+
+    public void setResponse(Response response) {
+        this.response = response;
+    }
+
+    public String getError() {
+        return error;
+    }
+
+    public void setError(String error) {
+        this.error = error;
+    }
+}

src/main/java/ru/ulstu/utils/timetable/model/Week.java

@@ -0,0 +1,18 @@
+package ru.ulstu.utils.timetable.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Week implements Serializable {
+
+    private List<Day> days = new ArrayList<>();
+
+    public List<Day> getDays() {
+        return days;
+    }
+
+    public void setDays(List<Day> days) {
+        this.days = days;
+    }
+}

src/main/resources/db/changelog-20190506_000000-schema.xml

@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="anton" id="20190506_000000-1">
+        <addColumn tableName="deadline">
+            <column name="executor" type="varchar(255)"/>
+        </addColumn>
+        <addColumn tableName="deadline">
+            <column name="done" type="boolean"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-20190506_000001-schema.xml

@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="anton" id="20190506_000000-2">
+        <createTable tableName="project_executors">
+            <column name="project_id" type="integer"/>
+            <column name="executors_id" type="integer"/>
+        </createTable>
+        <addForeignKeyConstraint baseTableName="project_executors" baseColumnNames="project_id"
+                                 constraintName="fk_project_project_executors" referencedTableName="project"
+                                 referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="project_executors" baseColumnNames="executors_id"
+                                 constraintName="fk_user_project_executors" referencedTableName="users"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-20190517_000001-schema.xml

@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="anton" id="20190517_000001-1">
+        <modifyDataType tableName="deadline"
+                        columnName="executor"
+                        newDataType="integer"
+                        schemaName="public"/>
+        <addForeignKeyConstraint baseTableName="deadline" baseColumnNames="executor"
+                                 constraintName="fk_deadline_executor" referencedTableName="users"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-20190528_000000-schema.xml

@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="anton" id="20190528_000000-1">
+        <renameColumn tableName="deadline"
+                      columnDataType="integer"
+                      newColumnName="executors"
+                      oldColumnName="executor"/>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-20190528_000002-schema.xml

@@ -0,0 +1,17 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="anton" id="20190528_000000-3">
+        <createTable tableName="deadline_executors">
+            <column name="deadline_id" type="integer"/>
+            <column name="executors_id" type="integer"/>
+        </createTable>
+        <addForeignKeyConstraint baseTableName="deadline_executors" baseColumnNames="deadline_id"
+                                 constraintName="fk_deadline_deadline_executors" referencedTableName="deadline"
+                                 referencedColumnNames="id"/>
+        <addForeignKeyConstraint baseTableName="deadline_executors" baseColumnNames="executors_id"
+                                 constraintName="fk_user_deadline_executors" referencedTableName="users"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>

src/main/resources/db/changelog-master.xml

@@ -39,10 +39,15 @@
     <include file="db/changelog-20190430_000000-schema.xml"/>
     <include file="db/changelog-20190505_000000-schema.xml"/>
     <include file="db/changelog-20190505_000001-schema.xml"/>
+    <include file="db/changelog-20190506_000000-schema.xml"/>
+    <include file="db/changelog-20190506_000001-schema.xml"/>
     <include file="db/changelog-20190507_000000-schema.xml"/>
     <include file="db/changelog-20190507_000001-schema.xml"/>
     <include file="db/changelog-20190511_000000-schema.xml"/>
+    <include file="db/changelog-20190517_000001-schema.xml"/>
     <include file="db/changelog-20190520_000000-schema.xml"/>
     <include file="db/changelog-20190523_000000-schema.xml"/>
+    <include file="db/changelog-20190528_000000-schema.xml"/>
+    <include file="db/changelog-20190528_000002-schema.xml"/>
     <include file="db/changelog-20190525_000000-schema.xml"/>
 </databaseChangeLog>

src/main/resources/public/css/project.css

@@ -0,0 +1,5 @@
+.div-deadline-done {
+    width: 60%;
+    height: 100%;
+    float: right;
+}

src/main/resources/templates/projects/fragments/projectStatusFragment.html

@@ -6,19 +6,19 @@
 <body>
 <span th:fragment="projectStatus (projectStatus)" class="fa-stack fa-1x">
     <th:block th:switch="${projectStatus.name()}">
-        <div th:case="'APPLICATION'">
+        <div th:case="'TECHNICAL_TASK'">
             <i class="fa fa-circle fa-stack-2x text-draft"></i>
         </div>
-        <div th:case="'ON_COMPETITION'">
+        <div th:case="'OPEN'">
             <i class="fa fa-circle fa-stack-2x text-review"></i>
         </div>
-        <div th:case="'SUCCESSFUL_PASSAGE'">
+        <div th:case="'IN_WORK'">
             <i class="fa fa-circle fa-stack-2x text-accepted"></i>
         </div>
-        <div th:case="'IN_WORK'">
+        <div th:case="'CERTIFICATE_ISSUED'">
             <i class="fa fa-circle fa-stack-2x text-primary"></i>
         </div>
-        <div th:case="'COMPLETED'">
+        <div th:case="'CLOSED'">
             <i class="fa fa-circle fa-stack-2x text-success"></i>
         </div>
         <div th:case="'FAILED'">

src/main/resources/templates/projects/project.html

@@ -3,7 +3,7 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/html">
 <head>
-
+    <link rel="stylesheet" href="../css/project.css"/>
 </head>
 <body>
 
@@ -71,7 +71,8 @@
 
                                 <div class="form-group">
                                     <label>Дедлайны показателей:</label>
-                                    <div class="row" th:each="deadline, rowStat : *{deadlines}">
+                                    <div class="row" th:each="deadline, rowStat : *{deadlines}"
+                                         style="margin-bottom: 15px;">
                                         <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
                                         <div class="col-6 div-deadline-date">
                                             <input type="date" class="form-control form-deadline-date" name="deadline"
@@ -89,6 +90,20 @@
                                                     aria-hidden="true"><i class="fa fa-times"/></span>
                                             </a>
                                         </div>
+                                        <div class="col-12" style="margin-bottom: 15px;"></div>
+                                        <div class="col-10 div-deadline-executor">
+                                            <select class="selectpicker form-control" multiple="true" data-live-search="true"
+                                                    title="-- Выберите исполнителя --" id="executors"
+                                                    th:field="*{deadlines[__${rowStat.index}__].executors}" data-size="5">
+                                                <option th:each="executors : ${allExecutors}" th:value="${executors.id}"
+                                                        th:text="${executors.lastName}"> Участник
+                                                </option>
+                                            </select>
+                                        </div>
+                                        <div class="col-2">
+                                            <input class="form-control div-deadline-done" type="checkbox"
+                                                   th:field="*{deadlines[__${rowStat.index}__].done}"/>
+                                        </div>
                                     </div>
                                     <p th:if="${#fields.hasErrors('deadlines')}" th:errors="*{deadlines}"
                                        class="alert alert-danger">Incorrect title</p>

src/main/resources/templates/users/dashboard.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorator="default" xmlns:th="http://www.w3.org/1999/xhtml">
+<head>
+    <script src="/js/core.js"></script>
+</head>
+<body>
+<div class="container" layout:fragment="content">
+    <section id="services">
+        <div class="container">
+            <div class="col-lg-12 text-center">
+                <h2 class="section-heading text-uppercase">Пользователи</h2>
+            </div>
+            <div class="text-center">
+                <h2 th:text="${error}">teste</h2>
+            </div>
+            <div class="row justify-content-center" id="dashboard">
+                <th:block th:each="user : ${users}">
+                    <div th:replace="users/fragments/userDashboardFragment :: userDashboard(user=${user})"/>
+                </th:block>
+            </div>
+        </div>
+    </section>
+    <script th:inline="javascript">
+        /*<![CDATA[*/
+        $(document).ready(function () {
+            var error = /*[[${error}]]*/
+            showFeedbackMessage(error, MessageTypesEnum.WARNING)
+        });
+        /*]]>*/
+    </script>
+</div>
+</body>
+</html>

src/main/resources/templates/users/fragments/userDashboardFragment.html

@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:fragment="headerfiles">
+    <meta charset="UTF-8"/>
+</head>
+<body>
+<div th:fragment="userDashboard (user)" class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3 dashboard-card">
+    <div class="row">
+        <div class="col col-10">
+            <b><p th:text="${user.user.lastName} + ' ' + ${user.user.firstName} + ' ' + ${user.user.patronymic}"></p></b>
+            <i><p th:if="${user.conference != null}" th:text="'Сейчас на конференции ' + ${user.conference.title}"></p></i>
+            <i><p th:if="${user.lesson != null}" th:text="'Сейчас на паре ' + ${user.lesson.nameOfLesson} + ' в аудитории ' + ${user.lesson.room}"></p></i>
+            <p th:if="${user.isOnline()}">Онлайн</p>
+        </div>
+    </div>
+</div>
+</body>
+</html>