From a62e4c9523c70fef481f84736d84575c93779701 Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Fri, 11 Nov 2016 11:07:28 -0500
Subject: [PATCH 01/22] fixed some bugs

---
 WebContent/WEB-INF/jsps/addSignOff.jsp                      | 2 +-
 WebContent/WEB-INF/jsps/buildInspection.jsp                 | 6 +++---
 src/ca/sheridancollege/controllers/HomeController.java      | 2 +-
 src/ca/sheridancollege/services/ControllerServices.java     | 6 +++++-
 .../classes/ca/sheridancollege/config/security-context.xml  | 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp
index a1e37f9..870bbd3 100644
--- a/WebContent/WEB-INF/jsps/addSignOff.jsp
+++ b/WebContent/WEB-INF/jsps/addSignOff.jsp
@@ -143,7 +143,7 @@
 				<div class="form-group">
 			        <c:url value="/" var="home" />
 			        <input type="submit" value="Save and Proceed" id="btnXlg2" class="pull-right btn btn-success" />
-				<!-- <a href="${home}" class="pull-right btn btn-success" id="btnXlg2">Finish</a> -->
+				<!-- <a href="${home}" class="pull-right btn btn-success" id="saveBtn">Finish</a> -->
 				</fieldset>
 </form>
 				</div>
diff --git a/WebContent/WEB-INF/jsps/buildInspection.jsp b/WebContent/WEB-INF/jsps/buildInspection.jsp
index 964a667..4a3f03e 100644
--- a/WebContent/WEB-INF/jsps/buildInspection.jsp
+++ b/WebContent/WEB-INF/jsps/buildInspection.jsp
@@ -33,7 +33,7 @@
 #topEntry{
 	margin: 1%;
 }
-#saveBtn{
+#saveBtn2{
     padding: 24px 34px;
     font-size: 16px;
     line-height: normal;
@@ -231,8 +231,8 @@
 <br>
 				<div class="form-group">
 			        <c:url value="/displayUnitDeficiencies2/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies2" />
-				<!-- 	<a href="${displayUnitDeficiencies2}" class="pull-right btn btn-success" id="nextBtn">Next</a> -->
-					<input type="submit" value="Save and Proceed" class="pull-right btn btn-success" id="saveBtn"/>
+				<!-- 	<a href="${displayUnitDeficiencies2}" class="pull-right btn btn-success" id="nextBtn2">Next</a> -->
+					<input type="submit" value="Save and Proceed" class="pull-right btn btn-success" id="saveBtn2"/>
 				<br />
 				<br />
 				
diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java
index 7b6ea5f..6e63bca 100644
--- a/src/ca/sheridancollege/controllers/HomeController.java
+++ b/src/ca/sheridancollege/controllers/HomeController.java
@@ -299,7 +299,7 @@ public String saveUnit2(
 
         model = controllerServices.saveUnit2(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, municipality, level, unitNum, plan, repName);
 
-        return "buildInspection";
+        return "addDeficiency2";
     }
 
     @RequestMapping("/addSignOff/{homeEnrollmentNumber}")
diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java
index 4233002..0614c35 100644
--- a/src/ca/sheridancollege/services/ControllerServices.java
+++ b/src/ca/sheridancollege/services/ControllerServices.java
@@ -446,7 +446,11 @@ public Model displayPdiReport(Model model, long homeEnrollmentNumber) {
             List<Form> form = dao.getForm(homeEnrollmentNumber);
             List<Builder> builder = dao.getBuilderRefNum("batman");
 
-            model.addAttribute("form", form.get(0));
+            if (form.size() > 0) {
+                model.addAttribute("form", form.get(0));
+            } else {
+                model.addAttribute("errorForm", true);
+            }
             model.addAttribute("unit", unit.get(0));
             model.addAttribute("builder", builder.get(0));
 
diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml
index c660964..c841b82 100644
--- a/target/classes/ca/sheridancollege/config/security-context.xml
+++ b/target/classes/ca/sheridancollege/config/security-context.xml
@@ -57,7 +57,7 @@
         <security:intercept-url pattern="/displayDeficiencies/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/css/**" access="permitAll"/>
         <security:intercept-url pattern="/scripts/**" access="permitAll"/>
-        <security:intercept-url pattern="/images/**" access="permitAll"/>
+        <security:intercept-url pattern="/img/**" access="permitAll"/>
         <security:intercept-url pattern="/" access="permitAll"/>
         <security:intercept-url pattern="/login" access="permitAll"/>
         <security:intercept-url pattern="/register" access="permitAll"/>

From 3a68d781b27512751da36c82eb99cd31f97d5bdd Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Fri, 11 Nov 2016 11:39:21 -0500
Subject: [PATCH 02/22] fixed some bugs

---
 .../controllers/HomeController.java           |   2 +-
 .../controllers/HomeController.class          | Bin 13584 -> 13584 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java
index 6e63bca..9fae4c2 100644
--- a/src/ca/sheridancollege/controllers/HomeController.java
+++ b/src/ca/sheridancollege/controllers/HomeController.java
@@ -299,7 +299,7 @@ public String saveUnit2(
 
         model = controllerServices.saveUnit2(model, homeEnrollmentNumber, posessionDate, lotNumber, address, projectName, municipality, level, unitNum, plan, repName);
 
-        return "addDeficiency2";
+        return "displayUnitDeficiencies2";
     }
 
     @RequestMapping("/addSignOff/{homeEnrollmentNumber}")
diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class
index 1b912492b77a773f1067584161c398cd0e490947..4d8a823b0fb33b6945359667549ee83886661bf9 100644
GIT binary patch
delta 14
VcmbP`H6d%m1YO4J%@cL&*#R&v1=Rom

delta 14
WcmbP`H6d%m1YO3*n<whlvjYG!o(4St


From ebde78f52a075ec28abab824ecd0890ce02f50e6 Mon Sep 17 00:00:00 2001
From: catpoehlman <cat.poehlman@gmail.com>
Date: Fri, 11 Nov 2016 12:09:02 -0500
Subject: [PATCH 03/22] sigs working

---
 WebContent/WEB-INF/jsps/pdiReport.jsp                   | 4 ++--
 src/ca/sheridancollege/controllers/HomeController.java  | 2 +-
 src/ca/sheridancollege/services/ControllerServices.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/pdiReport.jsp b/WebContent/WEB-INF/jsps/pdiReport.jsp
index 76fa73a..f6f0452 100644
--- a/WebContent/WEB-INF/jsps/pdiReport.jsp
+++ b/WebContent/WEB-INF/jsps/pdiReport.jsp
@@ -177,7 +177,7 @@ label {
 					placeholder="" type="text" required="required" value="${form.repName}"  readonly/>
 			</div>
 			<div class="col-lg-6" id="sig" style="margin: 2%">
-				<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}/2" />
+				<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}" />
 			</div>
 				<div>		
 					<label for="id" class="pull-right control-label" style="margin: 2%">This section
@@ -206,7 +206,7 @@ label {
 					</div>
 			
 					<div class="col-lg-6" id="sig" id="sig" style="margin: 2%">
-						<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}" />
+						<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}/2" />
 					</div>
 				</div>
 				<div class="col-lg-12 col-md-12 col-sm-12">
diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java
index 7b6ea5f..08010ee 100644
--- a/src/ca/sheridancollege/controllers/HomeController.java
+++ b/src/ca/sheridancollege/controllers/HomeController.java
@@ -391,7 +391,7 @@ public void getImage(HttpServletResponse response, @PathVariable long homeEnroll
     @RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}/2")
     public void getImage2(HttpServletResponse response, @PathVariable long homeEnrollmentNumber) throws IOException {
 
-        response = controllerServices.getImage(response, homeEnrollmentNumber);
+        response = controllerServices.getImage2(response, homeEnrollmentNumber);
     }
 
     @RequestMapping("/displayDeficiencies/{id}")
diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java
index 4233002..7fab2d0 100644
--- a/src/ca/sheridancollege/services/ControllerServices.java
+++ b/src/ca/sheridancollege/services/ControllerServices.java
@@ -234,7 +234,7 @@ public Model saveForm(Model model, long homeEnrollmentNumber, String desName) {
 
         addSignOff.setDesName(desName);
 
-        File sig = new File("C:\\abode\\purSig.png");
+        File sig = new File("C:\\abode\\refSig.png");
         byte[] sigImg = new byte[(int) sig.length()];
 
         try {

From dfb6a7cc516bf485f0584aea5be65cd6a65bf38f Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Thu, 17 Nov 2016 11:46:51 -0500
Subject: [PATCH 04/22] added values required and fixed date so time in no
 longer shown

---
 ...splayConstructionPersonnelDeficiencies.jsp |  11 +-
 .../ConstructionPersonnelDeficiencies.java    | 158 ++++++++++++++++++
 .../services/ControllerServices.java          |   7 +-
 .../controllers/HomeController.class          | Bin 13584 -> 13594 bytes
 4 files changed, 169 insertions(+), 7 deletions(-)
 create mode 100644 src/ca/sheridancollege/beans/ConstructionPersonnelDeficiencies.java

diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
index 673c5fa..59de8d9 100644
--- a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
+++ b/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,16 +26,17 @@
 <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>Deadline</th>
 		      <th></th>
 		      <th></th>
 		    </tr>
@@ -42,11 +44,12 @@
 		  <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}">
diff --git a/src/ca/sheridancollege/beans/ConstructionPersonnelDeficiencies.java b/src/ca/sheridancollege/beans/ConstructionPersonnelDeficiencies.java
new file mode 100644
index 0000000..3943c36
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java
index 00b4232..32cfc50 100644
--- a/src/ca/sheridancollege/services/ControllerServices.java
+++ b/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,7 +488,7 @@ 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);
@@ -496,11 +496,12 @@ public Model displayDeficienciesByConstructionPersonnel(Model model, int id) {
         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;
diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class
index 4d8a823b0fb33b6945359667549ee83886661bf9..0e1dbfe93aeab52a7f89f73dac41e234d1a7136b 100644
GIT binary patch
delta 140
zcmbP`H7kqj)W2Q(7#J8#7_ByPIY{$zF^Dtj@-S*KsxvZZP2MOiJUKx+m(7TWQIFAh
zvH*wD<ge0(j3%4aW%h_O>P&uOY|pI6s6Y9mf(R3%!DJf~RYt?fNhXerCX@Me#Dp15
p8F+zaTQD#(Fac>6VMepbXH5)*&4C;yMhgZdAkD_W$Y{yH0025w8?XQX

delta 126
zcmbQ0H6e@Z)W2Q(7#J8#7%et(IY>_qk#1%);9=BZG@LBJp)~owv>~I>W<!}h;*(R2
zg(m+u)??OT)SbM*NR&};a)Z3s<QNlvM*Yb-CXS3olP?;I3mG%;0!_1EU}Rtd(k#M^
bCX=t57zmpJIZTXZ3`#(nje(KToPhxVzpWf!


From d14909cf0c6e9b6a3d1b585d68df881c7c1b55f8 Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Thu, 17 Nov 2016 11:50:28 -0500
Subject: [PATCH 05/22] formatting change

---
 .../WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
index 59de8d9..8a2d3bf 100644
--- a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
@@ -38,7 +38,6 @@
 		      <th>Notes</th>
 		      <th>Deadline</th>
 		      <th></th>
-		      <th></th>
 		    </tr>
 		  </thead>
 		  <tbody>

From 51256d8be63133427b557395a1fc150a9bd2b7c4 Mon Sep 17 00:00:00 2001
From: catpoehlman <cat.poehlman@gmail.com>
Date: Thu, 17 Nov 2016 12:14:22 -0500
Subject: [PATCH 06/22] Photos save to db Just need to call them now

---
 WebContent/WEB-INF/jsps/addDeficiency.jsp     | 86 ++++++++++++++-----
 .../WEB-INF/jsps/displayUnitDeficiencies.jsp  |  4 +
 src/ca/sheridancollege/beans/Deficiency.java  | 12 +++
 .../services/ControllerServices.java          | 14 +++
 4 files changed, 95 insertions(+), 21 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp
index 9d78b48..367163a 100644
--- a/WebContent/WEB-INF/jsps/addDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp
@@ -5,7 +5,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" %>
-
+<script src="../scripts/photo.js"></script>
 <style>
 @import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
 @import url('https://fonts.googleapis.com/icon?family=Material+Icons');
@@ -201,6 +201,7 @@ h3{
 <title>Add Deficiency: ${unit.homeEnrollmentNumber}</title>
 
 <script>
+var save = false;
     function Validate() {
             if (ValidateCategories() && ValidateLocation()) {
                 return true;
@@ -240,6 +241,18 @@ h3{
                 return true;
             }
         }
+        
+        function saveDone(){
+        	save =true;
+        	var id = document.getElementById("id");
+        	var hen = document.getElementByName("homeEnrollmentNumber");
+			document.getElementById("defPhoto").value = "def"+id+"hen"+hen;
+        	//alert("test");
+        }
+        
+        function reallyClose() {
+            confirm("You have not saved a photo. Are you sure you want to leave?");
+        }
 </script>
 
 	<div style="margin: 2%">
@@ -293,6 +306,18 @@ h3{
 					</div>
 				</div>
 				
+				<div class="form-group">
+                	<label for="defPhoto" class="col-lg-1 control-label">Deficiency Photo</label>
+                	<div class="col-lg-8">
+                		<input path="defPhoto" name="defPhoto" class="form-control" id="defPhoto" readonly/> 
+                	</div>
+                	<div class="col-lg-2">
+					<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">
+                    Add Photo
+                  </button>
+					</div>
+                </div>
+				
 				<div class="form-group">
 					<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
 					<div class="col-lg-10">
@@ -325,29 +350,48 @@ h3{
 			    <a href="${displayUnitDeficiencies}" class="pull-right btn btn-default" id="btnXlg" style="margin-right: 8.33333333333%">Back</a>
 
 			</fieldset>
-			<!--
-			<div class="container2">
-
-			  <div class="app2">
+			
+			  
 
-			    <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
-			    <video id="camera-stream"></video>
-			    <img id="snap">
-
-			    <p id="error-message"></p>
-
-			    <div class="controls">
-			      <a href="#" id="delete-photo" title="Delete Photo" class="disabled"><i class="material-icons">delete</i></a>
-			      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
-			      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" class="disabled"><i class="material-icons">file_download</i></a>
-			    </div>
+			</div>
+		</form>
+	</div>
+	
+	<div class="modal fade" id="myModal">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <div class="container2">
+
+						  <div class="app2">
+			
+						    <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
+						    <video id="camera-stream"></video>
+						    <img id="snap">
+			
+						    <p id="error-message"></p>
+			
+						    <div class="controls">
+						      <a href="#" id="delete-photo" title="Redo Photo" class="disabled"><i class="material-icons">replay</i></a>
+						      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
+						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" class="disabled">
+						      	<i class="material-icons">done</i></a>
+						    </div>
 
 
 			    <canvas></canvas>
 			  </div>
-			</div>  This code works but is not for prototype release will be in the final prog. version-->
-
 			</div>
-		</form>
-
-	</div>
\ No newline at end of file
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="saveDone()">Close</button>
+                  
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
index f3c3e5f..523e243 100644
--- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
@@ -46,6 +46,7 @@ table{
 		      <th>Deficiency Type</th>
 		      <th>Description</th>
 		      <th></th>
+		      <th></th>
 		    </tr>
 		  </thead>
 		  <tbody>
@@ -55,6 +56,9 @@ table{
 				<td>${unitDeficiency.location}</td>
 				<td>${unitDeficiency.category}</td> 
 				<td>${unitDeficiency.description}</td>
+				<td>
+				    <a href="${deleteUrl}" class="btn btn-danger pull-right" style="margin:1%;">View Photo</a>
+				</td>
 				<td>
 				    <c:url value="/deleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
 				    <a href="${deleteUrl}" class="btn btn-danger pull-right" style="margin:1%;">Delete</a>
diff --git a/src/ca/sheridancollege/beans/Deficiency.java b/src/ca/sheridancollege/beans/Deficiency.java
index 830e21b..84b6a73 100644
--- a/src/ca/sheridancollege/beans/Deficiency.java
+++ b/src/ca/sheridancollege/beans/Deficiency.java
@@ -19,6 +19,8 @@ public class Deficiency implements Serializable, Comparable<Deficiency> {
     private Date deadline;
     private Boolean status;
     private long homeEnrollmentNumber;
+    @Column(columnDefinition="mediumblob")
+    private byte[] defPhoto;
 
     public Deficiency() {
         this(0, null, null, null, null, false, 0);
@@ -108,4 +110,14 @@ public void setHomeEnrollmentNumber(long homeEnrollmentNumber) {
     public int compareTo(Deficiency o) {
         return id<o.getId()?-1:id>o.getId()?1:0;
     }
+
+	public byte[] getDefPhoto() {
+		return defPhoto;
+	}
+
+	public void setDefPhoto(byte[] defPhoto) {
+		this.defPhoto = defPhoto;
+	}
+    
+    
 }
diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java
index 00b4232..0a09d15 100644
--- a/src/ca/sheridancollege/services/ControllerServices.java
+++ b/src/ca/sheridancollege/services/ControllerServices.java
@@ -44,6 +44,20 @@ public Model saveDeficiency(Model model, int id, String location, String descrip
         constructionPersonnel = constructionPersonnel.substring(constructionPersonnel.indexOf("-")).replace("-", "").trim();
         System.out.println("construction personnel substring: " + constructionPersonnel);
         Deficiency deficiency = new Deficiency(id, location, description, constructionPersonnel, category, deadline, false, homeEnrollmentNumber);
+        
+        File sig = new File("C:\\abode\\def"+id+"hen"+homeEnrollmentNumber+".png");
+        byte[] sigImg = new byte[(int) sig.length()];
+
+        try {
+            FileInputStream input = new FileInputStream(sig);
+            input.read(sigImg);
+            input.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        deficiency.setDefPhoto(sigImg);
+        
         List<Unit> unitList = dao.getUnit(homeEnrollmentNumber);
         Unit unit = unitList.get(0);
         System.out.println("Unit Size:" + unitList.size() + homeEnrollmentNumber);

From d2c6c7a1069678f135328b0972b5cb9fd9163133 Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Thu, 17 Nov 2016 12:23:28 -0500
Subject: [PATCH 07/22] added modal for delete confirmation

---
 .../WEB-INF/jsps/displayUnitDeficiencies.jsp  | 27 +++++++++++++++--
 .../WEB-INF/jsps/displayUnitDeficiencies2.jsp | 29 +++++++++++++++++--
 .../jsps/workOrderDisplayUnitDeficiencies.jsp | 28 ++++++++++++++++--
 .../services/ControllerServices.java          | 25 ++++++++++++++--
 4 files changed, 98 insertions(+), 11 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
index f3c3e5f..359dff9 100644
--- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
@@ -56,9 +56,32 @@ table{
 				<td>${unitDeficiency.category}</td> 
 				<td>${unitDeficiency.description}</td>
 				<td>
-				    <c:url value="/deleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
-				    <a href="${deleteUrl}" class="btn btn-danger pull-right" style="margin:1%;">Delete</a>
+				    <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal${unitDeficiency.id}">
+                        Delete
+                    </button>
 				</td>
+
+                <div class="modal fade" id="myModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Confirm Delete</h4>
+                      </div>
+                      <div class="modal-body">
+                        Are you sure you want to delete deficiency ${unitDeficiency.id}?
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">No</button>
+				        <c:url value="/deleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
+                        <a href="${deleteUrl}" class="btn btn-danger" style="margin:1%;">Delete</a>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
+
 				</tr>
 			</c:forEach>
 			</tbody>
diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp
index 713abc9..2cb8ef3 100644
--- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp
@@ -57,10 +57,33 @@ table{
 				<td>${unitDeficiency.location}</td>
 				<td>${unitDeficiency.category}</td> 
 				<td>${unitDeficiency.description}</td>
+
 				<td>
-				    <c:url value="/deleteDeficiency2/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl2" />
-				    <a href="${deleteUrl2}" class="btn btn-danger pull-right">Delete</a>
-				</td>
+                    <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal${unitDeficiency.id}">
+                        Delete
+                    </button>
+                </td>
+
+                <div class="modal fade" id="myModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Confirm Delete</h4>
+                      </div>
+                      <div class="modal-body">
+                        Are you sure you want to delete deficiency ${unitDeficiency.id}?
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                        <c:url value="/deleteDeficiency2/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
+                        <a href="${deleteUrl}" class="btn btn-danger" style="margin:1%;">Delete</a>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
 				</tr>
 			</c:forEach>
 			</tbody>
diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
index 1111eb1..9e6e791 100644
--- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
@@ -71,9 +71,31 @@
 				<a href="${editUrl}" class="btn btn-primary pull-right">Edit</a>
 				</td>
 				<td>
-				    <c:url value="/workOrderDeleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
-                    <a href="${deleteUrl}" class="btn btn-danger pull-right" style="margin:1%;">Delete</a>
-				</td>
+                    <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal${unitDeficiency.id}">
+                        Delete
+                    </button>
+                </td>
+
+                <div class="modal fade" id="myModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Confirm Delete</h4>
+                      </div>
+                      <div class="modal-body">
+                        Are you sure you want to delete deficiency ${unitDeficiency.id}?
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                        <c:url value="/workOrderDeleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
+                        <a href="${deleteUrl}" class="btn btn-danger" style="margin:1%;">Delete</a>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
 				</tr>
 			</c:forEach>
 			</tbody>
diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java
index 32cfc50..169d135 100644
--- a/src/ca/sheridancollege/services/ControllerServices.java
+++ b/src/ca/sheridancollege/services/ControllerServices.java
@@ -155,7 +155,14 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate
         }
 
         List<HomeOwner> returnPurch = dao.getHomeOwner(homeEnrollmentNumber);
-        HomeOwner ho = returnPurch.get(0);
+
+        HomeOwner ho;
+
+        if (returnPurch.size() > 0) {
+            ho = returnPurch.get(0);
+        } else {
+            ho = new HomeOwner("Jason Mamoa", "9053326718", homeEnrollmentNumber);
+        }
 
         form.setPurchName(ho.getName());
         form.setBuilderRefNum(b.getBuilderRefNum());
@@ -203,7 +210,13 @@ public Model saveUnit2(Model model, long homeEnrollmentNumber, Date posessionDat
         }
 
         List<HomeOwner> returnPurch = dao.getHomeOwner(homeEnrollmentNumber);
-        HomeOwner ho = returnPurch.get(0);
+        HomeOwner ho;
+
+        if (returnPurch.size() > 0) {
+            ho = returnPurch.get(0);
+        } else {
+            ho = new HomeOwner("Jason Mamoa", "9053326718", homeEnrollmentNumber);
+        }
 
         form.setPurchName(ho.getName());
         form.setBuilderRefNum(b.getBuilderRefNum());
@@ -259,7 +272,13 @@ public Model loadSignOff(Model model, long homeEnrollmentNumber) {
         Form addSignOff = returns.get(0);
 
         List<HomeOwner> home = dao.getHomeOwner(homeEnrollmentNumber);
-        HomeOwner ho = home.get(0);
+        HomeOwner ho;
+
+        if (home.size() > 0) {
+            ho = home.get(0);
+        } else {
+            ho = new HomeOwner("Jason Mamoa", "9053326718", homeEnrollmentNumber);
+        }
 
         addSignOff.setPurchName(ho.getName());
         model.addAttribute("form", addSignOff);

From 4d4f893174550ceece37b0d20890915b7c916ea9 Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Thu, 17 Nov 2016 12:30:34 -0500
Subject: [PATCH 08/22] text change

---
 WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
index 245ed2e..27f4dc0 100644
--- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
@@ -78,7 +78,7 @@ table{
                         Are you sure you want to delete deficiency ${unitDeficiency.id}?
                       </div>
                       <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">No</button>
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
 				        <c:url value="/deleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
                         <a href="${deleteUrl}" class="btn btn-danger" style="margin:1%;">Delete</a>
                       </div>

From b56584a904384ae164ae581e25c7e1fcf35ae614 Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Fri, 18 Nov 2016 14:54:27 -0500
Subject: [PATCH 09/22] added view deficiency photo to areas

---
 ...splayConstructionPersonnelDeficiencies.jsp |  27 ++++++++++++++++++
 .../WEB-INF/jsps/displayUnitDeficiencies.jsp  |  26 +++++++++++++++--
 .../WEB-INF/jsps/displayUnitDeficiencies2.jsp |  26 +++++++++++++++++
 .../jsps/workOrderDisplayUnitDeficiencies.jsp |  27 ++++++++++++++++++
 .../config/security-context.xml               |   1 +
 .../controllers/HomeController.java           |   7 +++++
 .../services/ControllerServices.java          |  16 +++++++++++
 .../ca/sheridancollege/beans/Deficiency.class | Bin 3513 -> 3776 bytes
 .../controllers/HomeController.class          | Bin 13594 -> 13946 bytes
 9 files changed, 128 insertions(+), 2 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
index 8a2d3bf..fbd778f 100644
--- a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
@@ -38,6 +38,7 @@
 		      <th>Notes</th>
 		      <th>Deadline</th>
 		      <th></th>
+		      <th></th>
 		    </tr>
 		  </thead>
 		  <tbody>
@@ -49,6 +50,32 @@
 				<td>${deficiency.category}</td>
 				<td>${deficiency.description}</td>
 				<td><fmt:formatDate value="${deficiency.deadline}" pattern="yyyy-MM-dd" /></td>
+
+				<td>
+                    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#photoModal${deficiency.id}">
+                        View Photo
+                    </button>
+                </td>
+
+                <div class="modal fade" id="photoModal${deficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <img id="defImage" src="../defImage/${deficiency.homeEnrollmentNumber}/${deficiency.id}" />
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
+
 				<td>
 					<c:choose>
 	              <c:when test="${deficiency.status}">
diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
index 27f4dc0..ac58dc0 100644
--- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
@@ -57,8 +57,30 @@ table{
 				<td>${unitDeficiency.category}</td> 
 				<td>${unitDeficiency.description}</td>
 				<td>
-				    <a href="${deleteUrl}" class="btn btn-danger pull-right" style="margin:1%;">View Photo</a>
-				</td>
+                    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#photoModal${unitDeficiency.id}">
+                        View Photo
+                    </button>
+                </td>
+
+                <div class="modal fade" id="photoModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <img id="defImage" src="defImage/${unit.homeEnrollmentNumber}/${unitDeficiency.id}" />
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
+
 				<td>
 				    <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal${unitDeficiency.id}">
                         Delete
diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp
index 2cb8ef3..172fae2 100644
--- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies2.jsp
@@ -48,6 +48,7 @@ table{
 		      <th>Deficiency Type</th>
 		      <th>Description</th>
 		      <th></th>
+		      <th></th>
 		    </tr>
 		  </thead>
 		  <tbody>
@@ -58,6 +59,31 @@ table{
 				<td>${unitDeficiency.category}</td> 
 				<td>${unitDeficiency.description}</td>
 
+				<td>
+                    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#photoModal${unitDeficiency.id}">
+                        View Photo
+                    </button>
+                </td>
+
+                <div class="modal fade" id="photoModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <img id="defImage" src="defImage/${unit.homeEnrollmentNumber}/${unitDeficiency.id}" />
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
+
 				<td>
                     <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#myModal${unitDeficiency.id}">
                         Delete
diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
index 9e6e791..3667d15 100644
--- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
@@ -43,6 +43,7 @@
 		      <th style="text-align: center;">Status</th>
 		      <th></th>
 		      <th></th>
+		      <th></th>
 		    </tr>
 		  </thead>
 		  <tbody>
@@ -54,6 +55,32 @@
 				<td>${unitDeficiency.category}</td>
 				<td>${unitDeficiency.description}</td>
 				<td>${unitDeficiency.constructionPersonnel}</td>
+
+				<td>
+                    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#photoModal${unitDeficiency.id}">
+                        View Photo
+                    </button>
+                </td>
+
+                <div class="modal fade" id="photoModal${unitDeficiency.id}">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <img id="defImage" src="../defImage/${unit.homeEnrollmentNumber}/${unitDeficiency.id}" />
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
+                </div><!-- /.modal -->
+
 				<td>
 				    <c:choose>
 	              <c:when test="${unitDeficiency.status}">
diff --git a/src/ca/sheridancollege/config/security-context.xml b/src/ca/sheridancollege/config/security-context.xml
index c841b82..eab0e20 100644
--- a/src/ca/sheridancollege/config/security-context.xml
+++ b/src/ca/sheridancollege/config/security-context.xml
@@ -20,6 +20,7 @@
         <security:intercept-url pattern="/pdiReportData" access="isAuthenticated()"/>
         <security:intercept-url pattern="/selectReport" access="isAuthenticated()"/>
         <security:intercept-url pattern="/imageDisplay/**" access="isAuthenticated()"/>
+        <security:intercept-url pattern="/defImage/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/addDeficiency/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/editDeficiency/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/addDeficiency2/**" access="isAuthenticated()"/>
diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java
index 68cdc95..6f5f355 100644
--- a/src/ca/sheridancollege/controllers/HomeController.java
+++ b/src/ca/sheridancollege/controllers/HomeController.java
@@ -394,6 +394,13 @@ public void getImage2(HttpServletResponse response, @PathVariable long homeEnrol
         response = controllerServices.getImage2(response, homeEnrollmentNumber);
     }
 
+    // this displays an image from the database
+    @RequestMapping(value = "defImage/{homeEnrollmentNumber}/{id}")
+    public void getDefImage(HttpServletResponse response, @PathVariable long homeEnrollmentNumber, @PathVariable int id) throws IOException {
+
+        response = controllerServices.getDefImage(response, homeEnrollmentNumber, id);
+    }
+
     @RequestMapping("/displayDeficiencies/{id}")
     public String displayDeficienciesByConstructionPersonnel(Model model, @PathVariable int id) {
 
diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java
index 8ecabaa..4313b87 100644
--- a/src/ca/sheridancollege/services/ControllerServices.java
+++ b/src/ca/sheridancollege/services/ControllerServices.java
@@ -567,4 +567,20 @@ public Model editDeficiency(Model model, long homeEnrollmentNumber, int id) {
 
         return model;
     }
+
+    public HttpServletResponse getDefImage(HttpServletResponse response, long homeEnrollmentNumber, int id) throws IOException {
+        response.setContentType("image/png");
+        List<Unit> unit = dao.getUnit(homeEnrollmentNumber);
+        List<Deficiency> deficiencyList = unit.get(0).getDeficiencies();
+        byte[] imageBytes = null;
+        for (Deficiency d : deficiencyList) {
+            if (id == d.getId()) {
+                imageBytes = d.getDefPhoto();
+            }
+        }
+        response.getOutputStream().write(imageBytes);
+        response.getOutputStream().flush();
+
+        return response;
+    }
 }
diff --git a/target/classes/ca/sheridancollege/beans/Deficiency.class b/target/classes/ca/sheridancollege/beans/Deficiency.class
index a35246a516e74c8f5c50ee77948f4b2fe2ea74b5..399bf398cd1402d31b73d00f39e7b57909e28467 100644
GIT binary patch
literal 3776
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
aDP$-X$tXGajZll8%JrH2LbK35C;A63a+LM}

literal 3513
zcmb_e+inwA6y3+yI1C9SPKddNyE6$G3@sOjkl=)38m<W`q_kx+9-M*kOk|Hy=@(Re
z>n~K5c%YS9sfMZ#RiFFR&*)dQUHi<~o=nFQs+uT1XXfm^&szJkoZtWY<yRs)PfnU*
zf{yB1p}A=^%&KPVj%67&qp)FUcC)Z(JT-OGu=ST|N(kEZOnadfEX}SJ?rc0WbT>^Y
zL0S3MbP6j7p;_h^+J<GMX`pi=?aNMmOKb26!ZfAfn$c*Qj{TsrC`jBCw6pBkO;@ws
zHO*=n$?D%<y?*qyRTLC6tFWjD8n7H)bKxUsWVwfB#ch~&tt4ni)oAJsbIUWy-EY~h
zSvS_qriptOY};|AcT><_>Hc|Pi!n4^Ff<Bf$7<DWgh|+19WV#%mSr*GIC4dTQkG%Y
z+)X^i{}eQ)GulQ==gaOQjAPq|1uq~pYEI)NwpBx`TBgmEJ-98`v<izbz%40obz8tP
z8lZB`aV%sW$JtG%ZY<di)T3_L?(J56!)U;3*0fD`PEb5QwFanVr)mrW+;N2t(+NSh
z^OZn2KQsUB&H7EgVR#t?yxUj3@{KH`3f7v2Vk0^J%Y?gWg3Iyccj%?kAkEO}G@TN(
zyH`b@x<UmyBPjiXo8Zn<LF4)LsQ`gahM07bNuLw6_5YFfZtB%3;%1o^u|7y~dY=It
z$pFelg@$ODcb65~MZ0-7tI&wIn^S17x0_dJpSQcF(0)3=c8dxfq(i*BuFxb6qLFKc
z%USjsIhzkApx5oqpwU=90M)nQ`VAq}VsI>m;I{1rUsmom?G79Vo}_oDi$^*@dieoX
z8Lwk9>ci++Fo+DotoZFd)(IkYp;J!SAWp|-JV>Tv!hw<qRDl|x`=JL(xbRaVU*W?E
zCK5fB6U-|5Xb-$@M9vy6fh_HTYxH>{FIyp_OKme&9YOj0I}N~8h1<8P&`0zT(gw$!
zpsqi^rEU51w5^<;*p@smQz4Bu1P!h@t%hz~H(64LdrEzpM+)g&F>5virh!u<&>DU$
z?@dUwO98u{V9&l2r8#KULFvC;RhOV!)ha7R3A2LAQH+w5rVJ(`L!5>kP}dkK_`?Lr
zJ?2NQm>!&uVn2p83*WIOMrwSW_RvIya&W;|NmC4!TrpB|#X!jw<AjynF{t=Fil@uC
zSYTDuxWG?5^OlbND6LQ8a}ZI9CIBl(dA9OwX^K=lahwx=oG)RU!Mm)wZ{}1kkxPoP
z)Xy|Mo_<Sb!}0cm#sL}cJ`J#sACGrToAG2>IOOeF77ozmcg!#$cg!&<cL(v^osv7|
zmzJo``KbPYA9F6MZ|OaCUz;wdGi|!0o@!G`%_Z7&Ma?DKbXCoz+O(kN(rqfM;{$D4
z>S0!8ghRM@5)2Om;Su0Jii{jXUXSDV1WnUPItxaeqsKB2#V)5}ms7FJso3RI>~boy
z7)nk>7DLIY$YKaiV8CLCYzg{+Zusm9SUFco^(VUY12!?hAUN{NnLxpk-GWu<rtdrl
zYc6g|okm7_biI<F0T3ocH11h->7*nHzWBpPAf+&n^N~Q7qk)vdKrRBvr9MEskq~q%
z63Epskl9Eex1)hv4Fj16kcB=#xNw}2J9O92Zm={9VIYf<K<?3f-+5bU7Q#So07#_|
z5bhfWvO=p7K+0ht%aK4H&{`Cbau~>60J+x(2)8W*fu=_Qx$qqtE7+{7kw6~N`oDni
z42OX{1dvC4fOvW$=;O#9xf0IE<47QnqkH5^7|0U<(fR;k>EeuhLZ5as62s0L-=*(E
z8L37B`HY_U&T~*U*2I*0Xq#Gj<GTqUW*;D|BMbyzoPMk)z7$MCM=ngiA^jUl$6nEB
z=kZ%gCtgt^&Q*&CB&Hs?VX`X_lVsrALC{l1NAcmId9iB&x7GaHru^G7>hy0U-q2>a
a8StNjOa@=}OzxhOCD*$A{$qW!iT(kI=xav+

diff --git a/target/classes/ca/sheridancollege/controllers/HomeController.class b/target/classes/ca/sheridancollege/controllers/HomeController.class
index 0e1dbfe93aeab52a7f89f73dac41e234d1a7136b..2433353992fc2e7ef114cc3ae37b937777dc9d5f 100644
GIT binary patch
delta 346
zcmYj~KQBXJ7{$-Isiv+{B~|Y2A1#C4hPZ7}^>?r|=_pMk29j3OhOL`Om@)7S!op<M
z5QCu~z~+Pa0tP%+B;-xr^S<Z#o%7tZKK9Mm&zCNM0@pic#SZl~>g|pCUio0RQ75M5
z%yI_GnJO_^`*p>&N5hBB+L4JUb3x89Pi%UiQO?M_<w(^&@fU+Ea8U*WY5B5Umc)&<
znSH#Eokk^<PjFVkDQjm7J$itC=LuGJJmPz%Tj{7_Af~se3SJ<{OT_i>z~{k8AgQV^
zPB8=icv}c~v`(97DM#HuCwI9B=jAv#BHM+~*g|FK{6U%j?N=~)E!||Q*UK52E6JN1
lomkQ)ps4L$t8bXge@VZ$lef}w;}L@^UL#kLR@DjDfNy9hJbM5D

delta 177
zcmeyBGb@Yh)W2Q(7#J8#7_ByP`A9QrO>UGCo@^kK%VxyGsK;nLS%5=n@=+N>Mw7|k
zWl9*eHs{E8i%&kJD9prYFuBH9Nk(QHqoI#b?*^b5ObjwWk_$*PFiv3LVw^NNKwptF
zlOYQz!U!~g&rDp|lz|th#)5$nq>6z>n9&TOlMN`!z&K-akD;t66QeoEL`Dk+B_Iuy
JVYFmm0071-Addh5


From b79272e3507e7adabd741974a18e88e420ceb86c Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Fri, 18 Nov 2016 15:07:09 -0500
Subject: [PATCH 10/22] formatted style.css to add image width

---
 WebContent/css/style.css                                    | 6 +++++-
 .../classes/ca/sheridancollege/config/security-context.xml  | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/WebContent/css/style.css b/WebContent/css/style.css
index e7a8c51..4cbe4cf 100644
--- a/WebContent/css/style.css
+++ b/WebContent/css/style.css
@@ -51,4 +51,8 @@ Extra Large Button CSS
     font-size: 16px;
     line-height: normal;
     border-radius: 8px;
-    }
\ No newline at end of file
+    }
+
+img {
+    max-width:100%
+}
diff --git a/target/classes/ca/sheridancollege/config/security-context.xml b/target/classes/ca/sheridancollege/config/security-context.xml
index c841b82..eab0e20 100644
--- a/target/classes/ca/sheridancollege/config/security-context.xml
+++ b/target/classes/ca/sheridancollege/config/security-context.xml
@@ -20,6 +20,7 @@
         <security:intercept-url pattern="/pdiReportData" access="isAuthenticated()"/>
         <security:intercept-url pattern="/selectReport" access="isAuthenticated()"/>
         <security:intercept-url pattern="/imageDisplay/**" access="isAuthenticated()"/>
+        <security:intercept-url pattern="/defImage/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/addDeficiency/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/editDeficiency/**" access="isAuthenticated()"/>
         <security:intercept-url pattern="/addDeficiency2/**" access="isAuthenticated()"/>

From 08815ed7209c3ef202508c910e140ea79e1de05a Mon Sep 17 00:00:00 2001
From: Elviis <jonathansakowski@Gmail.com>
Date: Fri, 18 Nov 2016 15:10:50 -0500
Subject: [PATCH 11/22] Addsignoff enable/disable fixed, minor visual changes

---
 WebContent/WEB-INF/jsps/addDeficiency.jsp     |  21 ++++--
 WebContent/WEB-INF/jsps/addSignOff.jsp        |  70 ++++++++++++++++--
 .../jsps/displayConstructionPersonnel.jsp     |   1 +
 WebContent/WEB-INF/jsps/home.jsp              |   2 +-
 .../ca/sheridancollege/beans/Deficiency.class | Bin 3513 -> 3776 bytes
 5 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp
index 367163a..71f8582 100644
--- a/WebContent/WEB-INF/jsps/addDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp
@@ -256,11 +256,12 @@ var save = false;
 </script>
 
 	<div style="margin: 2%">
+	<legend><h2>Enter or Edit Deficiency Information</h2></legend>
 		<c:url value="/saveDeficiency" var="url" />
 		<form name="form" class="form-horizontal" method="post" onsubmit="return Validate()" action="${url}">
 		<div class="jumbotron" id="con">
 			<fieldset>
-				<legend>Enter or Edit Deficiency Information</legend>
+				
 				<br>
 				<div class="alert alert-danger collapse" id="alert" >
                 	<div id="selectCategory" class="collapse">Please select a category.</div>
@@ -343,18 +344,23 @@ var save = false;
 				<input type="hidden" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 				
-				<input type="submit" value="Save Deficiency" class="btn btn-primary" id="btnXlg2" style="margin-left: 8.33333333333%" />
-					
-					
-			    <c:url value="/displayUnitDeficiencies/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
-			    <a href="${displayUnitDeficiencies}" class="pull-right btn btn-default" id="btnXlg" style="margin-right: 8.33333333333%">Back</a>
-
+				
 			</fieldset>
 			
 			  
 
 			</div>
+			<input type="submit" value="Save Deficiency" class="btn btn-primary" id="btnXlg2" style="margin-left: 8.33333333333%" />
+					
+					
+			    <c:url value="/displayUnitDeficiencies/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
+			    <a href="${displayUnitDeficiencies}" class="pull-right btn btn-default" id="btnXlg" style="margin-right: 8.33333333333%">Back</a>
+			
 		</form>
+		<br />
+		<br />
+		
+		<legend> </legend>
 	</div>
 	
 	<div class="modal fade" id="myModal">
@@ -388,6 +394,7 @@ var save = false;
 			    <canvas></canvas>
 			  </div>
 			</div>
+			
                       </div>
                       <div class="modal-footer">
                         <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="saveDone()">Close</button>
diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp
index 870bbd3..20e0f63 100644
--- a/WebContent/WEB-INF/jsps/addSignOff.jsp
+++ b/WebContent/WEB-INF/jsps/addSignOff.jsp
@@ -32,6 +32,63 @@
     color:white;
     }
 </style>
+
+<script type="text/javascript">
+var e;
+var used;
+
+function hide(){
+	//used = document.getElementById("repName").value;
+	//disable save on load
+	$( "#btnXlg2" ).prop( "disabled", true );
+	document.getElementById("btnXlg").style.visibility = 'visible';
+	document.getElementById("btnXlg2").style.visibility = 'visible';
+
+if (used === ""){
+	//alert(used);
+	document.getElementById("btnXlg").style.visibility = 'visible';
+	}
+}
+
+function showSave(){
+	$( "#btnXlg2" ).prop( "disabled", false );
+	//$( "#nextBtn" ).prop( "disabled", false );
+	//	$('a').disable(false);
+	//document.getElementById("saveBtn").style.visibility = 'visible';
+}
+
+function enableNextBtn(){
+	$('a').disable(false);
+}
+
+function disableNextBtn(){
+	$('a').disable(false);
+}
+
+//Function to enable disable Next button HREF
+$(function() {
+    jQuery.fn.extend({
+        disable: function(state) {
+            return this.each(function() {
+                var $this = $(this);
+                if($this.is('input'))
+                    this.disabled = state;
+                else
+                    $this.toggleClass('disabled', state);
+            });
+        }
+    });
+    
+   // $('a').disable(true);
+   
+    $('body').on('click', 'a.disabled', function(event) {
+        event.preventDefault();
+    });
+}); 
+
+</script>
+
+
 <title>SignOff Form</title>
 
 <body onload="hide()">
@@ -140,20 +197,19 @@
 				
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 				
-				<div class="form-group">
+				<div class="form-group" >
 			        <c:url value="/" var="home" />
-			        <input type="submit" value="Save and Proceed" id="btnXlg2" class="pull-right btn btn-success" />
+			        <input type="submit" value="Save and Proceed" id="btnXlg2" class="pull-right btn btn-success" style="margin: 2%"/>
 				<!-- <a href="${home}" class="pull-right btn btn-success" id="saveBtn">Finish</a> -->
+				
+				
 				</fieldset>
 </form>
+			        <c:url value="/displayUnitDeficiencies/${form.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
+					<a href="${displayUnitDeficiencies}" class="pull-left btn btn-default" id="btnXlg" style="margin: 2%">Back</a>
 				</div>
 
-				<div class="form-group">
 				
-			        <c:url value="/displayUnitDeficiencies/${form.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
-					<a href="${displayUnitDeficiencies}" class="pull-left btn btn-default" id="btnXlg">Back</a>
-
-				</div>
 				</div>
 				<br />
 				<br />
diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp
index 8182549..dee9394 100644
--- a/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp
+++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnel.jsp
@@ -29,4 +29,5 @@
 
        	<c:url value="/workOrderHome" var="backUrl" />
        	<a href="${backUrl}" id="btnXlg" class="btn btn-default">Back</a>
+       	
     </div>
diff --git a/WebContent/WEB-INF/jsps/home.jsp b/WebContent/WEB-INF/jsps/home.jsp
index 5c14ca3..9fd1dde 100644
--- a/WebContent/WEB-INF/jsps/home.jsp
+++ b/WebContent/WEB-INF/jsps/home.jsp
@@ -30,7 +30,7 @@ Extra Large Button CSS
 
 </style>
 
-	<div class="">
+	<div class="row row-centered text-center">
 	
 		<div class="row row-centered text-center">
 
diff --git a/target/classes/ca/sheridancollege/beans/Deficiency.class b/target/classes/ca/sheridancollege/beans/Deficiency.class
index a35246a516e74c8f5c50ee77948f4b2fe2ea74b5..399bf398cd1402d31b73d00f39e7b57909e28467 100644
GIT binary patch
literal 3776
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
aDP$-X$tXGajZll8%JrH2LbK35C;A63a+LM}

literal 3513
zcmb_e+inwA6y3+yI1C9SPKddNyE6$G3@sOjkl=)38m<W`q_kx+9-M*kOk|Hy=@(Re
z>n~K5c%YS9sfMZ#RiFFR&*)dQUHi<~o=nFQs+uT1XXfm^&szJkoZtWY<yRs)PfnU*
zf{yB1p}A=^%&KPVj%67&qp)FUcC)Z(JT-OGu=ST|N(kEZOnadfEX}SJ?rc0WbT>^Y
zL0S3MbP6j7p;_h^+J<GMX`pi=?aNMmOKb26!ZfAfn$c*Qj{TsrC`jBCw6pBkO;@ws
zHO*=n$?D%<y?*qyRTLC6tFWjD8n7H)bKxUsWVwfB#ch~&tt4ni)oAJsbIUWy-EY~h
zSvS_qriptOY};|AcT><_>Hc|Pi!n4^Ff<Bf$7<DWgh|+19WV#%mSr*GIC4dTQkG%Y
z+)X^i{}eQ)GulQ==gaOQjAPq|1uq~pYEI)NwpBx`TBgmEJ-98`v<izbz%40obz8tP
z8lZB`aV%sW$JtG%ZY<di)T3_L?(J56!)U;3*0fD`PEb5QwFanVr)mrW+;N2t(+NSh
z^OZn2KQsUB&H7EgVR#t?yxUj3@{KH`3f7v2Vk0^J%Y?gWg3Iyccj%?kAkEO}G@TN(
zyH`b@x<UmyBPjiXo8Zn<LF4)LsQ`gahM07bNuLw6_5YFfZtB%3;%1o^u|7y~dY=It
z$pFelg@$ODcb65~MZ0-7tI&wIn^S17x0_dJpSQcF(0)3=c8dxfq(i*BuFxb6qLFKc
z%USjsIhzkApx5oqpwU=90M)nQ`VAq}VsI>m;I{1rUsmom?G79Vo}_oDi$^*@dieoX
z8Lwk9>ci++Fo+DotoZFd)(IkYp;J!SAWp|-JV>Tv!hw<qRDl|x`=JL(xbRaVU*W?E
zCK5fB6U-|5Xb-$@M9vy6fh_HTYxH>{FIyp_OKme&9YOj0I}N~8h1<8P&`0zT(gw$!
zpsqi^rEU51w5^<;*p@smQz4Bu1P!h@t%hz~H(64LdrEzpM+)g&F>5virh!u<&>DU$
z?@dUwO98u{V9&l2r8#KULFvC;RhOV!)ha7R3A2LAQH+w5rVJ(`L!5>kP}dkK_`?Lr
zJ?2NQm>!&uVn2p83*WIOMrwSW_RvIya&W;|NmC4!TrpB|#X!jw<AjynF{t=Fil@uC
zSYTDuxWG?5^OlbND6LQ8a}ZI9CIBl(dA9OwX^K=lahwx=oG)RU!Mm)wZ{}1kkxPoP
z)Xy|Mo_<Sb!}0cm#sL}cJ`J#sACGrToAG2>IOOeF77ozmcg!#$cg!&<cL(v^osv7|
zmzJo``KbPYA9F6MZ|OaCUz;wdGi|!0o@!G`%_Z7&Ma?DKbXCoz+O(kN(rqfM;{$D4
z>S0!8ghRM@5)2Om;Su0Jii{jXUXSDV1WnUPItxaeqsKB2#V)5}ms7FJso3RI>~boy
z7)nk>7DLIY$YKaiV8CLCYzg{+Zusm9SUFco^(VUY12!?hAUN{NnLxpk-GWu<rtdrl
zYc6g|okm7_biI<F0T3ocH11h->7*nHzWBpPAf+&n^N~Q7qk)vdKrRBvr9MEskq~q%
z63Epskl9Eex1)hv4Fj16kcB=#xNw}2J9O92Zm={9VIYf<K<?3f-+5bU7Q#So07#_|
z5bhfWvO=p7K+0ht%aK4H&{`Cbau~>60J+x(2)8W*fu=_Qx$qqtE7+{7kw6~N`oDni
z42OX{1dvC4fOvW$=;O#9xf0IE<47QnqkH5^7|0U<(fR;k>EeuhLZ5as62s0L-=*(E
z8L37B`HY_U&T~*U*2I*0Xq#Gj<GTqUW*;D|BMbyzoPMk)z7$MCM=ngiA^jUl$6nEB
z=kZ%gCtgt^&Q*&CB&Hs?VX`X_lVsrALC{l1NAcmId9iB&x7GaHru^G7>hy0U-q2>a
a8StNjOa@=}OzxhOCD*$A{$qW!iT(kI=xav+


From 0f170dd09c54b376c75769f512e5ce86392117e7 Mon Sep 17 00:00:00 2001
From: catpoehlman <cat.poehlman@gmail.com>
Date: Fri, 18 Nov 2016 15:38:14 -0500
Subject: [PATCH 12/22] Sigs should all work with unique names now

---
 WebContent/WEB-INF/jsps/addSignOff.jsp             |  4 ++--
 WebContent/scripts/script.js                       |  6 ++++--
 WebContent/scripts/signing.js                      | 13 ++++++++++++-
 .../services/ControllerServices.java               | 14 +++++++++-----
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp
index 870bbd3..1ce0bfa 100644
--- a/WebContent/WEB-INF/jsps/addSignOff.jsp
+++ b/WebContent/WEB-INF/jsps/addSignOff.jsp
@@ -80,7 +80,7 @@
 					</div>
 				</div>
 				<!-- row 4 -->
-				<input type="hidden" name="homeEnrollmentNumber" value="${form.homeEnrollmentNumber}"/>
+				<input type="hidden" id="homeEnrollmentNumber" name="homeEnrollmentNumber" value="${form.homeEnrollmentNumber}"/>
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 				<div class="form-group">
 				<!-- <input type="submit" value="Save" id="btnXlg2" class="pull-right btn btn-primary" /> -->
@@ -96,7 +96,7 @@
     					</div>
 					</div>
 					
-					<div><button id="acc2" onclick="accept()" class="btn btn-primary btn-sm" type="button">Accept</button></div>
+					<div><button id="acc2" onclick="accept2()" class="btn btn-primary btn-sm" type="button">Accept</button></div>
 					<div id="acc1"></div>
 					<br><br>
 					<div><button onclick="clearSig()" id="btnXlg" class="btn btn-default btn-sm" type="button">Redo</button></div>
diff --git a/WebContent/scripts/script.js b/WebContent/scripts/script.js
index 4be8d2c..802f0de 100644
--- a/WebContent/scripts/script.js
+++ b/WebContent/scripts/script.js
@@ -37,10 +37,12 @@ function disableNextBtn(){
 }
 
 function acceptSig(){
+	var hen = document.getElementById("homeEnrollmentNumber").value;
+	//alert(hen);
 	var link = document.getElementById("signature").toDataURL();
-	document.getElementById("acc2").innerHTML='<a id="acc2" data-toggle="tooltip" data-placement="top" title="Attatch Signature to Form" download="refSig.png" href="'+link+'">Attach</a>';
+	document.getElementById("acc2").innerHTML='<a id="acc2" data-toggle="tooltip" data-placement="top" title="Attatch Signature to Form" download="'+hen+'refSig.png" href="'+link+'">Attach</a>';
 	showSave();
-	//alert("hi");
+	
 }
 
 function ValidateHEN() {
diff --git a/WebContent/scripts/signing.js b/WebContent/scripts/signing.js
index a3f6afa..4762514 100644
--- a/WebContent/scripts/signing.js
+++ b/WebContent/scripts/signing.js
@@ -22,12 +22,23 @@ function clearSig() {
 }
 
 function accept(){
+	alert("testing");
 	var link = document.getElementById("signature").toDataURL();
+	var hen = document.getElementById("homeEnrollmentNumber").value;
+	//alert(hen);
 	document.getElementById("acc2").innerHTML='<a id="acc2" data-toggle="tooltip" data-placement="top" title="Attatch Signature to Form" download="refSig.png" href="'+link+'">Attach</a>';
 	showSave();
-	//alert("hi");
+	
 }
 
+function accept2(){
+	var hen = document.getElementById("homeEnrollmentNumber").value;
+	//alert(hen);
+	var link = document.getElementById("signature").toDataURL();
+	document.getElementById("acc2").innerHTML='<a id="acc2" data-toggle="tooltip" data-placement="top" title="Attatch Signature to Form" download="'+hen+'refSig2.png" href="'+link+'">Attach</a>';
+	showSave();
+	//alert("hi");
+}
 
 /*
 
diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java
index 8ecabaa..a3d8f20 100644
--- a/src/ca/sheridancollege/services/ControllerServices.java
+++ b/src/ca/sheridancollege/services/ControllerServices.java
@@ -180,8 +180,9 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate
 
         form.setPurchName(ho.getName());
         form.setBuilderRefNum(b.getBuilderRefNum());
-
-        File sig = new File("C:\\abode\\refSig.png");
+        
+        //pic code - rep sig, 1st sig
+        File sig = new File("C:\\abode\\"+homeEnrollmentNumber+"refSig.png");
         byte[] sigImg = new byte[(int) sig.length()];
 
         try {
@@ -235,7 +236,7 @@ public Model saveUnit2(Model model, long homeEnrollmentNumber, Date posessionDat
         form.setPurchName(ho.getName());
         form.setBuilderRefNum(b.getBuilderRefNum());
 
-        File sig = new File("C:\\abode\\refSig.png");
+        File sig = new File("C:\\abode\\"+homeEnrollmentNumber+"refSig.png");
         byte[] sigImg = new byte[(int) sig.length()];
 
         try {
@@ -260,8 +261,9 @@ public Model saveForm(Model model, long homeEnrollmentNumber, String desName) {
         Form addSignOff = returns.get(0);
 
         addSignOff.setDesName(desName);
-
-        File sig = new File("C:\\abode\\refSig.png");
+        
+        //pic for 2nd sig
+        File sig = new File("C:\\abode\\"+homeEnrollmentNumber+"refSig2.png");
         byte[] sigImg = new byte[(int) sig.length()];
 
         try {
@@ -437,6 +439,8 @@ public HttpServletResponse getImage2(HttpServletResponse response, long homeEnro
 
         return response;
     }
+    
+    
 
     public Model completeDeficiencyUnit(Model model, int id, long homeEnrollmentNumber) {
         Unit unit = dao.completeDeficiency(id, homeEnrollmentNumber);

From f26b6509506db68d20be51dd55c87286de15f934 Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Fri, 18 Nov 2016 16:12:21 -0500
Subject: [PATCH 13/22] formatted style

---
 WebContent/css/style.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/WebContent/css/style.css b/WebContent/css/style.css
index 4cbe4cf..cafd4d0 100644
--- a/WebContent/css/style.css
+++ b/WebContent/css/style.css
@@ -54,5 +54,9 @@ Extra Large Button CSS
     }
 
 img {
-    max-width:100%
+    max-width:100%;
+}
+
+video {
+    max-width:100%;
 }

From 6160f59f133bd85956976962be1b919a34c52e33 Mon Sep 17 00:00:00 2001
From: catpoehlman <cat.poehlman@gmail.com>
Date: Fri, 18 Nov 2016 16:37:39 -0500
Subject: [PATCH 14/22] All Edits can take photos now! All tables should have
 correct labels

---
 WebContent/WEB-INF/jsps/addDeficiency2.jsp    | 233 +++++++++++++++++-
 ...splayConstructionPersonnelDeficiencies.jsp |   2 +-
 WebContent/WEB-INF/jsps/editDeficiency.jsp    | 233 +++++++++++++++++-
 .../WEB-INF/jsps/workOrderAddDeficiency.jsp   | 233 +++++++++++++++++-
 .../jsps/workOrderDisplayUnitDeficiencies.jsp |   2 +-
 5 files changed, 695 insertions(+), 8 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/addDeficiency2.jsp b/WebContent/WEB-INF/jsps/addDeficiency2.jsp
index df77148..d350c4d 100644
--- a/WebContent/WEB-INF/jsps/addDeficiency2.jsp
+++ b/WebContent/WEB-INF/jsps/addDeficiency2.jsp
@@ -5,8 +5,186 @@
 <%@ 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" %>
-
+<script src="../scripts/photo.js"></script>
 	<style>
+	@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
+@import url('https://fonts.googleapis.com/icon?family=Material+Icons');
+
+*{
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+}
+
+html{
+    background-color: #fff;
+    font:normal 16px/1.5 sans-serif;
+    color: #333;
+}
+
+h3{
+    font: normal 32px/1.5 'Open Sans', sans-serif;
+    color: #2c3e50;
+    margin: 50px 0;
+    text-align: center;
+}
+
+
+.container2{
+    max-width: 1000px;
+    margin: 50px auto;
+    padding: 20px;
+    background-color: #efefef;
+}
+
+.app2{
+    width: 100%;
+    position: relative;
+}
+
+.app2 #start-camera{
+    display: none;
+    border-radius: 3px;
+    max-width: 400px;
+    color: #fff;
+    background-color: #448AFF;
+    text-decoration: none;
+    padding: 15px;
+    opacity: 0.8;
+    margin: 50px auto;
+    text-align: center;
+}
+
+.app2 video#camera-stream{
+    display: none;
+    width: 100%;
+}
+
+.app2 img#snap{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10;
+    display: none;
+}
+
+.app2 #error-message{
+    width: 100%;
+    background-color: #ccc;
+    color: #9b9b9b;
+    font-size: 28px;
+    padding: 200px 100px;
+    text-align: center;
+    display: none;
+}
+
+.app2 .controls{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 20;
+
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    padding: 30px;
+    display: none;
+}
+
+.app2 .controls a{
+    border-radius: 50%;
+    color: #fff;
+    background-color: #111;
+    text-decoration: none;
+    padding: 15px;
+    line-height: 0;
+    opacity: 0.7;
+    outline: none;
+    -webkit-tap-highlight-color: transparent;
+}
+
+.app2 .controls a:hover{
+    opacity: 1;
+}
+
+.app2 .controls a.disabled{
+    background-color: #555;
+    opacity: 0.5;
+    cursor: default;
+    pointer-events: none;
+}
+
+.app2 .controls a.disabled:hover{
+    opacity: 0.5;
+}
+
+.app2 .controls a i{
+    font-size: 18px;
+}
+
+.app2 .controls #take-photo i{
+    font-size: 32px;
+}
+
+.app2 canvas{
+    display: none;
+}
+
+
+
+.app2 video#camera-stream.visible,
+.app2 img#snap.visible,
+.app2 #error-message.visible
+{
+    display: block;
+}
+
+.app2 .controls.visible{
+    display: flex;
+}
+
+
+
+@media(max-width: 1000px){
+    .container2{
+        margin: 40px;
+    }
+
+    .app2 #start-camera.visible{
+        display: block;
+    }
+
+    .app2 .controls a i{
+        font-size: 16px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 24px;
+    }
+}
+
+
+@media(max-width: 600px){
+    .container2{
+        margin: 10px;
+    }
+
+    .app2 #error-message{
+        padding: 80px 50px;
+        font-size: 18px;
+    }
+
+    .app2 .controls a i{
+        font-size: 12px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 18px;
+    }
+}
 #con {
 	background-color: #EDEEFF;
 	border-radius: 15px;
@@ -115,6 +293,18 @@
 					</div>
 				</div>
 				
+				<div class="form-group">
+                	<label for="defPhoto" class="col-lg-1 control-label">Deficiency Photo</label>
+                	<div class="col-lg-8">
+                		<input path="defPhoto" name="defPhoto" class="form-control" id="defPhoto" readonly/> 
+                	</div>
+                	<div class="col-lg-2">
+					<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">
+                    Add Photo
+                  </button>
+					</div>
+                </div>
+				
 				<div class="form-group">
 					<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
 					<div class="col-lg-10">
@@ -149,4 +339,43 @@
 			</fieldset>
 		</form>
 
-	</div>
\ No newline at end of file
+	</div>
+	<div class="modal fade" id="myModal">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <div class="container2">
+
+						  <div class="app2">
+			
+						    <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
+						    <video id="camera-stream"></video>
+						    <img id="snap">
+			
+						    <p id="error-message"></p>
+			
+						    <div class="controls">
+						      <a href="#" id="delete-photo" title="Redo Photo" class="disabled"><i class="material-icons">replay</i></a>
+						      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
+						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" class="disabled">
+						      	<i class="material-icons">done</i></a>
+						    </div>
+
+
+			    <canvas></canvas>
+			  </div>
+			</div>
+			
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="saveDone()">Close</button>
+                  
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
index fbd778f..a3f5087 100644
--- a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
@@ -38,7 +38,7 @@
 		      <th>Notes</th>
 		      <th>Deadline</th>
 		      <th></th>
-		      <th></th>
+		      <th style="text-align: center;">Status</th>
 		    </tr>
 		  </thead>
 		  <tbody>
diff --git a/WebContent/WEB-INF/jsps/editDeficiency.jsp b/WebContent/WEB-INF/jsps/editDeficiency.jsp
index 61f0f39..0a0fda4 100644
--- a/WebContent/WEB-INF/jsps/editDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/editDeficiency.jsp
@@ -27,10 +27,189 @@
 	src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
 	integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
 	crossorigin="anonymous"></script>
-	
+<script src="../../scripts/photo.js"></script>
 <link rel="stylesheet" type="text/css" href="/spring/css/style.css">
 
 <style>
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
+@import url('https://fonts.googleapis.com/icon?family=Material+Icons');
+
+*{
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+}
+
+html{
+    background-color: #fff;
+    font:normal 16px/1.5 sans-serif;
+    color: #333;
+}
+
+h3{
+    font: normal 32px/1.5 'Open Sans', sans-serif;
+    color: #2c3e50;
+    margin: 50px 0;
+    text-align: center;
+}
+
+
+.container2{
+    max-width: 1000px;
+    margin: 50px auto;
+    padding: 20px;
+    background-color: #efefef;
+}
+
+.app2{
+    width: 100%;
+    position: relative;
+}
+
+.app2 #start-camera{
+    display: none;
+    border-radius: 3px;
+    max-width: 400px;
+    color: #fff;
+    background-color: #448AFF;
+    text-decoration: none;
+    padding: 15px;
+    opacity: 0.8;
+    margin: 50px auto;
+    text-align: center;
+}
+
+.app2 video#camera-stream{
+    display: none;
+    width: 100%;
+}
+
+.app2 img#snap{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10;
+    display: none;
+}
+
+.app2 #error-message{
+    width: 100%;
+    background-color: #ccc;
+    color: #9b9b9b;
+    font-size: 28px;
+    padding: 200px 100px;
+    text-align: center;
+    display: none;
+}
+
+.app2 .controls{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 20;
+
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    padding: 30px;
+    display: none;
+}
+
+.app2 .controls a{
+    border-radius: 50%;
+    color: #fff;
+    background-color: #111;
+    text-decoration: none;
+    padding: 15px;
+    line-height: 0;
+    opacity: 0.7;
+    outline: none;
+    -webkit-tap-highlight-color: transparent;
+}
+
+.app2 .controls a:hover{
+    opacity: 1;
+}
+
+.app2 .controls a.disabled{
+    background-color: #555;
+    opacity: 0.5;
+    cursor: default;
+    pointer-events: none;
+}
+
+.app2 .controls a.disabled:hover{
+    opacity: 0.5;
+}
+
+.app2 .controls a i{
+    font-size: 18px;
+}
+
+.app2 .controls #take-photo i{
+    font-size: 32px;
+}
+
+.app2 canvas{
+    display: none;
+}
+
+
+
+.app2 video#camera-stream.visible,
+.app2 img#snap.visible,
+.app2 #error-message.visible
+{
+    display: block;
+}
+
+.app2 .controls.visible{
+    display: flex;
+}
+
+
+
+@media(max-width: 1000px){
+    .container2{
+        margin: 40px;
+    }
+
+    .app2 #start-camera.visible{
+        display: block;
+    }
+
+    .app2 .controls a i{
+        font-size: 16px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 24px;
+    }
+}
+
+
+@media(max-width: 600px){
+    .container2{
+        margin: 10px;
+    }
+
+    .app2 #error-message{
+        padding: 80px 50px;
+        font-size: 18px;
+    }
+
+    .app2 .controls a i{
+        font-size: 12px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 18px;
+    }
+}
+
 #con {
 	background-color: #EDEEFF;
 	border-radius: 15px;
@@ -135,6 +314,18 @@
 					</div>
 				</div>
 				
+				<div class="form-group">
+                	<label for="defPhoto" class="col-lg-1 control-label">Deficiency Photo</label>
+                	<div class="col-lg-8">
+                		<input path="defPhoto" name="defPhoto" class="form-control" id="defPhoto" readonly/> 
+                	</div>
+                	<div class="col-lg-2">
+					<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModalPic">
+                    Add/Change Photo
+                  </button>
+					</div>
+                </div>
+				
 				<div class="form-group">
 					<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
 					<div class="col-lg-8">
@@ -190,7 +381,45 @@
 			</fieldset>
 			</div>
 		</form>
-
 	</div>
+	<div class="modal fade" id="myModalPic">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <div class="container2">
+
+						  <div class="app2">
+			
+						    <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
+						    <video id="camera-stream"></video>
+						    <img id="snap">
+			
+						    <p id="error-message"></p>
+			
+						    <div class="controls">
+						      <a href="#" id="delete-photo" title="Redo Photo" class="disabled"><i class="material-icons">replay</i></a>
+						      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
+						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" class="disabled">
+						      	<i class="material-icons">done</i></a>
+						    </div>
+
+
+			    <canvas></canvas>
+			  </div>
+			</div>
+			
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="saveDone()">Close</button>
+                  
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
 </body>
 </html>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp
index a5e0499..3daad2b 100644
--- a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp
@@ -5,9 +5,187 @@
 <%@ 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" %>
-
+<script src="../scripts/photo.js"></script>
 <title>Add Deficiency: ${unit.homeEnrollmentNumber}</title>
 <style>
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
+@import url('https://fonts.googleapis.com/icon?family=Material+Icons');
+
+*{
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+}
+
+html{
+    background-color: #fff;
+    font:normal 16px/1.5 sans-serif;
+    color: #333;
+}
+
+h3{
+    font: normal 32px/1.5 'Open Sans', sans-serif;
+    color: #2c3e50;
+    margin: 50px 0;
+    text-align: center;
+}
+
+
+.container2{
+    max-width: 1000px;
+    margin: 50px auto;
+    padding: 20px;
+    background-color: #efefef;
+}
+
+.app2{
+    width: 100%;
+    position: relative;
+}
+
+.app2 #start-camera{
+    display: none;
+    border-radius: 3px;
+    max-width: 400px;
+    color: #fff;
+    background-color: #448AFF;
+    text-decoration: none;
+    padding: 15px;
+    opacity: 0.8;
+    margin: 50px auto;
+    text-align: center;
+}
+
+.app2 video#camera-stream{
+    display: none;
+    width: 100%;
+}
+
+.app2 img#snap{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10;
+    display: none;
+}
+
+.app2 #error-message{
+    width: 100%;
+    background-color: #ccc;
+    color: #9b9b9b;
+    font-size: 28px;
+    padding: 200px 100px;
+    text-align: center;
+    display: none;
+}
+
+.app2 .controls{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 20;
+
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    padding: 30px;
+    display: none;
+}
+
+.app2 .controls a{
+    border-radius: 50%;
+    color: #fff;
+    background-color: #111;
+    text-decoration: none;
+    padding: 15px;
+    line-height: 0;
+    opacity: 0.7;
+    outline: none;
+    -webkit-tap-highlight-color: transparent;
+}
+
+.app2 .controls a:hover{
+    opacity: 1;
+}
+
+.app2 .controls a.disabled{
+    background-color: #555;
+    opacity: 0.5;
+    cursor: default;
+    pointer-events: none;
+}
+
+.app2 .controls a.disabled:hover{
+    opacity: 0.5;
+}
+
+.app2 .controls a i{
+    font-size: 18px;
+}
+
+.app2 .controls #take-photo i{
+    font-size: 32px;
+}
+
+.app2 canvas{
+    display: none;
+}
+
+
+
+.app2 video#camera-stream.visible,
+.app2 img#snap.visible,
+.app2 #error-message.visible
+{
+    display: block;
+}
+
+.app2 .controls.visible{
+    display: flex;
+}
+
+
+
+@media(max-width: 1000px){
+    .container2{
+        margin: 40px;
+    }
+
+    .app2 #start-camera.visible{
+        display: block;
+    }
+
+    .app2 .controls a i{
+        font-size: 16px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 24px;
+    }
+}
+
+
+@media(max-width: 600px){
+    .container2{
+        margin: 10px;
+    }
+
+    .app2 #error-message{
+        padding: 80px 50px;
+        font-size: 18px;
+    }
+
+    .app2 .controls a i{
+        font-size: 12px;
+    }
+
+    .app2 .controls #take-photo i{
+        font-size: 18px;
+    }
+}
 #con {
 	background-color: #EDEEFF;
 	border-radius: 15px;
@@ -104,6 +282,18 @@
 							id="description" required="required"> </textarea>
 					</div>
 				</div>
+				
+				<div class="form-group">
+                	<label for="defPhoto" class="col-lg-1 control-label">Deficiency Photo</label>
+                	<div class="col-lg-8">
+                		<input path="defPhoto" name="defPhoto" class="form-control" id="defPhoto" readonly/> 
+                	</div>
+                	<div class="col-lg-2">
+					<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">
+                    Add Photo
+                  </button>
+					</div>
+                </div>
 
 				<div class="form-group">
 					<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
@@ -138,4 +328,43 @@
 			</fieldset>
 		</form>
 	</div>
-	</div>
\ No newline at end of file
+	</div>
+	<div class="modal fade" id="myModal">
+                  <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                      <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                          <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Deficiency Photo</h4>
+                      </div>
+                      <div class="modal-body">
+                        <div class="container2">
+
+						  <div class="app2">
+			
+						    <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
+						    <video id="camera-stream"></video>
+						    <img id="snap">
+			
+						    <p id="error-message"></p>
+			
+						    <div class="controls">
+						      <a href="#" id="delete-photo" title="Redo Photo" class="disabled"><i class="material-icons">replay</i></a>
+						      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
+						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" class="disabled">
+						      	<i class="material-icons">done</i></a>
+						    </div>
+
+
+			    <canvas></canvas>
+			  </div>
+			</div>
+			
+                      </div>
+                      <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="saveDone()">Close</button>
+                  
+                      </div>
+                    </div><!-- /.modal-content -->
+                  </div><!-- /.modal-dialog -->
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
index 3667d15..686390a 100644
--- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
@@ -40,8 +40,8 @@
 		      <th>Deficiency Type</th>
 		      <th>Notes</th>
 		      <th>Assignee</th>
-		      <th style="text-align: center;">Status</th>
 		      <th></th>
+		      <th style="text-align: center;">Status</th>
 		      <th></th>
 		      <th></th>
 		    </tr>

From 88839ea2b11e475b3720ccfa5cf892dd234f5bf2 Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Thu, 24 Nov 2016 10:56:38 -0500
Subject: [PATCH 15/22] fixed the nav bar search and made some formatting
 changes

---
 WebContent/WEB-INF/jsps/default.jsp |  1 -
 WebContent/WEB-INF/jsps/header.jsp  |  2 +-
 WebContent/WEB-INF/jsps/home.jsp    |  5 +--
 WebContent/scripts/script.js        |  3 --
 WebContent/scripts/signing.js       | 51 -----------------------------
 5 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/default.jsp b/WebContent/WEB-INF/jsps/default.jsp
index da36bd5..13025a8 100644
--- a/WebContent/WEB-INF/jsps/default.jsp
+++ b/WebContent/WEB-INF/jsps/default.jsp
@@ -11,7 +11,6 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 
-
 <script src="scripts/script.js"></script>
 <script src="../scripts/script.js"></script>
 
diff --git a/WebContent/WEB-INF/jsps/header.jsp b/WebContent/WEB-INF/jsps/header.jsp
index b69cd41..340b133 100644
--- a/WebContent/WEB-INF/jsps/header.jsp
+++ b/WebContent/WEB-INF/jsps/header.jsp
@@ -46,7 +46,7 @@
               </ul>
               <form class="navbar-form navbar-left" role="search" action="workOrderDisplayUnitDeficiencies">
                 <div class="form-group">
-                  <input id="homeEnrollmentNumberNav" name="homeEnrollmentNumber" type="text" class="form-control" placeholder="Home Enrollment Number" required="required">
+                  <input id="homeEnrollmentNumberNav" name="homeEnrollmentNumber" onkeypress='return event.charCode >= 48 && event.charCode <= 57' type="text" class="form-control" placeholder="Home Enrollment Number" required="required">
                 </div>
                 <button type="submit" class="btn btn-default">Submit</button>
               </form>
diff --git a/WebContent/WEB-INF/jsps/home.jsp b/WebContent/WEB-INF/jsps/home.jsp
index 9fd1dde..6877de3 100644
--- a/WebContent/WEB-INF/jsps/home.jsp
+++ b/WebContent/WEB-INF/jsps/home.jsp
@@ -41,7 +41,6 @@ Extra Large Button CSS
 			<c:url value="/workOrderHome" var="workOrderHome" />
 			<c:url value="/help" var="help" />
 			<c:url value="/buildInspection" var="buildInspection" />
-			
 
 		</div>
 
@@ -61,11 +60,9 @@ Extra Large Button CSS
 
 		<div class="row row-centered">
 			<div class="col-sm-2 text-center"></div>
-		<!-- 	<a href="${help}" class="col-sm-4 btn-xl btn-inverse btn-xl">Help</a> -->
-		<!-- <a href="${Placeholder}" class="col-sm-4 btn-xl btn-inverse btn-xl">Confirm Repairs</a> -->
 
 		</div>
-			<br />
+        <br />
 				
 <legend> </legend>
 	</div>
diff --git a/WebContent/scripts/script.js b/WebContent/scripts/script.js
index 802f0de..6114b7f 100644
--- a/WebContent/scripts/script.js
+++ b/WebContent/scripts/script.js
@@ -11,9 +11,6 @@ $( "#saveBtn" ).prop( "disabled", true );
 $( "#nextBtn" ).prop( "disabled", false );
 $( "#nextBtn" ).prop( "disabled", true );
 
-//document.getElementById("nextBtn").style.visibility = 'visible';
-//document.getElementById("saveBtn").style.visibility = 'visible';
-
 if (used === ""){
 	//alert(used);
 	document.getElementById("nextBtn").style.visibility = 'visible';
diff --git a/WebContent/scripts/signing.js b/WebContent/scripts/signing.js
index 4762514..488bbf0 100644
--- a/WebContent/scripts/signing.js
+++ b/WebContent/scripts/signing.js
@@ -3,18 +3,14 @@ var sigCapture = null;
 var canvas = document.getElementById("signature");
 
 $(document).ready(function(e) {
-
 	sigCapture = new SignatureCapture( "signature" );
-
 });
 
-
 function to_image(){
     var canvas = document.getElementById("signature");
 
     document.getElementById("theimage").src = canvas.toDataURL();
     Canvas2Image.saveAsPNG(canvas);
-
 }
 
 function clearSig() {
@@ -39,50 +35,3 @@ function accept2(){
 	showSave();
 	//alert("hi");
 }
-
-/*
-
-function download() {
-    var dt = canvas.toDataURL('image/jpeg');
-    this.href = dt;
-};
-downloadLnk.addEventListener('click', download, false);
-
-
-$(function() {
-	  $("#acc").click(function() {
-	      html2canvas(document.body, {
-	          onrendered: function(sigCapture) {
-	              return Canvas2Image.saveAsPNG(sigCapture);
-	          }
-	      });
-	  })
-	});
-
-
-//link on displayunit jsp commented out because not working
-function dlCanvas() {
-	  var dt = canvas.toDataURL();
-	  //Change MIME type to trick the browser to downlaod the file instead of displaying it 
-	  //dt = dt.replace(/^data:image\/[^;], 'data:application/octet-stream');
-
-	  //In addition to <a>'s "download" attribute, you can define HTTP-style headers 
-	  //dt = dt.replace(/^data:application\/octet-stream/, 'data:application/octet-stream;headers=Content-Disposition%3A%20attachment%3B%20filename=Canvas.png');
-
-	  this.href = dt;
-	  this.download = 'sig.png';
-	};
-	document.getElementById("dl").addEventListener('click', dlCanvas, false);
-
-
-//these 2 func together do not work
-document.getElementById('download').addEventListener('click', function() {
-    downloadCanvas(this, 'signature', 'test.png');
-}, false);
-
-function downloadCanvas(link, canvasId, filename) {
-    link.href = document.getElementById(canvasId).toDataURL();
-    link.download = filename;
-}
-
-*/

From 7a0b3e1f9495b13dfa1914ec7c8d9ef021d5a984 Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Fri, 25 Nov 2016 12:27:09 -0500
Subject: [PATCH 16/22] removed stuff for profs

---
 WebContent/WEB-INF/jsps/addDeficiency.jsp   | 61 +++++++++++----------
 WebContent/WEB-INF/jsps/displayUnitInfo.jsp |  2 +-
 WebContent/WEB-INF/jsps/editDeficiency.jsp  |  4 +-
 WebContent/WEB-INF/jsps/loginForm.jsp       |  2 +-
 4 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp
index 71f8582..f2083c9 100644
--- a/WebContent/WEB-INF/jsps/addDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp
@@ -363,37 +363,38 @@ var save = false;
 		<legend> </legend>
 	</div>
 	
-	<div class="modal fade" id="myModal">
-                  <div class="modal-dialog" role="document">
-                    <div class="modal-content">
-                      <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                          <span aria-hidden="true">&times;</span>
-                        </button>
-                        <h4 class="modal-title">Deficiency Photo</h4>
-                      </div>
-                      <div class="modal-body">
-                        <div class="container2">
-
-						  <div class="app2">
-			
-						    <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
-						    <video id="camera-stream"></video>
-						    <img id="snap">
-			
-						    <p id="error-message"></p>
-			
-						    <div class="controls">
-						      <a href="#" id="delete-photo" title="Redo Photo" class="disabled"><i class="material-icons">replay</i></a>
-						      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
-						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" class="disabled">
-						      	<i class="material-icons">done</i></a>
-						    </div>
-
+<div class="modal fade" id="myModal">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+            <h4 class="modal-title">Deficiency Photo</h4>
+          </div>
+          <div class="modal-body">
+            <div class="container2">
+
+              <div class="app2">
+
+                <a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
+                <video id="camera-stream"></video>
+                <img id="snap">
+
+                <p id="error-message"></p>
+
+                <div class="controls">
+                  <a href="#" id="delete-photo" title="Redo Photo" class="disabled">
+                    <i class="material-icons">replay</i></a>
+                  <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
+                  <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png"
+                    title="Save Photo" class="disabled">
+                    <i class="material-icons">done</i></a>
+                </div>
 
-			    <canvas></canvas>
-			  </div>
-			</div>
+    <canvas></canvas>
+  </div>
+</div>
 			
                       </div>
                       <div class="modal-footer">
diff --git a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp
index c5bb370..893f368 100644
--- a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp
@@ -243,7 +243,7 @@
     						<canvas id="signature" height="200px" />
     					</div>
 					</div>
-					
+
 					<div><button id="acc2" class="btn btn-primary" onclick="acceptSig()" type="button">Accept</button></div>
 					<div id="acc1"></div>
 					<br><br>
diff --git a/WebContent/WEB-INF/jsps/editDeficiency.jsp b/WebContent/WEB-INF/jsps/editDeficiency.jsp
index 0a0fda4..5a0b5fb 100644
--- a/WebContent/WEB-INF/jsps/editDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/editDeficiency.jsp
@@ -314,7 +314,7 @@ h3{
 					</div>
 				</div>
 				
-				<div class="form-group">
+				<!-- <div class="form-group">
                 	<label for="defPhoto" class="col-lg-1 control-label">Deficiency Photo</label>
                 	<div class="col-lg-8">
                 		<input path="defPhoto" name="defPhoto" class="form-control" id="defPhoto" readonly/> 
@@ -324,7 +324,7 @@ h3{
                     Add/Change Photo
                   </button>
 					</div>
-                </div>
+                </div> -->
 				
 				<div class="form-group">
 					<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
diff --git a/WebContent/WEB-INF/jsps/loginForm.jsp b/WebContent/WEB-INF/jsps/loginForm.jsp
index 7e54d1d..76a964a 100644
--- a/WebContent/WEB-INF/jsps/loginForm.jsp
+++ b/WebContent/WEB-INF/jsps/loginForm.jsp
@@ -35,7 +35,7 @@
 				<input type="submit" value="Login!" onclick="login()" class="btn btn-inverse "
 					style="margin-left: 8.33333333333%" />
 				<c:url value="/createAccount" var="createUrl"/>
-				<a href="${createUrl}" class="btn btn-inverse ">Create an Account</a>
+<!-- 			<a href="${createUrl}" class="btn btn-inverse ">Create an Account</a> -->
 			</fieldset>
 		</form>
 		<div>

From bb2391a8b27fa243bac584cf4437157c70a94781 Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Mon, 28 Nov 2016 11:02:20 -0500
Subject: [PATCH 17/22] added icons and formatted home screen

---
 WebContent/WEB-INF/jsps/default.jsp |  2 ++
 WebContent/WEB-INF/jsps/header.jsp  |  9 +++++++--
 WebContent/WEB-INF/jsps/home.jsp    | 22 +++++++++++++++-------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/default.jsp b/WebContent/WEB-INF/jsps/default.jsp
index 13025a8..1a23dc1 100644
--- a/WebContent/WEB-INF/jsps/default.jsp
+++ b/WebContent/WEB-INF/jsps/default.jsp
@@ -32,6 +32,8 @@
 
 
 <!-- Latest compiled and minified CSS -->
+<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
+      rel="stylesheet">
 <link rel="stylesheet"
 	href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
 	integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
diff --git a/WebContent/WEB-INF/jsps/header.jsp b/WebContent/WEB-INF/jsps/header.jsp
index 340b133..ab37c0a 100644
--- a/WebContent/WEB-INF/jsps/header.jsp
+++ b/WebContent/WEB-INF/jsps/header.jsp
@@ -15,6 +15,11 @@
 	<c:url value="/selectReport" var="reports" />
 	<c:url value="/help" var="help" />
 
+<style>
+.navbar-icons{
+    font-size: 16px;
+}
+</style>
 
 		<nav class="navbar navbar-default">
           <div class="container-fluid">
@@ -25,7 +30,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
               </button>
-              <a class="navbar-brand" href="${home}">aBode</a>
+              <a class="navbar-brand" href="${home}"><i class="material-icons navbar-icons">home</i> aBode</a>
             </div>
 
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -51,7 +56,7 @@
                 <button type="submit" class="btn btn-default">Submit</button>
               </form>
               <ul class="nav navbar-nav navbar-right">
-                <li><a href="${help}">Help</a></li>
+                <li><a href="${help}"><i class="material-icons navbar-icons">settings</i> Help</a></li>
               </ul>
             </div>
           </div>
diff --git a/WebContent/WEB-INF/jsps/home.jsp b/WebContent/WEB-INF/jsps/home.jsp
index 6877de3..518edf7 100644
--- a/WebContent/WEB-INF/jsps/home.jsp
+++ b/WebContent/WEB-INF/jsps/home.jsp
@@ -13,7 +13,7 @@ Extra Large Button CSS
 */
 .btn-xl {
 	padding: 34px 40px;
-	font-size: 25px;
+	font-size: 35px;
 	border-radius: 8px;
 	text-align: center;
 	margin: 20px;
@@ -27,6 +27,14 @@ Extra Large Button CSS
 	color: black;
 }
 
+.home-icons {
+    font-size: 40px;
+}
+
+.col-sm-2 {
+    width: 14%;
+}
+
 
 </style>
 
@@ -44,17 +52,17 @@ Extra Large Button CSS
 
 		</div>
 
-		<div class="row">
+		<div class="row row-centered">
 			<div class="col-sm-2 text-center"></div>
-			<a href="${displayUnitInformation}"	class="col-sm-4 btn-xl btn-inverse">Fill out PDI</a>
-			<a href="${buildInspection}" class="col-sm-4 btn-xl btn-inverse">Build	Inspection</a>
-
+			<a href="${displayUnitInformation}"	class="col-sm-4 btn-xl btn-inverse"><i class="material-icons home-icons" >create</i> PDI</a>
+			<a href="${buildInspection}" class="col-sm-4 btn-xl btn-inverse"><i class="material-icons home-icons" >domain</i> Inspection</a>
+            <div class="col-sm-2 text-center"></div>
 		</div>
 
 		<div class="row">
 			<div class="col-sm-2 text-center"></div>
-			<a href="${workOrderHome}" class="col-sm-4 btn-xl btn-inverse btn-xl">View Work Orders</a>
-			<a href="${selectReport}" class="col-sm-4 btn-xl btn-inverse btn-xl">View Reports</a>
+			<a href="${workOrderHome}" class="col-sm-4 btn-xl btn-inverse btn-xl"><i class="material-icons home-icons" >playlist_add_check</i> Work Orders</a>
+			<a href="${selectReport}" class="col-sm-4 btn-xl btn-inverse btn-xl"><i class="material-icons home-icons" >description</i> Reports</a>
 
 		</div>
 

From 0c7f1078f570d664db04568636791642a67b2855 Mon Sep 17 00:00:00 2001
From: catpoehlman <cat.poehlman@gmail.com>
Date: Mon, 28 Nov 2016 11:04:04 -0500
Subject: [PATCH 18/22] Toggles buttons same size, all large buttons same size,
 help text boxes bigger size

---
 WebContent/WEB-INF/jsps/addSignOff.jsp                |  3 ++-
 .../jsps/displayConstructionPersonnelDeficiencies.jsp |  6 +++---
 WebContent/WEB-INF/jsps/displayUnitInfo.jsp           |  4 +++-
 WebContent/WEB-INF/jsps/help.jsp                      |  8 ++++----
 .../WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp | 11 ++++++++---
 WebContent/css/style.css                              | 10 +++++++++-
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp
index 975a2ae..1b95d8f 100644
--- a/WebContent/WEB-INF/jsps/addSignOff.jsp
+++ b/WebContent/WEB-INF/jsps/addSignOff.jsp
@@ -25,11 +25,12 @@
 	margin: 2%
 }
 #acc2 {
-    padding: 21px 26px;
     font-size: 16px;
     line-height: normal;
     border-radius: 8px;
     color:white;
+    width: 170px;
+    height: 70px;
     }
 </style>
 
diff --git a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
index a3f5087..a857681 100644
--- a/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp
@@ -76,16 +76,16 @@
                   </div><!-- /.modal-dialog -->
                 </div><!-- /.modal -->
 
-				<td>
+				<td style="text-align: center;">
 					<c:choose>
 	              <c:when test="${deficiency.status}">
 		              <c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
-					    <a href="${completeUrl}" class="btn btn-success pull-right">Complete</a>
+					    <a href="${completeUrl}" id="toggleBtnID" class="btn btn-success">Complete</a>
 
 	              </c:when>
 	              <c:otherwise>
 	                <c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
-					    <a href="${completeUrl}" class="btn btn-warning pull-right">Incompleted</a>
+					    <a href="${completeUrl}" id="toggleBtnID" class="btn btn-warning">Incomplete</a>
 	              </c:otherwise>
 	            	</c:choose>
 
diff --git a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp
index c5bb370..f0ebcc7 100644
--- a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp
+++ b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp
@@ -18,12 +18,14 @@
 	border-radius: 15px;
 }
 #acc2 {
-    padding: 21px 26px;
     font-size: 16px;
     line-height: normal;
     border-radius: 8px;
     color:white;
+    width: 170px;
+    height: 70px;
     }
+
 #nextBtn {
     padding: 24px 34px;
     font-size: 16px;
diff --git a/WebContent/WEB-INF/jsps/help.jsp b/WebContent/WEB-INF/jsps/help.jsp
index d9a37b2..8c7df21 100644
--- a/WebContent/WEB-INF/jsps/help.jsp
+++ b/WebContent/WEB-INF/jsps/help.jsp
@@ -9,7 +9,7 @@
 
 <style>
 #feedbackDiv {
-	width: 50%;
+	width: 90%;
 }
 
 #contactTable {
@@ -151,19 +151,19 @@ table td {
 			<div style="margin: 2%">
 				<legend>Submit a Question or Feedback</legend>
 				<div id="feedbackDiv" class="form-group">
-					<div class="col-lg-7 control-label">
+					<div class="col-lg-10 control-label">
 						<input type="text" class="form-control" placeholder="Subject">
 					</div>
 					<br>
 					<br>
-					<div class="col-xs-7 control-label">
+					<div class="col-lg-10 control-label">
 						<textarea rows="9" maxlength="350" class="form-control pull-left"
 							placeholder="Short entry (350 character limit)">
 				</textarea>
 					</div>
 					<br>
 					<br>
-					<div class="col-lg-7 control-label">
+					<div class="col-lg-7 control-label" style="margin:1%">
 						<address> <form id="reset" >
 							<a
 								href="mailto:exampleAbode@exampleAbode.com? subject=Feedback&body=Message"
diff --git a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
index 686390a..fc992d1 100644
--- a/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
+++ b/WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp
@@ -23,6 +23,11 @@
     font-size: 16px;
     line-height: normal;
     border-radius: 8px;
+    }
+    
+    #toggleBtnID{
+    width:120;
+    
     }
     </style>
 
@@ -81,16 +86,16 @@
                   </div><!-- /.modal-dialog -->
                 </div><!-- /.modal -->
 
-				<td>
+				<td style="text-align: center;">
 				    <c:choose>
 	              <c:when test="${unitDeficiency.status}">
 		              <c:url value="/workOrderCompleteDeficiencyUnit/${unitDeficiency.id}/${unitDeficiency.homeEnrollmentNumber}" var="completeUrl" />
-					    <a href="${completeUrl}" class="btn btn-success pull-right">Complete</a>
+					    <a href="${completeUrl}" class="btn btn-success" id="toggleBtnID">Complete</a>
 	                
 	              </c:when>
 	              <c:otherwise>
 	                <c:url value="/workOrderCompleteDeficiencyUnit/${unitDeficiency.id}/${unitDeficiency.homeEnrollmentNumber}" var="completeUrl" />
-					    <a href="${completeUrl}" class="btn btn-warning pull-right">Incompleted</a>
+					    <a href="${completeUrl}" class="btn btn-warning" id="toggleBtnID">Incomplete</a>
 	              </c:otherwise>
 	            	</c:choose>
 				</td>
diff --git a/WebContent/css/style.css b/WebContent/css/style.css
index cafd4d0..1f7520c 100644
--- a/WebContent/css/style.css
+++ b/WebContent/css/style.css
@@ -6,11 +6,17 @@
 Extra Large Button CSS
 */
 .btn-xl {
-    padding: 18px 28px;
+    padding-top: 18px 28px;
     font-size: 22px;
     border-radius: 8px;
+    
 }
 
+#toggleBtnID{
+    width:120px;
+    
+    }
+
 .no-link {
     color:inherit;
     text-decoration:none;
@@ -44,6 +50,8 @@ Extra Large Button CSS
     font-size: 16px;
     line-height: normal;
     border-radius: 8px;
+    width: 170px;
+    height: 70px;
     }
     
 #btnXlg2 {

From 1dd8c2c9e4f7a3a9ab676c8767f19fa7befe0471 Mon Sep 17 00:00:00 2001
From: catpoehlman <cat.poehlman@gmail.com>
Date: Thu, 1 Dec 2016 11:40:04 -0500
Subject: [PATCH 19/22] JS for image name

---
 WebContent/WEB-INF/jsps/addDeficiency.jsp          | 14 +++-----------
 WebContent/WEB-INF/jsps/addDeficiency2.jsp         | 11 ++++++-----
 WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp |  5 +++--
 WebContent/scripts/script.js                       | 10 ++++++++++
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp
index f2083c9..1d54d91 100644
--- a/WebContent/WEB-INF/jsps/addDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/addDeficiency.jsp
@@ -242,14 +242,6 @@ var save = false;
             }
         }
         
-        function saveDone(){
-        	save =true;
-        	var id = document.getElementById("id");
-        	var hen = document.getElementByName("homeEnrollmentNumber");
-			document.getElementById("defPhoto").value = "def"+id+"hen"+hen;
-        	//alert("test");
-        }
-        
         function reallyClose() {
             confirm("You have not saved a photo. Are you sure you want to leave?");
         }
@@ -341,7 +333,7 @@ var save = false;
 					</div>
 				</div>
 
-				<input type="hidden" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
+				<input type="hidden" id="homeEnrollmentNumber" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 				
 				
@@ -388,7 +380,7 @@ var save = false;
                     <i class="material-icons">replay</i></a>
                   <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
                   <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png"
-                    title="Save Photo" class="disabled">
+                    title="Save Photo" class="disabled" onclick="saveDone()">
                     <i class="material-icons">done</i></a>
                 </div>
 
@@ -398,7 +390,7 @@ var save = false;
 			
                       </div>
                       <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="saveDone()">Close</button>
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                   
                       </div>
                     </div><!-- /.modal-content -->
diff --git a/WebContent/WEB-INF/jsps/addDeficiency2.jsp b/WebContent/WEB-INF/jsps/addDeficiency2.jsp
index d350c4d..05d1d9c 100644
--- a/WebContent/WEB-INF/jsps/addDeficiency2.jsp
+++ b/WebContent/WEB-INF/jsps/addDeficiency2.jsp
@@ -245,7 +245,7 @@ h3{
 	<div style="margin: 2%">
 		<c:url value="/saveDeficiency2" var="url" />
 		<form name="form" class="form-horizontal" method="post" onsubmit="return Validate()" action="${url}">
-
+		<div class="jumbotron" id="con">
 			<fieldset>
 				<legend>Enter or Edit Information</legend>
 
@@ -326,15 +326,15 @@ h3{
                         </select>
 					</div>
 				</div>
-
-				<input type="hidden" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
+</div>
+				<input type="hidden" id="homeEnrollmentNumber" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 				
 				<input type="submit" value="Save Deficiency" class="btn btn-primary" id="btnXlg2" style="margin-left: 8.33333333333%" />
 					
 					
 			    <c:url value="/displayUnitDeficiencies2/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies2" />
-			    <a href="${displayUnitDeficiencies2}" id="btnXlg2" class="pull-right btn btn-default">Back</a>
+			    <a href="${displayUnitDeficiencies2}" id="btnXlg2" class="pull-right btn btn-default" style="margin-right: 8.33333333333%">Back</a>
 
 			</fieldset>
 		</form>
@@ -363,7 +363,8 @@ h3{
 						    <div class="controls">
 						      <a href="#" id="delete-photo" title="Redo Photo" class="disabled"><i class="material-icons">replay</i></a>
 						      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
-						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" class="disabled">
+						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" 
+						      onclick="saveDone()" class="disabled">
 						      	<i class="material-icons">done</i></a>
 						    </div>
 
diff --git a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp
index 3daad2b..770ffc7 100644
--- a/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp
+++ b/WebContent/WEB-INF/jsps/workOrderAddDeficiency.jsp
@@ -317,7 +317,7 @@ h3{
 					</div>
 				</div>
 
-				<input type="hidden" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
+				<input type="hidden" id="homeEnrollmentNumber" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
 
 				<input type="submit" value="Save Deficiency" id="btnXlg" class="btn btn-primary" style="margin-left: 8.33333333333%" />
@@ -352,7 +352,8 @@ h3{
 						    <div class="controls">
 						      <a href="#" id="delete-photo" title="Redo Photo" class="disabled"><i class="material-icons">replay</i></a>
 						      <a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
-						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" class="disabled">
+						      <a href="#" id="download-photo" download="def${deficiency.id}hen${unit.homeEnrollmentNumber}.png" title="Save Photo" 
+						      onclick="saveDone()" class="disabled">
 						      	<i class="material-icons">done</i></a>
 						    </div>
 
diff --git a/WebContent/scripts/script.js b/WebContent/scripts/script.js
index 6114b7f..6e44f50 100644
--- a/WebContent/scripts/script.js
+++ b/WebContent/scripts/script.js
@@ -98,4 +98,14 @@ function verify() {
 		document.getElementById("error").innerHTML = "Please check your passwords";
 		return false;
 	}
+}
+
+function saveDone(){
+	//save =true;
+	
+	var id = document.getElementById("id").value;
+	var hen = document.getElementById("homeEnrollmentNumber").value;
+	//alert("test");
+	document.getElementById("defPhoto").value = "Deficiency"+id+".png";
+	//alert("test");
 }
\ No newline at end of file

From c89f132019044cf1b6cad1b3e2c06d4f4279b952 Mon Sep 17 00:00:00 2001
From: Elviis <jonathansakowski@Gmail.com>
Date: Thu, 1 Dec 2016 12:07:02 -0500
Subject: [PATCH 20/22] Fixed the report collapsing

---
 WebContent/WEB-INF/jsps/pdiReport.jsp         | 36 ++++++++++++++++---
 WebContent/scripts/script.js                  |  8 ++++-
 .../services/ControllerServices.java          |  4 +--
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/WebContent/WEB-INF/jsps/pdiReport.jsp b/WebContent/WEB-INF/jsps/pdiReport.jsp
index f6f0452..b31868b 100644
--- a/WebContent/WEB-INF/jsps/pdiReport.jsp
+++ b/WebContent/WEB-INF/jsps/pdiReport.jsp
@@ -6,6 +6,7 @@
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
+
 <style>
 #con {
 	background-color: #EDEEFF;
@@ -25,7 +26,28 @@ label {
 }
 
 </style>
-	
+	<body>
+			<c:choose>
+              <c:when test="${displayPage}">
+                <script>
+              
+                window.onload = function (){
+                    document.getElementById("mainReportDiv").style.display = 'visible';
+      				}
+                </script>
+                
+              </c:when>
+              <c:otherwise>
+                 <script>
+                 window.onload = function (){
+                     document.getElementById("mainReportDiv").style.display = 'none';
+                     
+       				}
+				 </script>
+               
+              </c:otherwise>
+            </c:choose>
+
 <title>Tarion PDI Form: ${unit.homeEnrollmentNumber}</title>
 
 <div id="divCon">
@@ -43,7 +65,7 @@ label {
 
 			<div class="form-group" style="margin: 2%">
 				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
-				<input type="submit" value="Go!" id="btnXlg" class="pull-right btn btn-primary" />
+				<input type="submit" value="Load Report" id="btnXlg" class="pull-right btn btn-primary" onclick="showPdiReport" />
 
 			</div>
 
@@ -64,11 +86,12 @@ label {
 
 
 	</div>
+	<div id="mainReportDiv">
 	
 		<c:url value="/pdiReport" var="url" />
 		<form name="form" class="form-horizontal" method="post"	action="${url}">
 			<fieldset>
-				<legend>TARION Pre-Delivery Inspection Form</legend>
+				<legend>List of Deficiencies</legend>
 				<div>
 					<table class="table table-striped table-hover">
 						<thead>
@@ -94,6 +117,8 @@ label {
 		
 	</div>
 	
+	<legend>Review of PDI</legend>
+	
 	<div class="jumbotron" id="legendCon" style="background-color:#EDEEFF">
 
 		<div class="form-group" style="margin: 2%">
@@ -247,7 +272,7 @@ label {
 			<input type="hidden" name="homeEnrollmentNumber" value="" /> 
 			<input	type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 		</div>
-		
+		</div>
 	<div class="jumbotron" id="legendCon" style="background-color:#EDEEFF; ">
 		<div style="padding:1%;" class="col-lg-12">	
 
@@ -264,4 +289,5 @@ label {
 	</div>
 	
 </div>
-</div>
\ No newline at end of file
+</div>
+</body>
\ No newline at end of file
diff --git a/WebContent/scripts/script.js b/WebContent/scripts/script.js
index 6114b7f..182e798 100644
--- a/WebContent/scripts/script.js
+++ b/WebContent/scripts/script.js
@@ -5,12 +5,14 @@ function hide(){
 used = document.getElementById("repName").value;
 //disable save on load
 $( "#saveBtn" ).prop( "disabled", true );
-
+document.getElementById("mainReportDiv").style.visibility = 'hidden';
 //test not hidden
 
 $( "#nextBtn" ).prop( "disabled", false );
 $( "#nextBtn" ).prop( "disabled", true );
 
+
+
 if (used === ""){
 	//alert(used);
 	document.getElementById("nextBtn").style.visibility = 'visible';
@@ -25,6 +27,10 @@ function showSave(){
 	document.getElementById("saveBtn").style.visibility = 'visible';
 }
 
+function showPdiReport(){
+	document.getElementById("saveBtn").style.visibility = "visible";
+}
+
 function enableNextBtn(){
 	$('a').disable(false);
 }
diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java
index fe12aec..8e316c5 100644
--- a/src/ca/sheridancollege/services/ControllerServices.java
+++ b/src/ca/sheridancollege/services/ControllerServices.java
@@ -124,7 +124,7 @@ public Model displayUnitData(Model model, long homeEnrollmentNumber, long num) {
 
             //String img = form.get(0).getRepSig().toString();
             model.addAttribute("errorHomeEnrollmentNumber", false);
-
+            model.addAttribute("displayPage", true);
             return model;
         } else {
 
@@ -490,7 +490,7 @@ public Model displayPdiReport(Model model, long homeEnrollmentNumber) {
             }
             model.addAttribute("unit", unit.get(0));
             model.addAttribute("builder", builder.get(0));
-
+            model.addAttribute("displayPage", true);
             return model;
         } else {
 

From 7f18a74174589e08a66f7330c97c105c872aac1b Mon Sep 17 00:00:00 2001
From: perds <aperdec@gmail.com>
Date: Thu, 1 Dec 2016 14:41:15 -0500
Subject: [PATCH 21/22] edited some botton css

---
 WebContent/WEB-INF/jsps/pdiReport.jsp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/WebContent/WEB-INF/jsps/pdiReport.jsp b/WebContent/WEB-INF/jsps/pdiReport.jsp
index b31868b..1dc16b9 100644
--- a/WebContent/WEB-INF/jsps/pdiReport.jsp
+++ b/WebContent/WEB-INF/jsps/pdiReport.jsp
@@ -25,6 +25,11 @@ label {
 	background-color: white;
 }
 
+.jumbotron {
+    padding-top: 10px;
+    padding-bottom: 85px;
+}
+
 </style>
 	<body>
 			<c:choose>

From 40d8557c2654950759c22edf71ff214b8d6af94e Mon Sep 17 00:00:00 2001
From: catpoehlman <cat.poehlman@gmail.com>
Date: Thu, 1 Dec 2016 19:03:29 -0500
Subject: [PATCH 22/22] logo now appears

---
 WebContent/WEB-INF/jsps/footer.jsp    |   3 ++-
 WebContent/WEB-INF/jsps/loginForm.jsp |   4 +++-
 WebContent/img/abode.png              | Bin 0 -> 22924 bytes
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 WebContent/img/abode.png

diff --git a/WebContent/WEB-INF/jsps/footer.jsp b/WebContent/WEB-INF/jsps/footer.jsp
index 0b56c64..239bff4 100644
--- a/WebContent/WEB-INF/jsps/footer.jsp
+++ b/WebContent/WEB-INF/jsps/footer.jsp
@@ -6,6 +6,7 @@
 <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
-<div style="text-align:center;">Copyright 2016 Jack Software</div>
+<div style="text-align:center;"><img src="https://s14.postimg.org/56v67gjap/abode.png" width="50px" style="margin-bottom:0.5%"><br>
+Copyright 2016 Jack Software</div>
 <br />
 <br />
\ No newline at end of file
diff --git a/WebContent/WEB-INF/jsps/loginForm.jsp b/WebContent/WEB-INF/jsps/loginForm.jsp
index 76a964a..4dc4e65 100644
--- a/WebContent/WEB-INF/jsps/loginForm.jsp
+++ b/WebContent/WEB-INF/jsps/loginForm.jsp
@@ -10,11 +10,12 @@
 	<c:if test="${param.error != null}">
 		<div id="error">No such account exists.  Please check your username and password!</div>
 	</c:if>
+
 	<div style="margin:8%">
 		<c:url value ="/login" var="url" />
 		<form name="form" method="post" class="form-horizontal" action="${url}">
 			<fieldset>
-				<legend>Login</legend>
+				<legend><img src="https://s14.postimg.org/56v67gjap/abode.png" width="60px" style="margin-bottom:1%"><br>Login</legend>
 				
 				<div class="form-group">
 					<label for="inputUsername" class="col-lg-1 control-label">Username</label>
@@ -41,6 +42,7 @@
 		<div>
 		</br></br></br>
 		<center>
+		
 		Powered by</br>
 		<img src="https://s22.postimg.org/k1hque3wh/Jack_Software_Logo.png" alt="img/JSLogo.png" width="200px">
 		</center>
diff --git a/WebContent/img/abode.png b/WebContent/img/abode.png
new file mode 100644
index 0000000000000000000000000000000000000000..06b53645383d13e95a56966001453ae1b0fdd10f
GIT binary patch
literal 22924
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
b{Qm&}?p`~TSHuH|00000NkvXXu0mjfS|XV=

literal 0
HcmV?d00001