holidays implemented

master
Markus Kreth 7 years ago
parent 1c9cf91523
commit 15180e86e6
  1. 10
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarCreator.java
  2. 2
      src/main/resources/jasper/calendar_year.jrxml

@ -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<ClubEvent> allevents = loadAllEvents(false);
int year = 2019;
List<ClubEvent> allevents = loadAllEvents(true).stream().filter(ev -> {
return ev.getStart().toLocalDate().getYear() <= year && ev.getEnd().toLocalDate().getYear() >= year;
}).collect(Collectors.toList());
List<LocalDate> holidays = filterHolidays(allevents);
Map<LocalDate, CharSequence> values = map(allevents, 2019);
Map<LocalDate, CharSequence> values = map(allevents, year);
JasperViewer v1 = new JasperViewer(createCalendar(2019, values, holidays));
JasperViewer v1 = new JasperViewer(createCalendar(year, values, holidays));
v1.setVisible(true);
}

@ -1138,7 +1138,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="162" y="179" width="39" height="10" isRemoveLineWhenBlank="true" uuid="1e1aaf99-75aa-4f94-af18-3d5b12623132"/>
<reportElement style="DayStyleFRIDAY5" mode="Opaque" x="162" y="179" width="39" height="10" isRemoveLineWhenBlank="true" uuid="1e1aaf99-75aa-4f94-af18-3d5b12623132"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>

Loading…
Cancel
Save