From 23d8c6fc0c3b031aa081ee1a245f9b0792514fd3 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 28 Nov 2017 16:41:33 +0100
Subject: [statistics] Introduce state column to get rid of complicated state
determination
This also adds support for the STANDBY state
---
modules-available/statistics/templates/clientlist.html | 17 ++++++++++-------
.../statistics/templates/machine-main.html | 15 +++++++++------
2 files changed, 19 insertions(+), 13 deletions(-)
(limited to 'modules-available/statistics/templates')
diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html
index 73148eb8..4755c3c1 100644
--- a/modules-available/statistics/templates/clientlist.html
+++ b/modules-available/statistics/templates/clientlist.html
@@ -60,15 +60,18 @@
{{#hasnotes}}{{/hasnotes}}
- {{#state_off}}
+ {{#state_OFFLINE}}
- {{/state_off}}
- {{#state_idle}}
+ {{/state_OFFLINE}}
+ {{#state_IDLE}}
- {{/state_idle}}
- {{#state_occupied}}
+ {{/state_IDLE}}
+ {{#state_OCCUPIED}}
- {{/state_occupied}}
+ {{/state_OCCUPIED}}
+ {{#state_STANDBY}}
+
+ {{/state_STANDBY}}
{{hostname}}
{{machineuuid}}
|
@@ -126,4 +129,4 @@ function toggleButton(v) {
$queryForm.submit();
}
-//-->
\ No newline at end of file
+//-->
diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html
index 74df80c4..1854a03b 100644
--- a/modules-available/statistics/templates/machine-main.html
+++ b/modules-available/statistics/templates/machine-main.html
@@ -50,13 +50,13 @@
{{lang_usageState}} |
- {{#state_off}}
+ {{#state_OFFLINE}}
{{lang_machineOff}}
- {{/state_off}}
- {{#state_idle}}
+ {{/state_OFFLINE}}
+ {{#state_IDLE}}
{{lang_machineIdle}}
- {{/state_idle}}
- {{#state_occupied}}
+ {{/state_IDLE}}
+ {{#state_OCCUPIED}}
{{#username}}
{{lang_machineOccupiedBy}} {{username}}
{{/username}}
@@ -64,7 +64,10 @@
{{lang_machineOccupied}}
{{/username}}
{{logintime_s}}
- {{/state_occupied}}
+ {{/state_OCCUPIED}}
+ {{#state_STANDBY}}
+ {{lang_machineStandby}}
+ {{/state_STANDBY}}
{{#session}}
{{#lectureid}}
--
cgit v1.2.3-55-g7522
|