diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-09 11:01:34 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-09 11:01:34 -0400 |
| commit | 1ce2c52bd902bec7d97530b9dd84528b0a784575 (patch) | |
| tree | b6185267c54cb512ddd72318eff3d93bb2ba4a2f /www/js/EventCtrl.js | |
| parent | c499df457c458155f57e0e5a4f9ec707bd645aff (diff) | |
merged new API udated to pass AlarmedFrames to consoleEvents (won't work for <1.30, but doesn't do any harm either)
Former-commit-id: 3410a07fa18d82dff15143bf4d5334cc0d4693bc
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index a2455b74..c84b9da5 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -470,8 +470,13 @@ angular.module('zmApp.controllers') $scope.footerExpand = function () { //https://server/zm/api/events/consoleEvents/5%20minute.json var ld = ZMDataModel.getLogin(); + + var af = "/AlarmFrames >=: " + ld.minAlarmCount; - var apiurl = ld.apiurl + "/events/consoleEvents/1%20hour.json"; + var apiurl = ld.apiurl + "/events/consoleEvents/1%20hour"+af+".json"; + ZMDataModel.zmDebug ("consoleEvents API:"+apiurl); + + $http.get(apiurl) .success(function (data) { ZMDataModel.zmDebug(JSON.stringify(data)); @@ -506,7 +511,8 @@ angular.module('zmApp.controllers') }); - apiurl = ld.apiurl + "/events/consoleEvents/1%20day.json"; + apiurl = ld.apiurl + "/events/consoleEvents/1%20day"+af+".json"; + ZMDataModel.zmDebug ("consoleEvents API:"+apiurl); $http.get(apiurl) .success(function (data) { ZMDataModel.zmDebug(JSON.stringify(data)); @@ -539,7 +545,8 @@ angular.module('zmApp.controllers') - apiurl = ld.apiurl + "/events/consoleEvents/1%20week.json"; + apiurl = ld.apiurl + "/events/consoleEvents/1%20week"+af+".json"; + ZMDataModel.zmDebug ("consoleEvents API:"+apiurl); $http.get(apiurl) .success(function (data) { ZMDataModel.zmDebug(JSON.stringify(data)); @@ -572,7 +579,8 @@ angular.module('zmApp.controllers') }); - apiurl = ld.apiurl + "/events/consoleEvents/1%20month.json"; + apiurl = ld.apiurl + "/events/consoleEvents/1%20month"+af+".json"; + ZMDataModel.zmDebug ("consoleEvents API:"+apiurl); $http.get(apiurl) .success(function (data) { ZMDataModel.zmDebug(JSON.stringify(data)); |