DASH: differt style changes / more PVs

diff --git a/python_suite/dashboard/dashboard.py b/python_suite/dashboard/dashboard.py
index 1af4276db2c9c83a08b0df77ddb57f8a73ec8227..6063d6b584511ff7fba6e861bf220187e22172ab 100755 (executable)
--- a/python_suite/dashboard/dashboard.py
+++ b/python_suite/dashboard/dashboard.py
@@ -28,7 +28,8 @@ def update_values():
                 pv['value'] = p.get()
             if pv['value'] is None: pv['value'] = '- disconnected -'
             pv['unit'] = p.units or ''
-
+            if pv['value'] == 'OFF': pv['value'] = '- OFF -'
+            if pv['value'] == 'ON': pv['value'] = '- ON -'
 @route('/')
 @view('pv_overview.jinja2')
 def index():

diff --git a/python_suite/dashboard/example.config.json b/python_suite/dashboard/example.config.json
index d5355cf7153bfa5960a2fcef2d7e38e15a40e704..dcc62e08973fd5bddc733bb83f14ede7406da847 100644 (file)
--- a/python_suite/dashboard/example.config.json
+++ b/python_suite/dashboard/example.config.json
@@ -1,5 +1,11 @@
 {
        "groups": [
+               {
+                       "name": "EXAMPLE",
+                       "PVs": [
+                               {"name": "CBM:MVD:EXAMPLE:DISCONECTED_EXAMPLE"}
+                               ]
+               },
                {
                        "name": "Cooling",
                        "PVs": [
@@ -59,6 +65,16 @@
                                {"name": "CBM:MVD:POWER:PRESTO_RECIPIENT:CHAN2:GetOVPMode"}, 
                                {"name": "CBM:MVD:POWER:PRESTO_RECIPIENT:CHAN3:GetOVPMode"}
                                ]
+               },
+               {
+                        "name": "Enviroment",
+                        "PVs": [
+                               {"name": "CBM:MVD:ENVIRON:OPUS20_CLEANROOM:Temperature"},
+                               {"name": "CBM:MVD:ENVIRON:OPUS20_CLEANROOM:Dewpoint"},
+                                {"name": "CBM:MVD:ENVIRON:OPUS20_CLEANROOM:AbsoluteHumidity"},
+                               {"name": "CBM:MVD:ENVIRON:OPUS20_CLEANROOM:RelativeHumidity"},
+                               {"name": "CBM:MVD:ENVIRON:OPUS20_CLEANROOM:BatteryVoltage"}
+                               ]
                }
-         ]
+       ]
 }

diff --git a/python_suite/dashboard/static/css/style.css b/python_suite/dashboard/static/css/style.css
index 4503e0f8e46efbc2b12d2799273beaacdbfa7f4e..78969f5fce82fe103aa7e00095a0036abe2c5cee 100644 (file)
--- a/python_suite/dashboard/static/css/style.css
+++ b/python_suite/dashboard/static/css/style.css
@@ -5,19 +5,19 @@
   margin-right: auto;
 }
 .header .cbm {
+  padding-left: 5px;
   position: relative;
   bottom: -5px;
   float: left;
-  width: 93px; <!-- orignal 250px-->
-  height: 120px; <!-- orginal 324px-->
+  height: 120px;  /*orginal 324px*/
 }
 .header .ikf {
+  padding-right: 5px;
   position: relative;
   bottom: -5px;
   float: right;
-  width: 264px; <!-- orignal 720px-->
-  height: 120px; <!-- orginal 327px-->
-}
+  height: 120px; /*orginal 327px*/
+} 
 
 .header h1 {
   position: center;
@@ -37,32 +37,35 @@
 }
 
 .invalid_alarm:after {
-  content: "invalid";
+  content: "- invalid -";
   position: relative;
   float: right;
   color: #0091FF;
 }
 .invalid_alarm {
-  border-color: #0091FF;
+  border: 3px solid #0091FF;
 }
 
 .minor_alarm:after {
-  content: "MINOR";
+  content: "- MINOR -";
   position: relative;
   float: right;
   color: #FF6F00;
 }
 .minor_alarm {
-  border-color: #FF6F00;
-
+  border: 3px solid #FF6F00;
 }
 .major_alarm:after {
-  content: "MAJOR";
+  content: "- MAJOR -";
   position: relative;
   float: right;
   color: #FF0000;
 }
 .major_alarm {
-  border-color: #FF0000;
+  border: 3px solid #FF0000;
+}
+
+.disconnected {
+  border: 3px solid #EBFF00;
 }