jasamedika-bridging/src/main/webapp/WEB-INF/web.xml

@@ -15,7 +15,7 @@
     </context-param>
     <context-param>
         <param-name>spring.profiles.default</param-name>
-        <param-value>bridging</param-value>
+        <param-value>localhost</param-value>
     </context-param>
     
     <listener>

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailServiceImpl.java

@@ -333,25 +333,24 @@ public class LogbookKinerjaDetailServiceImpl extends BaseVoServiceImpl implement
 				logbookKinerjaDetailDao.save(catatanKinerja);
 			}
 			{
-				Optional<LogbookKinerja> byIdLogbook = logbookKinerjaDao.findByNoRec(catatanKinerja.getLogbookKinerjaId());
+				Optional<LogbookKinerja> byIdLogbook = logbookKinerjaDao
+						.findByNoRec(catatanKinerja.getLogbookKinerjaId());
 				byIdLogbook.ifPresent(logbookKinerja -> {
-					if (Arrays.asList(PERCENTAGE).contains(logbookKinerja.getIndikatorKinerja().getSatuanIndikatorId())) {
+					if (Arrays.asList(PERCENTAGE)
-						List<Map<String, Object>> listCatatan = logbookKinerjaDetailDao.findAvgCapaianByKontrak(logbookKinerja.getNoRec(), Arrays.asList(PERCENTAGE));
+							.contains(logbookKinerja.getIndikatorKinerja().getSatuanIndikatorId())) {
-						Optional<Map<String, Object>> catatan = listCatatan.stream().filter(c -> logbookKinerja.getNoRec().equals(c.get("logbookId"))).findFirst();
+						List<Map<String, Object>> listCatatan = logbookKinerjaDetailDao
-						if (catatan.isPresent()) {
+								.findAvgCapaianByKontrak(logbookKinerja.getNoRec(), Arrays.asList(PERCENTAGE));
-							logbookKinerja.setCapaian(Double.parseDouble(catatan.get().get("avgCapaian").toString()));
+						Optional<Map<String, Object>> catatan = listCatatan.stream()
-						} else {
+								.filter(c -> logbookKinerja.getNoRec().equals(c.get("logbookId"))).findFirst();
-							logbookKinerja.setCapaian(0.0);
+						catatan.ifPresent(
-						}
+								c -> logbookKinerja.setCapaian(Double.parseDouble(c.get("avgCapaian").toString())));
-
 					} else {
-						List<Map<String, Object>> listCatatan = logbookKinerjaDetailDao.findSumCapaianByKontrak(logbookKinerja.getNoRec(), Arrays.asList(PERCENTAGE));
+						List<Map<String, Object>> listCatatan = logbookKinerjaDetailDao
-						Optional<Map<String, Object>> catatan = listCatatan.stream().filter(c -> logbookKinerja.getNoRec().equals(c.get("logbookId"))).findFirst();
+								.findSumCapaianByKontrak(logbookKinerja.getNoRec(), Arrays.asList(PERCENTAGE));
-						if (catatan.isPresent()) {
+						Optional<Map<String, Object>> catatan = listCatatan.stream()
-							logbookKinerja.setCapaian(Double.parseDouble(catatan.get().get("sumCapaian").toString()));
+								.filter(c -> logbookKinerja.getNoRec().equals(c.get("logbookId"))).findFirst();
-						} else {
+						catatan.ifPresent(
-							logbookKinerja.setCapaian(0.0);
+								c -> logbookKinerja.setCapaian(Double.parseDouble(c.get("sumCapaian").toString())));
-						}
 					}
 					logbookKinerjaDao.save(logbookKinerja);
 				});

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MonitoringAbsenServiceImpl.java

@@ -264,21 +264,17 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 		return result;
 	}
 
-	public Map<String, Object> jamEfektifTunggal(Date jadwalPulang, Date jadwalMasuk, long waktuIstirahat, String shift, float factorRate) {
+	public Map<String, Object> jamEfektifTunggal(Date jadwalPulang, Date jadwalMasuk, long waktuIstirahat, String shift) {
 		Map<String, Object> result = new HashMap<>();
 		String jam_efektif;
 		long minutes;
 		Long minutesAbsen = (long) 0;
 		Long minutesJadwal = (long) 0;
 	
-		if (CommonUtil.isNotNullOrEmpty(factorRate)) {
+		if (CommonUtil.isNotNullOrEmpty(jadwalMasuk) && CommonUtil.isNotNullOrEmpty(jadwalPulang)) {
-			minutesJadwal 		= (long) (factorRate * 60);	
+			minutesJadwal = reduceTime(jadwalPulang, jadwalMasuk);
-		}else{
+			if (minutesJadwal > 30) {
-			if (CommonUtil.isNotNullOrEmpty(jadwalMasuk) && CommonUtil.isNotNullOrEmpty(jadwalPulang)) {
+				minutesJadwal = minutesJadwal - waktuIstirahat; // 30_adalah_waktu_istirahat
-				minutesJadwal = reduceTime(jadwalPulang, jadwalMasuk);
-				if (minutesJadwal > 30) {
-					minutesJadwal = minutesJadwal - waktuIstirahat; // 30_adalah_waktu_istirahat
-				}
 			}
 		}
 
@@ -1874,7 +1870,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 										if (target.before(twoDaysAgo) || target.equals(twoDaysAgo)) {
 											absenTunggal++;
 											Map<String, Object> jamEfektif = new HashMap<>();
-																jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift"), (float) factorRateX);
+																jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift"));
 											
 											if (CommonUtil.isNotNullOrEmpty(jamEfektif)) {
 												jamEf = (String) jamEfektif.get("jam_efektif");
@@ -2177,25 +2173,12 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 								if (target.before(twoDaysAgo) || target.equals(twoDaysAgo)) {
 									absenTunggal++;
 									Map<String, Object> jamEfektif = new HashMap<>();
-														jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift"), (float) factorRateX);
+														jamEfektif = jamEfektifTunggal(jadwalPulang, jadwalMasuk, (long) data.get("waktuIstirahat"), (String) data.get("namaShift"));
 									
 									if (CommonUtil.isNotNullOrEmpty(jamEfektif)) {
 										jamEf = (String) jamEfektif.get("jam_efektif");
 										jumlahJamEfektif += (Long) jamEfektif.get("Minutes_Efektif");
 
-										if (count == 1) {
-											if ( CommonUtil.isNotNullOrEmpty(data.get("terlambat")))  {
-												jumlahTerlambat -= (long) data.get("terlambat");
-												jumlahCountTerlambat -= 1;
-												data.put("terlambat", "0");
-												data.put("telat", (long) 0);
-											}
-										}else{
-											jumlahTerlambat += (long) 0;
-											data.put("terlambat", "0");
-											data.put("telat", (long) 0);
-										}
-
 										if (((Integer) jamEfektif.get("hariKerja")) != 0) {
 											harikerja += (Integer) jamEfektif.get("hariKerja");
 											p1 += (Integer) jamEfektif.get("p1");
@@ -2204,11 +2187,11 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 											malam += (Integer) jamEfektif.get("malam");
 											data.putAll(jamEfektif);
 										}
-									}else{
-										jumlahTerlambat += (long) 0;
-										data.put("terlambat", "0");
-										data.put("telat", (long) 0);
 									}
+
+									jumlahTerlambat += (long) 0;
+									data.put("terlambat", "0");
+									data.put("telat", (long) 0);
 								}
 							} catch (ParseException e) {
 								e.printStackTrace();
@@ -2216,8 +2199,6 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
 
 						} else if ((CommonUtil.isNotNullOrEmpty(data.get("absensiPulang")) && CommonUtil.isNullOrEmpty(data.get("absensiMasuk"))) && (CommonUtil.isNotNullOrEmpty(jamMasuk) && CommonUtil.isNotNullOrEmpty(jamPulang))) {
 							absenTunggal++;
-
-							System.out.print("terlambat 2");
 						} else if ( CommonUtil.isNotNullOrEmpty(data.get("factorRate")) && factorRateX > 0.0 && Arrays.asList(listKetidakhadiran).contains(data.get("kodeShift")) ) {
 							//System.out.print("Ini Gua Cuti 123");
 							Map<String, Object> jamEfektif = new HashMap<>();