extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix multi-day event display was using event start & end time for each day instead of filling the day

Browse Source
This commit is contained in:
nathangray 2016-09-15 08:35:07 -06:00
parent bc108f4573
commit 88128b6a8b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/js/et2_widget_daycol.js
View File

@ -885,13 +885,13 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
{
event.end = new Date(event.end);
}
event['start_m'] = event.start.getUTCHours() * 60 + event.start.getUTCMinutes();
event['start_m'] = (event.start.valueOf()/1000 - day_start) / 60
if (event['start_m'] < 0)
{
event['start_m'] = 0;
event['multiday'] = true;
}
event['end_m'] = event.end.getUTCHours() * 60 + event.end.getUTCMinutes();
event['end_m'] = (event.end.valueOf()/1000 - day_start) / 60;
if (event['end_m'] >= 24*60)
{
event['end_m'] = 24*60-1;

1
calendar/js/et2_widget_event.js
View File

@ -653,7 +653,6 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
var duration = event.multiday ?
(event.end - event.start) / 60000 :
(event.end_m - event.start_m);
if (event.end_m === 24*60-1) ++duration;
duration = Math.floor(duration/60) + this.egw().lang('h')+(duration%60 ? duration%60 : '');
timespan = jQuery.datepicker.formatTime(