From 4cc00c2a4e44d1aef662fb2708e225d0ec63479c Mon Sep 17 00:00:00 2001 From: Moe Date: Thu, 16 Sep 2021 23:19:47 -0700 Subject: [PATCH] minor cleanup --- web/assets/js/bs5.dashboard-base.js | 19 ++++++++++--------- web/assets/js/bs5.initial.js | 8 ++++++++ web/pages/blocks/footer.ejs | 1 + 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/web/assets/js/bs5.dashboard-base.js b/web/assets/js/bs5.dashboard-base.js index d55a4165..f0d9a1ca 100644 --- a/web/assets/js/bs5.dashboard-base.js +++ b/web/assets/js/bs5.dashboard-base.js @@ -718,7 +718,15 @@ function drawIndicatorBar(item){ ` $('.disk-indicator-bars').append(html) } - +function setInterfaceCounts(monitors){ + var data = monitors || Object.values(loadedMonitors) + var activeCameraCount = data.filter((monitor) => { + var monCode = parseInt(monitor.code) + return monCode === 9 || monCode === 2 || monCode === 3 + }).length + $('.activeCameraCount').text(activeCameraCount) + $('.cameraCount').text(data.length) +} // on page load var readyFunctions = [] function onDashboardReady(theAction){ @@ -731,14 +739,7 @@ function onDashboardReadyExecute(theAction){ } $(document).ready(function(){ loadMonitorsIntoMemory(function(data){ - $('.cameraCount').text(data.length) - var activeCameraCount = data.filter((monitor) => { - var monCode = parseInt(monitor.code) - return monCode === 9 || monCode === 2 || monCode === 3 - }).length - console.error(activeCameraCount) - console.error(data) - $('.activeCameraCount').text(activeCameraCount) + setInterfaceCounts(data) openTab('initial') onDashboardReadyExecute() }) diff --git a/web/assets/js/bs5.initial.js b/web/assets/js/bs5.initial.js index e69de29b..0df05a5d 100644 --- a/web/assets/js/bs5.initial.js +++ b/web/assets/js/bs5.initial.js @@ -0,0 +1,8 @@ +onWebSocketEvent(function (d){ + switch(d.f){ + case'monitor_status': + case'monitor_edit': + setInterfaceCounts() + break; + } +}) diff --git a/web/pages/blocks/footer.ejs b/web/pages/blocks/footer.ejs index 8bd2b6cf..e518c244 100644 --- a/web/pages/blocks/footer.ejs +++ b/web/pages/blocks/footer.ejs @@ -32,6 +32,7 @@ +