From 136bc5af97f87550196b0085c8c088a69a85492d Mon Sep 17 00:00:00 2001
From: Tomonori Takahashi
Date: Mon, 20 Mar 2023 05:22:39 +0900
Subject: [PATCH] add start/stop time to daq-webctl html
---
share/controller/daq-webctl.html | 35 +++++++++++++++++++++++++-------
1 file changed, 28 insertions(+), 7 deletions(-)
diff --git a/share/controller/daq-webctl.html b/share/controller/daq-webctl.html
index 9b1edd4..e97125d 100644
--- a/share/controller/daq-webctl.html
+++ b/share/controller/daq-webctl.html
@@ -18,7 +18,10 @@ RUN number
-
+ Next :
+ Latest :
+ Start :
+ Stop :
@@ -27,16 +30,17 @@ State transition command
Idle ⊳ Running
Idle ⊳
-
+
+
⊳ Ready ⊳
@@ -246,15 +250,19 @@
Messages
hcol_name .innerHTML = "Service";
hcol_n_instances .innerHTML = "N";
- hcol_undefined .innerHTML = "Undefined";
+ //hcol_undefined .innerHTML = "Undefined";
+ hcol_undefined .innerHTML = "Undef.";
hcol_ok .innerHTML = "Ok";
hcol_error .innerHTML = "Error";
hcol_idle .innerHTML = "Idle";
hcol_initializing_device.innerHTML = "Init-Device"; //"InitializingDevice";
- hcol_initialized .innerHTML = "Initialized";
- hcol_binding .innerHTML = "Binding";
+ //hcol_initialized .innerHTML = "Initialized";
+ hcol_initialized .innerHTML = "Init.";
+ //hcol_binding .innerHTML = "Binding";
+ hcol_binding .innerHTML = "Bind.";
hcol_bound .innerHTML = "Bound";
- hcol_connecting .innerHTML = "Connecting";
+ //hcol_connecting .innerHTML = "Connecting";
+ hcol_connecting .innerHTML = "Conn.";
hcol_device_ready .innerHTML = "Device-Ready";
hcol_initializing_task .innerHTML = "Init-Task"; //"InitializingTask";
hcol_ready .innerHTML = "Ready";
@@ -300,6 +308,17 @@ Messages
// --------------------------------------------------
function redis_publish(arg) {
+ if (arg == "RUN") {
+ d = new Date();
+ val = document.getElementById('latest_run_start_time');
+ val.innerHTML = 'Start : ' + d.toString();
+ val.style.color="black";
+ document.getElementById('latest_run_stop_time').innerHTML = 'Stop : ';
+ } else if (arg == "STOP") {
+ d = new Date();
+ document.getElementById('latest_run_start_time').style.color="grey";
+ document.getElementById('latest_run_stop_time').innerHTML = 'Stop : ' + d.toString();
+ }
//console.log(this.constructor.name + ': arg = ' + arg);
const serviceOptions = document.getElementById('serviceSelector');
const srv = [];
@@ -341,6 +360,7 @@ Messages
function SetRunNumber(arg) {
console.log('SetRunNumber: ', arg);
document.getElementById("run_number").value = arg;
+ document.getElementById("next_run_number").innerHTML = 'Next : ' + arg;
}
// --------------------------------------------------
@@ -358,6 +378,7 @@ Messages
// return false;
//}
SendMessage('{ "command": "redis-set", "name": "' + arg + '", "value": "' + document.getElementById(arg).value + '" }');
+ redis_get('run_number');
return false;
}