Skip to content

Good to go #90

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 1 commit into from
Oct 7, 2016
Merged

Good to go #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 16 additions & 30 deletions WebContent/WEB-INF/jsps/pdiReport.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
<title>Tarion PDI Form: ${unit.homeEnrollmentNumber}</title>
</head>
<body>
<div>
<div style="margin: 2%">
<div class="jumbotron">

<c:url value="/pdiReportData" var="url2" />

Expand All @@ -41,7 +42,7 @@

<label class="col-lg-8 control-label">Enter Home Enrollment Number</label>

<input name="homeEnrollmentNumber" placeholder="Enter Home Enrollment Number" class="form-control" required="required"/>
<input name="homeEnrollmentNumber" placeholder="Enter Home Enrollment Number" class="form-control col-lg-8 " required="required"/>
</div>

<div class="form-group">
Expand All @@ -52,7 +53,8 @@
</form>

</div>
<div style="margin: 2%">


<c:url value="/pdiReport" var="url" />
<form name="form" class="form-horizontal" method="post"
action="${url}">
Expand All @@ -69,36 +71,20 @@
<th>Description:</th>
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>Column content</td>
<td>Column content</td>
<td>Column content</td>
</tr>
<tr>
<td>2</td>
<td>Column content</td>
<td>Column content</td>
<td>Column content</td>
</tr>

</tbody>

</table>


<c:forEach var="deficiency" items="${unit.deficiencies}">
<div class="list-group-item"> ${deficiency.id} + ${deficiency.location} + ${deficiency.description}

</div>
</c:forEach>

<div></div>
</div>
<div class="jumbotron other-colour">

<div class="form-group">
<label for="id" class="col-lg-1 control-label">Deficiency
Number</label>
<div class="col-lg-10">
<input path="id" name="id" class="form-control" id="id" value=""
readonly />
</div>

<label for="dateOfPosession" class="col-lg-1 control-label">Date
of Posession</label>

Expand Down Expand Up @@ -244,7 +230,7 @@
Name</label> <label for="deadline" class="col-lg-1 control-label">Purchaser's
Signature</label>
<div class="col-lg-6">
<input path="id" name="id" class="form-control" id="id" value=""
<input path="id" name="id" class="form-control" id="id" value="${form.date}"
readonly /> <label for="deadline" class="col-lg-1 control-label">Date
(YYYY/MM/DD)</label>
</div>
Expand All @@ -268,9 +254,9 @@
style="margin-left: 8.33333333333%" />


<c:url value="/displayUnitDeficiencies/${unit.homeEnrollmentNumber}"
var="displayUnitDeficiencies" />
<a href="${pdiReport}" class="pull-right btn btn-default">Back</a>
<c:url value="/selectReport"
var="selectReport" />
<a href="${selectReport}" class="pull-right btn btn-default">Back</a>

</div>
</body>
Expand Down
Binary file modified target/classes/ca/sheridancollege/controllers/HomeController.class
View file
Open in desktop
Binary file not shown.
Binary file modified target/classes/ca/sheridancollege/dao/DAO.class
View file
Open in desktop
Binary file not shown.