summaryrefslogtreecommitdiff
path: root/www/js/EventModalCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/EventModalCtrl.js')
-rw-r--r--www/js/EventModalCtrl.js14
1 files changed, 14 insertions, 0 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 5dde11a4..72214748 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1876,6 +1876,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
tempAlarms = [];
$scope.FrameArray = [];
+
//console.log ("FRAME ARRAY: "+JSON.stringify(data));
if (data.event && data.event.Frame) $scope.FrameArray = data.event.Frame;
var ts = 0;
@@ -1901,6 +1902,19 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
if (tempAlarms.length > 1) // don't do it for just one too
$scope.alarm_images = tempAlarms;
+ if (data.event.Event.Notes.indexOf('detected:') != -1) {
+
+ NVR.debug ("You have object detection! Adding object detect frame");
+ $scope.alarm_images.unshift({
+ frameid: 'objdetect',
+ id: 'doesntseemtobeusedhuh'
+ });
+ NVR.debug ("Your ZM version is:"+NVR.getCurrentServerVersion()+" and your obj frame setting is:"+NVR.getLogin().showObjectDetectionFrame);
+
+ } else {
+ NVR.debug ("No object detection found in notes");
+ }
+
}
$scope.constructFrame = function (fid) {