From 1473a56d717e0a285d997b37dc8dbd24d9cc7e69 Mon Sep 17 00:00:00 2001 From: Philipp Klaus Date: Thu, 24 Aug 2017 15:43:38 +0200 Subject: [PATCH] DASH: gview JS -> JSON req with .fail() and .done() --- python_suite/dashboard/views/gview.jinja2 | 37 +++++++++++++---------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/python_suite/dashboard/views/gview.jinja2 b/python_suite/dashboard/views/gview.jinja2 index df6df04..aa9019d 100644 --- a/python_suite/dashboard/views/gview.jinja2 +++ b/python_suite/dashboard/views/gview.jinja2 @@ -19,23 +19,28 @@ var update_every_ms = 2050; function updateStatus() { - $.getJSON("/api/values.json", 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 + $.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() { -- 2.43.0