Merge branch 'dev/base' into dev/technical-debt/clean-code

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiJadwalKerjaDao.java

@@ -71,8 +71,8 @@ public interface PegawaiJadwalKerjaDao extends PagingAndSortingRepository<Pegawa
 
 	@Query("select new Map(shiftKerja.id as idShift, shiftKerja.namaShift as namaShift) "
 			+ "from PegawaiJadwalKerja jadwalKerja " + "inner join jadwalKerja.shift shiftKerja "
-			+ "left join jadwalKerja.tanggal kalender " + "where shiftKerja.statusEnabled is true "
-			+ "and to_char(kalender.tanggal, 'yyyy-MM-dd') between :tgl1 and :tgl2 "
+			+ "left join jadwalKerja.tanggal kalender "
+			+ "where to_char(kalender.tanggal, 'yyyy-MM-dd') between :tgl1 and :tgl2 "
 			+ "and jadwalKerja.pegawaiId = :idPegawai " + "order by to_char(kalender.tanggal, 'yyyy-MM-dd')")
 	List<Map<String, Object>> getNamaShiftKerjaPegawaiByTanggal(@Param("tgl1") String tgl1, @Param("tgl2") String tgl2,
 			@Param("idPegawai") Integer idPegawai);