summaryrefslogtreecommitdiff
path: root/www/js/TimelineModalCtrl.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/TimelineModalCtrl.js')
-rw-r--r--www/js/TimelineModalCtrl.js11
1 files changed, 11 insertions, 0 deletions
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) {