#353 - inital code (also requires ZM API patch) to support local and server timezones

Former-commit-id: bbee60cc64cb521c0f7d7fc75437a9f427c58b5a

1 files changed, 22 insertions, 7 deletions

diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 59853c98..33e24f32 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1773,29 +1773,44 @@ angular.module('zmApp.controllers')
 
 
     function humanizeTime(str) {
-        return moment(str).fromNow();
-
+        //console.log ("Time:"+str+" TO LOCAL " + moment(str).local().toString());
+            return moment.tz(str, NVRDataModel.getTimeZoneNow()).fromNow();
     }
 
     $scope.prettifyDate = function (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');      
     };
 
     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(NVRDataModel.getTimeFormat());
+        if (NVRDataModel.getLogin().useLocalTimeZone)
+            return moment.tz(str, NVRDataModel.getTimeZoneNow()).tz(moment.tz.guess()).format(NVRDataModel.getTimeFormat());
+        else    
+            return moment(str).format(NVRDataModel.getTimeFormat());
     };
 
     $scope.prettifyTimeSec = function (str) {
-        return moment(str).format(NVRDataModel.getTimeFormatSec());
+        if (NVRDataModel.getLogin().useLocalTimeZone)
+            return moment.tz(str, NVRDataModel.getTimeZoneNow()).tz(moment.tz.guess()).format(NVRDataModel.getTimeFormatSec());
+        else
+            return moment(str).format(NVRDataModel.getTimeFormatSec());
     };
 
 
     $scope.prettify = function (str) {
-        return moment(str).format(NVRDataModel.getTimeFormat() + ', MMMM Do YYYY');
+        if (NVRDataModel.getLogin().useLocalTimeZone)
+            return moment.tz(str, NVRDataModel.getTimeZoneNow()).tz(moment.tz.guess()).format(NVRDataModel.getTimeFormat() + ', MMMM Do YYYY');
+        else    
+            return moment(str).format(NVRDataModel.getTimeFormat() + ', MMMM Do YYYY');
     };
     //--------------------------------------------------------
     // For consistency we are keeping the refresher list