From 4f9a59389e6bf5b11810904b03e5a8681e4b1802 Mon Sep 17 00:00:00 2001 From: Markus Kreth Date: Thu, 8 Nov 2018 23:59:40 +0100 Subject: [PATCH] proceeded year calendar --- .../ui/components/calendar/Year.java | 7 +- src/main/resources/jasper/calendar_year.jrxml | 6681 +++++++++++++++-- .../components/calendar/WeeksOfMonthTest.java | 9 + 3 files changed, 5917 insertions(+), 780 deletions(-) diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/Year.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/Year.java index a08b090..2b123cd 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/Year.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/Year.java @@ -46,7 +46,12 @@ public class Year { * @return numeric value of the day of the month. */ public String getDay(Month month, short week, DayOfWeek dayOfWeek) { - Integer res = monthWeeks.get(month).getWeek(week - 1).get(dayOfWeek); + + WeeksOfMonth weeksOfMonth = monthWeeks.get(month); + if (week >= weeksOfMonth.weekCount()) { + return ""; + } + Integer res = weeksOfMonth.getWeek(week - 1).get(dayOfWeek); return res == null ? "" : res.toString(); diff --git a/src/main/resources/jasper/calendar_year.jrxml b/src/main/resources/jasper/calendar_year.jrxml index e30530e..80be2b7 100644 --- a/src/main/resources/jasper/calendar_year.jrxml +++ b/src/main/resources/jasper/calendar_year.jrxml @@ -1,9 +1,16 @@ - + - + + + + + + + +