From 576d9058a4afb2a179f8c6a338f9b6c08108822b Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 14 May 2019 13:33:00 -0400 Subject: initial support for tokens #817 --- www/js/MontageCtrl.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'www/js/MontageCtrl.js') diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index a8b5b49d..c6705ef0 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -631,7 +631,7 @@ angular.module('zmApp.controllers') apiurl += '/\'' + interval + '\' HOUR_SECOND'; }*/ - apiurl += '.json?sort=StartTime&direction=desc&limit=1'; + apiurl += '.json?sort=StartTime&direction=desc&limit=1'+$rootScope.authSession; NVR.debug ("Getting event count using:"+apiurl); $http.get(apiurl) @@ -721,7 +721,7 @@ angular.module('zmApp.controllers') var apiurl = NVR.getLogin().apiurl; //console.log ("ALARM CALLED WITH " +JSON.stringify(monitor)); - var alarmurl = apiurl + "/monitors/alarm/id:" + monitor.Monitor.Id + "/command:status.json"; + var alarmurl = apiurl + "/monitors/alarm/id:" + monitor.Monitor.Id + "/command:status.json?"+$rootScope.authSession; // console.log("Alarm Check: Invoking " + alarmurl); $http.get(alarmurl) @@ -1916,7 +1916,7 @@ angular.module('zmApp.controllers') var ld = NVR.getLogin(); var url = ld.apiurl; var eid = monitor.Monitor.lastEvent.events[0].Event.Id; - url += '/events/'+monitor.Monitor.lastEvent.events[0].Event.Id+'.json'; + url += '/events/'+monitor.Monitor.lastEvent.events[0].Event.Id+'.json?'+$rootScope.authSession; var mid = monitor.Monitor.Id; ld.lastEventCheckTimes[mid] = (new moment()).tz(NVR.getTimeZoneNow()).format('YYYY-MM-DD HH:mm:ss'); -- cgit v1.2.3 From 55a3ff179df5df63b4d94f33622ff934416844d6 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 15 May 2019 16:40:51 -0400 Subject: logs --- www/js/MontageCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/js/MontageCtrl.js') diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index c6705ef0..37c6f005 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -636,7 +636,7 @@ angular.module('zmApp.controllers') NVR.debug ("Getting event count using:"+apiurl); $http.get(apiurl) .then (function (data) { - console.log ("EVENTS GOT: "+JSON.stringify(data)); + // console.log ("EVENTS GOT: "+JSON.stringify(data)); var res = data.data; var mid = monitor.Monitor.Id; if (res.events.length == 0) res = undefined; -- cgit v1.2.3 From f2f6040847b53222e4ca18334fc0978853c4b345 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 16 May 2019 10:48:21 -0400 Subject: #817 reduce some logs, fix return without promise error --- www/js/MontageCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/js/MontageCtrl.js') diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 37c6f005..53bcb660 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -633,7 +633,7 @@ angular.module('zmApp.controllers') apiurl += '.json?sort=StartTime&direction=desc&limit=1'+$rootScope.authSession; - NVR.debug ("Getting event count using:"+apiurl); + NVR.debug ("Getting event count"); $http.get(apiurl) .then (function (data) { // console.log ("EVENTS GOT: "+JSON.stringify(data)); -- cgit v1.2.3 From 41e8490439876ff4a33e4b3c5f4695b750c283d2 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 16 May 2019 20:14:14 -0400 Subject: only show event notes for objects if you selected objects in event list --- www/js/MontageCtrl.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'www/js/MontageCtrl.js') diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 53bcb660..497fd041 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -656,7 +656,16 @@ angular.module('zmApp.controllers') if (monitor.Monitor.lastEvent && showMontageSidebars) { - monitor.Monitor.showSidebar = true; + + if (ld.objectDetectionFilter) { + if (monitor.Monitor.lastEvent.object) { + monitor.Monitor.showSidebar = true; + } + } + else { + monitor.Monitor.showSidebar = true; + } + } }, -- cgit v1.2.3 From 12c8516a9f8151f22588d4a0fb42530b85265c6f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 18 May 2019 13:29:28 -0400 Subject: #817 various intercept fixes --- www/js/MontageCtrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'www/js/MontageCtrl.js') diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 497fd041..62077328 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -639,7 +639,8 @@ angular.module('zmApp.controllers') // console.log ("EVENTS GOT: "+JSON.stringify(data)); var res = data.data; var mid = monitor.Monitor.Id; - if (res.events.length == 0) res = undefined; + if (!res.events) res = undefined; + else if (res.events.length == 0) res = undefined; monitor.Monitor.lastEvent = res; -- cgit v1.2.3 From 5aee4039af90cc6b5c372076daa1d5ada9596075 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 20 May 2019 10:43:06 -0400 Subject: demote logs --- www/js/MontageCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/js/MontageCtrl.js') diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 62077328..4834d9e7 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -639,7 +639,7 @@ angular.module('zmApp.controllers') // console.log ("EVENTS GOT: "+JSON.stringify(data)); var res = data.data; var mid = monitor.Monitor.Id; - if (!res.events) res = undefined; + if (!res || !res.events) res = undefined; else if (res.events.length == 0) res = undefined; monitor.Monitor.lastEvent = res; @@ -2452,7 +2452,7 @@ angular.module('zmApp.controllers') } $scope.squeezeMonitors = function () { - console.log ("squeezing"); + NVR.debug ("squeezing"); pckry.once('layoutComplete', resizeComplete); $timeout(function () { pckry.layout(); -- cgit v1.2.3