diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCuti2021.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCuti2021.jrxml
index 251248c9..b373d75d 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCuti2021.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCuti2021.jrxml
@@ -811,7 +811,7 @@
 				<textFieldExpression><![CDATA[($F{jabatanKaRu}!=null?$F{jabatanKaRu}:"")]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="331" y="450" width="229" height="15" uuid="07ed3fe2-88da-46f2-b052-64dda835caf6"/>
+				<reportElement positionType="Float" x="310" y="450" width="249" height="15" uuid="07ed3fe2-88da-46f2-b052-64dda835caf6"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
@@ -836,7 +836,7 @@
 				<textFieldExpression><![CDATA[($F{nipKaRu}!=null?"NIP."+$F{nipKaRu}:"")]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="331" y="500" width="229" height="15" uuid="cce840a0-73eb-4605-a00f-d594863c5a5c">
+				<reportElement positionType="Float" x="310" y="500" width="250" height="15" uuid="cce840a0-73eb-4605-a00f-d594863c5a5c">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -845,7 +845,7 @@
 				<textFieldExpression><![CDATA["(" + $F{nama} + ")"]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="331" y="515" width="229" height="14" uuid="fedbc99d-2a6c-46ba-9e06-3867a2112ebf">
+				<reportElement positionType="Float" x="310" y="515" width="250" height="14" uuid="fedbc99d-2a6c-46ba-9e06-3867a2112ebf">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -937,7 +937,7 @@
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
 			<textField>
-				<reportElement positionType="Float" x="331" y="569" width="229" height="31" uuid="34fd8443-52f6-40aa-abfd-a27d1a03b300">
+				<reportElement positionType="Float" x="310" y="569" width="250" height="31" uuid="34fd8443-52f6-40aa-abfd-a27d1a03b300">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -947,7 +947,7 @@
 				<textFieldExpression><![CDATA[$F{jabatanAtasan1}!=null?$F{jabatanAtasan1}:$F{jabatanAtasan2}!=null?$F{jabatanAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="330" y="620" width="229" height="15" uuid="20fa3dbc-f80d-4094-9cda-40f3689680b0">
+				<reportElement positionType="Float" x="310" y="620" width="249" height="15" uuid="20fa3dbc-f80d-4094-9cda-40f3689680b0">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -956,7 +956,7 @@
 				<textFieldExpression><![CDATA[$F{namaAtasan1}!=null?$F{namaAtasan1}:$F{namaAtasan2}!=null?$F{namaAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="330" y="635" width="229" height="15" uuid="adb68d0d-1735-4f67-b1d9-96eb320ebfce">
+				<reportElement positionType="Float" x="310" y="635" width="249" height="15" uuid="adb68d0d-1735-4f67-b1d9-96eb320ebfce">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Bottom">
@@ -1046,7 +1046,7 @@
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
 			<textField>
-				<reportElement positionType="Float" x="331" y="747" width="227" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
+				<reportElement positionType="Float" x="310" y="747" width="248" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1221,13 +1221,13 @@
 				<textFieldExpression><![CDATA[($F{jabatanKaRu}!=null?"Mengetahui,":"")]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="330" y="692" width="229" height="30" uuid="e5e4bf9d-15a5-4637-8b47-dc708bccdc09">
+				<reportElement x="310" y="692" width="249" height="30" uuid="e5e4bf9d-15a5-4637-8b47-dc708bccdc09">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textFieldExpression><![CDATA[$F{labelTtdMenkes}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="331" y="765" width="227" height="15" uuid="4b3d9ce1-57b8-427e-b5c7-40b8dd145814">
+				<reportElement x="310" y="765" width="248" height="15" uuid="4b3d9ce1-57b8-427e-b5c7-40b8dd145814">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textFieldExpression><![CDATA[$F{nipMenkes} != null ? $F{nipMenkes} : ""]]></textFieldExpression>
@@ -1364,7 +1364,7 @@
 				<textFieldExpression><![CDATA["       Demikian permohonan "+($F{statusPegawai}!=null?$F{statusPegawai}.toLowerCase():"-")+" ini saya buat, terima kasih."]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="416" width="197" height="31" uuid="93410a43-83f5-48bc-8e88-3863b86b94b1">
+				<reportElement positionType="Float" x="50" y="416" width="250" height="31" uuid="93410a43-83f5-48bc-8e88-3863b86b94b1">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -1374,7 +1374,7 @@
 				<textFieldExpression><![CDATA[$F{jabatanAtasan1}!=null?$F{jabatanAtasan1}:$F{jabatanAtasan2}!=null?$F{jabatanAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="471" width="197" height="15" uuid="c8fab327-e172-4f02-ba0f-e172f3509107">
+				<reportElement positionType="Float" x="50" y="471" width="250" height="15" uuid="c8fab327-e172-4f02-ba0f-e172f3509107">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1383,7 +1383,7 @@
 				<textFieldExpression><![CDATA[$F{namaAtasan1}!=null?$F{namaAtasan1}:$F{namaAtasan2}!=null?$F{namaAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="486" width="197" height="15" uuid="361f98e8-a91f-4aa8-ab48-9dd5778c1488">
+				<reportElement positionType="Float" x="50" y="486" width="250" height="15" uuid="361f98e8-a91f-4aa8-ab48-9dd5778c1488">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
@@ -1392,14 +1392,14 @@
 				<textFieldExpression><![CDATA[$F{nipAtasan1}!=null?"NIP."+$F{nipAtasan1}:$F{nipAtasan2}!=null?"NIP."+$F{nipAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="290" y="401" width="196" height="15" uuid="267a5554-f4dc-4a6a-a382-fb0e148b42e3"/>
+				<reportElement positionType="Float" x="320" y="401" width="196" height="15" uuid="267a5554-f4dc-4a6a-a382-fb0e148b42e3"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
 				<text><![CDATA[Hormat saya,]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="290" y="471" width="196" height="15" uuid="0cafbae8-85e2-4779-8f6e-b3cdc6e809b8">
+				<reportElement positionType="Float" x="320" y="471" width="196" height="15" uuid="0cafbae8-85e2-4779-8f6e-b3cdc6e809b8">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1408,7 +1408,7 @@
 				<textFieldExpression><![CDATA[$F{nama}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="290" y="486" width="196" height="15" uuid="ce679080-f4c0-4d25-b8ca-23f2a0b63dfe">
+				<reportElement positionType="Float" x="320" y="486" width="196" height="15" uuid="ce679080-f4c0-4d25-b8ca-23f2a0b63dfe">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -1418,7 +1418,7 @@
 				<textFieldExpression><![CDATA[$F{nip}!=null?"NIP."+$F{nip}:""]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="73" y="401" width="197" height="15" uuid="dcd65b55-2835-439c-840b-84503d8e99ff"/>
+				<reportElement positionType="Float" x="50" y="401" width="250" height="15" uuid="dcd65b55-2835-439c-840b-84503d8e99ff"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri.jrxml
index 4298381a..e335787d 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri.jrxml
@@ -809,7 +809,7 @@
 				<textFieldExpression><![CDATA[($F{jabatanKaRu}!=null?$F{jabatanKaRu}:"")]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="363" y="449" width="126" height="15" uuid="07ed3fe2-88da-46f2-b052-64dda835caf6"/>
+				<reportElement positionType="Float" x="330" y="449" width="159" height="15" uuid="07ed3fe2-88da-46f2-b052-64dda835caf6"/>
 				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
@@ -834,7 +834,7 @@
 				<textFieldExpression><![CDATA[($F{nipKaRu}!=null?"NIP."+$F{nipKaRu}:"")]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="359" y="498" width="225" height="15" uuid="cce840a0-73eb-4605-a00f-d594863c5a5c">
+				<reportElement positionType="Float" x="330" y="498" width="254" height="15" uuid="cce840a0-73eb-4605-a00f-d594863c5a5c">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -843,7 +843,7 @@
 				<textFieldExpression><![CDATA[$F{nama}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="359" y="512" width="225" height="15" uuid="fedbc99d-2a6c-46ba-9e06-3867a2112ebf">
+				<reportElement positionType="Float" x="330" y="512" width="254" height="15" uuid="fedbc99d-2a6c-46ba-9e06-3867a2112ebf">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -935,7 +935,7 @@
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
 			<textField>
-				<reportElement positionType="Float" x="359" y="571" width="229" height="31" uuid="34fd8443-52f6-40aa-abfd-a27d1a03b300">
+				<reportElement positionType="Float" x="330" y="571" width="258" height="31" uuid="34fd8443-52f6-40aa-abfd-a27d1a03b300">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -945,7 +945,7 @@
 				<textFieldExpression><![CDATA[($F{jabatanAtasan1}!=null?$F{jabatanAtasan1}:"")]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="358" y="621" width="229" height="15" uuid="20fa3dbc-f80d-4094-9cda-40f3689680b0">
+				<reportElement positionType="Float" x="330" y="621" width="256" height="15" uuid="20fa3dbc-f80d-4094-9cda-40f3689680b0">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -954,7 +954,7 @@
 				<textFieldExpression><![CDATA[$F{namaAtasan1}!=null?$F{namaAtasan1}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="358" y="631" width="229" height="15" uuid="adb68d0d-1735-4f67-b1d9-96eb320ebfce">
+				<reportElement positionType="Float" x="330" y="631" width="256" height="15" uuid="adb68d0d-1735-4f67-b1d9-96eb320ebfce">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
@@ -1080,7 +1080,7 @@
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
 			<textField>
-				<reportElement positionType="Float" x="358" y="756" width="229" height="15" uuid="f59db5b7-3fd7-4db4-bfe3-ddf935c5b155">
+				<reportElement positionType="Float" x="330" y="756" width="256" height="15" uuid="f59db5b7-3fd7-4db4-bfe3-ddf935c5b155">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1089,7 +1089,7 @@
 				<textFieldExpression><![CDATA["NIP."+($F{nipAtasan2}!=null?$F{nipAtasan2}:"")]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="358" y="741" width="229" height="15" uuid="3446e336-d161-4199-9481-7f044bfaa7be">
+				<reportElement positionType="Float" x="330" y="741" width="256" height="15" uuid="3446e336-d161-4199-9481-7f044bfaa7be">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -1098,7 +1098,7 @@
 				<textFieldExpression><![CDATA[$F{namaAtasan2}!=null?$F{namaAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="358" y="690" width="229" height="31" uuid="eb44b0d0-5ef3-4a3a-a9c7-b6f155aaf466">
+				<reportElement positionType="Float" x="330" y="690" width="256" height="31" uuid="eb44b0d0-5ef3-4a3a-a9c7-b6f155aaf466">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -1159,7 +1159,7 @@
 				<textFieldExpression><![CDATA["Catatan:\n*      Coret yang tidak perlu\n**     Pilih salah satu\n***    Diisi oleh pejabat yang menangani bidang kepegawaian sebelum PNS mengajukan cuti\n****   Diberi tanda centang dan alasannya."]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="357" y="816" width="229" height="31" uuid="0d58df39-1988-4b97-8f50-f72a8fbf7e81">
+				<reportElement positionType="Float" x="330" y="816" width="255" height="31" uuid="0d58df39-1988-4b97-8f50-f72a8fbf7e81">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -1168,7 +1168,7 @@
 				<textFieldExpression><![CDATA[$F{isCutiLuarNegeri}==true?$F{labelTtdMenkes}:($F{jabatanAtasan}!=null?$F{jabatanAtasan}:"")]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="358" y="868" width="229" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
+				<reportElement positionType="Float" x="330" y="868" width="256" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -1177,7 +1177,7 @@
 				<textFieldExpression><![CDATA[$F{isCutiLuarNegeri}==true?($F{menteriKesehatan}!=null?$F{menteriKesehatan}:""):($F{namaAtasan}!=null?$F{namaAtasan}:"")]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="358" y="883" width="229" height="15" uuid="009ea072-2b37-436a-92b9-f5cc6d7b39d6">
+				<reportElement positionType="Float" x="330" y="883" width="256" height="15" uuid="009ea072-2b37-436a-92b9-f5cc6d7b39d6">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1494,17 +1494,20 @@
 					<text><![CDATA[Demikian kami sampaikan. Atas perhatian Bapak/Ibu, kami sampaikan terima kasih.]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" x="245" y="75" width="170" height="30" uuid="c06c67a4-7607-4dcf-9857-0a295d5ff38a"/>
+					<reportElement positionType="Float" x="160" y="75" width="255" height="30" uuid="c06c67a4-7607-4dcf-9857-0a295d5ff38a"/>
+					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$F{namaJabatanDirut}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement positionType="Float" x="245" y="145" width="170" height="15" uuid="6cce86b3-e6dd-4d56-91d1-4202df2f219a">
+					<reportElement positionType="Float" x="160" y="145" width="255" height="15" uuid="6cce86b3-e6dd-4d56-91d1-4202df2f219a">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
+					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$F{namaLengkapDirut}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement positionType="Float" x="245" y="160" width="170" height="15" uuid="770527fe-c551-4d92-bd45-c9846b16408d"/>
+					<reportElement positionType="Float" x="160" y="160" width="255" height="15" uuid="770527fe-c551-4d92-bd45-c9846b16408d"/>
+					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[($F{nipDirut}!=null?"NIP. "+$F{nipDirut}:"")]]></textFieldExpression>
 				</textField>
 				<staticText>
@@ -1652,7 +1655,7 @@
 				<textFieldExpression><![CDATA["       Demikian permohonan "+($F{statusPegawai}!=null?$F{statusPegawai}.toLowerCase():"-")+" ini saya buat, terima kasih."]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="410" width="197" height="31" uuid="38f2321c-a453-4d37-bc4e-d4507c93a373">
+				<reportElement positionType="Float" x="43" y="410" width="250" height="31" uuid="38f2321c-a453-4d37-bc4e-d4507c93a373">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -1662,7 +1665,7 @@
 				<textFieldExpression><![CDATA[$F{jabatanAtasan1}!=null?$F{jabatanAtasan1}:$F{jabatanAtasan2}!=null?$F{jabatanAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="465" width="197" height="15" uuid="d474f1e3-5cdd-47b3-b28f-5aae4978737a">
+				<reportElement positionType="Float" x="43" y="465" width="250" height="15" uuid="d474f1e3-5cdd-47b3-b28f-5aae4978737a">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1671,7 +1674,7 @@
 				<textFieldExpression><![CDATA[$F{namaAtasan1}!=null?$F{namaAtasan1}:$F{namaAtasan2}!=null?$F{namaAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="480" width="197" height="15" uuid="3b97642c-b56e-42e3-a6d1-2ef2e115bb0e">
+				<reportElement positionType="Float" x="43" y="480" width="250" height="15" uuid="3b97642c-b56e-42e3-a6d1-2ef2e115bb0e">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
@@ -1680,14 +1683,14 @@
 				<textFieldExpression><![CDATA[$F{nipAtasan1}!=null?"NIP."+$F{nipAtasan1}:$F{nipAtasan2}!=null?"NIP."+$F{nipAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="290" y="395" width="196" height="15" uuid="d75bb821-e66f-4bf9-a862-e53b07e29d71"/>
+				<reportElement positionType="Float" x="313" y="395" width="196" height="15" uuid="d75bb821-e66f-4bf9-a862-e53b07e29d71"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
 				<text><![CDATA[Hormat saya,]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="290" y="465" width="196" height="15" uuid="b31bff61-b9d0-4b0c-a1e2-ab8372ffca05">
+				<reportElement positionType="Float" x="313" y="465" width="196" height="15" uuid="b31bff61-b9d0-4b0c-a1e2-ab8372ffca05">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1696,7 +1699,7 @@
 				<textFieldExpression><![CDATA[$F{nama}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="290" y="480" width="196" height="15" uuid="1ab446e3-18c3-48a6-9e9c-d921f5da58d4">
+				<reportElement positionType="Float" x="313" y="480" width="196" height="15" uuid="1ab446e3-18c3-48a6-9e9c-d921f5da58d4">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -1706,7 +1709,7 @@
 				<textFieldExpression><![CDATA[$F{nip}!=null?"NIP."+$F{nip}:""]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="73" y="395" width="197" height="15" uuid="22df296a-d82d-4325-9fff-ca6d603937b0"/>
+				<reportElement positionType="Float" x="43" y="395" width="250" height="15" uuid="22df296a-d82d-4325-9fff-ca6d603937b0"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri2021.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri2021.jrxml
index cee33c0e..e132b4dd 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri2021.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiLuarNegeri2021.jrxml
@@ -808,7 +808,7 @@
 				<textFieldExpression><![CDATA[($F{jabatanKaRu}!=null?$F{jabatanKaRu}:"")]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="335" y="449" width="221" height="15" uuid="07ed3fe2-88da-46f2-b052-64dda835caf6"/>
+				<reportElement positionType="Float" x="310" y="449" width="246" height="15" uuid="07ed3fe2-88da-46f2-b052-64dda835caf6"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
@@ -833,7 +833,7 @@
 				<textFieldExpression><![CDATA[($F{nipKaRu}!=null?"NIP."+$F{nipKaRu}:"")]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="331" y="498" width="225" height="15" uuid="cce840a0-73eb-4605-a00f-d594863c5a5c">
+				<reportElement positionType="Float" x="310" y="498" width="246" height="15" uuid="cce840a0-73eb-4605-a00f-d594863c5a5c">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -842,7 +842,7 @@
 				<textFieldExpression><![CDATA[$F{nama}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="331" y="512" width="225" height="15" uuid="fedbc99d-2a6c-46ba-9e06-3867a2112ebf">
+				<reportElement positionType="Float" x="310" y="512" width="246" height="15" uuid="fedbc99d-2a6c-46ba-9e06-3867a2112ebf">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -934,7 +934,7 @@
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
 			<textField>
-				<reportElement positionType="Float" x="331" y="571" width="229" height="31" uuid="34fd8443-52f6-40aa-abfd-a27d1a03b300">
+				<reportElement positionType="Float" x="310" y="571" width="250" height="31" uuid="34fd8443-52f6-40aa-abfd-a27d1a03b300">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -944,7 +944,7 @@
 				<textFieldExpression><![CDATA[$F{jabatanAtasan1}!=null?$F{jabatanAtasan1}:$F{jabatanAtasan2}!=null?$F{jabatanAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="330" y="621" width="229" height="15" uuid="20fa3dbc-f80d-4094-9cda-40f3689680b0">
+				<reportElement positionType="Float" x="310" y="621" width="249" height="15" uuid="20fa3dbc-f80d-4094-9cda-40f3689680b0">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -953,7 +953,7 @@
 				<textFieldExpression><![CDATA[$F{namaAtasan1}!=null?$F{namaAtasan1}:$F{namaAtasan2}!=null?$F{namaAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="330" y="631" width="229" height="15" uuid="adb68d0d-1735-4f67-b1d9-96eb320ebfce">
+				<reportElement positionType="Float" x="310" y="631" width="249" height="15" uuid="adb68d0d-1735-4f67-b1d9-96eb320ebfce">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Bottom">
@@ -1050,7 +1050,7 @@
 				<textFieldExpression><![CDATA["Catatan:\n*      Coret yang tidak perlu\n**     Pilih salah satu\n***    Diisi oleh pejabat yang menangani bidang kepegawaian sebelum PNS mengajukan cuti\n****   Diberi tanda centang dan alasannya."]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="330" y="758" width="229" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
+				<reportElement positionType="Float" x="310" y="758" width="249" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -1158,14 +1158,14 @@
 				<textFieldExpression><![CDATA[$F{jabatanKaRu}!=null?"Mengetahui,":""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="329" y="690" width="229" height="31" uuid="45a92db2-bfb0-4e2f-aa72-97da92b26035">
+				<reportElement x="310" y="690" width="248" height="31" uuid="45a92db2-bfb0-4e2f-aa72-97da92b26035">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{labelTtdMenkes}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="330" y="776" width="229" height="15" uuid="a566f785-6610-4012-9647-09471f6ce654">
+				<reportElement x="310" y="776" width="249" height="15" uuid="a566f785-6610-4012-9647-09471f6ce654">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top"/>
@@ -1384,17 +1384,20 @@
 					<text><![CDATA[Demikian kami sampaikan. Atas perhatian Bapak/Ibu, kami sampaikan terima kasih.]]></text>
 				</staticText>
 				<textField>
-					<reportElement positionType="Float" x="245" y="75" width="170" height="30" uuid="c06c67a4-7607-4dcf-9857-0a295d5ff38a"/>
+					<reportElement positionType="Float" x="170" y="75" width="243" height="30" uuid="c06c67a4-7607-4dcf-9857-0a295d5ff38a"/>
+					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$F{namaJabatanDirut}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement positionType="Float" x="245" y="145" width="170" height="15" uuid="6cce86b3-e6dd-4d56-91d1-4202df2f219a">
+					<reportElement positionType="Float" x="170" y="145" width="244" height="15" uuid="6cce86b3-e6dd-4d56-91d1-4202df2f219a">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
+					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[$F{namaLengkapDirut}]]></textFieldExpression>
 				</textField>
 				<textField>
-					<reportElement positionType="Float" x="245" y="160" width="170" height="15" uuid="770527fe-c551-4d92-bd45-c9846b16408d"/>
+					<reportElement positionType="Float" x="170" y="160" width="244" height="15" uuid="770527fe-c551-4d92-bd45-c9846b16408d"/>
+					<textElement textAlignment="Right"/>
 					<textFieldExpression><![CDATA[($F{nipDirut}!=null?"NIP. "+$F{nipDirut}:"")]]></textFieldExpression>
 				</textField>
 				<staticText>
@@ -1542,7 +1545,7 @@
 				<textFieldExpression><![CDATA["       Demikian permohonan "+($F{statusPegawai}!=null?$F{statusPegawai}.toLowerCase():"-")+" ini saya buat, terima kasih."]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="410" width="197" height="31" uuid="e3bc2cff-ad49-4a0c-8f3d-8a40b9082ee1">
+				<reportElement positionType="Float" x="44" y="410" width="250" height="31" uuid="e3bc2cff-ad49-4a0c-8f3d-8a40b9082ee1">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -1552,7 +1555,7 @@
 				<textFieldExpression><![CDATA[$F{jabatanAtasan1}!=null?$F{jabatanAtasan1}:$F{jabatanAtasan2}!=null?$F{jabatanAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="465" width="197" height="15" uuid="3e3cfade-f642-4e99-b190-8408c83414f8">
+				<reportElement positionType="Float" x="44" y="465" width="250" height="15" uuid="3e3cfade-f642-4e99-b190-8408c83414f8">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1561,7 +1564,7 @@
 				<textFieldExpression><![CDATA[$F{namaAtasan1}!=null?$F{namaAtasan1}:$F{namaAtasan2}!=null?$F{namaAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="480" width="197" height="15" uuid="8489fa15-2015-4ef9-8e0b-8ee1467f6e86">
+				<reportElement positionType="Float" x="44" y="480" width="250" height="15" uuid="8489fa15-2015-4ef9-8e0b-8ee1467f6e86">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
@@ -1570,14 +1573,14 @@
 				<textFieldExpression><![CDATA[$F{nipAtasan1}!=null?"NIP."+$F{nipAtasan1}:$F{nipAtasan2}!=null?"NIP."+$F{nipAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="290" y="395" width="196" height="15" uuid="a0bc4dcc-7149-4ec4-8113-1cfa7bfbaacc"/>
+				<reportElement positionType="Float" x="314" y="395" width="196" height="15" uuid="a0bc4dcc-7149-4ec4-8113-1cfa7bfbaacc"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
 				<text><![CDATA[Hormat saya,]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="290" y="465" width="196" height="15" uuid="d0695572-1c30-4d31-bdf0-93f65143912e">
+				<reportElement positionType="Float" x="314" y="465" width="196" height="15" uuid="d0695572-1c30-4d31-bdf0-93f65143912e">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1586,7 +1589,7 @@
 				<textFieldExpression><![CDATA[$F{nama}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="290" y="480" width="196" height="15" uuid="89b2859e-5da2-439f-b54f-2f5a4dae802b">
+				<reportElement positionType="Float" x="314" y="480" width="196" height="15" uuid="89b2859e-5da2-439f-b54f-2f5a4dae802b">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -1596,7 +1599,7 @@
 				<textFieldExpression><![CDATA[$F{nip}!=null?"NIP."+$F{nip}:""]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="73" y="395" width="197" height="15" uuid="7a36944a-46ea-4a99-bd40-72f44bf007c6"/>
+				<reportElement positionType="Float" x="44" y="395" width="250" height="15" uuid="7a36944a-46ea-4a99-bd40-72f44bf007c6"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiNew.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiNew.jrxml
index a5b81eed..ebc4de15 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiNew.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapPermohonanCutiNew.jrxml
@@ -811,7 +811,7 @@
 				<textFieldExpression><![CDATA[($F{jabatanKaRu}!=null?$F{jabatanKaRu}:"")]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="335" y="451" width="147" height="15" uuid="07ed3fe2-88da-46f2-b052-64dda835caf6"/>
+				<reportElement positionType="Float" x="300" y="451" width="182" height="15" uuid="07ed3fe2-88da-46f2-b052-64dda835caf6"/>
 				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
@@ -836,7 +836,7 @@
 				<textFieldExpression><![CDATA[($F{nipKaRu}!=null?"NIP."+$F{nipKaRu}:"")]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="331" y="500" width="228" height="15" uuid="cce840a0-73eb-4605-a00f-d594863c5a5c">
+				<reportElement positionType="Float" x="300" y="500" width="259" height="15" uuid="cce840a0-73eb-4605-a00f-d594863c5a5c">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -845,7 +845,7 @@
 				<textFieldExpression><![CDATA[$F{nama}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="331" y="514" width="228" height="15" uuid="fedbc99d-2a6c-46ba-9e06-3867a2112ebf">
+				<reportElement positionType="Float" x="300" y="514" width="259" height="15" uuid="fedbc99d-2a6c-46ba-9e06-3867a2112ebf">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -937,7 +937,7 @@
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
 			<textField>
-				<reportElement positionType="Float" x="331" y="573" width="228" height="31" uuid="34fd8443-52f6-40aa-abfd-a27d1a03b300">
+				<reportElement positionType="Float" x="300" y="573" width="259" height="31" uuid="34fd8443-52f6-40aa-abfd-a27d1a03b300">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -947,7 +947,7 @@
 				<textFieldExpression><![CDATA[($F{jabatanAtasan1}!=null?$F{jabatanAtasan1}:"")]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="330" y="623" width="230" height="15" uuid="20fa3dbc-f80d-4094-9cda-40f3689680b0">
+				<reportElement positionType="Float" x="300" y="623" width="259" height="15" uuid="20fa3dbc-f80d-4094-9cda-40f3689680b0">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -956,7 +956,7 @@
 				<textFieldExpression><![CDATA[$F{namaAtasan1}!=null?$F{namaAtasan1}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="330" y="633" width="230" height="15" uuid="adb68d0d-1735-4f67-b1d9-96eb320ebfce">
+				<reportElement positionType="Float" x="300" y="633" width="259" height="15" uuid="adb68d0d-1735-4f67-b1d9-96eb320ebfce">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
@@ -1082,7 +1082,7 @@
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
 			<textField>
-				<reportElement positionType="Float" x="330" y="758" width="230" height="15" uuid="f59db5b7-3fd7-4db4-bfe3-ddf935c5b155">
+				<reportElement positionType="Float" x="300" y="758" width="259" height="15" uuid="f59db5b7-3fd7-4db4-bfe3-ddf935c5b155">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1091,7 +1091,7 @@
 				<textFieldExpression><![CDATA["NIP."+($F{nipAtasan2}!=null?$F{nipAtasan2}:"")]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="330" y="743" width="230" height="15" uuid="3446e336-d161-4199-9481-7f044bfaa7be">
+				<reportElement positionType="Float" x="300" y="743" width="259" height="15" uuid="3446e336-d161-4199-9481-7f044bfaa7be">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 				</reportElement>
 				<textElement verticalAlignment="Middle">
@@ -1100,7 +1100,7 @@
 				<textFieldExpression><![CDATA[$F{namaAtasan2}!=null?$F{namaAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="330" y="692" width="230" height="31" uuid="eb44b0d0-5ef3-4a3a-a9c7-b6f155aaf466">
+				<reportElement positionType="Float" x="300" y="692" width="259" height="31" uuid="eb44b0d0-5ef3-4a3a-a9c7-b6f155aaf466">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
@@ -1154,7 +1154,7 @@
 				<text><![CDATA[ TIDAK DISETUJUI****]]></text>
 			</staticText>
 			<textField>
-				<reportElement positionType="Float" x="329" y="870" width="228" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
+				<reportElement positionType="Float" x="300" y="870" width="256" height="15" uuid="b14bad62-5456-430f-82f3-f8fc44c52324">
 					<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1326,13 +1326,13 @@
 				<text><![CDATA[]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="329" y="818" width="230" height="31" uuid="36754b8f-0d34-4cb8-9f4e-f4c0d94ac220">
+				<reportElement x="300" y="818" width="258" height="31" uuid="36754b8f-0d34-4cb8-9f4e-f4c0d94ac220">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textFieldExpression><![CDATA[$F{labelTtdMenkes}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="329" y="888" width="228" height="15" uuid="591e8e5e-8780-4918-b947-26c614c6835a">
+				<reportElement x="300" y="888" width="256" height="15" uuid="591e8e5e-8780-4918-b947-26c614c6835a">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<textFieldExpression><![CDATA[$F{nipMenkes} != null ? $F{nipMenkes} : ""]]></textFieldExpression>
@@ -1470,7 +1470,7 @@
 				<textFieldExpression><![CDATA["       Demikian permohonan "+($F{statusPegawai}!=null?$F{statusPegawai}.toLowerCase():"-")+" ini saya buat, terima kasih."]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="416" width="197" height="31" uuid="86a26d64-b72a-452f-a5d0-545824fff617">
+				<reportElement positionType="Float" x="44" y="416" width="250" height="31" uuid="86a26d64-b72a-452f-a5d0-545824fff617">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -1480,7 +1480,7 @@
 				<textFieldExpression><![CDATA[$F{jabatanAtasan1}!=null?$F{jabatanAtasan1}:$F{jabatanAtasan2}!=null?$F{jabatanAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="471" width="197" height="15" uuid="648fd884-67c5-4d08-a58e-752d43a651bd">
+				<reportElement positionType="Float" x="44" y="471" width="250" height="15" uuid="648fd884-67c5-4d08-a58e-752d43a651bd">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1489,7 +1489,7 @@
 				<textFieldExpression><![CDATA[$F{namaAtasan1}!=null?$F{namaAtasan1}:$F{namaAtasan2}!=null?$F{namaAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="73" y="486" width="197" height="15" uuid="fe05c47f-aab5-4edf-98f7-aaebc9bdc6a1">
+				<reportElement positionType="Float" x="44" y="486" width="250" height="15" uuid="fe05c47f-aab5-4edf-98f7-aaebc9bdc6a1">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
@@ -1498,14 +1498,14 @@
 				<textFieldExpression><![CDATA[$F{nipAtasan1}!=null?"NIP."+$F{nipAtasan1}:$F{nipAtasan2}!=null?"NIP."+$F{nipAtasan2}:""]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="290" y="401" width="196" height="15" uuid="7bcc7a28-b37f-4a3a-a562-d57c8dc2835f"/>
+				<reportElement positionType="Float" x="314" y="401" width="196" height="15" uuid="7bcc7a28-b37f-4a3a-a562-d57c8dc2835f"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
 				<text><![CDATA[Hormat saya,]]></text>
 			</staticText>
 			<textField isBlankWhenNull="true">
-				<reportElement positionType="Float" x="290" y="471" width="196" height="15" uuid="265785ad-e0c1-4f4e-b063-d98c95e27d74">
+				<reportElement positionType="Float" x="314" y="471" width="196" height="15" uuid="265785ad-e0c1-4f4e-b063-d98c95e27d74">
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
@@ -1514,7 +1514,7 @@
 				<textFieldExpression><![CDATA[$F{nama}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement positionType="Float" x="290" y="486" width="196" height="15" uuid="b3b92289-e3f8-4ac0-b504-979631082aab">
+				<reportElement positionType="Float" x="314" y="486" width="196" height="15" uuid="b3b92289-e3f8-4ac0-b504-979631082aab">
 					<property name="com.jaspersoft.studio.unit.x" value="pixel"/>
 					<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
 				</reportElement>
@@ -1524,7 +1524,7 @@
 				<textFieldExpression><![CDATA[$F{nip}!=null?"NIP."+$F{nip}:""]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="73" y="401" width="197" height="15" uuid="79946d39-f451-46d9-b43f-c538274991d3"/>
+				<reportElement positionType="Float" x="44" y="401" width="250" height="15" uuid="79946d39-f451-46d9-b43f-c538274991d3"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml
index 24aa2222..47934e89 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/lapSuratIzin.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.8.0.final using JasperReports Library version 6.8.0-2ed8dfabb690ff337a5797129f2cd92902b0c87b  -->
+<!-- Created with Jaspersoft Studio version 6.11.0.final using JasperReports Library version 6.11.0-0c4056ccaa4d25a5a8c45672d2f764ea3498bebb  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="lapLogbook" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="8f989d7a-d471-4abe-a6d3-d5771bd2eec8">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
@@ -223,21 +223,21 @@
 				<text><![CDATA[langsungnya.]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="360" y="360" width="200" height="20" uuid="c10b399c-063d-4109-be91-ad164fd1ae64"/>
+				<reportElement x="310" y="360" width="250" height="20" uuid="c10b399c-063d-4109-be91-ad164fd1ae64"/>
 				<textElement verticalAlignment="Bottom">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{jabatanAtasan}!=null?$F{jabatanAtasan}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="360" y="450" width="200" height="20" uuid="35cb8e5c-fdd3-4b07-9670-a36c965f653e"/>
+				<reportElement x="310" y="450" width="250" height="20" uuid="35cb8e5c-fdd3-4b07-9670-a36c965f653e"/>
 				<textElement verticalAlignment="Bottom">
 					<font size="12" isUnderline="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{namaAtasan}!=null?$F{namaAtasan}:""]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="360" y="470" width="200" height="20" uuid="890d6cb9-8a4d-4355-b480-c4e075fe487c"/>
+				<reportElement x="310" y="470" width="250" height="20" uuid="890d6cb9-8a4d-4355-b480-c4e075fe487c"/>
 				<textElement>
 					<font size="12"/>
 				</textElement>
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratPelimpahanTugas.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratPelimpahanTugas.jrxml
index 027cb047..87e49877 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratPelimpahanTugas.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratPelimpahanTugas.jrxml
@@ -90,40 +90,40 @@
 				<textFieldExpression><![CDATA["Jakarta, " + new SimpleDateFormat("dd MMMM yyyy", new Locale("in","ID")).format(new Date())]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" x="70" y="210" width="210" height="20" uuid="343af5f4-7d7c-4e23-a609-046a435d4e2b"/>
+				<reportElement positionType="Float" x="20" y="210" width="250" height="20" uuid="343af5f4-7d7c-4e23-a609-046a435d4e2b"/>
 				<text><![CDATA[Yang Menerima Pelimpahan,]]></text>
 			</staticText>
 			<staticText>
-				<reportElement positionType="Float" x="310" y="210" width="230" height="20" uuid="02be9378-d2c3-4f40-9e72-751988b66138"/>
+				<reportElement positionType="Float" x="290" y="210" width="250" height="20" uuid="02be9378-d2c3-4f40-9e72-751988b66138"/>
 				<text><![CDATA[Yang Melimpahkan,]]></text>
 			</staticText>
 			<textField textAdjust="StretchHeight">
-				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="70" y="270" width="210" height="20" uuid="c2f79fc9-953e-4cb4-a1c5-3adc4f0ef4b9"/>
+				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="20" y="270" width="250" height="20" uuid="c2f79fc9-953e-4cb4-a1c5-3adc4f0ef4b9"/>
 				<textFieldExpression><![CDATA[$F{namaPegawaiDilimpah}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="311" y="270" width="229" height="20" uuid="3bdfbfbc-adc0-4a3a-bb47-518b8d9682f2"/>
+				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="290" y="270" width="250" height="20" uuid="3bdfbfbc-adc0-4a3a-bb47-518b8d9682f2"/>
 				<textFieldExpression><![CDATA[$F{namaPegawaiPelimpah}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="180" y="330" width="230" height="20" uuid="ffd63efb-c65f-43e7-adbe-b7e4e2b16288"/>
+				<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="170" y="331" width="250" height="20" uuid="ffd63efb-c65f-43e7-adbe-b7e4e2b16288"/>
 				<textElement textAlignment="Left" verticalAlignment="Top"/>
 				<text><![CDATA[Mengetahui,]]></text>
 			</staticText>
 			<textField textAdjust="StretchHeight">
-				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="180" y="390" width="230" height="20" uuid="6c2cf8dd-b6b3-4e95-8f49-f46554c8c159"/>
+				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="170" y="391" width="250" height="20" uuid="6c2cf8dd-b6b3-4e95-8f49-f46554c8c159"/>
 				<textFieldExpression><![CDATA[$F{namaAtasanLangsungPegawaiPelimpah}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="310" y="290" width="230" height="20" uuid="2ba19767-a02c-403c-85db-944e471d2864"/>
+				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="290" y="290" width="250" height="20" uuid="2ba19767-a02c-403c-85db-944e471d2864"/>
 				<textFieldExpression><![CDATA["NIP."+$F{nipPegawaiPelimpah}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="70" y="290" width="210" height="20" uuid="466020b3-42b1-4436-b0b6-c48a88ae84da"/>
+				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="20" y="290" width="250" height="20" uuid="466020b3-42b1-4436-b0b6-c48a88ae84da"/>
 				<textFieldExpression><![CDATA["NIP."+$F{nipPegawaiDilimpah}]]></textFieldExpression>
 			</textField>
 			<textField textAdjust="StretchHeight">
-				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="180" y="410" width="230" height="20" uuid="516bb3ff-0c22-407c-b60f-98e6046d3e33"/>
+				<reportElement positionType="Float" stretchType="RelativeToBandHeight" isPrintRepeatedValues="false" x="170" y="411" width="250" height="20" uuid="516bb3ff-0c22-407c-b60f-98e6046d3e33"/>
 				<textFieldExpression><![CDATA["NIP."+$F{nipAtasanLangsungPegawaiPelimpah}]]></textFieldExpression>
 			</textField>
 			<textField>
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratTugas.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratTugas.jrxml
index f7ed642a..dabdbe79 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratTugas.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratTugas.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.12.0.final using JasperReports Library version 6.12.1-ac0eebdb29e4c0985457bab279a6db744d661530  -->
+<!-- Created with Jaspersoft Studio version 6.11.0.final using JasperReports Library version 6.11.0-0c4056ccaa4d25a5a8c45672d2f764ea3498bebb  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="suratTugas" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="1d63a912-04ee-47d6-9d66-c47a2bbd2dca">
 	<property name="com.jaspersoft.studio.data.defaultdataadapter" value="One Empty Record"/>
 	<parameter name="nipPegawai" class="java.lang.String"/>
@@ -173,28 +173,28 @@
 				<text><![CDATA[Agar yang bersangkutan melaksanakan kegiatan dengan baik dan penuh tanggung jawab.]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="330" y="260" width="222" height="20" uuid="dfa21b9c-d072-4090-afea-e1ec60ab9c88"/>
+				<reportElement x="300" y="260" width="252" height="20" uuid="dfa21b9c-d072-4090-afea-e1ec60ab9c88"/>
 				<textElement verticalAlignment="Middle">
 					<font size="11"/>
 				</textElement>
 				<textFieldExpression><![CDATA["Jakarta, "+$F{today}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement x="330" y="280" width="222" height="20" uuid="5951bbc1-9cdd-4187-b94a-c3d4e1baeea6"/>
+				<reportElement x="300" y="280" width="252" height="20" uuid="5951bbc1-9cdd-4187-b94a-c3d4e1baeea6"/>
 				<textElement verticalAlignment="Middle">
 					<font size="11"/>
 				</textElement>
 				<text><![CDATA[Direktur SDM dan Pendidikan]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="330" y="350" width="222" height="20" uuid="aec0481a-2569-4e43-a198-80746a6ea13a"/>
+				<reportElement x="300" y="350" width="252" height="20" uuid="aec0481a-2569-4e43-a198-80746a6ea13a"/>
 				<textElement verticalAlignment="Middle">
 					<font size="11"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{namaPegawai}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement x="330" y="370" width="222" height="20" uuid="27c0d77b-71c1-458a-b88c-f940e8046291"/>
+				<reportElement x="300" y="370" width="252" height="20" uuid="27c0d77b-71c1-458a-b88c-f940e8046291"/>
 				<textElement verticalAlignment="Middle">
 					<font size="11"/>
 				</textElement>