diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php index 027e6c0..25368ef 100644 --- a/app/Helpers/custom.php +++ b/app/Helpers/custom.php @@ -229,7 +229,7 @@ if (!function_exists('kuesionerLogStatus')) { if(@$log->status == 11){ $progress = 'Terbit SK'; }else{ - $progress = ''.str_replace('_',' ',\Str::title($log->step)).''; + $progress = ''.str_replace('_',' ',\Str::title($log->step)).''; } } return $progress; diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php index cda222c..d58db41 100644 --- a/app/Http/Controllers/FrontController.php +++ b/app/Http/Controllers/FrontController.php @@ -19,6 +19,7 @@ class FrontController extends Controller 'kota' => Kuesioner::where('level',0)->count(), 'provinsi' => Kuesioner::where('level',1)->count(), 'nasional' => Kuesioner::where('level',2)->count(), + 'mandiri' => Kuesioner::where('level',3)->count(), ]; $data['title'] = 'Beranda'; return view('index',$data); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index fea28be..c4fa1a4 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -194,103 +194,78 @@ class HomeController extends Controller $action = ''; - // if((access('is_create', $this->route.'.*')) || (access('is_update', $this->route.'.*'))){ - // $action .= ''; - // } - - if(($row->level+1) == 1){ - $jenis_usulan = 'Adiwiyata Kab/Kota'; - }elseif(($row->level+1) == 2){ - $jenis_usulan = 'Adiwiyata Provinsi'; - }elseif(($row->level+1) == 3){ - $jenis_usulan = 'Adiwiyata Nasional'; - }elseif(($row->level+1) == 4){ - $jenis_usulan = 'Adiwiyata Mandiri'; + if((permission('is_create','modules.kuesioner.*','module',false)) || (permission('is_update','modules.kuesioner.*','module',false))){ + $action .= ''; + if($row->tahun == date('Y')){ + if(session('group_alias') == 'dinas'){ + if($row->status == 0){ + $action .= ''; + $action .= ''; + } + } + } } - $usulan = Usulan::where('sekolah','like','%'.$row->ms_sekolah_id.'%')->first(); + if($row->level == 0){ + $penghargaan = ' Belum Pernah'; + }elseif($row->level == 1){ + $penghargaan = ' Adiwiyata Kab/Kota'; + }elseif($row->level == 2){ + $penghargaan = ' Adiwiyata Provinsi'; + }elseif($row->level == 3){ + $penghargaan = ' Adiwiyata Nasional'; + }elseif($row->level == 4){ + $penghargaan = ' Adiwiyata Mandiri'; + } $dok = DokumenAdministrasi::where('ms_sekolah_id',$row->ms_sekolah_id)->where('tahun',date('Y'))->first(); - - if(session('group_alias') == 'sekolah'){ - if((@$dok->status == 0) || (@$dok->status == 2)){ - if(@$dok->status != 0){ - if($row->tahun == date('Y')){ - $action .= ''; - } - } - } - } - // $action .= ''; - if((session('group_alias') == 'dinas') || (session('group_alias') == 'suku_dinas')){ - if(@$dok){ - if(@$dok->status == 0){ - if($row->tahun == date('Y')){ - $action .= ''; - $action .= ''; - } - } - }else{ - if($row->tahun == date('Y')){ - $action .= ''; - } - } - } - - $fileUsulan = ''; - $fileUsulan .= '
- - -
'; - if(@$dok){ if(@$dok->status == 1){ $labelDok = 'Dokumen Di Verifikasi'; }elseif(@$dok->status == 2){ - $labelDok = 'Dokumen Di Tolak'; + $labelDok = 'Dokumen Di Tolak'; }else{ - $labelDok = 'Menuggu Verifikasi Dokumen'; + $labelDok = 'Menuggu Verifikasi Dokumen'; } }else{ - $labelDok = 'Belum Upload Dokumen'; + $labelDok = 'Belum Upload Dokumen'; } - // if($row->status == 0){ - // $labelDok .= '
Menunggu Usulan Dari Dinas/Sudin'; - // } + $status = ''; + if($row->status == 0){ + $status = 'Belum Diverifikasi'; + }elseif($row->status == 1){ + $status = 'Sudah Diverifikasi'; + }elseif($row->status == 2){ + $status = 'Ditolak'; + }elseif($row->status == 11){ + $status = 'Terbit SK'; + }else{ + $log = KuesionerLog::where('kuesioner_id',$row->KuesionerId)->orderBy('created_at','DESC')->first(); + $status = ''.str_replace('_',' ',\Str::title($log->step)).''; + } $sekolah = ''; - $sekolah .= @$row->sekolah->nama_sekolah.' '; - $sekolah .= ''.@$row->profile->tingkat->name.' '; - $sekolah .= ''.@$row->profile->status_sekolah.' '; - - $dataSekolah = ''; - $dataSekolah .= @$sekolah.'
'; - $dataSekolah .= 'Usulan '.@$row->tahun.' : '.@$jenis_usulan.'
'; + $sekolah .= @$row->sekolah->nama_sekolah.'
'; + $sekolah .= ''.@$row->profile->tingkat->name.' '; + $sekolah .= ''.@$row->profile->status_sekolah.' '; + $sekolah .= ''.@$row->profile->alamat_sekolah.' '; + $sekolah .= ''.@$row->sekolah->npsn.' '; $_data[] = [ 'no' => $key+1, 'id' => encode_id($row->id), 'npsn' => $row->sekolah->npsn, - 'dataSekolah' => @$dataSekolah, 'nama' => $sekolah, - 'tahun' => $row->tahun, - 'status' => $labelDok, - 'status_level' => 'Level '.levelAdiwiyata($row->npsn).'', + 'status_level' => 'Level '.levelAdiwiyata($row->npsn).'', 'wilayah' => $row->sekolah->kabupaten->name, 'kecamatan' => $row->sekolah->kecamatan->name, - 'jenis_usulan' => ''.$jenis_usulan.'', - 'fileUsulan' => $fileUsulan, + 'alamat_sekolah' => $row->sekolah->alamat_sekolah, + 'tingkat_sekolah' => $row->sekolah->tingkat->name, + 'status_sekolah' => $row->sekolah->status, + 'tahun' => $row->tahun, + 'alamat_sekolah' => $row->profile->alamat_sekolah, + 'status' => kuesionerLogStatus($row->KuesionerId).'
'.$labelDok, 'action' => $action, ]; diff --git a/app/Http/Controllers/KuesionerController.php b/app/Http/Controllers/KuesionerController.php index cd2f63d..e747a09 100644 --- a/app/Http/Controllers/KuesionerController.php +++ b/app/Http/Controllers/KuesionerController.php @@ -84,6 +84,19 @@ class KuesionerController extends Controller $penghargaan = ' Adiwiyata Mandiri'; } + $dok = DokumenAdministrasi::where('ms_sekolah_id',$row->ms_sekolah_id)->where('tahun',date('Y'))->first(); + if(@$dok){ + if(@$dok->status == 1){ + $labelDok = 'Dokumen Di Verifikasi'; + }elseif(@$dok->status == 2){ + $labelDok = 'Dokumen Di Tolak'; + }else{ + $labelDok = 'Menuggu Verifikasi Dokumen'; + } + }else{ + $labelDok = 'Belum Upload Dokumen'; + } + $status = ''; if($row->status == 0){ $status = 'Belum Diverifikasi'; @@ -118,7 +131,7 @@ class KuesionerController extends Controller 'tahun' => $row->tahun, 'alamat_sekolah' => $row->profile->alamat_sekolah, 'penghargaan' => $penghargaan, - 'status' => kuesionerLogStatus($row->KuesionerId), + 'status' => kuesionerLogStatus($row->KuesionerId).'
'.$labelDok, 'action' => $action, ]; diff --git a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php index f9521a9..4131e12 100644 --- a/app/Http/Controllers/Modules/Usulan/AdministrasiController.php +++ b/app/Http/Controllers/Modules/Usulan/AdministrasiController.php @@ -235,6 +235,7 @@ class AdministrasiController extends Controller // $data = $request['data']; $keyId = decode_id($request->secure_id); + // dd($keyId); if(!@$keyId){ return response()->json(['status' => false,'message' => 'Maaf Terjadi Kesalahan','type' => 'error']); @@ -346,6 +347,15 @@ class AdministrasiController extends Controller 'status' => 0, ]); + $kuesioner = Kuesioner::find($keyId); + if(@$filePathTim){ + $kuesioner->tim_adiwiyata_link = @$filePathTim; + } + if(@$filePath){ + $kuesioner->link_sk_adiwiyata = @$filePath; + } + $kuesioner->save(); + return response()->json(['status' => true,'message' => 'Berhasil Update Data','type' => 'success']); } diff --git a/app/Http/Controllers/SampahController.php b/app/Http/Controllers/SampahController.php new file mode 100644 index 0000000..7178697 --- /dev/null +++ b/app/Http/Controllers/SampahController.php @@ -0,0 +1,70 @@ +title; + $data['route'] = $this->route; + return view($this->template.'.index', $data); + } + + /** + * Show the form for creating a new resource. + */ + public function create() + { + // + } + + /** + * Store a newly created resource in storage. + */ + public function store(Request $request) + { + // + } + + /** + * Display the specified resource. + */ + public function show(string $id) + { + // + } + + /** + * Show the form for editing the specified resource. + */ + public function edit(string $id) + { + // + } + + /** + * Update the specified resource in storage. + */ + public function update(Request $request, string $id) + { + // + } + + /** + * Remove the specified resource from storage. + */ + public function destroy(string $id) + { + // + } +} diff --git a/app/Models/SampahTerkelola.php b/app/Models/SampahTerkelola.php new file mode 100644 index 0000000..09a6eee --- /dev/null +++ b/app/Models/SampahTerkelola.php @@ -0,0 +1,11 @@ +id('SampahTerkelolaId'); + $table->integer('ms_sekolah_id'); + $table->year('tahun'); + $table->integer('bulan'); + $table->string('organik'); + $table->string('sampah_anorganik'); + $table->string('b3'); + $table->string('minyak_jelantah'); + $table->timestampsTz(); + $table->softdeletesTz(); + + $table->foreign('ms_sekolah_id')->references('MsSekolahId')->on('ms_sekolah')->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('sampah_terkelola'); + } +}; diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 8249233..25e1b85 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -41,7 +41,7 @@
-
+
{{ $usulan['kota'] }}
@@ -78,6 +78,18 @@
--}}
+
+
{{ $usulan['mandiri'] }}
+
+
+ Mandiri + Sekolah Adiwiyata +
+ {{--
+ 2025 +
--}} +
+
diff --git a/resources/views/modules/dashboard/admin.blade.php b/resources/views/modules/dashboard/admin.blade.php index 598d9bf..36c7b28 100644 --- a/resources/views/modules/dashboard/admin.blade.php +++ b/resources/views/modules/dashboard/admin.blade.php @@ -169,8 +169,8 @@
-
Usulan Administrasi
- Lihat Semua  +
Verifikasi Kuesioner Leveling
+ Lihat Semua 
@@ -189,16 +189,15 @@ id="grid-data"> - No - Data Sekolah - File + # + No + {{-- Status Level --}} + {{-- NPSN --}} + Nama Sekolah + Wilayah + Kecamatan + Status - {{-- Nama Sekolah --}} - {{-- Kab/Kota --}} - {{-- Kecamatan --}} - {{-- Tahun --}} - {{-- Usulan Sebelumnya --}} - {{-- Pengajuan Usulan --}} diff --git a/resources/views/modules/kuesioner/form.blade.php b/resources/views/modules/kuesioner/form.blade.php index b909154..62299d8 100644 --- a/resources/views/modules/kuesioner/form.blade.php +++ b/resources/views/modules/kuesioner/form.blade.php @@ -46,6 +46,57 @@
@endif + @if((session('group_alias') == 'dinas') || (session('group_alias') == 'suku_dinas')) +
+
+

 Verifikasi Kuesioner Leveling

+

Sebelum melakukan verifikasi kuesioner leveling, silakan lakukan pengecekan validitas data terlebih dahulu untuk memastikan seluruh isian telah sesuai dan lengkap.

+
+ @if(@$dok) + @if(@$dok->status == 0) + @if($kuesioner->tahun == date('Y')) + Verifikasi + Tolak Verifikasi + @endif + @endif + @else + @if($kuesioner->tahun == date('Y')) + Tolak Verifikasi + @endif + @endif +
+
+
+ @elseif (session('group_alias') == 'sekolah') + @if(@$dok->status == 1) +
+
+

 Verifikasi Kuesioner Leveling

+

Kuesioner Anda telah di-approve dan dinyatakan valid. Silakan melanjutkan ke tahapan berikutnya.

+ Pemenuhan Kriteria   +
+
+ @elseif(@$dok->status == 2) + level+1) == 1){ + $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Kab/Kota'; + }elseif(($kuesioner->level+1) == 2){ + $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Provinsi'; + }elseif(($kuesioner->level+1) == 3){ + $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Nasional'; + }elseif(($kuesioner->level+1) == 4){ + $jenis_usulan = 'Keputusan Gubernur tentang penetapan Sekolah Adiwiyata Mandiri'; + } + ?> +
+
+

 Verifikasi Kuesioner Leveling

+

Kuesioner Anda belum lolos verifikasi dan dinyatakan ditolak. Silakan periksa kembali isian kuesioner dan lakukan perbaikan.

+ Perbaikan Data   +
+
+ @endif + @endif
{{csrf_field()}}
@@ -407,7 +458,7 @@
- +
- - + @if(@$kuesioner->link_sk_adiwiyata) +
+ +
+
+ +
+ 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)"> +
+
+ @else +
+ + +
+ @endif + + +
@if(@$dok->file_usulan)
+ @@ -452,6 +523,37 @@
+ + + + @endsection @section('page-js') @endsection \ No newline at end of file diff --git a/resources/views/modules/sampah/form.blade.php b/resources/views/modules/sampah/form.blade.php new file mode 100644 index 0000000..3344111 --- /dev/null +++ b/resources/views/modules/sampah/form.blade.php @@ -0,0 +1,17 @@ +@extends('layouts.master') + +@section('page-css') + +@endsection +@section('content') +
+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Est natus recusandae maiores distinctio modi illum placeat eveniet molestiae. Ab excepturi suscipit quisquam quas consectetur adipisci cumque quam reprehenderit quibusdam distinctio.

+
+
+@endsection +@section('page-js') + +@endsection \ No newline at end of file diff --git a/resources/views/modules/sampah/index.blade.php b/resources/views/modules/sampah/index.blade.php new file mode 100644 index 0000000..59e6591 --- /dev/null +++ b/resources/views/modules/sampah/index.blade.php @@ -0,0 +1,353 @@ +@extends('layouts.master') +@section('page-css') + + +@endsection +@section('content') +
+

+ {{$title}} +

+
+
+
+
+
+
+ + + + + + + + + + + + + + + + +
#NoSekolahTahunBulanOrganikAn OrganikB3Minyak Jelantah
+ +
+
+
+
+
+ + +@endsection +@section('page-js') + + + +@endsection \ No newline at end of file diff --git a/routes/modules/modules.php b/routes/modules/modules.php index 7ef91a6..b96cdc8 100644 --- a/routes/modules/modules.php +++ b/routes/modules/modules.php @@ -6,6 +6,7 @@ use App\Http\Controllers\HomeController; use App\Http\Controllers\AjaxController; use App\Http\Controllers\ProfileController; use App\Http\Controllers\KuesionerController; +use App\Http\Controllers\SampahController; use App\Http\Controllers\Master\IndikatorController; use App\Http\Controllers\Master\KomponenController; use App\Http\Controllers\Master\FormKriteriaController; @@ -80,6 +81,12 @@ Route::name('kuesioner.')->prefix('kuesioner')->group(function () { Route::get('/tolak/{id?}',[KuesionerController::class,'tolak'])->name('tolak'); }); +Route::name('sampah.')->prefix('sampah')->group(function () { + Route::resource('/',SampahController::class); + Route::get('/update/{id}',[SampahController::class,'update'])->name('update'); + Route::get('/grid',[SampahController::class,'grid'])->name('grid'); + }); + Route::name('usulan.')->prefix('usulan')->group(function () { Route::name('csak.')->prefix('csak')->group(function () {