JWS-29 patch fixes bug - wierd workaround since "^\\s*>" caused scanner to advance...

[jabaws.git] / statpages / MonthlySummary.jsp

diff --git a/statpages/MonthlySummary.jsp b/statpages/MonthlySummary.jsp
index 6c08d4d..ec06abf 100644 (file)
--- a/statpages/MonthlySummary.jsp
+++ b/statpages/MonthlySummary.jsp
@@ -7,20 +7,24 @@ Date: May 2011
 <%@ 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
+<c:import url="header.jsp" >\r
+       <c:param name="title">JABAWS Usage Statistics</c:param>\r
+</c:import>  \r
 \r
-<h2>Web Services Usage Statistics</h2>\r
-<table class="its"> \r
+<div style="margin: 20px ">  \r
+\r
+<h1>JABAWS Usage Statistics</h1>\r
+<table class="center its" style="width: 600px "> \r
 <thead>\r
 <tr>\r
 <th rowspan="2">Month</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
+<th title="Total number of jobs received">Total</th>\r
+<th title="The number of jobs with no result">Incomplete</th>\r
+<th title="The number of cancelled jobs">Cancelled</th>\r
+<th title="The number of jobs started but not collected by the user">Abandoned</th>\r
 </tr>\r
 </thead>\r
 <tbody>\r
@@ -35,14 +39,24 @@ Date: May 2011
        </c:otherwise>\r
 </c:choose>\r
 \r
-<td><a href="DisplayStat?datetime=${monthTotal.key.time}"><fmt:formatDate value="${monthTotal.key}" type="date" pattern="MMM yyyy"/></a></td>\r
+<td>\r
+<c:choose>\r
+<c:when test="${isAdmin}">\r
+  <a title="Click to view the detailed statistics for the period" href="DisplayStat?datetime=${monthTotal.key.time}"><fmt:formatDate value="${monthTotal.key}" type="date" pattern="MMM yyyy"/></a>\r
+</c:when>\r
+<c:otherwise>\r
+   <fmt:formatDate value="${monthTotal.key}" type="date" pattern="MMM yyyy"/>\r
+</c:otherwise>\r
+</c:choose>\r
+\r
+</td>\r
 <td>${monthTotal.value.total}</td>\r
 <td>${monthTotal.value.incomplete}</td>\r
 <td>${monthTotal.value.cancelled}</td>\r
 <td>${monthTotal.value.abandoned}</td>\r
 </tr>\r
 </c:forEach>\r
-<tr>\r
+<tr style="font-weight: bolder;">\r
 <td>Total:</td>\r
 <td>${total.total}</td>\r
 <td>${total.incomplete}</td>\r
@@ -52,5 +66,25 @@ Date: May 2011
 </tbody>\r
 </table>\r
 \r
+<div style="width: 600px">\r
+<h3>Help</h3>\r
+<p>\r
+The table contains the number of jobs processed by JABAWS per month, for the whole \r
+period when the statistics was collected</p> \r
+For each month the table contains the following information.  \r
+<ul>\r
+       <li>The period of time for which statistics is displayed. For example Jan 2011 means period of time from the first of \r
+       January to the 31 of January.</li>\r
+       <li>Total - the total number of jobs accepted by JABAWS</li>\r
+       <li>Incomplete - the number of jobs for which the result file was not found or was empty excluding cancelled</li>\r
+       <li>Cancelled - the number of jobs cancelled by the user</li>\r
+       <li>Abandoned - the number of jobs which result(s) were not collected</li>\r
+</ul>\r
+The summary for each column is displayed in the last row of the table.\r
+</div> <!-- Help text enclosing dev end -->\r
+<c:if test="${!isAdmin}">\r
+<br/><p><a href="AnnualStat">Please login as administrator</a> to view the detailed statistics (<a href=man_stats.html#helpUsageStats>help</a>)</p>\r
+</c:if>\r
 \r
+</div> <!-- page enclosing div end -->\r
 <jsp:include page="footer.jsp" />
\ No newline at end of file