Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev

web/assets/js/bs5.dashboard-base.js

@@ -851,14 +851,27 @@ function drawIndicatorBar(item){
     </div>`
     $('.disk-indicator-bars').append(html)
 }
+function updateInterfaceStatus(data){
+    // Updated status of interface in loaded Monitors
+    loadedMonitors[data.id].code = data.code
+    // Update counters in status bar
+    setInterfaceCounts()
+}
 function setInterfaceCounts(monitors){
     var data = monitors || Object.values(loadedMonitors)
+    var allCameraCount = data.length
     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)
+    var percentActive = (activeCameraCount/allCameraCount)*100
+    // Update Camera count in Monitors menu
+    $('.cameraCount').text(allCameraCount)
+    // Update Camera count in status bar
+    var el = $(`#indicator-activeCameraCount`)
+    var count = el.find('.indicator-percent')
+    count.text(`${activeCameraCount} / ${allCameraCount}`)
+    el.find('.progress-bar').css('width', `${percentActive}%`)
 }
 // on page load
 var readyFunctions = []

web/assets/js/bs5.powerVideo.js

@@ -254,14 +254,16 @@ $(document).ready(function(e){
             var groups = []
             var groupId = 1
             Object.keys(powerVideoLoadedVideos).forEach(function(monitorId,n){
+                var mon = Object.values($.ccio.mon).find(m => { return m.mid === monitorId });
+                var name = mon.name;
                 groups.push({
                     id: groupId,
-                    content: monitorId
+                    content: name + " | " + monitorId
                 })
                 groupId += 1
                 groups.push({
                     id: groupId,
-                    content: lang.Events
+                    content: name + " | " + lang.Events
                 })
                 groupId += 1
                 loadedTableGroupIds[monitorId] = groupId - 2

web/assets/js/bs5.startup.js

@@ -209,6 +209,9 @@ onWebSocketEvent(function (d){
                 })
             }
         break;
+        case'monitor_status':
+            updateInterfaceStatus(d);
+        break;
     }
 })
 $(document).ready(function(){