Compare commits
135 Commits
ade/logboo
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
1bbc62ad2c | ||
|
|
747611e326 | ||
|
|
f9561b6370 | ||
|
|
6c9b3639af | ||
|
|
191ad86219 | ||
|
|
2084527683 | ||
|
|
55bf10060c | ||
|
|
409a034bc4 | ||
|
|
be47016cd2 | ||
|
|
6122463397 | ||
|
|
5516ec8f2e | ||
|
|
9fdb73c1e7 | ||
|
|
0e1eb307a0 | ||
|
|
8b65c492cf | ||
|
|
a0cc1cd482 | ||
|
|
77eb8f3672 | ||
|
|
b7139f2851 | ||
|
|
8c617702eb | ||
|
|
0c753e9c22 | ||
|
|
248bc1cad7 | ||
|
|
db25c0aef9 | ||
|
|
82b84d2fb9 | ||
|
|
eb7b2f91ad | ||
|
|
e816f1f2e4 | ||
|
|
406ed896a9 | ||
|
|
9197ad56ce | ||
|
|
79f93d8f1e | ||
|
|
ae1e575d73 | ||
|
|
4d528f86bc | ||
|
|
a9a123cbf3 | ||
|
|
a705fc4c3b | ||
|
|
d1455fc1cf | ||
|
|
69df61e369 | ||
|
|
838739b0e1 | ||
|
|
4d73c1cbbe | ||
|
|
e6d47716ea | ||
|
|
74ca1b4cfa | ||
|
|
f5fd2a5831 | ||
|
|
f152385e55 | ||
|
|
f10373891e | ||
|
|
fbec23b80f | ||
|
|
d8de068b74 | ||
|
|
8e21f0b7cf | ||
|
|
f9d2af743f | ||
|
|
749fb0fb53 | ||
|
|
cf0e09ae01 | ||
|
|
e3dc3c5807 | ||
|
|
143bfa458e | ||
|
|
8b3a574ce1 | ||
|
|
9948599436 | ||
|
|
e6107dae92 | ||
|
|
d554375789 | ||
|
|
ef9ed72c64 | ||
|
|
b8ed331571 | ||
|
|
623f945859 | ||
|
|
ef48f2649c | ||
|
|
26e4dbb777 | ||
|
|
36eb745812 | ||
|
|
6b2df06b20 | ||
|
|
2481546942 | ||
|
|
12f5c633f2 | ||
|
|
2d83b9a91c | ||
|
|
31d07e10ce | ||
|
|
243a90e2c7 | ||
|
|
c44d5799f3 | ||
|
|
960b9af314 | ||
|
|
43d105de37 | ||
|
|
e6002e44e8 | ||
|
|
bda56b5f44 | ||
|
|
b1206442bb | ||
|
|
71391fb198 | ||
|
|
78699b5eee | ||
|
|
34ed82a346 | ||
|
|
69f37af283 | ||
|
|
5bbefc913d | ||
|
|
991b15464e | ||
|
|
3fb671e4f9 | ||
|
|
9c3f7924bc | ||
|
|
a1490efe43 | ||
|
|
b50c271d21 | ||
|
|
39796f393a | ||
|
|
389147e756 | ||
|
|
3582e22fed | ||
|
|
852325485b | ||
|
|
e2ac3cb803 | ||
|
|
1a21be43ab | ||
|
|
9a6ff8d2b8 | ||
|
|
a4b51b2ecb | ||
|
|
543b41dffa | ||
|
|
6dba53aee0 | ||
|
|
a4aa2ad173 | ||
|
|
d83566d8d5 | ||
|
|
6cd22af4b6 | ||
|
|
33bcd7b313 | ||
|
|
3947da84fc | ||
|
|
aa0f1ad5ae | ||
|
|
b239c18f9e | ||
|
|
07ced4ffc7 | ||
|
|
7f6474fb8a | ||
|
|
280cf73993 | ||
|
|
f03a842dd2 | ||
|
|
482731fafa | ||
|
|
eb71199dd7 | ||
|
|
5969617896 | ||
|
|
cb6b91f1ed | ||
|
|
c3688c9422 | ||
|
|
2c22512271 | ||
|
|
06aaa550d2 | ||
|
|
ad368f7946 | ||
|
|
8df79fac35 | ||
|
|
e2f9e92ecb | ||
|
|
9d054afeb5 | ||
|
|
a4dde9dd13 | ||
|
|
f092607ec4 | ||
|
|
8c1f6a1825 | ||
|
|
d24bbfb260 | ||
|
|
79fe30ff4b | ||
|
|
a4db6562b9 | ||
|
|
7750dc974e | ||
|
|
ac5e379b28 | ||
|
|
dd485a8a5a | ||
|
|
bdd2db96cc | ||
|
|
bda8841f7f | ||
|
|
d231af1cd1 | ||
|
|
27abc1bc75 | ||
|
|
d185736401 | ||
|
|
172c1a0539 | ||
|
|
82e77209e6 | ||
|
|
ec685312cf | ||
|
|
96abf3cdab | ||
|
|
4178405fd4 | ||
|
|
aace5f33b0 | ||
|
|
fc2d017850 | ||
|
|
321e87b6f9 | ||
|
|
d4f3cc414d |
@ -15,7 +15,7 @@
|
||||
</context-param>
|
||||
<context-param>
|
||||
<param-name>spring.profiles.default</param-name>
|
||||
<param-value>localhost</param-value>
|
||||
<param-value>bridging</param-value>
|
||||
</context-param>
|
||||
|
||||
<listener>
|
||||
|
||||
@ -393,7 +393,7 @@ public final class Master {
|
||||
public static final String OPERATOR_FACTOR_RATE_NONSHIFT = "x";
|
||||
public static final Integer[] PSM = { 31, 47, 106, 203, 204 }; // id shift kerja -> ada penambahan 203, 204
|
||||
public static final Integer RESET = 0;
|
||||
public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115, 203, 204}; // id shift kerja -> ada penambahan 203, 204
|
||||
public static final Integer[] TUJUH_BELAS_JAM_SHIFT = { 22, 24, 31, 33, 46, 47, 50, 58, 64, 65, 66, 86, 91, 106, 114, 115, 203, 204, 216, 313, 314, 315, 316}; // id shift kerja -> ada penambahan 203, 204
|
||||
}
|
||||
|
||||
public static final class StatusPegawai {
|
||||
|
||||
@ -943,8 +943,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam"))
|
||||
|| (data.get("namaShift").equals("Non Shift MOD")))) {
|
||||
if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2")) || (data.get("namaShift").equals("Non Shift MOD")))) {
|
||||
try {
|
||||
List<Map<String, Object>> listAbsensiPagi = new ArrayList<>();
|
||||
List<Map<String, Object>> listAbsensiPM = new ArrayList<>();
|
||||
@ -952,7 +951,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
|
||||
Map<String, Object> detailShiftPMPagi = new HashMap<>();
|
||||
Map<String, Object> detailShiftPMMalam = new HashMap<>();
|
||||
|
||||
if ((data.get("namaShift").equals("Pagi Malam"))) {
|
||||
if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) {
|
||||
detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail(
|
||||
Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P");
|
||||
detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(
|
||||
@ -1686,7 +1685,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Non Shift MOD")))) {
|
||||
if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2")) || (data.get("namaShift").equals("Non Shift MOD")))) {
|
||||
//if (CommonUtil.isNotNullOrEmpty(data.get("namaShift")) && (data.get("namaShift").equals("Non Shift MOD"))) {
|
||||
try {
|
||||
List<Map<String, Object>> listAbsensiPagi = new ArrayList<>();
|
||||
@ -1695,7 +1694,7 @@ public class MonitoringAbsenServiceImpl extends BaseVoServiceImpl implements Mon
|
||||
Map<String, Object> detailShiftPMPagi = new HashMap<>();
|
||||
Map<String, Object> detailShiftPMMalam = new HashMap<>();
|
||||
|
||||
if ((data.get("namaShift").equals("Pagi Malam"))) {
|
||||
if ((data.get("namaShift").equals("Pagi Malam")) || (data.get("namaShift").equals("Pagi Malam 2"))) {
|
||||
detailShiftPMPagi = monitoringAbsenDao.findShiftPMDetail(
|
||||
Integer.parseInt(data.get("idKelompokShiftKerja").toString()), "Pagi", "P");
|
||||
detailShiftPMMalam = monitoringAbsenDao.findShiftPMDetail(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user