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

Working plan exception - details pane shows incorrect details (#1011).

Browse source
This commit is contained in:
Alex Tselegidis 2021-07-19 16:21:14 +03:00
parent c885b27f7d
commit 23bcc2d468
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assets/js/backend_calendar_default_view.js
View file

@ -447,7 +447,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'text': EALang.start 'text': EALang.start
}), }),
$('<span/>', { $('<span/>', {
'text': GeneralFunctions.formatDate(event.start.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true) 'text': GeneralFunctions.formatDate(event.data.date + ' ' + event.data.workingPlanException.start, GlobalVariables.dateFormat, true)
}), }),
$('<br/>'), $('<br/>'),
@ -456,7 +456,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'text': EALang.end 'text': EALang.end
}), }),
$('<span/>', { $('<span/>', {
'text': GeneralFunctions.formatDate(event.end.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true) 'text': GeneralFunctions.formatDate(event.data.date + ' ' + event.data.workingPlanException.end, GlobalVariables.dateFormat, true)
}), }),
$('<br/>'), $('<br/>'),
@ -475,7 +475,7 @@ window.BackendCalendarDefaultView = window.BackendCalendarDefaultView || {};
'class': 'd-flex justify-content-between', 'class': 'd-flex justify-content-between',
'html': [ 'html': [
$('<button/>', { $('<button/>', {
'class': 'close-popover btn btn-outline-secondary', 'class': 'close-popover btn btn-outline-secondary mr-2',
'html': [ 'html': [
$('<i/>', { $('<i/>', {
'class': 'fas fa-ban mr-2' 'class': 'fas fa-ban mr-2'

4
assets/js/backend_calendar_table_view.js
View file

@ -1186,7 +1186,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
'text': EALang.start 'text': EALang.start
}), }),
$('<span/>', { $('<span/>', {
'text': GeneralFunctions.formatDate(event.start.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true) 'text': GeneralFunctions.formatDate(event.data.date + ' ' + event.data.workingPlanException.start, GlobalVariables.dateFormat, true)
}), }),
$('<br/>'), $('<br/>'),
@ -1194,7 +1194,7 @@ window.BackendCalendarTableView = window.BackendCalendarTableView || {};
'text': EALang.end 'text': EALang.end
}), }),
$('<span/>', { $('<span/>', {
'text': GeneralFunctions.formatDate(event.end.format('YYYY-MM-DD HH:mm:ss'), GlobalVariables.dateFormat, true) 'text': GeneralFunctions.formatDate(event.data.date + ' ' + event.data.workingPlanException.end, GlobalVariables.dateFormat, true)
}), }),
$('<br/>'), $('<br/>'),