Commit 9599d4fb by Novan Bagus Setiawan

perbaikan data seleksi proposal internal, jika tolak dan setujui tidak perlu refresh

parent 752dd786
......@@ -52,6 +52,9 @@ class DaftarSeleksiController extends Controller
$status = $request->get('status');
$tahun= $request->get('tahun');
if($tahun == '0')
$tahun = date('Y');
## Read value
$draw = $request->get('draw');
$start = $request->get("start");
......@@ -104,7 +107,7 @@ class DaftarSeleksiController extends Controller
->get();
$data_arr = array();
$hitung = 1;
foreach($records as $record){
$proposal_id = $record->proposal_id;
$jenis_id = $record->jenis_id;
......@@ -138,8 +141,8 @@ class DaftarSeleksiController extends Controller
$administrasi = '<span class="badge bg-danger">Tidak Lolos</span>';
else
{
$lolos = "confirmFinal('".Crypt::encrypt($proposal_id)."', '1')";
$tidak_lolos = "confirmFinal('".Crypt::encrypt($proposal_id)."', '2')";
$lolos = "confirmFinal('".Crypt::encrypt($proposal_id)."', '1', '".$hitung."')";
$tidak_lolos = "confirmFinal('".Crypt::encrypt($proposal_id)."', '2', '".$hitung."')";
$administrasi = '<td class="table-action">
<a href="#!" class="btn btn-icon-sm btn-success btn-sm" onclick="'.$lolos.'">Lolos ?</a>
<a href="#!" class="btn btn-icon-sm btn-danger btn-sm" onclick="'.$tidak_lolos.'">Tidak ?</a>
......@@ -159,7 +162,7 @@ class DaftarSeleksiController extends Controller
else
{
if($status_administrasi == '2')
$aksi = '<h4>0</h5>';
$aksi = '<h4>0</h4>';
else
$aksi = '<a href="'.$nilai.'" class="btn btn-icon-sm btn-warning btn-sm">Beri nilai<i class="fas fa-arrow-alt-circle-right"></i></a>';
}
......@@ -168,6 +171,7 @@ class DaftarSeleksiController extends Controller
$aksi = '<span class="badge bg-info">Administrasi belum dipilih</span>';
$data_arr[] = array(
"DT_RowId" => 'row_'.$hitung,
"proposal_id" => $proposal_id,
"kode" => $kode,
"jenis_pkm" => $jenis_pkm,
......@@ -177,6 +181,7 @@ class DaftarSeleksiController extends Controller
"administrasi" => $administrasi,
"aksi" => $aksi
);
$hitung++;
}
$response = array(
......
......@@ -65,7 +65,7 @@
<select class="form-select select2" name="reqTahun" id="reqTahun">
<option value="0">Semua</option>
@foreach ($periode as $res)
<option value="{{ $res->nama }}">{{ $res->nama }}</option>
<option value="{{ $res->nama }}" @php if($res->nama == date('Y')) echo 'selected'; @endphp>{{ $res->nama }}</option>
@endforeach
</select>
</div>
......@@ -129,7 +129,7 @@
"visible": false,
"searchable": false
}
]
],
});
$('#reqAdministrasi, #reqStatus, #reqTahun').change(function(){
......@@ -137,7 +137,13 @@
});
});
function confirmFinal(reqId, reqStatus)
// $('#example tbody').on('click', '.cek', function () {
// // var id = $(this).attr("id").match(/\d+/)[0];
// // var data = $('#example').DataTable().row( id ).data();
// // console.log(data[0]);
// });
function confirmFinal(reqId, reqStatus, rowId)
{
if(reqStatus == '1')
{
......@@ -174,7 +180,33 @@
})
.done(function(response){
swal.fire('Updated!', response.message, response.status).then(function(){
location.reload();
// $("#row_"+rowId+" td:nth-last-child(2)").find('.upload').remove();
// $("#tr-" + reqUrut +" td:nth-child(3)").empty();
if(reqStatus == '1')
{
$("#row_"+rowId+" td:nth-last-child(2)").empty()
var s= $('<span class="badge bg-success">Lolos</span>');
$("#row_"+rowId+" td:nth-last-child(2)").append(s);
$("#row_"+rowId+" td:last-child").empty();
var t= $('<a href="{{ URL::to("reviewer/seleksi-internal/") }}/'+reqId+'/edit" class="btn btn-icon-sm btn-warning btn-sm">Beri nilai<i class="fas fa-arrow-alt-circle-right"></i></a>');
$("#row_"+rowId+" td:last-child").append(t);
}
else
{
$("#row_"+rowId+" td:nth-last-child(4)").empty()
var r= $('<span class="badge bg-success">Sudah dinilai</span>');
$("#row_"+rowId+" td:nth-last-child(4)").append(r);
$("#row_"+rowId+" td:nth-last-child(2)").empty()
var s= $('<span class="badge bg-danger">Tidak Lolos</span>');
$("#row_"+rowId+" td:nth-last-child(2)").append(s);
$("#row_"+rowId+" td:last-child").empty();
var t= $('<h4>0</h4>');
$("#row_"+rowId+" td:last-child").append(t);
}
// location.reload();
});
})
.fail(function(){
......
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