From 534d6e1761d95bf3a72192cdf0674b2ee345466b Mon Sep 17 00:00:00 2001 From: Alex Tselegidis Date: Sun, 29 Mar 2020 14:44:06 +0200 Subject: [PATCH] Event popover display the provider timezone. --- assets/js/backend_calendar_default_view.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/assets/js/backend_calendar_default_view.js b/assets/js/backend_calendar_default_view.js index 66263f38..ec67ee76 100755 --- a/assets/js/backend_calendar_default_view.js +++ b/assets/js/backend_calendar_default_view.js @@ -325,6 +325,9 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {}; + '
' + '' + EALang.end + ' ' + GeneralFunctions.formatDate(event.end.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true) + + '
' + + '' + EALang.timezone + ' ' + + GlobalVariables.timezones[event.data.provider.timezone] + '
' + notes + '
' + @@ -343,7 +346,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {}; provider = '' + EALang.provider + ' ' + event.data.first_name + ' ' + event.data.last_name; } - var extra_period = jQuery.parseJSON(event.data.settings.extra_working_plan)[event.start.format()]; + var extraPeriod = jQuery.parseJSON(event.data.settings.extra_working_plan)[event.start.format()]; html = '' + '' + EALang.start + ' ' - + GeneralFunctions.formatDate(event.start.format() + ' ' + extra_period.start, GlobalVariables.dateFormat, true) + + GeneralFunctions.formatDate(event.start.format() + ' ' + extraPeriod.start, GlobalVariables.dateFormat, true) + '
' + '' + EALang.end + ' ' - + GeneralFunctions.formatDate(event.start.format() + ' ' + extra_period.end, GlobalVariables.dateFormat, true) - + '
' + + GeneralFunctions.formatDate(event.start.format() + ' ' + extraPeriod.end, GlobalVariables.dateFormat, true) + + '
' + + '' + EALang.timezone + ' ' + + GlobalVariables.timezones[event.data.provider.timezone] + + '
' + + provider + '
' + '
' + @@ -380,6 +386,9 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {}; '' + EALang.end + ' ' + GeneralFunctions.formatDate(event.end.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true) + '
' + + '' + EALang.timezone + ' ' + + GlobalVariables.timezones[event.data.provider.timezone] + + '
' + '' + EALang.service + ' ' + event.data.service.name + '
' +