#1012 don't show monitors that are hidden in filters

ZoneMinder · Jan 23, 2021 · efaedfa · efaedfa
1 parent 2efa5b0
commit efaedfa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js
@@ -44,6 +44,7 @@ angular.module('zmApp.controllers')
         }
         else {
           for (var i=0; i < $scope.monitors.length; i++) {
+            //console.log ($scope.monitors[i].Monitor.Id + " IS "+$scope.monitors[i].Monitor.listDisplay);
             if ($scope.monitors[i].Monitor.isChecked == undefined)
                $scope.monitors[i].Monitor.isChecked = true;
             if ($scope.monitors[i].Monitor.isChecked == true)
@@ -60,6 +61,11 @@ angular.module('zmApp.controllers')
         $scope.monitorsExpanded = !$scope.monitorsExpanded;
 
       };
+
+      $scope.onlyUnhidden = function (item) {
+        //console.log (' STATUS IS '+item.Monitor.listDisplay);
+        return item.Monitor.listDisplay != 'noshow';
+      };
       //--------------------------------------------------------------------------
       // Clears filters 
       //--------------------------------------------------------------------------

diff --git a/www/templates/events-date-time-filter.html b/www/templates/events-date-time-filter.html
@@ -20,9 +20,9 @@
     <ion-item class="custom-list" ng-click="toggleMonitors()">
         <i class="icon" ng-class="monitorsExpanded ? 'ion-minus' : 'ion-plus'"></i> &nbsp;Filter Monitors
       </ion-item>
-      <ion-item class="item-accordion" ng-show="monitorsExpanded" ng-repeat="monitor in monitors">
+      <ion-item class="item-accordion" ng-show="monitorsExpanded" ng-repeat="monitor in monitors | filter:onlyUnhidden">
+
         <span class="item-checkbox">
-
           {{monitor.Monitor.Name}}
           <label class="checkbox">
             <input type="checkbox" ng-model="monitor.Monitor.isChecked">