Skip to content

Commit a38bf79

Browse files
aperdecaperdec
authored
Merge pull request #100 from aperdec/develop
aBode 0.6 release
2 parents d8fa3b6 + 351e6ee commit a38bf79

51 files changed

Lines changed: 3213 additions & 1224 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎WebContent/WEB-INF/jsps/addDeficiency.jsp‎

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
2828
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
2929
crossorigin="anonymous"></script>
30-
<title>Perds' Wiki</title>
30+
<title>Add Deficiency: ${unit.homeEnrollmentNumber}</title>
3131
</head>
3232
<body>
3333

@@ -41,19 +41,28 @@
4141
<div class="form-group">
4242
<label for="id" class="col-lg-1 control-label">Deficiency Number</label>
4343
<div class="col-lg-10">
44-
<input path="id" name="id" class="form-control" id="id" placeholder="Id" required="required" />
44+
<input path="id" name="id" class="form-control" id="id" value="${deficiency.id}" readonly/>
4545
</div>
4646
</div>
4747

4848
<div class="form-group">
49-
<label for="location" class="col-lg-2 control-label">Location</label>
49+
<label for="deadline" class="col-lg-1 control-label">Deadline</label>
50+
<div class="col-lg-10">
51+
<input path="deadline" name="deadline" class="form-control" id="deadline" value="${unit.posessionDate}" readonly/>
52+
</div>
53+
</div>
54+
55+
<div class="form-group">
56+
<label for="location" class="col-lg-1 control-label">Location</label>
5057
<div class="col-lg-10">
5158
<select name="location" class="form-control" id="location">
5259
<option>Kitchen</option>
60+
<option>Master Bedroom</option>
5361
<option>Bedroom</option>
5462
<option>Living Room</option>
63+
<option>Dining Room</option>
5564
<option>Hallway</option>
56-
<option>Bedroom</option>
65+
<option>Master Washroom</option>
5766
<option>Washroom</option>
5867
</select>
5968
</div>
@@ -68,28 +77,37 @@
6877
</div>
6978

7079
<div class="form-group">
71-
<label for="constructionPersonnel" class="col-lg-2 control-label">Assign To</label>
80+
<label for="constructionPersonnel" class="col-lg-1 control-label">Assign To</label>
7281
<div class="col-lg-10">
7382
<select class="form-control" id="constructionPersonnel" name="constructionPersonnel">
74-
<option>Jane Smith</option>
75-
<option>Joey Batts</option>
76-
<option>Jackson Trig</option>
77-
<option>Jeffeory Spindle</option>
78-
<option>Jim Gerale</option>
79-
<option>Joelle Done</option>
83+
<c:forEach var="constructionPersonnel" items="${constructionPersonnelList}">
84+
<option>${constructionPersonnel.name}</option>
85+
</c:forEach>
8086
</select>
8187
</div>
8288
</div>
8389

90+
<div class="form-group">
91+
<label for="category" class="col-lg-1 control-label">Category</label>
92+
<div class="col-lg-10">
93+
<select class="form-control" id="category" name="category">
94+
<c:forEach var="category" items="${categories.categoryList}">
95+
<option>${category.subCategoryName}</option>
96+
</c:forEach>
97+
</select>
98+
</div>
99+
</div>
100+
101+
102+
84103
<input type="hidden" name="homeEnrollmentNumber" value="${unit.homeEnrollmentNumber}"/>
85104
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
86105

87-
<input type="submit" value="Save Deficiency" class="btn btn-primary "
88-
style="margin-left: 8.33333333333%" />
106+
<input type="submit" value="Save Deficiency" class="btn btn-primary" style="margin-left: 8.33333333333%" />
89107

90108

91-
<c:url value="/displayUnitDeficiencies/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
92-
<a href="${displayUnitDeficiencies}" class="pull-right btn btn-default">Back</a>
109+
<c:url value="/displayUnitDeficiencies/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
110+
<a href="${displayUnitDeficiencies}" class="pull-right btn btn-default">Back</a>
93111

94112

95113

‎WebContent/WEB-INF/jsps/addSignOff.jsp‎

Lines changed: 61 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
<head>
99
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
1010

11-
<script src="scripts/modernizr.custom.34982.js"></script>
12-
13-
<script src="scripts/signing.js"></script>
14-
<script src="scripts/signatureCapture.js"></script>
11+
<script src="../scripts/modernizr.custom.34982.js"></script>
1512

13+
<script src="../scripts/signing.js"></script>
14+
<script src="../scripts/signatureCapture.js"></script>
1615
<script
1716
src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
1817
<!-- Latest compiled and minified CSS -->
@@ -40,110 +39,95 @@
4039
#canvasContainer {
4140
border: 1px solid grey;
4241
border-radius: 5px;
42+
background-color:white;
43+
}
44+
#smallJum{
45+
background-color:#EDEEFF;
46+
padding: 2%;
47+
border-radius: 15px;
4348
}
4449
</style>
4550
<title>SignOff Form</title>
4651
</head>
4752
<body>
4853

49-
<!-- <p style="font-size:160%;">aBode</p> -->
50-
51-
52-
5354
<div style="margin: 2%">
54-
55-
<c:url value="/register" var="url" />
56-
<form name="form" method="post" action="${url}"
57-
class="form-horizontal" onsubmit="return verify()">
58-
<!-- May not need!!
59-
<div class="form-group">
60-
61-
<label for="homeCivicAddress" class="col-lg-8 control-label">Vendor/Builder and Home Address Information</label>
62-
63-
<div class="col-lg-4">
64-
<input path="homeCivicAddress" name="txtHomeCivicAddress"
65-
class="form-control" id="homeCivicAddress" placeholder="Enter Home Enrollment Number"
66-
required="required" type="text" />
67-
</div>
68-
69-
70-
</div>
71-
72-
<div class="form-group">
73-
</div> -->
74-
75-
76-
<fieldset>
55+
<div id="smallJum">
56+
<fieldset>
57+
<c:url value="/addSignOff" var="url" />
58+
<form name="form" method="post" action="${url}" class="form-horizontal" onsubmit="return verify()">
7759

7860
<legend>SignOff Form</legend>
7961

80-
8162
<div class="form-group">
82-
<p>I have inspected my new home and I agree that the descriptions of the items listed on this form are accurate.</p>
63+
<p>I have inspected my new home and I agree that the descriptions of the items listed on
64+
this form are accurate.</p>
8365
</div>
8466

85-
<!-- -->
67+
<!--entry row 1 -->
8668

8769
<div class="form-group">
8870
<label for="date" class="col-lg-3 control-label">Date</label>
8971

9072
<div class="col-lg-2">
91-
<input path="date" name="txtDate" class="form-control"
92-
id="level" placeholder="" required="required" type="text" />
93-
</div>
73+
<input path="date" name="date" class="form-control" value="${form.date}"
74+
id="date" placeholder="" required="required" type="text" />
9475
</div>
76+
</div>
77+
<!--entry row 2 -->
9578
<div class="form-group">
9679

97-
<label for="purchasersName" class="col-lg-3 control-label">Purchaser's Name</label>
80+
<label for="purchName" class="col-lg-3 control-label">Purchaser's Name</label>
9881

9982
<div class="col-lg-4">
100-
<input path="purchasersName" name="txtPurchasersName" class="form-control" id="purchasersName"
101-
placeholder="" required="required" type="text" />
83+
<input path="purchName" name="txtPurchasersName" class="form-control" id="purchName"
84+
placeholder="" value="${form.purchName}" required="required" type="text" />
10285
</div>
86+
</div>
87+
<!--entry row 3 -->
88+
<div class="form-group">
89+
<label for="desName" class="col-lg-3 control-label">Designator's Name</label>
10390

104-
<label for="designatorsName" class="col-lg-3 control-label">Designator's * Name</label>
105-
106-
<div class="col-lg-2">
107-
<input path="designatorsName" name="txtDesignatorsName"
108-
class="form-control" id="designatorsName"
109-
placeholder="" required="required" type="text" />
91+
<div class="col-lg-4">
92+
<input path="desName" name="desName" class="form-control" id="desName" value="${form.desName}"
93+
placeholder="" type="text" />
11094

11195
</div>
11296
</div>
97+
<!-- row 4 -->
98+
<input type="hidden" name="homeEnrollmentNumber" value="${form.homeEnrollmentNumber}"/>
99+
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
100+
<div class="form-group">
101+
<input type="submit" value="Save" class="pull-right btn btn-primary" />
113102

114-
<!-- end of row 2 start of row 3 -->
115-
103+
</div>
104+
</form>
116105
<div class="form-group">
117106

118-
<label for="purchasersSig" class="col-lg-3 control-label">Designator / Purchaser's Signature</label>
107+
<label for="finalSig" class="col-lg-3 control-label">Designator / Purchaser's Signature</label>
119108
<div class="col-lg-4">
120109
<div id="canvasContainer" width="300px" >
121110
<canvas id="signature" height="200px" />
122111
</div>
123112
</div>
124-
<!--<div><button onclick="to_image()">Accept</button></div>-->
125-
<div><button id="acc2" onclick="accept()">Accept</button></div>
113+
114+
<div><button id="acc2" onclick="accept()" class="btn btn-primary btn-sm">Accept</button></div>
126115
<div id="acc1"></div>
127116
<br><br>
128-
<div><button onclick="clearSig()">Redo</button></div>
129-
130-
<!--
131-
<div class="col-lg-4">
132-
<input path="purchasersSig" name="txtPurchasersSig"
133-
class="form-control" id="purchasersSig" placeholder=""
134-
required="required" type="text" />
135-
</div> -->
117+
<div><button onclick="clearSig()" class="btn btn-default btn-sm">Redo</button></div>
136118

137-
138-
</div>
139-
140-
<!-- end of row 3 start of row 4 -->
141-
<div class="form-group">
142-
<p>* Purchasers or owners who intend to designate someone to conduct the PDI in their place should ensure they
143-
provide written authority to the vendor/builder authorizing the designate to sign this form on their behalf</p>
144-
<br>
145-
<!-- <p>I the homeowner, confirm that all repair work listed has been completed.</p> -->
146-
</div>
119+
</div>
120+
</fieldset>
121+
</div>
122+
</div>
123+
<!-- end text -->
124+
125+
<div>
126+
<p>* Purchasers or owners who intend to designate someone to conduct the PDI in their place should ensure they
127+
provide written authority to the vendor/builder authorizing the designate to sign this form on their behalf</p>
128+
<br>
129+
<!-- <p>I the homeowner, confirm that all repair work listed has been completed.</p> -->
130+
</div>
147131

148132
<!-- end of row 5 start of row 6 -->
149133
<!-- MAY NOT NEED
@@ -169,19 +153,17 @@
169153

170154
<!-- end of row 6 start of row 7 -->
171155

172-
<div class="form-group">
156+
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
157+
158+
<div class="form-group">
173159
<c:url value="/" var="home" />
174-
<a href="${home}" class="pull-right btn btn-default">Finish</a>
160+
<a href="${home}" class="pull-right btn btn-success" id="nextBtn">Finish</a>
175161

176-
</div>
162+
</div>
177163

178164
<div class="form-group">
179-
180-
181-
<input type="hidden" name="${_csrf.parameterName}"
182-
value="${_csrf.token}" /> <input type="submit" value="Save"
183-
class="pull-right btn btn-default" onclick="verify()"
184-
/>
165+
<c:url value="/displayUnitDeficiencies/${form.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
166+
<a href="${displayUnitDeficiencies}" class="pull-left btn btn-default" id="backBtn">Back</a>
185167

186168
</div>
187169

@@ -190,8 +172,7 @@
190172
<!-- end -->
191173

192174

193-
</fieldset>
194-
</form>
175+
195176

196177
</div>
197178

‎WebContent/WEB-INF/jsps/displayBuildingProjects.jsp‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
2+
pageEncoding="ISO-8859-1"%>
3+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
4+
<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
5+
<!DOCTYPE html>
6+
<html>
7+
<head>
8+
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
9+
<script
10+
src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
11+
<!-- Latest compiled and minified CSS -->
12+
<link rel="stylesheet"
13+
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
14+
integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
15+
crossorigin="anonymous">
16+
17+
<!-- Optional theme -->
18+
<link rel="stylesheet"
19+
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css"
20+
integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r"
21+
crossorigin="anonymous">
22+
23+
<!-- Latest compiled and minified JavaScript -->
24+
<script
25+
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
26+
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
27+
crossorigin="anonymous"></script>
28+
29+
<title>aBode</title>
30+
</head>
31+
<body>
32+
33+
<div style="margin: 2%">
34+
<div class="list-group">
35+
<c:forEach var="project" items="${projectList}">
36+
<c:url value="/displayUnits/${project}" var="viewUrl" />
37+
<a href="${viewUrl}" class="list-group-item"> ${project} </a>
38+
</c:forEach>
39+
</div>
40+
</div>
41+
42+
<div style="padding: 0% 2%">
43+
44+
<c:url value="/workOrderHome" var="backUrl" />
45+
<a href="${backUrl}" class="btn btn-default">Back</a>
46+
</div>
47+
48+
</body>
49+
</html>

0 commit comments

Comments
 (0)