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/EventDateTimeFilterCtrl.js | |
| parent | e33a2f7dcada445a0891b3d1581edd4fcc36ad8d (diff) | |
| parent | 4b44e857b2d1174dfa2ce2721dbcebba9cdb1708 (diff) | |
Merge pull request #984 from lucasnz/ui_fixes
Ui fixes
Diffstat (limited to 'www/js/EventDateTimeFilterCtrl.js')
| -rw-r--r-- | www/js/EventDateTimeFilterCtrl.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js index 28779310..7867659b 100644 --- a/www/js/EventDateTimeFilterCtrl.js +++ b/www/js/EventDateTimeFilterCtrl.js @@ -29,6 +29,7 @@ angular.module('zmApp.controllers') $scope.$on('$ionicView.beforeEnter', function () { $scope.today = moment().format("YYYY-MM-DD"); $scope.monitors = NVR.getMonitorsNow(); + var countChecked = 0; if (!$scope.monitors.length) { NVR.getMonitors(1) .then (function (data) { @@ -36,6 +37,8 @@ angular.module('zmApp.controllers') for (var i=0; i < $scope.monitors.length; i++) { if ($scope.monitors[i].Monitor.isChecked == undefined) $scope.monitors[i].Monitor.isChecked = true; + if ($scope.monitors[i].Monitor.isChecked == true) + countChecked++; } }); } @@ -43,9 +46,14 @@ angular.module('zmApp.controllers') for (var i=0; i < $scope.monitors.length; i++) { if ($scope.monitors[i].Monitor.isChecked == undefined) $scope.monitors[i].Monitor.isChecked = true; + if ($scope.monitors[i].Monitor.isChecked == true) + countChecked++; } } - $scope.monitorsExpanded = false; + if (countChecked < $scope.monitors.length) + $scope.monitorsExpanded = true; + else + $scope.monitorsExpanded = false; }); $scope.toggleMonitors = function() { |