From 56126383fbbcc715f756aaa1f283dca988fcd975 Mon Sep 17 00:00:00 2001
From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Thu, 8 Dec 2011 17:44:10 +0000
Subject: [PATCH] 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
---
 statpages/Statistics.jsp      |    3 +++
 statpages/StatisticsTable.jsp |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/statpages/Statistics.jsp b/statpages/Statistics.jsp
index f9ebe80..9cef911 100644
--- a/statpages/Statistics.jsp
+++ b/statpages/Statistics.jsp
@@ -16,16 +16,19 @@ Date: May 2011
 
 <h2>JABAWS Usage Statistics for the Period: <fmt:formatDate value="${startDate}" /> to <fmt:formatDate value="${stopDate}"/></h2>
 <h2>All Jobs</h2>
+<c:set var="where"  value="everywhere" scope="request"/>
 <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>
+<c:set var="where"  value="local" scope="request"/>
 <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>
+<c:set var="where"  value="cluster" scope="request"/>
 <c:set var="statistics"  value="${stat.clusterStat}" scope="request"/>
 <c:set var="totals" value="${statTotalCluster}" scope="request"/>
 <c:import url="StatisticsTable.jsp"/>
diff --git a/statpages/StatisticsTable.jsp b/statpages/StatisticsTable.jsp
index 2d847ee..e6da204 100644
--- a/statpages/StatisticsTable.jsp
+++ b/statpages/StatisticsTable.jsp
@@ -36,10 +36,10 @@ Date: May 2011
 </c:choose>
 
 <td>${ws.key}</td>
-<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>
-<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>
-<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>
-<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>
+<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>
+<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>
+<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>
+<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>
 </tr>
 </c:forEach>
 
-- 
1.7.10.2