From b932ff8ba88334fe3451ff36c0f4fa1ce1b5c7c8 Mon Sep 17 00:00:00 2001 From: Steve Nyemba Date: Tue, 14 Jan 2025 23:10:25 -0600 Subject: [PATCH] bug fix: dashboard handling --- cms/index.py | 1 - cms/static/js/dashboard.js | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cms/index.py b/cms/index.py index 1267ebf..9dce0c1 100644 --- a/cms/index.py +++ b/cms/index.py @@ -267,7 +267,6 @@ def _POST_CMSPage(app_id,key): # _html = e.render(**_args) if 'read?uri=' in _uri or 'download?doc=' in _uri : _uri = _uri.split('=')[1] - print ([' ## ',_uri,'\n',request.headers['uri']]) _args = _route.render(_uri,_id,_getId(app_id,key)) #session.get(app_id,'main')) return _args[_id],200 # return _html,200 diff --git a/cms/static/js/dashboard.js b/cms/static/js/dashboard.js index 6ead88f..f4c1df9 100644 --- a/cms/static/js/dashboard.js +++ b/cms/static/js/dashboard.js @@ -19,12 +19,14 @@ monitor.render.table_list = function (_data){ jx.dom.set.value('table.info',_data.about) jx.dom.set.value('tables','') jx.dom.append('tables',nodes) + nodes.childNodes[0].click() } monitor.render.data = function(_data){ jx.dom.set.value('dashboard','' ) _apex = [] + Object.keys(_data).forEach(_key=>{ _board = jx.dom.get.instance('DIV') @@ -37,14 +39,16 @@ monitor.render.data = function(_data){ var _id = Object.keys(_entry)[0] _itemPane = jx.dom.get.instance('DIV') + _frame = jx.dom.get.instance('DIV') + // _itemPane.innerHTML = '

'+_id+'

',_entry[_id] // // Making title .... - var _titleDiv = $('
:title
:about
'.replace(/:title/,_id).replace(/:about/,_entry[_id].about)) - console.log(_titleDiv) - $(_itemPane).append(_titleDiv) - - _itemPane.className = _entry[_id].css + var _titleDiv = $('
:title
:about
'.replace(/:title/,_id).replace(/:about/,_entry[_id].about)) + + // $(_itemPane).append(_titleDiv) + $(_frame).append(_titleDiv) + _itemPane.className = _entry[_id].css _entry[_id].charts.forEach(_chartItem=>{ if (_chartItem.type == 'scalar') { _chart = jx.dom.get.instance('DIV') @@ -62,9 +66,11 @@ monitor.render.data = function(_data){ _itemPane.appendChild(_chart) }) + _frame.appendChild(_itemPane) + _frame.className = 'basic-board' // _itemPane.className = 'board-' + _itemPane.childNodes.length // _itemPane.className = 'board-' + _itemPane.childNodes.length - jx.dom.append('dashboard',_itemPane) + jx.dom.append('dashboard',_frame) // var _options = _item[_id] }) @@ -170,7 +176,7 @@ monitor.get = function(table){ } if(!qcms){ - qcms = {} + var qcms = {} } var _dashboard = function(_context,_uri){ @@ -186,7 +192,7 @@ var _dashboard = function(_context,_uri){ http.setHeader('Content-Type','application/json') http.setData(JSON.stringify(_args)) http.post(_uri,function(x){ - if(x.readyState == 4 && x.status == 200) + if(x.readyState == 4 && x.status == 200){} }) } }