update
parent
eb5a5274bc
commit
2dc5ce9c45
|
|
@ -170,6 +170,9 @@ class CSAKController extends Controller
|
||||||
$sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span> ';
|
$sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span> ';
|
||||||
$sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span> ';
|
$sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span> ';
|
||||||
|
|
||||||
|
$countpenilaian = Penilaian::where('ms_sekolah_id',$row->ms_sekolah_id)->where('tahun',$row->tahun)->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||||
|
$page = FormKriteria::select('page_number')->where('tahun',tahunKuesioner($row->KuesionerId))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||||
|
|
||||||
$_data[] = [
|
$_data[] = [
|
||||||
'no' => $key+1,
|
'no' => $key+1,
|
||||||
'id' => encode_id($row->id),
|
'id' => encode_id($row->id),
|
||||||
|
|
@ -181,7 +184,8 @@ class CSAKController extends Controller
|
||||||
'kecamatan' => $row->sekolah->kecamatan->name,
|
'kecamatan' => $row->sekolah->kecamatan->name,
|
||||||
'penghargaan' => $penghargaan,
|
'penghargaan' => $penghargaan,
|
||||||
'penilaian' => $penilaian,
|
'penilaian' => $penilaian,
|
||||||
'progress' => kuesionerLogStatus($row->KuesionerId),
|
'progress' => count(@$countpenilaian).' / '.count(@$page),
|
||||||
|
'status' => kuesionerLogStatus($row->KuesionerId),
|
||||||
'action' => $action,
|
'action' => $action,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -182,12 +182,7 @@ class CSAPController extends Controller
|
||||||
$sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span> ';
|
$sekolah .= '<span class="badge bg-success-light text-success">'.@$row->profile->tingkat->name.'</span> ';
|
||||||
$sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span> ';
|
$sekolah .= '<span class="badge bg-primary-light text-primary">'.@$row->profile->status_sekolah.'</span> ';
|
||||||
|
|
||||||
if(session('group_alias') == 'penilai_kota'){
|
$countpenilaian = Penilaian::where('ms_sekolah_id',$row->ms_sekolah_id)->where('tahun',$row->tahun)->where('status',2)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||||
$countpenilaian = Penilaian::where('ms_sekolah_id',$row->ms_sekolah_id)->where('tahun',$row->tahun)->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
|
||||||
}elseif((session('group_alias') == 'penilai_provinsi') || (session('group_alias') == 'penilai_disdik') || (session('group_alias') == 'penilai_kemenag')){
|
|
||||||
$countpenilaian = Penilaian::where('ms_sekolah_id',$row->ms_sekolah_id)->where('tahun',$row->tahun)->where('status',2)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
$page = FormKriteria::select('page_number')->where('tahun',tahunKuesioner($row->KuesionerId))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
$page = FormKriteria::select('page_number')->where('tahun',tahunKuesioner($row->KuesionerId))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||||
|
|
||||||
$_data[] = [
|
$_data[] = [
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
<div class="w-100">
|
<div class="w-100">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<select name="progress" class="form-control select2">
|
<select name="progress" class="form-control select2">
|
||||||
<option value="">-- PILIH PROGRESS --</option>
|
<option value="">-- PILIH STATUS --</option>
|
||||||
<option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
|
<option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
|
||||||
<option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
|
<option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
|
||||||
<option value="dikembalikan">Perbaikan Kuesioner Leveling</option>
|
<option value="dikembalikan">Perbaikan Kuesioner Leveling</option>
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
<div class="w-100">
|
<div class="w-100">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<select name="progress" class="form-control select2">
|
<select name="progress" class="form-control select2">
|
||||||
<option value="">-- PILIH PROGRESS --</option>
|
<option value="">-- PILIH STATUS --</option>
|
||||||
<option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
|
<option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
|
||||||
<option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
|
<option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
|
||||||
<option value="dikembalikan">Perbaikan Kuesioner Leveling</option>
|
<option value="dikembalikan">Perbaikan Kuesioner Leveling</option>
|
||||||
|
|
@ -144,6 +144,7 @@
|
||||||
<!-- <th data-field="tingkat_sekolah">Dokumen Administrasi</th> -->
|
<!-- <th data-field="tingkat_sekolah">Dokumen Administrasi</th> -->
|
||||||
<th data-field="penilaian">Pemenuhan Kriteria</th>
|
<th data-field="penilaian">Pemenuhan Kriteria</th>
|
||||||
<th data-field="progress">Progress</th>
|
<th data-field="progress">Progress</th>
|
||||||
|
<th data-field="status">Status</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody></tbody>
|
<tbody></tbody>
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@
|
||||||
<div class="w-100">
|
<div class="w-100">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<select name="progress" class="form-control select2">
|
<select name="progress" class="form-control select2">
|
||||||
<option value="">-- PILIH PROGRESS --</option>
|
<option value="">-- PILIH STATUS --</option>
|
||||||
<option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
|
<option value="sekolah_mengisi_kuesioner_leveling">Sekolah Mengisi Kuesioner Leveling</option>
|
||||||
<option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
|
<option value="menunggu_verifikasi_kuesioner_leveling">Menunggu Verifikasi Kuesioner Leveling</option>
|
||||||
<option value="dikembalikan">Perbaikan Kuesioner Leveling</option>
|
<option value="dikembalikan">Perbaikan Kuesioner Leveling</option>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue