update

app/Http/Controllers/KuesionerController.php

@@ -365,6 +365,7 @@ class KuesionerController extends Controller
             $insert->pihak_kegiatan_lingkungan = json_encode(@$pihakKegiatanFormatted);
             $insert->tahun                     = date('Y');
             $insert->link_sk_adiwiyata         = @$request->link_sk_adiwiyata;
+            $insert->tahun_penghargaan         = @$request->tahun_penghargaan;
             $insert->tim_adiwiyata_nomor_sk    = @$request->tim_adiwiyata_nomor_sk;
             $insert->tim_adiwiyata_link        = @$request->tim_adiwiyata_link;
             $insert->save();

app/Http/Controllers/Modules/Usulan/CSAPController.php

@@ -6,6 +6,11 @@ use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use App\Models\Master\Provinsi;
 use App\Models\Kuesioner;
+use App\Models\KuesionerLog;
+use App\Models\Master\Sekolah;
+use App\Models\Master\FormKriteria;
+use App\Models\DokumenAdministrasi;
+use App\Models\Penilaian;
 
 class CSAPController extends Controller
 {
@@ -25,6 +30,52 @@ class CSAPController extends Controller
         return view($this->template.'.index',$data);
     }
 
+    public function update($id)
+    {
+        $keyId = decode_id($id);
+        $data['kuesioner']  = Kuesioner::where('ms_sekolah_id',$keyId)->where('tahun',date('Y'))->first();
+        $data['sekolah']    = Sekolah::find($keyId);
+        $data['route'] = $this->route;
+        $data['title'] = $this->title;
+        $data['page']  = FormKriteria::select('page_number')->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;
+        $data['jumlah_tenaga_pendidik']       = @$jumlah->jumlah_tenaga_pendidik;
+        $data['jumlah_tenaga_kependidikan']   = @$jumlah->jumlah_tenaga_kependidikan;
+        $data['jumlah_warga_sekolah_lainnya'] = @$jumlah->jumlah_warga_sekolah_lainnya;
+        $data['jumlah_biopori']               = @$jumlah->jumlah_biopori;
+        $data['jumlah_sumur_resapan']         = @$jumlah->jumlah_sumur_resapan;
+        $data['jumlah_pohon']                 = @$jumlah->jumlah_pohon;
+
+        $air = json_decode($data['sekolah']->profile->penghematan_air);
+        $data['air_sebelum_pblhs'] = @$air->air_sebelum_pblhs;
+        $data['air_setelah_pblhs'] = @$air->air_setelah_pblhs;
+
+        $listrik = json_decode($data['sekolah']->profile->penghematan_listrik);
+        $data['listrik_sebelum_pblhs'] = @$listrik->listrik_sebelum_pblhs;
+        $data['listrik_setelah_pblhs'] = @$listrik->listrik_setelah_pblhs;
+        $data['luas_ruangan_ac']       = @$listrik->luas_ruangan_ac;
+        $data['luas_ruangan_non_ac']   = @$listrik->luas_ruangan_non_ac;
+        $data['jumlah_kader']          = @$listrik->jumlah_kader;
+
+        $data['dokumen'] = DokumenAdministrasi::where('ms_sekolah_id',$keyId)->where('tahun',date('Y'))->first();
+
+        return view($this->template.'.form',$data);
+    }
+    public function resume($id)
+    {
+        // permission('is_read', $this->route, 'module',true);
+
+        $data['title'] = $this->title;
+        $data['route'] = $this->route;   
+        $keyId = decode_id($id);
+        $data['sekolah']    = Sekolah::find($keyId);
+        $data['page']  = FormKriteria::select('page_number')->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray(); 
+
+        return view($this->template.'.resume',$data);
+    }
+
     public function grid(Request $request)
     {
         $kuesioner = Kuesioner::where('level',1)->orderBy('created_at','DESC')->get();
@@ -33,7 +84,7 @@ class CSAPController extends Controller
             $action = '';
 
             if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){
-                $action .= '<a href="'.url('kuesioner/update/'.encode_id($row->ms_sekolah_id)).'" data-toggle="tooltip" title="Resume" class="btn btn-xs btn-block btn-primary"><i class="fal fa-eye text-white"></i></a>';
+                $action .= '<a href="'.url('usulan/csap/update/'.encode_id($row->ms_sekolah_id)).'" data-toggle="tooltip" title="View Data" class="btn btn-xs btn-block btn-primary"><i class="fal fa-edit text-white"></i></a>';
             }
 
             if($row->level == 0){
@@ -48,6 +99,11 @@ class CSAPController extends Controller
                 $penghargaan = '<i class="fal fa-trophy"></i>&nbsp;Adiwiyata Mandiri';
             }
 
+            $penilaian = '';
+            $penilaian .= '<span style="width:100%;" class="text-left badge badge-secondary"> Sekolah : '.getNilaiAll('sekolah',$row->ms_sekolah_id).'</span></br>';
+            $penilaian .= '<span style="width:100%;" class="text-left badge badge-primary"> Kota : '.getNilaiAll('kota',$row->ms_sekolah_id).'</span></br>';
+            $penilaian .= '<span style="width:100%;" class="text-left badge badge-success"> Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'</span></br>';
+
             $sekolah = '';
             $sekolah .= @$row->sekolah->nama_sekolah.'<br>';
             $sekolah .= '<span class="badge badge-success">'.@$row->profile->tingkat->name.'</span>&nbsp;';
@@ -59,7 +115,8 @@ class CSAPController extends Controller
                 'npsn'              => $row->sekolah->npsn,
                 'nama'              => $sekolah,
                 'wilayah'           => $row->sekolah->kabupaten->name,
-                'penghargaan'       => $penghargaan,
+                'penilaian'         => $penilaian,
+                'progress'          => kuesionerLogStatus($row->KuesionerId),
                 'action'            => $action,
             ];
 
@@ -81,7 +138,91 @@ class CSAPController extends Controller
      */
     public function store(Request $request)
     {
-        //
+        $sekolahId = decode_id($request->sekolah);
+        if(session('group_alias') == 'penilai_kota'){
+            $status = 1;
+        }else{
+            $status = 2;
+        }
+
+        $soal = Penilaian::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
+        $penilaian  = Penilaian::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->where('status',$status)->groupBy('page_number')->orderBy('page_number','ASC')->pluck('page_number')->toArray();
+
+        if(count($soal) != count($penilaian)){
+            return response()->json(['validasi' => false,'message' => 'Maaf Penilaian Belum Lengkap!']);
+        }
+
+        if($request['validasi'] == 1){
+
+            if(session('group_alias') == 'penilai_kota'){
+                $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
+                $kuesioner->catatan_usulan  = $request['catatan_validasi'];
+                $kuesioner->status          = 4;
+                $kuesioner->save();
+
+                //kuesioner log
+                $log = new KuesionerLog;
+                $log->kuesioner_id   = $kuesioner->KuesionerId;
+                $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
+                $log->npsn           = $kuesioner->npsn;
+                $log->ms_group_id    = session('group_id');
+                $log->step           = 'selesai_penilaian_kota';
+                $log->status         = 4;
+                $log->created_by     = auth()->user()->id;
+                $log->save();
+            }elseif(session('group_alias') == 'penilai_provinsi'){
+                $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
+                $kuesioner->catatan_usulan  = $request['catatan_validasi'];
+                $kuesioner->status          = 10;
+                $kuesioner->save();
+
+                //kuesioner log
+                $log = new KuesionerLog;
+                $log->kuesioner_id   = $kuesioner->KuesionerId;
+                $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
+                $log->npsn           = $kuesioner->npsn;
+                $log->ms_group_id    = session('group_id');
+                $log->step           = 'selesai_penilaian_provinsi';
+                $log->status         = 6;
+                $log->created_by     = auth()->user()->id;
+                $log->save();
+
+                //kuesioner log final
+                $log = new KuesionerLog;
+                $log->kuesioner_id   = $kuesioner->KuesionerId;
+                $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
+                $log->npsn           = $kuesioner->npsn;
+                $log->ms_group_id    = session('group_id');
+                $log->step           = 'selesai_final';
+                $log->status         = 10;
+                $log->created_by     = auth()->user()->id;
+                $log->save();
+            }
+
+
+        }elseif($request['validasi'] == 2){
+
+            $kuesioner = Kuesioner::where('ms_sekolah_id',$sekolahId)->where('tahun',date('Y'))->first();
+            $kuesioner->catatan_usulan  = $request['catatan_validasi'];
+            $kuesioner->status          = 5;
+            $kuesioner->save();
+
+            //kuesioner log
+            $log = new KuesionerLog;
+            $log->kuesioner_id   = $kuesioner->KuesionerId;
+            $log->ms_sekolah_id  = $kuesioner->ms_sekolah_id;
+            $log->npsn           = $kuesioner->npsn;
+            $log->ms_group_id    = session('group_id');
+            $log->step           = 'dikembalikan_penilaian_kota';
+            $log->status         = 5;
+            $log->created_by     = auth()->user()->id;
+            $log->save();
+            
+        }else{
+            return response()->json(['validasi' => false,'message' => 'Maaf Terjadi Kesalahan Dalam Input Data!']);
+        }
+
+        return response()->json(['status' => true,'message' => 'Berhasil update data!']);
     }
 
     /**
@@ -100,14 +241,6 @@ class CSAPController extends Controller
         //
     }
 
-    /**
-     * Update the specified resource in storage.
-     */
-    public function update(Request $request, string $id)
-    {
-        //
-    }
-
     /**
      * Remove the specified resource from storage.
      */

resources/views/modules/kuesioner/form.blade.php

@@ -475,16 +475,16 @@
                                     <td>
                                         <div class="form-group">
                                             <label>Tahun perolehan penghargaaan (kosongkan jika belum adiwiyata)</label>
-                                            <select class="form-control form-control-sm">
+                                            <select class="form-control form-control-sm tahun_penghargaan" name="tahun_penghargaan">
                                                 <option value="">Pilih Tahun</option>
                                                 @for($i = (date('Y')-5); $i <= (date('Y')); $i++)
-                                                <option value="{{$i}}">{{$i}}</option>
+                                                <option {{@$kuesioner->tahun_penghargaan == $i ? 'selected' : ''}} value="{{$i}}">{{$i}}</option>
                                                 @endfor
                                             </select>
                                         </div>
                                         <div class="form-group">
                                             <label>Link SK adiwiyata / perpanjangan (kosongkan jika belum mendapat adiwiyata)</label>
-                                            <input type="text" class="form-control form-control-sm" name="" placeholder="Link SK adiwiyata / perpanjangan (kosongkan jika belum mendapat adiwiyata)">
+                                            <input type="text" value="{{@$kuesioner->link_sk_adiwiyata}}" class="form-control form-control-sm link_sk_adiwiyata" name="link_sk_adiwiyata" placeholder="Link SK adiwiyata / perpanjangan (kosongkan jika belum mendapat adiwiyata)">
                                         </div>
                                     </td>
                                 </tr>
@@ -534,7 +534,7 @@
         let tim_adiwiyata = $('input[name="tim_adiwiyata"]:checked').val();
 
         if(level >= 0){
-
+            if(level == 0){
                 if((tim_adiwiyata >= 1)){
 
                     if(tim_adiwiyata == 2){
@@ -568,6 +568,23 @@
                 }else{
                     toastr.error("Data Belum Lengkap ", 'Error!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});    
                 }
+        }else{
+            let tahun = $('.tahun_penghargaan').find(':selected').val();
+            let link_sk_adiwiyata = $('.link_sk_adiwiyata').val();
+            if((tahun == '') || (link_sk_adiwiyata == '')){
+                toastr.error("Data Belum Lengkap", 'Error!', {
+                    positionClass: 'toast-bottom-right',
+                    containerId: 'toast-bottom-right'
+                });
+            }else{
+                toastr.success("Data Sudah Lengkap", 'Sukses!', {
+                    positionClass: 'toast-bottom-right',
+                    containerId: 'toast-bottom-right'
+                });    
+
+                $('#form').submit();
+            }
+        }
             
         }else{
             toastr.error("Penghargaan adiwiyata Belum Diisi ", 'Error!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});

resources/views/modules/usulan/csak/form.blade.php

@@ -103,7 +103,7 @@
                                             <td>{{@$sekolah->npsn}}</td>
                                         </tr>
                                         <tr>
-                                            <td>Nama Sekolag</td>
+                                            <td>Nama Sekolah</td>
                                             <td>{{@$sekolah->nama_sekolah}}</td>
                                         </tr>
                                         <tr>
@@ -553,7 +553,7 @@
             let name = $(this).attr('name');
             let value = $(this).val()?.trim(); // Pastikan nilai di-trim untuk menghindari spasi kosong
 
-            if (type === 'radio' || type === 'checkbox') {
+            if (type === 'radio') {
                 // Validasi radio: setidaknya satu opsi harus dipilih
                 if ($(`input[name="${name}"]:checked`).length === 0) {
                     isValid = false;
@@ -561,6 +561,16 @@
                 } else {
                     $(`input[name="${name}"]`).closest('.custom-control-input').removeClass("is-invalid");
                 }
+            }else if(type === 'checkbox'){
+                if ($(`input[name="${name}"]:checked`).length === 0) {
+                    isValid = false;
+                    $(`input[name="${name}"]`).closest('.custom-control-input').addClass("is-invalid");
+                }else if ($(`input[name="${name}"]:checked`).length === 1) {
+                    isMultiple = false;
+                    $(`input[name="${name}"]`).closest('.custom-control-input').addClass("is-invalid");
+                } else {
+                    $(`input[name="${name}"]`).closest('.custom-control-input').removeClass("is-invalid");
+                }
             } else {
                 // Validasi input teks atau lainnya
                 if (!value) {

resources/views/modules/usulan/csap/form.blade.php

@@ -86,7 +86,7 @@
                             <div class="col-md-12" style="background: rgba(23, 162, 184, 0.2) !important;">
                                     <ul class="nav nav-pills" role="tablist">
                                     <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#profile">Profile Sekolah</a></li>
-                                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#dokumen">Dokumen Administrasi</a></li>
+                                    <li class="nav-item d-none"><a class="nav-link" data-toggle="tab" href="#dokumen">Dokumen Administrasi</a></li>
                                     <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#kriteria">Pemenuhan Kriteria</a></li>
                                     <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#usulan">Usulan CSA</a></li>
                                 </ul>
@@ -320,7 +320,7 @@
                                                 </a>
                                             </div>
                                         </div>
-                                        @if(@$kuesioner->status < 4)
+                                        @if(@$kuesioner->status <= 4)
                                         <div class="col-md-12 mt-3">
                                             <button id="btnSave" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button>
                                         </div>
@@ -336,39 +336,27 @@
                                             <td>Jenis Usulan CSA</td>
                                             <td>{{getUsulan($sekolah->MsSekolahId)}}</td>
                                         </tr>
-                                        <tr>
+                                        <!-- <tr>
                                             <th colspan="2" class="table-info">Penghargaan</th>
                                         </tr>
                                         <tr>
                                             <td>Penghargaan Terakhir</td>
                                             <td>{{getPenghargaanTerakhir($sekolah->MsSekolahId)}}</td>
-                                        </tr>
+                                        </tr> -->
-                                        <tr>
-                                            <td>Nomor SK</td>
-                                            <td>-</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Tanggal Penetapan SK</td>
-                                            <td>-</td>
-                                        </tr>
                                         <tr>
                                             <th colspan="2" class="table-info">Berdasarkan data usulan yang dilengkapi, dinyatakan bahwa {{@$sekolah->nama_sekolah}} :</th>
                                         </tr>
-                                        <tr>
-                                            <td>Nilai Dokumen Administrasi</td>
-                                            <td>0</td>
-                                        </tr>
-                                        <tr>
-                                            <td>Nilai Pemenuhan Kriteria</td>
-                                            <td>0</td>
-                                        </tr>
                                         <tr>
                                             <td>Validasi</td>
                                             <td>
                                                 <select class="form-control select2" id="validasi" name="validasi">
                                                     <option value="">- Pilih Validasi -</option>
-                                                    <option {{@$kuesioner->status == '4' ? 'selected' : ''}} value="1">Diteruskan</option>
+                                                    @if(session('group_alias') == 'penilai_kota')
-                                                    <option {{@$kuesioner->status == '5' ? 'selected' : ''}} value="2">Dikembalikan</option>
+                                                    <option value="1">Diteruskan</option>
+                                                    <option value="2">Dikembalikan</option>
+                                                    @elseif(session('group_alias') == 'penilai_provinsi')
+                                                    <option value="1">Selesai</option>
+                                                    @endif
                                                 </select>
                                             </td>
                                         </tr>
@@ -378,7 +366,7 @@
                                                 <textarea class="form-control" id="catatan_validasi" name="catatan_validasi" placeholder="Catatan">{{@$kuesioner->catatan_usulan}}</textarea>
                                             </td>
                                         </tr>
-                                        @if(@$kuesioner->status < 4)
+                                        @if(@$kuesioner->status <= 4)
                                         <tr>
                                             <td><button id="btnSaveUsulan" class="btn btn-success"><i class="fal fa-save"></i>&nbsp;Simpan Data</button></td>
                                             <td></td>
@@ -576,7 +564,7 @@
             let name = $(this).attr('name');
             let value = $(this).val()?.trim(); // Pastikan nilai di-trim untuk menghindari spasi kosong
 
-            if (type === 'radio' || type === 'checkbox') {
+            if (type === 'radio') {
                 // Validasi radio: setidaknya satu opsi harus dipilih
                 if ($(`input[name="${name}"]:checked`).length === 0) {
                     isValid = false;
@@ -584,6 +572,16 @@
                 } else {
                     $(`input[name="${name}"]`).closest('.custom-control-input').removeClass("is-invalid");
                 }
+            }else if(type === 'checkbox'){
+                if ($(`input[name="${name}"]:checked`).length === 0) {
+                    isValid = false;
+                    $(`input[name="${name}"]`).closest('.custom-control-input').addClass("is-invalid");
+                }else if ($(`input[name="${name}"]:checked`).length === 1) {
+                    isMultiple = false;
+                    $(`input[name="${name}"]`).closest('.custom-control-input').addClass("is-invalid");
+                } else {
+                    $(`input[name="${name}"]`).closest('.custom-control-input').removeClass("is-invalid");
+                }
             } else {
                 // Validasi input teks atau lainnya
                 if (!value) {
@@ -617,6 +615,8 @@
             success: function (response) {
                 // console.log('Response:', response);
                 toastr.success("Berhasil menyimpan data", 'Success!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'});
+                $('.nilai_kota').html(response.nilai_kota);
+                $('.nilai_provinsi').html(response.nilai_prov);
 
                 
                 $('.page').closest('.activePage').addClass('bg-success');

resources/views/modules/usulan/kriteria/form.blade.php

@@ -178,7 +178,7 @@
                             hiddenInput.name = 'input_upload_files[]';
                             hiddenInput.value = fileInfo.filename;
                             hiddenInput.class = 'removeFormKriteria';
-                            var elem = '<input type="hidden" name="input_upload_files[]" value="'+fileInfo.filename+'" class="removeFormKriteria">';
+                            var elem = '<input type="hidden" name="input_upload_files[]" value="'+fileInfo.filename+'" class="removeFormKriteria uploadedFiles is-required">';
                             $('.changeForm').append(elem);
                         });
                     });
@@ -251,7 +251,7 @@
                                 hiddenInput.name = 'input_upload_files[]';
                                 hiddenInput.class = 'removeFormKriteria';
                                 hiddenInput.value = fileInfo.filename;
-                                var elem = '<input type="hidden" name="input_upload_files[]" value="'+fileInfo.filename+'" class="removeFormKriteria">';
+                                var elem = '<input type="hidden" name="input_upload_files[]" value="'+fileInfo.filename+'" class="removeFormKriteria uploadedFiles is-required">';
                                 $('.changeForm').append(elem);
                             });
                         });
@@ -316,6 +316,16 @@
             let name = $(this).attr('name');
             let value = $(this).val()?.trim(); // Pastikan nilai di-trim untuk menghindari spasi kosong
 
+            let uploadedFilesValue = $('.uploadedFiles').val();
+            if (!uploadedFilesValue || uploadedFilesValue === '') {
+                isValid = false;
+                $('.uploadedFiles').addClass("is-invalid");
+                toastr.error("Harap upload minimal 1 file", 'Error!', {positionClass: 'toast-bottom-right'});
+                return;
+            } else {
+                $('.uploadedFiles').removeClass("is-invalid");
+            }
+
             if (type === 'radio') {
                 // Validasi radio: setidaknya satu opsi harus dipilih
                 if ($(`input[name="${name}"]:checked`).length === 0) {