From d18fe91c08dcdb6979c40151c7777c72455e434c Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 19 Mar 2015 11:39:42 +0100
Subject: [PATCH] no-jira: take the year in account to calculate isToday()
---
.../org/olat/commons/calendar/model/KalendarEvent.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/commons/calendar/model/KalendarEvent.java b/src/main/java/org/olat/commons/calendar/model/KalendarEvent.java
index b1c0848e2e7..1eec100ad2d 100644
--- a/src/main/java/org/olat/commons/calendar/model/KalendarEvent.java
+++ b/src/main/java/org/olat/commons/calendar/model/KalendarEvent.java
@@ -220,14 +220,17 @@ public class KalendarEvent implements Cloneable, Comparable<KalendarEvent> {
public boolean isToday() {
Calendar cal = Calendar.getInstance();
int todayDay = cal.get(Calendar.DAY_OF_YEAR);
+ int todayYear = cal.get(Calendar.YEAR);
cal.setTime(begin);
int startDay = cal.get(Calendar.DAY_OF_YEAR);
- boolean today = (todayDay - startDay == 0);
+ int startYear = cal.get(Calendar.YEAR);
+ boolean today = (todayDay == startDay) && (todayYear == startYear);
if(end != null) {
cal.setTime(end);
int endDay = cal.get(Calendar.DAY_OF_YEAR);
- today &= (todayDay - endDay == 0);
+ int endYear = cal.get(Calendar.YEAR);
+ today &= (todayDay == endDay) && (todayYear == endYear);
}
//an event without end date finish the same day (3.6.1. Event Component, https://tools.ietf.org/html/rfc5545#section-3.6.1)
return today;
--
GitLab