Bug fix to the stat pages

git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@4802 e3abac25-378b-4346-85de-24260fe3988d

diff --git a/statpages/Statistics.jsp b/statpages/Statistics.jsp
index f9ebe80..9cef911 100644 (file)
--- a/statpages/Statistics.jsp
+++ b/statpages/Statistics.jsp
@@ -16,16 +16,19 @@ Date: May 2011
 \r
 <h2>JABAWS Usage Statistics for the Period: <fmt:formatDate value="${startDate}" /> to <fmt:formatDate value="${stopDate}"/></h2>\r
 <h2>All Jobs</h2>\r
+<c:set var="where"  value="everywhere" scope="request"/>\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
+<c:set var="where"  value="local" scope="request"/>\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
 <h2>Cluster Jobs</h2>\r
+<c:set var="where"  value="cluster" scope="request"/>\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

diff --git a/statpages/StatisticsTable.jsp b/statpages/StatisticsTable.jsp
index 2d847ee..e6da204 100644 (file)
--- a/statpages/StatisticsTable.jsp
+++ b/statpages/StatisticsTable.jsp
@@ -36,10 +36,10 @@ Date: May 2011
 </c:choose>\r
 \r
 <td>${ws.key}</td>\r
-<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=everywhere&type=all&from=${startDate.time}&to=${stopDate.time}">${ws.value.jobNumber}</a></td>\r
-<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=everywhere&type=incomplete&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.incompleteJobs)}</a></td>\r
-<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=everywhere&type=cancelled&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.cancelledJobs)}</a></td>\r
-<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=everywhere&type=abandoned&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.abandonedJobs)}</a></td>\r
+<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=${where}&type=all&from=${startDate.time}&to=${stopDate.time}">${ws.value.jobNumber}</a></td>\r
+<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=${where}&type=incomplete&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.incompleteJobs)}</a></td>\r
+<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=${where}&type=cancelled&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.cancelledJobs)}</a></td>\r
+<td><a title="Click to view jobs" href="Joblist?ws=${ws.key}&where=${where}&type=abandoned&from=${startDate.time}&to=${stopDate.time}">${fn:length(ws.value.abandonedJobs)}</a></td>\r
 </tr>\r
 </c:forEach>\r
 \r