added validation to revision

cypo721 · Jan 13, 2017 · 2004941 · 2004941
1 parent ccb1065
commit 2004941
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 7 deletions.
diff --git a/web/src/main/java/controllers/RevisionController.java b/web/src/main/java/controllers/RevisionController.java
@@ -78,10 +78,18 @@ public String submitNew(@ModelAttribute("revision") RevisionCreateDTO revisionDT
 
  if (revisionDTO.getDateOfRevision() != null && !revisionDTO.getDateOfRevision().trim().isEmpty()) {
  revision.setDateOfRevision(parser.parse(revisionDTO.getDateOfRevision().trim()));
+ } else {
+ redirectAttributes.addFlashAttribute("alert_danger", "\"Date of revision\" cannot be empty.");
+ redirectAttributes.addFlashAttribute("revision", revisionDTO);
+ return "redirect:new";
  }
 
  if (revisionDTO.getInfo() != null && !revisionDTO.getInfo().trim().isEmpty()) {
  revision.setInfo(revisionDTO.getInfo());
+ } else {
+ redirectAttributes.addFlashAttribute("alert_danger", "\"Info\" cannot be empty.");
+ redirectAttributes.addFlashAttribute("revision", revisionDTO);
+ return "redirect:new";
  }
 
  if (revisionDTO.getMachine() != null && !revisionDTO.getMachine().trim().isEmpty()) {
@@ -125,13 +133,17 @@ public String submitEdit(@PathVariable long id,
  RevisionDTO revision = revisionFacade.findById(id);
 
  SimpleDateFormat parser = new SimpleDateFormat("yyyy-MM-dd");
-
+ 
  if (revisionDTO.getDateOfRevision() != null && !revisionDTO.getDateOfRevision().trim().isEmpty()) {
  revision.setDateOfRevision(parser.parse(revisionDTO.getDateOfRevision().trim()));
  }
-  
- if (revisionDTO.getInfo() != null) {
+
+ if (revisionDTO.getInfo() != null && !revisionDTO.getInfo().trim().isEmpty()) {
  revision.setInfo(revisionDTO.getInfo());
+ } else {
+ redirectAttributes.addFlashAttribute("alert_danger", "\"Info\" cannot be empty.");
+ redirectAttributes.addFlashAttribute("revision", revisionDTO);
+ return "redirect:" + uriBuilder.path("/revision/edit/{id}").buildAndExpand(id).encode().toUriString(); 
  }
 
  if (revisionDTO.getMachine() != null && !revisionDTO.getMachine().trim().isEmpty()) {

diff --git a/web/src/main/java/validators/RevisionDtoValidator.java b/web/src/main/java/validators/RevisionDtoValidator.java
@@ -0,0 +1,22 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package validators;
+
+import org.springframework.validation.Errors;
+
+/**
+ *
+ * @author eduard
+ */
+public class RevisionDtoValidator {
+ public boolean supports(Class<?> clazz) {
+ return false;
+ }
+
+ public void validate(Object target, Errors errors) {
+
+ }
+}
diff --git a/web/src/main/webapp/WEB-INF/jsp/revision/edit.jsp b/web/src/main/webapp/WEB-INF/jsp/revision/edit.jsp
@@ -3,19 +3,21 @@
 <%@ taglib tagdir="/WEB-INF/tags" prefix="my" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="form" uri="https://www.springframework.org/tags/form" %>
-<my:template title="Edit rental">
+<my:template title="Edit revision">
 <jsp:attribute name="body">
 
 <div class="container">
  <div class="col-md-4">
  <form:form method="post" modelAttribute="revision" action="${editAction}">
  <div class="form-group">
- <label for="dateOfRevision">Date of Revision</label>
- <form:input path="dateOfRevision" cssClass="form-control" id="dateOfRevision" placeholder="dateOfRevision" value="${revision.dateOfRevision}"/>
+ <label for="dateOfRevision">Date of revision (YYYY-MM-DD)</label>
+ <form:input type="date" path="dateOfRevision" cssClass="form-control" id="dateOfRevision" placeholder="Date of revision"/>
+ <p><form:errors path="dateOfRevision" cssClass="error" /></p>
  </div>
  <div class="form-group">
  <label for="info">Info</label>
- <form:input path="info" cssClass="form-control" id="info" placeholder="info" value="${revision.info}"/>
+ <form:input path="info" cssClass="form-control" id="info" placeholder="Info"/>
+ <p><form:errors path="info" cssClass="error" /></p>
  </div>
  <div class="form-group">
  <label for="price">Machine</label>

diff --git a/web/src/main/webapp/WEB-INF/jsp/revision/new.jsp b/web/src/main/webapp/WEB-INF/jsp/revision/new.jsp
@@ -11,10 +11,12 @@
  <div class="form-group">
  <label for="dateOfRevision">Date of revision (YYYY-MM-DD)</label>
  <form:input type="date" path="dateOfRevision" cssClass="form-control" id="dateOfRevision" placeholder="Date of revision"/>
+ <p><form:errors path="dateOfRevision" cssClass="error" /></p>
  </div>
  <div class="form-group">
  <label for="info">Info</label>
  <form:input path="info" cssClass="form-control" id="info" placeholder="Info"/>
+ <p><form:errors path="info" cssClass="error" /></p>
  </div>
  <div class="form-group">
  <label for="price">Machine</label>