git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add the "Reload" and "CSV" buttons
[proteocache.git] / webapp / view / reportJobStatistics.jsp
diff --git a/webapp/view/reportJobStatistics.jsp b/webapp/view/reportJobStatistics.jsp
index 7b7a515..09a3a87 100644 (file)
--- a/webapp/view/reportJobStatistics.jsp
+++ b/webapp/view/reportJobStatistics.jsp
@@ -10,24 +10,30 @@
 <body>
        <div class="container">
                <jsp:include page="fragments/mainmenu.jsp" />
-               <spring:url value="/stat/oneday" var="onedayquery" />
-               <spring:url value="/stat/query?date1=${date1}&date2=${date2}&option=${option}" var="thequery" />
+               <spring:url value="/stat/jobsoneday/results" var="oneday_query" />
+               <spring:url value="/stat/jobsdaily/results?date1=${date1}&date2=${date2}&option=${option}" var="the_query" />
 
-       <ul class="nav navbar-nav navbar-right">
-               <li>
-               <a href="${thequery}" class="btn btn-default active">Reload</a>
-               </li>
-       </ul>
+               <!-- reload and CSV buttons  -->
+               <ul class="nav navbar-nav navbar-right">
+                       <li>
+                       <a href="${the_query}" class="btn btn-default active">Reload</a>
+                       </li>
+                       <c:choose><c:when test="${csvfile != ''}">
+                       <li>
+                       <a id="forCSVfile" download="data.csv" href="data:application/csv;charset=utf-8,${csvfile}" class="btn btn-default active">CSV</a>
+                       </li>
+                       </c:when></c:choose>
+               </ul>
 
        <div class="panel panel-default">
        <div class="panel-heading">
                <c:choose>
                        <c:when test="${option == 'AllDates,off'}">
-                               <p style="font-weight:bold;">Jobs statistics for the whole period</p>
+                               <p style="font-weight:bold;">Jobs statistics for the whole period (${ndays} days)</p>
                        </c:when>
                        <c:otherwise>
                                <p style="font-weight:bold;">
-                               Jobs statistics for the time period: <c:out value="${date1}" /> to <c:out value="${date2}"/>
+                               Jobs statistics for the time period: <c:out value="${date1}" /> to <c:out value="${date2}"/> (${ndays} days)
                                </p>
                        </c:otherwise>
                </c:choose>
@@ -70,10 +76,25 @@
                                                                <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>
+                                                               <td style="text-align: right"><a href="${oneday_query}?date=${res.key}&status=OK">${value.totalOK}</a></td>
+                                                               <td style="text-align: right">
+                                                                       <c:choose>
+                                                                       <c:when test="${value.totalStopped == 0}">0</c:when>
+                                                                       <c:otherwise><a href="${oneday_query}?date=${res.key}&status=Stopped">${value.totalStopped}</a></c:otherwise>
+                                                                       </c:choose>
+                                                               </td>
+                                                               <td style="text-align: right">
+                                                                       <c:choose>
+                                                                       <c:when test="${value.totalError == 0}">0</c:when>
+                                                                       <c:otherwise><a href="${oneday_query}?date=${res.key}&status=JpredError">${value.totalError}</a></c:otherwise>
+                                                                       </c:choose>
+                                                               </td>
+                                                               <td style="text-align: right">
+                                                                       <c:choose>
+                                                                       <c:when test="${value.totalTimeOut == 0}">0</c:when>
+                                                                       <c:otherwise><a href="${oneday_query}?date=${res.key}&status=TimedOut">${value.totalTimeOut}</a></c:otherwise>
+                                                                       </c:choose>
+                                                               </td>
                                                        </tr>
                                                </c:forEach>
                                        </tbody>
@@ -81,7 +102,6 @@
                                </div>
                        </c:otherwise>
                </c:choose>
-
        </div>
        </div>