diff --git a/src/main/resources/jasper/calendar_year.jrxml b/src/main/resources/jasper/calendar_year.jrxml
index 5d031f7..f4ec107 100644
--- a/src/main/resources/jasper/calendar_year.jrxml
+++ b/src/main/resources/jasper/calendar_year.jrxml
@@ -26,7 +26,7 @@
 	<parameter name="Date" class="java.time.LocalDate">
 		<defaultValueExpression><![CDATA[java.time.LocalDate.now()]]></defaultValueExpression>
 	</parameter>
-	<parameter name="Year" class="de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.calendar.Year">
+	<parameter name="Year" class="de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.calendar.Year" evaluationTime="Early">
 		<defaultValueExpression><![CDATA[new de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.calendar.Year(2018)]]></defaultValueExpression>
 	</parameter>
 	<queryString>
@@ -164,9 +164,9 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="32" width="39" height="10" isRemoveLineWhenBlank="true" uuid="802e6694-d7a3-4690-a49b-68f7922e0ca2"/>
 				<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"/>
@@ -176,13 +176,13 @@
 			</textField>
 			<textField isBlankWhenNull="true">
 				<reportElement x="378" y="42" width="39" height="25" uuid="1fab31e5-c838-4e32-9c93-7ba3b75ae0e3">
-					<printWhenExpression><![CDATA[$P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.WEDNESDAY )!=""]]></printWhenExpression>
+					<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.FEBRUARY, (short)1, java.time.DayOfWeek.WEDNESDAY ))>0]]></printWhenExpression>
 				</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="0.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"/>
@@ -192,9 +192,9 @@
 				<reportElement x="378" y="77" width="39" height="25" uuid="6a28af25-3705-42fa-b11d-a91243830b19"/>
 				<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>
 					<font size="4"/>
@@ -205,9 +205,9 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="67" width="39" height="10" uuid="560fea15-243b-4717-803f-428cf9fbd9ee"/>
 				<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"/>
@@ -219,9 +219,9 @@
 				<reportElement x="378" y="112" width="39" height="25" uuid="490b8a20-416f-4e3b-bdcc-9b12e34b7b02"/>
 				<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>
 					<font size="4"/>
@@ -232,9 +232,9 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="102" width="39" height="10" uuid="d48decff-98d6-48cb-b8fb-fec5d793d181"/>
 				<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"/>
@@ -246,9 +246,9 @@
 				<reportElement x="378" y="147" width="39" height="25" uuid="b230ba03-d9a0-4510-a143-12033727eada"/>
 				<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"/>
@@ -259,9 +259,9 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="137" width="39" height="10" uuid="c3dc86f5-8cdc-427a-812c-93acd585618c"/>
 				<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"/>
@@ -381,9 +381,9 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="32" width="39" height="10" uuid="6d9c6eda-3afb-4106-9ba7-4b1d703bda5f"/>
 				<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"/>
@@ -395,9 +395,9 @@
 				<reportElement x="456" y="42" width="39" height="25" uuid="f3616cfb-874e-40e4-81d9-f9f35852fa8c"/>
 				<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>
 					<font size="4"/>
@@ -408,9 +408,9 @@
 				<reportElement x="456" y="77" width="39" height="25" uuid="0a9507ee-cdd1-42c1-8f8f-e0f011a2eb30"/>
 				<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>
 					<font size="4"/>
@@ -421,9 +421,9 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="67" width="39" height="10" uuid="655e4d3f-97a5-4d75-b9c1-916fa239289d"/>
 				<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"/>
@@ -435,9 +435,9 @@
 				<reportElement x="456" y="112" width="39" height="25" uuid="35cba7c6-b4ae-48b9-b7d3-f4b96fa2bcaf"/>
 				<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>
 					<font size="4"/>
@@ -448,9 +448,9 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="102" width="39" height="10" uuid="1cc75f56-9bae-4ae5-b688-d7b512e7e82d"/>
 				<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"/>
@@ -462,9 +462,9 @@
 				<reportElement x="456" y="147" width="39" height="25" uuid="ecb73768-801e-430e-b95e-15379864725e"/>
 				<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"/>
@@ -475,9 +475,9 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="137" width="39" height="10" uuid="4915f5e7-c6fe-4897-9668-c323134cbb34"/>
 				<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"/>
@@ -597,7 +597,7 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="32" width="39" height="10" uuid="c872146b-36db-4396-b1b1-8de1d8db328f"/>
 				<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>
@@ -611,7 +611,7 @@
 				<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="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>
@@ -624,7 +624,7 @@
 				<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="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>
@@ -637,7 +637,7 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="67" width="39" height="10" uuid="dd752a25-54c2-4441-bd4a-54c48487dc02"/>
 				<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>
@@ -651,7 +651,7 @@
 				<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="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>
@@ -664,7 +664,7 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="102" width="39" height="10" uuid="1f23a898-7e05-44ba-8d57-53fc18df8885"/>
 				<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>
@@ -678,7 +678,7 @@
 				<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="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>
@@ -691,7 +691,7 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="137" width="39" height="10" uuid="93724c7e-4607-436f-96a1-72ecfa520d18"/>
 				<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>
@@ -707,7 +707,7 @@
 					<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="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"/>
@@ -723,7 +723,7 @@
 					<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				<textElement>
 					<font size="4"/>
@@ -765,7 +765,7 @@
 					<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="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"/>
@@ -779,7 +779,7 @@
 					<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				<textElement>
 					<font size="4"/>
@@ -819,7 +819,7 @@
 					<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="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"/>
@@ -833,7 +833,7 @@
 					<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				<textElement>
 					<font size="4"/>
@@ -873,7 +873,7 @@
 					<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="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"/>
@@ -887,7 +887,7 @@
 					<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				<textElement>
 					<font size="4"/>
@@ -922,12 +922,12 @@
 				<textFieldExpression><![CDATA[]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="172" width="39" height="10" uuid="25fe0525-3d42-477d-a96a-e55f3cae33e5"/>
+				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="300" y="172" 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"/>
 					<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"/>
@@ -941,7 +941,7 @@
 					<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
 				<textElement>
 					<font size="4"/>
@@ -949,7 +949,7 @@
 				<textFieldExpression><![CDATA[]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="172" width="39" height="10" uuid="dca71615-1ec8-4f63-b84e-5b40908a2339"/>
+				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="339" y="172" 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"/>
@@ -979,9 +979,9 @@
 				<reportElement x="378" y="182" width="39" height="25" uuid="5c2944a5-0096-4dee-ba7f-c29cad090f91"/>
 				<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"/>
@@ -989,12 +989,12 @@
 				<textFieldExpression><![CDATA[]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="172" width="39" height="10" uuid="2cd41f3c-588b-4021-b8f9-f516c70ed5c2"/>
+				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="378" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="2cd41f3c-588b-4021-b8f9-f516c70ed5c2"/>
 				<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"/>
@@ -1003,7 +1003,9 @@
 				<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="182" 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>
 					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1016,7 +1018,7 @@
 				<textFieldExpression><![CDATA[]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="172" width="39" height="10" uuid="8dcb02a1-0375-456b-9d3b-e3a1917845fd"/>
+				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="417" y="172" 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"/>
@@ -1030,12 +1032,14 @@
 				<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="182" 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>
 					<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"/>
@@ -1043,12 +1047,12 @@
 				<textFieldExpression><![CDATA[]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="172" width="39" height="10" uuid="5ba37589-570d-4c93-a203-68b500814d5d"/>
+				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="456" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="5ba37589-570d-4c93-a203-68b500814d5d"/>
 				<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"/>
@@ -1072,7 +1076,7 @@
 				<textFieldExpression><![CDATA[]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="172" width="39" height="10" uuid="0d990089-b5ad-46a1-a91d-61973f1ff192"/>
+				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="495" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="0d990089-b5ad-46a1-a91d-61973f1ff192"/>
 				<box>
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1091,7 +1095,7 @@
 				</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="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
@@ -1104,7 +1108,7 @@
 				<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="534" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="0381b4f2-d649-4ddb-b3a4-40d24c9f7feb"/>
 				<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>
@@ -1244,7 +1248,7 @@
 						<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="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"/>
@@ -1258,7 +1262,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1271,7 +1275,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1298,7 +1302,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1311,7 +1315,7 @@
 						<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="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"/>
@@ -1325,7 +1329,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1338,7 +1342,7 @@
 						<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="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"/>
@@ -1352,7 +1356,7 @@
 						<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="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"/>
@@ -1366,7 +1370,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1379,7 +1383,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1406,7 +1410,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1419,7 +1423,7 @@
 						<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="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"/>
@@ -1433,7 +1437,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1446,7 +1450,7 @@
 						<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="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"/>
@@ -1460,7 +1464,7 @@
 						<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="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"/>
@@ -1474,7 +1478,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1487,7 +1491,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1514,7 +1518,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1527,7 +1531,7 @@
 						<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="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"/>
@@ -1541,7 +1545,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1554,7 +1558,7 @@
 						<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="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"/>
@@ -1568,7 +1572,7 @@
 						<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="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"/>
@@ -1582,7 +1586,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1595,7 +1599,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1622,7 +1626,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1635,7 +1639,7 @@
 						<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="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"/>
@@ -1649,7 +1653,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1662,7 +1666,7 @@
 						<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="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"/>
@@ -1676,7 +1680,7 @@
 						<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.5" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="6" isBold="true"/>
@@ -1690,7 +1694,7 @@
 						<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.5" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1703,7 +1707,7 @@
 						<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.5" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1716,7 +1720,7 @@
 						<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.5" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="6" isBold="true"/>
@@ -1730,7 +1734,7 @@
 						<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.5" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1743,7 +1747,7 @@
 						<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.5" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="6" isBold="true"/>
@@ -1757,7 +1761,7 @@
 						<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.5" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1770,7 +1774,7 @@
 						<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.5" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="6" isBold="true"/>
@@ -1784,7 +1788,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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"/>
@@ -1798,7 +1802,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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>
 						<font size="4"/>
@@ -1811,7 +1815,7 @@
 						<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="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"/>
@@ -1825,7 +1829,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1852,7 +1856,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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"/>
@@ -1879,7 +1883,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1892,7 +1896,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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"/>
@@ -1908,7 +1912,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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"/>
@@ -1921,7 +1925,7 @@
 						<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="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"/>
@@ -1935,7 +1939,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -1948,7 +1952,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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"/>
@@ -1962,7 +1966,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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"/>
@@ -1975,7 +1979,7 @@
 						<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="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"/>
@@ -1989,7 +1993,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -2004,7 +2008,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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"/>
@@ -2019,7 +2023,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -2034,7 +2038,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -2047,7 +2051,7 @@
 						<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="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"/>
@@ -2063,7 +2067,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -2076,7 +2080,7 @@
 						<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="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"/>
@@ -2092,7 +2096,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -2105,7 +2109,7 @@
 						<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="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"/>
@@ -2121,7 +2125,7 @@
 						<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="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -2134,7 +2138,7 @@
 						<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="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"/>
@@ -2150,7 +2154,7 @@
 						<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.5" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement>
 						<font size="4"/>
@@ -2163,7 +2167,7 @@
 						<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.5" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
 					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="6" isBold="true"/>
@@ -2177,7 +2181,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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"/>
@@ -2193,7 +2197,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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"/>
@@ -2235,7 +2239,7 @@
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.5" 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"/>
@@ -2249,7 +2253,7 @@
 						<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="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"/>
@@ -3139,7 +3143,7 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="172" width="39" height="10" uuid="5cd79953-acd8-440b-8370-46c0a1456619"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="5cd79953-acd8-440b-8370-46c0a1456619"/>
 					<box>
 						<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3166,7 +3170,7 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="172" width="39" height="10" uuid="b7b06619-8b82-48a4-b93c-84c6e85d603f"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="b7b06619-8b82-48a4-b93c-84c6e85d603f"/>
 					<box>
 						<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3180,7 +3184,9 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="39" y="182" width="39" height="25" uuid="550825a6-8505-4400-8e6d-95cdafa4d8fb"/>
+					<reportElement x="39" y="182" width="39" height="25" uuid="550825a6-8505-4400-8e6d-95cdafa4d8fb">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.TUESDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3193,7 +3199,9 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="78" y="182" width="39" height="25" uuid="5b3c768f-e2b8-4691-b924-e435bff13916"/>
+					<reportElement x="78" y="182" width="39" height="25" uuid="5b3c768f-e2b8-4691-b924-e435bff13916">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.WEDNESDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3206,7 +3214,7 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="172" width="39" height="10" uuid="26bb7502-434b-4a78-b86a-a8d0c9c9a1fd"/>
+					<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"/>
@@ -3220,7 +3228,9 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="117" y="182" width="39" height="25" uuid="65623c93-2afd-4213-b449-570e838af2b8"/>
+					<reportElement x="117" y="182" width="39" height="25" uuid="65623c93-2afd-4213-b449-570e838af2b8">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.THURSDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3233,7 +3243,7 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="172" width="39" height="10" uuid="be91eceb-168a-44a9-b298-8a4b48e40774"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="be91eceb-168a-44a9-b298-8a4b48e40774"/>
 					<box>
 						<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3247,7 +3257,9 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="156" y="182" width="39" height="25" uuid="358ae416-de56-4108-8601-faa3a0031ac2"/>
+					<reportElement x="156" y="182" width="39" height="25" uuid="358ae416-de56-4108-8601-faa3a0031ac2">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MARCH, (short)5, java.time.DayOfWeek.FRIDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3260,7 +3272,7 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="172" width="39" height="10" uuid="c04c2f43-d4ec-441c-a517-129c5dfb75f7"/>
+					<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"/>
@@ -3274,7 +3286,9 @@
 					<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"/>
+					<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>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3287,7 +3301,7 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" uuid="2cf0aeee-2617-4539-bcf0-45b5ade9a305"/>
+					<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"/>
@@ -3301,7 +3315,9 @@
 					<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"/>
+					<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"/>
@@ -3314,7 +3330,7 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" uuid="50bdb247-de3d-4f18-a874-4f1e98f9aae0"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="50bdb247-de3d-4f18-a874-4f1e98f9aae0"/>
 					<box>
 						<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3328,7 +3344,7 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (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" uuid="e6042c53-1645-4682-b8f5-878ef0cdd715"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="207" width="39" height="10" isRemoveLineWhenBlank="true" uuid="e6042c53-1645-4682-b8f5-878ef0cdd715"/>
 					<box>
 						<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3342,7 +3358,7 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)6, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="207" width="39" height="10" uuid="4d8fd720-6fef-42a5-a37d-1a355fdfdf7b"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="207" width="39" height="10" isRemoveLineWhenBlank="true" uuid="4d8fd720-6fef-42a5-a37d-1a355fdfdf7b"/>
 					<box>
 						<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3356,7 +3372,9 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MARCH, (short)6, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="0" y="217" width="39" height="25" uuid="a7c554f9-8a17-49d5-ab26-68146e8e6fad"/>
+					<reportElement x="0" y="217" width="39" height="25" uuid="a7c554f9-8a17-49d5-ab26-68146e8e6fad">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MARCH, (short)6, java.time.DayOfWeek.MONDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3369,7 +3387,9 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="39" y="217" width="39" height="25" uuid="3f27cae3-2ffb-4288-a473-84419062aef9"/>
+					<reportElement x="39" y="217" width="39" height="25" uuid="3f27cae3-2ffb-4288-a473-84419062aef9">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MARCH, (short)6, java.time.DayOfWeek.TUESDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -3510,7 +3530,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="32" width="39" height="10" uuid="719664b6-cb84-4e41-8e2a-2f4be336f070"/>
 					<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>
@@ -3524,7 +3544,7 @@
 					<reportElement x="78" y="42" width="39" height="25" uuid="e3e7ac6d-9557-4525-bd16-b21d342fa974"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3537,7 +3557,7 @@
 					<reportElement x="78" y="77" width="39" height="25" uuid="8158e3bc-e136-49de-b50c-b9fce0c7802b"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3550,7 +3570,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="67" width="39" height="10" uuid="cc13a9c9-4794-48cc-9a5a-9c98fd3ef5e9"/>
 					<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>
@@ -3564,7 +3584,7 @@
 					<reportElement x="78" y="112" width="39" height="25" uuid="3f7e69b3-d2fe-43e4-8efc-c58f9abb53f6"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3577,7 +3597,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="102" width="39" height="10" uuid="6a33886b-a604-4ebd-ae59-e8860571b003"/>
 					<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>
@@ -3591,7 +3611,7 @@
 					<reportElement x="78" y="147" width="39" height="25" uuid="26cc3b3f-9bac-4d0a-8a7a-63ef3d9f958b"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3604,7 +3624,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="137" width="39" height="10" uuid="e657f700-0b73-4552-9b67-69af7137db02"/>
 					<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>
@@ -3618,7 +3638,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="32" width="39" height="10" uuid="95fb50fb-10de-4246-9854-b3ba49e2e852"/>
 					<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>
@@ -3632,7 +3652,7 @@
 					<reportElement x="117" y="42" width="39" height="25" uuid="3fb04c6c-2a18-4ce7-920e-14ad02e958dd"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3645,7 +3665,7 @@
 					<reportElement x="117" y="77" width="39" height="25" uuid="8aee4fb7-f4b7-4141-b9a2-5d1469da3b3d"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3658,7 +3678,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="67" width="39" height="10" uuid="db15b758-ec4a-47d9-9bbe-556d0c403f81"/>
 					<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>
@@ -3672,7 +3692,7 @@
 					<reportElement x="117" y="112" width="39" height="25" uuid="bd6ed95a-4f53-4744-acf1-b4e1a41f8d8e"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3685,7 +3705,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="102" width="39" height="10" uuid="2188730b-c0a5-4d33-aff6-fcaf3c956d97"/>
 					<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>
@@ -3699,7 +3719,7 @@
 					<reportElement x="117" y="147" width="39" height="25" uuid="f7dfebd5-c53b-4477-aa5c-a657fd773599"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3712,7 +3732,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="137" width="39" height="10" uuid="d0468521-d363-43d9-aa24-163b0f287e7b"/>
 					<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>
@@ -3726,7 +3746,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="32" width="39" height="10" uuid="2f4555bf-3d1c-415e-bca2-cbfe193ebde5"/>
 					<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>
@@ -3740,7 +3760,7 @@
 					<reportElement x="156" y="42" width="39" height="25" uuid="29b7262b-c7e7-4c46-b03b-5219668f1362"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3753,7 +3773,7 @@
 					<reportElement x="156" y="77" width="39" height="25" uuid="517508e4-fd43-4025-9863-1ffdde7a0e81"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3766,7 +3786,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="67" width="39" height="10" uuid="a3b64008-ff05-4ae0-8cf6-5935114f3f21"/>
 					<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>
@@ -3780,7 +3800,7 @@
 					<reportElement x="156" y="112" width="39" height="25" uuid="fc82e1d7-066d-47bc-943a-6b2af4c3dddc"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3793,7 +3813,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="102" width="39" height="10" uuid="82e50964-c2c8-4bbd-8b67-a28b6ed688fd"/>
 					<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>
@@ -3807,7 +3827,7 @@
 					<reportElement x="156" y="147" width="39" height="25" uuid="5f03cf30-175e-4ff8-9ac0-7a20d67b3aea"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -3820,7 +3840,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="137" width="39" height="10" uuid="ab0c6b07-2013-44e6-b575-d1e2423c9da2"/>
 					<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>
@@ -3834,7 +3854,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" uuid="3d04096c-09d1-4f5b-ad08-912b842aa25c"/>
 					<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>
@@ -3848,7 +3868,7 @@
 					<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="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>
@@ -3861,7 +3881,7 @@
 					<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="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>
@@ -3874,7 +3894,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" uuid="709bd046-1a97-42b2-8ca1-f74441cc467d"/>
 					<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>
@@ -3888,7 +3908,7 @@
 					<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="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>
@@ -3901,7 +3921,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" uuid="389ce9f2-6dda-4183-b077-7ba5d43ae835"/>
 					<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>
@@ -3915,7 +3935,7 @@
 					<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="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>
@@ -3928,7 +3948,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" uuid="6c0c1b9d-e27f-4ba3-aacf-a3bbef6560a8"/>
 					<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>
@@ -3942,7 +3962,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" uuid="5fc6d7cb-eff8-40e8-911d-9d705741afab"/>
 					<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>
@@ -3956,7 +3976,7 @@
 					<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="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>
@@ -3969,7 +3989,7 @@
 					<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="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>
@@ -3982,7 +4002,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" uuid="b276d017-6f1e-4967-a071-e11369783433"/>
 					<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>
@@ -3996,7 +4016,7 @@
 					<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="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>
@@ -4009,7 +4029,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" uuid="e9b45e8a-6469-477f-a796-160574756638"/>
 					<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>
@@ -4023,7 +4043,7 @@
 					<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="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>
@@ -4036,7 +4056,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="137" width="39" height="10" uuid="5294096f-5f2d-4b38-9cc1-d110faf0aeaf"/>
 					<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>
@@ -4077,7 +4097,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="32" width="39" height="10" uuid="175b071f-b9f2-4bdf-a930-985a1f751c87"/>
 					<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>
@@ -4091,7 +4111,7 @@
 					<reportElement x="39" y="42" width="39" height="25" uuid="451fd4fc-4e59-43e2-832a-57a64d4a7612"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -4131,7 +4151,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="67" width="39" height="10" uuid="a3af9e32-fc99-400c-a23c-cec936eb0bbd"/>
 					<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>
@@ -4145,7 +4165,7 @@
 					<reportElement x="39" y="77" width="39" height="25" uuid="cbf2dc70-6275-4c06-bf7b-d24fc763762f"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -4185,7 +4205,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="102" width="39" height="10" uuid="937a4add-bd3e-4655-81db-9373ad91596d"/>
 					<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>
@@ -4199,7 +4219,7 @@
 					<reportElement x="39" y="112" width="39" height="25" uuid="0569e212-8f83-43d4-9a26-7a1807470786"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -4239,7 +4259,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="137" width="39" height="10" uuid="da24455b-ac14-4320-a270-2475a1007724"/>
 					<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>
@@ -4253,7 +4273,7 @@
 					<reportElement x="39" y="147" width="39" height="25" uuid="31990965-e74a-4487-8b9b-fc3905e91f54"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -4263,7 +4283,7 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="172" width="39" height="10" uuid="47487ac5-fd53-4a25-b80e-4278a7ea995c"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="47487ac5-fd53-4a25-b80e-4278a7ea995c"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -4290,10 +4310,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="172" width="39" height="10" uuid="c9470373-bb89-46b0-9bff-035800098000"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="c9470373-bb89-46b0-9bff-035800098000"/>
 					<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>
@@ -4307,7 +4327,7 @@
 					<reportElement x="39" y="182" width="39" height="25" uuid="d2c3d422-a06e-41c2-b993-b49b20ced842"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -4320,7 +4340,7 @@
 					<reportElement x="78" y="182" width="39" height="25" uuid="4e495a3e-bc1b-49b6-901c-5c1fc9307b2a"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -4330,10 +4350,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="172" width="39" height="10" uuid="d32ba337-de1d-4d7c-ae1a-da958196a966"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="d32ba337-de1d-4d7c-ae1a-da958196a966"/>
 					<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>
@@ -4347,7 +4367,7 @@
 					<reportElement x="117" y="182" width="39" height="25" uuid="3f3511d0-8989-4af8-a585-b14fe6aa4d30"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -4357,10 +4377,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="172" width="39" height="10" uuid="9760ae77-9638-4b25-8bb9-5129a8589df1"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="9760ae77-9638-4b25-8bb9-5129a8589df1"/>
 					<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>
@@ -4371,10 +4391,12 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="156" y="182" width="39" height="25" uuid="1ae8ab15-1b27-40cd-8003-ba0a706eb5a6"/>
+					<reportElement x="156" y="182" width="39" height="25" uuid="1ae8ab15-1b27-40cd-8003-ba0a706eb5a6">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MAY, (short)5, java.time.DayOfWeek.FRIDAY ))>0]]></printWhenExpression>
+					</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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -4384,10 +4406,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="172" width="39" height="10" uuid="3962f559-7ad9-4593-b131-034c52dff88d"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="3962f559-7ad9-4593-b131-034c52dff88d"/>
 					<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>
@@ -4398,10 +4420,12 @@
 					<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"/>
+					<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>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -4411,10 +4435,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" uuid="7aa1ec37-97d7-481e-9362-ed35f2086176"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="7aa1ec37-97d7-481e-9362-ed35f2086176"/>
 					<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>
@@ -4425,10 +4449,12 @@
 					<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"/>
+					<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="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>
@@ -4438,10 +4464,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" uuid="2a15cd43-fcd2-4c5e-9700-b410499fe616"/>
+					<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="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>
@@ -4452,7 +4478,7 @@
 					<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" uuid="5e655f76-7653-41ef-b199-81068fa33120"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="207" width="39" height="10" isRemoveLineWhenBlank="true" uuid="5e655f76-7653-41ef-b199-81068fa33120"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -4466,10 +4492,10 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)6, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="207" width="39" height="10" uuid="d4ec8424-fa22-459e-b7a7-bbca2f0da7cc"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="207" width="39" height="10" isRemoveLineWhenBlank="true" uuid="d4ec8424-fa22-459e-b7a7-bbca2f0da7cc"/>
 					<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>
@@ -4480,7 +4506,9 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)6, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="39" y="217" width="39" height="25" uuid="edebb81f-8e60-40ff-813b-ac068623dfcd"/>
+					<reportElement x="39" y="217" width="39" height="25" uuid="edebb81f-8e60-40ff-813b-ac068623dfcd">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MAY, (short)6, java.time.DayOfWeek.TUESDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -4494,7 +4522,7 @@
 				</textField>
 				<textField isBlankWhenNull="true">
 					<reportElement x="0" y="217" width="39" height="25" uuid="2f12341a-68ec-4fc3-9f30-63756a3e3b71">
-						<printWhenExpression><![CDATA[$P{Year}.getDay( java.time.Month.MAY, (short)6, java.time.DayOfWeek.MONDAY ) != null]]></printWhenExpression>
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.MAY, (short)6, java.time.DayOfWeek.MONDAY ))>0]]></printWhenExpression>
 					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5420,9 +5448,9 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="172" width="39" height="10" uuid="3fb1c838-aa59-441d-9659-2f542cf209d3"/>
 					<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"/>
@@ -5431,11 +5459,13 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="39" y="182" width="39" height="25" uuid="2094b926-7d97-45b1-989a-5240a7d53ac2"/>
+					<reportElement x="39" y="182" width="39" height="25" uuid="2094b926-7d97-45b1-989a-5240a7d53ac2">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.TUESDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<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>
@@ -5444,7 +5474,9 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="78" y="182" width="39" height="25" uuid="4bd640c3-43d5-4c14-9c95-ecaeb0c86ac4"/>
+					<reportElement x="78" y="182" width="39" height="25" uuid="4bd640c3-43d5-4c14-9c95-ecaeb0c86ac4">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.WEDNESDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5471,7 +5503,9 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="117" y="182" width="39" height="25" uuid="fdd1f2dd-706b-4343-805b-f2f6201a8301"/>
+					<reportElement x="117" y="182" width="39" height="25" uuid="fdd1f2dd-706b-4343-805b-f2f6201a8301">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.THURSDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5487,9 +5521,9 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="172" width="39" height="10" uuid="b4cd2075-d1a3-4e13-a57c-8e6e90ee69f8"/>
 					<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"/>
@@ -5498,7 +5532,9 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="156" y="182" width="39" height="25" uuid="4d47ab1d-fc9a-447a-86e1-d44acbd70850"/>
+					<reportElement x="156" y="182" width="39" height="25" uuid="4d47ab1d-fc9a-447a-86e1-d44acbd70850">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay( java.time.Month.APRIL, (short)5, java.time.DayOfWeek.FRIDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5525,7 +5561,9 @@
 					<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" 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>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5541,9 +5579,9 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" uuid="21edaebb-f55d-41d1-81aa-ba690d4e1046"/>
 					<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"/>
@@ -5552,7 +5590,9 @@
 					<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" 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>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -5596,7 +5636,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="207" width="39" height="10" isRemoveLineWhenBlank="true" uuid="c52b2bae-83e9-4e17-874b-498af45931c6"/>
 					<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>
@@ -5765,7 +5805,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="32" width="39" height="10" uuid="c39e42fa-5a8f-4c57-b29e-83bbd0a5450b"/>
 					<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>
@@ -5779,7 +5819,7 @@
 					<reportElement x="78" y="42" width="39" height="25" uuid="de00ea68-55a2-4c92-bdbe-984cdb7da715"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -5792,7 +5832,7 @@
 					<reportElement x="78" y="77" width="39" height="25" uuid="e32ae6de-0737-4cf7-b7fd-70974f75e28e"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -5805,7 +5845,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="67" width="39" height="10" uuid="9fb35b97-39bd-4f29-8b31-2d65ffd739f3"/>
 					<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>
@@ -5819,7 +5859,7 @@
 					<reportElement x="78" y="112" width="39" height="25" uuid="cf17d7fa-e58b-49e4-a364-23ac18e319cd"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -5832,7 +5872,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="102" width="39" height="10" uuid="2984af0e-0600-48d0-a332-8f45c6474097"/>
 					<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>
@@ -5846,7 +5886,7 @@
 					<reportElement x="78" y="147" width="39" height="25" uuid="1f329a24-045b-4fe4-8fd8-7d9f22cb6160"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -5859,7 +5899,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="137" width="39" height="10" uuid="3a42074e-2651-4fe6-9b81-f5ac14d231c5"/>
 					<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>
@@ -5873,7 +5913,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="32" width="39" height="10" uuid="2abc4c4e-3de5-4e31-8864-1667409fca2a"/>
 					<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>
@@ -5887,7 +5927,7 @@
 					<reportElement x="117" y="42" width="39" height="25" uuid="a0343770-5309-41c5-908c-1f3a65d33b00"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -5900,7 +5940,7 @@
 					<reportElement x="117" y="77" width="39" height="25" uuid="02ee8bcc-1cbd-4876-bfa9-7b29e14f6718"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -5913,7 +5953,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="67" width="39" height="10" uuid="c43c4bc5-0513-49e2-a936-e9d961d9a21e"/>
 					<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>
@@ -5927,7 +5967,7 @@
 					<reportElement x="117" y="112" width="39" height="25" uuid="20c88051-e001-4910-8b7e-ef4901b4c444"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -5940,7 +5980,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="102" width="39" height="10" uuid="f6ffa666-3f47-49ca-ad58-f53f2a6fe77d"/>
 					<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>
@@ -5954,7 +5994,7 @@
 					<reportElement x="117" y="147" width="39" height="25" uuid="d387730e-6d7f-4c64-9c44-fe9f39f8cebd"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -5967,7 +6007,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="137" width="39" height="10" uuid="9a7d0a7f-31db-408d-a741-df45c0ae116f"/>
 					<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>
@@ -5981,7 +6021,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="32" width="39" height="10" uuid="68275c50-3768-449a-aa16-5de2fd462610"/>
 					<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>
@@ -5995,7 +6035,7 @@
 					<reportElement x="156" y="42" width="39" height="25" uuid="e5a390ee-f21c-4d8b-b947-bfe2dc1c4d1b"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6008,7 +6048,7 @@
 					<reportElement x="156" y="77" width="39" height="25" uuid="a4a36818-d0b2-4c72-9f05-02eb460951ab"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6021,7 +6061,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="67" width="39" height="10" uuid="0df46d87-0953-4eed-9a76-14a04e32a6aa"/>
 					<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>
@@ -6035,7 +6075,7 @@
 					<reportElement x="156" y="112" width="39" height="25" uuid="9d42e190-8dc5-424b-9ae0-3507a84a298e"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6048,7 +6088,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="102" width="39" height="10" uuid="fe07e43c-810c-4458-be6f-b487c84ab497"/>
 					<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>
@@ -6062,7 +6102,7 @@
 					<reportElement x="156" y="147" width="39" height="25" uuid="1447c948-ffc1-48fb-9a1d-767575ed23f4"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6075,7 +6115,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="137" width="39" height="10" uuid="9fe7e33a-f71f-4853-aba5-d407c1e89845"/>
 					<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>
@@ -6089,7 +6129,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="32" width="39" height="10" uuid="b0629287-3731-4fd4-bc6f-faa9075d0130"/>
 					<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>
@@ -6103,7 +6143,7 @@
 					<reportElement x="195" y="42" width="39" height="25" uuid="0e55d732-25c6-4463-b45d-28e8eee83727"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6116,7 +6156,7 @@
 					<reportElement x="195" y="77" width="39" height="25" uuid="4d77c45c-67f1-44d8-90fd-1c5698861e3c"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6129,7 +6169,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="67" width="39" height="10" uuid="bb282191-bc28-44ec-95a8-7ab64a3151ef"/>
 					<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>
@@ -6143,7 +6183,7 @@
 					<reportElement x="195" y="112" width="39" height="25" uuid="15607ab2-51ef-4c28-92a8-76c9c70d02f3"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6156,7 +6196,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="102" width="39" height="10" uuid="9dbc4758-e6a7-4b1e-87e7-658495ab33f8"/>
 					<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>
@@ -6170,7 +6210,7 @@
 					<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="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>
@@ -6183,7 +6223,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="137" width="39" height="10" uuid="6d2170df-f357-4458-89a2-379ecc6cd8e6"/>
 					<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>
@@ -6197,7 +6237,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="32" width="39" height="10" uuid="91322292-77cc-494b-ab84-7c748ac58436"/>
 					<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>
@@ -6211,7 +6251,7 @@
 					<reportElement x="234" y="42" width="39" height="25" uuid="08eda686-b175-4b08-8c9d-9a78409ff8e9"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6224,7 +6264,7 @@
 					<reportElement x="234" y="77" width="39" height="25" uuid="f32fe17c-b97b-4e53-b16f-757ddd48c110"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6237,7 +6277,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="67" width="39" height="10" uuid="b623ac35-d16a-4ee7-8a73-f0c16076dbc8"/>
 					<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>
@@ -6251,7 +6291,7 @@
 					<reportElement x="234" y="112" width="39" height="25" uuid="16874b1f-c5d8-4dd0-b2c4-86de37a5b0b7"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6264,7 +6304,7 @@
 					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="102" width="39" height="10" uuid="d531348c-a098-4305-8e25-1375c62ec62d"/>
 					<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>
@@ -6278,7 +6318,7 @@
 					<reportElement x="234" y="147" width="39" height="25" uuid="24d6952b-274b-43b3-97e9-8aeb978ef392"/>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6291,7 +6331,7 @@
 					<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="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>
@@ -6332,7 +6372,7 @@
 					<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="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>
@@ -6346,7 +6386,7 @@
 					<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="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>
@@ -6386,7 +6426,7 @@
 					<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="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>
@@ -6400,7 +6440,7 @@
 					<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="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>
@@ -6440,7 +6480,7 @@
 					<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="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>
@@ -6454,7 +6494,7 @@
 					<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="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>
@@ -6494,7 +6534,7 @@
 					<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="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>
@@ -6508,7 +6548,7 @@
 					<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="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>
@@ -6518,7 +6558,7 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="172" width="39" height="10" uuid="64474d1a-9a4b-4410-b380-267ab3a4e17a"/>
+					<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"/>
@@ -6545,10 +6585,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="172" width="39" height="10" uuid="f913f39f-a85f-4363-9e2b-3d5ae7b11674"/>
+					<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="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>
@@ -6562,7 +6602,7 @@
 					<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="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>
@@ -6571,11 +6611,11 @@
 					</textElement>
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
-				<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="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>
@@ -6585,10 +6625,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="78" y="172" width="39" height="10" uuid="65ef87db-6898-47d8-9619-d63bcfe854a1"/>
+					<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="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>
@@ -6598,11 +6638,11 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$P{Year}.getDay(  java.time.Month.JUNE, (short)5, java.time.DayOfWeek.WEDNESDAY )]]></textFieldExpression>
 				</textField>
-				<textField>
+				<textField isBlankWhenNull="true">
 					<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="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>
@@ -6612,10 +6652,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="117" y="172" width="39" height="10" uuid="a0b4711d-3872-40bd-b904-91570b51729e"/>
+					<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="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>
@@ -6625,11 +6665,11 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$P{Year}.getDay(  java.time.Month.JUNE, (short)5, java.time.DayOfWeek.THURSDAY )]]></textFieldExpression>
 				</textField>
-				<textField>
+				<textField isBlankWhenNull="true">
 					<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="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>
@@ -6639,10 +6679,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="156" y="172" width="39" height="10" uuid="b341f644-f9f8-44f6-9c67-2174e155693e"/>
+					<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="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>
@@ -6652,11 +6692,13 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$P{Year}.getDay(  java.time.Month.JUNE, (short)5, java.time.DayOfWeek.FRIDAY )]]></textFieldExpression>
 				</textField>
-				<textField>
-					<reportElement x="195" y="182" width="39" height="25" uuid="fadc40b9-b833-4fc9-8ea0-2dbfba223880"/>
+				<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>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6666,10 +6708,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" uuid="dcca42bd-ea6c-4136-960e-56159f8d7cee"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="195" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="dcca42bd-ea6c-4136-960e-56159f8d7cee"/>
 					<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>
@@ -6680,10 +6722,12 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay(  java.time.Month.JUNE, (short)5, java.time.DayOfWeek.SATURDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="234" y="182" width="39" height="25" uuid="af1b8139-c03a-4b8b-aa72-4e682e513131"/>
+					<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>
 					<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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
@@ -6693,10 +6737,10 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" uuid="dab95a42-cab4-4a67-bd88-f9c0ef92b2ce"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="234" y="172" width="39" height="10" isRemoveLineWhenBlank="true" uuid="dab95a42-cab4-4a67-bd88-f9c0ef92b2ce"/>
 					<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>
@@ -6707,7 +6751,7 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay(  java.time.Month.JUNE, (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" uuid="a2058acf-f5a9-4814-baa3-2080d2c94275"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="0" y="207" width="39" height="10" isRemoveLineWhenBlank="true" uuid="a2058acf-f5a9-4814-baa3-2080d2c94275"/>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6721,10 +6765,10 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay(  java.time.Month.JUNE, (short)6, java.time.DayOfWeek.MONDAY )]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="207" width="39" height="10" uuid="a2132ae3-8b14-48f5-8d43-a5f2f455c5b6"/>
+					<reportElement style="Style_Calendar_Day_Number" mode="Opaque" x="39" y="207" width="39" height="10" isRemoveLineWhenBlank="true" uuid="a2132ae3-8b14-48f5-8d43-a5f2f455c5b6"/>
 					<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>
@@ -6735,7 +6779,9 @@
 					<textFieldExpression><![CDATA[$P{Year}.getDay(  java.time.Month.JUNE, (short)6, java.time.DayOfWeek.TUESDAY )]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="0" y="217" width="39" height="25" uuid="b7f8c0f8-2662-47fd-88d3-a8585c431c9a"/>
+					<reportElement x="0" y="217" width="39" height="25" uuid="b7f8c0f8-2662-47fd-88d3-a8585c431c9a">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay(  java.time.Month.JUNE, (short)6, java.time.DayOfWeek.MONDAY ))>0]]></printWhenExpression>
+					</reportElement>
 					<box>
 						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<leftPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -6748,10 +6794,12 @@
 					<textFieldExpression><![CDATA[]]></textFieldExpression>
 				</textField>
 				<textField isBlankWhenNull="true">
-					<reportElement x="39" y="217" width="39" height="25" uuid="80d63235-c3ae-4c0b-a47d-b0c8589e8259"/>
+					<reportElement x="39" y="217" width="39" height="25" uuid="80d63235-c3ae-4c0b-a47d-b0c8589e8259">
+						<printWhenExpression><![CDATA[LEN($P{Year}.getDay(  java.time.Month.JUNE, (short)6, java.time.DayOfWeek.TUESDAY ))>0]]></printWhenExpression>
+					</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="1.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>