diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index b4703e9..3931aa2 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -5,6 +5,7 @@ namespace Modules\Lpj\Http\Controllers; use App\Http\Controllers\Controller; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; +use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Validator; use Maatwebsite\Excel\Facades\Excel; use Modules\Lpj\Exports\BasicDataSurveyorExport; @@ -527,22 +528,29 @@ class SurveyorController extends Controller - public function storeAproved($id) + public function storeAproved(Request $request, $id): JsonResponse { - try { - $penilaian = Penilaian::findOrFail($id); - $penilaian->update([ - 'authorized_status' => 1, - ]); + $data = []; + if (request()->ajax()) { + try { + $penilaian = Penilaian::findOrFail($id); + $penilaian->update([ + 'authorized_status' => 1, + ]); + + $data['status'] = 'success'; + $data['message']= 'Jadwal '.$request->noReg.' berhasil di aprove'; + } catch (\Exception $e) { + $data['status'] = 'error'; + $data['message'] = 'Gagal membuat jadwal: ' . $e->getMessage(); + } - return redirect() - ->route('permohonan.index') - ->with('success', 'Jadwal berhasil di aprove.'); - } catch (\Exception $e) { - return redirect() - ->route('permohonan.index') - ->with('error', 'Gagal membuat jadwal: ' . $e->getMessage()); + } else { + $data['status'] = 'error'; + $data['message'] = "no ajax request"; } + + return response()->json($data); } diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php index 88e0105..e4f9550 100644 --- a/resources/views/penilaian/form.blade.php +++ b/resources/views/penilaian/form.blade.php @@ -3,11 +3,8 @@ @section('breadcrumbs') {{ Breadcrumbs::render(request()->route()->getName()) }} @endsection - - - - @section('content') +@include('lpj::assetsku.includenya')
@include('lpj::component.detail-jaminan', ['backLink' => 'penilaian.index']) @@ -462,6 +459,7 @@ if (response.success) { window.location.href = '{{ route('penilaian.index') }}'; + toastrSuccessBuild(response.message); } else { showErrorMessages(response.errors); @@ -470,6 +468,7 @@ }, error: function(xhr) { // Handle errors from the server + toastrErrorBuild(xhr.responseJSON.message); showErrorMessages(xhr.responseJSON?.errors); console.error('Error occurred:', xhr.statusText); console.log('Response:', xhr.responseText); diff --git a/resources/views/permohonan/index.blade.php b/resources/views/permohonan/index.blade.php index 6c7cb6f..4a891c5 100644 --- a/resources/views/permohonan/index.blade.php +++ b/resources/views/permohonan/index.blade.php @@ -186,9 +186,9 @@ let actionHtml = `
`; if (data && data.penilaian && data.penilaian.waktu_penilaian !== null && data.status !== - 'done') { + 'done' && data.penilaian.authorized_status==null) { actionHtml += ` - + `; @@ -225,5 +225,58 @@ }); + @endpush diff --git a/routes/web.php b/routes/web.php index 011dbc1..529f05c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -514,7 +514,7 @@ Route::middleware(['auth'])->group(function () { Route::post('store', [SurveyorController::class, 'store'])->name('store'); Route::post('storeDenah', [SurveyorController::class, 'storeDenah'])->name('storeDenah'); Route::put('storeJadwal', [SurveyorController::class, 'storeJadwal'])->name('storeJadwal'); - Route::get('storeAproved/{id}', [SurveyorController::class, 'storeAproved'])->name('storeAproved'); + Route::put('storeAproved/{storeAproved}', [SurveyorController::class, 'storeAproved'])->name('storeAproved'); Route::put('storeFreeze', [SurveyorController::class, 'storeFreeze'])->name('storeFreeze'); Route::post('storeFoto', [SurveyorController::class, 'storeFoto'])->name('storeFoto'); Route::post('storeDataPembanding', [SurveyorController::class, 'storeDataPembanding'])->name('storeDataPembanding');