From 1e6b3cba3acc74c7777e27ef43f4cfe2e5509c12 Mon Sep 17 00:00:00 2001
From: T-Midnight <belousovatanya1995@yandex.ru>
Date: Wed, 17 Apr 2019 13:25:10 +0400
Subject: [PATCH] #42 delete blank lines, fix js, fix leaderId validation

---
 .../grant/controller/GrantController.java     |  6 ++--
 .../resources/templates/grants/grant.html     | 28 ++++++++-----------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/controller/GrantController.java b/src/main/java/ru/ulstu/grant/controller/GrantController.java
index 82fc80e..0731188 100644
--- a/src/main/java/ru/ulstu/grant/controller/GrantController.java
+++ b/src/main/java/ru/ulstu/grant/controller/GrantController.java
@@ -61,10 +61,10 @@ public class GrantController {
             throws IOException {
         filterEmptyDeadlines(grantDto);
         if (grantDto.getDeadlines().isEmpty()) {
-            errors.rejectValue("deadlines", "errorCode", "Не может быть пустым");
+            errors.rejectValue("deadlines", "errorCode", "Не может быть пусто");
         }
-        if (grantDto.getLeaderId().equals(null)) {
-            errors.rejectValue("leader", "errorCode", "Укажите руководителя");
+        if (grantDto.getLeaderId().equals(-1)) {
+            errors.rejectValue("leaderId", "errorCode", "Укажите руководителя");
         }
         if (errors.hasErrors()) {
             return GRANT_PAGE;
diff --git a/src/main/resources/templates/grants/grant.html b/src/main/resources/templates/grants/grant.html
index 4a45cad..91a9c6d 100644
--- a/src/main/resources/templates/grants/grant.html
+++ b/src/main/resources/templates/grants/grant.html
@@ -33,7 +33,6 @@
                                        class="alert alert-danger">Incorrect title</p>
                                     <p class="help-block text-danger"></p>
                                 </div>
-
                                 <div class="form-group">
                                     <label for="status">Статус:</label>
                                     <select class="form-control" th:field="*{status}" id="status">
@@ -42,13 +41,11 @@
                                         </option>
                                     </select>
                                 </div>
-
                                 <div class="form-group">
                                     <label for="comment">Комментарий:</label>
                                     <textarea class="form-control" rows="3" id="comment"
                                               th:field="*{comment}"></textarea>
                                 </div>
-
                                 <div class="form-group">
                                     <label>Дедлайны показателей:</label>
                                     <div class="row" th:each="deadline, rowStat : *{deadlines}">
@@ -77,7 +74,6 @@
                                     <input type="submit" id="addDeadline" name="addDeadline" class="btn btn-primary"
                                            value="Добавить дедлайн"/>
                                 </div>
-
                                 <div class="form-group">
                                     <label for="loader">Загрузить заявку:</label>
                                     <div id="loader">
@@ -91,7 +87,8 @@
                                        aria-expanded="false"
                                        aria-controls="collapse-filter">Фильтр рабочей группы
                                 </label>
-                                <div th:class="${grantDto.wasLeader || grantDto.birthDate || grantDto.degree} ? 'form-check' : 'form-check collapse'" id="collapse-filter">
+                                <div th:class="${grantDto.wasLeader || grantDto.birthDate || grantDto.degree} ?
+                                                'form-check' : 'form-check collapse'" id="collapse-filter">
                                     <div class="row">
                                         <div class="col">
                                             <input class="form-check-input" type="checkbox" id="f1"
@@ -130,17 +127,21 @@
                                            value="Применить фильтр"/>
                                     <hr/>
                                 </div>
-
                                 <div class="form-group">
                                     <label>Руководитель проекта:</label>
-                                    <select class="form-control" th:field="*{leaderId}" id="leader"
+                                    <select class="form-control" th:field="*{leaderId}" id="leaderId"
                                             onchange="updateAuthors();">
+                                        <option selected="selected" hidden="hidden" th:value="-1">-- Выберите
+                                            руководителя --
+                                        </option>
                                         <option th:each="leader : ${allAuthors}" th:value="${leader.id}"
                                                 th:text="${leader.lastName}"> Руководитель
                                         </option>
                                     </select>
+                                    <p th:if="${#fields.hasErrors('leaderId')}" th:errors="*{leaderId}"
+                                       class="alert alert-danger">Choose leader</p>
+                                    <p class="help-block text-danger"></p>
                                 </div>
-
                                 <div class="form-group">
                                     <label>Участники гранта:</label>
                                     <select class="selectpicker form-control" multiple="true"
@@ -150,17 +151,13 @@
                                                 th:text="${author.lastName}"> Участник
                                         </option>
                                     </select>
-                                    <p th:if="${#fields.hasErrors('authorIds')}" th:errors="*{authorIds}"
-                                       class="alert alert-danger">Incorrect member</p>
                                 </div>
-
                                 <div class="form-group">
                                     <label>Список статей:</label>
                                     <p><a href="./#" class="btn btn-primary"><i class="fa fa-plus-circle"
                                                                                 aria-hidden="true">
                                     </i> Добавить статью</a></p>
                                 </div>
-
                                 <div class="form-group">
                                     <div th:if="*{project} == null">
                                         <input type="submit" name="createProject" class="btn btn-primary"
@@ -169,7 +166,6 @@
                                     <input type = "hidden" th:field="*{project.id}"/>
                                 </div>
                             </div>
-
                             <div class="clearfix"></div>
                             <div class="col-lg-12">
                                 <div class="form-group">
@@ -212,10 +208,8 @@
             $("#authors").val('default');
             $("#authors").selectpicker("refresh");
             $("#authors").children('option:disabled').prop('disabled', false);
-
-            var lid = document.getElementById("leader");
-            var aut = document.getElementById("authors");
-            aut.options[lid.selectedIndex].disabled="disabled";
+            var lid = $("#leaderId option:selected").val();
+            $("#authors [value='" + lid + "']").attr("disabled", "disabled");
         }
     </script>
 </div>