From 9e1138801ca326c219bc8a8783ce3884a6197122 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Tue, 28 Nov 2023 07:46:10 +0700
Subject: [PATCH 1/3] Update service slip gaji

Clean code
---
 .../medifirst2000/service/SlipGajiService.java       |  9 +++------
 .../service/impl/SlipGajiServiceImpl.java            | 12 ------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SlipGajiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SlipGajiService.java
index dd0a128e..76df0ea0 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SlipGajiService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SlipGajiService.java
@@ -1,12 +1,11 @@
 package com.jasamedika.medifirst2000.service;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
 import com.jasamedika.medifirst2000.dto.KomponenGajiDto;
 import com.jasamedika.medifirst2000.dto.SlipGajiDto;
 
+import java.io.IOException;
+import java.util.List;
+
 /**
  * @author salmanoe
  * @since Jan 20, 2023
@@ -24,7 +23,5 @@ public interface SlipGajiService {
 
 	String writeExcel(Long bulan) throws IOException;
 
-	Map<String, Object> previewPdf(Integer pegawaiId, Long bulan);
-
 	List<KomponenGajiDto> listKomponen();
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
index d3f7e43b..894fde13 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
@@ -542,18 +542,6 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		return absoluteFilePath;
 	}
 
-	@Override
-	public Map<String, Object> previewPdf(Integer pegawaiId, Long bulan) {
-		SlipGajiDto dto = this.get(pegawaiId, bulan);
-		Map<String, Object> result = new HashMap<>();
-		result.put("namaPegawai", dto.getNamaPegawai());
-		result.put("nip", dto.getNip());
-		result.put("jabatan", dto.getJabatan());
-		result.put("unitKerja", dto.getUnitKerja());
-		result.put("subUnitKerja", dto.getSubUnitKerja());
-		return result;
-	}
-
 	@Override
 	public List<KomponenGajiDto> listKomponen() {
 		List<KomponenGajiDto> result = new ArrayList<>();

From 6b999994d40c8b69a01371aa173d69ee01bfccb6 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Tue, 28 Nov 2023 07:46:29 +0700
Subject: [PATCH 2/3] Update slipGaji.jrxml

Perbaikan redaksional footer slip gaji
---
 .../src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
index 7ad5ab64..46fe97ca 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
@@ -1724,7 +1724,7 @@
 					<textElement textAlignment="Right" verticalAlignment="Bottom">
 						<font size="5" isItalic="true"/>
 					</textElement>
-					<text><![CDATA[SLIP GAJI INI SAH TANPA TANDA TANGAN (GENERATED BY SYSTEM)]]></text>
+					<text><![CDATA[Slip Gaji ini dicetak secara elektronik dan sah tanpa tanda tangan]]></text>
 				</staticText>
 				<staticText>
 					<reportElement positionType="Float" x="160" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="91d9fddb-aecb-4195-9907-8674e48152e1">

From a269b4d25aadf82731004218cccf644898a8d102 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Tue, 28 Nov 2023 07:46:29 +0700
Subject: [PATCH 3/3] Update slipGaji.jrxml

Perbaikan redaksional footer slip gaji
---
 .../WEB-INF/templates/jrxml/slipGaji.jrxml    | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
index 7ad5ab64..bcd50a56 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
@@ -65,7 +65,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<summary>
-		<band height="590">
+		<band height="592">
 			<image>
 				<reportElement x="0" y="0" width="505" height="38" isPrintWhenDetailOverflows="true" uuid="c4fbc1c2-32a1-42ec-a770-88149a0d9be1">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
@@ -1716,16 +1716,6 @@
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
-				<staticText>
-					<reportElement positionType="Float" x="0" y="560" width="505" height="30" isPrintWhenDetailOverflows="true" uuid="efbf27e3-9c27-4d00-8eb2-3202d619b659">
-						<property name="com.jaspersoft.studio.unit.width" value="px"/>
-						<property name="com.jaspersoft.studio.unit.x" value="px"/>
-					</reportElement>
-					<textElement textAlignment="Right" verticalAlignment="Bottom">
-						<font size="5" isItalic="true"/>
-					</textElement>
-					<text><![CDATA[SLIP GAJI INI SAH TANPA TANDA TANGAN (GENERATED BY SYSTEM)]]></text>
-				</staticText>
 				<staticText>
 					<reportElement positionType="Float" x="160" y="348" width="90" height="12" isPrintWhenDetailOverflows="true" uuid="91d9fddb-aecb-4195-9907-8674e48152e1">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
@@ -1804,6 +1794,33 @@
 					</textElement>
 					<textFieldExpression><![CDATA[$F{remunerasiTambahanLain}]]></textFieldExpression>
 				</textField>
+				<textField>
+					<reportElement positionType="Float" x="0" y="560" width="505" height="20" isPrintWhenDetailOverflows="true" uuid="2a9e3ee6-219d-4378-b7e7-345ef1bb7a87">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box rightPadding="2">
+						<topPen lineWidth="0.0"/>
+						<bottomPen lineWidth="0.0"/>
+						<rightPen lineWidth="0.0"/>
+					</box>
+					<textElement textAlignment="Right" verticalAlignment="Bottom">
+						<font size="7" isItalic="true"/>
+					</textElement>
+					<textFieldExpression><![CDATA["Slip Gaji ini dicetak pada " + DateFormat.getDateInstance(1, new Locale("in", "ID")).format(new Date())]]></textFieldExpression>
+				</textField>
+				<staticText>
+					<reportElement positionType="Float" x="0" y="580" width="505" height="12" isPrintWhenDetailOverflows="true" uuid="90f1fa8b-a41c-4115-afff-5dffec1c8dca">
+						<property name="com.jaspersoft.studio.unit.width" value="px"/>
+						<property name="com.jaspersoft.studio.unit.x" value="px"/>
+						<property name="com.jaspersoft.studio.unit.height" value="px"/>
+					</reportElement>
+					<box rightPadding="2"/>
+					<textElement textAlignment="Right" verticalAlignment="Top">
+						<font size="7" isItalic="true"/>
+					</textElement>
+					<text><![CDATA[secara elektronik dan sah tanpa tanda tangan]]></text>
+				</staticText>
 			</elementGroup>
 		</band>
 	</summary>