X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=statpages%2FJoblist.jsp;h=4f44c6a5d90042a4c72d604ac9c6346425314f2d;hb=refs%2Fheads%2FJWS-80-VM-root-page;hp=90fda8212b5b57702f67c3b2d286d0b759ab80ba;hpb=7b9487955c0a2e257ad43eb7d2a9b48942bb5abe;p=jabaws.git

diff --git a/statpages/Joblist.jsp b/statpages/Joblist.jsp
index 90fda82..4f44c6a 100644
--- a/statpages/Joblist.jsp
+++ b/statpages/Joblist.jsp
@@ -10,10 +10,13 @@ Date: May 2011
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://displaytag.sf.net" prefix="dt" %>
 
-<jsp:include page="header.jsp" />
+<c:import url="header.jsp" >
+	<c:param name="title">JABAWS Usage Statistics</c:param>
+</c:import>  
 
 <dt:table class="its" id="job" name="${stat.jobs}" export="true" sort="list"  pagesize="100" 
 defaultsort="0" defaultorder="descending">
+	<dt:caption>JABAWS Jobs List (<a href="#dcolm">detailed column description</a>) </dt:caption>	
 	<dt:column title="JobID" sortable="true">
 		<c:choose>
 		<c:when test="${fn:startsWith(job.jobname,'@')}">
@@ -25,9 +28,21 @@ defaultsort="0" defaultorder="descending">
 		</c:choose>
 	</dt:column>
 	<dt:column property="clusterJobId" title="Cluster JobID" sortable="false"></dt:column>
-	<dt:column property="inputSize" title="Input Size (Kb)" sortable="true"></dt:column>
-	<dt:column property="resultSize" title="Result Size (Kb)" sortable="true"></dt:column>
-	<dt:column property="runtime" title="Runtime (s)" sortable="true"></dt:column>
+	<dt:column property="inputSize" title="Input Size (b)" sortable="true"></dt:column>
+	<dt:column property="resultSize" title="Result Size (b)" sortable="true"></dt:column>
+	<dt:column title="Runtime (s)" sortable="true">
+		<c:choose>
+			<c:when test="${job.runtime==-1}">
+				?
+			</c:when>
+			<c:when test="${job.runtime==0}">
+				&lt;1
+			</c:when>
+			<c:otherwise>
+				${job.runtime}
+			</c:otherwise>
+		</c:choose>
+	</dt:column>
 	<dt:column property="start" title="Start time" sortable="true"></dt:column>
 	<dt:column property="finish" title="Finish time" sortable="true"></dt:column>	
 	
@@ -53,4 +68,22 @@ defaultsort="0" defaultorder="descending">
 
 </dt:table>
 
-<jsp:include page="footer.jsp" />
\ No newline at end of file
+<c:if test="${!empty stat.jobs}">
+
+<a name="dcolm"></a>Columns
+<ul>
+	<li>JobID - the JABAWS job id, unique for every job</li>
+	<li>Cluster JobID - cluster job id</li>
+	<li>InputSize - input size in bytes</li>
+	<li>ResultSize - result size in bytes</li>
+	<li>Runtime (s) - job's runtime in seconds</li>
+	<li>Start time (s)- job's start time and date</li>
+	<li>Finish time (s)- job's finish time and date</li>
+	<li>isCancelled - whether the job was cancelled</li>
+	<li>isCollected - whether the job was collected. False for the jobs that has been initiated but which results has never been retrieved</li>
+	<li>isFinished - whether the job has finished. This does not necessarily mean that the job has produced the result. 
+	The job can sometime finish in failure.</li>
+</ul>
+</c:if>
+	
+<jsp:include page="footer.jsp" />