git://source.jalview.org / jabaws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Further work on statistics display
[jabaws.git] / statpages / Statistics.jsp
diff --git a/statpages/Statistics.jsp b/statpages/Statistics.jsp
index 11ab920..f788e7c 100644 (file)
--- a/statpages/Statistics.jsp
+++ b/statpages/Statistics.jsp
@@ -18,35 +18,36 @@ Date: May 2011
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />\r
 <title>Cluster usage per user</title>\r
 <style type="text/css" media="all">\r
-     @import url("statpages/screen.css");\r
+     @import url("${pageContext.request.contextPath}/statpages/screen.css");\r
 </style>\r
-<link rel="stylesheet" href="statpages/print.css" type="text/css" media="print" />\r
-\r
+<link rel="stylesheet" href="${pageContext.request.contextPath}/statpages/print.css" type="text/css" media="print" />\r
 </head>\r
+\r
 <body>\r
 \r
-<div id="wrapper">\r
+\r
 <h2>All jobs</h2>\r
-<table style="border: 1px solid red; border-collapse: separate;"> \r
+<table class="its" style="border: 1px solid red; border-collapse: separate;"> \r
+<thead>\r
 <tr>\r
 <th rowspan="2">Web Service</th>\r
-<th colspan="3" style="text-align: center">Number of Jobs</th>\r
+<th colspan="4" style="text-align: center">Number of Jobs</th>\r
 </tr>\r
 <tr>\r
 <th>Total</th>\r
 <th>Incomplete</th>\r
 <th>Cancelled</th>\r
-<th>Failed</th>\r
 <th>Abandoned</th>\r
 </tr>\r
+</thead>\r
+<tbody>\r
 <c:set var="count"></c:set>\r
-<c:forEach items="${stat}" var="ws" >\r
+<c:forEach items="${stat.allStat}" var="ws" >\r
 <tr>\r
 <td>${ws.key}</td>\r
 <td><a href="Joblist?ws=${ws.key}&where=everywhere&type=all&from=${startDate}&to=${stopDate}">${ws.value.jobNumber}</a></td>\r
 <td><a href="Joblist?ws=${ws.key}&where=everywhere&type=incomplete&from=${startDate}&to=${stopDate}">${fn:length(ws.value.incompleteJobs)}</a></td>\r
 <td><a href="Joblist?ws=${ws.key}&where=everywhere&type=cancelled&from=${startDate}&to=${stopDate}">${fn:length(ws.value.cancelledJobs)}</a></td>\r
-<td><a href="Joblist?ws=${ws.key}&where=everywhere&type=failed&from=${startDate}&to=${stopDate}">${fn:length(ws.value.failedJobs)}</a></td>\r
 <td><a href="Joblist?ws=${ws.key}&where=everywhere&type=abandoned&from=${startDate}&to=${stopDate}">${fn:length(ws.value.abandonedJobs)}</a></td>\r
 </tr>\r
 </c:forEach>\r
@@ -55,57 +56,76 @@ Date: May 2011
 <td>${statTotal.total}</td>\r
 <td>${statTotal.incomplete}</td>\r
 <td>${statTotal.cancelled}</td>\r
-<td>${statTotal.failed}</td>\r
 <td>${statTotal.abandoned}</td>\r
 </tr>\r
-\r
+</tbody>\r
 </table>\r
 \r
 <h2>Local jobs</h2>\r
 <table style="border: 1px solid red; border-collapse: separate;"> \r
 <tr>\r
 <th rowspan="2">Web Service</th>\r
-<th colspan="3" style="text-align: center">Number of Jobs</th>\r
+<th colspan="4" style="text-align: center">Number of Jobs</th>\r
 </tr>\r
 <tr>\r
-<th>OK </th>\r
-<th>Unfinished</th>\r
+<th>Total</th>\r
+<th>Incomplete</th>\r
 <th>Cancelled</th>\r
+<th>Abandoned</th>\r
 </tr>\r
 \r
-<c:forEach items="${statLocal}" var="ws" >\r
+<c:forEach items="${stat.localStat}" var="ws" >\r
 <tr>\r
 <td>${ws.key}</td>\r
 <td><a href="Joblist?ws=${ws.key}&where=local&type=all&from=${startDate}&to=${stopDate}">${ws.value.jobNumber}</a></td>\r
 <td><a href="Joblist?ws=${ws.key}&where=local&type=incomplete&from=${startDate}&to=${stopDate}">${fn:length(ws.value.incompleteJobs)}</a></td>\r
 <td><a href="Joblist?ws=${ws.key}&where=local&type=cancelled&from=${startDate}&to=${stopDate}">${fn:length(ws.value.cancelledJobs)}</a></td>\r
+<td><a href="Joblist?ws=${ws.key}&where=local&type=abandoned&from=${startDate}&to=${stopDate}">${fn:length(ws.value.abandonedJobs)}</a></td>\r
 </tr>\r
 </c:forEach>\r
+\r
+<tr>\r
+<td>Total:</td>\r
+<td>${statTotalLocal.total}</td>\r
+<td>${statTotalLocal.incomplete}</td>\r
+<td>${statTotalLocal.cancelled}</td>\r
+<td>${statTotalLocal.abandoned}</td>\r
+</tr>\r
+\r
 </table>\r
 \r
 <h2>Cluster jobs</h2>\r
 <table style="border: 1px solid red; border-collapse: separate;"> \r
 <tr>\r
 <th rowspan="2">Web Service</th>\r
-<th colspan="3" style="text-align: center">Number of Jobs</th>\r
+<th colspan="4" style="text-align: center">Number of Jobs</th>\r
 </tr>\r
 <tr>\r
-<th>OK </th>\r
-<th>Unfinished</th>\r
+<th>Total</th>\r
+<th>Incomplete</th>\r
 <th>Cancelled</th>\r
+<th>Abandoned</th>\r
 </tr>\r
 \r
-<c:forEach items="${statCluster}" var="ws" >\r
+<c:forEach items="${stats.clusterStat}" var="ws" >\r
 <tr>\r
 <td>${ws.key}</td>\r
 <td><a href="Joblist?ws=${ws.key}&where=cluster&type=all&from=${startDate}&to=${stopDate}">${ws.value.jobNumber}</a></td>\r
 <td><a href="Joblist?ws=${ws.key}&where=cluster&type=incomplete&from=${startDate}&to=${stopDate}">${fn:length(ws.value.incompleteJobs)}</a></td>\r
 <td><a href="Joblist?ws=${ws.key}&where=cluster&type=cancelled&from=${startDate}&to=${stopDate}">${fn:length(ws.value.cancelledJobs)}</a></td>\r
+<td><a href="Joblist?ws=${ws.key}&where=cluster&type=abandoned&from=${startDate}&to=${stopDate}">${fn:length(ws.value.abandonedJobs)}</a></td>\r
 </tr>\r
 </c:forEach>\r
+<tr>\r
+<td>Total:</td>\r
+<td>${statTotalCluster.total}</td>\r
+<td>${statTotalCluster.incomplete}</td>\r
+<td>${statTotalCluster.cancelled}</td>\r
+<td>${statTotalCluster.abandoned}</td>\r
+</tr>\r
+\r
 </table>\r
 \r
-</div><!-- Wrapper end -->\r
 \r
 <%--\r
 <dt:table class="its" id="order" name="${stat.abandonedJobs}" export="true" sort="list"  pagesize="-1" \r