From b1a90ec28529dcaab1285ff9de84e5b0f0900542 Mon Sep 17 00:00:00 2001
From: salmanoe <salmanoe@live.com>
Date: Fri, 15 Jan 2021 19:05:38 +0700
Subject: [PATCH] penambahan space untuk kop surat dan no surat

---
 .../service/impl/ReportServiceImpl.java         |  8 +++++++-
 .../medifirst2000/base/BaseModel.java           |  2 --
 .../jrxml/suratIzinSementaraCuti.jrxml          | 17 ++++++++++++-----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
index bdd6419d..083def9e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
@@ -2535,7 +2535,13 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 				UnitKerjaPegawai unitKerja = unitKerjaDao.findOne(idUnitKerja);
 				result.put("namaPegawai", pegawai.get("nama"));
 				result.put("nipPegawai", pegawai.get("nipPns"));
-				result.put("namaPangkatGolongan", pegawai.get("namaGolongan"));
+				if (CommonUtil.isNotNullOrEmpty(pegawai.get("namaPangkat"))
+						&& CommonUtil.isNotNullOrEmpty(pegawai.get("namaGolongan"))) {
+					result.put("namaPangkatGolongan",
+							pegawai.get("namaPangkat").toString() + "/ " + pegawai.get("namaGolongan").toString());
+				} else {
+					result.put("namaPangkatGolongan", "");
+				}
 				result.put("namaJabatan", jabatan.getNamaJabatan());
 				result.put("unitKerja", unitKerja.getName());
 				if (CommonUtil.isNotNullOrEmpty(statusPegawai)) {
diff --git a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseModel.java b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseModel.java
index de4a6932..a0b1045d 100644
--- a/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseModel.java
+++ b/jasamedika-core/src/main/java/com/jasamedika/medifirst2000/base/BaseModel.java
@@ -28,8 +28,6 @@ import com.jasamedika.medifirst2000.util.JsonUtil;
 @MappedSuperclass
 public abstract class BaseModel implements Serializable {
 	
-	private static final long serialVersionUID = -3699877637782824658L;
-	
 	public Map<String, Object> ToSingleMap() throws IllegalArgumentException, IllegalAccessException {
 		Map<String, Object> maps = new HashMap<String, Object>();
 		for (Field field : BaseModel.GetFields(this.getClass())) {
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratIzinSementaraCuti.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratIzinSementaraCuti.jrxml
index da17e4b3..b8bc911e 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratIzinSementaraCuti.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/suratIzinSementaraCuti.jrxml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 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="suratIzinSementara" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="81c2f907-a601-4101-8ea0-f382e0429e5b">
+<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="suratIzinSementara" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="170" bottomMargin="20" uuid="81c2f907-a601-4101-8ea0-f382e0429e5b">
 	<field name="namaPegawai" class="java.lang.String"/>
 	<field name="nipPegawai" class="java.lang.String"/>
 	<field name="namaPangkatGolongan" class="java.lang.String"/>
@@ -17,7 +17,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="79" splitType="Stretch">
+		<band height="100" splitType="Stretch">
 			<textField>
 				<reportElement x="30" y="30" width="495" height="40" uuid="d708c1a5-ad97-4234-a62c-f815323ae877"/>
 				<textElement textAlignment="Center" verticalAlignment="Top">
@@ -32,6 +32,13 @@
 				<textElement textAlignment="Right"/>
 				<textFieldExpression><![CDATA["Jakarta, " + new SimpleDateFormat("dd MMMM yyyy", new Locale("in","ID")).format(new Date())]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement x="30" y="70" width="495" height="20" uuid="e1bd5328-4030-4188-b515-6cae46190bcb"/>
+				<textElement textAlignment="Center" verticalAlignment="Top">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA["NOMOR : KP.04.02/XXI.2/            /2021"]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<summary>
@@ -83,12 +90,12 @@
 			</textField>
 			<textField>
 				<reportElement x="330" y="370" width="195" height="20" uuid="46994830-9074-4618-82fb-834c1dba68af"/>
-				<textElement textAlignment="Right" verticalAlignment="Top"/>
+				<textElement textAlignment="Center" verticalAlignment="Top"/>
 				<textFieldExpression><![CDATA["("+$F{namaAtasan}+")"]]></textFieldExpression>
 			</textField>
 			<textField>
 				<reportElement x="330" y="390" width="195" height="20" uuid="0362b07d-7e2a-427f-932c-07d9aa974965"/>
-				<textElement textAlignment="Right"/>
+				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA["NIP. "+$F{nipAtasan}]]></textFieldExpression>
 			</textField>
 			<textField>
@@ -119,7 +126,7 @@ Kepala Biro Kepegawaian Kementerian Kesehatan RI]]></text>
 			</staticText>
 			<textField>
 				<reportElement x="330" y="290" width="195" height="39" uuid="5b629bc0-0974-4e58-8cf0-f8c6e50cc666"/>
-				<textElement textAlignment="Right"/>
+				<textElement textAlignment="Center"/>
 				<textFieldExpression><![CDATA[$F{jabatanAtasan}]]></textFieldExpression>
 			</textField>
 			<staticText>