humanize time difference for other views too

Former-commit-id: dd6df8dd23512f22c802d4f41c2c64da25b59282

2 files changed, 25 insertions, 1 deletions

diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 5aaf6034..8ebf1f1b 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1105,7 +1105,15 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
     }
 
-
+    function humanizeTime(str)
+    {
+        var et = moment(str);
+        var m = moment.duration(moment().diff(et)).humanize();
+        
+        var r  = m+' '+$translate.instant('kAgo'); 
+        return (r);
+        
+    }
 
     function jumpToEventZms(connkey, dirn) {
 
@@ -1291,6 +1299,8 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
         var loginData = ZMDataModel.getLogin();
         var myurl = loginData.apiurl + '/events/' + eid + ".json";
         ZMDataModel.zmLog("*** Constructed API for detailed events: " + myurl);
+        $scope.humanizeTime = "...";
+        $scope.mName = "...";
         $http.get(myurl)
             .then(function (success) {
 
@@ -1314,6 +1324,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
                     $scope.eFramesNum = event.Event.Frames;
                     $scope.eventDur = Math.round(event.Event.Length);
                     $scope.loginData = ZMDataModel.getLogin();
+                    $scope.humanizeTime = humanizeTime(event.Event.StartTime);
+                    $scope.mName = ZMDataModel.getMonitorName(event.Event.MonitorId);
+                    //console.log (">>>>>>>>HUMANIZE " + $scope.humanizeTime);
 
                     //console.log("**** VIDEO STATE IS " + event.Event.DefaultVideo);
                     if (typeof event.Event.DefaultVideo === 'undefined')
diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js
index aa403010..a4b2cb4b 100644
--- a/www/js/TimelineModalCtrl.js
+++ b/www/js/TimelineModalCtrl.js
@@ -176,6 +176,8 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
             });
 
         $scope.eventdetails = $translate.instant('kLoading') + "...";
+        $scope.mName = ZMDataModel.getMonitorName($scope.event.Event.MonitorId);
+        $scope.humanizeTime = humanizeTime($scope.event.Event.StartTime);
         processEvent();
         //$scope.eventdetails = JSON.stringify($scope.event);
     });
@@ -440,6 +442,15 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', '
     }
 
 
+    function humanizeTime(str)
+    {
+        var et = moment(str);
+        var m = moment.duration(moment().diff(et)).humanize();
+        
+        var r  = m+' '+$translate.instant('kAgo'); 
+        return (r);
+        
+    }
 
     function padToN(number, digits) {