From 15180e86e6e248d830a67254cd63c51e54bebae5 Mon Sep 17 00:00:00 2001 From: Markus Kreth Date: Sat, 1 Dec 2018 02:02:00 +0100 Subject: [PATCH] holidays implemented --- .../ui/components/CalendarCreator.java | 10 +++++++--- src/main/resources/jasper/calendar_year.jrxml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarCreator.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarCreator.java index 3c692d6..6a108f0 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarCreator.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarCreator.java @@ -13,6 +13,7 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.stream.Collectors; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -81,13 +82,16 @@ public abstract class CalendarCreator { Locale.setDefault(Locale.GERMANY); - List allevents = loadAllEvents(false); + int year = 2019; + List allevents = loadAllEvents(true).stream().filter(ev -> { + return ev.getStart().toLocalDate().getYear() <= year && ev.getEnd().toLocalDate().getYear() >= year; + }).collect(Collectors.toList()); List holidays = filterHolidays(allevents); - Map values = map(allevents, 2019); + Map values = map(allevents, year); - JasperViewer v1 = new JasperViewer(createCalendar(2019, values, holidays)); + JasperViewer v1 = new JasperViewer(createCalendar(year, values, holidays)); v1.setVisible(true); } diff --git a/src/main/resources/jasper/calendar_year.jrxml b/src/main/resources/jasper/calendar_year.jrxml index fb88da2..acfa57d 100644 --- a/src/main/resources/jasper/calendar_year.jrxml +++ b/src/main/resources/jasper/calendar_year.jrxml @@ -1138,7 +1138,7 @@ - +