update
parent
3e4366b807
commit
0f6c67db75
|
|
@ -38,6 +38,7 @@ class CSAPController extends Controller
|
|||
$data['route'] = $this->route;
|
||||
$data['title'] = $this->title;
|
||||
$data['page'] = FormKriteria::select('page_number')->where('tahun',tahunKuesioner($keyId))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||
$data['penilaian'] = Penilaian::where('ms_sekolah_id',$data['kuesioner']->ms_sekolah_id)->where('tahun',$data['kuesioner']->tahun)->where('status',2)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||
|
||||
$jumlah = json_decode($data['sekolah']->profile->data_jumlah);
|
||||
$data['jumlah_peserta_didik'] = @$jumlah->jumlah_peserta_didik;
|
||||
|
|
|
|||
|
|
@ -105,6 +105,7 @@ class KriteriaController extends Controller
|
|||
$_value = [];
|
||||
|
||||
$kuesioner = decode_id($data['secure_id']);
|
||||
$page = FormKriteria::where('tahun',tahunKuesioner($kuesioner))->select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||
|
||||
foreach ($data as $key => $value) {
|
||||
if (strpos($key, 'input_') === 0) {
|
||||
|
|
@ -176,10 +177,15 @@ class KriteriaController extends Controller
|
|||
|
||||
if(session('group_alias') == 'sekolah'){
|
||||
$status = 0;
|
||||
$reload = false;
|
||||
}elseif(session('group_alias') == 'penilai_kota'){
|
||||
$status = 1;
|
||||
$penilaian = Penilaian::where('ms_sekolah_id',$idSekolah)->where('tahun',date('Y'))->where('status',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||
$reload = (count(@$penilaian) == count(@$page) ? true : false);
|
||||
}elseif(session('group_alias') == 'penilai_provinsi'){
|
||||
$status = 2;
|
||||
$penilaian = Penilaian::where('ms_sekolah_id',$idSekolah)->where('tahun',date('Y'))->where('status',2)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||
$reload = (count(@$penilaian) == count(@$page) ? true : false);
|
||||
}
|
||||
|
||||
if(@$request['sekolah']){
|
||||
|
|
@ -335,10 +341,6 @@ class KriteriaController extends Controller
|
|||
// dd($value);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
$nilai_kota = Penilaian::where('ms_sekolah_id',$idSekolah)
|
||||
->where('page_number',decode_id($data['key']))
|
||||
->where('skor','!=',0)
|
||||
|
|
@ -375,7 +377,7 @@ class KriteriaController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
return response()->json(['total_sekolah' => getNilaiAll('sekolah',$sekolah->MsSekolahId,$kuesioner),'total_kota' => getNilaiAll('kota',$sekolah->MsSekolahId,$kuesioner),'total_provinsi' => getNilaiAll('provinsi',$sekolah->MsSekolahId,$kuesioner),'status' => true,'data' => $_value,'message' => 'Berhasil Update Data','page' => $data['key'],'page_number' => decode_id($data['key']),'nilai_kota' => @$nilai_kota ? @$nilai_kota->skor : 0,
|
||||
return response()->json(['reload' => $reload,'total_sekolah' => getNilaiAll('sekolah',$sekolah->MsSekolahId,$kuesioner),'total_kota' => getNilaiAll('kota',$sekolah->MsSekolahId,$kuesioner),'total_provinsi' => getNilaiAll('provinsi',$sekolah->MsSekolahId,$kuesioner),'status' => true,'data' => $_value,'message' => 'Berhasil Update Data','page' => $data['key'],'page_number' => decode_id($data['key']),'nilai_kota' => @$nilai_kota ? @$nilai_kota->skor : 0,
|
||||
'nilai_prov' => @$nilai_prov ? @$nilai_prov->skor : 0]);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -331,13 +331,11 @@
|
|||
<textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
@if(count(@$penilaian) == count(@$page))
|
||||
@if(session('group_id') == 6)
|
||||
@if(@$kuesioner->status < 4)
|
||||
<div class="col-md-12 my-2">
|
||||
<button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i> Simpan Data</button>
|
||||
</div>
|
||||
@endif
|
||||
@if(session('group_id') == 6)
|
||||
@if(@$kuesioner->status < 4)
|
||||
<div class="col-md-12 my-2">
|
||||
<button id="btnSaveUsulan" class="btn {{ (count(@$penilaian) == count(@$page) ? '' : 'd-none') }} btn-success"><i class="fal fa-save"></i> Simpan Data</button>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -306,6 +306,19 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12 my-2">
|
||||
<div class="d-flex justify-content-between">
|
||||
<div class="fw-500">Pemenuhan Kriteria</div>
|
||||
<div>
|
||||
{{count(@$penilaian)}} / {{count(@$page)}}
|
||||
@if(count(@$penilaian) == count(@$page))
|
||||
<span class="badge bg-success text-white">Sudah Lengkap</span>
|
||||
@else
|
||||
<span class="badge bg-danger text-white">Belum Lengkap</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 my-2">
|
||||
<div class="form-group">
|
||||
<label class="fw-500">Jenis Usulan CSA</label>
|
||||
|
|
@ -335,13 +348,13 @@
|
|||
@if(session('group_id') == 6)
|
||||
@if(@$kuesioner->status <= 3)
|
||||
<div class="col-md-12 my-2">
|
||||
<button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i> Simpan Data</button>
|
||||
<button id="btnSaveUsulan" class="btn btn-success {{ (count(@$penilaian) == count(@$page) ? '' : 'd-none') }} "><i class="fal fa-save"></i> Simpan Data</button>
|
||||
</div>
|
||||
@endif
|
||||
@elseif(session('group_id') == 7)
|
||||
@if(@$kuesioner->status <= 4)
|
||||
<div class="col-md-12 my-2">
|
||||
<button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i> Simpan Data</button>
|
||||
<button id="btnSaveUsulan" class="btn btn-success {{ (count(@$penilaian) == count(@$page) ? '' : 'd-none') }}"><i class="fal fa-save"></i> Simpan Data</button>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue