From 4eba7f893a40c8d2efc08d37d31bcdae3931c869 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 14 Nov 2024 03:15:45 +0700 Subject: [PATCH] Refactor and optimize RegistrasiController Menghapus komentar yang tidak diperlukan, merapikan kode, dan menambahkan dependensi yang hilang. Perubahan ini juga mencakup optimalisasi pengambilan data serta perbaikan penanganan permintaan AJAX pada metode setData dan update. --- app/Http/Controllers/RegistrasiController.php | 187 ++++++++---------- 1 file changed, 81 insertions(+), 106 deletions(-) diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php index 99e5f4f..6b69cd0 100644 --- a/app/Http/Controllers/RegistrasiController.php +++ b/app/Http/Controllers/RegistrasiController.php @@ -4,28 +4,14 @@ use App\Http\Controllers\Controller; use Exception; - use Illuminate\Http\Request; - use Maatwebsite\Excel\Facades\Excel; - // use Modules\Location\Models\City; - // use Modules\Location\Models\District; - // use Modules\Location\Models\Province; - // use Modules\Location\Models\Village; - // use Modules\Lpj\Exports\DebitureExport; - // use Modules\Lpj\Http\Requests\DebitureRequest; - // use Modules\Lpj\Http\Requests\DokumenJaminanRequest; - // use Modules\Lpj\Models\Branch; - // use Modules\Lpj\Models\Debiture; - // use Modules\Lpj\Models\DokumenJaminan; - // use Modules\Lpj\Models\JenisJaminan; - // use Modules\Lpj\Models\JenisLegalitasJaminan; - // use Modules\Lpj\Models\PemilikJaminan; - use Modules\Lpj\Models\Permohonan; - use Modules\Lpj\Models\JenisPenilaian; - use Modules\Lpj\Models\Regions; use Illuminate\Http\JsonResponse; - use Illuminate\Support\Facades\Validator; + use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; - + use Illuminate\Support\Facades\Validator; + use Maatwebsite\Excel\Facades\Excel; + use Modules\Lpj\Models\JenisPenilaian; + use Modules\Lpj\Models\Permohonan; + use Modules\Lpj\Models\Regions; class RegistrasiController extends Controller { @@ -43,7 +29,7 @@ } // Retrieve data from the database - $query = Permohonan::query()->where('status','=','preregister'); + $query = Permohonan::query()->where('status', '=', 'preregister'); // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { @@ -101,143 +87,132 @@ 'data' => $data, ]); } - + public function edit($id) { return view('lpj::registrasi.edit', compact('id')); } - public function setData(Request $request): JsonResponse - { - $data = array(); - $datas = array(); + public function setData(Request $request) + : JsonResponse { + $data = []; + $datas = []; if (request()->ajax()) { - $id = $request->id; + $id = $request->id; $datas = Permohonan::find($id); - + if ($datas) { - $jenisPenilaians=null; - $regions=null; - $regions=Regions::pluck('name', 'id'); - $jenisPenilaians=JenisPenilaian::pluck('name', 'id'); - - $data['status'] = 'success'; - $data['regions'] = $regions; - $data['jenisPenilaians'] = $jenisPenilaians; - $data['datas'] = $datas; - $data['message'] ['message_success'] = array("data successfully found"); + $jenisPenilaians = null; + $regions = null; + $regions = Regions::pluck('name', 'id'); + $jenisPenilaians = JenisPenilaian::pluck('name', 'id'); + + $data['status'] = 'success'; + $data['regions'] = $regions; + $data['jenisPenilaians'] = $jenisPenilaians; + $data['datas'] = $datas; + $data['message'] ['message_success'] = ["data successfully found"]; } else { - $data['status'] = 'error'; - $data['datas'] = null; - $data['message'] ['message_data'] = array("data not found"); + $data['status'] = 'error'; + $data['datas'] = null; + $data['message'] ['message_data'] = ["data not found"]; } } else { - $data['status'] = 'error'; - $data['message'] ['message_ajax'] = array("no ajax request"); + $data['status'] = 'error'; + $data['message'] ['message_ajax'] = ["no ajax request"]; } return response()->json($data); } - public function update(Request $request, $id): JsonResponse - { + public function update(Request $request, $id) + : JsonResponse { // init - $data = array(); - $dataku = array(); + $data = []; + $dataku = []; $tindakan = null; if (request()->ajax()) { $validator = RegistrasiController::rulesEditnya($request, $id); - + if ($validator['fails']) { $data['message'] = $validator['errors']; - $data['status'] = 'error'; - } - else - { + $data['status'] = 'error'; + } else { try { + $tindakan = $request->tindakan; + $dataku = [ + 'registrasi_by' => Auth::id(), + 'registrasi_at' => now(), + ]; - $tindakan=$request->tindakan; - $dataku = ['registrasi_by' => Auth::id(), - 'registrasi_at' => now() - ]; - - if($tindakan==0) - { - $dataku['jenis_penilaian_id'] =$request->jenis_penilaian; - $dataku['region_id'] =$request->region; - $dataku['status'] = 'registered'; - if($request->catatan2) - $dataku['registrasi_catatan'] =$request->catatan2; - } - else - { - $dataku['registrasi_catatan'] =$request->catatan; - $dataku['status'] = 'revisi'; + if ($tindakan == 0) { + $dataku['jenis_penilaian_id'] = $request->jenis_penilaian; + $dataku['region_id'] = $request->region; + $dataku['status'] = 'registered'; + if ($request->catatan2) { + $dataku['registrasi_catatan'] = $request->catatan2; + } + } else { + $dataku['registrasi_catatan'] = $request->catatan; + $dataku['status'] = 'revisi'; } - $data['dataku'] =$dataku; - + $data['dataku'] = $dataku; + $modal = Permohonan::find($id); - + $modal->update($dataku); - // - $data['status'] = 'success'; - $data['message'] ['message_success'] = array('Regitrasi '.$modal->nomor_registrasi.' successfully'); + // + $data['status'] = 'success'; + $data['message'] ['message_success'] = ['Regitrasi ' . $modal->nomor_registrasi . ' successfully']; } catch (Exception $e) { - - $data['status'] = 'error'; - $data['message'] ['message_try_catch'] = array('Regitrasi updated failed.'); + $data['status'] = 'error'; + $data['message'] ['message_try_catch'] = ['Regitrasi updated failed.']; } } - } else { - $data['status'] = 'error'; - $data['message'] ['message_ajax'] = array("no ajax request"); + $data['status'] = 'error'; + $data['message'] ['message_ajax'] = ["no ajax request"]; } return response()->json($data); - } public function rulesEditnya($request, $id) { - $tindakan=null; - $jenis_penilaian=null; - $validate_catatan=''; - $tindakan=$request->tindakan; - $jenis_penilaian=$request->jenis_penilaian; - + $tindakan = null; + $jenis_penilaian = null; + $validate_catatan = ''; + $tindakan = $request->tindakan; + $jenis_penilaian = $request->jenis_penilaian; + $validateIt = [ // 'name' diambil dari definisi parameter yang di kirim pada POST Data 'tindakan' => 'required', ]; $messageIt = [ - 'tindakan.required' => 'Silahkan pilih Tindakan' + 'tindakan.required' => 'Silahkan pilih Tindakan', ]; - if($tindakan==0) - { - $validateIt['jenis_penilaian'] = ['required']; - $messageIt ['jenis_penilaian.required']= 'Silahkan pilih Jenis Penilaian'; + if ($tindakan == 0) { + $validateIt['jenis_penilaian'] = ['required']; + $messageIt ['jenis_penilaian.required'] = 'Silahkan pilih Jenis Penilaian'; - // INTERNAL - if(1==$jenis_penilaian) - { - $validateIt['region'] = ['required']; - $messageIt ['region.required']= 'Silahkan pilih Region'; + // INTERNAL + if (1 == $jenis_penilaian) { + $validateIt['region'] = ['required']; + $messageIt ['region.required'] = 'Silahkan pilih Region'; } - } - elseif($tindakan==1) - { - $validateIt['catatan'] = ['required']; - $messageIt ['catatan.required']= 'Silahkan isi Catatan'; + } elseif ($tindakan == 1) { + $validateIt['catatan'] = ['required']; + $messageIt ['catatan.required'] = 'Silahkan isi Catatan'; } $validator = Validator::make($request->all(), $validateIt, $messageIt); - $data['fails'] = $validator->fails(); + $data['fails'] = $validator->fails(); $data['errors'] = $validator->errors(); return $data; @@ -245,8 +220,8 @@ public function show($id) { - $permohonan = Permohonan::find($id); - return view('lpj::registrasi.show', compact('id','permohonan')); + $permohonan = Permohonan::find($id); + return view('lpj::registrasi.show', compact('id', 'permohonan')); } }