git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
1. Move query jsps into a separate directory
[proteocache.git] / webapp / view / reportTimeExecution.jsp
diff --git a/webapp/view/reportTimeExecution.jsp b/webapp/view/reportTimeExecution.jsp
index d711c05..64cef89 100644 (file)
--- a/webapp/view/reportTimeExecution.jsp
+++ b/webapp/view/reportTimeExecution.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,19 +5,17 @@
 <%@ 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="/exectime/query?date1=${date1}&date2=${date2}&option=${option}" var="thequery" />
+               <spring:url value="/stat/exectime/query?date1=${date1}&date2=${date2}&option=${option}" var="the_query" />
 
        <!-- reload button  -->
        <ul class="nav navbar-nav navbar-right">
                <li>
-               <a href="${thequery}" class="btn btn-default active" role="button">Reload</a>
+               <a href="${the_query}" class="btn btn-default active">Reload</a>
                </li>
        </ul>
 
@@ -26,10 +23,10 @@
        <div class="panel-heading">
                <c:choose>
                        <c:when test="${option == 'AllDates,off'}">
-                               <p style="font-weight:bold;">Time execution for the whole period</p>
+                               <p style="font-weight:bold;">Time execution for the whole period (${ndays} days)</p>
                        </c:when>
                        <c:otherwise>
-                               <p style="font-weight:bold;">Time execution for the interval: ${date1} - ${date2}</p>
+                               <p style="font-weight:bold;">Time execution for the interval: ${date1} - ${date2} (${ndays} days)</p>
                        </c:otherwise>
                </c:choose>
        </div>
@@ -66,7 +63,11 @@
                                                <c:when test="${loop.last}">
                                                        <tr style="font-weight: bolder;">
                                                                <td style="text-align: right">Total numbers:</td>
-                                                               <td style="text-align: right">0</td>
+                                                               <c:set var="alldaytotal" value="0"/>
+                                                               <c:forEach items="${res.timeTotalExec}" var="total">
+                                                                       <c:set var="alldaytotal" value="${alldaytotal + total}"/>
+                                                               </c:forEach>
+                                                               <td style="text-align: right">${alldaytotal}</td>
                                                                <c:forEach items="${res.timeTotalExec}" var="total">
                                                                        <td style="text-align: right">${total}</td>
                                                                </c:forEach>
@@ -80,7 +81,11 @@
                                                <c:when test="${not loop.last}">
                                                        <tr>
                                                                <td style="text-align: center">${res.date}</td>
-                                                               <td style="text-align: right">0</td>
+                                                               <c:set var="daytotal" value="0"/>
+                                                               <c:forEach items="${res.timeRez}" var="time">
+                                                                       <c:set var="daytotal" value="${daytotal + time}"/>
+                                                               </c:forEach>
+                                                               <td style="text-align: right">${daytotal}</td>
                                                                <c:forEach items="${res.timeRez}" var="time">
                                                                        <td style="text-align: right">${time}</td>
                                                                </c:forEach>