From c7776a531cc7a77a36a45ef46762fb77bc7e8791 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 7 Jul 2014 16:32:34 +0200
Subject: [PATCH] OO-1108: show very long range event where the begin is before
the month shown by the calendar and the end date after
---
.../commons/calendar/ui/components/FullCalendarMapper.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/main/java/org/olat/commons/calendar/ui/components/FullCalendarMapper.java b/src/main/java/org/olat/commons/calendar/ui/components/FullCalendarMapper.java
index b17f37067ef..2849e9645a0 100644
--- a/src/main/java/org/olat/commons/calendar/ui/components/FullCalendarMapper.java
+++ b/src/main/java/org/olat/commons/calendar/ui/components/FullCalendarMapper.java
@@ -138,9 +138,12 @@ public class FullCalendarMapper implements Mapper {
private boolean isInRange(Date from, Date to, KalendarEvent event) {
Date end = event.getEnd();
Date begin = event.getBegin();
+ System.out.println(begin + " -> " + end);
if(begin != null && end != null) {
if(from.compareTo(begin) <= 0 && to.compareTo(end) >= 0) {
return true;
+ } else if(begin.compareTo(from) <= 0 && end.compareTo(to) >= 0) {
+ return true;
} else if(from.compareTo(begin) <= 0 && to.compareTo(begin) >= 0) {
return true;
} else if(from.compareTo(end) <= 0 && to.compareTo(end) >= 0) {
--
GitLab