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 (file)
--- a/statpages/MonthlySummary.jsp
+++ b/statpages/MonthlySummary.jsp
@@ -44,7 +44,7 @@ Date: May 2011
 \r
 <c:forEach items="${stat}" var="monthTotal" >\r
 <tr>\r
-<td><a href="DisplayStat?month=${monthTotal.key}"><fmt:formatDate value="${monthTotal.key}" type="date" pattern="MMM yyyy"/></a></td>\r
+<td><a href="DisplayStat?datetime=${monthTotal.key.time}"><fmt:formatDate value="${monthTotal.key}" type="date" pattern="MMM yyyy"/></a></td>\r
 <td>${monthTotal.value.total}</td>\r
 <td>${monthTotal.value.incomplete}</td>\r
 <td>${monthTotal.value.cancelled}</td>\r

diff --git a/statpages/Statistics.jsp b/statpages/Statistics.jsp
index f788e7c..af8d82f 100644 (file)
--- a/statpages/Statistics.jsp
+++ b/statpages/Statistics.jsp
@@ -41,7 +41,8 @@ Date: May 2011
 </tr>\r
 </thead>\r
 <tbody>\r
-<c:set var="count"></c:set>\r
+\r
+ \r
 <c:forEach items="${stat.allStat}" var="ws" >\r
 <tr>\r
 <td>${ws.key}</td>\r
@@ -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>\r
 </tr>\r
 </c:forEach>\r
+\r
 <tr>\r
 <td>Total:</td>\r
 <td>${statTotal.total}</td>\r
@@ -107,7 +109,7 @@ Date: May 2011
 <th>Abandoned</th>\r
 </tr>\r
 \r
-<c:forEach items="${stats.clusterStat}" var="ws" >\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