Add table of currently running jobs

1 files changed, 28 insertions, 11 deletions

diff --git a/lorry-controller-webapp b/lorry-controller-webapp
index 3bc0ff3..aa62877 100755
--- a/lorry-controller-webapp
+++ b/lorry-controller-webapp
@@ -68,31 +68,48 @@ td {
 
         <p>Free disk space: {{disk_free_gib}} GiB.</p>
 
+        <h2>Currently running jobs</h2>
+
+<table>
+<tr>
+<th>Job ID</th>
+<th>path</th>
+</tr>
+% for spec in run_queue:
+%    if spec['running_job'] is not None:
+<tr>
+<td>{{spec['running_job']}}</td>
+<td>{{spec['path']}}</td>
+</tr>
+%    end
+% end
+</table>
+
         <h2>Run-queue</h2>
 
-        <table>
-            <tr>
+<table>
+<tr>
 <th>Pos</th>
 <th>Path</th>
 <th>URL</th>
 <th>Interval</th>
 <th>Due</th>
 <th>Job</th>
-            </tr>
-        % for i, spec in enumerate(run_queue):
-        %   obj = json.loads(spec['text'])
-        %   name = obj.keys()[0]
-        %   fields = obj[name]
-            <tr>
+</tr>
+% for i, spec in enumerate(run_queue):
+%   obj = json.loads(spec['text'])
+%   name = obj.keys()[0]
+%   fields = obj[name]
+<tr>
 <td>{{i+1}}</td>
 <td>{{spec['path']}}</td>
 <td>{{fields['url']}}</td>
 <td>{{spec['interval']}}</td>
 <td>{{spec['due_nice']}}</td>
 <td>{{spec['running_job']}}</td>
-            </tr>
-        % end
-        </table>
+</tr>
+% end
+</table>
 
         <hr />