<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">
<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>
<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="${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>
</div>
</c:otherwise>
</c:choose>
-
</div>
</div>
git://source.jalview.org / proteocache.git / blobdiff