From 0c23cd9f70553265905f5dd8bb0b1d977c903474 Mon Sep 17 00:00:00 2001 From: catpoehlman Date: Thu, 6 Oct 2016 19:52:59 -0400 Subject: [PATCH 1/2] most CSS for enter PDI response for second image may have an issue with builder ref number -- but it is there --- WebContent/WEB-INF/jsps/addSignOff.jsp | 27 +++++--- .../WEB-INF/jsps/displayBuildingProjects.jsp | 2 +- .../WEB-INF/jsps/displayUnitDeficiencies.jsp | 41 +++++++++++-- WebContent/WEB-INF/jsps/displayUnitInfo.jsp | 61 +++++++++++-------- WebContent/scripts/signing.js | 4 ++ src/ca/sheridancollege/beans/Form.java | 10 +++ .../controllers/HomeController.java | 6 ++ .../services/ControllerServices.java | 19 +++++- 8 files changed, 128 insertions(+), 42 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp index 61152e7..03f8ecb 100644 --- a/WebContent/WEB-INF/jsps/addSignOff.jsp +++ b/WebContent/WEB-INF/jsps/addSignOff.jsp @@ -40,6 +40,12 @@ #canvasContainer { border: 1px solid grey; border-radius: 5px; + background-color:white; +} +#smallJum{ + background-color:#EDEEFF; + padding: 2%; + border-radius: 15px; } SignOff Form @@ -51,8 +57,9 @@
- +
+ SignOff Form
@@ -95,7 +102,7 @@
- +
@@ -109,14 +116,14 @@
-
+


-
+
- + -





+

* 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

@@ -152,11 +159,15 @@
- Finish + Finish
- +
+ + Back + +
diff --git a/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp b/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp index 726dad3..66e2b4a 100644 --- a/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp +++ b/WebContent/WEB-INF/jsps/displayBuildingProjects.jsp @@ -42,7 +42,7 @@
- Back + Back
diff --git a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp index 9538227..ae12b91 100644 --- a/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp +++ b/WebContent/WEB-INF/jsps/displayUnitDeficiencies.jsp @@ -25,28 +25,59 @@ src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"> + + + - +
+

Unit ${unit.unitNum} Deficiency List

+ + + + + + + + + + + -
${unitDeficiency.id} + ${unitDeficiency.description} +
+ + + + + + + +
#LocationDeficiency TypeDescription
${unitDeficiency.id}${unitDeficiency.location}${unitDeficiency.category}${unitDeficiency.description} Delete - +
- +
Add Deficiency - Next + Next
diff --git a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp index 47e1c52..1f64805 100644 --- a/WebContent/WEB-INF/jsps/displayUnitInfo.jsp +++ b/WebContent/WEB-INF/jsps/displayUnitInfo.jsp @@ -7,6 +7,21 @@ + + + @@ -14,9 +29,6 @@ - - + + @@ -78,12 +85,12 @@ Extra Large Button CSS
- +
- +
- +
@@ -245,24 +252,26 @@ Extra Large Button CSS - -
+ +


-
+
- +

+ +
- Next + Next
+ Working! -->
diff --git a/WebContent/scripts/signing.js b/WebContent/scripts/signing.js index becd778..4bb2e32 100644 --- a/WebContent/scripts/signing.js +++ b/WebContent/scripts/signing.js @@ -25,7 +25,11 @@ function accept(){ var link = document.getElementById("signature").toDataURL(); document.getElementById("acc2").innerHTML='SAVE'; + showNext(); +} +function showNext(){ + document.getElementById("nextBtn").show(); } /* diff --git a/src/ca/sheridancollege/beans/Form.java b/src/ca/sheridancollege/beans/Form.java index b306445..2a61827 100644 --- a/src/ca/sheridancollege/beans/Form.java +++ b/src/ca/sheridancollege/beans/Form.java @@ -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(); @@ -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; + } + } diff --git a/src/ca/sheridancollege/controllers/HomeController.java b/src/ca/sheridancollege/controllers/HomeController.java index 4c59810..dca124a 100644 --- a/src/ca/sheridancollege/controllers/HomeController.java +++ b/src/ca/sheridancollege/controllers/HomeController.java @@ -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) { diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index 7c7d7e2..cba7006 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -100,6 +100,7 @@ public Model saveUnit(Model model, long homeEnrollmentNumber, Date posessionDate model.addAttribute("unit", returns.get(0)); List returnsBuilder = dao.getBuilder(builderUserName); + Builder b = returnsBuilder.get(0); model.addAttribute("builder", returnsBuilder.get(0)); Form form = new Form(homeEnrollmentNumber, "PDI", repName); @@ -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); @@ -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 = dao.getForm(homeEnrollmentNumber); @@ -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 = 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); From 3b911d0f40456c0a78b13cd490e62c6bb42639c0 Mon Sep 17 00:00:00 2001 From: catpoehlman Date: Thu, 6 Oct 2016 20:14:03 -0400 Subject: [PATCH 2/2] signoffpage changes --- WebContent/WEB-INF/jsps/addSignOff.jsp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/WebContent/WEB-INF/jsps/addSignOff.jsp b/WebContent/WEB-INF/jsps/addSignOff.jsp index 03f8ecb..3932a0e 100644 --- a/WebContent/WEB-INF/jsps/addSignOff.jsp +++ b/WebContent/WEB-INF/jsps/addSignOff.jsp @@ -8,11 +8,6 @@ - - - - - @@ -48,16 +43,20 @@ border-radius: 15px; } + + + + SignOff Form
- +
-
+
SignOff Form @@ -123,7 +122,7 @@
-
+





* 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