summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2016-08-08 12:32:16 -0400
committerPliable Pixels <pliablepixels@gmail.com>2016-08-08 12:32:16 -0400
commit124bf502b858e6e963f70d68f9385b7f04c794a7 (patch)
tree19a2fb85eb1ef793b873cacc69a43c45d5368376 /www/js
parent9fbdca5ca43914b68596c638dbf62cf781155d7c (diff)
#296 - show timestamp
Former-commit-id: 50d9cf37565e163f015b60b05c74cc6007c746cc
Diffstat (limited to 'www/js')
-rw-r--r--www/js/EventCtrl.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 0e805876..63bd0f96 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -806,7 +806,8 @@ angular.module('zmApp.controllers')
id: data.event.Frame[i].Id,
frameid: data.event.Frame[i].FrameId,
score: data.event.Frame[i].Score,
- fname: padToN(data.event.Frame[i].FrameId, eventImageDigits) + "-capture.jpg"
+ fname: padToN(data.event.Frame[i].FrameId, eventImageDigits) + "-capture.jpg",
+ time:data.event.Frame[i].TimeStamp
});
timestamp = data.event.Frame[i].TimeStamp;
}
@@ -1489,6 +1490,10 @@ angular.module('zmApp.controllers')
$scope.prettifyTime = function (str) {
return moment(str).format(ZMDataModel.getTimeFormat());
};
+
+ $scope.prettifyTimeSec = function (str) {
+ return moment(str).format(ZMDataModel.getTimeFormatSec());
+ };
$scope.prettify = function (str) {