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] #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="Добавить дедлайн"/>