From 88128b6a8b84d0260075f96735078b0577b69014 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 15 Sep 2016 08:35:07 -0600 Subject: [PATCH] Fix multi-day event display was using event start & end time for each day instead of filling the day --- calendar/js/et2_widget_daycol.js | 4 ++-- calendar/js/et2_widget_event.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/calendar/js/et2_widget_daycol.js b/calendar/js/et2_widget_daycol.js index 59f7d80997..2c123a3195 100644 --- a/calendar/js/et2_widget_daycol.js +++ b/calendar/js/et2_widget_daycol.js @@ -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; diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js index 513b809b66..5cb8b75043 100644 --- a/calendar/js/et2_widget_event.js +++ b/calendar/js/et2_widget_event.js @@ -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(