From 6812cb08dcbf08bebfb32fcb34b58b351243337f Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 3 Nov 2015 08:57:51 -0500 Subject: [PATCH] Display missing events when printing working hours --- NEWS | 1 + UI/WebServerResources/UIxCalViewPrint.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index a1af989d7..f232dc16b 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,7 @@ Bug fixes - avoid crash when replying to a mail with no recipients (#3359) - inline images sent from SOGo webmail are not displayed in Mozilla Thunderbird (#3271) - prevent postal address showing on single line over EAS (#2614) + - display missing events when printing working hours only 2.3.2 (2015-09-16) ------------------ diff --git a/UI/WebServerResources/UIxCalViewPrint.js b/UI/WebServerResources/UIxCalViewPrint.js index e26396c58..a90fd8803 100644 --- a/UI/WebServerResources/UIxCalViewPrint.js +++ b/UI/WebServerResources/UIxCalViewPrint.js @@ -308,7 +308,7 @@ function _drawCalendarEvents(events, eventsData, columnsData) { if (printHoursCheckBox.checked) { var offset = _computeOffset(parentDiv); - if ((eventRep.start - offset[0]) > 0 && (eventRep.start - offset[0]) < offset[1]) { + if ((eventRep.start - offset[0]) >= 0 && (eventRep.start - offset[0]) <= offset[1]) { var eventCell = newEventDIV(eventRep, calendarEventsData[nbr], offset[0]); var eventInside = eventCell.down(".eventInside"); addColorsOnEvents(eventInside, eventCell); @@ -338,7 +338,7 @@ function _drawCalendarEvents(events, eventsData, columnsData) { var nbr = eventRep.nbr; if (printHoursCheckBox.checked) { var offset = _computeOffset(parentDiv); - if ((eventRep.start - offset[0]) > 0 && (eventRep.start - offset[0]) < offset[1]) { + if ((eventRep.start - offset[0]) >= 0 && (eventRep.start - offset[0]) <= offset[1]) { var eventCell = newEventDIV(eventRep, eventsData[nbr], offset[0]); var eventInside = eventCell.down(".eventInside"); addColorsOnEvents(eventInside, eventCell);