git://source.jalview.org / proteocache.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rename and merge controllers
[proteocache.git] / webapp / view / queryTimeExecution.jsp
diff --git a/webapp/view/queryTimeExecution.jsp b/webapp/view/queryTimeExecution.jsp
index aeb8564..3d7f7f2 100644 (file)
--- a/webapp/view/queryTimeExecution.jsp
+++ b/webapp/view/queryTimeExecution.jsp
@@ -1,31 +1,37 @@
-<%@ 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 prefix="spring" uri="http://www.springframework.org/tags"%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@page import="java.util.Calendar"%>
 
 <html>
-<jsp:include page="fragments/header.jsp" />
+<jsp:include page="fragments/header_database.jsp" />
 <body>
        <div class="container">
        <jsp:include page="fragments/mainmenu.jsp" />
+       <spring:url value="/stat/exectime/results" var="query"/>
+
+       <div class="panel panel-default">
+               <div class="panel-heading">
+                       <div style="font-weight:bold;">Enter time period for execution statistics</div>
+               </div>
+               <div class="panel-body">
+                       <form method="get" action="${query}">
+                               <p><input type="checkbox" name="option" value="AllDates" checked="checked" onclick="hide(this, 'date');"> Query for all dates</p>
+                                       <div id='date' style="visibility:hidden;">
+                                       <p>
+                                               Jobs executed 
+                                               from <input type="text" name="date1" value="${date1}" style="width: 145px;" /> 
+                                               to <input type="text" name="date2" value="${date2}" style="width: 145px;" />
+                                       </p>
+                                       </div>
 
-       <spring:url value="/exectime/query" var="formurl"/>
-       <form method="get" action="${fn:escapeXml(formurl)}">
-               <h3>Enter time period</h3>      
-                <% Calendar cal = Calendar.getInstance();
-                       String datecalBegin = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/1";
-                       String datecalEnd = cal.get(Calendar.YEAR) + "/" + (cal.get(Calendar.MONTH) + 1) + "/" + cal.get(Calendar.DAY_OF_MONTH);
-                %>
-               <p>from  <input type="text" name="data1" value = <%= datecalBegin%> style=" width : 145px;"/>
-               to <input type="text" name="data2" value = <%= datecalEnd%> style=" width : 145px;"/></p>
-               <input type="checkbox" name="option" value="AllDates">Query for all dates<br>
                                <input type="hidden" name="option" value="off"/>
-               <input type="submit" name="Search" value="Search"/>
-       </form>
+                               <input type="submit" name="Search" value="Search"/>
+                       </form>
+               </div>
+       </div>
        
                <jsp:include page="fragments/footer.jsp"/>
        </div>