diff --git a/pom.xml b/pom.xml
index 1cc36e8..9bbdb02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,10 @@
vaadin-clubhelper
Vaadin Administation Frontend for Clubhelper.
+
+ 3
+
+
org.springframework.boot
spring-boot-starter-parent
@@ -147,11 +151,6 @@
junit-jupiter-engine
test
-
- org.junit.vintage
- junit-vintage-engine
- test
-
com.h2database
h2
@@ -202,6 +201,11 @@
jasperreports
6.7.0
+
+ net.sf.jasperreports
+ jasperreports-functions
+ 6.7.0
+
@@ -266,19 +270,6 @@
default-jacoco-report
- prepare-package
-
- report
-
-
-
- default-jacoco-check
-
- check
-
-
-
- jacoco-report
test
report
diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/CalendarTaskRefresher.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/CalendarTaskRefresher.java
index 262bc71..344ae3a 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/CalendarTaskRefresher.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/business/CalendarTaskRefresher.java
@@ -44,4 +44,8 @@ public class CalendarTaskRefresher {
log.debug("successfully stored {}", e);
}
}
+
+ public void setDao(ClubEventDao dao) {
+ this.dao = dao;
+ }
}
diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/AbstractDaoImpl.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/AbstractDaoImpl.java
index 7c7fbb9..7dd71d6 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/AbstractDaoImpl.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/AbstractDaoImpl.java
@@ -31,16 +31,15 @@ public abstract class AbstractDaoImpl implements IDao {
public T update(T obj) {
return em.merge(obj);
}
-
+
@Override
public T get(Object primaryKey) {
return em.find(entityClass, primaryKey);
}
-
+
@Override
public List listAll() {
- TypedQuery query = em.createNamedQuery(
- entityClass.getSimpleName() + ".findAll", entityClass);
+ TypedQuery query = em.createNamedQuery(entityClass.getSimpleName() + ".findAll", entityClass);
return query.getResultList();
}
diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/ClubEventDaoImpl.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/ClubEventDaoImpl.java
index 66c4370..fed0f34 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/ClubEventDaoImpl.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/ClubEventDaoImpl.java
@@ -1,16 +1,20 @@
package de.kreth.vaadin.clubhelper.vaadinclubhelper.dao;
+import javax.persistence.EntityManager;
+
import org.springframework.stereotype.Repository;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent;
@Repository
-public class ClubEventDaoImpl extends AbstractDaoImpl
- implements
- ClubEventDao {
+public class ClubEventDaoImpl extends AbstractDaoImpl implements ClubEventDao {
public ClubEventDaoImpl() {
super(ClubEvent.class);
}
+ public void setEntityManager(EntityManager em) {
+ this.em = em;
+ }
+
}
diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/YearlyCalendarCreator.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/YearlyCalendarCreator.java
index 932520e..037a4f1 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/YearlyCalendarCreator.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/YearlyCalendarCreator.java
@@ -1,6 +1,7 @@
package de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components;
import java.io.InputStream;
+import java.time.LocalDate;
import java.util.Map;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.calendar.Year;
@@ -12,8 +13,11 @@ public class YearlyCalendarCreator extends CalendarCreator {
private Year year;
- public YearlyCalendarCreator(int year) {
- this.year = new Year(year);
+ public YearlyCalendarCreator(int year, Map values) {
+ if (values == null) {
+ throw new NullPointerException("Calendar values must not be null!");
+ }
+ this.year = new Year(year, values);
}
@Override
diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/WeeksOfMonth.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/WeeksOfMonth.java
index 0682674..901e4e6 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/WeeksOfMonth.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/WeeksOfMonth.java
@@ -13,7 +13,8 @@ import java.util.Map;
public class WeeksOfMonth {
- private static final List ORDERED_WEEKDAY = Arrays.asList(DayOfWeek.MONDAY, DayOfWeek.TUESDAY, DayOfWeek.WEDNESDAY, DayOfWeek.THURSDAY, DayOfWeek.FRIDAY, DayOfWeek.SATURDAY, DayOfWeek.SUNDAY);
+ private static final List ORDERED_WEEKDAY = Arrays.asList(DayOfWeek.MONDAY, DayOfWeek.TUESDAY,
+ DayOfWeek.WEDNESDAY, DayOfWeek.THURSDAY, DayOfWeek.FRIDAY, DayOfWeek.SATURDAY, DayOfWeek.SUNDAY);
private final YearMonth yearMonth;
private final List> weeks;
@@ -31,17 +32,17 @@ public class WeeksOfMonth {
List> result = new ArrayList<>();
Map currentWeek = new HashMap<>();
-
+
int monthValue = yearMonth.getMonthValue();
while (day.getMonthValue() == monthValue) {
- for (DayOfWeek d: ORDERED_WEEKDAY) {
+ for (DayOfWeek d : ORDERED_WEEKDAY) {
if (d.equals(day.getDayOfWeek()) && day.getMonthValue() == monthValue) {
currentWeek.put(d, day.getDayOfMonth());
day = day.plusDays(1);
} else {
currentWeek.put(d, null);
- }
+ }
}
result.add(Collections.unmodifiableMap(currentWeek));
currentWeek = new HashMap<>();
@@ -54,7 +55,9 @@ public class WeeksOfMonth {
}
/**
- * Week in Month >=0 && < {@link #weekCount()} depending on day count and weekday order.
+ * Week in Month >=0 && < {@link #weekCount()} depending on day count and
+ * weekday order.
+ *
* @param index
* @return
*/
@@ -64,11 +67,11 @@ public class WeeksOfMonth {
/**
* Count of week (parts) in this month.
+ *
* @return
*/
public int weekCount() {
return weeks.size();
}
-
-
+
}
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 46ea449..83a3a6c 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
@@ -4,6 +4,7 @@ import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.Month;
import java.time.format.TextStyle;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -13,12 +14,17 @@ public class Year {
private final LocalDate date;
private final Locale locale;
private final Map monthWeeks;
+ private final Map values;
public Year(int year) {
- this(year, Locale.getDefault());
+ this(year, Collections.emptyMap(), Locale.getDefault());
}
- public Year(int year, Locale locale) {
+ public Year(int year, Map values) {
+ this(year, values, Locale.getDefault());
+ }
+
+ public Year(int year, Map values, Locale locale) {
if (year < 1900 || year > 2100) {
throw new IllegalArgumentException("Year value must be between 1900 and 2100");
}
@@ -28,6 +34,10 @@ public class Year {
for (Month m : Month.values()) {
monthWeeks.put(m, new WeeksOfMonth(m, year));
}
+ this.values = values;
+ for (LocalDate d : values.keySet()) {
+ System.out.println(d + "\t" + values.get(d));
+ }
}
public int getYear() {
@@ -47,14 +57,24 @@ public class Year {
* @return numeric value of the day of the month.
*/
public String getDay(Month month, short week, DayOfWeek dayOfWeek) {
+ Integer res = getDayOfMonth(month, week, dayOfWeek);
+
+ return res == null ? "" : res.toString();
+
+ }
+
+ public Integer getDayOfMonth(Month month, short week, DayOfWeek dayOfWeek) {
WeeksOfMonth weeksOfMonth = monthWeeks.get(month);
if (week > weeksOfMonth.weekCount()) {
- return "";
+ return null;
}
- Integer res = weeksOfMonth.getWeek(week - 1).get(dayOfWeek);
-
- return res == null ? "" : res.toString();
+ return weeksOfMonth.getWeek(week - 1).get(dayOfWeek);
}
+ public CharSequence getContent(Month month, short week, DayOfWeek dayOfWeek) {
+ Integer res = getDayOfMonth(month, week, dayOfWeek);
+ LocalDate day = date.withMonth(month.getValue()).withDayOfMonth(res);
+ return values.get(day);
+ }
}
diff --git a/src/main/resources/jasper/calendar_year.jrxml b/src/main/resources/jasper/calendar_year.jrxml
index f4ec107..f98450b 100644
--- a/src/main/resources/jasper/calendar_year.jrxml
+++ b/src/main/resources/jasper/calendar_year.jrxml
@@ -39,7 +39,7 @@
<band height="830">
<textField pattern="MMMM">
- <reportElement isPrintRepeatedValues="false" x="300" y="0" width="273" height="22" uuid="8475fb7d-4b29-4e41-bca0-0661596661db"/>
+ <reportElement isPrintRepeatedValues="false" x="300" y="60" width="273" height="22" uuid="8475fb7d-4b29-4e41-bca0-0661596661db"/>
<box>
<topPen lineWidth="1.0"/>
<leftPen lineWidth="1.0"/>
@@ -51,7 +51,7 @@
<textFieldExpression><![CDATA[java.time.Month.FEBRUARY.getDisplayName(java.time.format.TextStyle.FULL, java.util.Locale.getDefault())]]></textFieldExpression>
</textField>
<staticText>
- <reportElement mode="Opaque" x="300" y="22" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="45e99a7b-ab87-4579-a137-09992d0c53f2">
+ <reportElement mode="Opaque" x="300" y="82" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="45e99a7b-ab87-4579-a137-09992d0c53f2">
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
</reportElement>
<box>
@@ -65,7 +65,7 @@
<text><![CDATA[Montag]]></text>
</staticText>
<staticText>
- <reportElement mode="Opaque" x="339" y="22" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="e7b19200-b386-446d-8223-05885980d308">
+ <reportElement mode="Opaque" x="339" y="82" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="e7b19200-b386-446d-8223-05885980d308">
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
</reportElement>
<box>
@@ -81,7 +81,7 @@
<text><![CDATA[Dienstag]]></text>
</staticText>
<staticText>
- <reportElement mode="Opaque" x="378" y="22" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="8bab1e7b-be77-4fbb-8933-1dc3f9c0a243">
+ <reportElement mode="Opaque" x="378" y="82" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="8bab1e7b-be77-4fbb-8933-1dc3f9c0a243">
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
</reportElement>
<box>
@@ -97,7 +97,7 @@
<text><![CDATA[Mittwoch]]></text>
</staticText>
<staticText>
- <reportElement mode="Opaque" x="417" y="22" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="d9099da9-c98d-4806-a34b-43bd771f75b7">
+ <reportElement mode="Opaque" x="417" y="82" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="d9099da9-c98d-4806-a34b-43bd771f75b7">
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
</reportElement>
<box>
@@ -113,7 +113,7 @@
<text><![CDATA[Donnerstag]]></text>
</staticText>
<staticText>
- <reportElement mode="Opaque" x="456" y="22" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="134d1807-dc0e-4f6a-af3b-8ed138dee09a">
+ <reportElement mode="Opaque" x="456" y="82" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="134d1807-dc0e-4f6a-af3b-8ed138dee09a">
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
</reportElement>
<box>
@@ -129,7 +129,7 @@
<text><![CDATA[Freitag]]></text>
</staticText>
<staticText>
- <reportElement mode="Opaque" x="495" y="22" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="a7f997e6-0029-4374-9400-77424f7914d6">
+ <reportElement mode="Opaque" x="495" y="82" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="a7f997e6-0029-4374-9400-77424f7914d6">
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
</reportElement>
<box>
@@ -145,7 +145,7 @@
<text><![CDATA[Samstag]]></text>
</staticText>
<staticText>
- <reportElement mode="Opaque" x="534" y="22" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="1b145888-a4c6-49a0-9c0d-0ccf64bdfc80">
+ <reportElement mode="Opaque" x="534" y="82" width="39" height="10" forecolor="#FFFCFC" backcolor="#403D3D" uuid="1b145888-a4c6-49a0-9c0d-0ccf64bdfc80">
<property name="com.jaspersoft.studio.unit.y" value="pixel"/>
</reportElement>
<box>
@@ -161,7 +161,7 @@
<text><![CDATA[Sonntag]]></text>
</staticText>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="32" width="39" height="10" isRemoveLineWhenBlank="true" uuid="802e6694-d7a3-4690-a49b-68f7922e0ca2"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="92" width="39" height="10" isRemoveLineWhenBlank="true" uuid="802e6694-d7a3-4690-a49b-68f7922e0ca2"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -175,7 +175,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="378" y="42" width="39" height="25" uuid="1fab31e5-c838-4e32-9c93-7ba3b75ae0e3">
+ <reportElement x="378" y="100" width="39" height="27" uuid="1fab31e5-c838-4e32-9c93-7ba3b75ae0e3">
<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.WEDNESDAY ))>0]]></printWhenExpression>
</reportElement>
<box>
@@ -189,7 +189,7 @@
</textElement>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="378" y="77" width="39" height="25" uuid="6a28af25-3705-42fa-b11d-a91243830b19"/>
+ <reportElement x="378" y="135" width="39" height="27" uuid="6a28af25-3705-42fa-b11d-a91243830b19"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -202,7 +202,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="67" width="39" height="10" uuid="560fea15-243b-4717-803f-428cf9fbd9ee"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="127" width="39" height="10" uuid="560fea15-243b-4717-803f-428cf9fbd9ee"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -216,7 +216,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)2, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="378" y="112" width="39" height="25" uuid="490b8a20-416f-4e3b-bdcc-9b12e34b7b02"/>
+ <reportElement x="378" y="170" width="39" height="27" uuid="490b8a20-416f-4e3b-bdcc-9b12e34b7b02"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -229,7 +229,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="102" width="39" height="10" uuid="d48decff-98d6-48cb-b8fb-fec5d793d181"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="162" width="39" height="10" uuid="d48decff-98d6-48cb-b8fb-fec5d793d181"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -243,7 +243,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)3, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="378" y="147" width="39" height="25" uuid="b230ba03-d9a0-4510-a143-12033727eada"/>
+ <reportElement x="378" y="207" width="39" height="25" uuid="b230ba03-d9a0-4510-a143-12033727eada"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -256,7 +256,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="137" width="39" height="10" uuid="c3dc86f5-8cdc-427a-812c-93acd585618c"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="197" width="39" height="10" uuid="c3dc86f5-8cdc-427a-812c-93acd585618c"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -270,7 +270,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)4, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="32" width="39" height="10" uuid="792a412a-6478-4112-89c1-24cf7968c22e"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="92" width="39" height="10" uuid="792a412a-6478-4112-89c1-24cf7968c22e"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -284,7 +284,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="417" y="42" width="39" height="25" uuid="49164703-9056-4d37-9e07-214e7b45b5dd"/>
+ <reportElement x="417" y="100" width="39" height="27" uuid="49164703-9056-4d37-9e07-214e7b45b5dd"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -297,7 +297,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="417" y="77" width="39" height="25" uuid="3cb26ca9-b164-47cb-80c0-0f4cf11f0f25"/>
+ <reportElement x="417" y="135" width="39" height="27" uuid="3cb26ca9-b164-47cb-80c0-0f4cf11f0f25"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -310,7 +310,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="67" width="39" height="10" uuid="01ccc0e0-f191-4565-92ed-5fff32a2ab77"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="127" width="39" height="10" uuid="01ccc0e0-f191-4565-92ed-5fff32a2ab77"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -324,7 +324,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)2, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="417" y="112" width="39" height="25" uuid="c3974294-d67f-4045-b67b-403ea81602af"/>
+ <reportElement x="417" y="170" width="39" height="27" uuid="c3974294-d67f-4045-b67b-403ea81602af"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -337,7 +337,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="102" width="39" height="10" uuid="1c9ab041-93c8-4f49-81fd-8a5127671255"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="162" width="39" height="10" uuid="1c9ab041-93c8-4f49-81fd-8a5127671255"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -351,7 +351,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)3, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="417" y="147" width="39" height="25" uuid="3e7f8f6a-0974-4c07-9fd7-08d9defe8c2a"/>
+ <reportElement x="417" y="207" width="39" height="25" uuid="3e7f8f6a-0974-4c07-9fd7-08d9defe8c2a"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -364,7 +364,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="137" width="39" height="10" uuid="836fecc0-29c6-4be7-8ab6-4e37b7e6f364"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="197" width="39" height="10" uuid="836fecc0-29c6-4be7-8ab6-4e37b7e6f364"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -378,7 +378,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)4, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="32" width="39" height="10" uuid="6d9c6eda-3afb-4106-9ba7-4b1d703bda5f"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="92" width="39" height="10" uuid="6d9c6eda-3afb-4106-9ba7-4b1d703bda5f"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -392,7 +392,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="456" y="42" width="39" height="25" uuid="f3616cfb-874e-40e4-81d9-f9f35852fa8c"/>
+ <reportElement x="456" y="100" width="39" height="27" uuid="f3616cfb-874e-40e4-81d9-f9f35852fa8c"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -405,7 +405,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="456" y="77" width="39" height="25" uuid="0a9507ee-cdd1-42c1-8f8f-e0f011a2eb30"/>
+ <reportElement x="456" y="135" width="39" height="27" uuid="0a9507ee-cdd1-42c1-8f8f-e0f011a2eb30"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -418,7 +418,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="67" width="39" height="10" uuid="655e4d3f-97a5-4d75-b9c1-916fa239289d"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="127" width="39" height="10" uuid="655e4d3f-97a5-4d75-b9c1-916fa239289d"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -432,7 +432,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)2, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="456" y="112" width="39" height="25" uuid="35cba7c6-b4ae-48b9-b7d3-f4b96fa2bcaf"/>
+ <reportElement x="456" y="170" width="39" height="27" uuid="35cba7c6-b4ae-48b9-b7d3-f4b96fa2bcaf"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -445,7 +445,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="102" width="39" height="10" uuid="1cc75f56-9bae-4ae5-b688-d7b512e7e82d"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="162" width="39" height="10" uuid="1cc75f56-9bae-4ae5-b688-d7b512e7e82d"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -459,7 +459,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)3, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="456" y="147" width="39" height="25" uuid="ecb73768-801e-430e-b95e-15379864725e"/>
+ <reportElement x="456" y="207" width="39" height="25" uuid="ecb73768-801e-430e-b95e-15379864725e"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -472,7 +472,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="137" width="39" height="10" uuid="4915f5e7-c6fe-4897-9668-c323134cbb34"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="197" width="39" height="10" uuid="4915f5e7-c6fe-4897-9668-c323134cbb34"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -486,7 +486,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)4, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="32" width="39" height="10" uuid="f48ff514-93fc-4464-91a9-b3c329d505b4"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="92" width="39" height="10" forecolor="#FF0000" uuid="f48ff514-93fc-4464-91a9-b3c329d505b4"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -499,34 +499,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="495" y="42" width="39" height="25" uuid="774f719a-6c33-4000-a5ee-c52001a2b584"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="true">
- <reportElement x="495" y="77" width="39" height="25" uuid="fe123ad0-4f1b-4ce8-a5d5-cb7eda30385f"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="67" width="39" height="10" uuid="2694e40d-419d-4951-96e2-5e93fc880111"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="127" width="39" height="10" forecolor="#FF0000" uuid="2694e40d-419d-4951-96e2-5e93fc880111"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -539,21 +513,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="495" y="112" width="39" height="25" uuid="9a0868cc-22b0-4c1f-9b1b-18f712bae830"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="102" width="39" height="10" uuid="e94b967d-0bc5-457d-a729-3d64ac804913"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="162" width="39" height="10" forecolor="#FF0000" uuid="e94b967d-0bc5-457d-a729-3d64ac804913"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -566,21 +527,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="495" y="147" width="39" height="25" uuid="d919fc18-7ec8-4139-80eb-6dcca70a2763"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="137" width="39" height="10" uuid="9b760fcd-f3b5-48ed-81ea-0b42c4ef37b3"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="197" width="39" height="10" forecolor="#FF0000" uuid="9b760fcd-f3b5-48ed-81ea-0b42c4ef37b3"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -594,7 +542,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="32" width="39" height="10" uuid="c872146b-36db-4396-b1b1-8de1d8db328f"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="92" width="39" height="10" forecolor="#FF0000" uuid="c872146b-36db-4396-b1b1-8de1d8db328f"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -607,34 +555,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="534" y="42" width="39" height="25" uuid="fdb477dd-3294-4287-95d7-e67d9b3dc258"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="true">
- <reportElement x="534" y="77" width="39" height="25" uuid="569a8419-637c-4f98-9f7a-fc881fb1cbc8"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="67" width="39" height="10" uuid="dd752a25-54c2-4441-bd4a-54c48487dc02"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="127" width="39" height="10" forecolor="#FF0000" uuid="dd752a25-54c2-4441-bd4a-54c48487dc02"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -647,21 +569,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="534" y="112" width="39" height="25" uuid="9ff6577b-084b-44a4-9de5-a0ef9122736a"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="102" width="39" height="10" uuid="1f23a898-7e05-44ba-8d57-53fc18df8885"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="162" width="39" height="10" forecolor="#FF0000" uuid="1f23a898-7e05-44ba-8d57-53fc18df8885"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -674,21 +583,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="534" y="147" width="39" height="25" uuid="b6db214e-1835-4cd2-85f6-3680ff02eb28"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="137" width="39" height="10" uuid="93724c7e-4607-436f-96a1-72ecfa520d18"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="197" width="39" height="10" forecolor="#FF0000" uuid="93724c7e-4607-436f-96a1-72ecfa520d18"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -702,7 +598,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)4, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="32" width="39" height="10" isRemoveLineWhenBlank="true" uuid="0dd76a73-e991-43ad-a814-9ad7561d042f"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="92" width="39" height="10" isRemoveLineWhenBlank="true" uuid="0dd76a73-e991-43ad-a814-9ad7561d042f"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -716,7 +612,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="300" y="42" width="39" height="25" uuid="2f9978bf-a19f-4aaa-a10a-4a9e43b0a764">
+ <reportElement x="300" y="100" width="39" height="27" uuid="2f9978bf-a19f-4aaa-a10a-4a9e43b0a764">
<printWhenExpression><![CDATA[false]]></printWhenExpression>
</reportElement>
<box>
@@ -731,7 +627,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="32" width="39" height="10" isRemoveLineWhenBlank="true" uuid="93dbbb94-3db7-4067-9472-4913748f5b5e"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="92" width="39" height="10" isRemoveLineWhenBlank="true" uuid="93dbbb94-3db7-4067-9472-4913748f5b5e"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -745,7 +641,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="339" y="42" width="39" height="25" uuid="1d83d649-98ad-49ef-a1bd-fba93376bf11">
+ <reportElement x="339" y="100" width="39" height="27" uuid="1d83d649-98ad-49ef-a1bd-fba93376bf11">
<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.TUESDAY ))>0]]></printWhenExpression>
</reportElement>
<box>
@@ -760,7 +656,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="67" width="39" height="10" uuid="bcb0b0e8-5c26-4725-9c3c-fe37c8efc8e9"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="127" width="39" height="10" uuid="bcb0b0e8-5c26-4725-9c3c-fe37c8efc8e9"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -774,7 +670,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)2, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="300" y="77" width="39" height="25" uuid="4f02a624-e8af-455f-a696-3cbcb6a0eea9"/>
+ <reportElement x="300" y="135" width="39" height="27" uuid="4f02a624-e8af-455f-a696-3cbcb6a0eea9"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -787,7 +683,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="67" width="39" height="10" uuid="9e128c30-5db5-491a-bb6b-922ccd6387d5"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="127" width="39" height="10" uuid="9e128c30-5db5-491a-bb6b-922ccd6387d5"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -801,7 +697,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)2, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="339" y="77" width="39" height="25" uuid="08346bbf-1b0b-4ac6-8486-8f28eea3c076"/>
+ <reportElement x="339" y="135" width="39" height="27" uuid="08346bbf-1b0b-4ac6-8486-8f28eea3c076"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -814,7 +710,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="102" width="39" height="10" uuid="6160ba18-b0cd-4d3b-85d4-a225ce94286b"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="162" width="39" height="10" uuid="6160ba18-b0cd-4d3b-85d4-a225ce94286b"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -828,7 +724,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)3, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="300" y="112" width="39" height="25" uuid="f59d82ea-85be-4241-acc7-b0a570cefa70"/>
+ <reportElement x="300" y="170" width="39" height="27" uuid="f59d82ea-85be-4241-acc7-b0a570cefa70"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -841,7 +737,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="102" width="39" height="10" uuid="a1bc5fbf-b32b-4a98-b7b7-fc28efb03f70"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="162" width="39" height="10" uuid="a1bc5fbf-b32b-4a98-b7b7-fc28efb03f70"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -855,7 +751,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)3, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="339" y="112" width="39" height="25" uuid="4b1c84fb-6ea4-4cc4-bf60-1c1ed11effa0"/>
+ <reportElement x="339" y="170" width="39" height="27" uuid="4b1c84fb-6ea4-4cc4-bf60-1c1ed11effa0"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -868,7 +764,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="137" width="39" height="10" uuid="318d58de-5c15-4b75-a9ce-43bb39881b6b"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="197" width="39" height="10" uuid="318d58de-5c15-4b75-a9ce-43bb39881b6b"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -882,7 +778,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)4, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="300" y="147" width="39" height="25" uuid="f0533fda-ef5a-4cd7-a2c3-4fb71ae89e94"/>
+ <reportElement x="300" y="207" width="39" height="25" uuid="f0533fda-ef5a-4cd7-a2c3-4fb71ae89e94"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -895,7 +791,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="137" width="39" height="10" uuid="fa7a3d28-4db5-4c7a-acb9-5880ba6b3cbe"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="197" width="39" height="10" uuid="fa7a3d28-4db5-4c7a-acb9-5880ba6b3cbe"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -909,7 +805,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)4, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="339" y="147" width="39" height="25" uuid="e19eaaa0-20ec-43f8-a54d-16d925e58555"/>
+ <reportElement x="339" y="207" width="39" height="25" uuid="e19eaaa0-20ec-43f8-a54d-16d925e58555"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -922,7 +818,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="25fe0525-3d42-477d-a96a-e55f3cae33e5"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="232" width="39" height="10" isRemoveLineWhenBlank="true" uuid="25fe0525-3d42-477d-a96a-e55f3cae33e5"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -936,7 +832,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="300" y="182" width="39" height="25" uuid="5bf0cdba-3068-41e4-b24a-4e2f57296fce"/>
+ <reportElement x="300" y="242" width="39" height="25" uuid="5bf0cdba-3068-41e4-b24a-4e2f57296fce"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -949,7 +845,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="dca71615-1ec8-4f63-b84e-5b40908a2339"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="232" width="39" height="10" isRemoveLineWhenBlank="true" uuid="dca71615-1ec8-4f63-b84e-5b40908a2339"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -963,7 +859,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="339" y="182" width="39" height="25" uuid="39e697ca-2430-4729-ab6f-5f86c82895ca"/>
+ <reportElement x="339" y="242" width="39" height="25" uuid="39e697ca-2430-4729-ab6f-5f86c82895ca"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -976,7 +872,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="378" y="182" width="39" height="25" uuid="5c2944a5-0096-4dee-ba7f-c29cad090f91"/>
+ <reportElement x="378" y="242" width="39" height="25" uuid="5c2944a5-0096-4dee-ba7f-c29cad090f91"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -989,7 +885,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="2cd41f3c-588b-4021-b8f9-f516c70ed5c2"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="232" width="39" height="10" isRemoveLineWhenBlank="true" uuid="2cd41f3c-588b-4021-b8f9-f516c70ed5c2"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1003,7 +899,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="417" y="182" width="39" height="25" uuid="4ed7526d-8a35-434f-9faa-dc8cd5e9662e">
+ <reportElement x="417" y="242" width="39" height="25" uuid="4ed7526d-8a35-434f-9faa-dc8cd5e9662e">
<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.THURSDAY ))>0]]></printWhenExpression>
</reportElement>
<box>
@@ -1018,7 +914,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="8dcb02a1-0375-456b-9d3b-e3a1917845fd"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="232" width="39" height="10" isRemoveLineWhenBlank="true" uuid="8dcb02a1-0375-456b-9d3b-e3a1917845fd"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1032,7 +928,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="456" y="182" width="39" height="25" uuid="dd8b642b-0a8b-4990-928f-e50a06118914">
+ <reportElement x="456" y="242" width="39" height="25" uuid="dd8b642b-0a8b-4990-928f-e50a06118914">
<printWhenExpression><![CDATA[LEN( $P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.SATURDAY ))>0]]></printWhenExpression>
</reportElement>
<box>
@@ -1047,7 +943,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="5ba37589-570d-4c93-a203-68b500814d5d"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="232" width="39" height="10" isRemoveLineWhenBlank="true" uuid="5ba37589-570d-4c93-a203-68b500814d5d"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1060,23 +956,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="495" y="182" width="39" height="25" uuid="bd77c18c-c4f8-44f4-a35e-6242db33d93f">
- <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.SATURDAY ) )>0]]></printWhenExpression>
- </reportElement>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="0d990089-b5ad-46a1-a91d-61973f1ff192"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="232" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="0d990089-b5ad-46a1-a91d-61973f1ff192"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1089,23 +970,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="534" y="182" width="39" height="25" uuid="c407c8f5-e703-4621-9cee-2221de47ad2a">
- <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.SUNDAY ) )>0]]></printWhenExpression>
- </reportElement>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="0381b4f2-d649-4ddb-b3a4-40d24c9f7feb"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="232" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="0381b4f2-d649-4ddb-b3a4-40d24c9f7feb"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1119,7 +985,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<frame>
- <reportElement x="0" y="0" width="273" height="242" uuid="5977e69f-9946-4d10-92e6-09f6c2dee300"/>
+ <reportElement x="4" y="60" width="273" height="242" uuid="5977e69f-9946-4d10-92e6-09f6c2dee300"/>
<textField pattern="MMMM">
<reportElement isPrintRepeatedValues="false" x="0" y="0" width="273" height="22" uuid="21293131-3839-43aa-b449-b19867eee2da"/>
<box>
@@ -1257,7 +1123,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="78" y="42" width="39" height="25" uuid="94478d6f-7946-4993-928e-c7019de62b19"/>
+ <reportElement x="78" y="41" width="39" height="26" forecolor="#0000FF" uuid="94478d6f-7946-4993-928e-c7019de62b19"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1267,10 +1133,10 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="78" y="77" width="39" height="25" uuid="d7442624-a38a-4b80-9f0c-c2d0edcb9afa"/>
+ <reportElement x="78" y="75" width="39" height="27" uuid="d7442624-a38a-4b80-9f0c-c2d0edcb9afa"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1297,7 +1163,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)2, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="78" y="112" width="39" height="25" uuid="2a646b63-0e6d-4dbe-a095-e0fbb48c3980"/>
+ <reportElement x="78" y="110" width="39" height="27" uuid="2a646b63-0e6d-4dbe-a095-e0fbb48c3980"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1324,7 +1190,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)3, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="78" y="147" width="39" height="25" uuid="da8474e8-63b5-47f0-ba6c-054634f975d9"/>
+ <reportElement x="78" y="145" width="39" height="27" uuid="da8474e8-63b5-47f0-ba6c-054634f975d9"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1365,7 +1231,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="117" y="42" width="39" height="25" uuid="6674d997-a5b8-4314-870b-fbaee1fe3f8c"/>
+ <reportElement x="117" y="41" width="39" height="26" forecolor="#0000FF" uuid="6674d997-a5b8-4314-870b-fbaee1fe3f8c"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1375,10 +1241,10 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="117" y="77" width="39" height="25" uuid="bc22775c-431d-42cc-a715-21cbec6797ff"/>
+ <reportElement x="117" y="75" width="39" height="27" uuid="bc22775c-431d-42cc-a715-21cbec6797ff"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1405,7 +1271,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)2, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="117" y="112" width="39" height="25" uuid="b01a91cd-fe5b-48ee-8347-3d97ddb4d8d2"/>
+ <reportElement x="117" y="110" width="39" height="27" uuid="b01a91cd-fe5b-48ee-8347-3d97ddb4d8d2"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1432,7 +1298,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)3, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="117" y="147" width="39" height="25" uuid="60302fe9-35d9-4942-8216-6a9159ddce3d"/>
+ <reportElement x="117" y="145" width="39" height="27" uuid="60302fe9-35d9-4942-8216-6a9159ddce3d"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1473,7 +1339,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="156" y="42" width="39" height="25" uuid="ee2ca9ff-3ab5-4393-a2fe-0451125ebe2a"/>
+ <reportElement x="156" y="41" width="39" height="26" forecolor="#0000FF" uuid="ee2ca9ff-3ab5-4393-a2fe-0451125ebe2a"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1483,10 +1349,10 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="156" y="77" width="39" height="25" uuid="ec800d57-ce1f-4ef5-8c21-b5bda550d244"/>
+ <reportElement x="156" y="75" width="39" height="27" uuid="ec800d57-ce1f-4ef5-8c21-b5bda550d244"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1513,7 +1379,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)2, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="156" y="112" width="39" height="25" uuid="f6544cd6-dac6-48a5-a514-cc3fcd213cd1"/>
+ <reportElement x="156" y="110" width="39" height="27" uuid="f6544cd6-dac6-48a5-a514-cc3fcd213cd1"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1540,7 +1406,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)3, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="156" y="147" width="39" height="25" uuid="8432de8c-b8c5-4afd-9bee-204d3bbb30e0"/>
+ <reportElement x="156" y="145" width="39" height="27" uuid="8432de8c-b8c5-4afd-9bee-204d3bbb30e0"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1567,7 +1433,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)4, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" uuid="0cf53bce-cc45-403d-833c-e20c481afee3"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" forecolor="#FF0000" uuid="0cf53bce-cc45-403d-833c-e20c481afee3"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1580,34 +1446,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="42" width="39" height="25" uuid="12054388-33dc-4d3a-a418-06b29af4c76b"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="77" width="39" height="25" uuid="0cadcefa-339b-4272-a5c7-a6fdf424c9fb"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" uuid="04c30d84-9400-4d35-9ace-fa7e2a58e5c1"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" forecolor="#FF0000" uuid="04c30d84-9400-4d35-9ace-fa7e2a58e5c1"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1620,21 +1460,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="112" width="39" height="25" uuid="bfcc6688-d813-48ab-b4b6-7c2e6003ece2"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" uuid="0c2c719f-6bfc-4144-b828-ef6a2bad8f7f"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" forecolor="#FF0000" uuid="0c2c719f-6bfc-4144-b828-ef6a2bad8f7f"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1647,21 +1474,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="147" width="39" height="25" uuid="4c18439e-4924-4d8f-b39c-f01db72bdbe0"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" uuid="802bd569-323f-49ca-a96c-c2d4c1c17180"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" forecolor="#FF0000" uuid="802bd569-323f-49ca-a96c-c2d4c1c17180"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1675,7 +1489,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" uuid="5589f962-7266-45bb-b276-614e3c8f3719"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" forecolor="#FF0000" uuid="5589f962-7266-45bb-b276-614e3c8f3719"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1688,34 +1502,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="42" width="39" height="25" uuid="7c62a5b4-3b12-4abc-adab-4ee1a820458a"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="77" width="39" height="25" uuid="b0f95e9d-d3e2-40b9-9182-01764cfaae28"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" uuid="c616e701-f0a3-4d5c-9b61-9672e10b9bc3"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" forecolor="#FF0000" uuid="c616e701-f0a3-4d5c-9b61-9672e10b9bc3"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1728,21 +1516,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="112" width="39" height="25" uuid="bf37b88a-3e0d-4a1f-b2bb-f8b3b80223af"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" uuid="c27d4b40-e590-4077-8b2d-00f6ee740f22"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" forecolor="#FF0000" uuid="c27d4b40-e590-4077-8b2d-00f6ee740f22"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1755,21 +1530,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="147" width="39" height="25" uuid="a3d83aad-1ffe-4bae-b3b6-a7489214b4de"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" uuid="d10dc7ed-6730-4bd8-bcad-78dbb602cb4c"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" forecolor="#FF0000" uuid="d10dc7ed-6730-4bd8-bcad-78dbb602cb4c"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1797,7 +1559,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="42" width="39" height="25" uuid="660304e6-2981-448f-8990-0cf8f2efbc23"/>
+ <reportElement x="0" y="41" width="39" height="26" forecolor="#0000FF" uuid="660304e6-2981-448f-8990-0cf8f2efbc23"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.5" lineStyle="Solid" lineColor="#000000"/>
@@ -1807,7 +1569,7 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField>
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="32" width="39" height="10" uuid="202fe000-98be-4c0f-b59c-7bc91a656a5b"/>
@@ -1824,7 +1586,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="42" width="39" height="25" uuid="208dff4b-9244-4c50-9ae1-e6b1a36fc06a"/>
+ <reportElement x="39" y="41" width="39" height="26" forecolor="#0000FF" uuid="208dff4b-9244-4c50-9ae1-e6b1a36fc06a"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1834,7 +1596,7 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField>
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="67" width="39" height="10" uuid="389d3764-a279-4825-bb7d-e36f1be6b580"/>
@@ -1851,7 +1613,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)2, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="77" width="39" height="25" uuid="ecf323b4-70bd-4cdf-96e5-f16c400d7710"/>
+ <reportElement x="0" y="75" width="39" height="27" uuid="ecf323b4-70bd-4cdf-96e5-f16c400d7710"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.5" lineStyle="Solid" lineColor="#000000"/>
@@ -1878,7 +1640,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)2, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="77" width="39" height="25" uuid="16724e14-9391-4fe0-99b8-4284ec4d39d1"/>
+ <reportElement x="39" y="75" width="39" height="27" uuid="16724e14-9391-4fe0-99b8-4284ec4d39d1"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1905,7 +1667,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)3, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="112" width="39" height="25" uuid="e0716ccb-7794-4789-b123-1506eff12934">
+ <reportElement x="0" y="110" width="39" height="27" uuid="e0716ccb-7794-4789-b123-1506eff12934">
<printWhenExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)3, java.time.DayOfWeek.MONDAY ) != null]]></printWhenExpression>
</reportElement>
<box>
@@ -1934,7 +1696,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)3, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="112" width="39" height="25" uuid="b04ddc2d-ec21-420d-90dd-6c9ef706269c"/>
+ <reportElement x="39" y="110" width="39" height="27" uuid="b04ddc2d-ec21-420d-90dd-6c9ef706269c"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1961,7 +1723,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)4, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="147" width="39" height="25" uuid="6adf2dda-58cb-4a44-a22b-9254494d6d0c"/>
+ <reportElement x="0" y="145" width="39" height="27" uuid="6adf2dda-58cb-4a44-a22b-9254494d6d0c"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.5" lineStyle="Solid" lineColor="#000000"/>
@@ -1988,7 +1750,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)4, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="147" width="39" height="25" uuid="c025ca72-8bc6-48fe-baf1-18c314bf1980"/>
+ <reportElement x="39" y="145" width="39" height="27" uuid="c025ca72-8bc6-48fe-baf1-18c314bf1980"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -2001,7 +1763,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="182" width="39" height="25" uuid="ba2a0e53-7ace-403e-bcad-78728d0c2166">
+ <reportElement x="0" y="180" width="39" height="27" uuid="ba2a0e53-7ace-403e-bcad-78728d0c2166">
<printWhenExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.MONDAY )!=""]]></printWhenExpression>
</reportElement>
<box>
@@ -2016,7 +1778,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="182" width="39" height="25" uuid="519ad489-5091-441e-bc45-8c26de09e2fc">
+ <reportElement x="39" y="180" width="39" height="27" uuid="519ad489-5091-441e-bc45-8c26de09e2fc">
<printWhenExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.TUESDAY )!=""]]></printWhenExpression>
</reportElement>
<box>
@@ -2031,7 +1793,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="78" y="182" width="39" height="25" uuid="9e945caf-c28b-410d-a35f-07318fd746a3">
+ <reportElement x="78" y="180" width="39" height="27" uuid="9e945caf-c28b-410d-a35f-07318fd746a3">
<printWhenExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.WEDNESDAY )!=""]]></printWhenExpression>
</reportElement>
<box>
@@ -2060,7 +1822,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="117" y="182" width="39" height="25" uuid="8cbdab17-2819-4534-9a78-f8bea636b2ac">
+ <reportElement x="117" y="180" width="39" height="27" uuid="8cbdab17-2819-4534-9a78-f8bea636b2ac">
<printWhenExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.THURSDAY )!=""]]></printWhenExpression>
</reportElement>
<box>
@@ -2089,7 +1851,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="156" y="182" width="39" height="25" uuid="58ba0ac4-a6d1-425a-9dee-b504a8497b9f">
+ <reportElement x="156" y="180" width="39" height="27" uuid="58ba0ac4-a6d1-425a-9dee-b504a8497b9f">
<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.FRIDAY ) )>0]]></printWhenExpression>
</reportElement>
<box>
@@ -2117,23 +1879,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="182" width="39" height="25" uuid="2331e041-c51e-4cfa-9673-bdca77498949">
- <printWhenExpression><![CDATA[LEN( $P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.SATURDAY ))>0]]></printWhenExpression>
- </reportElement>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="8938d342-91c1-49da-b690-5ef7d97d7eca"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="8938d342-91c1-49da-b690-5ef7d97d7eca"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -2146,23 +1893,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="182" width="39" height="25" uuid="1a10a28e-3533-40c6-9edb-fe25e4ad183c">
- <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.SUNDAY ) )>0]]></printWhenExpression>
- </reportElement>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="f5141fdf-eac2-45b3-bf3d-6e1a9d801e6c"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="f5141fdf-eac2-45b3-bf3d-6e1a9d801e6c"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -2190,7 +1922,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)6, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="217" width="39" height="25" isRemoveLineWhenBlank="true" uuid="09435d8c-c639-4292-87d0-f7ab45d3eec3">
+ <reportElement x="0" y="215" width="39" height="27" isRemoveLineWhenBlank="true" uuid="09435d8c-c639-4292-87d0-f7ab45d3eec3">
<printWhenExpression><![CDATA[false]]></printWhenExpression>
</reportElement>
<box>
@@ -2219,7 +1951,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)6, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="217" width="39" height="25" uuid="fb0d09fa-6bbe-4245-9441-e39566f1bb94">
+ <reportElement x="39" y="215" width="39" height="27" uuid="fb0d09fa-6bbe-4245-9441-e39566f1bb94">
<printWhenExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)6, java.time.DayOfWeek.TUESDAY )!=""]]></printWhenExpression>
</reportElement>
<box>
@@ -2261,10 +1993,144 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
- </frame>
- <frame>
- <reportElement x="0" y="259" width="273" height="242" uuid="a6fe8476-6452-4277-920d-4f4e44dc52f8"/>
- <textField pattern="MMMM">
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="41" width="39" height="26" forecolor="#0000FF" uuid="12054388-33dc-4d3a-a418-06b29af4c76b"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="75" width="39" height="27" forecolor="#0000FF" uuid="0cadcefa-339b-4272-a5c7-a6fdf424c9fb"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="110" width="39" height="27" forecolor="#0000FF" uuid="bfcc6688-d813-48ab-b4b6-7c2e6003ece2"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="145" width="39" height="27" forecolor="#0000FF" uuid="4c18439e-4924-4d8f-b39c-f01db72bdbe0"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="41" width="39" height="26" forecolor="#0000FF" uuid="7c62a5b4-3b12-4abc-adab-4ee1a820458a"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="75" width="39" height="27" forecolor="#0000FF" uuid="b0f95e9d-d3e2-40b9-9182-01764cfaae28"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="110" width="39" height="27" forecolor="#0000FF" uuid="bf37b88a-3e0d-4a1f-b2bb-f8b3b80223af"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="145" width="39" height="27" forecolor="#0000FF" uuid="a3d83aad-1ffe-4bae-b3b6-a7489214b4de"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)4, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="180" width="39" height="27" forecolor="#0000FF" uuid="2331e041-c51e-4cfa-9673-bdca77498949">
+ <printWhenExpression><![CDATA[LEN( $P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.SATURDAY ))>0]]></printWhenExpression>
+ </reportElement>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="180" width="39" height="27" forecolor="#0000FF" uuid="1a10a28e-3533-40c6-9edb-fe25e4ad183c">
+ <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.SUNDAY ) )>0]]></printWhenExpression>
+ </reportElement>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JANUARY, (short)5, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ </frame>
+ <frame>
+ <reportElement x="4" y="312" width="273" height="242" uuid="a6fe8476-6452-4277-920d-4f4e44dc52f8"/>
+ <textField pattern="MMMM">
<reportElement isPrintRepeatedValues="false" x="0" y="0" width="273" height="22" uuid="c1718a80-21c9-45f4-b13e-a023a5fb43b3"/>
<box>
<topPen lineWidth="1.0"/>
@@ -2606,9 +2472,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="32" width="39" height="10" uuid="e70c2807-fbe2-4fb5-92df-f45b8de43de9"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -2646,9 +2512,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="67" width="39" height="10" uuid="d16c469f-54b3-44f1-a8f6-820bbc264277"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -2673,9 +2539,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="102" width="39" height="10" uuid="fe57d74f-852f-40bb-8409-0013962e750e"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -2700,9 +2566,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="137" width="39" height="10" uuid="ec783303-7588-4b48-899f-f0b6d044ca0f"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -2711,7 +2577,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)4, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" uuid="9edffd7f-90f1-4e00-9a81-89f7685970be"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" forecolor="#FF0000" uuid="9edffd7f-90f1-4e00-9a81-89f7685970be"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -2724,34 +2590,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="42" width="39" height="25" uuid="a4e15da0-d681-4578-91b9-67773dc4799e"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="77" width="39" height="25" uuid="e469a56d-c186-46f3-99f9-554da3c4cb38"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" uuid="4be621ec-85a5-49df-b883-f24947da5e18"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" forecolor="#FF0000" uuid="4be621ec-85a5-49df-b883-f24947da5e18"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -2764,21 +2604,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="112" width="39" height="25" uuid="c160383d-a4fb-4f2e-871f-7c66bf9deeec"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" uuid="8937624d-b456-49fe-825e-27357b12f063"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" forecolor="#FF0000" uuid="8937624d-b456-49fe-825e-27357b12f063"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -2791,21 +2618,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="147" width="39" height="25" uuid="5c58f670-dab0-4d7e-ab31-ecc34b9ae695"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" uuid="cc4a7211-6e37-4c7f-ba26-8873c2862ec9"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" forecolor="#FF0000" uuid="cc4a7211-6e37-4c7f-ba26-8873c2862ec9"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -2819,10 +2633,10 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" uuid="fed1e1ab-ef5e-4f93-8324-c2a4e455a096"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" forecolor="#FF0000" uuid="fed1e1ab-ef5e-4f93-8324-c2a4e455a096"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
@@ -2832,37 +2646,11 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="42" width="39" height="25" uuid="c81638c8-179f-450d-be17-618049ee0538"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="77" width="39" height="25" uuid="891acb4a-b453-4dbc-b6e9-40037f099427"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" uuid="1e7c2830-a2ba-4859-b2ad-9a157878fc1a"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" forecolor="#FF0000" uuid="1e7c2830-a2ba-4859-b2ad-9a157878fc1a"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
@@ -2872,24 +2660,11 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="112" width="39" height="25" uuid="8c4229f5-1837-48cf-ad0c-ac1b68a095ef"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" uuid="c3cc7091-ed07-484f-9097-1995d0e32f4d"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" forecolor="#FF0000" uuid="c3cc7091-ed07-484f-9097-1995d0e32f4d"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
@@ -2899,24 +2674,11 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="147" width="39" height="25" uuid="a9888966-3ccb-4ef9-8fb7-76e7a3fef8c7"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" uuid="b9247ed6-90ca-467e-87dd-41f776d73595"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" forecolor="#FF0000" uuid="b9247ed6-90ca-467e-87dd-41f776d73595"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
@@ -3217,7 +2979,7 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="26bb7502-434b-4a78-b86a-a8d0c9c9a1fd"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
@@ -3275,9 +3037,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="c04c2f43-d4ec-441c-a517-129c5dfb75f7"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -3285,55 +3047,25 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="182" width="39" height="25" uuid="3f562f89-f13a-4dad-a1ae-fc6e058f0d1e">
- <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.SATURDAY ))>0]]></printWhenExpression>
- </reportElement>
+ <textField>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="2cf0aeee-2617-4539-bcf0-45b5ade9a305"/>
<box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
- <textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="2cf0aeee-2617-4539-bcf0-45b5ade9a305"/>
- <box>
- <topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement textAlignment="Right" verticalAlignment="Middle">
- <font size="6" isBold="true"/>
- <paragraph rightIndent="1"/>
+ <textElement textAlignment="Right" verticalAlignment="Middle">
+ <font size="6" isBold="true"/>
+ <paragraph rightIndent="1"/>
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="182" width="39" height="25" uuid="831102f5-7f7f-436f-9fab-db9c16d55770">
- <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.SUNDAY ))>0]]></printWhenExpression>
- </reportElement>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="50bdb247-de3d-4f18-a874-4f1e98f9aae0"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="50bdb247-de3d-4f18-a874-4f1e98f9aae0"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
@@ -3401,9 +3133,143 @@
</textElement>
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="42" width="39" height="25" forecolor="#0000FF" uuid="a4e15da0-d681-4578-91b9-67773dc4799e"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MARCH, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="77" width="39" height="25" forecolor="#0000FF" uuid="e469a56d-c186-46f3-99f9-554da3c4cb38"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MARCH, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="112" width="39" height="25" forecolor="#0000FF" uuid="c160383d-a4fb-4f2e-871f-7c66bf9deeec"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MARCH, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="147" width="39" height="25" forecolor="#0000FF" uuid="5c58f670-dab0-4d7e-ab31-ecc34b9ae695"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MARCH, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="42" width="39" height="25" forecolor="#0000FF" uuid="c81638c8-179f-450d-be17-618049ee0538"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MARCH, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="77" width="39" height="25" forecolor="#0000FF" uuid="891acb4a-b453-4dbc-b6e9-40037f099427"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MARCH, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="112" width="39" height="25" forecolor="#0000FF" uuid="8c4229f5-1837-48cf-ad0c-ac1b68a095ef"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MARCH, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="147" width="39" height="25" forecolor="#0000FF" uuid="a9888966-3ccb-4ef9-8fb7-76e7a3fef8c7"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MARCH, (short)4, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="182" width="39" height="25" forecolor="#0000FF" uuid="3f562f89-f13a-4dad-a1ae-fc6e058f0d1e">
+ <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.SATURDAY ))>0]]></printWhenExpression>
+ </reportElement>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="182" width="39" height="25" forecolor="#0000FF" uuid="831102f5-7f7f-436f-9fab-db9c16d55770">
+ <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.SUNDAY ))>0]]></printWhenExpression>
+ </reportElement>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
</frame>
<frame>
- <reportElement x="0" y="534" width="273" height="252" uuid="d73bb6a5-7938-4dc6-92ff-11e44ded03b0"/>
+ <reportElement x="4" y="565" width="273" height="252" uuid="d73bb6a5-7938-4dc6-92ff-11e44ded03b0"/>
<textField pattern="MMMM">
<reportElement isPrintRepeatedValues="false" x="0" y="0" width="273" height="22" uuid="a19180cb-e5c0-4af5-aa86-6e3a480efe0f"/>
<box>
@@ -3851,7 +3717,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)4, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" uuid="3d04096c-09d1-4f5b-ad08-912b842aa25c"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" forecolor="#FF0000" uuid="3d04096c-09d1-4f5b-ad08-912b842aa25c"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3864,34 +3730,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="42" width="39" height="25" uuid="fe1e4494-6831-4f09-a894-47738ecfcecf"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="77" width="39" height="25" uuid="23477d1a-1adf-4394-aa64-88434928aed5"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" uuid="709bd046-1a97-42b2-8ca1-f74441cc467d"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" forecolor="#FF0000" uuid="709bd046-1a97-42b2-8ca1-f74441cc467d"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3904,21 +3744,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="112" width="39" height="25" uuid="26d729ed-a3fd-4f55-b17b-e2bde3667377"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" uuid="389ce9f2-6dda-4183-b077-7ba5d43ae835"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" forecolor="#FF0000" uuid="389ce9f2-6dda-4183-b077-7ba5d43ae835"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3931,21 +3758,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="147" width="39" height="25" uuid="7a8b7119-43ea-4bee-9112-b1bc336b9986"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" uuid="6c0c1b9d-e27f-4ba3-aacf-a3bbef6560a8"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" forecolor="#FF0000" uuid="6c0c1b9d-e27f-4ba3-aacf-a3bbef6560a8"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3959,7 +3773,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" uuid="5fc6d7cb-eff8-40e8-911d-9d705741afab"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" forecolor="#FF0000" uuid="5fc6d7cb-eff8-40e8-911d-9d705741afab"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3972,34 +3786,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="42" width="39" height="25" uuid="ad506615-3485-447a-a9ee-92d4acfeca89"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="77" width="39" height="25" uuid="f4bf4175-7363-496f-a512-1e411e2668ca"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" uuid="b276d017-6f1e-4967-a071-e11369783433"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" forecolor="#FF0000" uuid="b276d017-6f1e-4967-a071-e11369783433"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -4012,21 +3800,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="112" width="39" height="25" uuid="9fbf28fe-baae-40ab-b95b-f6e07fd7395b"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" uuid="e9b45e8a-6469-477f-a796-160574756638"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" forecolor="#FF0000" uuid="e9b45e8a-6469-477f-a796-160574756638"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -4039,21 +3814,8 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="147" width="39" height="25" uuid="3575c444-d516-4dd4-8d1b-2a70b45809bc"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" uuid="5294096f-5f2d-4b38-9cc1-d110faf0aeaf"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" forecolor="#FF0000" uuid="5294096f-5f2d-4b38-9cc1-d110faf0aeaf"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -4419,23 +4181,22 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="182" width="39" height="25" uuid="390f10c2-3897-4b74-8688-ec6b48a4aef7">
- <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.SATURDAY ))>0]]></printWhenExpression>
- </reportElement>
+ <textField>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="7aa1ec37-97d7-481e-9362-ed35f2086176"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement>
- <font size="4"/>
+ <textElement textAlignment="Right" verticalAlignment="Middle">
+ <font size="6" isBold="true"/>
+ <paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="7aa1ec37-97d7-481e-9362-ed35f2086176"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="2a15cd43-fcd2-4c5e-9700-b410499fe616"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -4446,36 +4207,7 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="182" width="39" height="25" uuid="6df7a065-a2d0-4b14-a57d-8da32f658282">
- <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.SUNDAY ))>0]]></printWhenExpression>
- </reportElement>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
- </textField>
- <textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="2a15cd43-fcd2-4c5e-9700-b410499fe616"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement textAlignment="Right" verticalAlignment="Middle">
- <font size="6" isBold="true"/>
- <paragraph rightIndent="1"/>
- </textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField>
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="207" width="39" height="10" isRemoveLineWhenBlank="true" uuid="5e655f76-7653-41ef-b199-81068fa33120"/>
@@ -4535,9 +4267,143 @@
</textElement>
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="42" width="39" height="25" forecolor="#0000FF" uuid="fe1e4494-6831-4f09-a894-47738ecfcecf"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MAY, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="77" width="39" height="25" forecolor="#0000FF" uuid="23477d1a-1adf-4394-aa64-88434928aed5"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MAY, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="112" width="39" height="25" forecolor="#0000FF" uuid="26d729ed-a3fd-4f55-b17b-e2bde3667377"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MAY, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="147" width="39" height="25" forecolor="#0000FF" uuid="7a8b7119-43ea-4bee-9112-b1bc336b9986"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MAY, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="42" width="39" height="25" forecolor="#0000FF" uuid="ad506615-3485-447a-a9ee-92d4acfeca89"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MAY, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="77" width="39" height="25" forecolor="#0000FF" uuid="f4bf4175-7363-496f-a512-1e411e2668ca"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MAY, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="112" width="39" height="25" forecolor="#0000FF" uuid="9fbf28fe-baae-40ab-b95b-f6e07fd7395b"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MAY, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="147" width="39" height="25" forecolor="#0000FF" uuid="3575c444-d516-4dd4-8d1b-2a70b45809bc"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MAY, (short)4, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="182" width="39" height="25" forecolor="#0000FF" uuid="390f10c2-3897-4b74-8688-ec6b48a4aef7">
+ <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.SATURDAY ))>0]]></printWhenExpression>
+ </reportElement>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MAY, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="182" width="39" height="25" forecolor="#0000FF" uuid="6df7a065-a2d0-4b14-a57d-8da32f658282">
+ <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.SUNDAY ))>0]]></printWhenExpression>
+ </reportElement>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.MAY, (short)5, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
</frame>
<frame>
- <reportElement x="300" y="259" width="273" height="242" uuid="f7f28567-14da-47e0-a481-2b9951e70244"/>
+ <reportElement x="300" y="312" width="273" height="242" uuid="f7f28567-14da-47e0-a481-2b9951e70244"/>
<textField pattern="MMMM">
<reportElement isPrintRepeatedValues="false" x="0" y="0" width="273" height="22" uuid="d33c395c-4d11-4efe-9a24-447b44d3827c"/>
<box>
@@ -4747,7 +4613,7 @@
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
@@ -4773,9 +4639,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="32" width="39" height="10" uuid="631d5cc7-6be3-4532-808e-937504888c7d"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -4813,9 +4679,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="67" width="39" height="10" uuid="2393a880-87af-4629-ac30-88aaafc9927b"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -4840,9 +4706,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="102" width="39" height="10" uuid="2510b78d-4037-4ce0-9960-0ee741384759"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -4855,7 +4721,7 @@
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
@@ -4867,9 +4733,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="137" width="39" height="10" uuid="85b238ad-97d3-45c6-9a63-acbc62e54d07"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -4963,7 +4829,7 @@
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
@@ -4986,12 +4852,12 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)4, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" uuid="6d3b93c5-6ec6-413e-a598-512011a1c278"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" forecolor="#FF0000" uuid="6d3b93c5-6ec6-413e-a598-512011a1c278"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -5000,7 +4866,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="195" y="42" width="39" height="25" uuid="7b7b5a0c-4e68-4227-9154-1d7b888af0f3"/>
+ <reportElement x="195" y="42" width="39" height="25" forecolor="#0000FF" uuid="7b7b5a0c-4e68-4227-9154-1d7b888af0f3"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5010,10 +4876,10 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.APRIL, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="195" y="77" width="39" height="25" uuid="075a30c0-1222-42c1-ad90-174a121b45c0"/>
+ <reportElement x="195" y="77" width="39" height="25" forecolor="#0000FF" uuid="075a30c0-1222-42c1-ad90-174a121b45c0"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5023,15 +4889,15 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.APRIL, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" uuid="0fcfc1f0-2951-4fd6-8fdb-e55567d4de69"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" forecolor="#FF0000" uuid="0fcfc1f0-2951-4fd6-8fdb-e55567d4de69"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -5040,7 +4906,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="195" y="112" width="39" height="25" uuid="a3fc07d6-1cac-4350-8992-621dd42bfbd4"/>
+ <reportElement x="195" y="112" width="39" height="25" forecolor="#0000FF" uuid="a3fc07d6-1cac-4350-8992-621dd42bfbd4"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5050,15 +4916,15 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.APRIL, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" uuid="9fc53213-b46f-4b17-8807-f77d131dde52"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" forecolor="#FF0000" uuid="9fc53213-b46f-4b17-8807-f77d131dde52"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -5067,25 +4933,25 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="195" y="147" width="39" height="25" uuid="674e1ba4-ef9a-40a3-a224-c6a5de25c561"/>
+ <reportElement x="195" y="147" width="39" height="25" forecolor="#0000FF" uuid="674e1ba4-ef9a-40a3-a224-c6a5de25c561"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.APRIL, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" uuid="c89ce102-672e-4830-9596-d3acbacc1217"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" forecolor="#FF0000" uuid="c89ce102-672e-4830-9596-d3acbacc1217"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -5094,7 +4960,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" uuid="2a7682bb-a8a5-4fe5-9dfd-6c43abc0bc78"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" forecolor="#FF0000" uuid="2a7682bb-a8a5-4fe5-9dfd-6c43abc0bc78"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5108,7 +4974,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="234" y="42" width="39" height="25" uuid="b48f8caf-4bda-4843-b472-326e8751073a"/>
+ <reportElement x="234" y="42" width="39" height="25" forecolor="#0000FF" uuid="b48f8caf-4bda-4843-b472-326e8751073a"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5118,10 +4984,10 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.APRIL, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="234" y="77" width="39" height="25" uuid="70c55e92-78db-4d7c-af9b-0550797615d8"/>
+ <reportElement x="234" y="77" width="39" height="25" forecolor="#0000FF" uuid="70c55e92-78db-4d7c-af9b-0550797615d8"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5131,10 +4997,10 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.APRIL, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" uuid="247a6168-dbf2-43b0-97e0-2fe2644abdbc"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" forecolor="#FF0000" uuid="247a6168-dbf2-43b0-97e0-2fe2644abdbc"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5148,7 +5014,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="234" y="112" width="39" height="25" uuid="8d8a1169-9466-40ee-b0ab-582e115ac92c"/>
+ <reportElement x="234" y="112" width="39" height="25" forecolor="#0000FF" uuid="8d8a1169-9466-40ee-b0ab-582e115ac92c"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5158,10 +5024,10 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.APRIL, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" uuid="999349cc-7e5b-4268-9e31-89431501a6ae"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" forecolor="#FF0000" uuid="999349cc-7e5b-4268-9e31-89431501a6ae"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5175,20 +5041,20 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="234" y="147" width="39" height="25" uuid="80c29594-a0e9-4e9c-9fd4-d7927cc1319a"/>
+ <reportElement x="234" y="147" width="39" height="25" forecolor="#0000FF" uuid="80c29594-a0e9-4e9c-9fd4-d7927cc1319a"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.APRIL, (short)4, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" uuid="77ca8fe4-4f24-4657-9a1e-341017ed86c6"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" forecolor="#FF0000" uuid="77ca8fe4-4f24-4657-9a1e-341017ed86c6"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5232,9 +5098,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="32" width="39" height="10" uuid="e90a786d-fe5e-48b4-b973-e8202c0f60c9"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -5286,9 +5152,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="67" width="39" height="10" uuid="d326e849-76a0-4e6c-a0a4-6bad440c0b5d"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -5340,9 +5206,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="102" width="39" height="10" uuid="bc97d36f-28f4-48d5-94d9-665e9cb0725f"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -5382,7 +5248,7 @@
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
@@ -5394,9 +5260,9 @@
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="137" width="39" height="10" uuid="c29c1bfc-555e-4e38-8ef1-34b4b95e16c8"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement textAlignment="Right" verticalAlignment="Middle">
<font size="6" isBold="true"/>
@@ -5408,9 +5274,9 @@
<reportElement x="39" y="147" width="39" height="25" uuid="a5660831-a471-4e0e-983e-39789cf06909"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="4"/>
@@ -5436,7 +5302,7 @@
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
@@ -5464,9 +5330,9 @@
</reportElement>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
<textElement>
<font size="4"/>
@@ -5489,7 +5355,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="172" width="39" height="10" uuid="63fad05d-cdba-46bc-b427-1dafaa2b85b6"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="63fad05d-cdba-46bc-b427-1dafaa2b85b6"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5518,7 +5384,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="172" width="39" height="10" uuid="b4cd2075-d1a3-4e13-a57c-8e6e90ee69f8"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="b4cd2075-d1a3-4e13-a57c-8e6e90ee69f8"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5547,7 +5413,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="172" width="39" height="10" uuid="236fd435-9500-4d31-893d-3efbdd881836"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="236fd435-9500-4d31-893d-3efbdd881836"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5561,7 +5427,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="195" y="182" width="39" height="25" uuid="7306f116-a975-4c34-bfbe-c4da65cd2064">
+ <reportElement x="195" y="182" width="39" height="25" forecolor="#0000FF" uuid="7306f116-a975-4c34-bfbe-c4da65cd2064">
<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.SATURDAY ))>0]]></printWhenExpression>
</reportElement>
<box>
@@ -5573,10 +5439,10 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" uuid="21edaebb-f55d-41d1-81aa-ba690d4e1046"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="21edaebb-f55d-41d1-81aa-ba690d4e1046"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5590,7 +5456,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="234" y="182" width="39" height="25" uuid="deba1dce-fbe3-40db-8611-bda4a33b13e0">
+ <reportElement x="234" y="182" width="39" height="25" forecolor="#0000FF" uuid="deba1dce-fbe3-40db-8611-bda4a33b13e0">
<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.SUNDAY ))>0]]></printWhenExpression>
</reportElement>
<box>
@@ -5602,10 +5468,10 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" uuid="f8947777-513e-47da-8a12-d9b4b9a7728a"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="f8947777-513e-47da-8a12-d9b4b9a7728a"/>
<box>
<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5678,7 +5544,7 @@
</textField>
</frame>
<frame>
- <reportElement x="300" y="534" width="273" height="252" uuid="15c1353a-2ba6-44cd-af04-34c2922c6791"/>
+ <reportElement x="300" y="565" width="273" height="252" uuid="15c1353a-2ba6-44cd-af04-34c2922c6791"/>
<textField pattern="MMMM">
<reportElement isPrintRepeatedValues="false" x="0" y="0" width="273" height="22" uuid="a73a50b8-4f42-4b4e-8113-7d775e90f638"/>
<box>
@@ -5866,7 +5732,7 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField>
<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="102" width="39" height="10" uuid="2984af0e-0600-48d0-a332-8f45c6474097"/>
@@ -6126,7 +5992,7 @@
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" uuid="b0629287-3731-4fd4-bc6f-faa9075d0130"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" forecolor="#FF0000" uuid="b0629287-3731-4fd4-bc6f-faa9075d0130"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6139,34 +6005,36 @@
</textElement>
<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="42" width="39" height="25" uuid="0e55d732-25c6-4463-b45d-28e8eee83727"/>
+ <textField>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" forecolor="#FF0000" uuid="bb282191-bc28-44ec-95a8-7ab64a3151ef"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement>
- <font size="4"/>
+ <textElement textAlignment="Right" verticalAlignment="Middle">
+ <font size="6" isBold="true"/>
+ <paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="77" width="39" height="25" uuid="4d77c45c-67f1-44d8-90fd-1c5698861e3c"/>
+ <textField>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" forecolor="#FF0000" uuid="9dbc4758-e6a7-4b1e-87e7-658495ab33f8"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement>
- <font size="4"/>
+ <textElement textAlignment="Right" verticalAlignment="Middle">
+ <font size="6" isBold="true"/>
+ <paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" uuid="bb282191-bc28-44ec-95a8-7ab64a3151ef"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" forecolor="#FF0000" uuid="6d2170df-f357-4458-89a2-379ecc6cd8e6"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6177,23 +6045,24 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="112" width="39" height="25" uuid="15607ab2-51ef-4c28-92a8-76c9c70d02f3"/>
+ <textField>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" forecolor="#FF0000" uuid="91322292-77cc-494b-ab84-7c748ac58436"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement>
- <font size="4"/>
+ <textElement textAlignment="Right" verticalAlignment="Middle">
+ <font size="6" isBold="true"/>
+ <paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" uuid="9dbc4758-e6a7-4b1e-87e7-658495ab33f8"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" forecolor="#FF0000" uuid="b623ac35-d16a-4ee7-8a73-f0c16076dbc8"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6204,23 +6073,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
- </textField>
- <textField isBlankWhenNull="true">
- <reportElement x="195" y="147" width="39" height="25" uuid="55caac44-80ba-4d4b-b143-ea1f89c7d9cf"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement>
- <font size="4"/>
- </textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" uuid="6d2170df-f357-4458-89a2-379ecc6cd8e6"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" forecolor="#FF0000" uuid="d531348c-a098-4305-8e25-1375c62ec62d"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6231,10 +6087,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" uuid="91322292-77cc-494b-ab84-7c748ac58436"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" forecolor="#FF0000" uuid="0145e172-bbf0-4268-b5e4-79b32ce68694"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6245,23 +6101,24 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="42" width="39" height="25" uuid="08eda686-b175-4b08-8c9d-9a78409ff8e9"/>
+ <textField>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="32" width="39" height="10" uuid="a814e427-8312-4670-ac77-740af2c99d45"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement>
- <font size="4"/>
+ <textElement textAlignment="Right" verticalAlignment="Middle">
+ <font size="6" isBold="true"/>
+ <paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)1, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="234" y="77" width="39" height="25" uuid="f32fe17c-b97b-4e53-b16f-757ddd48c110"/>
+ <reportElement x="0" y="42" width="39" height="25" uuid="5cff196f-c834-44f7-924f-6f98d06004fe"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6274,7 +6131,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" uuid="b623ac35-d16a-4ee7-8a73-f0c16076dbc8"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="32" width="39" height="10" uuid="4e26fcbf-0420-4879-8243-7eef27c74fb6"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6285,10 +6142,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)1, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="234" y="112" width="39" height="25" uuid="16874b1f-c5d8-4dd0-b2c4-86de37a5b0b7"/>
+ <reportElement x="39" y="42" width="39" height="25" uuid="15288764-61ca-4b8f-a038-a875daef3307"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6301,7 +6158,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" uuid="d531348c-a098-4305-8e25-1375c62ec62d"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="67" width="39" height="10" uuid="dc4a3858-deaf-4d5f-8815-e9acb3089766"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6312,10 +6169,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)2, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="234" y="147" width="39" height="25" uuid="24d6952b-274b-43b3-97e9-8aeb978ef392"/>
+ <reportElement x="0" y="77" width="39" height="25" uuid="cb07efc2-c80c-435e-b8d0-5f5b507904fd"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6328,21 +6185,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" uuid="0145e172-bbf0-4268-b5e4-79b32ce68694"/>
- <box>
- <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
- <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- </box>
- <textElement textAlignment="Right" verticalAlignment="Middle">
- <font size="6" isBold="true"/>
- <paragraph rightIndent="1"/>
- </textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
- </textField>
- <textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="32" width="39" height="10" uuid="a814e427-8312-4670-ac77-740af2c99d45"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="67" width="39" height="10" uuid="796e2c36-3a85-4a03-b101-1eeb6ff3dee4"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6353,10 +6196,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)1, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)2, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="42" width="39" height="25" uuid="5cff196f-c834-44f7-924f-6f98d06004fe"/>
+ <reportElement x="39" y="77" width="39" height="25" uuid="b9908d2c-75d7-4410-a06e-4da028a96ad4"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6369,7 +6212,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="32" width="39" height="10" uuid="4e26fcbf-0420-4879-8243-7eef27c74fb6"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="102" width="39" height="10" uuid="d6df9bd8-4ff2-471a-be83-88d92c99f664"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6380,10 +6223,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)1, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="42" width="39" height="25" uuid="15288764-61ca-4b8f-a038-a875daef3307"/>
+ <reportElement x="0" y="112" width="39" height="25" uuid="26eff69d-af76-4ad1-bca9-bf5023fd8bbb"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6396,7 +6239,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="67" width="39" height="10" uuid="dc4a3858-deaf-4d5f-8815-e9acb3089766"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="102" width="39" height="10" uuid="e3cc1317-9b3a-4350-b960-76c16cbe47de"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6407,10 +6250,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)2, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="77" width="39" height="25" uuid="cb07efc2-c80c-435e-b8d0-5f5b507904fd"/>
+ <reportElement x="39" y="112" width="39" height="25" uuid="162a5596-ab4e-4b60-8248-828ab9dd1caa"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6423,7 +6266,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="67" width="39" height="10" uuid="796e2c36-3a85-4a03-b101-1eeb6ff3dee4"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="137" width="39" height="10" uuid="543c1555-e8eb-4c51-a6b6-af7410c7855e"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6434,10 +6277,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)2, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="77" width="39" height="25" uuid="b9908d2c-75d7-4410-a06e-4da028a96ad4"/>
+ <reportElement x="0" y="147" width="39" height="25" uuid="0a850734-a6b0-421e-b507-66908ef4fba0"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6450,7 +6293,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="102" width="39" height="10" uuid="d6df9bd8-4ff2-471a-be83-88d92c99f664"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="137" width="39" height="10" uuid="f2b352fe-4189-4b1b-94de-ca34fc780cd6"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6461,10 +6304,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="112" width="39" height="25" uuid="26eff69d-af76-4ad1-bca9-bf5023fd8bbb"/>
+ <reportElement x="39" y="147" width="39" height="25" uuid="03873079-add7-44d8-81d0-57fd936715ef"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6477,7 +6320,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="102" width="39" height="10" uuid="e3cc1317-9b3a-4350-b960-76c16cbe47de"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="64474d1a-9a4b-4410-b380-267ab3a4e17a"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6488,10 +6331,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="112" width="39" height="25" uuid="162a5596-ab4e-4b60-8248-828ab9dd1caa"/>
+ <reportElement x="0" y="182" width="39" height="25" uuid="6a104e81-0fb2-4973-a6b9-73b3327f1645"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6504,7 +6347,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="137" width="39" height="10" uuid="543c1555-e8eb-4c51-a6b6-af7410c7855e"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="f913f39f-a85f-4363-9e2b-3d5ae7b11674"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6515,10 +6358,23 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="147" width="39" height="25" uuid="0a850734-a6b0-421e-b507-66908ef4fba0"/>
+ <reportElement x="39" y="182" width="39" height="25" uuid="c1fe334e-b106-45dd-a21a-d85a6ce69491"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="78" y="182" width="39" height="25" uuid="a695ed47-3a1a-4650-b8eb-ba441c4326ce"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6531,7 +6387,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="137" width="39" height="10" uuid="f2b352fe-4189-4b1b-94de-ca34fc780cd6"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="65ef87db-6898-47d8-9619-d63bcfe854a1"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6542,10 +6398,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="147" width="39" height="25" uuid="03873079-add7-44d8-81d0-57fd936715ef"/>
+ <reportElement x="195" y="42" width="39" height="25" forecolor="#0000FF" uuid="0e55d732-25c6-4463-b45d-28e8eee83727"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6555,24 +6411,23 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="64474d1a-9a4b-4410-b380-267ab3a4e17a"/>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="77" width="39" height="25" forecolor="#0000FF" uuid="4d77c45c-67f1-44d8-90fd-1c5698861e3c"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement textAlignment="Right" verticalAlignment="Middle">
- <font size="6" isBold="true"/>
- <paragraph rightIndent="1"/>
+ <textElement>
+ <font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="0" y="182" width="39" height="25" uuid="6a104e81-0fb2-4973-a6b9-73b3327f1645"/>
+ <reportElement x="195" y="112" width="39" height="25" forecolor="#0000FF" uuid="15607ab2-51ef-4c28-92a8-76c9c70d02f3"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6582,24 +6437,23 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
- <textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="f913f39f-a85f-4363-9e2b-3d5ae7b11674"/>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="147" width="39" height="25" forecolor="#0000FF" uuid="55caac44-80ba-4d4b-b143-ea1f89c7d9cf"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement textAlignment="Right" verticalAlignment="Middle">
- <font size="6" isBold="true"/>
- <paragraph rightIndent="1"/>
+ <textElement>
+ <font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="39" y="182" width="39" height="25" uuid="c1fe334e-b106-45dd-a21a-d85a6ce69491"/>
+ <reportElement x="234" y="42" width="39" height="25" forecolor="#0000FF" uuid="08eda686-b175-4b08-8c9d-9a78409ff8e9"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6609,10 +6463,10 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="78" y="182" width="39" height="25" uuid="a695ed47-3a1a-4650-b8eb-ba441c4326ce"/>
+ <reportElement x="234" y="77" width="39" height="25" forecolor="#0000FF" uuid="f32fe17c-b97b-4e53-b16f-757ddd48c110"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6622,24 +6476,23 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="65ef87db-6898-47d8-9619-d63bcfe854a1"/>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="112" width="39" height="25" forecolor="#0000FF" uuid="16874b1f-c5d8-4dd0-b2c4-86de37a5b0b7"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement textAlignment="Right" verticalAlignment="Middle">
- <font size="6" isBold="true"/>
- <paragraph rightIndent="1"/>
+ <textElement>
+ <font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="117" y="182" width="39" height="25" uuid="c74d0b73-46f2-4e4a-b8e8-2c51dae0bb70"/>
+ <reportElement x="234" y="147" width="39" height="25" forecolor="#0000FF" uuid="24d6952b-274b-43b3-97e9-8aeb978ef392"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6649,24 +6502,25 @@
<textElement>
<font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)4, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
</textField>
- <textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="a0b4711d-3872-40bd-b904-91570b51729e"/>
+ <textField isBlankWhenNull="true">
+ <reportElement x="195" y="182" width="39" height="25" forecolor="#0000FF" uuid="fadc40b9-b833-4fc9-8ea0-2dbfba223880">
+ <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.SATURDAY ))>0]]></printWhenExpression>
+ </reportElement>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement textAlignment="Right" verticalAlignment="Middle">
- <font size="6" isBold="true"/>
- <paragraph rightIndent="1"/>
+ <textElement>
+ <font size="4"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="156" y="182" width="39" height="25" uuid="3cdf4917-ee65-4777-beb2-158858ead02d"/>
+ <reportElement x="117" y="182" width="39" height="25" uuid="c74d0b73-46f2-4e4a-b8e8-2c51dae0bb70"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6678,8 +6532,23 @@
</textElement>
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="234" y="182" width="39" height="25" forecolor="#0000FF" uuid="af1b8139-c03a-4b8b-aa72-4e682e513131">
+ <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.SUNDAY ))>0]]></printWhenExpression>
+ </reportElement>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="b341f644-f9f8-44f6-9c67-2174e155693e"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="a0b4711d-3872-40bd-b904-91570b51729e"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6690,12 +6559,10 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
</textField>
<textField isBlankWhenNull="true">
- <reportElement x="195" y="182" width="39" height="25" uuid="fadc40b9-b833-4fc9-8ea0-2dbfba223880">
- <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.SATURDAY ))>0]]></printWhenExpression>
- </reportElement>
+ <reportElement x="156" y="182" width="39" height="25" uuid="3cdf4917-ee65-4777-beb2-158858ead02d"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6708,7 +6575,7 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="dcca42bd-ea6c-4136-960e-56159f8d7cee"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="b341f644-f9f8-44f6-9c67-2174e155693e"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6719,25 +6586,24 @@
<font size="6" isBold="true"/>
<paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
</textField>
- <textField isBlankWhenNull="true">
- <reportElement x="234" y="182" width="39" height="25" uuid="af1b8139-c03a-4b8b-aa72-4e682e513131">
- <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.SUNDAY ))>0]]></printWhenExpression>
- </reportElement>
+ <textField>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="dcca42bd-ea6c-4136-960e-56159f8d7cee"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
- <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
</box>
- <textElement>
- <font size="4"/>
+ <textElement textAlignment="Right" verticalAlignment="Middle">
+ <font size="6" isBold="true"/>
+ <paragraph rightIndent="1"/>
</textElement>
- <textFieldExpression><![CDATA[]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.JUNE, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
</textField>
<textField>
- <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="dab95a42-cab4-4a67-bd88-f9c0ef92b2ce"/>
+ <reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" forecolor="#FF0000" uuid="dab95a42-cab4-4a67-bd88-f9c0ef92b2ce"/>
<box>
<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6809,6 +6675,154 @@
<textFieldExpression><![CDATA[]]></textFieldExpression>
</textField>
</frame>
+ <textField>
+ <reportElement x="229" y="15" width="120" height="29" uuid="20f70651-76b7-4001-9c33-1e5445086ef5"/>
+ <box>
+ <pen lineWidth="1.0" lineStyle="Double"/>
+ <topPen lineWidth="1.0" lineStyle="Double" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Double" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Double" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Double" lineColor="#000000"/>
+ </box>
+ <textElement textAlignment="Center" verticalAlignment="Middle">
+ <font size="19" isBold="true"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getYear()]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="495" y="100" width="39" height="27" forecolor="#0000FF" uuid="774f719a-6c33-4000-a5ee-c52001a2b584"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="495" y="135" width="39" height="27" forecolor="#0000FF" uuid="fe123ad0-4f1b-4ce8-a5d5-cb7eda30385f"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.FEBRUARY, (short)2, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="495" y="170" width="39" height="27" forecolor="#0000FF" uuid="9a0868cc-22b0-4c1f-9b1b-18f712bae830"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.FEBRUARY, (short)3, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="495" y="205" width="39" height="27" forecolor="#0000FF" uuid="d919fc18-7ec8-4139-80eb-6dcca70a2763"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.FEBRUARY, (short)4, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="534" y="100" width="39" height="27" forecolor="#0000FF" uuid="fdb477dd-3294-4287-95d7-e67d9b3dc258"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="534" y="135" width="39" height="27" forecolor="#0000FF" uuid="569a8419-637c-4f98-9f7a-fc881fb1cbc8"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.FEBRUARY, (short)2, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="534" y="170" width="39" height="27" forecolor="#0000FF" uuid="9ff6577b-084b-44a4-9de5-a0ef9122736a"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.FEBRUARY, (short)3, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="534" y="205" width="39" height="27" forecolor="#0000FF" uuid="b6db214e-1835-4cd2-85f6-3680ff02eb28"/>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.FEBRUARY, (short)4, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="495" y="240" width="39" height="27" forecolor="#0000FF" uuid="bd77c18c-c4f8-44f4-a35e-6242db33d93f">
+ <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.SATURDAY ) )>0]]></printWhenExpression>
+ </reportElement>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
+ </textField>
+ <textField isBlankWhenNull="true">
+ <reportElement x="534" y="240" width="39" height="27" forecolor="#0000FF" uuid="c407c8f5-e703-4621-9cee-2221de47ad2a">
+ <printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.SUNDAY ) )>0]]></printWhenExpression>
+ </reportElement>
+ <box>
+ <topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+ <leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <bottomPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ <rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
+ </box>
+ <textElement>
+ <font size="4"/>
+ </textElement>
+ <textFieldExpression><![CDATA[$P{Year}.getContent( java.time.Month.FEBRUARY, (short)5, java.time.DayOfWeek.SUNDAY )]]></textFieldExpression>
+ </textField>
</band>
diff --git a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/YearTest.java b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/YearTest.java
index 795effb..8aa7118 100644
--- a/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/YearTest.java
+++ b/src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/calendar/YearTest.java
@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.time.DayOfWeek;
import java.time.Month;
+import java.util.Collections;
import org.junit.jupiter.api.Test;
@@ -12,21 +13,21 @@ class YearTest {
@Test()
void test18thCenturyEx() {
- assertThrows(IllegalArgumentException.class, () -> new Year(1899));
- assertThrows(IllegalArgumentException.class, () -> new Year(2101));
- new Year(1900);
- new Year(2100);
+ assertThrows(IllegalArgumentException.class, () -> new Year(1899, Collections.emptyMap()));
+ assertThrows(IllegalArgumentException.class, () -> new Year(2101, Collections.emptyMap()));
+ new Year(1900, Collections.emptyMap());
+ new Year(2100, Collections.emptyMap());
}
@Test
void testMondayIsFirst() {
- Year y = new Year(2018);
+ Year y = new Year(2018, Collections.emptyMap());
assertEquals("1", y.getDay(Month.OCTOBER, (short) 1, DayOfWeek.MONDAY));
}
@Test
void testThursdayIsFirst() {
- Year y = new Year(2018);
+ Year y = new Year(2018, Collections.emptyMap());
assertEquals("", y.getDay(Month.NOVEMBER, (short) 1, DayOfWeek.MONDAY));
}