amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-14 12:54:54 +00:00
Code Issues Projects Releases Wiki Activity

fix(calendar(js)): adjust line of the current time to user's timezone

Browse Source 
Fixes #5512
This commit is contained in:
Francis Lachapelle
2022-05-02 12:37:58 -04:00
parent 700d726511
commit 1b3b9c253c
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Scheduler/sgNowLine.directive.js
+16 -11
View File
@@ -46,8 +46,8 @@
/**
* @ngInject
*/
sgNowLineController.$inject = ['$scope', '$element', '$timeout'];
function sgNowLineController($scope, $element, $timeout) {
sgNowLineController.$inject = ['$scope', '$element', '$timeout', 'Preferences'];
function sgNowLineController($scope, $element, $timeout, Preferences) {
var _this = this, updater,
scrollViewCtrl = $element.controller('sgCalendarScrollView');
@@ -62,15 +62,20 @@
function _updateLine(force) {
var now = new Date(), // TODO: adjust to user's timezone
nowDay = now.getDayString(),
hours = now.getHours(),
hourHeight = $scope.quarterHeight * 4,
minutes = now.getMinutes(),
minuteHeight = $scope.quarterHeight/15,
position = parseInt(hours * hourHeight +
minutes * minuteHeight -
1);
var now = new Date(), nowDay, hours, hourHeight, minutes, minuteHeight, position;
// Adjust to user's timezone
now.setTime(now.getTime() +
now.getTimezoneOffset() * 60 * 1000 +
Preferences.defaults.UserTimeZoneSecondsFromGMT * 1000);
nowDay = now.getDayString();
hours = now.getHours();
hourHeight = $scope.quarterHeight * 4;
minutes = now.getMinutes();
minuteHeight = $scope.quarterHeight/15;
position = parseInt(hours * hourHeight +
minutes * minuteHeight -
1);
if (force || nowDay != $scope.nowDay) {
if ($scope.lineElement)