Skip to content

Commit 31c5ac0

Browse files
aperdecaperdec
committed
Merge branch 'develop' into ToggleButtonsWorking
# Conflicts: # WebContent/WEB-INF/jsps/loginForm.jsp
2 parents 2f1d7f7 + 8444b4b commit 31c5ac0

34 files changed

Lines changed: 856 additions & 1146 deletions

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

Lines changed: 17 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,10 @@
11
<%@ 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="form" uri="http://www.springframework.org/tags/form"%>
5-
6-
<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
7-
<!DOCTYPE html>
8-
<html>
9-
<head>
10-
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
11-
<script
12-
src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
13-
<!-- Latest compiled and minified CSS -->
14-
<link rel="stylesheet"
15-
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
16-
integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
17-
crossorigin="anonymous">
18-
19-
<!-- Optional theme -->
20-
<link rel="stylesheet"
21-
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css"
22-
integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r"
23-
crossorigin="anonymous">
24-
25-
<!-- Latest compiled and minified JavaScript -->
26-
<script
27-
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
28-
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
29-
crossorigin="anonymous"></script>
30-
31-
<link rel="stylesheet" type="text/css" href="/spring/css/style.css">
32-
<link rel="stylesheet" type="text/css" href="/spring/css/photo.css">
33-
<script src="/spring/scripts/photo.js"></script>
2+
pageEncoding="ISO-8859-1"%>
3+
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
4+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
5+
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
6+
<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
7+
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
348

359
<style>
3610
@import url('https://fonts.googleapis.com/css?family=Open+Sans:400,700');
@@ -225,8 +199,7 @@ h3{
225199
</style>
226200

227201
<title>Add Deficiency: ${unit.homeEnrollmentNumber}</title>
228-
</head>
229-
<body>
202+
230203
<script>
231204
function Validate() {
232205
if (ValidateCategories() && ValidateLocation()) {
@@ -354,29 +327,27 @@ h3{
354327
</fieldset>
355328
<!--
356329
<div class="container2">
357-
330+
358331
<div class="app2">
359-
332+
360333
<a href="#" id="start-camera" class="visible">Touch here to start the app.</a>
361334
<video id="camera-stream"></video>
362335
<img id="snap">
363-
336+
364337
<p id="error-message"></p>
365-
338+
366339
<div class="controls">
367340
<a href="#" id="delete-photo" title="Delete Photo" class="disabled"><i class="material-icons">delete</i></a>
368341
<a href="#" id="take-photo" title="Take Photo"><i class="material-icons">camera_alt</i></a>
369-
<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>
342+
<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>
370343
</div>
371-
372-
344+
345+
373346
<canvas></canvas>
374347
</div>
375348
</div> This code works but is not for prototype release will be in the final prog. version-->
376-
349+
377350
</div>
378351
</form>
379-
380-
</div>
381-
</body>
382-
</html>
352+
353+
</div>

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

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,11 @@
11
<%@ 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="form" uri="http://www.springframework.org/tags/form"%>
2+
pageEncoding="ISO-8859-1"%>
3+
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
4+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
5+
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
6+
<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
7+
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
58

6-
<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %>
7-
<!DOCTYPE html>
8-
<html>
9-
<head>
10-
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
11-
<script
12-
src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
13-
<!-- Latest compiled and minified CSS -->
14-
<link rel="stylesheet"
15-
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
16-
integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
17-
crossorigin="anonymous">
18-
19-
<!-- Optional theme -->
20-
<link rel="stylesheet"
21-
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css"
22-
integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r"
23-
crossorigin="anonymous">
24-
25-
<!-- Latest compiled and minified JavaScript -->
26-
<script
27-
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
28-
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
29-
crossorigin="anonymous"></script>
30-
319
<style>
3210
#con {
3311
background-color: #EDEEFF;
@@ -43,8 +21,7 @@
4321

4422

4523
<title>Add Deficiency: ${unit.homeEnrollmentNumber}</title>
46-
</head>
47-
<body>
24+
4825
<script>
4926
function Validate() {
5027
if (ValidateCategories() && ValidateLocation()) {
@@ -172,6 +149,4 @@
172149
</fieldset>
173150
</form>
174151

175-
</div>
176-
</body>
177-
</html>
152+
</div>

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

Lines changed: 19 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,11 @@
11
<%@ 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-
11-
<script src="../scripts/modernizr.custom.34982.js"></script>
12-
13-
<script src="../scripts/signing.js"></script>
14-
<script src="../scripts/signatureCapture.js"></script>
15-
<script
16-
src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
17-
<!-- Latest compiled and minified CSS -->
18-
<link rel="stylesheet"
19-
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
20-
integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7"
21-
crossorigin="anonymous">
22-
23-
<!-- Optional theme -->
24-
<link rel="stylesheet"
25-
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css"
26-
integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r"
27-
crossorigin="anonymous">
28-
29-
<!-- Latest compiled and minified JavaScript -->
30-
<script
31-
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
32-
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
33-
crossorigin="anonymous"></script>
34-
35-
<link rel="stylesheet" type="text/css" href="../css/style.css">
36-
2+
pageEncoding="ISO-8859-1"%>
3+
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
4+
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
5+
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
6+
<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%>
7+
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
8+
379
<style>
3810
.flex-v-center {
3911
display: flex;
@@ -61,8 +33,8 @@
6133
}
6234
</style>
6335
<title>SignOff Form</title>
64-
</head>
65-
<body>
36+
37+
<body onload="hide()">
6638
<div id="titleCon"><legend><h2>Pre-Delivery Inspection (Step 3 of 3)</h2></legend></div>
6739
<div style="margin: 2%">
6840
<div id="smallJum">
@@ -111,10 +83,10 @@
11183
<input type="hidden" name="homeEnrollmentNumber" value="${form.homeEnrollmentNumber}"/>
11284
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
11385
<div class="form-group">
114-
<input type="submit" value="Save" id="btnXlg" class="pull-right btn btn-primary" />
86+
<!-- <input type="submit" value="Save" id="btnXlg2" class="pull-right btn btn-primary" /> -->
11587

11688
</div>
117-
</form>
89+
<!-- </form> -->
11890
<div class="form-group">
11991

12092
<label for="finalSig" class="col-lg-3 control-label">Designator / Purchaser's Signature</label>
@@ -124,13 +96,13 @@
12496
</div>
12597
</div>
12698

127-
<div><button id="acc2" onclick="accept()" class="btn btn-primary btn-sm">Accept</button></div>
99+
<div><button id="acc2" onclick="accept()" class="btn btn-primary btn-sm" type="button">Accept</button></div>
128100
<div id="acc1"></div>
129101
<br><br>
130-
<div><button onclick="clearSig()" id="btnXlg" class="btn btn-default btn-sm">Redo</button></div>
102+
<div><button onclick="clearSig()" id="btnXlg" class="btn btn-default btn-sm" type="button">Redo</button></div>
131103

132104
</div>
133-
</fieldset>
105+
<!-- </fieldset> -->
134106
</div>
135107
</div>
136108
<!-- end text -->
@@ -170,9 +142,10 @@
170142

171143
<div class="form-group">
172144
<c:url value="/" var="home" />
173-
174-
<a href="${home}" class="pull-right btn btn-success" id="btnXlg">Finish</a>
175-
145+
<input type="submit" value="Save and Proceed" id="btnXlg2" class="pull-right btn btn-success" />
146+
<!-- <a href="${home}" class="pull-right btn btn-success" id="btnXlg2">Finish</a> -->
147+
</fieldset>
148+
</form>
176149
</div>
177150

178151
<div class="form-group">
@@ -191,13 +164,7 @@
191164
<br />
192165
<!-- end -->
193166

194-
195-
196-
197167
</div>
198168

199-
200169
<!-- footer area -->
201-
202-
</body>
203-
</html>
170+
</body>

0 commit comments

Comments
 (0)