update
parent
980613f5c1
commit
5a72d508fe
|
|
@ -37,6 +37,7 @@ class CSAKController extends Controller
|
||||||
$data['route'] = $this->route;
|
$data['route'] = $this->route;
|
||||||
$data['title'] = $this->title;
|
$data['title'] = $this->title;
|
||||||
$data['page'] = FormKriteria::where('tahun',tahunKuesioner($keyId))->select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
$data['page'] = FormKriteria::where('tahun',tahunKuesioner($keyId))->select('page_number')->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',1)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||||
|
|
||||||
$jumlah = json_decode($data['sekolah']->profile->data_jumlah);
|
$jumlah = json_decode($data['sekolah']->profile->data_jumlah);
|
||||||
$data['jumlah_peserta_didik'] = @$jumlah->jumlah_peserta_didik;
|
$data['jumlah_peserta_didik'] = @$jumlah->jumlah_peserta_didik;
|
||||||
|
|
|
||||||
|
|
@ -94,7 +94,7 @@ class KriteriaController extends Controller
|
||||||
$data['log'] = KuesionerLog::where('ms_sekolah_id',$keyId)->orderBy('created_at','ASC')->get();
|
$data['log'] = KuesionerLog::where('ms_sekolah_id',$keyId)->orderBy('created_at','ASC')->get();
|
||||||
|
|
||||||
$data['dok'] = DokumenAdministrasi::where('ms_sekolah_id',$keyId)->where('tahun',$data['kuesioner']->tahun)->first();
|
$data['dok'] = DokumenAdministrasi::where('ms_sekolah_id',$keyId)->where('tahun',$data['kuesioner']->tahun)->first();
|
||||||
$data['penilaian'] = Penilaian::where('ms_sekolah_id',$keyId)->where('tahun',$data['kuesioner']->tahun)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
$data['penilaian'] = Penilaian::where('ms_sekolah_id',$keyId)->where('tahun',$data['kuesioner']->tahun)->where('status',0)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
|
||||||
|
|
||||||
return view($this->template.'.progress',$data);
|
return view($this->template.'.progress',$data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -273,13 +273,13 @@
|
||||||
<div class="text-secondary bg-secondary px-1 py-1 rounded w-100">
|
<div class="text-secondary bg-secondary px-1 py-1 rounded w-100">
|
||||||
<div class="d-flex flex-column">
|
<div class="d-flex flex-column">
|
||||||
<span class="text-center"> Sekolah </span>
|
<span class="text-center"> Sekolah </span>
|
||||||
<h5 class="text-center font-weight-bold total_sekolah">{{getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId)}}</h5>
|
<h5 class="text-center font-weight-bold total_sekolah">{{getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId)}}/70</h5>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-primary bg-primary-light px-1 py-1 rounded w-100">
|
<div class="text-primary bg-primary-light px-1 py-1 rounded w-100">
|
||||||
<div class="d-flex flex-column">
|
<div class="d-flex flex-column">
|
||||||
<span class="text-center"> Kota</span>
|
<span class="text-center"> Kota</span>
|
||||||
<h5 class="text-center font-weight-bold total_kota">{{getNilaiAll('kota',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId)}}</h5>
|
<h5 class="text-center font-weight-bold total_kota">{{getNilaiAll('kota',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId)}}/70</h5>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{{-- <div class="text-success bg-success-light px-1 py-1 rounded w-100">
|
{{-- <div class="text-success bg-success-light px-1 py-1 rounded w-100">
|
||||||
|
|
@ -290,6 +290,20 @@
|
||||||
</div> --}}
|
</div> --}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-12 my-2">
|
||||||
|
{{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 class="col-md-6 my-2">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="fw-500">Jenis Usulan CSA</label>
|
||||||
|
<input disabled type="text" class="form-control" name="" value="{{getUsulan($sekolah->MsSekolahId)}}">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-6 my-2">
|
<div class="col-md-6 my-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="fw-500">Jenis Usulan CSA</label>
|
<label class="fw-500">Jenis Usulan CSA</label>
|
||||||
|
|
|
||||||
|
|
@ -284,6 +284,28 @@
|
||||||
<i class="fal fa-info-circle"></i> Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}}
|
<i class="fal fa-info-circle"></i> Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-12 my-2">
|
||||||
|
<div class="d-flex flex-column flex-md-row gap-1 justify-content-center">
|
||||||
|
<div class="text-secondary bg-secondary px-1 py-1 rounded w-100">
|
||||||
|
<div class="d-flex flex-column">
|
||||||
|
<span class="text-center"> Sekolah </span>
|
||||||
|
<h5 class="text-center font-weight-bold total_sekolah">{{getNilaiAll('sekolah',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId)}}/80</h5>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="text-primary bg-primary-light px-1 py-1 rounded w-100">
|
||||||
|
<div class="d-flex flex-column">
|
||||||
|
<span class="text-center"> Kota</span>
|
||||||
|
<h5 class="text-center font-weight-bold total_kota">{{getNilaiAll('kota',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId)}}/80</h5>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="text-success bg-success-light px-1 py-1 rounded w-100">
|
||||||
|
<div class="d-flex flex-column">
|
||||||
|
<span class="text-center"> Provinsi</span>
|
||||||
|
<h5 class="text-center font-weight-bold total_provinsi">{{getNilaiAll('provinsi',$kuesioner->ms_sekolah_id,$kuesioner->KuesionerId)}}/80</h5>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="col-md-6 my-2">
|
<div class="col-md-6 my-2">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="fw-500">Jenis Usulan CSA</label>
|
<label class="fw-500">Jenis Usulan CSA</label>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue