From: pvtroshin <pvtroshin@e3abac25-378b-4346-85de-24260fe3988d>
Date: Thu, 26 May 2011 15:03:35 +0000 (+0000)
Subject: Further work on statistics display
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4c9da258de7e115741f62fba3db9b9e7e128a6e4;p=jabaws.git

Further work on statistics display

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

diff --git a/statpages/MonthlySummary.jsp b/statpages/MonthlySummary.jsp
index 09d3ca5..1aff7e4 100644
--- a/statpages/MonthlySummary.jsp
+++ b/statpages/MonthlySummary.jsp
@@ -44,7 +44,7 @@ Date: May 2011
 
 <c:forEach items="${stat}" var="monthTotal" >
 <tr>
-<td><a href="DisplayStat?month=${monthTotal.key}"><fmt:formatDate value="${monthTotal.key}" type="date" pattern="MMM yyyy"/></a></td>
+<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>
 <td>${monthTotal.value.cancelled}</td>
diff --git a/statpages/Statistics.jsp b/statpages/Statistics.jsp
index f788e7c..af8d82f 100644
--- a/statpages/Statistics.jsp
+++ b/statpages/Statistics.jsp
@@ -41,7 +41,8 @@ Date: May 2011
 </tr>
 </thead>
 <tbody>
-<c:set var="count"></c:set>
+
+ 
 <c:forEach items="${stat.allStat}" var="ws" >
 <tr>
 <td>${ws.key}</td>
@@ -51,6 +52,7 @@ Date: May 2011
 <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>
@@ -107,7 +109,7 @@ Date: May 2011
 <th>Abandoned</th>
 </tr>
 
-<c:forEach items="${stats.clusterStat}" var="ws" >
+<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>