Merge pull request 'andydev' (#60) from andydev into staging

Reviewed-on: #60

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);
     }
 
 

resources/views/permohonan/index.blade.php

@@ -186,9 +186,9 @@
                         let actionHtml = `<div class="flex flex-nowrap justify-center gap-1.5">`;
 
                         if (data && data.penilaian && data.penilaian.waktu_penilaian !== null && data.status !==
-                            'done') {
+                            'done' && data.penilaian.authorized_status==null) {
                             actionHtml += `
-                <a class="btn btn-sm btn-outline btn-primary" href="surveyor/storeAproved/${data.penilaian.id}">
+                <a class="btn btn-sm btn-outline btn-primary" href="javascript:void(0)" onclick="surveyorApproveKunjungan(${data.penilaian.id},'${data.nomor_registrasi}')" title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}">
                     <i class="ki-filled ki-calendar-edit"></i>
                 </a>
             `;
@@ -225,5 +225,58 @@
 
         });
     </script>
+    <script type="text/javascript">
+        function surveyorApproveKunjungan(id, noReg) {
+            Swal.fire({
+                title: ' ',
+                text: "Yakin akan Menyetujui Jadwal Kunjungan "+noReg+"?",
+                icon: 'warning',
+                showCancelButton: true,
+                confirmButtonColor: '#3085d6',
+                cancelButtonColor: '#d33',
+                confirmButtonText: 'Yes'
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    //define variable
+                    // $id ==> penilaian.id
+                    let token = "{{ csrf_token() }}";
+                    let useURL = "{{ URL::to('/surveyor/storeAproved') }}"+"/"+id; 
+                    
+                    var input_data = new Object();
+                    input_data._token = token;
+                    input_data.id = id;
+                    input_data.noReg =noReg;
+                    $.ajax({
+                        url: useURL,
+                        type: "PUT",
+                        cache: false,
+                        data: input_data,
+                        dataType: "json",
+                        success: function(response) {
+                            console.log(response);
+                            if('success' == response.status)
+                            {
+                                swal.fire('Sukses Menyetujui!', response.message, 'success').then(() => {
+                                    location.reload(true);
+                                });
+                            }
+                            else
+                            {
+                                Swal.fire('Error!', response.message, 'error');
+                            }
+                            
+                        },
+                        error: function(response, textStatus, errorThrown) {
+                            // var errors = response.responseJSON.errors;
+                            // console.log(errors);
+                            console.log(response);
+
+                        }
+                    });  
+                }
+            })
+            
+        }
+    </script>
 @endpush
 

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');