diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2020-09-30 07:33:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 07:33:39 -0400 |
| commit | f8ccd2c91f2bdc83626c30c0edcaf47ee50f2f30 (patch) | |
| tree | 7a37a28da20e701992d6b05b26939df401508a5f /www/js/EventCtrl.js | |
| parent | e33a2f7dcada445a0891b3d1581edd4fcc36ad8d (diff) | |
| parent | 4b44e857b2d1174dfa2ce2721dbcebba9cdb1708 (diff) | |
Merge pull request #984 from lucasnz/ui_fixes
Ui fixes
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 16406f73..ca16c5e5 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -233,6 +233,11 @@ angular.module('zmApp.controllers') $rootScope.fromString = ""; $rootScope.toString = ""; $rootScope.monitorsFilter=""; + for (var i=0; i < $scope.monitors.length; i++) { + if ($scope.monitors[i] != undefined) { + $scope.monitors[i].Monitor.isChecked = undefined; + } + } } }); @@ -559,6 +564,19 @@ angular.module('zmApp.controllers') nolangFrom = moment($rootScope.fromString).locale('en').format("YYYY-MM-DD HH:mm:ss"); if ($rootScope.toString) nolangTo = moment($rootScope.toString).locale('en').format("YYYY-MM-DD HH:mm:ss"); + if ($scope.id) { + $rootScope.monitorsFilter = "/MonitorId =:" + $scope.id; + //console.log("monitors.length: " + $scope.monitors.length); + for (var i=0; i < $scope.monitors.length; i++) { + if ($scope.monitors[i] != undefined) { + if ($scope.monitors[i].Monitor.Id == $scope.id) + $scope.monitors[i].Monitor.isChecked = true; + else + $scope.monitors[i].Monitor.isChecked = false; + } + } + $scope.id = 0; + } NVR.getEvents($scope.id, currEventsPage, "", nolangFrom, nolangTo, false, $rootScope.monitorsFilter) .then(function (data) { @@ -2092,6 +2110,11 @@ angular.module('zmApp.controllers') $scope.id = 0; $scope.showEvent = false; $scope.footerState = ionPullUpFooterState.MINIMIZED; + for (var i=0; i < $scope.monitors.length; i++) { + if ($scope.monitors[i] != undefined) { + $scope.monitors[i].Monitor.isChecked = undefined; + } + } getInitialEvents(); /* |