diff --git a/app/Http/Controllers/Modules/Usulan/SKController.php b/app/Http/Controllers/Modules/Usulan/SKController.php index 8f52b22..e8b2ccc 100644 --- a/app/Http/Controllers/Modules/Usulan/SKController.php +++ b/app/Http/Controllers/Modules/Usulan/SKController.php @@ -47,6 +47,10 @@ class SKController extends Controller }elseif($row->jenis_usulan == 3){ $jenis_usulan = 'Sekolah Adiwiyata Nasional'; } + + $action = ''; + // $action .= ''; + $_data[] = [ 'no' => $key+1, 'id' => encode_id($row->id), @@ -78,6 +82,17 @@ class SKController extends Controller return view($this->template.'.form',$data); } + public function update($id) + { + permission('is_update', $this->route, 'module',true); + + $data['title'] = $this->title; + $data['route'] = $this->route; + $data['sk'] = SK::find(decode_id($id)); + + return view($this->template.'.form',$data); + } + /** * Store a newly created resource in storage. */ @@ -107,12 +122,12 @@ class SKController extends Controller ]); } - if(SK::where('tahun',date('Y'))->where('jenis_usulan',$request->jenis_usulan)->count() > 0){ - return redirect()->back()->with([ - 'message' => 'Maaf Penetapan SK Tahun '.date('Y').' Untuk Usulan '.$usulan.' Sudah Ada', - 'type' => "error" - ]); - } + // if(SK::where('tahun',date('Y'))->where('jenis_usulan',$request->jenis_usulan)->count() > 0){ + // return redirect()->back()->with([ + // 'message' => 'Maaf Penetapan SK Tahun '.date('Y').' Untuk Usulan '.$usulan.' Sudah Ada', + // 'type' => "error" + // ]); + // } if ($request->hasFile('file')) { $file = $request->file('file'); @@ -146,35 +161,48 @@ class SKController extends Controller // dd($decoded); if(@$request->file){ - $sk = SK::updateOrCreate([ - 'tahun' => date('Y'), - 'jenis_usulan' => $request->jenis_usulan, - ],[ - 'tahun' => date('Y'), - 'nama' => @$request->nama, - 'nomor_sk' => @$request->nomor_sk, - 'tanggal_penetapan' => $request->tanggal_penetapan, - 'jenis_usulan' => $request->jenis_usulan, - 'file' => $filePath, - 'deskripsi' => @$request->deskripsi, - 'created_by' => auth()->user()->id, - 'sekolah' => json_encode($decoded), - ]); - }else{ - $sk = SK::updateOrCreate([ - 'tahun' => date('Y'), - 'jenis_usulan' => $request->jenis_usulan, - ],[ - 'tahun' => date('Y'), - 'nomor_sk' => @$request->nomor_sk, - 'nama' => @$request->nama, - 'tanggal_penetapan' => $request->tanggal_penetapan, - 'jenis_usulan' => $request->jenis_usulan, - 'deskripsi' => @$request->deskripsi, - 'created_by' => auth()->user()->id, - 'sekolah' => json_encode($decoded), - ]); + $sk = new SK; + $sk->tahun = date('Y'); + $sk->nama = @$request->nama; + $sk->nomor_sk = @$request->nomor_sk; + $sk->tanggal_penetapan = $request->tanggal_penetapan; + $sk->jenis_usulan = $request->jenis_usulan; + $sk->file = $filePath; + $sk->deskripsi = @$request->deskripsi; + $sk->created_by = auth()->user()->id; + $sk->sekolah = json_encode($decoded); + $sk->save(); + + // $sk = SK::updateOrCreate([ + // 'tahun' => date('Y'), + // 'jenis_usulan' => $request->jenis_usulan, + // ],[ + // 'tahun' => date('Y'), + // 'nama' => @$request->nama, + // 'nomor_sk' => @$request->nomor_sk, + // 'tanggal_penetapan' => $request->tanggal_penetapan, + // 'jenis_usulan' => $request->jenis_usulan, + // 'file' => $filePath, + // 'deskripsi' => @$request->deskripsi, + // 'created_by' => auth()->user()->id, + // 'sekolah' => json_encode($decoded), + // ]); } + // else{ + // $sk = SK::updateOrCreate([ + // 'tahun' => date('Y'), + // 'jenis_usulan' => $request->jenis_usulan, + // ],[ + // 'tahun' => date('Y'), + // 'nomor_sk' => @$request->nomor_sk, + // 'nama' => @$request->nama, + // 'tanggal_penetapan' => $request->tanggal_penetapan, + // 'jenis_usulan' => $request->jenis_usulan, + // 'deskripsi' => @$request->deskripsi, + // 'created_by' => auth()->user()->id, + // 'sekolah' => json_encode($decoded), + // ]); + // } foreach($request->sekolah as $sekolah){ @@ -225,15 +253,6 @@ class SKController extends Controller { // } - - /** - * Update the specified resource in storage. - */ - public function update(Request $request, string $id) - { - // - } - /** * Remove the specified resource from storage. */ diff --git a/resources/views/modules/dashboard/sekolah.blade.php b/resources/views/modules/dashboard/sekolah.blade.php index ec04236..c0c754e 100644 --- a/resources/views/modules/dashboard/sekolah.blade.php +++ b/resources/views/modules/dashboard/sekolah.blade.php @@ -3,15 +3,134 @@ @section('page-css') @endsection @section('content') -
{{session('alamat_sekolah')}}
+