jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix calendar problem with UTC (#2268)

Browse Source
This commit is contained in:
Kevin Papst
2021-01-16 00:00:47 +01:00
committed by GitHub
parent 1eae149c75
commit e2324b7d51
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/calendar/user.html.twig
View File

@@ -181,7 +181,6 @@
}); });
}; };
document.addEventListener('kimai.initialized', function(event) { document.addEventListener('kimai.initialized', function(event) {
// prevent multiple open popovers // prevent multiple open popovers
jQuery('html').on('click', function(e) { jQuery('html').on('click', function(e) {
@@ -231,7 +230,8 @@
height: 'auto', height: 'auto',
nowIndicator: true, nowIndicator: true,
now: '{{ now|date_format('c') }}', now: '{{ now|date_format('c') }}',
timezone: '{{ app.user.preferenceValue("timezone") }}', {# see https://github.com/kevinpapst/kimai2/issues/2155 #}
timezone: '{{ app.user.timezone == 'UTC' ? 'GMT' : app.user.timezone }}',
weekends: {% if config.showWeekends %}true{% else %}false{% endif %}, weekends: {% if config.showWeekends %}true{% else %}false{% endif %},
businessHours: { businessHours: {
dow: [{{ config.businessDays|join(',') }}], dow: [{{ config.businessDays|join(',') }}],