From a1bfb41aefe682ad1d955baa448df2769eef390c Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 5 Jan 2018 17:30:18 -0500 Subject: #563 if you tap on an event which is being recorded, show live instead --- www/js/EventModalCtrl.js | 5 +++ www/lang/locale-en.json | 2 +- www/templates/events-modal.html | 82 ++++++++++++++++++++++++----------------- 3 files changed, 54 insertions(+), 35 deletions(-) (limited to 'www') diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 73f45474..871051ad 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -1276,6 +1276,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.onSwipeEvent = function(eid, dirn) { + if ($scope.liveFeedMid) return; //console.log("HERE"); var ld = NVRDataModel.getLogin(); if (!ld.canSwipeMonitors) return; @@ -1583,6 +1584,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro NVRDataModel.log("*** Constructed API for detailed events: " + myurl); $scope.humanizeTime = "..."; $scope.mName = "..."; + $scope.liveFeedMid = ''; $http.get(myurl) .then(function(success) { @@ -1595,6 +1597,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro if (!event.Event.EndTime) { $scope.eventWarning = $translate.instant('kEventStillRecording'); + // if this happens we get to live feed + $scope.liveFeedMid = event.Event.MonitorId; + NVRDataModel.log ("Event not ready, setting live view, with MID="+$scope.liveFeedMid); } event.Event.BasePath = computeBasePath(event); diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 1e3df83b..229250b1 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -93,7 +93,7 @@ "kErrorRetrievingState" :"error retrieving state", "kErrorSave" :"Error - could not save", "kEvent" :"event", - "kEventStillRecording" :"still recording - display will start after recording is complete", + "kEventStillRecording" :"event is still recording - showing live feed", "kEventHistFaster" :"faster", "kEventHistHrs" :"hours ago", "kEventHistPause" :"pause", diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 2c0b0f8a..bc0a33e5 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -9,9 +9,20 @@
- + + +
+ +
{{eventWarning}}
+
+ + +
  {{'kPaused' | translate}} 
@@ -69,7 +80,7 @@
-
+
@@ -87,36 +98,39 @@ - - -
{{mName}}  {{videoDynamicTime}} ({{humanizeTime}}) [{{d_eventId}}] {{eventWarning}}
- + +
+ + +
{{mName}}  {{videoDynamicTime}} ({{humanizeTime}}) [{{d_eventId}}] {{eventWarning}}
+ +
-- cgit v1.2.3