Cluster usage per user

From: pvtroshin Date: Thu, 26 May 2011 16:12:19 +0000 (+0000) Subject: Further work on statistics display X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7b9487955c0a2e257ad43eb7d2a9b48942bb5abe;p=jabaws.git Further work on statistics display git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4176 e3abac25-378b-4346-85de-24260fe3988d --- diff --git a/statpages/Joblist.jsp b/statpages/Joblist.jsp index ba232c2..90fda82 100644 --- a/statpages/Joblist.jsp +++ b/statpages/Joblist.jsp @@ -5,26 +5,12 @@ Author: Peter Troshin Date: May 2011 --%> - <%@ 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" %> <%@ taglib uri="http://displaytag.sf.net" prefix="dt" %> - - - - - -Cluster usage per user - - - - - - + @@ -67,15 +53,4 @@ defaultsort="0" defaultorder="descending"> -<%-- - -

- - -

-	<input type="submit" name="Submit"/>
-</form>
- --%>
- 
-</body>
-</html>
\ No newline at end of file
+<jsp:include page="footer.jsp" />
\ No newline at end of file
diff --git a/statpages/MonthlySummary.jsp b/statpages/MonthlySummary.jsp
index 1aff7e4..6c08d4d 100644
--- a/statpages/MonthlySummary.jsp
+++ b/statpages/MonthlySummary.jsp
@@ -1,33 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
 <%--
 Author: Peter Troshin
 Date: May 2011
 --%>
-
 <%@ 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" %>
 <%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>
 
-    
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>JABAWS Monthly Summary Usage Statistics</title>
-<style type="text/css" media="all">
-     @import url("${pageContext.request.contextPath}/statpages/screen.css");
-</style>
-<link rel="stylesheet" href="${pageContext.request.contextPath}/statpages/print.css" type="text/css" media="print" />
-</head>
-
-<body>
-
+<jsp:include page="header.jsp" />
 
 <h2>Web Services Usage Statistics</h2>
-<table class="its" style="border: 1px solid red; border-collapse: separate;"> 
+<table class="its"> 
 <thead>
 <tr>
 <th rowspan="2">Month</th>
@@ -42,8 +25,16 @@ Date: May 2011
 </thead>
 <tbody>
 
-<c:forEach items="${stat}" var="monthTotal" >
-<tr>
+<c:forEach items="${stat}" var="monthTotal" varStatus="status">
+<c:choose>
+	<c:when test="${status.count%2==0}">
+		<tr class="even">
+	</c:when>
+	<c:otherwise>
+		<tr class="odd">
+	</c:otherwise>
+</c:choose>
+
 <td><a href="DisplayStat?datetime=${monthTotal.key.time}"><fmt:formatDate value="${monthTotal.key}" type="date" pattern="MMM yyyy"/></a></td>
 <td>${monthTotal.value.total}</td>
 <td>${monthTotal.value.incomplete}</td>
@@ -62,5 +53,4 @@ Date: May 2011
 </table>
 
 
-</body>
-</html>
\ No newline at end of file
+<jsp:include page="footer.jsp" />
\ No newline at end of file
diff --git a/statpages/Statistics.jsp b/statpages/Statistics.jsp
index af8d82f..65575a6 100644
--- a/statpages/Statistics.jsp
+++ b/statpages/Statistics.jsp
@@ -1,6 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
 <%--
 Author: Peter Troshin
 Date: May 2011
@@ -11,136 +8,25 @@ Date: May 2011
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>
 
+<jsp:include page="header.jsp" />
     
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Cluster usage per user</title>
-<style type="text/css" media="all">
-     @import url("${pageContext.request.contextPath}/statpages/screen.css");
-</style>
-<link rel="stylesheet" href="${pageContext.request.contextPath}/statpages/print.css" type="text/css" media="print" />
-</head>
-
-<body>
-
-
+<h2>JABAWS Usage Statistics for the Period: <fmt:formatDate value="${startDate}" /> to <fmt:formatDate value="${stopDate}"/></h2>
 <h2>All jobs</h2>
-<table class="its" style="border: 1px solid red; border-collapse: separate;"> 
-<thead>
-<tr>
-<th rowspan="2">Web Service</th>
-<th colspan="4" style="text-align: center">Number of Jobs</th>
-</tr>
-<tr>
-<th>Total</th>
-<th>Incomplete</th>
-<th>Cancelled</th>
-<th>Abandoned</th>
-</tr>
-</thead>
-<tbody>
 
- 
-<c:forEach items="${stat.allStat}" var="ws" >
-<tr>
-<td>${ws.key}</td>
-<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=all&from=${startDate}&to=${stopDate}">${ws.value.jobNumber}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=incomplete&from=${startDate}&to=${stopDate}">${fn:length(ws.value.incompleteJobs)}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=cancelled&from=${startDate}&to=${stopDate}">${fn:length(ws.value.cancelledJobs)}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=abandoned&from=${startDate}&to=${stopDate}">${fn:length(ws.value.abandonedJobs)}</a></td>
-</tr>
-</c:forEach>
-
-<tr>
-<td>Total:</td>
-<td>${statTotal.total}</td>
-<td>${statTotal.incomplete}</td>
-<td>${statTotal.cancelled}</td>
-<td>${statTotal.abandoned}</td>
-</tr>
-</tbody>
-</table>
+<c:set var="statistics"  value="${stat.allStat}" scope="request"/>
+<c:set var="totals" value="${statTotal}" scope="request"/>
+<c:import url="StatisticsTable.jsp"/> 
 
 <h2>Local jobs</h2>
-<table style="border: 1px solid red; border-collapse: separate;"> 
-<tr>
-<th rowspan="2">Web Service</th>
-<th colspan="4" style="text-align: center">Number of Jobs</th>
-</tr>
-<tr>
-<th>Total</th>
-<th>Incomplete</th>
-<th>Cancelled</th>
-<th>Abandoned</th>
-</tr>
-
-<c:forEach items="${stat.localStat}" var="ws" >
-<tr>
-<td>${ws.key}</td>
-<td><a href="Joblist?ws=${ws.key}&where=local&type=all&from=${startDate}&to=${stopDate}">${ws.value.jobNumber}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=local&type=incomplete&from=${startDate}&to=${stopDate}">${fn:length(ws.value.incompleteJobs)}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=local&type=cancelled&from=${startDate}&to=${stopDate}">${fn:length(ws.value.cancelledJobs)}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=local&type=abandoned&from=${startDate}&to=${stopDate}">${fn:length(ws.value.abandonedJobs)}</a></td>
-</tr>
-</c:forEach>
-
-<tr>
-<td>Total:</td>
-<td>${statTotalLocal.total}</td>
-<td>${statTotalLocal.incomplete}</td>
-<td>${statTotalLocal.cancelled}</td>
-<td>${statTotalLocal.abandoned}</td>
-</tr>
-
-</table>
-
+<c:set var="statistics"  value="${stat.localStat}" scope="request"/>
+<c:set var="totals" value="${statTotalLocal}" scope="request"/>
+<c:import url="StatisticsTable.jsp"/>
+	
+ 
 <h2>Cluster jobs</h2>
-<table style="border: 1px solid red; border-collapse: separate;"> 
-<tr>
-<th rowspan="2">Web Service</th>
-<th colspan="4" style="text-align: center">Number of Jobs</th>
-</tr>
-<tr>
-<th>Total</th>
-<th>Incomplete</th>
-<th>Cancelled</th>
-<th>Abandoned</th>
-</tr>
-
-<c:forEach items="${stat.clusterStat}" var="ws" >
-<tr>
-<td>${ws.key}</td>
-<td><a href="Joblist?ws=${ws.key}&where=cluster&type=all&from=${startDate}&to=${stopDate}">${ws.value.jobNumber}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=cluster&type=incomplete&from=${startDate}&to=${stopDate}">${fn:length(ws.value.incompleteJobs)}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=cluster&type=cancelled&from=${startDate}&to=${stopDate}">${fn:length(ws.value.cancelledJobs)}</a></td>
-<td><a href="Joblist?ws=${ws.key}&where=cluster&type=abandoned&from=${startDate}&to=${stopDate}">${fn:length(ws.value.abandonedJobs)}</a></td>
-</tr>
-</c:forEach>
-<tr>
-<td>Total:</td>
-<td>${statTotalCluster.total}</td>
-<td>${statTotalCluster.incomplete}</td>
-<td>${statTotalCluster.cancelled}</td>
-<td>${statTotalCluster.abandoned}</td>
-</tr>
+<c:set var="statistics"  value="${stat.clusterStat}" scope="request"/>
+<c:set var="totals" value="${statTotalCluster}" scope="request"/>
+<c:import url="StatisticsTable.jsp"/>
 
-</table>
-
-
-<%--
-<dt:table class="its" id="order" name="${stat.abandonedJobs}" export="true" sort="list"  pagesize="-1" 
-defaultsort="2" defaultorder="descending">
-	<dt:column property="jobname" sortable="true"></dt:column>
-</dt:table>
 
-<form action="" method="post">
-	<input name="field1" maxlength="" title=""  type="text"/>
-	<input name="field2" maxlength="" title=""  type="text"/>
-	<textarea name="field3" cols="10" rows="10"  title="" />
-	<input type="submit" name="Submit"/>
-</form>
- --%>
-</body>
-</html>
\ No newline at end of file
+<jsp:include page="footer.jsp" />
diff --git a/statpages/StatisticsTable.jsp b/statpages/StatisticsTable.jsp
new file mode 100644
index 0000000..d744abe
--- /dev/null
+++ b/statpages/StatisticsTable.jsp
@@ -0,0 +1,56 @@
+<%--
+Author: Peter Troshin
+Date: May 2011
+--%>
+
+<%@ 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" %>
+<%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>
+
+    
+<table class="its" style="border-collapse: separate;"> 
+<thead>
+<tr>
+<th rowspan="2">Web Service</th>
+<th colspan="4" style="text-align: center">Number of Jobs</th>
+</tr>
+<tr>
+<th>Total</th>
+<th>Incomplete</th>
+<th>Cancelled</th>
+<th>Abandoned</th>
+</tr>
+</thead>
+<tbody>
+
+ 
+<c:forEach items="${statistics}" var="ws" varStatus="status">
+<c:choose>
+	<c:when test="${status.count%2==0}">
+		<tr class="even">
+	</c:when>
+	<c:otherwise>
+		<tr class="odd">
+	</c:otherwise>
+</c:choose>
+
+<td>${ws.key}</td>
+<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=all&from=${startDate.time}&to=${stopDate.time}">${ws.value.jobNumber}</a></td>
+<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=incomplete&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.incompleteJobs)}</a></td>
+<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=cancelled&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.cancelledJobs)}</a></td>
+<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=abandoned&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.abandonedJobs)}</a></td>
+</tr>
+</c:forEach>
+
+<tr style="font-weight: bolder;">
+<td>Total:</td>
+<td>${totals.total}</td>
+<td>${totals.incomplete}</td>
+<td>${totals.cancelled}</td>
+<td>${totals.abandoned}</td>
+</tr>
+</tbody>
+</table>
+<c:remove var="statistics"/>
+<c:remove var="totals"/>
\ No newline at end of file
diff --git a/statpages/footer.jsp b/statpages/footer.jsp
index 6565d96..5a464b6 100644
--- a/statpages/footer.jsp
+++ b/statpages/footer.jsp
@@ -1,24 +1,3 @@
-<jsp:root version="1.2" xmlns:jsp="http://java.sun.com/JSP/Page">
-  <jsp:text>
-    <![CDATA[</div></div></div>]]>
-  </jsp:text>
-
-
-  <div class="clear">
-  <hr />
-  </div>
-  <div id="footer">
-
-
-  <div class="xright">© 2002-2006 the Displaytag team</div>
-  <div class="clear">
-  <hr />
-  </div>
-  </div>
-
-
-
-  <jsp:text>
-    <![CDATA[</body></html>]]>
-  </jsp:text>
-</jsp:root>
+</div> 
+</body>
+</html>
diff --git a/statpages/header.jsp b/statpages/header.jsp
index 813a6bb..1e54eaa 100644
--- a/statpages/header.jsp
+++ b/statpages/header.jsp
@@ -1,148 +1,15 @@
-<jsp:root version="1.2" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="urn:jsptld:http://java.sun.com/jstl/core">
-  <jsp:directive.page contentType="text/html; charset=UTF-8" />
-  <jsp:text>
-    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">]]>
-  </jsp:text>
-  <jsp:text>
-    <![CDATA[<html xmlns="http://www.w3.org/1999/xhtml" lang="en">]]>
-  </jsp:text>
-  <head>
-    <title>
-      The
-      <![CDATA[<display:*>]]>
-      tag library
-    </title>
-    <meta http-equiv="Expires" content="-1" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Cache-Control" content="no-cache" />
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-    <style type="text/css" media="all">
-      @import url("css/maven-base.css"); @import url("css/maven-theme.css"); @import url("css/site.css"); @import
-      url("css/screen.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-  </head>
-  <jsp:text>
-    <![CDATA[<body class="composite">]]>
-  </jsp:text>
-  <div id="banner">
-    <a href="index.jsp" id="bannerRight">
-      <img src="img/displaytag.png" alt="" />
-    </a>
-    <div class="clear">
-      <hr />
-    </div>
-  </div>
-  <div id="breadcrumbs">
-    <div class="xright">
-      <a href="http://displaytag.sf.net">Documentation</a>
-      |
-      <a href="index.jsp">Examples</a>
-    </div>
-    <div class="clear">
-      <hr />
-    </div>
-  </div>
-  <div id="leftColumn">
-    <div id="navcolumn">
-      <h5>Examples</h5>
-      <ul>
-        <li>
-          <a href="example-nocolumns.jsp">Simplest case, no columns</a>
-        </li>
-        <li>
-          <a href="example-columns.jsp">Columns</a>
-        </li>
-        <li>
-          <a href="example-styles.jsp">Styles</a>
-        </li>
-        <li>
-          <a href="example-datasource.jsp">Acquiring your List of data</a>
-        </li>
-        <li>
-          <a href="example-imp-objects.jsp">Implicit objects</a>
-        </li>
-        <li>
-          <a href="example-subsets.jsp">Showing subsets of data</a>
-        </li>
-        <li>
-          <a href="example-autolink.jsp">Smart linking</a>
-        </li>
-        <li>
-          <a href="example-decorator.jsp">Using decorators</a>
-        </li>
-        <li>
-          <a href="example-decorator-link.jsp">Creating dynamic links</a>
-        </li>
-        <li>
-          <a href="example-paging.jsp">Auto-paging of long lists</a>
-        </li>
-        <li>
-          <a href="example-sorting.jsp">Auto-sorting by columns</a>
-        </li>
-        <li>
-          <a href="example-grouping.jsp">Column grouping</a>
-        </li>
-        <li>
-          <a href="example-callbacks.jsp">Using callbacks for totals</a>
-        </li>
-        <li>
-          <a href="example-export.jsp">Data exporting</a>
-        </li>
-        <li>
-          <a href="example-config.jsp">Config, overriding default</a>
-        </li>
-        <li>
-          <a href="example-pse.jsp">All the features together</a>
-        </li>
-        <li>
-          <a href="example-twotables.jsp">More tables on one page</a>
-        </li>
-        <li>
-          <a href="example-nestedtables.jsp">Nested tables</a>
-        </li>
-        <li>
-          <a href="example-caption-footer.jsp">Caption and footer</a>
-        </li>
-        <li>
-          <a href="example-misc.jsp">Misc, odds and ends</a>
-        </li>
-        <li>
-          <a href="example-new-export.jsp">WYSIWYG data exporting</a>
-        </li>
-        <li>
-          <a href="example-format.jsp">Using format</a>
-        </li>
-        <li>
-          <a href="example-columnlist.jsp">Dynamic Column Creation</a>
-        </li>
-        <li>
-          <a href="example-rowclass.jsp">Row highlighting</a>
-        </li>
-        <li>
-          <a href="example-columnsummation.jsp">Column Summation</a>
-        </li>
-        <li>
-          <a href="example-keepstatus.jsp">Preserve pagination status</a>
-        </li>
-        <li>
-          <a href="example-checkboxes.jsp">Posting forms (checkboxes)</a>
-        </li>
-      </ul>
-      <a href="http://validator.w3.org/check?uri=referer" id="poweredBy">
-        <img src="img/valid-xhtml10.png" alt="Valid XHTML 1.0!" height="31" width="88" style="border:none" />
-      </a>
-    </div>
-  </div>
-  <jsp:scriptlet>if (request.getRequestURI().indexOf("example-") != -1) {</jsp:scriptlet>
-  <ul id="showsource">
-    <li><![CDATA[<a href="]]><c:out value="${pageContext.request.requestURI}" />
-      <![CDATA[.source">View source</a>]]></li>
-  </ul>
-  <jsp:scriptlet>}</jsp:scriptlet>
-  <jsp:text>
-    <![CDATA[<div id="bodyColumn">
-      <div id="contentBox">
-      <div class="section">]]>
-  </jsp:text>
-</jsp:root>
+    
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Cluster usage per user</title>
+<style type="text/css" media="all">
+     @import url("${pageContext.request.contextPath}/statpages/screen.css");
+</style>
+<link rel="stylesheet" href="${pageContext.request.contextPath}/statpages/print.css" type="text/css" media="print" />
+
+</head>
+<body>
+<div id="statwrapper">
+
diff --git a/statpages/screen.css b/statpages/screen.css
index 302a5d3..9f4c984 100644
--- a/statpages/screen.css
+++ b/statpages/screen.css
@@ -18,12 +18,12 @@ h4,h5,h6,p,strong,div,form,acronym,label,table,td,th,span,a,hr,code,pre,hr
 }
 
 a,a:visited,a:hover {
-	color: #666;
-	text-decoration: none;
+	color: black;
+	text-decoration: underline;
 }
 
 a:hover {
-	text-decoration: underline;
+	color: #666; 
 }
 
 img {