Add past deadline text for project

nunomigueltech · Sep 3, 2020 · cfee3a6 · cfee3a6
1 parent 3022a1e
commit cfee3a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/main/webapp/WEB-INF/views/project.jsp b/src/main/webapp/WEB-INF/views/project.jsp
@@ -114,6 +114,7 @@
 												    	<h6 class="text-warning font-weight-bold">Completed</h6>
 												   	</c:if>
 											    	<h6 class="card-subtitle text-muted mt-2">${idea.description }</h6>
+											    	<a class="btn btn-primary btn-sm mt-3" href="/deleteIdea/${idea.id}">Delete</a>
 												 </li>
 											</c:forEach>
 										</c:when>

diff --git a/src/main/webapp/WEB-INF/views/projects.jsp b/src/main/webapp/WEB-INF/views/projects.jsp
@@ -83,13 +83,20 @@
 						</c:if>
 	    				<c:if test="${not empty projects}">
 	    					<ul class="list-group list-group-flush">
-		    					<c:forEach items="${projects}" var="item">
+		    					<c:forEach items="${projects}" var="project">
 								    <li class="list-group-item">
-								    	<h4><a href="/project/${item.id}">${item.title}</a></h4>
-								    	<c:if test="${not empty item.deadline}">
-								    		<h5 style="font-size: 0.9rem;">Deadline: ${item.deadline}</h5>
+								    	<h4><a href="/project/${project.id}">${project.title}</a></h4>
+								    	<c:if test="${not empty project.deadline}">
+								    		<c:choose>
+												<c:when test="${ project.isExpired() }">
+													<h5 style="font-size: 0.9rem;">Past deadline (${project.deadline})</h5>
+												</c:when>
+												<c:otherwise>
+													<h5 style="font-size: 0.9rem;">Due on ${project.deadline}</h5>
+												</c:otherwise>
+											</c:choose>
 								    	</c:if>		  
-								    	<h6>${item.getTaskProgress()}</h6>
+								    	<h6>${project.getTaskProgress()}</h6>
 								    </li>
 								</c:forEach>
 	    					</ul>