PROT-4 updated CF JobDateInfo (add new columns), JpredArchive (add column ExecutionSt...

[proteocache.git] / website / ReportJobsByDate.jsp

diff --git a/website/ReportJobsByDate.jsp b/website/ReportJobsByDate.jsp
index 261a11b..5192e37 100644 (file)
--- a/website/ReportJobsByDate.jsp
+++ b/website/ReportJobsByDate.jsp
@@ -19,9 +19,21 @@
 <h3>Time execution: ${timeExecution} ms</h3>
 
 <c:set var="sum" value="0" />
+<c:set var="sumOK" value="0" />
+<c:set var="sumStopped" value="0" />
+<c:set var="sumError" value="0" />
+<c:set var="sumTimeOut" value="0" />
 <c:forEach items="${result}" var="res">
        <c:set var="tot" value="${res.total}" />
        <c:set var="sum" value="${sum + tot}" />
+       <c:set var="totOK" value="${res.totalOK}" />
+       <c:set var="sumOK" value="${sumOK + totOK}" />
+       <c:set var="totStopped" value="${res.totalStopped}" />
+       <c:set var="sumStopped" value="${sumStopped + totStopped}" />
+       <c:set var="totError" value="${res.totalError}" />
+       <c:set var="sumError" value="${sumError + totError}" />
+       <c:set var="totTimeOut" value="${res.totalTimeOut}" />
+       <c:set var="sumTimeOut" value="${sumTimeOut + totTimeOut}" />
 </c:forEach>
 
 
@@ -29,13 +41,14 @@
        <thead>
                <tr>
                        <th rowspan="2" style="text-align: centre">Date</th>
-                       <th colspan="4" style="text-align: centre">Number of Proteins</th>
+                       <th rowspan="2" style="text-align: centre">Total jobs</th>
+                       <th colspan="5" style="text-align: centre">Number of jobs</th>
                </tr>
                <tr>
-                       <th style="text-align: centre">Total</th>
-                       <th style="text-align: centre">Failed</th>
-                       <th style="text-align: centre">Cancelled</th>
-                       <th style="text-align: centre">Abandoned</th>
+                       <th style="text-align: centre">Status "OK"</th>
+                       <th style="text-align: centre">Status "Stopped"</th>
+                       <th style="text-align: centre">Status "Error"</th>
+                       <th style="text-align: centre">Status "Time out"</th>
                </tr>
        </thead>
        <tbody>
@@ -43,18 +56,20 @@
                <tr style="font-weight: bolder;">
                        <td>Total:</td>
                        <td style="text-align: right">${sum}</td>
-                       <td style="text-align: right">0</td>
-                       <td style="text-align: right">0</td>
-                       <td style="text-align: right">0</td>
+                       <td style="text-align: right">${sumOK}</td>
+                       <td style="text-align: right">${sumStopped}</td>
+                       <td style="text-align: right">${sumError}</td>
+                       <td style="text-align: right">${sumTimeOut}</td>
                </tr>
 
                <c:forEach items="${result}" var="res">
                        <tr>
                                <td>${res.date}</td>
                                <td style="text-align: right"><c:out value="${res.total}" /></td>
-                               <td style="text-align: right">0</td>
-                               <td style="text-align: right">0</td>
-                               <td style="text-align: right">0</td>
+                               <td style="text-align: right">${res.totalOK}</td>
+                               <td style="text-align: right">${res.totalStopped}</td>
+                               <td style="text-align: right">${res.totalError}</td>
+                               <td style="text-align: right">${res.totalTimeOut}</td>
                        </tr>
                </c:forEach>