diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/EventModalCtrl.js | 5 | ||||
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 26 |
3 files changed, 29 insertions, 6 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 33e24f32..8254123c 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1774,7 +1774,11 @@ angular.module('zmApp.controllers') function humanizeTime(str) { //console.log ("Time:"+str+" TO LOCAL " + moment(str).local().toString()); + if (NVRDataModel.getLogin().useLocalTimeZone) return moment.tz(str, NVRDataModel.getTimeZoneNow()).fromNow(); + else + return moment(str).fromNow(); + } $scope.prettifyDate = function (str) { diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index d91986aa..37b41548 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -1169,7 +1169,10 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro function humanizeTime(str) { - return moment(str).fromNow(); + if (NVRDataModel.getLogin().useLocalTimeZone) + return moment.tz(str, NVRDataModel.getTimeZoneNow()).fromNow(); + else + return moment(str).fromNow(); } diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 23f6bc4c..d38be8ab 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -16,23 +16,39 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc // formats events dates in a nice way //--------------------------------------- $scope.prettifyDateTimeFirst = function (str) { - return moment(str).format(NVRDataModel.getTimeFormat() + '/MMM Do'); + if (NVRDataModel.getLogin().useLocalTimeZone) + return moment.tz(str, NVRDataModel.getTimeZoneNow()).tz(moment.tz.guess()).format(NVRDataModel.getTimeFormat() + '/MMM Do'); + else + return moment(str).format(NVRDataModel.getTimeFormat() + '/MMM Do'); }; $scope.prettifyDate = function (str) { return moment(str).format('MMM Do, YYYY ' + NVRDataModel.getTimeFormat()); }; function prettifyDate(str) { - return moment(str).format('MMM Do'); + if (NVRDataModel.getLogin().useLocalTimeZone) + return moment.tz(str, NVRDataModel.getTimeZoneNow()).tz(moment.tz.guess()).format('MMM Do'); + else + return moment(str).format('MMM Do'); } $scope.prettifyTime = function (str) { - return moment(str).format('h:mm a'); + if (NVRDataModel.getLogin().useLocalTimeZone) + return moment.tz(str, NVRDataModel.getTimeZoneNow()).tz(moment.tz.guess()).format('h:mm a'); + else + return moment(str).format('h:mm a'); }; $scope.prettify = function (str) { - return moment(str).format(NVRDataModel.getTimeFormat() + ' on MMMM Do YYYY'); + if (NVRDataModel.getLogin().useLocalTimeZone) + return moment.tz(str, NVRDataModel.getTimeZoneNow()).tz(moment.tz.guess()).format(NVRDataModel.getTimeFormat() + ' on MMMM Do YYYY'); + else + return moment(str).format(NVRDataModel.getTimeFormat() + ' on MMMM Do YYYY'); }; $scope.humanizeTime = function (str) { - return moment(str).fromNow(); + if (NVRDataModel.getLogin().useLocalTimeZone) + return moment.tz(str, NVRDataModel.getTimeZoneNow()).fromNow(); + else + return moment(str).fromNow(); + }; // if you change date in footer, change hrs $scope.dateChanged = function () { |