Skip to content

Styling1 #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aperdec merged 2 commits into from
Oct 7, 2016
Merged

Styling1 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c23cd9
most CSS for enter PDI
catpoehlman Oct 6, 2016
3b911d0
signoffpage changes
catpoehlman Oct 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions WebContent/WEB-INF/jsps/addSignOff.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
<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="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
<!-- Latest compiled and minified CSS -->
Expand Down Expand Up @@ -40,19 +35,30 @@
#canvasContainer {
border: 1px solid grey;
border-radius: 5px;
background-color:white;
}
#smallJum{
background-color:#EDEEFF;
padding: 2%;
border-radius: 15px;
}
</style>
<script src="scripts/modernizr.custom.34982.js"></script>

<script src="scripts/signing.js"></script>
<script src="scripts/signatureCapture.js"></script>
<title>SignOff Form</title>
</head>
<body>

<div style="margin: 2%">

<div id="smallJum">
<c:url value="/addSignOff" var="url" />
<form name="form" method="post" action="${url}"
class="form-horizontal" onsubmit="return verify()">

<fieldset>

<legend>SignOff Form</legend>

<div class="form-group">
Expand Down Expand Up @@ -95,7 +101,7 @@
<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-default" />
<input type="submit" value="Save" class="pull-right btn btn-primary" />

</div>
</fieldset>
Expand All @@ -109,12 +115,12 @@
</div>
</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><button onclick="clearSig()" class="btn btn-default btn-sm">Redo</button></div>
</div>

</div>
<!-- end text -->
<br><br><br><br><br><br>
<div>
Expand Down Expand Up @@ -152,11 +158,15 @@

<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 class="form-group">
<c:url value="/displayUnitDeficiencies/${form.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
<a href="${displayUnitDeficiencies}" class="pull-left btn btn-default" id="backBtn">Back</a>

</div>



Expand Down
2 changes: 1 addition & 1 deletion WebContent/WEB-INF/jsps/displayBuildingProjects.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<div style="padding: 0% 2%">

<c:url value="/workOrderHome" var="backUrl" />
<a href="${backUrl}" class="btn btn-primary">Back</a>
<a href="${backUrl}" class="btn btn-default">Back</a>
</div>

</body>
Expand Down
41 changes: 36 additions & 5 deletions WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,59 @@
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
crossorigin="anonymous"></script>

<style>
#con {
background-color: #EDEEFF;
}

table{
border: #D1D0CE solid 1px;
}
</style>

<title></title>
</head>
<body>

<div class="jumbotron" id="con">
<center><h2>Unit ${unit.unitNum} Deficiency List</h2></center>
<div style="margin: 2%">
<div class="list-group">
<table class="table table-striped table-hover">
<thead>
<tr>
<th>#</th>
<th>Location</th>
<th>Deficiency Type</th>
<th>Description</th>
<th></th>
</tr>
</thead>
<tbody>
<c:forEach var="unitDeficiency" items="${unit.deficiencies}">
<div class="list-group-item"> ${unitDeficiency.id} + ${unitDeficiency.description}
<tr>
<td>${unitDeficiency.id}</td>
<td>${unitDeficiency.location}</td>
<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">Delete</a>
</div>
</td>
</tr>
</c:forEach>
</tbody>
</table>
</div>
</div>

</div>
<div style="padding: 0% 2%">

<c:url value="/addDeficiency/${unit.homeEnrollmentNumber}" var="addUrl" />
<a href="${addUrl}" class="btn btn-primary">Add Deficiency</a>

<c:url value="/addSignOff/${unit.homeEnrollmentNumber}" var="addSignOff" />
<a href="${addSignOff}" class="pull-right btn btn-default">Next</a>
<a href="${addSignOff}" class="pull-right btn btn-success">Next</a>
</div>

</body>
Expand Down
61 changes: 35 additions & 26 deletions WebContent/WEB-INF/jsps/displayUnitInfo.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,28 @@
<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>

<script type="text/javascript">
document.getElementById("nextBtn").hide();
document.getElementById("saveBtn").hide();

function showSave(){
document.getElementById("saveBtn").show();
}
function showNext(){
document.getElementById("nextBtn").show();
}

</script>

<script src="scripts/modernizr.custom.34982.js"></script>
<!-- <script src="scripts/sig.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 -->
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
Expand All @@ -34,29 +46,24 @@
src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
crossorigin="anonymous"></script>


<style>
.flex-v-center {
display: flex;
align-items: center;
}

/*
Extra Large Button CSS
*/
.btn-lilG {
padding: 8px 18px;
font-size: 10px;
border-radius: 30px;
text-align: center;
margin: 5px;
border: 2px solid black;
color:inherit;

}

#canvasContainer {
border: 1px solid grey;
border-radius: 5px;
background-color:white;
}

#smallJum{
background-color:#EDEEFF;
padding: 2%;
border-radius: 15px;
}

</style>
Expand All @@ -78,12 +85,12 @@ Extra Large Button CSS
<form:input path="homeEnrollmentNumber" placeholder="Enter Home Enrollment Number" class="form-control" required="required"/>
</div>
<div class="form-group">
<input type="submit" value="Go!" class="pull-right btn btn-default" />
<input type="submit" value="Go!" class="pull-right btn btn-primary" />
</div>
</form:form>
<!--</form>-->
<div id="error"></div>

<div id="smallJum">
<fieldset>
<c:url value="/saveUnit" var="url2" />
<form name="form" method="post" action="${url2}"
Expand Down Expand Up @@ -230,7 +237,7 @@ Extra Large Button CSS
<div class="form-group">

<!-- <a href="${url2}" class="pull-right btn btn-default">Save</a> -->
<input type="submit" value="Save" class="pull-right btn btn-default" />
<input type="submit" value="Save" class="pull-right btn btn-primary" id="saveBtn"/>
</div>


Expand All @@ -245,24 +252,26 @@ Extra Large Button CSS
<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><button onclick="clearSig()" class="btn btn-default btn-sm">Redo</button></div>
</div>


</fieldset>
</fieldset><br><br>
</div>
<br>
<div class="form-group">
<c:url value="/displayUnitDeficiencies/${unit.homeEnrollmentNumber}" var="displayUnitDeficiencies" />
<a href="${displayUnitDeficiencies}" class="pull-right btn btn-default">Next</a>
<a href="${displayUnitDeficiencies}" class="pull-right btn btn-success" id="nextBtn">Next</a>

</div>

<div>
<!--image display test.
<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}" /> Working! -->
<img id="theimage" src="imageDisplay/${form.homeEnrollmentNumber}/2" /> Working! -->
</div>
</div>

Expand Down
4 changes: 4 additions & 0 deletions WebContent/scripts/signing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ function accept(){

var link = document.getElementById("signature").toDataURL();
document.getElementById("acc2").innerHTML='<a id="dl" download="refSig.png" href="'+link+'">SAVE</a>';
showNext();
}

function showNext(){
document.getElementById("nextBtn").show();
}

/*
Expand Down
10 changes: 10 additions & 0 deletions src/ca/sheridancollege/beans/Form.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public class Form implements Serializable {
private String purchName;
@Column(columnDefinition="mediumblob")
private byte[] finalSig;
private long builderRefNum;

public Form() {
Date today = new Date();
Expand Down Expand Up @@ -124,5 +125,14 @@ public byte[] getFinalSig() {
public void setFinalSig(byte[] finalSig) {
this.finalSig = finalSig;
}

public long getBuilderRefNum() {
return builderRefNum;
}

public void setBuilderRefNum(long builderRefNum) {
this.builderRefNum = builderRefNum;
}


}
6 changes: 6 additions & 0 deletions src/ca/sheridancollege/controllers/HomeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,12 @@ public void getImage(HttpServletResponse response,@PathVariable long homeEnrollm

response = controllerServices.getImage(response, homeEnrollmentNumber);
}

@RequestMapping(value = "/imageDisplay/{homeEnrollmentNumber}/2")
public void getImage2(HttpServletResponse response,@PathVariable long homeEnrollmentNumber) throws IOException {

response = controllerServices.getImage(response, homeEnrollmentNumber);
}

@RequestMapping("/displayDeficiencies/{id}")
public String displayDeficienciesByConstructionPersonnel(Model model, @PathVariable int id) {
Expand Down
19 changes: 17 additions & 2 deletions src/ca/sheridancollege/services/ControllerServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate
model.addAttribute("unit", returns.get(0));

List<Builder> returnsBuilder = dao.getBuilder(builderUserName);
Builder b = returnsBuilder.get(0);
model.addAttribute("builder", returnsBuilder.get(0));

Form form = new Form(homeEnrollmentNumber, "PDI", repName);
Expand All @@ -108,7 +109,8 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate
HomeOwner ho = returnPurch.get(0);

form.setPurchName(ho.getName());

form.setBuilderRefNum(b.getBuilderRefNum());

dao.createForm(form);
model.addAttribute("form", form);

Expand Down Expand Up @@ -240,7 +242,8 @@ public Model displayUnitsByProject(Model model, String project) {

return model;
}


//gets first sig
public HttpServletResponse getImage(HttpServletResponse response, long homeEnrollmentNumber) throws IOException {
response.setContentType("image/png");
List<Form> form = dao.getForm(homeEnrollmentNumber);
Expand All @@ -251,6 +254,18 @@ public HttpServletResponse getImage(HttpServletResponse response, long homeEnrol

return response;
}

//get final sig
public HttpServletResponse getImage2(HttpServletResponse response, long homeEnrollmentNumber) throws IOException {
response.setContentType("image/png");
List<Form> form = dao.getForm(homeEnrollmentNumber);
Form f = form.get(0);
byte[] imageBytes = f.getFinalSig();
response.getOutputStream().write(imageBytes);
response.getOutputStream().flush();

return response;
}

public Model completeDeficiency(Model model, int id, long homeEnrollmentNumber) {
dao.completeDeficiency(id, homeEnrollmentNumber);
Expand Down