From be9365db12c35aaa54c2d3d14ac6bf8f24fd55dd Mon Sep 17 00:00:00 2001 From: Philipp Klaus Date: Mon, 25 Sep 2017 14:29:04 +0800 Subject: [PATCH] DASH: /pv/ now shows properties in nicely readable form --- python_suite/dashboard/dashboard.py | 21 ++++++++++++++++++- .../views/pv_details_bootstrap.jinja2 | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/python_suite/dashboard/dashboard.py b/python_suite/dashboard/dashboard.py index 51cb831..4e8fba1 100755 --- a/python_suite/dashboard/dashboard.py +++ b/python_suite/dashboard/dashboard.py @@ -187,7 +187,26 @@ def index(): @app.route('/pv/') @view('pv_details_bootstrap.jinja2') def pv_details(pv_name): - return {'pv_name': pv_name, 'config': CONFIG} + property_name_mapping = { + 'name': 'Process Variable Name', + 'alias': 'Alias', + 'descr': 'Description', + 'value': 'Value', + 'unit': 'Unit of Value', + 'precision': 'Precision of Value', + 'classes': 'Classes / Tags', + 'num_value': 'Numerical Value', + 'char_value': 'String Representation of Value', + 'upper_ctrl_limit': 'Upper Control Range Limit', + 'lower_ctrl_limit': 'Lower Control Range Limit', + 'upper_disp_limit': 'Upper Operator Display Limit', + 'lower_disp_limit': 'Lower Operator Display Limit', + 'upper_alarm_limit': 'Upper Alarm Limit', + 'lower_alarm_limit': 'Lower Alarm Limit', + '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} @app.route('/list_bs/') @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 4735672..d095038 100644 --- a/python_suite/dashboard/views/pv_details_bootstrap.jinja2 +++ b/python_suite/dashboard/views/pv_details_bootstrap.jinja2 @@ -54,8 +54,8 @@
{% for key in PV %}
-
{{ key }}
-
{{ PV[key] }}
+
{{ property_name_mapping[key] or key }}
+
{{ PV[key]|string }}
{% endfor %}
-- 2.43.0