Author: Peter Troshin\r
Date: May 2011\r
--%>\r
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>\r
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\r
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>\r
<%@ 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
<div style="margin: 20px "> \r
\r
<h1>JABAWS Usage Statistics</h1>\r
+\r
+<ul style="font-weight: bold;">\r
+ <li>Server: <a href="${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}">\r
+ ${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}\r
+ </a> </li>\r
+ <li>Time of execusion: ${timeexec} msec</li>\r
+</ul>\r
+\r
<table class="center its" style="width: 600px "> \r
<thead>\r
<tr>\r
</c:otherwise>\r
</c:choose>\r
\r
-<td><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></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
<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</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