diff options
Diffstat (limited to 'www/js/EventCtrl.js')
| -rw-r--r-- | www/js/EventCtrl.js | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index e06309aa..c1311ebd 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -317,7 +317,7 @@ angular.module('zmApp.controllers') function getEventObject(eid) { - var apiurl = NVR.getLogin().apiurl + '/events/' + eid + '.json'; + var apiurl = NVR.getLogin().apiurl + '/events/' + eid + '.json?'+$rootScope.authSession; $http.get(apiurl) .then(function (data) {}, @@ -456,7 +456,7 @@ angular.module('zmApp.controllers') pageLoaded = true; //$scope.viewTitle.title = data.pagination.count; - console.log(JSON.stringify(data.pagination)); + // console.log(JSON.stringify(data.pagination)); if (data.pagination && data.pagination.pageCount) maxEventsPage = data.pagination.pageCount; @@ -919,7 +919,7 @@ angular.module('zmApp.controllers') function onError(error) { $ionicLoading.hide(); - console.log("Error: " + error); + NVR.debug("Error: " + error); } } @@ -1222,7 +1222,7 @@ angular.module('zmApp.controllers') function prepareImages(e) { var d = $q.defer(); var imglist = []; - var myurl = loginData.apiurl + '/events/' + e.Event.Id + ".json"; + var myurl = loginData.apiurl + '/events/' + e.Event.Id + ".json?"+$rootScope.authSession; $http.get(myurl) .then(function (succ) { var data = succ.data; @@ -1656,7 +1656,7 @@ angular.module('zmApp.controllers') NVR.debug("Archiving request for EID=" + eid); var loginData = NVR.getLogin(); - var apiArchive = loginData.apiurl + "/events/" + eid + ".json"; + var apiArchive = loginData.apiurl + "/events/" + eid + ".json?"+$rootScope.authSession; var setArchiveBit = ($scope.events[ndx].Event.Archived == '0') ? "1" : "0"; NVR.debug("Calling archive with:" + apiArchive + " and Archive=" + setArchiveBit); @@ -1743,7 +1743,7 @@ angular.module('zmApp.controllers') //$scope.eventList.showDelete = false; //curl -XDELETE http://server/zm/api/events/1.json var loginData = NVR.getLogin(); - var apiDelete = loginData.apiurl + "/events/" + id + ".json"; + var apiDelete = loginData.apiurl + "/events/" + id + ".json?"+$rootScope.authSession; NVR.debug("DeleteEvent: ID=" + id + " item=" + itemid); NVR.log("Delete event " + apiDelete); @@ -1877,18 +1877,18 @@ angular.module('zmApp.controllers') var af = "/AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); if (ld.objectDetectionFilter) { - af = af + '/Notes REGEXP:"detected:"'; + af = af + '/Notes REGEXP:detected:'; } - var apiurl = ld.apiurl + "/events/consoleEvents/1 hour" + af + ".json"; + var apiurl = ld.apiurl + "/events/consoleEvents/1 hour" + af + ".json?"+$rootScope.authSession; //NVR.debug("consoleEvents API:" + apiurl); $http.get(apiurl) .then(function (data) { data = data.data; - // NVR.debug(JSON.stringify(data)); + // NVR.debug(JSON.stringify(data)); $scope.hours = []; var p = data.results; for (var key in data.results) { @@ -1919,7 +1919,7 @@ angular.module('zmApp.controllers') } }); - apiurl = ld.apiurl + "/events/consoleEvents/1 day" + af + ".json"; + apiurl = ld.apiurl + "/events/consoleEvents/1 day" + af + ".json?"+$rootScope.authSession; //NVR.debug("consoleEvents API:" + apiurl); $http.get(apiurl) .then(function (data) { @@ -1952,7 +1952,7 @@ angular.module('zmApp.controllers') } }); - apiurl = ld.apiurl + "/events/consoleEvents/1 week" + af + ".json"; + apiurl = ld.apiurl + "/events/consoleEvents/1 week" + af + ".json?"+$rootScope.authSession; //NVR.debug("consoleEvents API:" + apiurl); $http.get(apiurl) .then(function (data) { @@ -1986,7 +1986,7 @@ angular.module('zmApp.controllers') } }); - apiurl = ld.apiurl + "/events/consoleEvents/1 month" + af + ".json"; + apiurl = ld.apiurl + "/events/consoleEvents/1 month" + af + ".json?"+$rootScope.authSession; //NVR.debug("consoleEvents API:" + apiurl); $http.get(apiurl) .then(function (data) { @@ -2163,7 +2163,7 @@ angular.module('zmApp.controllers') $scope.alarm_images = []; event.Event.height = (eventsListDetailsHeight + eventsListScrubHeight); $ionicScrollDelegate.resize(); - var myurl = loginData.apiurl + '/events/' + event.Event.Id + ".json"; + var myurl = loginData.apiurl + '/events/' + event.Event.Id + ".json?"+$rootScope.authSession; NVR.log("API for event details" + myurl); $http.get(myurl) .then(function (data) { @@ -2274,7 +2274,7 @@ angular.module('zmApp.controllers') var i; - var myurl_frames = loginData.apiurl + '/events/' + event.Event.Id + ".json"; + var myurl_frames = loginData.apiurl + '/events/' + event.Event.Id + ".json?"+$rootScope.authSession; NVR.log("API for event details" + myurl_frames); $http.get(myurl_frames) .then(function (data) { @@ -2320,7 +2320,7 @@ angular.module('zmApp.controllers') videoURL += NVR.insertBasicAuthToken(); - console.log("************** VIDEO IS " + videoURL); + // console.log("************** VIDEO IS " + videoURL); event.Event.video.config = { autoPlay: true, sources: [{ @@ -2334,7 +2334,7 @@ angular.module('zmApp.controllers') }; - var myurl2 = loginData.apiurl + '/events/' + event.Event.Id + ".json"; + var myurl2 = loginData.apiurl + '/events/' + event.Event.Id + ".json?"+$rootScope.authSession; NVR.log("API for event details" + myurl2); $http.get(myurl2) .then(function (data) { @@ -2751,13 +2751,13 @@ angular.module('zmApp.controllers') // the events API does not return an error for anything // except greater page limits than reported - console.log("***** LOADING MORE INFINITE SCROLL ****"); + //console.log("***** LOADING MORE INFINITE SCROLL ****"); if ((currEventsPage >= maxEventsPage) && (pageLoaded)) { moreEvents = false; NVR.debug("No more - We have a total of " + maxEventsPage + " and are at page=" + currEventsPage); - console.log("*** At Page " + currEventsPage + " of " + maxEventsPage + ", not proceeding"); + // console.log("*** At Page " + currEventsPage + " of " + maxEventsPage + ", not proceeding"); $ionicLoading.hide(); return; } @@ -2776,7 +2776,7 @@ angular.module('zmApp.controllers') if ($scope.search.text != "") { var toastStr = $translate.instant('kPleaseWait') +'...'+ currEventsPage; - console.log ("SHOW " + toastStr ); + // console.log ("SHOW " + toastStr ); $ionicLoading.show({ maxwidth: 100, noBackdrop:true, @@ -3017,7 +3017,7 @@ angular.module('zmApp.controllers') var ld = NVR.getLogin(); - console.log("Toggling " + ld.enableAlarmCount); + // console.log("Toggling " + ld.enableAlarmCount); ld.enableAlarmCount = !ld.enableAlarmCount; NVR.setLogin(ld); $scope.loginData = NVR.getLogin(); |