-<?xml version="1.0" encoding="ISO-8859-1" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
- pageEncoding="ISO-8859-1"%>\r
<%--\r
Author: Peter Troshin\r
Date: May 2011\r
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>\r
<%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>\r
\r
+<jsp:include page="header.jsp" />\r
\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html xmlns="http://www.w3.org/1999/xhtml">\r
-<head>\r
-<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("${pageContext.request.contextPath}/statpages/screen.css");\r
-</style>\r
-<link rel="stylesheet" href="${pageContext.request.contextPath}/statpages/print.css" type="text/css" media="print" />\r
-</head>\r
-\r
-<body>\r
-\r
-\r
+<h2>JABAWS Usage Statistics for the Period: <fmt:formatDate value="${startDate}" /> to <fmt:formatDate value="${stopDate}"/></h2>\r
<h2>All jobs</h2>\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="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>Abandoned</th>\r
-</tr>\r
-</thead>\r
-<tbody>\r
\r
- \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=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>${statTotal.total}</td>\r
-<td>${statTotal.incomplete}</td>\r
-<td>${statTotal.cancelled}</td>\r
-<td>${statTotal.abandoned}</td>\r
-</tr>\r
-</tbody>\r
-</table>\r
+<c:set var="statistics" value="${stat.allStat}" scope="request"/>\r
+<c:set var="totals" value="${statTotal}" scope="request"/>\r
+<c:import url="StatisticsTable.jsp"/> \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="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>Abandoned</th>\r
-</tr>\r
-\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
+<c:set var="statistics" value="${stat.localStat}" scope="request"/>\r
+<c:set var="totals" value="${statTotalLocal}" scope="request"/>\r
+<c:import url="StatisticsTable.jsp"/>\r
+ \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="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>Abandoned</th>\r
-</tr>\r
-\r
-<c:forEach items="${stat.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
+<c:set var="statistics" value="${stat.clusterStat}" scope="request"/>\r
+<c:set var="totals" value="${statTotalCluster}" scope="request"/>\r
+<c:import url="StatisticsTable.jsp"/>\r
\r
-</table>\r
-\r
-\r
-<%--\r
-<dt:table class="its" id="order" name="${stat.abandonedJobs}" export="true" sort="list" pagesize="-1" \r
-defaultsort="2" defaultorder="descending">\r
- <dt:column property="jobname" sortable="true"></dt:column>\r
-</dt:table>\r
\r
-<form action="" method="post">\r
- <input name="field1" maxlength="" title="" type="text"/>\r
- <input name="field2" maxlength="" title="" type="text"/>\r
- <textarea name="field3" cols="10" rows="10" title="" />\r
- <input type="submit" name="Submit"/>\r
-</form>\r
- --%>\r
-</body>\r
-</html>
\ No newline at end of file
+<jsp:include page="footer.jsp" />\r
git://source.jalview.org / jabaws.git / blobdiff