diff --git a/app/Http/Controllers/KuesionerController.php b/app/Http/Controllers/KuesionerController.php index 1efbdeb..fddb15e 100644 --- a/app/Http/Controllers/KuesionerController.php +++ b/app/Http/Controllers/KuesionerController.php @@ -80,7 +80,7 @@ class KuesionerController extends Controller $status = 'Ditolak'; }else{ $log = KuesionerLog::where('kuesioner_id',$row->KuesionerId)->orderBy('created_at','DESC')->first(); - $status = ''.str_replace('_',' ',$log->step).''; + $status = ''.str_replace('_',' ',\Str::title($log->step)).''; } $sekolah = ''; diff --git a/app/Http/Controllers/Modules/Usulan/CSAKController.php b/app/Http/Controllers/Modules/Usulan/CSAKController.php index 1aa3f70..8b1eade 100644 --- a/app/Http/Controllers/Modules/Usulan/CSAKController.php +++ b/app/Http/Controllers/Modules/Usulan/CSAKController.php @@ -103,7 +103,7 @@ class CSAKController extends Controller $penilaian .= ' Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'
'; $log = KuesionerLog::where('kuesioner_id',$row->KuesionerId)->orderBy('created_at','DESC')->first(); - $progress = ''.str_replace('_',' ',$log->step).''; + $progress = ''.str_replace('_',' ',\Str::title($log->step)).''; $sekolah = ''; $sekolah .= @$row->sekolah->nama_sekolah.'
'; diff --git a/app/Http/Controllers/Modules/Usulan/SKController.php b/app/Http/Controllers/Modules/Usulan/SKController.php new file mode 100644 index 0000000..9de3248 --- /dev/null +++ b/app/Http/Controllers/Modules/Usulan/SKController.php @@ -0,0 +1,140 @@ +route, 'module',true); + $data['title'] = $this->title; + $data['route'] = $this->route; + $data['provinsi'] = Provinsi::where('kode_wilayah','010000')->get(); + + return view($this->template.'.index',$data); + } + + public function grid(Request $request) + { + $kuesioner = Kuesioner::where('level',0)->orderBy('created_at','DESC')->get(); + foreach ($kuesioner as $key => $row) { + + $action = ''; + + // if($row->status == 4){ + // $action .= ''; + // } + + 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'; + } + + $penilaian = ''; + $penilaian .= ' Sekolah : '.getNilaiAll('sekolah',$row->ms_sekolah_id).'
'; + $penilaian .= ' Kota : '.getNilaiAll('kota',$row->ms_sekolah_id).'
'; + $penilaian .= ' Provinsi : '.getNilaiAll('provinsi',$row->ms_sekolah_id).'
'; + + $log = KuesionerLog::where('kuesioner_id',$row->KuesionerId)->orderBy('created_at','DESC')->first(); + $progress = ''.str_replace('_',' ',\Str::title($log->step)).''; + + $sekolah = ''; + $sekolah .= @$row->sekolah->nama_sekolah.'
'; + $sekolah .= ''.@$row->profile->tingkat->name.' '; + $sekolah .= ''.@$row->profile->status_sekolah.' '; + + $_data[] = [ + 'no' => $key+1, + 'id' => encode_id($row->id), + 'npsn' => $row->sekolah->npsn, + 'nama' => $sekolah, + 'status_level' => 'Level '.levelAdiwiyata($row->npsn).'', + 'wilayah' => $row->sekolah->kabupaten->name, + 'penghargaan' => $penghargaan, + 'penilaian' => $penilaian, + 'progress' => $progress, + 'action' => $action, + ]; + + } + + return response()->json($_data); + } + + /** + * Show the form for creating a new resource. + */ + public function create() + { + permission('is_create', $this->route, 'module',true); + + $data['title'] = $this->title; + $data['route'] = $this->route; + + return view($this->template.'.form',$data); + } + + /** + * 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/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 6801e24..e402d88 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -8,6 +8,8 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Hash; use App\Models\ProfileSekolah as Profile; +use App\Models\Kuesioner; +use App\Models\KuesionerLog; use App\Models\Master\Sekolah; use App\Models\Master\Provinsi; @@ -61,7 +63,7 @@ class ProfileController extends Controller $action = ''; if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){ - $action .= ''; + $action .= ''; } if($row->level == 0){ @@ -76,6 +78,29 @@ class ProfileController extends Controller $penghargaan = ' Adiwiyata Mandiri'; } + 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'; + } + + $kuesioner = Kuesioner::where('ms_sekolah_id',$row->MsSekolahId)->where('tahun',date('Y'))->orderBy('created_at','DESC')->first(); + $log = KuesionerLog::where('kuesioner_id',@$kuesioner->KuesionerId)->orderBy('created_at','DESC')->first(); + if(@$log){ + $progress = ''.str_replace('_',' ',\Str::title($log->step)).''; + }else{ + $progress = ''; + } + + $penilaian = ''; + $penilaian .= ' Sekolah : '.getNilaiAll('sekolah',$row->MsSekolahId).'
'; + $penilaian .= ' Kota : '.getNilaiAll('kota',$row->MsSekolahId).'
'; + $penilaian .= ' Provinsi : '.getNilaiAll('provinsi',$row->MsSekolahId).'
'; + $_data[] = [ 'no' => $key+1, 'id' => encode_id($row->id), @@ -85,10 +110,10 @@ class ProfileController extends Controller 'wilayah' => $row->kabupaten->name, 'tanggal_level' => '-', 'penghargaan' => $penghargaan, - 'dok' => '', - 'kriteria' => '', - 'jenis_usulan' => 'Nasional', - 'usulkan_csa' => 'Diusulkan/ Proses Penilaian', + 'dok' => '-', + 'kriteria' => $penilaian, + 'jenis_usulan' => $jenis_usulan, + 'usulkan_csa' => $progress, 'perpanjang_csa' => '-', 'action' => $action, ]; diff --git a/public/assets/img/background.png b/public/assets/img/background.png new file mode 100644 index 0000000..eaf299b Binary files /dev/null and b/public/assets/img/background.png differ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index fce2b37..0fcd30c 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -21,7 +21,7 @@
-
+
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 102d5e8..082a979 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -27,7 +27,7 @@
-
+
diff --git a/resources/views/include/sidebar.blade.php b/resources/views/include/sidebar.blade.php index f68134d..2e8ee7c 100644 --- a/resources/views/include/sidebar.blade.php +++ b/resources/views/include/sidebar.blade.php @@ -24,7 +24,7 @@ border-bottom: 1px solid #eee; } -
+
@@ -36,7 +36,7 @@ {{session('group_name')}}
-