create DateBean, UserBean, TotalBean

[proteocache.git] / webapp / view / reportJobStatistics.jsp

diff --git a/webapp/view/reportJobStatistics.jsp b/webapp/view/reportJobStatistics.jsp
index 5c707b7..7b7a515 100644 (file)
--- a/webapp/view/reportJobStatistics.jsp
+++ b/webapp/view/reportJobStatistics.jsp
@@ -39,23 +39,6 @@
                                <p>No jobs for this period</p>
                        </c:when>
                        <c:otherwise>
-                               <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>
                                <div class="table-responsive">
                                <table class="table table-striped table-hover table-bordered">
                                        <thead>
@@ -75,20 +58,22 @@
                                        <tbody>
                                                <tr style="font-weight: bolder;">
                                                        <td style="text-align: center">Total:</td>
-                                                       <td style="text-align: right">${sum}</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>
+                                                       <c:set var="total" value="${result.wholeTotal}"/>
+                                                       <td style="text-align: right">${total.total}</td>
+                                                       <td style="text-align: right">${total.totalOK}</td>
+                                                       <td style="text-align: right">${total.totalStopped}</td>
+                                                       <td style="text-align: right">${total.totalError}</td>
+                                                       <td style="text-align: right">${total.totalTimeOut}</td>
                                                </tr>
-                                               <c:forEach items="${result}" var="res">
+                                               <c:forEach items="${result.dateTotal}" var="res">
                                                        <tr>
-                                                               <td style="text-align: center">${res.date}</td>
-                                                               <td style="text-align: right">${res.total}</td>
-                                                               <td style="text-align: right"><a href="${onedayquery}?date=${res.date}">${res.totalOK}</a></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>
+                                                               <td style="text-align: center">${res.key}</td>
+                                                               <c:set var="value" value="${res.value}"/>
+                                                               <td style="text-align: right">${value.total}</td>
+                                                               <td style="text-align: right"><a href="${onedayquery}?date=${res.key}">${value.totalOK}</a></td>
+                                                               <td style="text-align: right">${value.totalStopped}</td>
+                                                               <td style="text-align: right">${value.totalError}</td>
+                                                               <td style="text-align: right">${value.totalTimeOut}</td>
                                                        </tr>
                                                </c:forEach>
                                        </tbody>