added values required and fixed date so time in no longer shown

WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp

@@ -8,6 +8,7 @@
     <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
     <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
     <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+    <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
     <style>
     #con {
@@ -25,28 +26,29 @@
 <div class="jumbotron" id="con">
 <center><h2>Deficiency List</h2></center>
 	<div style="margin: 2%">
-	<legend>Work Assigned to ${deficiency.constructionPersonnel}</legend>
+	<legend>Work Assigned to ${constructionPersonnel}</legend>
 		<div class="list-group">
 		<table class="table table-striped table-hover">
 		  <thead>
 		    <tr>
-		    <th>Project</th>
+		      <th>Project</th>
 		      <th>Unit</th>
 		      <th>Location</th>
 		      <th>Deficiency Type</th>
 		      <th>Notes</th>
-		      <th></th>
+		      <th>Deadline</th>
 		      <th></th>
 		    </tr>
 		  </thead>
 		  <tbody>
 			<c:forEach var="deficiency" items="${deficiencyList}">
 				<tr>
-				<td>${deficiency.id}</td>
-				<td>${deficiency.id}</td>
+				<td>${deficiency.projectName}</td>
+				<td>${deficiency.unitNum}</td>
 				<td>${deficiency.location}</td>
 				<td>${deficiency.category}</td>
 				<td>${deficiency.description}</td>
+				<td><fmt:formatDate value="${deficiency.deadline}" pattern="yyyy-MM-dd" /></td>
 				<td>
 					<c:choose>
 	              <c:when test="${deficiency.status}">

src/ca/sheridancollege/beans/ConstructionPersonnelDeficiencies.java

@@ -0,0 +1,158 @@
+package ca.sheridancollege.beans;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Created by Perds on 11/17/2016.
+ */
+public class ConstructionPersonnelDeficiencies {
+
+    private int id;
+    private String location;
+    private String description;
+    private String constructionPersonnel;
+    private String category;
+    private Date deadline;
+    private Boolean status;
+    private long homeEnrollmentNumber;
+    private int lotNumber;
+    private String address;
+    private String projectName;
+    private Date posessionDate;
+    private int unitNum;
+    private String plan;
+
+    public ConstructionPersonnelDeficiencies() {
+    }
+
+    public ConstructionPersonnelDeficiencies(Deficiency d, Unit u) {
+        id = d.getId();
+        location = d.getLocation();
+        description = d.getDescription();
+        constructionPersonnel = d.getConstructionPersonnel();
+        category = d.getCategory();
+        deadline = d.getDeadline();
+        status = d.getStatus();
+        homeEnrollmentNumber = u.getHomeEnrollmentNumber();
+        lotNumber = u.getLotNumber();
+        address = u.getAddress();
+        projectName = u.getProjectName();
+        posessionDate = u.getPosessionDate();
+        unitNum = u.getUnitNum();
+        plan = u.getPlan();
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getConstructionPersonnel() {
+        return constructionPersonnel;
+    }
+
+    public void setConstructionPersonnel(String constructionPersonnel) {
+        this.constructionPersonnel = constructionPersonnel;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public Date getDeadline() {
+        return deadline;
+    }
+
+    public void setDeadline(Date deadline) {
+        this.deadline = deadline;
+    }
+
+    public Boolean getStatus() {
+        return status;
+    }
+
+    public void setStatus(Boolean status) {
+        this.status = status;
+    }
+
+    public long getHomeEnrollmentNumber() {
+        return homeEnrollmentNumber;
+    }
+
+    public void setHomeEnrollmentNumber(long homeEnrollmentNumber) {
+        this.homeEnrollmentNumber = homeEnrollmentNumber;
+    }
+
+    public int getLotNumber() {
+        return lotNumber;
+    }
+
+    public void setLotNumber(int lotNumber) {
+        this.lotNumber = lotNumber;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public Date getPosessionDate() {
+        return posessionDate;
+    }
+
+    public void setPosessionDate(Date posessionDate) {
+        this.posessionDate = posessionDate;
+    }
+
+    public int getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(int unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public String getPlan() {
+        return plan;
+    }
+
+    public void setPlan(String plan) {
+        this.plan = plan;
+    }
+}

src/ca/sheridancollege/services/ControllerServices.java

@@ -178,7 +178,7 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate
 
         return model;
     }
-    
+
     public Model saveUnit2(Model model, long homeEnrollmentNumber, Date posessionDate, int lotNumber, String address, String projectName, String municipality, int level, int unitNum, String plan, String repName) {
         Unit unit = new Unit(homeEnrollmentNumber, lotNumber, address, projectName, posessionDate, municipality, level, unitNum, plan);
 
@@ -488,19 +488,20 @@ public Model displayConstructionPersonnel(Model model) {
     }
 
     public Model displayDeficienciesByConstructionPersonnel(Model model, int id) {
-        List<Deficiency> deficiencyList = new ArrayList<>();
+        List<ConstructionPersonnelDeficiencies> deficiencyList = new ArrayList<>();
         List<Unit> unitList = dao.getAllUnits();
         List<ConstructionPersonnel> constructionPersonnelList = dao.getConstructionPersonnel(id);
         ConstructionPersonnel constructionPersonnel = constructionPersonnelList.get(0);
 
         for (Unit unit : unitList) {
             for (Deficiency deficiency : unit.getDeficiencies()) {
                 if (deficiency.getConstructionPersonnel().equals(constructionPersonnel.getName())) {
-                    deficiencyList.add(deficiency);
+                    deficiencyList.add(new ConstructionPersonnelDeficiencies(deficiency, unit));
                 }
             }
         }
 
+        model.addAttribute("constructionPersonnel", constructionPersonnel.getName());
         model.addAttribute("deficiencyList", deficiencyList);
 
         return model;