Skip to content

Commit 560788b

Browse files
committed
Toggle buttons working
1 parent 277bd5b commit 560788b

2 files changed

Lines changed: 24 additions & 5 deletions

File tree

WebContent/WEB-INF/jsps/displayConstructionPersonnelDeficiencies.jsp

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
2727
crossorigin="anonymous"></script>
2828

29-
<link rel="stylesheet" type="text/css" href="../css/style.css">
29+
<link rel="stylesheet" type="text/css" href="../../../css/style.css">
3030

3131
<style>
3232
#con {
@@ -70,8 +70,18 @@
7070
<td>${deficiency.category}</td>
7171
<td>${deficiency.description}</td>
7272
<td>
73-
<c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
74-
<a href="${completeUrl}" class="btn btn-primary pull-right">Is Completed: ${deficiency.status}</a>
73+
<c:choose>
74+
<c:when test="${deficiency.status}">
75+
<c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
76+
<a href="${completeUrl}" class="btn btn-success pull-right">Complete</a>
77+
78+
</c:when>
79+
<c:otherwise>
80+
<c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
81+
<a href="${completeUrl}" class="btn btn-warning pull-right">Incompleted</a>
82+
</c:otherwise>
83+
</c:choose>
84+
7585
</td>
7686
</tr>
7787
</c:forEach>

WebContent/WEB-INF/jsps/workOrderDisplayUnitDeficiencies.jsp

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,17 @@
7979
<td>${unitDeficiency.description}</td>
8080
<td>${unitDeficiency.constructionPersonnel}</td>
8181
<td>
82-
<c:url value="/workOrderCompleteDeficiencyUnit/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="completeUrl" />
83-
<a href="${completeUrl}" class="btn btn-primary pull-right">Is Completed: ${unitDeficiency.status}</a>
82+
<c:choose>
83+
<c:when test="${deficiency.status}">
84+
<c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
85+
<a href="${completeUrl}" class="btn btn-success pull-right">Complete</a>
86+
87+
</c:when>
88+
<c:otherwise>
89+
<c:url value="/workOrderCompleteDeficiency/${deficiency.id}/${deficiency.homeEnrollmentNumber}/${deficiency.constructionPersonnel}" var="completeUrl" />
90+
<a href="${completeUrl}" class="btn btn-warning pull-right">Incompleted</a>
91+
</c:otherwise>
92+
</c:choose>
8493
</td>
8594
<td>
8695
<c:url value="/workOrderDeleteDeficiency/${unitDeficiency.id}/${unit.homeEnrollmentNumber}" var="deleteUrl" />

0 commit comments

Comments
 (0)