From fabe9de5b5da0154272fb6b6c663979463ba40c3 Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe@live.com>
Date: Mon, 5 Sep 2022 18:04:32 +0700
Subject: [PATCH] Update resep.jrxml Perbaikan penanda racikan dan penanda
 telaah resep

---
 .../WEB-INF/templates/jrxml/resep.jrxml       | 89 +++++++++++++------
 .../templates/jrxml/resep_racikan.jrxml       | 72 +++++++++++----
 2 files changed, 114 insertions(+), 47 deletions(-)

diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml
index 2cf06687..03d60c70 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep.jrxml
@@ -443,7 +443,25 @@
 			<property name="com.jaspersoft.studio.unit.height" value="px"/>
 			<elementGroup>
 				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="290" y="0" width="193" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="b34f8385-f2bc-416c-846b-0a4daf421e9d">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="0" width="30" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="11b77b24-40a7-4635-aed1-d460b8b42f40">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="21c489cf-54ea-4179-b618-89425111d3db"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<box rightPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Top" markup="none">
+						<font fontName="SansSerif" size="12" isBold="true" isItalic="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{isRacikan} ? "" : $V{REPORT_COUNT} + "/ "]]></textFieldExpression>
+				</textField>
+				<textField textAdjust="StretchHeight">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="328" y="0" width="155" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="b34f8385-f2bc-416c-846b-0a4daf421e9d">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="943091f4-cbec-41f8-93d2-5b8fb2e2ac43"/>
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -455,7 +473,7 @@
 					<textFieldExpression><![CDATA[$F{isRacikan} ? "" : $F{jumlah}]]></textFieldExpression>
 				</textField>
 				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="10" y="0" width="280" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="cd3072c8-ac8d-413e-9f4c-ea9c96d8c2dd">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="30" y="0" width="298" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="cd3072c8-ac8d-413e-9f4c-ea9c96d8c2dd">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="21c489cf-54ea-4179-b618-89425111d3db"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
@@ -488,24 +506,26 @@
 			</elementGroup>
 			<elementGroup>
 				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="350" y="34" width="133" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="0056156b-c610-4b1d-8fba-01e8939cdbbd">
-						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="61129d6a-13dd-498e-972e-6d44db74b69f"/>
-					</reportElement>
-					<textElement>
-						<font size="12"/>
-					</textElement>
-					<textFieldExpression><![CDATA[$F{aturanPakai}]]></textFieldExpression>
-				</textField>
-				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="96" y="34" width="254" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="d8492f5a-6e45-4a92-a456-8174bb84e2b1">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="80" y="34" width="230" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="d8492f5a-6e45-4a92-a456-8174bb84e2b1">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="f9a69edd-15e7-4066-89fd-f45f376694b7"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
-					<textElement>
+					<textElement textAlignment="Left">
 						<font size="12"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{instruksi}]]></textFieldExpression>
 				</textField>
+				<textField textAdjust="StretchHeight">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="340" y="34" width="133" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="0056156b-c610-4b1d-8fba-01e8939cdbbd">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="61129d6a-13dd-498e-972e-6d44db74b69f"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Right">
+						<font size="12"/>
+					</textElement>
+					<textFieldExpression><![CDATA[$F{aturanPakai}]]></textFieldExpression>
+				</textField>
 			</elementGroup>
 		</band>
 	</detail>
@@ -527,11 +547,11 @@
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="10" width="80" height="17" uuid="34088358-c9a3-4716-935a-0de9137f1536">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="0" y="10" width="69" height="17" uuid="34088358-c9a3-4716-935a-0de9137f1536">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<textElement textAlignment="Center" verticalAlignment="Top" rotation="None">
 						<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false"/>
@@ -539,7 +559,18 @@
 					<text><![CDATA[V]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="80" y="10" width="80" height="17" uuid="bd42ce50-2e8c-4ec8-8a6f-031d37f54dfb">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="138" y="10" width="69" height="17" uuid="bae9eedc-73a8-41c6-8345-7f6455612dc3">
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Center" verticalAlignment="Top" rotation="None">
+						<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false"/>
+					</textElement>
+					<text><![CDATA[A]]></text>
+				</staticText>
+				<staticText>
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="69" y="10" width="69" height="17" uuid="bd42ce50-2e8c-4ec8-8a6f-031d37f54dfb">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					</reportElement>
@@ -549,7 +580,7 @@
 					<text><![CDATA[H]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="160" y="10" width="80" height="17" uuid="4bf1bb69-bba8-4740-9597-3b2e1792bf68">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="207" y="10" width="69" height="17" uuid="4bf1bb69-bba8-4740-9597-3b2e1792bf68">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					</reportElement>
@@ -559,7 +590,7 @@
 					<text><![CDATA[R]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="240" y="10" width="80" height="17" uuid="c61fb69d-ee67-4446-b6af-85486269eb6f">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="276" y="10" width="69" height="17" uuid="c61fb69d-ee67-4446-b6af-85486269eb6f">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
 					</reportElement>
@@ -569,17 +600,7 @@
 					<text><![CDATA[K]]></text>
 				</staticText>
 				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="320" y="10" width="80" height="17" uuid="3c41a4ea-9b85-4d53-b0f7-41dcfe9cd539">
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
-						<property name="com.jaspersoft.studio.unit.y" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Center" verticalAlignment="Top" rotation="None">
-						<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false"/>
-					</textElement>
-					<text><![CDATA[P]]></text>
-				</staticText>
-				<staticText>
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="400" y="10" width="80" height="17" uuid="8babfc1b-c336-4ab8-9e0a-8f24956540e1">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="414" y="10" width="69" height="17" uuid="8babfc1b-c336-4ab8-9e0a-8f24956540e1">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.y" value="px"/>
@@ -589,6 +610,16 @@
 					</textElement>
 					<text><![CDATA[T]]></text>
 				</staticText>
+				<staticText>
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="345" y="10" width="69" height="17" uuid="3c41a4ea-9b85-4d53-b0f7-41dcfe9cd539">
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="com.jaspersoft.studio.unit.y" value="px"/>
+					</reportElement>
+					<textElement textAlignment="Center" verticalAlignment="Top" rotation="None">
+						<font fontName="SansSerif" size="10" isBold="true" isItalic="false" isUnderline="false"/>
+					</textElement>
+					<text><![CDATA[P]]></text>
+				</staticText>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml
index bc040c1d..ba6dd117 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/resep_racikan.jrxml
@@ -23,7 +23,24 @@
 			<printWhenExpression><![CDATA[($P{rKe}).equals($F{rKe})]]></printWhenExpression>
 			<elementGroup>
 				<textField textAdjust="StretchHeight">
-					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="10" y="0" width="280" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="6a0b6a30-cf99-49b4-8add-a59e7eabe558">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="328" y="0" width="155" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="40d048a8-0e81-47c3-aab9-583b6b6cf3cd">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5cdfcc34-0f33-4f99-8809-4ee7291a599d"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font size="12"/>
+					</textElement>
+					<textFieldExpression><![CDATA[($P{rKe}).equals($F{rKe}) ? $F{jumlah}:""]]></textFieldExpression>
+				</textField>
+				<textField textAdjust="StretchHeight">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="37" y="0" width="291" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="6a0b6a30-cf99-49b4-8add-a59e7eabe558">
 						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="51cc68a1-819e-47c5-a1b3-314433cb79d9"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
@@ -40,24 +57,43 @@
 					</textElement>
 					<textFieldExpression><![CDATA[($P{rKe}).equals($F{rKe}) ? $F{obat}:""]]></textFieldExpression>
 				</textField>
+				<textField textAdjust="StretchHeight">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" isPrintRepeatedValues="false" x="0" y="0" width="30" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="24b08552-bc20-45e4-adbe-036f51c866c1">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="51cc68a1-819e-47c5-a1b3-314433cb79d9"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="5">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Top">
+						<font size="12" isBold="true" isItalic="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA[($P{rKe}).equals($F{rKe}) ? $F{rKe} + "/":""]]></textFieldExpression>
+				</textField>
+				<textField textAdjust="StretchHeight">
+					<reportElement positionType="Float" stretchType="ElementGroupHeight" x="30" y="0" width="7" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="167dcc15-f02c-41db-9148-b28004b608dd">
+						<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="51cc68a1-819e-47c5-a1b3-314433cb79d9"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					</reportElement>
+					<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
+						<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
+					</box>
+					<textElement textAlignment="Left" verticalAlignment="Top">
+						<font size="12"/>
+					</textElement>
+					<textFieldExpression><![CDATA[($P{rKe}).equals($F{rKe}) ? "-" : ""]]></textFieldExpression>
+				</textField>
 			</elementGroup>
-			<textField textAdjust="StretchHeight">
-				<reportElement positionType="Float" stretchType="ElementGroupHeight" x="290" y="0" width="193" height="17" isRemoveLineWhenBlank="true" isPrintWhenDetailOverflows="true" uuid="40d048a8-0e81-47c3-aab9-583b6b6cf3cd">
-					<property name="com.jaspersoft.studio.spreadsheet.connectionID" value="5cdfcc34-0f33-4f99-8809-4ee7291a599d"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-				</reportElement>
-				<box topPadding="0" leftPadding="0" bottomPadding="0" rightPadding="0">
-					<topPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<leftPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-					<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
-				</box>
-				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA[($P{rKe}).equals($F{rKe}) ? $F{jumlah}:""]]></textFieldExpression>
-			</textField>
 		</band>
 	</detail>
 </jasperReport>