maket
/
MaketRandevu
1
1
Fork 0
Code Issues 15 Pull Requests Packages Projects Releases 4 Wiki Activity

Corrections in the event popovers of the calendar page.

This commit is contained in:
alext 2017-10-31 11:13:53 +01:00
parent 6ba3d7ce70
commit 5741fca71d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/assets/js/backend_calendar_default_view.js
View File

@ -96,8 +96,8 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
var unavailable = lastFocusedEventData.data; var unavailable = lastFocusedEventData.data;
// Replace string date values with actual date objects. // Replace string date values with actual date objects.
unavailable.start_datetime = lastFocusedEventData.start.clone(); unavailable.start_datetime = lastFocusedEventData.start.format('YYYY-MM-DD HH:mm:ss');
unavailable.end_datetime = lastFocusedEventData.end.clone(); unavailable.end_datetime = lastFocusedEventData.end.format('YYYY-MM-DD HH:mm:ss');
$dialog = $('#manage-unavailable'); $dialog = $('#manage-unavailable');
BackendCalendarUnavailabilitiesModal.resetUnavailableDialog(); BackendCalendarUnavailabilitiesModal.resetUnavailableDialog();
@ -268,7 +268,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
var $parent = $(jsEvent.target.offsetParent); var $parent = $(jsEvent.target.offsetParent);
var $altParent = $(jsEvent.target).parents().eq(1); var $altParent = $(jsEvent.target).parents().eq(1);
if ($parent.hasClass('fc-unavailable') || $altParent.hasClass('fc-unavailable')) { if ($(this).hasClass('fc-unavailable') || $parent.hasClass('fc-unavailable') || $altParent.hasClass('fc-unavailable')) {
displayEdit = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom')) displayEdit = (($parent.hasClass('fc-custom') || $altParent.hasClass('fc-custom'))
&& GlobalVariables.user.privileges.appointments.edit == true) && GlobalVariables.user.privileges.appointments.edit == true)
? '' : 'hide'; ? '' : 'hide';
@ -287,10 +287,10 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
+ '.popover-content button {margin-right: 10px;}' + '.popover-content button {margin-right: 10px;}'
+ '</style>' + + '</style>' +
'<strong>' + EALang.start + '</strong> ' '<strong>' + EALang.start + '</strong> '
+ GeneralFunctions.formatDate(event.start, GlobalVariables.dateFormat, true) + GeneralFunctions.formatDate(event.start.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true)
+ '<br>' + + '<br>' +
'<strong>' + EALang.end + '</strong> ' '<strong>' + EALang.end + '</strong> '
+ GeneralFunctions.formatDate(event.end, GlobalVariables.dateFormat, true) + GeneralFunctions.formatDate(event.end.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true)
+ '<br>' + '<br>'
+ notes + notes
+ '<hr>' + + '<hr>' +
@ -311,10 +311,10 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
+ '.popover-content button {margin-right: 10px;}' + '.popover-content button {margin-right: 10px;}'
+ '</style>' + + '</style>' +
'<strong>' + EALang.start + '</strong> ' '<strong>' + EALang.start + '</strong> '
+ GeneralFunctions.formatDate(event.start, GlobalVariables.dateFormat, true) + GeneralFunctions.formatDate(event.start.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true)
+ '<br>' + + '<br>' +
'<strong>' + EALang.end + '</strong> ' '<strong>' + EALang.end + '</strong> '
+ GeneralFunctions.formatDate(event.end, GlobalVariables.dateFormat, true) + GeneralFunctions.formatDate(event.end.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true)
+ '<br>' + + '<br>' +
'<strong>' + EALang.service + '</strong> ' '<strong>' + EALang.service + '</strong> '
+ event.data.service.name + event.data.service.name