git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add additional checks of input parameters
[proteocache.git] / webapp / view / reportJobStatistics.jsp
diff --git a/webapp/view/reportJobStatistics.jsp b/webapp/view/reportJobStatistics.jsp
index 0ce608c..59a0cb1 100644 (file)
--- a/webapp/view/reportJobStatistics.jsp
+++ b/webapp/view/reportJobStatistics.jsp
@@ -1,4 +1,3 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 <%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
@@ -6,32 +5,35 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 
-<%@page import="java.util.ArrayList"%>
-
 <html>
 <jsp:include page="fragments/header.jsp" />
 <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" />
+
+       <ul class="nav navbar-nav navbar-right">
+               <li>
+               <a href="${thequery}" class="btn btn-default active">Reload</a>
+               </li>
+       </ul>
 
        <div class="panel panel-default">
        <div class="panel-heading">
-
                <c:choose>
-                       <c:when test="${flag == 'AllDates,off'}">
-                               <p style="font-weight:bold;">Jobs statistics for the whole period</p>
+                       <c:when test="${option == 'AllDates,off'}">
+                               <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="${data1}" /> to <c:out value="${data2}"/>
+                               Jobs statistics for the time period: <c:out value="${date1}" /> to <c:out value="${date2}"/> (${ndays} days)
                                </p>
                        </c:otherwise>
                </c:choose>
-
        </div>
-       <div class="panel-body">
 
+       <div class="panel-body">
                <c:choose>
                        <c:when test="${result == null}">
                                <p>No jobs for this period</p>
@@ -59,13 +61,13 @@
                                        <thead>
                                                <tr style="text-align: center">
                                                        <th rowspan="2" style="text-align: center">Date</th>
-                                                       <th rowspan="2" style="text-align: center">Total <br/>number of jobs</th>
-                                                       <th colspan="5" style="text-align: center">Number of jobs</th>
+                                                       <th rowspan="2" style="text-align: center">Total number<br/> of jobs</th>
+                                                       <th colspan="5" style="text-align: center">Job Statistics</th>
                                                </tr>
                                                <tr>
                                                        <th style="text-align: center">Status "OK"</th>
                                                        <th style="text-align: center">Status "Stopped"</th>
-                                                       <th style="text-align: center">Status "Error"</th>
+                                                       <th style="text-align: center">Status "Internal Error"</th>
                                                        <th style="text-align: center">Status "Time out"</th>
                                                </tr>
                                        </thead>