diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index 45f1766d..4f1bb3e2 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -9,8 +9,6 @@ public final class Master { public static final short KODE_PROFILE = 0; public static final String KONSUL = "konsul"; public static final String[] KONSUL_VISIT = { "konsul", "visit" }; - public static final Double MENIT_KERJA_HARIAN = 7.5 * 60.0; - public static final Double MENIT_KERJA_RAMADHAN = 6.0 * 60.0; public static final boolean STATUS_ENABLE_FALSE = false; public static final boolean STATUS_ENABLE_TRUE = true; public static final String TIDAK_ADA_PERUBAHAN_DATA = "Tidak Ada Perubahan Data!"; diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java index eadff315..1581e4b4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java @@ -152,6 +152,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb public LogbookKinerjaVO update(LogbookKinerjaVO vo) throws JpaSystemException, ServiceVOException { DateFormat mf = new SimpleDateFormat("yyyy-MM"); + double menitKerjaHarian = Double.parseDouble(GetSettingDataFixed("menitKerjaHarian")); LogbookKinerja logbookKinerjaLama = logbookKinerjaDao.findOne(vo.getNoRec()); Pegawai pegawai = pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai()); @@ -165,7 +166,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb logbookKinerjaBaru.setIndikatorKinerja(indikatorKinerja); if (vo.getIndikatorKinerja().getId().equals(Master.IndikatorKinerja.PEMENUHAN_JAM_KERJA)) { Integer targetHariKerja = hitungTargetHariKerja(vo.getBulan()); - Double targetJamKerja = targetHariKerja.doubleValue() * Master.MENIT_KERJA_HARIAN; + Double targetJamKerja = targetHariKerja.doubleValue() * menitKerjaHarian; logbookKinerjaBaru.setTarget(targetJamKerja); } @@ -408,6 +409,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb Date start = DateUtil.startMonth(bulan); Date end = DateUtil.endMonth(bulan); + double menitKerjaHarian = Double.parseDouble(GetSettingDataFixed("menitKerjaHarian")); + double menitKerjaRamadhan = Double.parseDouble(GetSettingDataFixed("menitKerjaRamadhan")); List targetPresensi = kalenderDao.getTargetKerja(start, end); int jumlahHariKerjaHarian = 0; int jumlahHariKerjaRamadhan = 0; @@ -420,8 +423,8 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } - result += (double) jumlahHariKerjaHarian * Master.MENIT_KERJA_HARIAN; - result += (double) jumlahHariKerjaRamadhan * Master.MENIT_KERJA_RAMADHAN; + result += (double) jumlahHariKerjaHarian * menitKerjaHarian; + result += (double) jumlahHariKerjaRamadhan * menitKerjaRamadhan; return result; }