diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/DataModel.js | 6 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 9 | ||||
| -rw-r--r-- | www/js/app.js | 8 |
3 files changed, 16 insertions, 7 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"; |