From f32f79a48051e30119a1e9834323614ea2c0b9c9 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Mon, 2 May 2016 14:49:39 +0200
Subject: [PATCH] [backend,ui] Allow visualisation of running splits per
experiment
---
beat/web/backend/templates/backend/scheduler.html | 14 ++++++++++++--
beat/web/ui/static/ui/css/style.css | 11 +++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/beat/web/backend/templates/backend/scheduler.html b/beat/web/backend/templates/backend/scheduler.html
index 04e89e968..1dbbb34ff 100644
--- a/beat/web/backend/templates/backend/scheduler.html
+++ b/beat/web/backend/templates/backend/scheduler.html
@@ -23,6 +23,7 @@
{% load fingerprint %}
{% load backend_tags %}
+{% load humanize %}
{% block title %}{{ block.super }} - Scheduler{% endblock %}
@@ -164,6 +165,15 @@
<td>{{ obj|count_job_splits:"L" }}</td>
<td>{{ obj|count_job_splits:"S" }}</td>
</tr>
+ {% for split in obj.job_splits %}
+ <tr class="job-split">
+ <td class="job-split-empty"></td>
+ <td>{{ split.job.block.name }} (<strong>{{ split.get_status_display }}</strong>)</td>
+ <td>{{ split.split_index|add:"1" }}/{{ split.job.block.required_slots }}</td>
+ <td colspan="3">{% if split.worker.name %} at {{ split.worker.name }} (consuming {{ split.job.block.queue.cores_per_slot }} core{{ split.job.block.queue.cores_per_slot|pluralize }}){% endif %}</td>
+ <td colspan="3">{% if split.start_date %} <i class="fa fa-clock-o"></i> {{ split.start_date|naturaltime }}{% endif %}</td>
+ </tr>
+ {% endfor %}
{% endfor %}
</tbody>
</table>
@@ -181,8 +191,8 @@
<tr>
<th class="status"></th>
<th>Name</th>
- <th>Available/Total Cores (In use)</th>
- <th>Memory (in Gb) (In use)</th>
+ <th>Available/Total Cores (Load)</th>
+ <th>Memory (in Gb) (Load)</th>
<th>Last Updated</th>
<th>Info</th>
</tr>
diff --git a/beat/web/ui/static/ui/css/style.css b/beat/web/ui/static/ui/css/style.css
index 29ce2345f..f490e370a 100644
--- a/beat/web/ui/static/ui/css/style.css
+++ b/beat/web/ui/static/ui/css/style.css
@@ -528,3 +528,14 @@ select.form-control.input-sm + .chosen-container.chosen-container-single .chosen
.chosen-container .chosen-results li.highlighted .help {
color: #3e3e3e;
}
+
+
+/*********** Backend: scheduler page style ************/
+tr.job-split {
+ color: #ababab;
+ font-style: italic;
+}
+
+tr.job-split td.job-split-empty {
+ background-color: #dedede;
+}
--
GitLab