salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-deploy

Browse Source
This commit is contained in:
Salman Manoe 2023-11-28 08:45:31 +07:00
commit c69023d15c
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SlipGajiService.java
View File

@ -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();
}

12
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
View File

@ -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<>();

39
jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
View File

@ -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>