git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add detailed statistics on delated jobs
[proteocache.git] / webapp / view / reports / RemoveJobs.jsp
diff --git a/webapp/view/reports/RemoveJobs.jsp b/webapp/view/reports/RemoveJobs.jsp
index b1d62fa..4a63761 100644 (file)
--- a/webapp/view/reports/RemoveJobs.jsp
+++ b/webapp/view/reports/RemoveJobs.jsp
@@ -11,32 +11,37 @@
 <body>
        <div class="container">
                <jsp:include page="../fragments/mainmenu.jsp" />
-               <spring:url value="/sequence/sequence/results" var="sequence_query" />
+               <spring:url value="/sequence/results" var="sequence_query" />
                <spring:url value="/admin/ip/results" var="ip_query" />
 
                <div class="panel panel-default">
-               <div class="panel-heading">
-                       <p style="font-weight:bold;">Information for removed jobs</p>
-               </div>
-               <div class="panel-body">
-                       <!-- <div class="grid-wrapper-div">-->
-                       <c:if test="${byDate != 'off'}">
-                               <p>${njobs} jobs have been removed for time period: <c:out value="${date1}" /> to <c:out value="${date2}"/> (${ndays} days)</p>
-                       </c:if>
-                       <c:if test="${byId != 'off'}">
-                               <p>Job ${id} has been removed.</p>
-                       </c:if>
-                       <c:if test="${byIp != 'off'}">
-                               <p>Jobs launched from ${ip} have been removed. ${njobs} jobs have been removed.</p>
-                       </c:if>
-                       <c:if test="${bySequence != 'off'}">
-                               <p>Jobs launched with sequence ${seq} have been removed. ${njobs} jobs have been removed.</p>
-                       </c:if>
-                       <!-- </div>-->
-               </div>
+                       <div class="panel-heading">
+                               <p style="font-weight:bold;">Information on removed jobs</p>
+                       </div>
+                       <div class="panel-body">
+                       <c:choose>
+                       <c:when test="${njobs > 0}">
+                               <c:if test="${byDate != 'off'}">
+                                       <p>${njobsbyDate} jobs have been removed for the time period: ${date1} to ${date2} (${ndays} days)</p>
+                               </c:if>
+                               <c:if test="${byId != 'off'}">
+                                       <p>Job ${id} has been removed.</p>
+                               </c:if>
+                               <c:if test="${byIp != 'off'}">
+                                       <p>Jobs launched from ${ip} have been removed. ${njobsbyIp} jobs have been removed.</p>
+                               </c:if>
+                               <c:if test="${bySequence != 'off'}">
+                                       <p>Jobs launched with sequence ${seq} have been removed. ${njobsbySeq} jobs have been removed.</p>
+                               </c:if>
+                       </c:when>
+                       <c:otherwise>
+                               <p>No jobs has been removed.</p>
+                       </c:otherwise>
+                       </c:choose>
+                       </div>
                </div>
 
                <jsp:include page="../fragments/footer.jsp" />
        </div>
 </body>
-</html>
\ No newline at end of file
+</html>