From 8fbce550286d4dcd6ba02dce5104690653f8cdfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Wed, 17 Apr 2019 11:04:35 +0300
Subject: [PATCH 01/17] #86 projects main page

---
 .../project/controller/ProjectController.java | 39 +++++++++++++++++++
 .../ulstu/project/service/ProjectService.java |  9 +++++
 src/main/resources/templates/index.html       |  2 +-
 .../templates/projects/dashboard.html         | 24 ++++++++++++
 .../fragments/projectNavigationFragment.html  | 26 +++++++++++++
 .../templates/projects/projects.html          | 33 ++++++++++++++++
 6 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/ru/ulstu/project/controller/ProjectController.java
 create mode 100644 src/main/resources/templates/projects/dashboard.html
 create mode 100644 src/main/resources/templates/projects/fragments/projectNavigationFragment.html
 create mode 100644 src/main/resources/templates/projects/projects.html

diff --git a/src/main/java/ru/ulstu/project/controller/ProjectController.java b/src/main/java/ru/ulstu/project/controller/ProjectController.java
new file mode 100644
index 0000000..5b5eb4a
--- /dev/null
+++ b/src/main/java/ru/ulstu/project/controller/ProjectController.java
@@ -0,0 +1,39 @@
+package ru.ulstu.project.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.Errors;
+import org.springframework.web.bind.annotation.*;
+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 springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static liquibase.util.StringUtils.isEmpty;
+
+@Controller()
+@RequestMapping(value = "/projects")
+@ApiIgnore
+public class ProjectController {
+    private final ProjectService projectService;
+
+    public ProjectController(ProjectService projectService) {
+        this.projectService = projectService;
+    }
+
+    @GetMapping("/dashboard")
+    public void getDashboard(ModelMap modelMap) {
+        modelMap.put("projects", projectService.findAllDto());
+    }
+
+    @GetMapping("/projects")
+    public void getProjects(ModelMap modelMap) {
+        modelMap.put("projects", projectService.findAllDto());
+    }
+}
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index b54a60a..78a9d3c 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -2,6 +2,7 @@ package ru.ulstu.project.service;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
@@ -10,9 +11,11 @@ import ru.ulstu.project.repository.ProjectRepository;
 import java.util.List;
 
 import static org.springframework.util.ObjectUtils.isEmpty;
+import static ru.ulstu.core.util.StreamApiUtils.convert;
 
 @Service
 public class ProjectService {
+    private final static int MAX_DISPLAY_SIZE = 40;
 
     private final ProjectRepository projectRepository;
     private final DeadlineService deadlineService;
@@ -27,6 +30,12 @@ public class ProjectService {
         return projectRepository.findAll();
     }
 
+    public List<ProjectDto> findAllDto() {
+        List<ProjectDto> projects = convert(findAll(), ProjectDto::new);
+        projects.forEach(projectDto -> projectDto.setTitle(StringUtils.abbreviate(projectDto.getTitle(), MAX_DISPLAY_SIZE)));
+        return projects;
+    }
+
     @Transactional
     public Project create(ProjectDto projectDto) {
         Project newProject = copyFromDto(new Project(), projectDto);
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 2d86945..6ca1c12 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -46,7 +46,7 @@
                 </div>
             </div>
             <div class="col-md-4 col-sm-6 portfolio-item">
-                <a class="portfolio-link" data-toggle="modal" href="/projects">
+                <a class="portfolio-link" href="./projects/dashboard">
                     <div class="portfolio-hover">
                         <div class="portfolio-hover-content">
                             <i class="fa fa-arrow-right fa-3x"></i>
diff --git a/src/main/resources/templates/projects/dashboard.html b/src/main/resources/templates/projects/dashboard.html
new file mode 100644
index 0000000..882c202
--- /dev/null
+++ b/src/main/resources/templates/projects/dashboard.html
@@ -0,0 +1,24 @@
+<!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>
+</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 th:replace="projects/fragments/projectNavigationFragment"/>
+            </div>
+            <div class="row justify-content-center" id="dashboard">
+                <th:block>
+                    <div/>
+                </th:block>
+            </div>
+        </div>
+    </section>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/fragments/projectNavigationFragment.html b/src/main/resources/templates/projects/fragments/projectNavigationFragment.html
new file mode 100644
index 0000000..c26d8b8
--- /dev/null
+++ b/src/main/resources/templates/projects/fragments/projectNavigationFragment.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:fragment="headerfiles">
+    <meta charset="UTF-8"/>
+</head>
+<body>
+<div class="row justify-content-center">
+    <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
+        <a href="./projects" class="btn btn-light toolbar-button"><i class="fa fa-list-alt"></i>
+            Список</a>
+    </div>
+    <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
+        <a href="./dashboard" class="btn btn-light toolbar-button"><i class="fa fa-newspaper-o"
+                                                                      aria-hidden="true"></i> Панель
+            управления</a>
+    </div>
+
+    <div class="col-12 col-sm-12 col-md-12 col-lg-4 col-xl-3">
+        <a href="javascript:void(0)" class="btn btn-light toolbar-button"><i class="fa fa-plus-circle"
+                                                                       aria-hidden="true"></i>
+            Добавить проект</a>
+
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/projects.html b/src/main/resources/templates/projects/projects.html
new file mode 100644
index 0000000..0336770
--- /dev/null
+++ b/src/main/resources/templates/projects/projects.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorator="default" xmlns:th="">
+<head>
+</head>
+<body>
+<div class="container" layout:fragment="content">
+    <form id="projects-form" method="post" th:action="@{'/projects/projects'}">
+        <input th:type="hidden" name="projectDeleteId" id="projectDeleteId"/>
+        <section id="projects">
+            <div class="container">
+                <div class="row" id="project-list">
+                    <div class="col-lg-12 text-center">
+                        <h2 class="section-heading text-uppercase">Проекты</h2>
+                        <div th:replace="projects/fragments/projectNavigationFragment"/>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-md-9 col-sm-12">
+                        <th:block>
+                            <div/>
+                        </th:block>
+                    </div>
+                    <div class="col-md-3 col-sm-12">
+                    </div>
+                </div>
+            </div>
+        </section>
+    </form>
+</div>
+</body>
+</html>

From ee55e08feee4ea20dfa52403996f0659cd42f1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 6 May 2019 17:43:20 +0300
Subject: [PATCH 02/17] #98 project tasks deadline edited

---
 .../conference/service/ConferenceService.java |  3 +-
 .../ru/ulstu/deadline/model/Deadline.java     | 35 ++++++++++++++++---
 .../ru/ulstu/grant/service/GrantService.java  |  2 +-
 .../ru/ulstu/paper/service/PaperService.java  |  2 +-
 .../project/controller/ProjectController.java |  7 ++++
 .../ru/ulstu/project/model/ProjectDto.java    |  9 +++++
 .../ulstu/project/service/ProjectService.java |  7 ++++
 .../db/changelog-20190506_000000-schema.xml   | 13 +++++++
 src/main/resources/db/changelog-master.xml    |  1 +
 .../resources/templates/projects/project.html |  8 +++--
 10 files changed, 78 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190506_000000-schema.xml

diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 38de435..b42f981 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -267,7 +267,8 @@ public class ConferenceService {
     }
 
     public Deadline copyDeadline(Deadline oldDeadline) {
-        Deadline newDeadline = new Deadline(oldDeadline.getDate(), oldDeadline.getDescription());
+        Deadline newDeadline = new Deadline(oldDeadline.getDate(), oldDeadline.getDescription(),
+                oldDeadline.getExecutor(), oldDeadline.getDone());
         newDeadline.setId(oldDeadline.getId());
         return newDeadline;
     }
diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 148697c..9ab9acd 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -20,21 +20,30 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
+    private String executor;
+    private Boolean done;
+
     public Deadline() {
     }
 
-    public Deadline(Date deadlineDate, String description) {
+    public Deadline(Date deadlineDate, String description, String executor, Boolean done) {
         this.date = deadlineDate;
         this.description = description;
+        this.executor = executor;
+        this.done = done;
     }
 
     @JsonCreator
     public Deadline(@JsonProperty("id") Integer id,
                     @JsonProperty("description") String description,
-                    @JsonProperty("date") Date date) {
+                    @JsonProperty("date") Date date,
+                    @JsonProperty("executor") String executor,
+                    @JsonProperty("done") Boolean done) {
         this.setId(id);
         this.description = description;
         this.date = date;
+        this.executor = executor;
+        this.done = done;
     }
 
     public String getDescription() {
@@ -53,6 +62,22 @@ public class Deadline extends BaseEntity {
         this.date = date;
     }
 
+    public String getExecutor() {
+        return executor;
+    }
+
+    public void setExecutor(String executor) {
+        this.executor = executor;
+    }
+
+    public Boolean getDone() {
+        return done;
+    }
+
+    public void setDone(Boolean done) {
+        this.done = done;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -67,11 +92,13 @@ public class Deadline extends BaseEntity {
         Deadline deadline = (Deadline) o;
         return getId().equals(deadline.getId()) &&
                 description.equals(deadline.description) &&
-                date.equals(deadline.date);
+                date.equals(deadline.date) &&
+                executor.equals(deadline.executor) &&
+                done.equals(deadline.done);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), description, date);
+        return Objects.hash(super.hashCode(), description, date, executor, done);
     }
 }
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 9cff4b6..0837b49 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -141,7 +141,7 @@ public class GrantService {
         grant.setComment("Комментарий к гранту 1");
         grant.setProject(projectId);
         grant.setStatus(APPLICATION);
-        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
+        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн", "", false));
         grant.getAuthors().add(user);
         grant.setLeader(user);
         grant.getPapers().add(paper);
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index f98997d..1188c28 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -173,7 +173,7 @@ public class PaperService {
         Paper paper = new Paper();
         paper.setTitle(title);
         paper.getAuthors().add(user);
-        paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
+        paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн", "", false));
         paper.setCreateDate(new Date());
         paper.setUpdateDate(new Date());
         paper.setStatus(DRAFT);
diff --git a/src/main/java/ru/ulstu/project/controller/ProjectController.java b/src/main/java/ru/ulstu/project/controller/ProjectController.java
index ae09658..14b8736 100644
--- a/src/main/java/ru/ulstu/project/controller/ProjectController.java
+++ b/src/main/java/ru/ulstu/project/controller/ProjectController.java
@@ -79,6 +79,13 @@ 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);
diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index 4e03365..319609c 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -20,6 +20,7 @@ public class ProjectDto {
     private GrantDto grant;
     private String repository;
     private String applicationFileName;
+    private List<Integer> removedDeadlineIds = new ArrayList<>();
 
     public ProjectDto() {
     }
@@ -121,4 +122,12 @@ 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;
+    }
 }
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index 247624d..4a79e6c 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -104,6 +104,13 @@ public class ProjectService {
         }
     }
 
+    public void removeDeadline(ProjectDto projectDto, Integer deadlineId) {
+        if (projectDto.getDeadlines().get(deadlineId).getId() != null) {
+            projectDto.getRemovedDeadlineIds().add(projectDto.getDeadlines().get(deadlineId).getId());
+        }
+        projectDto.getDeadlines().remove((int) deadlineId);
+    }
+
     public Project findById(Integer id) {
         return projectRepository.findOne(id);
     }
diff --git a/src/main/resources/db/changelog-20190506_000000-schema.xml b/src/main/resources/db/changelog-20190506_000000-schema.xml
new file mode 100644
index 0000000..cd5a59b
--- /dev/null
+++ b/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>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 83ff280..3b455a8 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -38,4 +38,5 @@
     <include file="db/changelog-20190428_000000-schema.xml"/>
     <include file="db/changelog-20190430_000000-schema.xml"/>
     <include file="db/changelog-20190505_000000-schema.xml"/>
+    <include file="db/changelog-20190506_000000-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index dc3fa6d..cd49319 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -73,14 +73,18 @@
                                     <label>Дедлайны показателей:</label>
                                     <div class="row" th:each="deadline, rowStat : *{deadlines}">
                                         <input type="hidden" th:field="*{deadlines[__${rowStat.index}__].id}"/>
-                                        <div class="col-6 div-deadline-date">
+                                        <div class="col-3 div-deadline-date">
                                             <input type="date" class="form-control form-deadline-date" name="deadline"
                                                    th:field="*{deadlines[__${rowStat.index}__].date}"/>
                                         </div>
-                                        <div class="col-4 div-deadline-description">
+                                        <div class="col-3 div-deadline-description">
                                             <input class="form-control" type="text" placeholder="Описание"
                                                    th:field="*{deadlines[__${rowStat.index}__].description}"/>
                                         </div>
+                                        <div class="col-4 div-deadline-executor">
+                                            <input class="form-control" type="text" placeholder="Исполнитель"
+                                                   th:field="*{deadlines[__${rowStat.index}__].executor}"/>
+                                        </div>
                                         <div class="col-2">
                                             <a class="btn btn-danger float-right"
                                                th:onclick="|$('#deadlines${rowStat.index}\\.description').val('');

From 4bab980f624d8ac8ec24400aa544b2e5daeb48dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 6 May 2019 20:17:10 +0300
Subject: [PATCH 03/17] #98 deadline model and service edited

---
 .../ru/ulstu/deadline/model/Deadline.java     |  4 +---
 .../deadline/service/DeadlineService.java     |  4 ++++
 .../resources/templates/projects/project.html | 19 ++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 9ab9acd..5a05ea1 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -66,9 +66,7 @@ public class Deadline extends BaseEntity {
         return executor;
     }
 
-    public void setExecutor(String executor) {
-        this.executor = executor;
-    }
+    public void setExecutor(String executor) { this.executor = executor; }
 
     public Boolean getDone() {
         return done;
diff --git a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
index 0ef8a4f..6002c86 100644
--- a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
+++ b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
@@ -29,6 +29,8 @@ public class DeadlineService {
         Deadline updateDeadline = deadlineRepository.findOne(deadline.getId());
         updateDeadline.setDate(deadline.getDate());
         updateDeadline.setDescription(deadline.getDescription());
+        updateDeadline.setExecutor(deadline.getExecutor());
+        updateDeadline.setDone(deadline.getDone());
         deadlineRepository.save(updateDeadline);
         return updateDeadline;
     }
@@ -38,6 +40,8 @@ public class DeadlineService {
         Deadline newDeadline = new Deadline();
         newDeadline.setDate(deadline.getDate());
         newDeadline.setDescription(deadline.getDescription());
+        newDeadline.setExecutor(deadline.getExecutor());
+        newDeadline.setDone(deadline.getDone());
         newDeadline = deadlineRepository.save(newDeadline);
         return newDeadline;
     }
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index cd49319..2a0b7cf 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -71,20 +71,17 @@
 
                                 <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-3 div-deadline-date">
+                                        <div class="col-6 div-deadline-date">
                                             <input type="date" class="form-control form-deadline-date" name="deadline"
                                                    th:field="*{deadlines[__${rowStat.index}__].date}"/>
                                         </div>
-                                        <div class="col-3 div-deadline-description">
+                                        <div class="col-4 div-deadline-description">
                                             <input class="form-control" type="text" placeholder="Описание"
                                                    th:field="*{deadlines[__${rowStat.index}__].description}"/>
                                         </div>
-                                        <div class="col-4 div-deadline-executor">
-                                            <input class="form-control" type="text" placeholder="Исполнитель"
-                                                   th:field="*{deadlines[__${rowStat.index}__].executor}"/>
-                                        </div>
                                         <div class="col-2">
                                             <a class="btn btn-danger float-right"
                                                th:onclick="|$('#deadlines${rowStat.index}\\.description').val('');
@@ -97,6 +94,14 @@
                                     <p th:if="${#fields.hasErrors('deadlines')}" th:errors="*{deadlines}"
                                        class="alert alert-danger">Incorrect title</p>
                                 </div>
+                                <div class="form-group">
+                                    <div class="row" th:each="deadline, rowStat : *{deadlines}">
+                                        <div class="col-10 div-deadline-executor">
+                                            <input class="form-control" type="text" placeholder="Исполнитель"
+                                                   th:field="*{deadlines[__${rowStat.index}__].executor}"/>
+                                        </div>
+                                    </div>
+                                </div>
                                 <div class="form-group">
                                     <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
                                            value="Добавить дедлайн"/>

From 4025aa67ca1720d75cdda18dcf4221868470f162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 6 May 2019 21:51:58 +0300
Subject: [PATCH 04/17] #98 project completion added

---
 .../java/ru/ulstu/project/model/Project.java  | 16 ++++++++
 .../ru/ulstu/project/model/ProjectDto.java    | 41 ++++++++++++++++++-
 .../db/changelog-20190506_000001-schema.xml   | 17 ++++++++
 src/main/resources/db/changelog-master.xml    |  1 +
 src/main/resources/public/css/project.css     |  5 +++
 .../resources/templates/projects/project.html | 15 +++----
 6 files changed, 87 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190506_000001-schema.xml
 create mode 100644 src/main/resources/public/css/project.css

diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index c971c4b..acf0d0f 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -5,17 +5,22 @@ import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
 import ru.ulstu.grant.model.Grant;
+import ru.ulstu.user.model.User;
 
 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;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 @Entity
 public class Project extends BaseEntity {
@@ -62,6 +67,9 @@ public class Project extends BaseEntity {
     @JoinColumn(name = "file_id")
     private FileData application;
 
+    @ManyToMany(fetch = FetchType.EAGER)
+    private Set<User> executors = new HashSet<>();
+
     public String getTitle() {
         return title;
     }
@@ -117,4 +125,12 @@ public class Project extends BaseEntity {
     public void setApplication(FileData application) {
         this.application = application;
     }
+
+    public Set<User> getExecutors() {
+        return executors;
+    }
+
+    public void setExecutors(Set<User> executors) {
+        this.executors = executors;
+    }
 }
diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index 319609c..0f86e1a 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -3,11 +3,17 @@ 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.UserDto;
 
 import java.util.ArrayList;
 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;
@@ -21,6 +27,10 @@ public class ProjectDto {
     private String repository;
     private String applicationFileName;
     private List<Integer> removedDeadlineIds = new ArrayList<>();
+    private Set<Integer> executorIds;
+    private Set<UserDto> executors;
+
+    private final static int MAX_EXECUTORS_LENGTH = 40;
 
     public ProjectDto() {
     }
@@ -36,7 +46,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") Set<UserDto> executors) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -45,6 +57,8 @@ public class ProjectDto {
         this.repository = repository;
         this.deadlines = deadlines;
         this.applicationFileName = null;
+        this.executorIds = executorIds;
+        this.executors = executors;
     }
 
 
@@ -57,6 +71,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(project.getExecutors(), user -> user.getId());
+        this.executors = convert(project.getExecutors(), UserDto::new);
     }
 
     public Integer getId() {
@@ -130,4 +146,27 @@ public class ProjectDto {
     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 Set<UserDto> getExecutors() {
+        return executors;
+    }
+
+    public void setExecutors(Set<UserDto> executors) {
+        this.executors = executors;
+    }
+
+    public String getExecutorsString() {
+        return StringUtils.abbreviate(executors
+                .stream()
+                .map(executor -> executor.getLastName())
+                .collect(Collectors.joining(", ")), MAX_EXECUTORS_LENGTH);
+    }
 }
diff --git a/src/main/resources/db/changelog-20190506_000001-schema.xml b/src/main/resources/db/changelog-20190506_000001-schema.xml
new file mode 100644
index 0000000..e28d009
--- /dev/null
+++ b/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>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 3b455a8..051c953 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -39,4 +39,5 @@
     <include file="db/changelog-20190430_000000-schema.xml"/>
     <include file="db/changelog-20190505_000000-schema.xml"/>
     <include file="db/changelog-20190506_000000-schema.xml"/>
+    <include file="db/changelog-20190506_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/public/css/project.css b/src/main/resources/public/css/project.css
new file mode 100644
index 0000000..24e12ea
--- /dev/null
+++ b/src/main/resources/public/css/project.css
@@ -0,0 +1,5 @@
+.div-deadline-done {
+    width: 60%;
+    height: 100%;
+    float: right;
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index 2a0b7cf..8385694 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/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>
 
@@ -90,17 +90,18 @@
                                                     aria-hidden="true"><i class="fa fa-times"/></span>
                                             </a>
                                         </div>
-                                    </div>
-                                    <p th:if="${#fields.hasErrors('deadlines')}" th:errors="*{deadlines}"
-                                       class="alert alert-danger">Incorrect title</p>
-                                </div>
-                                <div class="form-group">
-                                    <div class="row" th:each="deadline, rowStat : *{deadlines}">
+                                        <div class="col-12" style="margin-bottom: 15px;"></div>
                                         <div class="col-10 div-deadline-executor">
                                             <input class="form-control" type="text" placeholder="Исполнитель"
                                                    th:field="*{deadlines[__${rowStat.index}__].executor}"/>
                                         </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>
                                 </div>
                                 <div class="form-group">
                                     <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"

From 241c489b21a5fb5f1624aaccfbdd78eaa883b982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 6 May 2019 22:10:40 +0300
Subject: [PATCH 05/17] #98 deadline edited

---
 src/main/java/ru/ulstu/deadline/model/Deadline.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 5a05ea1..9ab9acd 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -66,7 +66,9 @@ public class Deadline extends BaseEntity {
         return executor;
     }
 
-    public void setExecutor(String executor) { this.executor = executor; }
+    public void setExecutor(String executor) {
+        this.executor = executor;
+    }
 
     public Boolean getDone() {
         return done;

From f960d4de1b78cd9a8cd01ea43bdd6304fcc7d844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Fri, 17 May 2019 11:30:26 +0300
Subject: [PATCH 06/17] #98 deadline model edited

---
 src/main/java/ru/ulstu/deadline/model/Deadline.java    | 5 +++++
 src/main/java/ru/ulstu/grant/service/GrantService.java | 2 +-
 src/main/java/ru/ulstu/paper/service/PaperService.java | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 9ab9acd..5ab9f47 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -26,6 +26,11 @@ public class Deadline extends BaseEntity {
     public Deadline() {
     }
 
+    public Deadline(Date deadlineDate, String description) {
+        this.date = deadlineDate;
+        this.description = description;
+    }
+
     public Deadline(Date deadlineDate, String description, String executor, Boolean done) {
         this.date = deadlineDate;
         this.description = description;
diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index c06a71c..45f9b2f 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -164,7 +164,7 @@ public class GrantService {
         grant.setComment("Комментарий к гранту 1");
         grant.setProject(projectId);
         grant.setStatus(APPLICATION);
-        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн", "", false));
+        grant.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
         grant.getAuthors().add(user);
         grant.setLeader(user);
         grant.getPapers().add(paper);
diff --git a/src/main/java/ru/ulstu/paper/service/PaperService.java b/src/main/java/ru/ulstu/paper/service/PaperService.java
index 0a60c92..db810f5 100644
--- a/src/main/java/ru/ulstu/paper/service/PaperService.java
+++ b/src/main/java/ru/ulstu/paper/service/PaperService.java
@@ -173,7 +173,7 @@ public class PaperService {
         Paper paper = new Paper();
         paper.setTitle(title);
         paper.getAuthors().add(user);
-        paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн", "", false));
+        paper.getDeadlines().add(new Deadline(deadlineDate, "первый дедлайн"));
         paper.setCreateDate(new Date());
         paper.setUpdateDate(new Date());
         paper.setStatus(DRAFT);

From d7c4e6b22264bbd76b35fae997fb8fbfeb328d1c Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Tue, 21 May 2019 02:09:07 +0400
Subject: [PATCH 07/17] #91 base users dashboard

---
 .../repository/ConferenceRepository.java      |  4 +
 .../conference/service/ConferenceService.java |  4 +
 .../service/ConferenceUserService.java        |  2 -
 .../user/controller/UserMvcController.java    |  5 +
 .../java/ru/ulstu/user/model/UserInfoNow.java | 50 ++++++++++
 .../repository/UserSessionRepository.java     |  3 +
 .../ru/ulstu/user/service/UserService.java    | 37 ++++++-
 .../user/service/UserSessionService.java      |  6 ++
 .../utils/timetable/TimetableService.java     | 97 +++++++++++++++++++
 .../ru/ulstu/utils/timetable/model/Day.java   | 27 ++++++
 .../ulstu/utils/timetable/model/Lesson.java   | 27 ++++++
 .../ulstu/utils/timetable/model/Response.java | 16 +++
 .../timetable/model/TimetableResponse.java    | 22 +++++
 .../ru/ulstu/utils/timetable/model/Week.java  | 16 +++
 .../resources/templates/users/dashboard.html  | 24 +++++
 .../fragments/userDashboardFragment.html      | 18 ++++
 16 files changed, 355 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/user/model/UserInfoNow.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/TimetableService.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/model/Day.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/model/Response.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/model/Week.java
 create mode 100644 src/main/resources/templates/users/dashboard.html
 create mode 100644 src/main/resources/templates/users/fragments/userDashboardFragment.html

diff --git a/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java b/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
index 2b0a428..8f9e05f 100644
--- a/src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
+++ b/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);
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceService.java b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
index 38ce659..1a5db52 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceService.java
@@ -306,4 +306,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);
+    }
 }
diff --git a/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java b/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
index f771b2a..16842c1 100644
--- a/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
+++ b/src/main/java/ru/ulstu/conference/service/ConferenceUserService.java
@@ -43,6 +43,4 @@ public class ConferenceUserService {
         newUser = conferenceUserRepository.save(newUser);
         return newUser;
     }
-
-
 }
diff --git a/src/main/java/ru/ulstu/user/controller/UserMvcController.java b/src/main/java/ru/ulstu/user/controller/UserMvcController.java
index 5bcbd13..d283a21 100644
--- a/src/main/java/ru/ulstu/user/controller/UserMvcController.java
+++ b/src/main/java/ru/ulstu/user/controller/UserMvcController.java
@@ -48,4 +48,9 @@ public class UserMvcController extends OdinController<UserListDto, UserDto> {
         User user = userSessionService.getUserBySessionId(sessionId);
         modelMap.addAttribute("userDto", userService.updateUserInformation(user, userDto));
     }
+
+    @GetMapping("/dashboard")
+    public void getUsersDashboard(ModelMap modelMap) {
+        modelMap.addAttribute("users", userService.getUsersInfo());
+    }
 }
diff --git a/src/main/java/ru/ulstu/user/model/UserInfoNow.java b/src/main/java/ru/ulstu/user/model/UserInfoNow.java
new file mode 100644
index 0000000..7d69c56
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java b/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java
index b922e4f..5319245 100644
--- a/src/main/java/ru/ulstu/user/repository/UserSessionRepository.java
+++ b/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);
 }
diff --git a/src/main/java/ru/ulstu/user/service/UserService.java b/src/main/java/ru/ulstu/user/service/UserService.java
index c889caa..334fbf5 100644
--- a/src/main/java/ru/ulstu/user/service/UserService.java
+++ b/src/main/java/ru/ulstu/user/service/UserService.java
@@ -3,6 +3,7 @@ package ru.ulstu.user.service;
 import com.google.common.collect.ImmutableMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Sort;
 import org.springframework.mail.MailException;
@@ -13,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;
@@ -30,6 +32,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;
@@ -38,8 +41,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.model.Lesson;
 
 import javax.mail.MessagingException;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -62,19 +70,27 @@ 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;
 
     public UserService(UserRepository userRepository,
                        PasswordEncoder passwordEncoder,
                        UserRoleRepository userRoleRepository,
                        UserMapper userMapper,
                        MailService mailService,
-                       ApplicationProperties applicationProperties) {
+                       ApplicationProperties applicationProperties,
+                       @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;
     }
 
     private User getUserByEmail(String email) {
@@ -341,4 +357,23 @@ public class UserService implements UserDetailsService {
             throw new UserSendingMailException(email);
         }
     }
+
+    public List<UserInfoNow> getUsersInfo() {
+        List<UserInfoNow> usersInfoNow = new ArrayList<>();
+        for (User user : userRepository.findAll()) {
+            Lesson lesson = null;
+            try {
+                lesson = timetableService.getCurrentLesson(user.getUserAbbreviate());
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            usersInfoNow.add(new UserInfoNow(
+                    lesson,
+                    conferenceService.getActiveConferenceByUser(user),
+                    user,
+                    userSessionService.isOnline(user))
+            );
+        }
+        return usersInfoNow;
+    }
 }
diff --git a/src/main/java/ru/ulstu/user/service/UserSessionService.java b/src/main/java/ru/ulstu/user/service/UserSessionService.java
index ae289d0..17a7f5b 100644
--- a/src/main/java/ru/ulstu/user/service/UserSessionService.java
+++ b/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();
+    }
 }
diff --git a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
new file mode 100644
index 0000000..f17ea86
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
@@ -0,0 +1,97 @@
+package ru.ulstu.utils.timetable;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import ru.ulstu.utils.timetable.model.Lesson;
+import ru.ulstu.utils.timetable.model.TimetableResponse;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+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";
+    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() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        return (cal.get(Calendar.WEEK_OF_YEAR) + 1) % 2;
+    }
+
+    private TimetableResponse getTimetableForUser(String userFIO) throws IOException {
+        URL url = new URL(TIMETABLE_URL + "/api/1.0/timetable?filter=" + URLEncoder.encode(userFIO, "UTF-8"));
+        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+        con.setRequestMethod("GET");
+
+        BufferedReader in = new BufferedReader(
+                new InputStreamReader(con.getInputStream()));
+        String inputLine;
+        StringBuilder content = new StringBuilder();
+        while ((inputLine = in.readLine()) != null) {
+            content.append(inputLine);
+        }
+        in.close();
+
+        return new ObjectMapper().readValue(content.toString(), TimetableResponse.class);
+    }
+
+    public Lesson getCurrentLesson(String userFio) throws IOException {
+        TimetableResponse response = getTimetableForUser(userFio);
+        int lessonNumber = getCurrentLessonNumber();
+        if (lessonNumber < 0) {
+            return null;
+        }
+
+        List<Object> 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);
+    }
+}
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Day.java b/src/main/java/ru/ulstu/utils/timetable/model/Day.java
new file mode 100644
index 0000000..f548462
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Day.java
@@ -0,0 +1,27 @@
+package ru.ulstu.utils.timetable.model;
+
+import java.util.List;
+
+
+public class Day {
+
+    private Integer day;
+    private List<List<Object>> lessons = null;
+
+    public Integer getDay() {
+        return day;
+    }
+
+    public void setDay(Integer day) {
+        this.day = day;
+    }
+
+    public List<List<Object>> getLessons() {
+        return lessons;
+    }
+
+    public void setLessons(List<List<Object>> lessons) {
+        this.lessons = lessons;
+    }
+}
+
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java b/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
new file mode 100644
index 0000000..e651e1a
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
@@ -0,0 +1,27 @@
+package ru.ulstu.utils.timetable.model;
+
+public class Lesson {
+    private String group;
+    private String nameOfLesson;
+    private String teacher;
+    private String room;
+
+    public Lesson() {
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public String getNameOfLesson() {
+        return nameOfLesson;
+    }
+
+    public String getTeacher() {
+        return teacher;
+    }
+
+    public String getRoom() {
+        return room;
+    }
+}
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Response.java b/src/main/java/ru/ulstu/utils/timetable/model/Response.java
new file mode 100644
index 0000000..b5b9e97
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Response.java
@@ -0,0 +1,16 @@
+package ru.ulstu.utils.timetable.model;
+
+import java.util.List;
+
+public class Response {
+
+    private List<Week> weeks = null;
+
+    public List<Week> getWeeks() {
+        return weeks;
+    }
+
+    public void setWeeks(List<Week> weeks) {
+        this.weeks = weeks;
+    }
+}
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java b/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
new file mode 100644
index 0000000..118c979
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Week.java b/src/main/java/ru/ulstu/utils/timetable/model/Week.java
new file mode 100644
index 0000000..19f3c50
--- /dev/null
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Week.java
@@ -0,0 +1,16 @@
+package ru.ulstu.utils.timetable.model;
+
+import java.util.List;
+
+public class Week {
+
+    private List<Day> days = null;
+
+    public List<Day> getDays() {
+        return days;
+    }
+
+    public void setDays(List<Day> days) {
+        this.days = days;
+    }
+}
diff --git a/src/main/resources/templates/users/dashboard.html b/src/main/resources/templates/users/dashboard.html
new file mode 100644
index 0000000..8236734
--- /dev/null
+++ b/src/main/resources/templates/users/dashboard.html
@@ -0,0 +1,24 @@
+<!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>
+</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="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>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/users/fragments/userDashboardFragment.html b/src/main/resources/templates/users/fragments/userDashboardFragment.html
new file mode 100644
index 0000000..267bbf8
--- /dev/null
+++ b/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>
\ No newline at end of file

From 308da4113d395005204741494b71d85bcf252271 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 24 May 2019 13:26:02 +0400
Subject: [PATCH 08/17] fix week number calculation

---
 .../ru/ulstu/utils/timetable/TimetableService.java  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
index aa49fed..d65e276 100644
--- a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
+++ b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
@@ -3,6 +3,7 @@ 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;
@@ -50,9 +51,15 @@ public class TimetableService {
     }
 
     private int getCurrentWeek() {
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(new Date());
-        return (cal.get(Calendar.WEEK_OF_YEAR) + 1) % 2;
+        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 {

From 193b2b3a3255f45274f299364e8c398f9f1ce3ad Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Sat, 25 May 2019 14:03:43 +0400
Subject: [PATCH 09/17] #91 using RestTemplate & show error on timetable
 loading exception

---
 .../user/controller/UserMvcController.java    |  2 +-
 .../ru/ulstu/user/service/UserService.java    | 12 +++--
 .../utils/timetable/TimetableService.java     | 48 ++++++++-----------
 .../errors/TimetableClientException.java      |  7 +++
 .../ru/ulstu/utils/timetable/model/Day.java   |  9 ++--
 .../ulstu/utils/timetable/model/Lesson.java   |  5 +-
 .../ulstu/utils/timetable/model/Response.java |  3 +-
 .../timetable/model/TimetableResponse.java    |  2 +-
 .../ru/ulstu/utils/timetable/model/Week.java  |  6 ++-
 src/main/resources/application.properties     |  4 +-
 .../resources/templates/users/dashboard.html  | 13 ++++-
 11 files changed, 63 insertions(+), 48 deletions(-)
 create mode 100644 src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java

diff --git a/src/main/java/ru/ulstu/user/controller/UserMvcController.java b/src/main/java/ru/ulstu/user/controller/UserMvcController.java
index d283a21..044bde8 100644
--- a/src/main/java/ru/ulstu/user/controller/UserMvcController.java
+++ b/src/main/java/ru/ulstu/user/controller/UserMvcController.java
@@ -51,6 +51,6 @@ public class UserMvcController extends OdinController<UserListDto, UserDto> {
 
     @GetMapping("/dashboard")
     public void getUsersDashboard(ModelMap modelMap) {
-        modelMap.addAttribute("users", userService.getUsersInfo());
+        modelMap.addAllAttributes(userService.getUsersInfo());
     }
 }
diff --git a/src/main/java/ru/ulstu/user/service/UserService.java b/src/main/java/ru/ulstu/user/service/UserService.java
index 334fbf5..b022866 100644
--- a/src/main/java/ru/ulstu/user/service/UserService.java
+++ b/src/main/java/ru/ulstu/user/service/UserService.java
@@ -42,10 +42,10 @@ 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.io.IOException;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -358,14 +358,16 @@ public class UserService implements UserDetailsService {
         }
     }
 
-    public List<UserInfoNow> getUsersInfo() {
+    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 (IOException e) {
-                e.printStackTrace();
+            } catch (TimetableClientException e) {
+                err = "Не удалось загрузить расписание";
             }
             usersInfoNow.add(new UserInfoNow(
                     lesson,
@@ -374,6 +376,6 @@ public class UserService implements UserDetailsService {
                     userSessionService.isOnline(user))
             );
         }
-        return usersInfoNow;
+        return ImmutableMap.of("users", usersInfoNow, "error", err);
     }
 }
diff --git a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
index f17ea86..aa49fed 100644
--- a/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
+++ b/src/main/java/ru/ulstu/utils/timetable/TimetableService.java
@@ -1,15 +1,12 @@
 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.utils.timetable.errors.TimetableClientException;
 import ru.ulstu.utils.timetable.model.Lesson;
 import ru.ulstu.utils.timetable.model.TimetableResponse;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -17,10 +14,10 @@ import java.util.Date;
 import java.util.List;
 
 public class TimetableService {
-    private static final String TIMETABLE_URL = "http://timetable.athene.tech";
+    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[]{
+    private long[] lessonsStarts = new long[] {
             lessonTimeFormat.parse("8:00:00").getTime(),
             lessonTimeFormat.parse("9:40:00").getTime(),
             lessonTimeFormat.parse("11:30:00").getTime(),
@@ -30,7 +27,8 @@ public class TimetableService {
             lessonTimeFormat.parse("18:10:00").getTime(),
     };
 
-    public TimetableService() throws ParseException { }
+    public TimetableService() throws ParseException {
+    }
 
     private int getCurrentDay() {
         Calendar calendar = Calendar.getInstance();
@@ -42,6 +40,7 @@ public class TimetableService {
         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;
@@ -56,31 +55,26 @@ public class TimetableService {
         return (cal.get(Calendar.WEEK_OF_YEAR) + 1) % 2;
     }
 
-    private TimetableResponse getTimetableForUser(String userFIO) throws IOException {
-        URL url = new URL(TIMETABLE_URL + "/api/1.0/timetable?filter=" + URLEncoder.encode(userFIO, "UTF-8"));
-        HttpURLConnection con = (HttpURLConnection) url.openConnection();
-        con.setRequestMethod("GET");
-
-        BufferedReader in = new BufferedReader(
-                new InputStreamReader(con.getInputStream()));
-        String inputLine;
-        StringBuilder content = new StringBuilder();
-        while ((inputLine = in.readLine()) != null) {
-            content.append(inputLine);
-        }
-        in.close();
-
-        return new ObjectMapper().readValue(content.toString(), TimetableResponse.class);
+    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) throws IOException {
-        TimetableResponse response = getTimetableForUser(userFio);
+    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<Object> lessons = response
+        List<Lesson> lessons = response
                 .getResponse()
                 .getWeeks()
                 .get(getCurrentWeek())
diff --git a/src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java b/src/main/java/ru/ulstu/utils/timetable/errors/TimetableClientException.java
new file mode 100644
index 0000000..4723bda
--- /dev/null
+++ b/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);
+    }
+}
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Day.java b/src/main/java/ru/ulstu/utils/timetable/model/Day.java
index f548462..e4e37f9 100644
--- a/src/main/java/ru/ulstu/utils/timetable/model/Day.java
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Day.java
@@ -1,12 +1,13 @@
 package ru.ulstu.utils.timetable.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
-public class Day {
+public class Day  {
 
     private Integer day;
-    private List<List<Object>> lessons = null;
+    private List<List<Lesson>> lessons = new ArrayList<>();
 
     public Integer getDay() {
         return day;
@@ -16,11 +17,11 @@ public class Day {
         this.day = day;
     }
 
-    public List<List<Object>> getLessons() {
+    public List<List<Lesson>> getLessons() {
         return lessons;
     }
 
-    public void setLessons(List<List<Object>> lessons) {
+    public void setLessons(List<List<Lesson>> lessons) {
         this.lessons = lessons;
     }
 }
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java b/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
index e651e1a..b1b1707 100644
--- a/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Lesson.java
@@ -1,14 +1,11 @@
 package ru.ulstu.utils.timetable.model;
 
-public class Lesson {
+public class Lesson  {
     private String group;
     private String nameOfLesson;
     private String teacher;
     private String room;
 
-    public Lesson() {
-    }
-
     public String getGroup() {
         return group;
     }
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Response.java b/src/main/java/ru/ulstu/utils/timetable/model/Response.java
index b5b9e97..dfd3a84 100644
--- a/src/main/java/ru/ulstu/utils/timetable/model/Response.java
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Response.java
@@ -1,10 +1,11 @@
 package ru.ulstu.utils.timetable.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class Response {
 
-    private List<Week> weeks = null;
+    private List<Week> weeks = new ArrayList<>();
 
     public List<Week> getWeeks() {
         return weeks;
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java b/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
index 118c979..925d9a8 100644
--- a/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
+++ b/src/main/java/ru/ulstu/utils/timetable/model/TimetableResponse.java
@@ -1,6 +1,6 @@
 package ru.ulstu.utils.timetable.model;
 
-public class TimetableResponse {
+public class TimetableResponse  {
     private Response response;
     private String error;
 
diff --git a/src/main/java/ru/ulstu/utils/timetable/model/Week.java b/src/main/java/ru/ulstu/utils/timetable/model/Week.java
index 19f3c50..8ea76ea 100644
--- a/src/main/java/ru/ulstu/utils/timetable/model/Week.java
+++ b/src/main/java/ru/ulstu/utils/timetable/model/Week.java
@@ -1,10 +1,12 @@
 package ru.ulstu.utils.timetable.model;
 
+import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
-public class Week {
+public class Week implements Serializable {
 
-    private List<Day> days = null;
+    private List<Day> days = new ArrayList<>();
 
     public List<Day> getDays() {
         return days;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 038ddcf..41c8ece 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -24,7 +24,7 @@ spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFact
 # JPA Settings
 spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker
 spring.datasource.username=postgres
-spring.datasource.password=postgres
+spring.datasource.password=password
 spring.datasource.driverclassName=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=validate
 # Liquibase Settings
@@ -34,6 +34,6 @@ liquibase.change-log=classpath:db/changelog-master.xml
 # Application Settings
 ng-tracker.base-url=http://127.0.0.1:8080
 ng-tracker.undead-user-login=admin
-ng-tracker.dev-mode=true
+ng-tracker.dev-mode=false
 ng-tracker.use-https=false
 ng-tracker.check-run=false
\ No newline at end of file
diff --git a/src/main/resources/templates/users/dashboard.html b/src/main/resources/templates/users/dashboard.html
index 8236734..e5b7563 100644
--- a/src/main/resources/templates/users/dashboard.html
+++ b/src/main/resources/templates/users/dashboard.html
@@ -3,15 +3,18 @@
       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})"/>
@@ -19,6 +22,14 @@
             </div>
         </div>
     </section>
+    <script th:inline="javascript">
+        /*<![CDATA[*/
+        $(document).ready(function () {
+            var error = /*[[${error}]]*/
+            showFeedbackMessage(error, MessageTypesEnum.WARNING)
+        });
+        /*]]>*/
+    </script>
 </div>
 </body>
 </html>
\ No newline at end of file

From f4479c2ab7d7d48806cac42361aa970b50cbd2ff Mon Sep 17 00:00:00 2001
From: "Artem.Arefev" <a.arefyev@mediasoft.team>
Date: Sat, 25 May 2019 14:11:57 +0400
Subject: [PATCH 10/17] #91 fixed app properties

---
 src/main/resources/application.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 41c8ece..038ddcf 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -24,7 +24,7 @@ spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFact
 # JPA Settings
 spring.datasource.url=jdbc:postgresql://localhost:5432/ng-tracker
 spring.datasource.username=postgres
-spring.datasource.password=password
+spring.datasource.password=postgres
 spring.datasource.driverclassName=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=validate
 # Liquibase Settings
@@ -34,6 +34,6 @@ liquibase.change-log=classpath:db/changelog-master.xml
 # Application Settings
 ng-tracker.base-url=http://127.0.0.1:8080
 ng-tracker.undead-user-login=admin
-ng-tracker.dev-mode=false
+ng-tracker.dev-mode=true
 ng-tracker.use-https=false
 ng-tracker.check-run=false
\ No newline at end of file

From 4eeb79ab80fedec0b8d69dc901cb5d9cb326e312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 27 May 2019 09:19:52 +0300
Subject: [PATCH 11/17] #98 changelog edited

---
 .../java/ru/ulstu/deadline/model/Deadline.java     | 10 +++++-----
 .../db/changelog-20190517_000001-schema.xml        | 14 ++++++++++++++
 src/main/resources/db/changelog-master.xml         |  1 +
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190517_000001-schema.xml

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 5ab9f47..4dfebef 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -20,7 +20,7 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
-    private String executor;
+    private Integer executor;
     private Boolean done;
 
     public Deadline() {
@@ -31,7 +31,7 @@ public class Deadline extends BaseEntity {
         this.description = description;
     }
 
-    public Deadline(Date deadlineDate, String description, String executor, Boolean done) {
+    public Deadline(Date deadlineDate, String description, Integer executor, Boolean done) {
         this.date = deadlineDate;
         this.description = description;
         this.executor = executor;
@@ -42,7 +42,7 @@ public class Deadline extends BaseEntity {
     public Deadline(@JsonProperty("id") Integer id,
                     @JsonProperty("description") String description,
                     @JsonProperty("date") Date date,
-                    @JsonProperty("executor") String executor,
+                    @JsonProperty("executor") Integer executor,
                     @JsonProperty("done") Boolean done) {
         this.setId(id);
         this.description = description;
@@ -67,11 +67,11 @@ public class Deadline extends BaseEntity {
         this.date = date;
     }
 
-    public String getExecutor() {
+    public Integer getExecutor() {
         return executor;
     }
 
-    public void setExecutor(String executor) {
+    public void setExecutor(Integer executor) {
         this.executor = executor;
     }
 
diff --git a/src/main/resources/db/changelog-20190517_000001-schema.xml b/src/main/resources/db/changelog-20190517_000001-schema.xml
new file mode 100644
index 0000000..73c6435
--- /dev/null
+++ b/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>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index 1cab67b..d81f1cb 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -44,4 +44,5 @@
     <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"/>
 </databaseChangeLog>
\ No newline at end of file

From 7388e12e3f5d50ab6278f99e96ff0d49046b9ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Mon, 27 May 2019 18:19:31 +0300
Subject: [PATCH 12/17] #98 edited project executors

---
 .../project/controller/ProjectController.java |  6 +++++
 .../java/ru/ulstu/project/model/Project.java  |  9 ++++++-
 .../ru/ulstu/project/model/ProjectDto.java    | 24 ++++++++++++++++++-
 .../ulstu/project/service/ProjectService.java | 13 +++++++++-
 .../resources/templates/projects/project.html |  9 +++++--
 5 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ru/ulstu/project/controller/ProjectController.java b/src/main/java/ru/ulstu/project/controller/ProjectController.java
index 14b8736..88f0c7a 100644
--- a/src/main/java/ru/ulstu/project/controller/ProjectController.java
+++ b/src/main/java/ru/ulstu/project/controller/ProjectController.java
@@ -13,6 +13,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;
@@ -92,6 +93,11 @@ public class ProjectController {
         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()))
diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index acf0d0f..f061221 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -2,6 +2,7 @@ package ru.ulstu.project.model;
 
 import org.hibernate.validator.constraints.NotBlank;
 import ru.ulstu.core.model.BaseEntity;
+import ru.ulstu.core.model.UserContainer;
 import ru.ulstu.deadline.model.Deadline;
 import ru.ulstu.file.model.FileData;
 import ru.ulstu.grant.model.Grant;
@@ -23,7 +24,8 @@ import java.util.List;
 import java.util.Set;
 
 @Entity
-public class Project extends BaseEntity {
+public class Project extends BaseEntity implements UserContainer {
+
     public enum ProjectStatus {
         APPLICATION("Заявка"),
         ON_COMPETITION("Отправлен на конкурс"),
@@ -133,4 +135,9 @@ public class Project extends BaseEntity {
     public void setExecutors(Set<User> executors) {
         this.executors = executors;
     }
+
+    @Override
+    public Set<User> getUsers() {
+        return getExecutors();
+    }
 }
diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index 0f86e1a..0292f1f 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -29,6 +29,8 @@ public class ProjectDto {
     private List<Integer> removedDeadlineIds = new ArrayList<>();
     private Set<Integer> executorIds;
     private Set<UserDto> executors;
+    private boolean hasAge;
+    private boolean hasDegree;
 
     private final static int MAX_EXECUTORS_LENGTH = 40;
 
@@ -48,7 +50,9 @@ public class ProjectDto {
                       @JsonProperty("repository") String repository,
                       @JsonProperty("deadlines") List<Deadline> deadlines,
                       @JsonProperty("executorIds") Set<Integer> executorIds,
-                      @JsonProperty("executors") Set<UserDto> executors) {
+                      @JsonProperty("executors") Set<UserDto> executors,
+                      @JsonProperty("hasAge") boolean hasAge,
+                      @JsonProperty("hasDegree") boolean hasDegree) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -59,6 +63,8 @@ public class ProjectDto {
         this.applicationFileName = null;
         this.executorIds = executorIds;
         this.executors = executors;
+        this.hasAge = hasAge;
+        this.hasDegree = hasDegree;
     }
 
 
@@ -163,6 +169,22 @@ public class ProjectDto {
         this.executors = executors;
     }
 
+    public boolean isHasAge() {
+        return hasAge;
+    }
+
+    public void setHasAge(boolean hasAge) {
+        this.hasAge = hasAge;
+    }
+
+    public boolean isHasDegree() {
+        return hasDegree;
+    }
+
+    public void setHasDegree(boolean hasDegree) {
+        this.hasDegree = hasDegree;
+    }
+
     public String getExecutorsString() {
         return StringUtils.abbreviate(executors
                 .stream()
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index 4a79e6c..2f6473b 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -5,10 +5,13 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.service.FileService;
+import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.repository.GrantRepository;
 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;
@@ -26,15 +29,18 @@ public class ProjectService {
     private final DeadlineService deadlineService;
     private final GrantRepository grantRepository;
     private final FileService fileService;
+    private final UserService userService;
 
     public ProjectService(ProjectRepository projectRepository,
                           DeadlineService deadlineService,
                           GrantRepository grantRepository,
-                          FileService fileService) {
+                          FileService fileService,
+                          UserService userService) {
         this.projectRepository = projectRepository;
         this.deadlineService = deadlineService;
         this.grantRepository = grantRepository;
         this.fileService = fileService;
+        this.userService = userService;
     }
 
     public List<Project> findAll() {
@@ -115,4 +121,9 @@ public class ProjectService {
         return projectRepository.findOne(id);
     }
 
+    public List<User> getProjectExecutors(ProjectDto projectDto) {
+        List<User> filteredUsers = userService.filterByAgeAndDegree(projectDto.isHasAge(), projectDto.isHasDegree());
+        return filteredUsers;
+    }
+
 }
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index 8385694..304fed0 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -92,8 +92,13 @@
                                         </div>
                                         <div class="col-12" style="margin-bottom: 15px;"></div>
                                         <div class="col-10 div-deadline-executor">
-                                            <input class="form-control" type="text" placeholder="Исполнитель"
-                                                   th:field="*{deadlines[__${rowStat.index}__].executor}"/>
+                                            <select class="selectpicker form-control" data-live-search="true"
+                                                    title="-- Выберите исполнителя --" id="executors"
+                                                    th:field="*{deadlines[__${rowStat.index}__].executor}" data-size="5">
+                                                <option th:each="executor : ${allExecutors}" th:value="${executor.id}"
+                                                        th:text="${executor.lastName}"> Участник
+                                                </option>
+                                            </select>
                                         </div>
                                         <div class="col-2">
                                             <input class="form-control div-deadline-done" type="checkbox"

From eb87c6d52ffb8de49290699056960c904fd93c2f Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Tue, 28 May 2019 00:40:36 +0400
Subject: [PATCH 13/17] #98 project statuses edited

---
 src/main/java/ru/ulstu/project/model/Project.java      | 10 +++++-----
 .../java/ru/ulstu/project/service/ProjectService.java  |  4 ++--
 .../projects/fragments/projectStatusFragment.html      | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index f061221..cf0de14 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -27,11 +27,11 @@ import java.util.Set;
 public class Project extends BaseEntity implements UserContainer {
 
     public enum ProjectStatus {
-        APPLICATION("Заявка"),
-        ON_COMPETITION("Отправлен на конкурс"),
-        SUCCESSFUL_PASSAGE("Успешное прохождение"),
+        TT("ТЗ"),
+        OPEN("Открыт"),
         IN_WORK("В работе"),
-        COMPLETED("Завершен"),
+        CERTIFICATE_ISSUED("Оформление свидетельства"),
+        CLOSED("Закрыт"),
         FAILED("Провалены сроки");
 
         private String statusName;
@@ -49,7 +49,7 @@ public class Project extends BaseEntity implements UserContainer {
     private String title;
 
     @Enumerated(value = EnumType.STRING)
-    private ProjectStatus status = ProjectStatus.APPLICATION;
+    private ProjectStatus status = ProjectStatus.TT;
 
     @NotNull
     private String description;
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index 2f6473b..2b9e82b 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -19,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.TT;
 
 @Service
 public class ProjectService {
@@ -89,7 +89,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 ? TT : projectDto.getStatus());
         project.setTitle(projectDto.getTitle());
         if (projectDto.getGrant() != null && projectDto.getGrant().getId() != null) {
             project.setGrant(grantRepository.findOne(projectDto.getGrant().getId()));
diff --git a/src/main/resources/templates/projects/fragments/projectStatusFragment.html b/src/main/resources/templates/projects/fragments/projectStatusFragment.html
index d8f29cc..c56958e 100644
--- a/src/main/resources/templates/projects/fragments/projectStatusFragment.html
+++ b/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="'TT'">
             <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'">

From 3b0a2dd964c60fc53c4ec9ac64fedcedb4dc7594 Mon Sep 17 00:00:00 2001
From: "a.vasin" <vasin.anton404@gmail.com>
Date: Tue, 28 May 2019 11:12:27 +0400
Subject: [PATCH 14/17] #98 executors list added

---
 .../ru/ulstu/deadline/model/Deadline.java     | 30 ++++++++++---------
 .../deadline/service/DeadlineService.java     |  4 +--
 .../java/ru/ulstu/project/model/Project.java  | 15 +++++-----
 .../ru/ulstu/project/model/ProjectDto.java    | 13 ++++----
 .../ulstu/project/service/ProjectService.java |  5 ++--
 .../db/changelog-20190528_000000-schema.xml   | 11 +++++++
 .../db/changelog-20190528_000001-schema.xml   | 17 +++++++++++
 src/main/resources/db/changelog-master.xml    |  2 ++
 .../fragments/projectStatusFragment.html      |  2 +-
 9 files changed, 67 insertions(+), 32 deletions(-)
 create mode 100644 src/main/resources/db/changelog-20190528_000000-schema.xml
 create mode 100644 src/main/resources/db/changelog-20190528_000001-schema.xml

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 3a54bec..97b6441 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -4,11 +4,11 @@ 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.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 @Entity
@@ -20,7 +20,9 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
-    private Integer executor;
+    @OneToMany(targetEntity=User.class, fetch=FetchType.EAGER)
+    private List<User> executors;
+
     private Boolean done;
 
     public Deadline() {
@@ -31,10 +33,10 @@ public class Deadline extends BaseEntity {
         this.description = description;
     }
 
-    public Deadline(Date deadlineDate, String description, Integer executor, Boolean done) {
+    public Deadline(Date deadlineDate, String description, List<User> executors, Boolean done) {
         this.date = deadlineDate;
         this.description = description;
-        this.executor = executor;
+        this.executors = executors;
         this.done = done;
     }
 
@@ -42,12 +44,12 @@ public class Deadline extends BaseEntity {
     public Deadline(@JsonProperty("id") Integer id,
                     @JsonProperty("description") String description,
                     @JsonProperty("date") Date date,
-                    @JsonProperty("executor") Integer executor,
+                    @JsonProperty("executors") List<User> executors,
                     @JsonProperty("done") Boolean done) {
         this.setId(id);
         this.description = description;
         this.date = date;
-        this.executor = executor;
+        this.executors = executors;
         this.done = done;
     }
 
@@ -67,12 +69,12 @@ public class Deadline extends BaseEntity {
         this.date = date;
     }
 
-    public Integer getExecutor() {
-        return executor;
+    public List<User> getExecutors() {
+        return executors;
     }
 
-    public void setExecutor(Integer executor) {
-        this.executor = executor;
+    public void setExecutors(List<User> executors) {
+        this.executors = executors;
     }
 
     public Boolean getDone() {
@@ -103,12 +105,12 @@ public class Deadline extends BaseEntity {
         return getId().equals(deadline.getId()) &&
                 description.equals(deadline.description) &&
                 date.equals(deadline.date) &&
-                executor.equals(deadline.executor) &&
+                executors.equals(deadline.executors) &&
                 done.equals(deadline.done);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), description, date, executor, done);
+        return Objects.hash(super.hashCode(), description, date, executors, done);
     }
 }
diff --git a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
index 83f1afb..9c45537 100644
--- a/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
+++ b/src/main/java/ru/ulstu/deadline/service/DeadlineService.java
@@ -30,7 +30,7 @@ public class DeadlineService {
         Deadline updateDeadline = deadlineRepository.findOne(deadline.getId());
         updateDeadline.setDate(deadline.getDate());
         updateDeadline.setDescription(deadline.getDescription());
-        updateDeadline.setExecutor(deadline.getExecutor());
+        updateDeadline.setExecutors(deadline.getExecutors());
         updateDeadline.setDone(deadline.getDone());
         deadlineRepository.save(updateDeadline);
         return updateDeadline;
@@ -41,7 +41,7 @@ public class DeadlineService {
         Deadline newDeadline = new Deadline();
         newDeadline.setDate(deadline.getDate());
         newDeadline.setDescription(deadline.getDescription());
-        newDeadline.setExecutor(deadline.getExecutor());
+        newDeadline.setExecutors(deadline.getExecutors());
         newDeadline.setDone(deadline.getDone());
         newDeadline = deadlineRepository.save(newDeadline);
         return newDeadline;
diff --git a/src/main/java/ru/ulstu/project/model/Project.java b/src/main/java/ru/ulstu/project/model/Project.java
index cf0de14..3d11583 100644
--- a/src/main/java/ru/ulstu/project/model/Project.java
+++ b/src/main/java/ru/ulstu/project/model/Project.java
@@ -27,7 +27,7 @@ import java.util.Set;
 public class Project extends BaseEntity implements UserContainer {
 
     public enum ProjectStatus {
-        TT("ТЗ"),
+        TECHNICAL_TASK("Техническое задание"),
         OPEN("Открыт"),
         IN_WORK("В работе"),
         CERTIFICATE_ISSUED("Оформление свидетельства"),
@@ -49,7 +49,7 @@ public class Project extends BaseEntity implements UserContainer {
     private String title;
 
     @Enumerated(value = EnumType.STRING)
-    private ProjectStatus status = ProjectStatus.TT;
+    private ProjectStatus status = ProjectStatus.TECHNICAL_TASK;
 
     @NotNull
     private String description;
@@ -69,8 +69,8 @@ public class Project extends BaseEntity implements UserContainer {
     @JoinColumn(name = "file_id")
     private FileData application;
 
-    @ManyToMany(fetch = FetchType.EAGER)
-    private Set<User> executors = new HashSet<>();
+    @ManyToMany(fetch = FetchType.LAZY)
+    private List<User> executors = new ArrayList<>();
 
     public String getTitle() {
         return title;
@@ -128,16 +128,17 @@ public class Project extends BaseEntity implements UserContainer {
         this.application = application;
     }
 
-    public Set<User> getExecutors() {
+    public List<User> getExecutors() {
         return executors;
     }
 
-    public void setExecutors(Set<User> executors) {
+    public void setExecutors(List<User> executors) {
         this.executors = executors;
     }
 
     @Override
     public Set<User> getUsers() {
-        return getExecutors();
+        Set<User> users = new HashSet<User>(getExecutors());
+        return users;
     }
 }
diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index 0292f1f..f6ee831 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -6,9 +6,11 @@ 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;
@@ -28,7 +30,7 @@ public class ProjectDto {
     private String applicationFileName;
     private List<Integer> removedDeadlineIds = new ArrayList<>();
     private Set<Integer> executorIds;
-    private Set<UserDto> executors;
+    private List<UserDto> executors;
     private boolean hasAge;
     private boolean hasDegree;
 
@@ -50,7 +52,7 @@ public class ProjectDto {
                       @JsonProperty("repository") String repository,
                       @JsonProperty("deadlines") List<Deadline> deadlines,
                       @JsonProperty("executorIds") Set<Integer> executorIds,
-                      @JsonProperty("executors") Set<UserDto> executors,
+                      @JsonProperty("executors") List<UserDto> executors,
                       @JsonProperty("hasAge") boolean hasAge,
                       @JsonProperty("hasDegree") boolean hasDegree) {
         this.id = id;
@@ -69,6 +71,7 @@ public class ProjectDto {
 
 
     public ProjectDto(Project project) {
+        Set<User> users = new HashSet<User>(project.getExecutors());
         this.id = project.getId();
         this.title = project.getTitle();
         this.status = project.getStatus();
@@ -77,7 +80,7 @@ public class ProjectDto {
         this.grant = project.getGrant() == null ? null : new GrantDto(project.getGrant());
         this.repository = project.getRepository();
         this.deadlines = project.getDeadlines();
-        this.executorIds = convert(project.getExecutors(), user -> user.getId());
+        this.executorIds = convert(users, user -> user.getId());
         this.executors = convert(project.getExecutors(), UserDto::new);
     }
 
@@ -161,11 +164,11 @@ public class ProjectDto {
         this.executorIds = executorIds;
     }
 
-    public Set<UserDto> getExecutors() {
+    public List<UserDto> getExecutors() {
         return executors;
     }
 
-    public void setExecutors(Set<UserDto> executors) {
+    public void setExecutors(List<UserDto> executors) {
         this.executors = executors;
     }
 
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index 2b9e82b..ab2fa91 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -5,7 +5,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.thymeleaf.util.StringUtils;
 import ru.ulstu.deadline.service.DeadlineService;
 import ru.ulstu.file.service.FileService;
-import ru.ulstu.grant.model.GrantDto;
 import ru.ulstu.grant.repository.GrantRepository;
 import ru.ulstu.project.model.Project;
 import ru.ulstu.project.model.ProjectDto;
@@ -19,7 +18,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.TT;
+import static ru.ulstu.project.model.Project.ProjectStatus.TECHNICAL_TASK;
 
 @Service
 public class ProjectService {
@@ -89,7 +88,7 @@ public class ProjectService {
 
     private Project copyFromDto(Project project, ProjectDto projectDto) throws IOException {
         project.setDescription(projectDto.getDescription());
-        project.setStatus(projectDto.getStatus() == null ? TT : 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()));
diff --git a/src/main/resources/db/changelog-20190528_000000-schema.xml b/src/main/resources/db/changelog-20190528_000000-schema.xml
new file mode 100644
index 0000000..02ba642
--- /dev/null
+++ b/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>
diff --git a/src/main/resources/db/changelog-20190528_000001-schema.xml b/src/main/resources/db/changelog-20190528_000001-schema.xml
new file mode 100644
index 0000000..0605b48
--- /dev/null
+++ b/src/main/resources/db/changelog-20190528_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="20190528_000000-1">
+        <createTable tableName="deadline_executors">
+            <column name="deadline_id" type="integer"/>
+            <column name="executors" 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"
+                                 constraintName="fk_user_deadline_executors" referencedTableName="users"
+                                 referencedColumnNames="id"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index b4ce865..fbc1ec3 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -47,4 +47,6 @@
     <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_000001-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/fragments/projectStatusFragment.html b/src/main/resources/templates/projects/fragments/projectStatusFragment.html
index c56958e..bf0d3f6 100644
--- a/src/main/resources/templates/projects/fragments/projectStatusFragment.html
+++ b/src/main/resources/templates/projects/fragments/projectStatusFragment.html
@@ -6,7 +6,7 @@
 <body>
 <span th:fragment="projectStatus (projectStatus)" class="fa-stack fa-1x">
     <th:block th:switch="${projectStatus.name()}">
-        <div th:case="'TT'">
+        <div th:case="'TECHNICAL_TASK'">
             <i class="fa fa-circle fa-stack-2x text-draft"></i>
         </div>
         <div th:case="'OPEN'">

From c25392337a3ababebf34e4c3404f277ab945b184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Tue, 28 May 2019 16:16:41 +0300
Subject: [PATCH 15/17] #98 project deadlines edited

---
 .../ru/ulstu/project/model/ProjectDto.java    | 24 +------------------
 .../ulstu/project/service/ProjectService.java |  8 +++----
 ...l => changelog-20190528_000002-schema.xml} |  6 ++---
 src/main/resources/db/changelog-master.xml    |  2 +-
 .../resources/templates/projects/project.html |  8 +++----
 5 files changed, 13 insertions(+), 35 deletions(-)
 rename src/main/resources/db/{changelog-20190528_000001-schema.xml => changelog-20190528_000002-schema.xml} (87%)

diff --git a/src/main/java/ru/ulstu/project/model/ProjectDto.java b/src/main/java/ru/ulstu/project/model/ProjectDto.java
index f6ee831..affee4e 100644
--- a/src/main/java/ru/ulstu/project/model/ProjectDto.java
+++ b/src/main/java/ru/ulstu/project/model/ProjectDto.java
@@ -31,8 +31,6 @@ public class ProjectDto {
     private List<Integer> removedDeadlineIds = new ArrayList<>();
     private Set<Integer> executorIds;
     private List<UserDto> executors;
-    private boolean hasAge;
-    private boolean hasDegree;
 
     private final static int MAX_EXECUTORS_LENGTH = 40;
 
@@ -52,9 +50,7 @@ public class ProjectDto {
                       @JsonProperty("repository") String repository,
                       @JsonProperty("deadlines") List<Deadline> deadlines,
                       @JsonProperty("executorIds") Set<Integer> executorIds,
-                      @JsonProperty("executors") List<UserDto> executors,
-                      @JsonProperty("hasAge") boolean hasAge,
-                      @JsonProperty("hasDegree") boolean hasDegree) {
+                      @JsonProperty("executors") List<UserDto> executors) {
         this.id = id;
         this.title = title;
         this.status = status;
@@ -65,8 +61,6 @@ public class ProjectDto {
         this.applicationFileName = null;
         this.executorIds = executorIds;
         this.executors = executors;
-        this.hasAge = hasAge;
-        this.hasDegree = hasDegree;
     }
 
 
@@ -172,22 +166,6 @@ public class ProjectDto {
         this.executors = executors;
     }
 
-    public boolean isHasAge() {
-        return hasAge;
-    }
-
-    public void setHasAge(boolean hasAge) {
-        this.hasAge = hasAge;
-    }
-
-    public boolean isHasDegree() {
-        return hasDegree;
-    }
-
-    public void setHasDegree(boolean hasDegree) {
-        this.hasDegree = hasDegree;
-    }
-
     public String getExecutorsString() {
         return StringUtils.abbreviate(executors
                 .stream()
diff --git a/src/main/java/ru/ulstu/project/service/ProjectService.java b/src/main/java/ru/ulstu/project/service/ProjectService.java
index ab2fa91..fe8813c 100644
--- a/src/main/java/ru/ulstu/project/service/ProjectService.java
+++ b/src/main/java/ru/ulstu/project/service/ProjectService.java
@@ -110,8 +110,8 @@ public class ProjectService {
     }
 
     public void removeDeadline(ProjectDto projectDto, Integer deadlineId) {
-        if (projectDto.getDeadlines().get(deadlineId).getId() != null) {
-            projectDto.getRemovedDeadlineIds().add(projectDto.getDeadlines().get(deadlineId).getId());
+        if (deadlineId != null) {
+            projectDto.getRemovedDeadlineIds().add(deadlineId);
         }
         projectDto.getDeadlines().remove((int) deadlineId);
     }
@@ -121,8 +121,8 @@ public class ProjectService {
     }
 
     public List<User> getProjectExecutors(ProjectDto projectDto) {
-        List<User> filteredUsers = userService.filterByAgeAndDegree(projectDto.isHasAge(), projectDto.isHasDegree());
-        return filteredUsers;
+        List<User> users = userService.findAll();
+        return users;
     }
 
 }
diff --git a/src/main/resources/db/changelog-20190528_000001-schema.xml b/src/main/resources/db/changelog-20190528_000002-schema.xml
similarity index 87%
rename from src/main/resources/db/changelog-20190528_000001-schema.xml
rename to src/main/resources/db/changelog-20190528_000002-schema.xml
index 0605b48..7df707c 100644
--- a/src/main/resources/db/changelog-20190528_000001-schema.xml
+++ b/src/main/resources/db/changelog-20190528_000002-schema.xml
@@ -2,15 +2,15 @@
 <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">
+    <changeSet author="anton" id="20190528_000000-3">
         <createTable tableName="deadline_executors">
             <column name="deadline_id" type="integer"/>
-            <column name="executors" 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"
+        <addForeignKeyConstraint baseTableName="deadline_executors" baseColumnNames="executors_id"
                                  constraintName="fk_user_deadline_executors" referencedTableName="users"
                                  referencedColumnNames="id"/>
     </changeSet>
diff --git a/src/main/resources/db/changelog-master.xml b/src/main/resources/db/changelog-master.xml
index fbc1ec3..c8a6e63 100644
--- a/src/main/resources/db/changelog-master.xml
+++ b/src/main/resources/db/changelog-master.xml
@@ -48,5 +48,5 @@
     <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_000001-schema.xml"/>
+    <include file="db/changelog-20190528_000002-schema.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/templates/projects/project.html b/src/main/resources/templates/projects/project.html
index 304fed0..2c4a67b 100644
--- a/src/main/resources/templates/projects/project.html
+++ b/src/main/resources/templates/projects/project.html
@@ -92,11 +92,11 @@
                                         </div>
                                         <div class="col-12" style="margin-bottom: 15px;"></div>
                                         <div class="col-10 div-deadline-executor">
-                                            <select class="selectpicker form-control" data-live-search="true"
+                                            <select class="selectpicker form-control" multiple="true" data-live-search="true"
                                                     title="-- Выберите исполнителя --" id="executors"
-                                                    th:field="*{deadlines[__${rowStat.index}__].executor}" data-size="5">
-                                                <option th:each="executor : ${allExecutors}" th:value="${executor.id}"
-                                                        th:text="${executor.lastName}"> Участник
+                                                    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>

From 8ffafd669328c16d759e37d91fb04cfe32cb07ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Tue, 28 May 2019 16:46:12 +0300
Subject: [PATCH 16/17] #98 deadline imports edited

---
 src/main/java/ru/ulstu/deadline/model/Deadline.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index 97b6441..d9f2373 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -6,7 +6,11 @@ import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.core.model.BaseEntity;
 import ru.ulstu.user.model.User;
 
-import javax.persistence.*;
+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;
@@ -20,7 +24,7 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
-    @OneToMany(targetEntity=User.class, fetch=FetchType.EAGER)
+    @OneToMany(targetEntity=User.class, fetch= FetchType.EAGER)
     private List<User> executors;
 
     private Boolean done;

From 77ce908d584caf5d4346c0929b22744037319c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BD=20=D0=90=D0=BD=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BD?= <a.vasin@mediasoft.team>
Date: Tue, 28 May 2019 16:55:08 +0300
Subject: [PATCH 17/17] #98 deadline edited

---
 src/main/java/ru/ulstu/deadline/model/Deadline.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/ulstu/deadline/model/Deadline.java b/src/main/java/ru/ulstu/deadline/model/Deadline.java
index d9f2373..17287a8 100644
--- a/src/main/java/ru/ulstu/deadline/model/Deadline.java
+++ b/src/main/java/ru/ulstu/deadline/model/Deadline.java
@@ -24,7 +24,7 @@ public class Deadline extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
-    @OneToMany(targetEntity=User.class, fetch= FetchType.EAGER)
+    @OneToMany(targetEntity = User.class, fetch = FetchType.EAGER)
     private List<User> executors;
 
     private Boolean done;