git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Improve UI of the website
[proteocache.git] / webapp / view / reportTimeExecution.jsp
diff --git a/webapp/view/reportTimeExecution.jsp b/webapp/view/reportTimeExecution.jsp
index 9c642e8..d711c05 100644 (file)
--- a/webapp/view/reportTimeExecution.jsp
+++ b/webapp/view/reportTimeExecution.jsp
@@ -1,12 +1,11 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-       pageEncoding="UTF-8"%>
+<%@ 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"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ page trimDirectiveWhitespaces="true"%>
+
 <%@page import="java.util.ArrayList"%>
 
 <html>
@@ -14,17 +13,28 @@
 <body>
        <div class="container">
                <jsp:include page="fragments/mainmenu.jsp" />
+               <spring:url value="/exectime/query?date1=${date1}&date2=${date2}&option=${option}" var="thequery" />
+
+       <!-- reload button  -->
+       <ul class="nav navbar-nav navbar-right">
+               <li>
+               <a href="${thequery}" class="btn btn-default active" role="button">Reload</a>
+               </li>
+       </ul>
 
+       <div class="panel panel-default">
+       <div class="panel-heading">
                <c:choose>
-                       <c:when test="${flag == 'AllDate'}">
-                               <h3>Time execution for the whole period</h3>
+                       <c:when test="${option == 'AllDates,off'}">
+                               <p style="font-weight:bold;">Time execution for the whole period</p>
                        </c:when>
                        <c:otherwise>
-                               <h3>Time execution for the interval: ${data1} - ${data2}</h3>
+                               <p style="font-weight:bold;">Time execution for the interval: ${date1} - ${date2}</p>
                        </c:otherwise>
                </c:choose>
-               <h3>Time execution: ${timeExecution} ms</h3>
-
+       </div>
+       
+       <div class="panel-body">
                <c:set var="sum" value="0" />
                <c:forEach items="${result}" var="res" varStatus="loop">
                        <c:choose>
@@ -36,13 +46,13 @@
                        </c:choose>
                </c:forEach>
 
-               <h3>Total number of jobs: ${sum}</h3>
+               <p>There are ${sum} jobs in total</p>
 
-               <table border="1"
-                       style="border-collapse: collapse; white-space: nowrap">
+               <table class="table table-striped table-hover table-bordered">
                        <thead>
                                <tr>
                                        <th style="text-align: center; width: 150px">Date</th>
+                                       <th style="text-align: center; width: 150px">Total</th>
                                        <th style="text-align: center; width: 150px">0 - 30 s</th>
                                        <th style="text-align: center; width: 150px">30 - 60 s</th>
                                        <th style="text-align: center; width: 150px">1 - 2 min</th>
@@ -55,7 +65,8 @@
                                        <c:choose>
                                                <c:when test="${loop.last}">
                                                        <tr style="font-weight: bolder;">
-                                                               <td>Total:</td>
+                                                               <td style="text-align: right">Total numbers:</td>
+                                                               <td style="text-align: right">0</td>
                                                                <c:forEach items="${res.timeTotalExec}" var="total">
                                                                        <td style="text-align: right">${total}</td>
                                                                </c:forEach>
@@ -68,7 +79,8 @@
                                        <c:choose>
                                                <c:when test="${not loop.last}">
                                                        <tr>
-                                                               <td>${res.date}</td>
+                                                               <td style="text-align: center">${res.date}</td>
+                                                               <td style="text-align: right">0</td>
                                                                <c:forEach items="${res.timeRez}" var="time">
                                                                        <td style="text-align: right">${time}</td>
                                                                </c:forEach>
@@ -78,9 +90,10 @@
                                </c:forEach>
                        </tbody>
                </table>
+       </div>
+       </div>
 
-
-               <jsp:include page="fragments/footer.jsp" />
+       <jsp:include page="fragments/footer.jsp" />
        </div>
 </body>
 </html>
\ No newline at end of file