Commit 85432b19 by nurchamim

modul : bug laporan absensi

status : selesai
keterangan : bug fix, ketika absensi shift dan ada T, TAP atau PC, nama shift tidak tampil
parent 9a414244
...@@ -399,6 +399,11 @@ ...@@ -399,6 +399,11 @@
} }
} }
function ambilKodeDasar(kode) {
if (!kode) return '';
return kode.split(',')[0].trim();
}
function getjamshift() { function getjamshift() {
var id_cabang = $("#form_input #id_cabang").val(); var id_cabang = $("#form_input #id_cabang").val();
...@@ -418,9 +423,17 @@ ...@@ -418,9 +423,17 @@
.append('<option value="">Pilih Shift</option>'); .append('<option value="">Pilih Shift</option>');
$.each(data.data, function(k, v) { $.each(data.data, function(k, v) {
var kode_bersih = v.kode_shift
.replace(', (T)', '')
.replace(', (PC)', '')
.replace(', (TAP)', '');
var text_option = kode_bersih + ' - ' + v.nama_shift;
$('#id_shift').append( $('#id_shift').append(
'<option value="'+v.id_master_shift+'" libur="'+v.libur+'">' '<option value="'+v.id_master_shift+'" ' +
+ v.kode_shift + ' - ' + v.nama_shift + 'data-kode="'+v.kode_shift+'">' +
text_option +
'</option>' '</option>'
); );
}); });
...@@ -434,13 +447,16 @@ ...@@ -434,13 +447,16 @@
if (typeof selected_shift !== 'undefined' && selected_shift !== '') { if (typeof selected_shift !== 'undefined' && selected_shift !== '') {
$('#id_shift option').each(function () { var selected_dasar = ambilKodeDasar(selected_shift);
var kode = $(this).text().split(' - ')[0];
if (kode === selected_shift) { $('#id_shift option').each(function () {
var opt_dasar = ambilKodeDasar($(this).data('kode'));
if (opt_dasar === selected_dasar) {
$('#id_shift') $('#id_shift')
.val($(this).val()) .val($(this).val())
.trigger('change.select2'); .trigger('change.select2');
return false; // stop loop
} }
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment