Skip to content
Snippets Groups Projects

Resolve "daily scheduling bug"

Merged Valentin Groues requested to merge 209-daily-scheduling-bug into master
1 file
+ 9
0
Compare changes
  • Side-by-side
  • Inline
@@ -135,6 +135,10 @@ function get_subjects_events(day) {
start: $.fullCalendar.moment(event.appointment_start),
end: $.fullCalendar.moment(event.appointment_end)
};
if (event.start.valueOf() === event.end.valueOf()) {
event.end = $.fullCalendar.moment(event.start);
event.end.add(1, 'hour');
}
$('#calendar').fullCalendar('renderEvent', event, true);
} else {
add_event(event, subject.color, subject.id, undefined, boxBody);
@@ -170,6 +174,10 @@ function get_subjects_events(day) {
start: $.fullCalendar.moment(event.appointment_start),
end: $.fullCalendar.moment(event.appointment_end)
};
if (event.start.valueOf() === event.end.valueOf()) {
event.end = $.fullCalendar.moment(event.start);
event.end.add(1, 'hour');
}
$('#calendar').fullCalendar('renderEvent', event, true);
} else {
add_event(event, location.color, undefined, location.id, boxBody);
@@ -358,6 +366,7 @@ $(document).ready(function () {
resources: resources_url,
events: [],
eventRender: function (event, element) {
if (event.rendering !== 'background') {
var content =
element.popover({
Loading