From ea99e0c1108f072202f9753fd834382cd41e93fc Mon Sep 17 00:00:00 2001
From: "emanuele.laface@esss.se" <emanuele.laface@esss.se>
Date: Mon, 27 Jun 2022 09:28:37 +0200
Subject: [PATCH] Fixes
---
WebSites/ccg/dashboard.json | 289 ++++++++++++++++-----------
WebSites/menu/available-screens.html | 1 +
2 files changed, 171 insertions(+), 119 deletions(-)
diff --git a/WebSites/ccg/dashboard.json b/WebSites/ccg/dashboard.json
index f4697ec..c08b86f 100644
--- a/WebSites/ccg/dashboard.json
+++ b/WebSites/ccg/dashboard.json
@@ -106,81 +106,82 @@
]
},
{
- "title": "RFQ",
+ "title": "LEBT-010:Vac-VGC-10000:PrsR",
"width": 1,
"row": {
- "1": 31,
- "2": 11,
- "3": 27,
- "4": 27
+ "1": 23,
+ "2": 35,
+ "3": 23,
+ "4": 23,
+ "13": 23
},
"col": {
"1": 1,
"2": 1,
"3": 1,
- "4": 1
+ "4": 2,
+ "13": 2
},
- "col_width": 4,
+ "col_width": 1,
"widgets": [
{
- "type": "flot_extended_plugin",
+ "type": "text_widget",
"settings": {
- "plot_type": "line",
- "legend": true,
- "height": 5,
- "value": "datasources[\"Clock\"][\"numeric_value\"];\nvar series = document.getElementById(\"time-series\").value;\n\nlet pvs = [\"RFQ-010:Vac-VGC-10000:PrsR\",\"RFQ-010:Vac-VGC-20000:PrsR\",\"RFQ-010:Vac-VGC-30000:PrsR\",\"RFQ-010:Vac-VGC-40000:PrsR\"];\nvar data = [];\n\npvs.forEach(function (item, index) {\n data.push({label: item, data: datasources[series][item]});\n});\n\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
- "xticks": "6",
- "x_timestamp": true,
- "zoom": "xy"
+ "size": "regular",
+ "value": "datasources[\"realtime\"][\"LEBT-010:Vac-VGC-10000:PrsR\"][\"value\"]",
+ "animate": true,
+ "units": "mBar"
}
}
]
},
{
- "title": "MEBT",
+ "title": "LEBT-010:Vac-VGC-30000:PrsR",
"width": 1,
"row": {
- "1": 59,
- "2": 39,
- "3": 47,
- "4": 43
+ "1": 27,
+ "2": 35,
+ "3": 23,
+ "4": 23,
+ "13": 23
},
"col": {
"1": 1,
- "2": 1,
- "3": 1,
- "4": 1
+ "2": 2,
+ "3": 2,
+ "4": 1,
+ "13": 1
},
- "col_width": 4,
+ "col_width": 1,
"widgets": [
{
- "type": "flot_extended_plugin",
+ "type": "text_widget",
"settings": {
- "plot_type": "line",
- "legend": true,
- "height": 5,
- "value": "datasources[\"Clock\"][\"numeric_value\"];\nvar series = document.getElementById(\"time-series\").value;\n\nlet pvs = [\"MEBT-010:Vac-VGC-10000:PrsR\",\"MEBT-010:Vac-VGC-30000:PrsR\",\"MEBT-010:Vac-VGC-40000:PrsR\"];\nvar data = [];\n\npvs.forEach(function (item, index) {\n data.push({label: item, data: datasources[series][item]});\n});\n\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
- "xticks": "6",
- "x_timestamp": true,
- "zoom": "xy"
+ "title": "",
+ "size": "regular",
+ "value": "datasources[\"realtime\"][\"LEBT-010:Vac-VGC-30000:PrsR\"][\"value\"]",
+ "animate": true,
+ "units": "mBar"
}
}
]
},
{
- "title": "DTL",
+ "title": "RFQ",
"width": 1,
"row": {
- "1": 83,
- "2": 51,
- "3": 63,
- "4": 59
+ "1": 31,
+ "2": 11,
+ "3": 27,
+ "4": 27,
+ "13": 27
},
"col": {
"1": 1,
"2": 1,
"3": 1,
- "4": 1
+ "4": 1,
+ "13": 1
},
"col_width": 4,
"widgets": [
@@ -190,7 +191,7 @@
"plot_type": "line",
"legend": true,
"height": 5,
- "value": "datasources[\"Clock\"][\"numeric_value\"];\nvar series = document.getElementById(\"time-series\").value;\n\nlet pvs = [\"DTL-010:Vac-VGC-10000:PrsR\",\"DTL-010:Vac-VGC-20000:PrsR\",\"DTL-010:Vac-VGC-50000:PrsR\"];\nvar data = [];\n\npvs.forEach(function (item, index) {\n data.push({label: item, data: datasources[series][item]});\n});\n\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
+ "value": "datasources[\"Clock\"][\"numeric_value\"];\nvar series = document.getElementById(\"time-series\").value;\n\nlet pvs = [\"RFQ-010:Vac-VGC-10000:PrsR\",\"RFQ-010:Vac-VGC-20000:PrsR\",\"RFQ-010:Vac-VGC-30000:PrsR\",\"RFQ-010:Vac-VGC-40000:PrsR\"];\nvar data = [];\n\npvs.forEach(function (item, index) {\n data.push({label: item, data: datasources[series][item]});\n});\n\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
"xticks": "6",
"x_timestamp": true,
"zoom": "xy"
@@ -198,63 +199,6 @@
}
]
},
- {
- "title": "LEBT-010:Vac-VGC-10000:PrsR",
- "width": 1,
- "row": {
- "1": 23,
- "2": 35,
- "3": 23,
- "4": 23
- },
- "col": {
- "1": 1,
- "2": 1,
- "3": 1,
- "4": 2
- },
- "col_width": 1,
- "widgets": [
- {
- "type": "text_widget",
- "settings": {
- "size": "regular",
- "value": "datasources[\"realtime\"][\"LEBT-010:Vac-VGC-10000:PrsR\"][\"value\"]",
- "animate": true,
- "units": "mBar"
- }
- }
- ]
- },
- {
- "title": "LEBT-010:Vac-VGC-30000:PrsR",
- "width": 1,
- "row": {
- "1": 27,
- "2": 35,
- "3": 23,
- "4": 23
- },
- "col": {
- "1": 1,
- "2": 2,
- "3": 2,
- "4": 1
- },
- "col_width": 1,
- "widgets": [
- {
- "type": "text_widget",
- "settings": {
- "title": "",
- "size": "regular",
- "value": "datasources[\"realtime\"][\"LEBT-010:Vac-VGC-30000:PrsR\"][\"value\"]",
- "animate": true,
- "units": "mBar"
- }
- }
- ]
- },
{
"title": "RFQ-010:Vac-VGC-10000:PrsR",
"width": 1,
@@ -262,13 +206,15 @@
"1": 43,
"2": 63,
"3": 39,
- "4": 39
+ "4": 39,
+ "16": 39
},
"col": {
"1": 1,
"2": 1,
"3": 1,
- "4": 1
+ "4": 1,
+ "16": 1
},
"col_width": 1,
"widgets": [
@@ -290,13 +236,15 @@
"1": 47,
"2": 63,
"3": 39,
- "4": 39
+ "4": 39,
+ "16": 39
},
"col": {
"1": 1,
"2": 2,
"3": 2,
- "4": 2
+ "4": 2,
+ "16": 2
},
"col_width": 1,
"widgets": [
@@ -318,13 +266,15 @@
"1": 51,
"2": 67,
"3": 39,
- "4": 39
+ "4": 39,
+ "16": 39
},
"col": {
"1": 1,
"2": 1,
"3": 3,
- "4": 3
+ "4": 3,
+ "16": 3
},
"col_width": 1,
"widgets": [
@@ -346,13 +296,15 @@
"1": 55,
"2": 67,
"3": 43,
- "4": 39
+ "4": 39,
+ "16": 39
},
"col": {
"1": 1,
"2": 2,
"3": 2,
- "4": 4
+ "4": 4,
+ "16": 4
},
"col_width": 1,
"widgets": [
@@ -367,6 +319,39 @@
}
]
},
+ {
+ "title": "MEBT",
+ "width": 1,
+ "row": {
+ "1": 59,
+ "2": 39,
+ "3": 47,
+ "4": 43,
+ "16": 43
+ },
+ "col": {
+ "1": 1,
+ "2": 1,
+ "3": 1,
+ "4": 1,
+ "16": 1
+ },
+ "col_width": 4,
+ "widgets": [
+ {
+ "type": "flot_extended_plugin",
+ "settings": {
+ "plot_type": "line",
+ "legend": true,
+ "height": 5,
+ "value": "datasources[\"Clock\"][\"numeric_value\"];\nvar series = document.getElementById(\"time-series\").value;\n\nlet pvs = [\"MEBT-010:Vac-VGC-10000:PrsR\",\"MEBT-010:Vac-VGC-30000:PrsR\",\"MEBT-010:Vac-VGC-40000:PrsR\"];\nvar data = [];\n\npvs.forEach(function (item, index) {\n data.push({label: item, data: datasources[series][item]});\n});\n\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
+ "xticks": "6",
+ "x_timestamp": true,
+ "zoom": "xy"
+ }
+ }
+ ]
+ },
{
"title": "MEBT-010:Vac-VGC-10000:PrsR",
"width": 1,
@@ -374,13 +359,15 @@
"1": 71,
"2": 71,
"3": 59,
- "4": 55
+ "4": 55,
+ "19": 55
},
"col": {
"1": 1,
"2": 1,
"3": 1,
- "4": 1
+ "4": 1,
+ "19": 1
},
"col_width": 1,
"widgets": [
@@ -402,13 +389,15 @@
"1": 75,
"2": 71,
"3": 59,
- "4": 55
+ "4": 55,
+ "19": 55
},
"col": {
"1": 1,
"2": 2,
"3": 2,
- "4": 2
+ "4": 2,
+ "19": 2
},
"col_width": 1,
"widgets": [
@@ -430,13 +419,15 @@
"1": 79,
"2": 75,
"3": 59,
- "4": 55
+ "4": 55,
+ "19": 55
},
"col": {
"1": 1,
"2": 1,
"3": 3,
- "4": 3
+ "4": 3,
+ "19": 3
},
"col_width": 1,
"widgets": [
@@ -451,6 +442,39 @@
}
]
},
+ {
+ "title": "DTL",
+ "width": 1,
+ "row": {
+ "1": 83,
+ "2": 51,
+ "3": 63,
+ "4": 59,
+ "19": 59
+ },
+ "col": {
+ "1": 1,
+ "2": 1,
+ "3": 1,
+ "4": 1,
+ "19": 1
+ },
+ "col_width": 4,
+ "widgets": [
+ {
+ "type": "flot_extended_plugin",
+ "settings": {
+ "plot_type": "line",
+ "legend": true,
+ "height": 5,
+ "value": "datasources[\"Clock\"][\"numeric_value\"];\nvar series = document.getElementById(\"time-series\").value;\n\nlet pvs = [\"DTL-010:Vac-VGC-10000:PrsR\",\"DTL-010:Vac-VGC-20000:PrsR\",\"DTL-010:Vac-VGC-50000:PrsR\"];\nvar data = [];\n\npvs.forEach(function (item, index) {\n data.push({label: item, data: datasources[series][item]});\n});\n\nfreeboard.showLoadingIndicator(false);\nreturn data;\n",
+ "xticks": "6",
+ "x_timestamp": true,
+ "zoom": "xy"
+ }
+ }
+ ]
+ },
{
"title": "DTL-010:Vac-VGC-10000:PrsR",
"width": 1,
@@ -458,13 +482,15 @@
"1": 95,
"2": 75,
"3": 75,
- "4": 71
+ "4": 71,
+ "22": 71
},
"col": {
"1": 1,
"2": 2,
"3": 1,
- "4": 1
+ "4": 1,
+ "22": 1
},
"col_width": 1,
"widgets": [
@@ -486,13 +512,15 @@
"1": 99,
"2": 79,
"3": 75,
- "4": 71
+ "4": 71,
+ "22": 71
},
"col": {
"1": 1,
"2": 1,
"3": 2,
- "4": 2
+ "4": 2,
+ "22": 2
},
"col_width": 1,
"widgets": [
@@ -514,13 +542,15 @@
"1": 103,
"2": 79,
"3": 75,
- "4": 71
+ "4": 71,
+ "22": 71
},
"col": {
"1": 1,
"2": 2,
"3": 3,
- "4": 3
+ "4": 3,
+ "22": 3
},
"col_width": 1,
"widgets": [
@@ -534,6 +564,28 @@
}
}
]
+ },
+ {
+ "title": "ISrc-010:Vac-VVMC-01100:FlwR",
+ "width": 1,
+ "row": {
+ "4": 23
+ },
+ "col": {
+ "4": 4
+ },
+ "col_width": 1,
+ "widgets": [
+ {
+ "type": "text_widget",
+ "settings": {
+ "size": "regular",
+ "value": "datasources[\"realtime\"][\"ISrc-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
+ "animate": true,
+ "units": "sccm"
+ }
+ }
+ ]
}
],
"datasources": [
@@ -619,11 +671,10 @@
"name": "realtime",
"type": "JSON",
"settings": {
- "url": "/data/api/v2/pvget/LEBT-010:Vac-VGC-10000:PrsR,LEBT-010:Vac-VGC-30000:PrsR,RFQ-010:Vac-VGC-10000:PrsR,RFQ-010:Vac-VGC-20000:PrsR,RFQ-010:Vac-VGC-30000:PrsR,RFQ-010:Vac-VGC-40000:PrsR,MEBT-010:Vac-VGC-10000:PrsR,MEBT-010:Vac-VGC-30000:PrsR,MEBT-010:Vac-VGC-40000:PrsR,DTL-010:Vac-VGC-10000:PrsR,DTL-010:Vac-VGC-20000:PrsR,DTL-010:Vac-VGC-50000:PrsR",
+ "url": "/data/api/v2/pvget/LEBT-010:Vac-VGC-10000:PrsR,LEBT-010:Vac-VGC-30000:PrsR,RFQ-010:Vac-VGC-10000:PrsR,RFQ-010:Vac-VGC-20000:PrsR,RFQ-010:Vac-VGC-30000:PrsR,RFQ-010:Vac-VGC-40000:PrsR,MEBT-010:Vac-VGC-10000:PrsR,MEBT-010:Vac-VGC-30000:PrsR,MEBT-010:Vac-VGC-40000:PrsR,DTL-010:Vac-VGC-10000:PrsR,DTL-010:Vac-VGC-20000:PrsR,DTL-010:Vac-VGC-50000:PrsR,ISrc-010:Vac-VVMC-01100:FlwR",
"use_thingproxy": true,
"refresh": 10,
- "method": "GET",
- "name": "realtime"
+ "method": "GET"
}
}
],
diff --git a/WebSites/menu/available-screens.html b/WebSites/menu/available-screens.html
index c64fa5a..d3cedd3 100644
--- a/WebSites/menu/available-screens.html
+++ b/WebSites/menu/available-screens.html
@@ -16,6 +16,7 @@
<li><a href="/rfq_skid_exchangervane/">Skid Exchanger and Vane Regulation Loop</a></li>
<li><a href="/rfq_skid_body/">Skid Body Regulation Loop</a></li>
</ul>
+<li><a href="/ccg/">Cold Cathode Gauges</a></li>
<li><a href="http://dmsc-services02.cslab.esss.lu.se:8765/">YMIR</a></li>
<li><a href="/contacts/">Contacts (only local network)</a></li>
<li><a href="/pvs/">PV Search Engine</a></li>
--
GitLab