holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar - fix multi-day events ending at 00:00 would only be shown for the first day

Browse Source
This commit is contained in:
nathangray 2018-09-24 11:24:05 -06:00
parent be731519cf
commit 1e98a89bbd
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/js/app.js
View File

@ -3151,9 +3151,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
start: typeof record.data.start === 'string' ? record.data.start : record.data.start.toJSON(), start: typeof record.data.start === 'string' ? record.data.start : record.data.start.toJSON(),
end: typeof record.data.end === 'string' ? record.data.end : record.data.end.toJSON() end: typeof record.data.end === 'string' ? record.data.end : record.data.end.toJSON()
}; };
if(dates.start.substr(0,10) !== dates.end.substr(0,10) && if(dates.start.substr(0,10) !== dates.end.substr(0,10))
// Avoid events ending at midnight having a 0 length event the next day
dates.end.substr(11,8) !== '00:00:00')
{ {
var end = new Date(Math.min(new Date(record.data.end), new Date(state.last))); var end = new Date(Math.min(new Date(record.data.end), new Date(state.last)));
end.setUTCHours(23); end.setUTCHours(23);
@ -3164,6 +3162,10 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
do do
{ {
var expanded_date = ''+t.getUTCFullYear() + sprintf('%02d',t.getUTCMonth()+1) + sprintf('%02d',t.getUTCDate()); var expanded_date = ''+t.getUTCFullYear() + sprintf('%02d',t.getUTCMonth()+1) + sprintf('%02d',t.getUTCDate());
// Avoid events ending at midnight having a 0 length event the next day
if(t.toJSON().substr(0,10) === dates.end.substr(0,10) && dates.end.substr(11,8) === '00:00:00') break;
if(typeof(updated_days[expanded_date]) === 'undefined') if(typeof(updated_days[expanded_date]) === 'undefined')
{ {
// Check to make sure it's in range first, expanded_date could be after our end // Check to make sure it's in range first, expanded_date could be after our end
@ -3179,7 +3181,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
} }
t.setUTCDate(t.getUTCDate() + 1); t.setUTCDate(t.getUTCDate() + 1);
} }
while(end >= t) while(end >= t )
} }
} }
} }