Changeset 3880

Timestamp:

Oct 26, 2007, 11:08:50 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Added column to Jobs list that displays running time (in minutes and seconds) of a job.

Location:

trunk/www/views/jobs

Files:

• list_jobs.jsp (modified) (3 diffs)
• view_job.jsp (modified) (1 diff)

trunk/www/views/jobs/list_jobs.jsp

@@ -86 +86 @@
 final boolean createPermission = sc.hasPermission(Permission.CREATE, itemType);
 final ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, null, null);
-
+final Date now = new Date();
 final ModeInfo mode = ModeInfo.get(request.getParameter("mode"));
 final String callback = request.getParameter("callback");
@@ -323 +323 @@
         exportable="true"
         formatter="<%=dateTimeFormatter%>"
+      />
+      <tbl:columndef
+        id="runningTime"
+        title="Running time"
       />
       <tbl:columndef
@@ -566 +570 @@
                 <tbl:cell column="started" value="<%=item.getStarted()%>" />
                 <tbl:cell column="ended" value="<%=item.getEnded()%>" />
+                <tbl:cell column="runningTime">
+                  <%
+                  Date started = item.getStarted();
+                  if (started != null)
+                  {
+                    Date ended = item.getEnded();
+                    if (ended == null) ended = now;
+                    long runningTime = ended.getTime() - started.getTime();
+                    %>
+                    <%=Values.formatTime(runningTime / 1000)%>
+                    <%
+                  }
+                  %>
+                </tbl:cell>
                 <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>
                 <tbl:cell column="pluginType">

trunk/www/views/jobs/view_job.jsp

@@ -219 +219 @@
       </tr>
       <tr valign="top">
+        <td class="prompt">Running time</td>
+        <td>
+          <%
+          Date started = job.getStarted();
+          if (started != null)
+          {
+            Date ended = job.getEnded();
+            if (ended == null) ended = new Date();
+            long runningTime = ended.getTime() - started.getTime();
+            %>
+            <%=Values.formatTime(runningTime / 1000)%>
+            <%
+          }
+          %>
+        </td>
+      </tr>
+      <tr valign="top">
         <td class="prompt">Server</td>
         <td>