diff --git a/WebContent/WEB-INF/jsps/pdiReport.jsp b/WebContent/WEB-INF/jsps/pdiReport.jsp index f6f0452..b31868b 100644 --- a/WebContent/WEB-INF/jsps/pdiReport.jsp +++ b/WebContent/WEB-INF/jsps/pdiReport.jsp @@ -6,6 +6,7 @@ <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> + - + + + + + + + + + + + + Tarion PDI Form: ${unit.homeEnrollmentNumber}
@@ -43,7 +65,7 @@ label {
- +
@@ -64,11 +86,12 @@ label {
+
- TARION Pre-Delivery Inspection Form + List of Deficiencies
@@ -94,6 +117,8 @@ label { + Review of PDI +
@@ -247,7 +272,7 @@ label {
- +
@@ -264,4 +289,5 @@ label {
- \ No newline at end of file + + \ No newline at end of file diff --git a/WebContent/scripts/script.js b/WebContent/scripts/script.js index 6114b7f..182e798 100644 --- a/WebContent/scripts/script.js +++ b/WebContent/scripts/script.js @@ -5,12 +5,14 @@ function hide(){ used = document.getElementById("repName").value; //disable save on load $( "#saveBtn" ).prop( "disabled", true ); - +document.getElementById("mainReportDiv").style.visibility = 'hidden'; //test not hidden $( "#nextBtn" ).prop( "disabled", false ); $( "#nextBtn" ).prop( "disabled", true ); + + if (used === ""){ //alert(used); document.getElementById("nextBtn").style.visibility = 'visible'; @@ -25,6 +27,10 @@ function showSave(){ document.getElementById("saveBtn").style.visibility = 'visible'; } +function showPdiReport(){ + document.getElementById("saveBtn").style.visibility = "visible"; +} + function enableNextBtn(){ $('a').disable(false); } diff --git a/src/ca/sheridancollege/services/ControllerServices.java b/src/ca/sheridancollege/services/ControllerServices.java index fe12aec..8e316c5 100644 --- a/src/ca/sheridancollege/services/ControllerServices.java +++ b/src/ca/sheridancollege/services/ControllerServices.java @@ -124,7 +124,7 @@ public Model displayUnitData(Model model, long homeEnrollmentNumber, long num) { //String img = form.get(0).getRepSig().toString(); model.addAttribute("errorHomeEnrollmentNumber", false); - + model.addAttribute("displayPage", true); return model; } else { @@ -490,7 +490,7 @@ public Model displayPdiReport(Model model, long homeEnrollmentNumber) { } model.addAttribute("unit", unit.get(0)); model.addAttribute("builder", builder.get(0)); - + model.addAttribute("displayPage", true); return model; } else {