#569 #563 event playback with warning for inprogress streams (will fail in video, so warning is needed)

2 files changed, 8 insertions, 0 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index de09d8cc..a9602ed1 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -1860,6 +1860,8 @@ angular.module('zmApp.controllers')
         // monitorId == 0 means all monitors (ZM starts from 1)
         //-----------------------------------------------------------------------------
 
+        // new reminder
+        // https://zm/api/events.json?&sort=StartTime&direction=desc
         getEvents: function (monitorId, pageId, loadingStr, startTime, endTime) {
 
           //console.log("ZMData getEvents called with ID=" + monitorId + "and Page=" + pageId);
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index b8a7acbc..a450fe80 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1591,6 +1591,12 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                     var event = success.data.event;
                     currentEvent = event;
 
+                    $scope.eventWarning = '';
+
+                    if (!event.Event.EndTime) {
+                        $scope.eventWarning = $translate.instant('kEventStillRecording');
+                    }
+
                     event.Event.BasePath = computeBasePath(event);
                     event.Event.relativePath = computeRelativePath(event);