Merge pull request #984 from lucasnz/ui_fixes

Ui fixes

3 files changed, 35 insertions, 4 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();
 
           /*
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() {
diff --git a/www/templates/events.html b/www/templates/events.html
index f23f37d1..c2c0c30f 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -161,7 +161,7 @@
           <div class="row" ng-if="isGroupShown(event)" style="min-height: 50px;padding-top: 5px;margin-top: 0px;">
             <div ng-if="groupType=='alarms'">
               <div>
-                <p>
+                <div style="float: right; margin-right: 10px; margin-bottom: 5px;">
                   <!--scroll <i class="icon ion-arrow-left-c"></i> 
                                 <i class="icon ion-arrow-right-c"></i>-->
                   <button ng-click="toggleTypeOfAlarms()"
@@ -172,10 +172,10 @@
                     class="button button-small button-assertive button-stable button-outline">
                     <span translate="kOutlineMotion"></span>:{{outlineMotion}}
                   </button>
-                </p>
+                </div>
 
 
-                <ion-scroll direction="x" overflow-scroll="false">
+                <ion-scroll direction="x" overflow-scroll="false" style="width: calc(100vw - 22px); margin-left: -10px; margin-right: -10px;">
                   <span ng-repeat="alarm in alarm_images | selectFrames: typeOfFrames">
 
                     <figure class="animated slideInLeft" style="display:inline-block">