From 7b8812082807557e2cb7ed0444a4100417aa5d66 Mon Sep 17 00:00:00 2001 From: Philipp Klaus Date: Mon, 28 Aug 2017 16:52:12 +0200 Subject: [PATCH] DASH: put gview JS into /static/js/gview.js --- python_suite/dashboard/views/gview.jinja2 | 29 ++--------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/python_suite/dashboard/views/gview.jinja2 b/python_suite/dashboard/views/gview.jinja2 index aa9019d..6502e17 100644 --- a/python_suite/dashboard/views/gview.jinja2 +++ b/python_suite/dashboard/views/gview.jinja2 @@ -3,7 +3,8 @@ {% block title %}GView {{ svg }}{% endblock %} {% block header %} - + + {% endblock %} {% block content %} @@ -14,35 +15,9 @@ {% endblock %} - {% block js_end_of_page %} var update_every_ms = 2050; -function updateStatus() { - $.getJSON("/api/values.json") - .fail(function( jqxhr, textStatus, error ) { - var err = textStatus + ", " + error; - console.log( "Request Failed: " + err ); - }) - .done(function( data ) { - var gview = document.getElementById("gview"); - var svgDoc = gview.contentDocument; - // ---------- - var svgItems = svgDoc.getElementsByClassName("dynamic"); - [].forEach.call(svgItems, function (el) { - var el_id = el.id; - var pvName = el_id.substring(0, el_id.lastIndexOf("_")); - var pvField = el_id.substring(el_id.lastIndexOf("_") + 1, el_id.length); - var pvName = pvName.replace(/-/g, ':'); - var pv = data.PVs[data.PV_lookup[pvName]]; - if (pvField == "VAL") - el.textContent = pv.value.toFixed(pv.precision); - else if (pvField == "EGU") - el.textContent = pv.unit - }); - }); -}; - function timedUpdate() { updateStatus(); setTimeout(function() { -- 2.43.0