#103 - moving alarm count to the API

Former-commit-id: 15614ad820631a3d202bbecd5ae83e6a7c15540e

4 files changed, 19 insertions, 11 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index c053bde8..fa64eeb8 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -986,6 +986,10 @@ angular.module('zmApp.controllers')
                 myurl = myurl + "/StartTime >=:"+startTime;
             if (endTime)
                 myurl = myurl + "/EndTime <=:"+endTime;
+            
+            myurl = myurl + "/AlarmFrames >=:" + $rootScope.minAlarmCount;
+            
+            
             myurl = myurl + ".json";
             console.log (">>>>>Constructed URL " + myurl);
             
@@ -1060,6 +1064,8 @@ angular.module('zmApp.controllers')
                 myurl = myurl + "/StartTime >=:"+startTime;
             if (endTime)
                 myurl = myurl + "/EndTime <=:"+endTime;
+            
+            myurl = myurl + "/AlarmFrames >=:" + $rootScope.minAlarmCount;
             myurl = myurl + ".json";
 
 
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index beadd18b..8c1f4a02 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -24,7 +24,7 @@ angular.module('zmApp.controllers')
         $scope.weeks = [];
         $scope.months = [];
         
-        $scope.minAlarmCount = "1";
+        
 
         $scope.eventList = {
             showDelete: false
@@ -946,11 +946,11 @@ angular.module('zmApp.controllers')
             if ($scope.showSearch == false)
                 $scope.search.text = "";
 
-            console.log("**** Setting search view to " + $scope.showSearch + " ****");
+            //console.log("**** Setting search view to " + $scope.showSearch + " ****");
             if (enableLoadMore == false && $scope.showSearch == false) {
                 moreEvents = true;
                 enableLoadMore = true;
-                console.log("REMOVING ARTIFICAL LOAD MORE BLOCK");
+                //console.log("REMOVING ARTIFICAL LOAD MORE BLOCK");
             }
         };
 
@@ -1402,7 +1402,8 @@ angular.module('zmApp.controllers')
         
         $scope.toggleMinAlarmFrameCount = function () {
             console.log ("Toggling");
-            $scope.minAlarmCount = ($scope.minAlarmCount == '0') ? '1':'0';
+            $rootScope.minAlarmCount = ($rootScope.minAlarmCount == '0') ? '1':'0';
+            doRefresh();
         };
 
 
diff --git a/www/js/app.js b/www/js/app.js
index 0fea5dbf..38a451a2 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -531,7 +531,7 @@ angular.module('zmApp', [
                 } else //  this means login error
                 {
                     $rootScope.loggedIntoZm = -1;
-                    console.log("**** ZM Login FAILED");
+                    //console.log("**** ZM Login FAILED");
                     ZMDataModel.zmLog("zmAutologin Error: Bad Credentials ", "error");
                     $rootScope.$emit('auth-error', "incorrect credentials");
 
@@ -544,16 +544,17 @@ angular.module('zmApp', [
                 ZMDataModel.getAuthKey($rootScope.validMonitorId)
                     .then(function (success) {
 
-                            console.log(success);
+                            //console.log(success);
                             $rootScope.authSession = success;
                             ZMDataModel.zmLog("Stream authentication construction: " +
                                 $rootScope.authSession);
 
                         },
                         function (error) {
-                            console.log(error);
+                            //console.log(error);
                             
                             ZMDataModel.zmLog("Modal: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession);
+                        ZMDataModel.zmDebug("Error was: " + JSON.stringify(error));
                         });
 
                 return (d.promise);
@@ -637,6 +638,7 @@ angular.module('zmApp', [
         $rootScope.currentServerGroup = "defaultServer";
         $rootScope.validMonitorId = "";
         $rootScope.newVersionAvailable = "";
+        $rootScope.minAlarmCount = "1";
     
        
 
diff --git a/www/templates/events.html b/www/templates/events.html
index e7016147..1f1b76e4 100644
--- a/www/templates/events.html
+++ b/www/templates/events.html
@@ -38,10 +38,9 @@
       
         <div ng-if="!eventsBeingLoaded">
             <ion-list show-delete="eventList.showDelete">
-                <ion-item repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}" overflow-scroll="true" ng-show="event.Event.AlarmFrames >= minAlarmCount">
-
-                    <!--<span class="events-filter-on" ng-if="isEventFilterOn">Filter</span>-->
-
+                <ion-item repeat="event in events| filter:search.text" item-height="event.Event.height" id="item-{{$index}}" overflow-scroll="true" >
+                    
+                    
                     <span style="float:right;margin-top:-18px;background-color:#6d0909;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-clock"></i>&nbsp;&nbsp;{{prettifyTime(event.Event.StartTime)}}</span>
 
                     <span style="float:left;margin-top:-18px;background-color:#444444;color:#fff;font-size:11px;opacity:0.7;width:90px;border-radius: 0px 0px 5px 5px;">&nbsp;&nbsp;&nbsp;<i class="ion-calendar"></i>&nbsp;&nbsp;{{prettifyDate(event.Event.StartTime)}}</span>