diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/DataModel.js | 1 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 17 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 15 |
3 files changed, 31 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 59fca7b4..8671ab53 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1520,6 +1520,7 @@ angular.module('zmApp.controllers') d.resolve(tz); debug ("Timezone API response is:"+success.data.tz); isTzSupported = true; + $rootScope.$emit('tz-updated'); return (d.promise); }, diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 2486ec9a..ce5fec93 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -66,6 +66,11 @@ angular.module('zmApp.controllers') // initial code //--------------------------------------------------- + //we come here is TZ is updated after the view loads + $rootScope.$on('tz-updated', function() { + $scope.tzAbbr = NVRDataModel.getTimeZoneNow(); + NVRDataModel.debug ("Timezone API updated timezone to " + NVRDataModel.getTimeZoneNow()); + }); $rootScope.$on("language-changed", function () { NVRDataModel.log(">>>>>>>>>>>>>>> language changed"); @@ -84,7 +89,17 @@ angular.module('zmApp.controllers') { showHiddenMonitors = false; } - console.log (">>>>>>>>>>>>>>>>>SHOWHIDDEN IS " + showHiddenMonitors); + // console.log (">>>>>>>>>>>>>>>>>SHOWHIDDEN IS " + showHiddenMonitors); + + // lets get the abbreviated version of TZ to display + if (NVRDataModel.getLogin().useLocalTimeZone) + { + $scope.tzAbbr = moment().tz(moment.tz.guess()).zoneAbbr(); + } + else + { + $scope.tzAbbr = moment().tz(NVRDataModel.getTimeZoneNow()).zoneAbbr(); + } $scope.events = []; getInitialEvents(); diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 16b809b9..fa8d8cea 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -266,7 +266,10 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla } - + $rootScope.$on('tz-updated', function() { + $scope.tzAbbr = NVRDataModel.getTimeZoneNow(); + NVRDataModel.debug ("Timezone API updated timezone to " + NVRDataModel.getTimeZoneNow()); + }); @@ -315,6 +318,16 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla $scope.modalFromTimelineIsOpen = false; var tempMon = message; + + // lets get the abbreviated version of TZ to display + if (NVRDataModel.getLogin().useLocalTimeZone) + { + $scope.tzAbbr = moment().tz(moment.tz.guess()).zoneAbbr(); + } + else + { + $scope.tzAbbr = moment().tz(NVRDataModel.getTimeZoneNow()).zoneAbbr(); + } //console.log ("TIMELINE MONITORS: " + JSON.stringify(message)); var ld = NVRDataModel.getLogin(); |