aperdec · aperdec · Oct 7, 2016 · Sep 27, 2016 · Sep 27, 2016 · Sep 28, 2016
diff --git a/WebContent/WEB-INF/jsps/addDeficiency.jsp b/WebContent/WEB-INF/jsps/addDeficiency.jsp
@@ -27,7 +27,7 @@
 	src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
 	integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
 	crossorigin="anonymous"></script>
-<title>Perds' Wiki</title>
+<title>Add Deficiency: ${unit.homeEnrollmentNumber}</title>
 </head>
 <body>
 
@@ -41,19 +41,28 @@
 				<div class="form-group">
 					<label for="id" class="col-lg-1 control-label">Deficiency Number</label>
 					<div class="col-lg-10">
-						<input path="id" name="id" class="form-control" id="id" placeholder="Id" required="required" />
+						<input path="id" name="id" class="form-control" id="id" value="${deficiency.id}" readonly/>
 					</div>
 				</div>
 
 				<div class="form-group">
-					<label for="location" class="col-lg-2 control-label">Location</label>
+                	<label for="deadline" class="col-lg-1 control-label">Deadline</label>
+                	<div class="col-lg-10">
+                		<input path="deadline" name="deadline" class="form-control" id="deadline" value="${unit.posessionDate}" readonly/>
+                	</div>
+                </div>
+
+				<div class="form-group">
+					<label for="location" class="col-lg-1 control-label">Location</label>
 					<div class="col-lg-10">
 						<select name="location" class="form-control" id="location">
 							<option>Kitchen</option>
+							<option>Master Bedroom</option>
 							<option>Bedroom</option>
 							<option>Living Room</option>
+							<option>Dining Room</option>
 							<option>Hallway</option>
-							<option>Bedroom</option>
+							<option>Master Washroom</option>
 							<option>Washroom</option>
 						</select>
 					</div>
@@ -68,28 +77,37 @@
 				</div>
 
 				<div class="form-group">
-					<label for="constructionPersonnel" class="col-lg-2 control-label">Assign To</label>
+					<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
 					<div class="col-lg-10">
 						<select class="form-control" id="constructionPersonnel" name="constructionPersonnel">
-							<option>Jane Smith</option>
-							<option>Joey Batts</option>
-							<option>Jackson Trig</option>
-							<option>Jeffeory Spindle</option>
-							<option>Jim Gerale</option>
-							<option>Joelle Done</option>
+							<c:forEach var="constructionPersonnel" items="${constructionPersonnelList}">
+                                 <option>${constructionPersonnel.name}</option>
+                            </c:forEach>
 						</select>
 					</div>
 				</div>
 
+                <div class="form-group">
+					<label for="category" class="col-lg-1 control-label">Category</label>
+					<div class="col-lg-10">
+						<select class="form-control" id="category" name="category">
+				        <c:forEach var="category" items="${categories.categoryList}">
+                	        <option>${category.subCategoryName}</option>
+                        </c:forEach>
+                        </select>
+					</div>
+				</div>
+
+
+
 				<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 "
-					style="margin-left: 8.33333333333%" />
+				<input type="submit" value="Save Deficiency" class="btn btn-primary" style="margin-left: 8.33333333333%" />
 
 
-			        <c:url value="/displayUnitDeficiencies/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
-					<a href="${displayUnitDeficiencies}" class="pull-right btn btn-default">Back</a>
+			    <c:url value="/displayUnitDeficiencies/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
+			    <a href="${displayUnitDeficiencies}" class="pull-right btn btn-default">Back</a>
 
 
 

diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp
@@ -8,11 +8,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 
-<script src="scripts/modernizr.custom.34982.js"></script>
-
-<script src="scripts/signing.js"></script>
-<script src="scripts/signatureCapture.js"></script>
+<script src="../scripts/modernizr.custom.34982.js"></script>
 
+<script src="../scripts/signing.js"></script>
+<script src="../scripts/signatureCapture.js"></script>
 <script
 	src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
 <!-- Latest compiled and minified CSS -->
@@ -40,110 +39,95 @@
 #canvasContainer {
     border: 1px solid grey;
     border-radius: 5px;
+    background-color:white;
+}
+#smallJum{
+	background-color:#EDEEFF;
+	padding: 2%;
+	border-radius: 15px;
 }
 </style>
 <title>SignOff Form</title>
 </head>
 <body>
 
-	<!-- <p style="font-size:160%;">aBode</p> -->
-
-
-
 	<div style="margin: 2%">
-
-		<c:url value="/register" var="url" />
-		<form name="form" method="post" action="${url}"
-			class="form-horizontal" onsubmit="return verify()">
-			<!-- May not need!!
-			<div class="form-group">
-
-					<label for="homeCivicAddress" class="col-lg-8 control-label">Vendor/Builder and Home Address Information</label>
-
-					<div class="col-lg-4">
-						<input path="homeCivicAddress" name="txtHomeCivicAddress"
-							class="form-control" id="homeCivicAddress" placeholder="Enter Home Enrollment Number"
-							required="required" type="text" />
-					</div>
-
-
-				</div>
-
-				<div class="form-group">
-				</div> -->
-
-
-			<fieldset>
+	<div id="smallJum">
+	<fieldset>
+		<c:url value="/addSignOff" var="url" />
+		<form name="form" method="post" action="${url}"	class="form-horizontal" onsubmit="return verify()">
 
 				<legend>SignOff Form</legend>
 
-
 				<div class="form-group">
-                                    <p>I have inspected my new home and I agree that the descriptions of the items listed on this form are accurate.</p>	
+                	<p>I have inspected my new home and I agree that the descriptions of the items listed on
+                	 this form are accurate.</p>	
 				</div>
 
-				<!-- -->
+				<!--entry row 1 -->
 
 				<div class="form-group">
 					<label for="date" class="col-lg-3 control-label">Date</label>
 
 					<div class="col-lg-2">
-						<input path="date" name="txtDate" class="form-control"
-							id="level" placeholder="" required="required" type="text" />
-					</div>
+						<input path="date" name="date" class="form-control" value="${form.date}"
+							id="date" placeholder="" required="required" type="text" />
 					</div>
+				</div>
+				<!--entry row 2 -->
 				<div class="form-group">
 
-					<label for="purchasersName" class="col-lg-3 control-label">Purchaser's Name</label>
+					<label for="purchName" class="col-lg-3 control-label">Purchaser's Name</label>
 
 					<div class="col-lg-4">
-						<input path="purchasersName" name="txtPurchasersName" class="form-control" id="purchasersName"
-							placeholder="" required="required" type="text" />
+						<input path="purchName" name="txtPurchasersName" class="form-control" id="purchName"
+							placeholder="" value="${form.purchName}" required="required" type="text" />
 					</div>
+				</div>
+				<!--entry row 3 -->
+				<div class="form-group">
+				<label for="desName" class="col-lg-3 control-label">Designator's Name</label>
 
-					<label for="designatorsName" class="col-lg-3 control-label">Designator's * Name</label>
-
-					<div class="col-lg-2">
-						<input path="designatorsName" name="txtDesignatorsName"
-							class="form-control" id="designatorsName"
-							placeholder="" required="required" type="text" />
+					<div class="col-lg-4">
+						<input path="desName" name="desName" class="form-control" id="desName" value="${form.desName}"
+							placeholder="" type="text" />
 
 					</div>
 				</div>
+				<!-- row 4 -->
+				<input type="hidden" name="homeEnrollmentNumber" value="${form.homeEnrollmentNumber}"/>
+				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
+				<div class="form-group">
+					<input type="submit" value="Save" class="pull-right btn btn-primary" />
 
-				<!-- end of row 2 start of row 3 -->
-
+				</div>
+                </form>
 				<div class="form-group">
 
-					<label for="purchasersSig" class="col-lg-3 control-label">Designator / Purchaser's Signature</label>
+					<label for="finalSig" class="col-lg-3 control-label">Designator / Purchaser's Signature</label>
 					<div class="col-lg-4">
 						<div id="canvasContainer" width="300px" >
     						<canvas id="signature" height="200px" />
     					</div>
 					</div>
-					<!--<div><button onclick="to_image()">Accept</button></div>-->
-					<div><button id="acc2" onclick="accept()">Accept</button></div>
+
+					<div><button id="acc2" onclick="accept()" class="btn btn-primary btn-sm">Accept</button></div>
 					<div id="acc1"></div>
 					<br><br>
-					<div><button onclick="clearSig()">Redo</button></div>
-
-					<!--  
-					<div class="col-lg-4">
-						<input path="purchasersSig" name="txtPurchasersSig"
-							class="form-control" id="purchasersSig" placeholder=""
-							required="required" type="text" />
-					</div> -->
+					<div><button onclick="clearSig()" class="btn btn-default btn-sm">Redo</button></div>				
 
-
-				</div>
-
-				<!-- end of row 3 start of row 4 -->
-                                <div class="form-group">
-                                    <p>* Purchasers or owners who intend to designate someone to conduct the PDI in their place should ensure they 
-                                        provide written authority to the vendor/builder authorizing the designate to sign this form on their behalf</p>
-                                    <br>
-                                    <!-- <p>I the homeowner, confirm that all repair work listed has been completed.</p> -->
-                                </div>
+</div>
+				</fieldset>
+</div>
+</div>
+				<!-- end text -->
+
+                <div>
+	                <p>* Purchasers or owners who intend to designate someone to conduct the PDI in their place should ensure they 
+	                   provide written authority to the vendor/builder authorizing the designate to sign this form on their behalf</p>
+	                 <br>
+                 <!-- <p>I the homeowner, confirm that all repair work listed has been completed.</p> -->
+                 </div>
 
 				<!-- end of row 5 start of row 6 -->
 				<!-- MAY NOT NEED
@@ -169,19 +153,17 @@
 
 				<!-- end of row 6 start of row 7 -->
 
-					<div class="form-group">
+				<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
+
+				<div class="form-group">
 			        <c:url value="/" var="home" />
-					<a href="${home}" class="pull-right btn btn-default">Finish</a>
+					<a href="${home}" class="pull-right btn btn-success" id="nextBtn">Finish</a>
 
-					</div>
+				</div>
 
 				<div class="form-group">
-
-
-					<input type="hidden" name="${_csrf.parameterName}"
-						value="${_csrf.token}" /> <input type="submit" value="Save"
-						class="pull-right btn btn-default" onclick="verify()"
-						 />
+			        <c:url value="/displayUnitDeficiencies/${form.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
+					<a href="${displayUnitDeficiencies}" class="pull-left btn btn-default" id="backBtn">Back</a>
 
 				</div>
 
@@ -190,8 +172,7 @@
 				<!-- end -->
 
 
-                        </fieldset>
-                </form>
+
 
 	</div>
 

diff --git a/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp b/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp
@@ -0,0 +1,49 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+	pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<script
+	src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
+<!-- Latest compiled and minified CSS -->
+<link rel="stylesheet"
+	href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
+	integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
+	crossorigin="anonymous">
+
+<!-- Optional theme -->
+<link rel="stylesheet"
+	href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css"
+	integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r"
+	crossorigin="anonymous">
+
+<!-- Latest compiled and minified JavaScript -->
+<script
+	src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
+	integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
+	crossorigin="anonymous"></script>
+
+<title>aBode</title>
+</head>
+<body>
+
+	<div style="margin: 2%">
+		<div class="list-group">
+			<c:forEach var="project" items="${projectList}">
+				<c:url value="/displayUnits/${project}" var="viewUrl" />
+				<a href="${viewUrl}" class="list-group-item"> ${project} </a>
+			</c:forEach>
+		</div>
+	</div>
+
+	<div style="padding: 0% 2%">
+
+    	<c:url value="/workOrderHome" var="backUrl" />
+    	<a href="${backUrl}" class="btn btn-default">Back</a>
+    </div>
+
+</body>
+</html>