Skip to content

Commit 4e7f1bb

Browse files
aperdecaperdec
committed
Merge branch 'develop' into pdiReport5
# Conflicts: # WebContent/WEB-INF/jsps/selectReport.jsp
2 parents 6a6c184 + 0326338 commit 4e7f1bb

10 files changed

Lines changed: 272 additions & 29 deletions

File tree

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +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>
1115
<script
1216
src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
1317
<!-- Latest compiled and minified CSS -->
@@ -43,22 +47,16 @@
4347
border-radius: 15px;
4448
}
4549
</style>
46-
<script src="scripts/modernizr.custom.34982.js"></script>
47-
48-
<script src="scripts/signing.js"></script>
49-
<script src="scripts/signatureCapture.js"></script>
5050
<title>SignOff Form</title>
5151
</head>
5252
<body>
5353

5454
<div style="margin: 2%">
55-
<div id="smallJum">
55+
<div id="smallJum">
56+
<fieldset>
5657
<c:url value="/addSignOff" var="url" />
57-
<form name="form" method="post" action="${url}"
58-
class="form-horizontal" onsubmit="return verify()">
58+
<form name="form" method="post" action="${url}" class="form-horizontal" onsubmit="return verify()">
5959

60-
<fieldset>
61-
6260
<legend>SignOff Form</legend>
6361

6462
<div class="form-group">
@@ -91,8 +89,7 @@
9189
<label for="desName" class="col-lg-3 control-label">Designator's Name</label>
9290

9391
<div class="col-lg-4">
94-
<input path="desName" name="desName"
95-
class="form-control" id="desName" value="${form.desName}"
92+
<input path="desName" name="desName" class="form-control" id="desName" value="${form.desName}"
9693
placeholder="" type="text" />
9794

9895
</div>
@@ -104,7 +101,6 @@
104101
<input type="submit" value="Save" class="pull-right btn btn-primary" />
105102

106103
</div>
107-
</fieldset>
108104
</form>
109105
<div class="form-group">
110106

@@ -119,10 +115,13 @@
119115
<div id="acc1"></div>
120116
<br><br>
121117
<div><button onclick="clearSig()" class="btn btn-default btn-sm">Redo</button></div>
122-
</div>
118+
119+
</div>
120+
</fieldset>
121+
</div>
123122
</div>
124123
<!-- end text -->
125-
<br><br><br><br><br><br>
124+
126125
<div>
127126
<p>* Purchasers or owners who intend to designate someone to conduct the PDI in their place should ensure they
128127
provide written authority to the vendor/builder authorizing the designate to sign this form on their behalf</p>

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,26 @@
2525
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
2626
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
2727
crossorigin="anonymous"></script>
28+
29+
<style>
30+
.list-group-item{
31+
margin:0.5%;
32+
}
33+
#2 {
34+
background-color: #EDEEFF;
35+
}
36+
#1 {
37+
background-color: #EDEEFF;
38+
}
39+
#2:hover{
40+
background-color: #9394AA;
41+
color:black;
42+
}
43+
#1:hover{
44+
background-color: #9394AA;
45+
color:black;
46+
}
47+
</style>
2848

2949
<title>aBode</title>
3050
</head>
@@ -34,7 +54,7 @@
3454
<div class="list-group">
3555
<c:forEach var="constructionPersonnel" items="${constructionPersonnelList}">
3656
<c:url value="/displayDeficiencies/${constructionPersonnel.id}" var="viewUrl" />
37-
<a href="${viewUrl}" class="list-group-item"> ${constructionPersonnel.name} </a>
57+
<a href="${viewUrl}" class="list-group-item" style="background-color: #EDEEFF;"> ${constructionPersonnel.name} </a>
3858
</c:forEach>
3959
</div>
4060
</div>

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

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,57 @@
2525
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
2626
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
2727
crossorigin="anonymous"></script>
28+
29+
<style>
30+
#con {
31+
background-color: #EDEEFF;
32+
}
33+
34+
table{
35+
border: #D1D0CE solid 1px;
36+
}
37+
</style>
2838

2939
<title>aBode</title>
3040
</head>
3141
<body>
32-
42+
<div class="jumbotron" id="con">
43+
<center><h2>Unit ${unit.unitNum} Deficiency List</h2></center>
3344
<div style="margin: 2%">
3445
<div class="list-group">
46+
<table class="table table-striped table-hover">
47+
<thead>
48+
<tr>
49+
<th>#</th>
50+
<th>Location</th>
51+
<th>Deficiency Type</th>
52+
<th>Description</th>
53+
<th></th>
54+
<th></th>
55+
</tr>
56+
</thead>
57+
<tbody>
3558
<c:forEach var="deficiency" items="${deficiencyList}">
36-
<div class="list-group-item"> ${deficiency.id} + ${deficiency.description}
37-
<c:url value="/workOrderDeleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}" var="deleteUrl" />
59+
<tr>
60+
<td>${deficiency.id}</td>
61+
<td>${deficiency.location}</td>
62+
<td>${deficiency.category}</td>
63+
<td>${deficiency.description}</td>
64+
<td>
65+
<c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}" var="completeUrl" />
66+
<a href="${completeUrl}" class="btn btn-primary pull-right">Is Completed: ${deficiency.status}</a>
67+
</td>
68+
<td>
69+
<c:url value="/workOrderDeleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}" var="deleteUrl" />
3870
<a href="${deleteUrl}" class="btn btn-danger pull-right">Delete</a>
39-
<c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}" var="completeUrl" />
40-
<a href="${completeUrl}" class="btn btn-primary pull-right">Is Completed: ${deficiency.status}</a>
41-
</div>
71+
</td>
72+
</tr>
4273
</c:forEach>
74+
</tbody>
75+
</table>
4376
</div>
4477
</div>
78+
</div>
4579

4680
<div style="padding: 0% 2%">
4781

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

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
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"
5+
uri="http://www.springframework.org/security/tags"%>
6+
<!DOCTYPE html>
7+
<html>
8+
<head>
9+
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
10+
<script
11+
src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
12+
<!-- Latest compiled and minified CSS -->
13+
<link rel="stylesheet"
14+
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
15+
integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
16+
crossorigin="anonymous">
17+
18+
<!-- Optional theme -->
19+
<link rel="stylesheet"
20+
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css"
21+
integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r"
22+
crossorigin="anonymous">
23+
24+
<!-- Latest compiled and minified JavaScript -->
25+
<script
26+
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
27+
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
28+
crossorigin="anonymous"></script>
29+
30+
<title>aBode</title>
31+
</head>
32+
<body>
33+
34+
<h3>Help</h3>
35+
<br>
36+
37+
<li type="button" class="btn btn-primary " data-toggle="modal" data-target="#modal1">
38+
Home enrolment number will not generate data
39+
</li>
40+
<div class="modal" id="modal1">
41+
<div class="modal-dialog">
42+
<div class="modal-content">
43+
<div class="modal-header">
44+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
45+
<h4 class="modal-title">Home enrolment number will not generate data</h4>
46+
</div>
47+
<div class="modal-body">
48+
<li>Make sure to select the go button</a></li>
49+
<li>Close Abode for 10 seconds then reopen Abode</a></li>
50+
<li>Make sure caps lock is off</a></li>
51+
<li>Login with the correct credentials </a></li>
52+
</div>
53+
<div class="modal-footer">
54+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
55+
</div>
56+
</div>
57+
</div>
58+
</div>
59+
<br>
60+
<br>
61+
<li type="button" class="btn btn-primary " data-toggle="modal" data-target="#modal2">
62+
Next button is not functioning
63+
</li>
64+
<div class="modal" id="modal2">
65+
<div class="modal-dialog">
66+
<div class="modal-content">
67+
<div class="modal-header">
68+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
69+
<h4 class="modal-title">Next button is not functioning</h4>
70+
</div>
71+
<div class="modal-body">
72+
<li>Make sure all fields are populated</a></li>
73+
<li>Populate needed fields </a></li>
74+
<li>Make sure to save</a></li>
75+
</div>
76+
<div class="modal-footer">
77+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
78+
</div>
79+
</div>
80+
</div>
81+
</div>
82+
83+
<br>
84+
<br>
85+
<li type="button" class="btn btn-primary " data-toggle="modal" data-target="#modal3">
86+
No Deficiencies displaying
87+
</li>
88+
<div class="modal" id="modal3">
89+
<div class="modal-dialog">
90+
<div class="modal-content">
91+
<div class="modal-header">
92+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
93+
<h4 class="modal-title">No Deficiencies displaying</h4>
94+
</div>
95+
<div class="modal-body">
96+
<li>Make sure you are updated</a></li>
97+
<li>Make sure there is a internet connection</a></li>
98+
<li>Re enter the home enrolment number </a></li>
99+
<li>Add or delete needed deficiencies</a></li>
100+
<li>Populate needed fields </a></li>
101+
<li>Make sure to save</a></li>
102+
</div>
103+
<div class="modal-footer">
104+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
105+
</div>
106+
</div>
107+
</div>
108+
</div>
109+
110+
<br>
111+
<address>
112+
Select link to ask questions here: <a
113+
href="mailto:exampleAbode@exampleAbode.com? subject=Feedback&body=Message"
114+
target="#">Send Mail</a>
115+
</address>
116+
<p>Abode Contact # 647-232-2699</p>
117+
<p>Times Group Inc # (905) 940-6286</p>
118+
119+
120+
121+
122+
123+
124+
</body>
125+
</html>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ table{
7373

7474

7575
<c:url value="/pdiReport" var="pdiReport" />
76-
<a href="${pdiReport}" class="pull-right btn btn-default">Next</a>
76+
<a href="${pdiReport}" class="pull-right btn btn-primary">Next</a>
7777

7878
</div>
7979
</body>

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

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,58 @@
2525
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
2626
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
2727
crossorigin="anonymous"></script>
28+
29+
<style>
30+
#con {
31+
background-color: #EDEEFF;
32+
}
33+
34+
table{
35+
border: #D1D0CE solid 1px;
36+
}
37+
</style>
38+
2839
<title></title>
2940
</head>
3041
<body>
3142

43+
<div class="jumbotron" id="con">
44+
<center><h2>Unit ${unit.unitNum} Deficiency List</h2></center>
3245
<div style="margin: 2%">
3346
<div class="list-group">
47+
<table class="table table-striped table-hover">
48+
<thead>
49+
<tr>
50+
<th>#</th>
51+
<th>Location</th>
52+
<th>Deficiency Type</th>
53+
<th>Description</th>
54+
<th></th>
55+
<th></th>
56+
</tr>
57+
</thead>
58+
<tbody>
3459
<c:forEach var="unitDeficiency" items="${unit.deficiencies}">
35-
<div class="list-group-item"> ${unitDeficiency.id} + ${unitDeficiency.description}
36-
<c:url value="/workOrderDeleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
37-
<a href="${deleteUrl}" class="btn btn-danger pull-right">Delete</a>
60+
<tr>
61+
<td>${unitDeficiency.id}</td>
62+
<td>${unitDeficiency.location}</td>
63+
<td>${unitDeficiency.category}</td>
64+
<td>${unitDeficiency.description}</td>
65+
<td>
3866
<c:url value="/workOrderCompleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="completeUrl" />
39-
<a href="${completeUrl}" class="btn btn-primary pull-right">Is Completed: ${unitDeficiency.status}</a>
40-
</div>
67+
<a href="${completeUrl}" class="btn btn-primary pull-right">Is Completed: ${unitDeficiency.status}</a>
68+
</td>
69+
<td>
70+
<c:url value="/workOrderDeleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />
71+
<a href="${deleteUrl}" class="btn btn-danger pull-right">Delete</a>
72+
</td>
73+
</tr>
4174
</c:forEach>
75+
</tbody>
76+
</table>
4277
</div>
4378
</div>
79+
</div>
4480

4581
<div style="padding: 0% 2%">
4682

0 commit comments

Comments
 (0)