From afe876927f816cec2adeb89a78ae7addf290e92a Mon Sep 17 00:00:00 2001
From: Stefano Pavinato <stefano.pavinato@ess.eu>
Date: Fri, 20 Jan 2023 07:54:15 +0100
Subject: [PATCH] Added HW status and rearrenged a bit the panes
---
WebSites/fbis/dashboard.json | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/WebSites/fbis/dashboard.json b/WebSites/fbis/dashboard.json
index ee636f8..672d4c7 100644
--- a/WebSites/fbis/dashboard.json
+++ b/WebSites/fbis/dashboard.json
@@ -1,7 +1,7 @@
{
"version": 1,
"header_image": "",
- "allow_edit": false,
+ "allow_edit": true,
"plugins": [],
"panes": [
{
@@ -44,7 +44,7 @@
},
"col": {
"3": 3,
- "4": 4,
+ "4": 1,
"5": 2,
"6": 2,
"7": 2,
@@ -121,7 +121,7 @@
},
"col": {
"3": 1,
- "4": 1,
+ "4": 4,
"7": 1,
"8": 1,
"9": 1
@@ -337,7 +337,7 @@
},
"col": {
"3": 3,
- "4": 4,
+ "4": 1,
"5": 4,
"6": 4,
"7": 4,
@@ -346,6 +346,16 @@
},
"col_width": 1,
"widgets": [
+ {
+ "type": "ragIndicator",
+ "settings": {
+ "title": "HW Status and Conenections",
+ "value": "switch (datasources[\"Interlocks\"][\"FBIS::HW_ok\"][\"value\"][\"index\"]) {\n case 1:\n return 0;\n break;\n default:\n \treturn 2;\n}",
+ "green_text": "OK",
+ "amber_text": "NOK",
+ "red_text": "NOKswitch (datasources[\"Interlocks\"][\"FBIS-DLN01::status\"][\"value\"][\"index\"]) {\n case 1:\n return 0;\n break;\n default:\n \treturn 2;\n}"
+ }
+ },
{
"type": "ragIndicator",
"settings": {
@@ -405,16 +415,11 @@
"amber_text": "NOK",
"red_text": "NOK"
}
- },
- {
- "type": "ragIndicator",
- "settings": {
- "title": "SCU05"
- }
}
]
},
{
+ "title": "Decision Logic Nodes: Processing Units (PU)",
"width": 1,
"row": {
"4": 31,
@@ -431,10 +436,10 @@
"settings": {
"plot_type": "horiz_stacked_bar",
"legend": true,
- "height": 5,
+ "height": 3,
"value": "var dln01_pbd = datasources[\"Interlocks\"][\"FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_pbdspu_A\"][\"value\"]; \nvar dln01_pbm = datasources[\"Interlocks\"][\"FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_pbmspu_A\"][\"value\"]; \nvar dln01_spu = datasources[\"Interlocks\"][\"FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_spu_A\"][\"value\"]; \nvar dln01_ssp = datasources[\"Interlocks\"][\"FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_sspu_A\"][\"value\"]; \nvar dln01_pus = dln01_pbd + dln01_pbm + dln01_spu + dln01_ssp;\n\n\nvar dln01_bi = datasources[\"Interlocks\"][\"FBIS-DLN01:Ctrl-AMC-03:no_pu_bi_A\"][\"value\"]; \nvar dln01_rbi = datasources[\"Interlocks\"][\"FBIS-DLN01:Ctrl-AMC-03:no_pu_rbi_A\"][\"value\"]; \nvar dln01_ebi = datasources[\"Interlocks\"][\"FBIS-DLN01:Ctrl-AMC-03:no_pu_ebi_A\"][\"value\"];\n\nvar dln01_bi_p = (dln01_bi/dln01_pus)*100;\nvar dln01_rbi_p = (dln01_rbi/dln01_pus)*100;\nvar dln01_ebi_p = (dln01_ebi/dln01_pus)*100;\nvar dln01_ok_p = 100 - dln01_bi_p - dln01_rbi_p - dln01_ebi;\n\n\nvar dln02_pbd = datasources[\"Interlocks\"][\"FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_pbdspu_A\"][\"value\"]; \nvar dln02_pbm = datasources[\"Interlocks\"][\"FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_pbmspu_A\"][\"value\"]; \nvar dln02_spu = datasources[\"Interlocks\"][\"FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_spu_A\"][\"value\"]; \nvar dln02_ssp = datasources[\"Interlocks\"][\"FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_sspu_A\"][\"value\"]; \nvar dln02_pus = dln02_pbd + dln02_pbm + dln02_spu + dln02_ssp;\n\n\nvar dln02_bi = datasources[\"Interlocks\"][\"FBIS-DLN02:Ctrl-AMC-03:no_pu_bi_A\"][\"value\"]; \nvar dln02_rbi = datasources[\"Interlocks\"][\"FBIS-DLN02:Ctrl-AMC-03:no_pu_rbi_A\"][\"value\"]; \nvar dln02_ebi = datasources[\"Interlocks\"][\"FBIS-DLN02:Ctrl-AMC-03:no_pu_ebi_A\"][\"value\"];\n\nvar dln02_bi_p = (dln02_bi/dln02_pus)*100;\nvar dln02_rbi_p = (dln02_rbi/dln02_pus)*100;\nvar dln02_ebi_p = (dln02_ebi/dln02_pus)*100;\nvar dln02_ok_p = 100 - dln02_bi_p - dln02_rbi_p - dln02_ebi;\n\n\nvar d = [{\n label: 'OK',\n color: 'green',\n data: [[dln02_ok_p, 0], [dln01_ok_p, 1]]\n}, {\n label: 'BI',\n color: 'yellow',\n data: [[dln02_bi_p, 0], [dln01_bi_p, 1]]\n}, {\n label: 'RBI',\n color: 'orange',\n data: [[dln02_rbi_p, 0], [dln01_rbi_p, 1]]\n}, {\n label: 'EBI',\n color: 'red',\n data: [[dln02_ebi_p, 0], [dln01_ebi_p, 1]]\n}];\n\nreturn d;",
"xticks": "[[0, '0%'], [10, '10%'], [20, '20%'], [30, '30%'], [40, '40%'], [50, '50%'], [60, '60%'], [70, '70%'], [80, '80%'], [90, '90%'], [100, '100%'], [110, '']]",
- "yticks": "[[0, 'DLN 02 (34 signals)'], [1, 'DLN 01 (99 signals)']]",
+ "yticks": "[[0, 'DLN 02 (34 PUs)'], [1, 'DLN 01 (99 PUs)']]",
"points": false,
"tooltip": false,
"zoom": ""
@@ -448,7 +453,7 @@
"name": "Interlocks",
"type": "JSON",
"settings": {
- "url": "/data/api/v2/pvget/FBIS::beam_state_ok,FBIS-DLN01::status,FBIS-DLN02::status,FBIS-SCU01::status,FBIS-SCU02::status,FBIS-SCU03::status,FBIS-SCU04::status,FBIS::beam_permit_ok,FBIS::beam_destination,FBIS::beam_mode,FBIS::BI_ok,FBIS::RBI_ok,FBIS::EBI_ok,FBIS::PSS_ok,FBIS::MPSMag_ok,FBIS::MPSID_ok,FBIS::MPSVac_ok,FBIS::IS_PLC_ok,FBIS::RFLPSAllSystemStatus,FBIS::MEBT_Ch_PLC_ok,FBIS::LEBT_Ch_Fault_ok,FBIS::BCM_ok,FBIS::BPM_ok,FBIS::SIS_ok,FBIS::IS_PLC_RBI_ok,FBIS::PSS_RBI_ok,FBIS::IS_PLC_RBI_ok,FBIS::RF_RBI_ok,FBIS::MPSVac_RBI_ok,FBIS::MPSID_RBI_ok,FBIS::MPSMag_RBI_ok,FBIS::MEBT_Ch_PLC_RBI_ok,FBIS::LEBT_Ch_Fault_RBI_ok,FBIS::BCM_RBI_ok,FBIS::BPM_RBI_ok,FBIS::SIS_RBI_ok,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_pbdspu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_pbmspu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_spu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_sspu_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_bi_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_ebi_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_rbi_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_pbdspu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_pbmspu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_spu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_sspu_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_bi_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_ebi_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_rbi_A",
+ "url": "/data/api/v2/pvget/FBIS::beam_state_ok,FBIS-DLN01::status,FBIS-DLN02::status,FBIS-SCU01::status,FBIS-SCU02::status,FBIS-SCU03::status,FBIS-SCU04::status,FBIS::beam_permit_ok,FBIS::HW_ok,FBIS::beam_destination,FBIS::beam_mode,FBIS::BI_ok,FBIS::RBI_ok,FBIS::EBI_ok,FBIS::PSS_ok,FBIS::MPSMag_ok,FBIS::MPSID_ok,FBIS::MPSVac_ok,FBIS::IS_PLC_ok,FBIS::RFLPSAllSystemStatus,FBIS::MEBT_Ch_PLC_ok,FBIS::LEBT_Ch_Fault_ok,FBIS::BCM_ok,FBIS::BPM_ok,FBIS::SIS_ok,FBIS::IS_PLC_RBI_ok,FBIS::PSS_RBI_ok,FBIS::IS_PLC_RBI_ok,FBIS::RF_RBI_ok,FBIS::MPSVac_RBI_ok,FBIS::MPSID_RBI_ok,FBIS::MPSMag_RBI_ok,FBIS::MEBT_Ch_PLC_RBI_ok,FBIS::LEBT_Ch_Fault_RBI_ok,FBIS::BCM_RBI_ok,FBIS::BPM_RBI_ok,FBIS::SIS_RBI_ok,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_pbdspu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_pbmspu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_spu_A,FBIS-DLN01:Ctrl-AMC-03:cfg_no_of_sspu_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_bi_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_ebi_A,FBIS-DLN01:Ctrl-AMC-03:no_pu_rbi_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_pbdspu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_pbmspu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_spu_A,FBIS-DLN02:Ctrl-AMC-03:cfg_no_of_sspu_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_bi_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_ebi_A,FBIS-DLN02:Ctrl-AMC-03:no_pu_rbi_A",
"use_thingproxy": false,
"refresh": 5,
"method": "GET"
--
GitLab