DASH: {epics_ioc_terminology} in pv_detail

diff --git a/python_suite/dashboard/dashboard.py b/python_suite/dashboard/dashboard.py
index 85943a7306a683bf41179adf4f63dd307f7285c9..98e60ca6396b85c996f06eabf22aaa1e21365a18 100755 (executable)
--- a/python_suite/dashboard/dashboard.py
+++ b/python_suite/dashboard/dashboard.py
@@ -88,8 +88,6 @@ def cb_value_update(**kwargs):
           None : "disconnected",
         }
         pv['classes'] = class_map[kwargs['severity']]
-        #print(kwargs['pvname'], kwargs['type'])
-        #print(kwargs)
         if 'enum' in kwargs['type']:
             if type(kwargs['char_value']) is bytes:
                  pv['value'] = kwargs['char_value'].decode('ascii')
@@ -206,7 +204,20 @@ def pv_details(pv_name):
       'upper_warning_limit': 'Upper Warning Limit',
       'lower_warning_limit': 'Lower Warning Limit',
     }
-    return {'pv_name': pv_name, 'config': CONFIG, 'property_name_mapping': property_name_mapping}
+    epics_ioc_terminology = {
+      'value': 'VAL',
+      'unit': 'EGU',
+      'precision': 'PREC',
+      'upper_ctrl_limit': 'DRVH',
+      'lower_ctrl_limit': 'DRVL',
+      'upper_disp_limit': 'HOPR',
+      'lower_disp_limit': 'LOPR',
+      'upper_alarm_limit': 'HIHI',
+      'lower_alarm_limit': 'LOLO',
+      'upper_warning_limit': 'HIGH',
+      'lower_warning_limit': 'LOW',
+    }
+    return {'pv_name': pv_name, 'config': CONFIG, 'property_name_mapping': property_name_mapping, 'epics_ioc_terminology': epics_ioc_terminology}
 
 @app.route('/list_bs/<page>')
 @view('pv_overview_bootstrap.jinja2')

diff --git a/python_suite/dashboard/views/pv_details_bootstrap.jinja2 b/python_suite/dashboard/views/pv_details_bootstrap.jinja2
index 6bcc7cda4c677d175b7fc98afaf902c2f1d2c2d1..27ef9352dcbd44f2fe10035848555fc71a16726f 100644 (file)
--- a/python_suite/dashboard/views/pv_details_bootstrap.jinja2
+++ b/python_suite/dashboard/views/pv_details_bootstrap.jinja2
@@ -54,7 +54,7 @@
        <div class="details-list container">
                {% for key in PV %}
                <div class="details-set row">
-                       <div class="col col-md-6 details-set-key"  >{{ property_name_mapping[key] or key }}</div>
+                       <div class="col col-md-6 details-set-key"  >{{ property_name_mapping[key] or key }}{% if key in epics_ioc_terminology %} ({{epics_ioc_terminology[key]}}){%endif%}</div>
                        <div class="col col-md-6 details-set-value">{{ PV[key]|string }}</div>
                </div>
                {% endfor %}