Merge branch '125-bug-date-conf' into 'dev'

Resolve "Bug: ошибка при попытке сохранить конференцию с невыбранными датами"

Closes #125

See merge request romanov73/ng-tracker!103

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

@@ -92,6 +92,7 @@ public class ConferenceService extends BaseService {
         conferenceDto.setName(conferenceDto.getTitle());
         filterEmptyDeadlines(conferenceDto);
         checkEmptyFieldsOfDeadline(conferenceDto, errors);
+        checkEmptyFieldsOfDates(conferenceDto, errors);
         checkUniqueName(conferenceDto,
                 errors,
                 conferenceDto.getId(),
@@ -301,6 +302,12 @@ public class ConferenceService extends BaseService {
         }
     }
 
+    private void checkEmptyFieldsOfDates(ConferenceDto conferenceDto, Errors errors) {
+        if (conferenceDto.getBeginDate() == null || conferenceDto.getEndDate() == null) {
+            errors.rejectValue("beginDate", "errorCode", "Даты должны быть заполнены");
+        }
+    }
+
     public void filterEmptyDeadlines(ConferenceDto conferenceDto) {
         conferenceDto.setDeadlines(conferenceDto.getDeadlines().stream()
                 .filter(dto -> dto.getDate() != null || !org.springframework.util.StringUtils.isEmpty(dto.getDescription()))

src/main/resources/templates/conferences/conference.html

@@ -42,12 +42,20 @@
                                            placeholder="http://"/>
                                 </div>
 
+                                <p th:if="${#fields.hasErrors('url')}" th:errors="*{url}"
+                                   class="alert alert-danger">Incorrect description</p>
+                                <p class="help-block text-danger"></p>
+
                                 <div class="form-group">
                                     <label for="description">Описание:</label>
                                     <textarea class="form-control" rows="8" th:field="*{description}" id="description">
                                     </textarea>
                                 </div>
 
+                                <p th:if="${#fields.hasErrors('description')}" th:errors="*{description}"
+                                   class="alert alert-danger">Incorrect description</p>
+                                <p class="help-block text-danger"></p>
+
                                 <div class="form-group">
                                     <label for="deadlines">Дедлайны:</label>
                                     <div class="deadline-list form-control list-group" id="deadlines">
@@ -65,6 +73,7 @@
                                         </div>
                                     </div>
                                 </div>
+
                                 <p th:if="${#fields.hasErrors('deadlines')}" th:errors="*{deadlines}"
                                    class="alert alert-danger">Incorrect title</p>
                                 <p class="help-block text-danger"></p>
@@ -94,6 +103,10 @@
                                         </div>
                                     </div>
                                 </div>
+                                <p th:if="${#fields.hasErrors('beginDate') || #fields.hasErrors('endDate')}"
+                                   th:errors="*{beginDate}"
+                                   class="alert alert-danger">Incorrect date</p>
+                                <p class="help-block text-danger"></p>
 
                                 <div class="form-group">
                                     <label for="members">Участники:</label>
@@ -123,7 +136,6 @@
                                 </div>
 
                                 <div class="form-group d-flex justify-content-between flex-wrap">
-                                    <!--<input type="hidden" th:value="*{ping}" th:name="ping"/>-->
                                     <input id="ping-button" class="btn btn-primary"
                                            type="submit" name="pingConference" value="Ping участникам"
                                            th:disabled="*{id == null ? 'true' : 'false'}"/>