diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 6094c5e..be11bac 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -496,7 +496,7 @@ class PenilaiController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?)', ['assign','done', 'proses-laporan', 'paparan', 'proses-paparan','paparan']); + $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?)', ['assign','survey-completed', 'proses-laporan', 'paparan', 'proses-paparan','paparan']); if (!Auth::user()->hasRole('administrator')) { $query->whereHas('penilaian.userPenilai', function ($q) { diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index c16e361..4b2ba7b 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -483,7 +483,7 @@ class PenilaianController extends Controller ]); } elseif (Auth::user()->roles[0]->name === 'DD Appraisal') { $permohonan->update([ - 'status' => 'proses-laporan', + 'status' => 'done', 'approval_dd' => Auth::user()->id, 'approval_dd_at' => now(), 'keterangan' => $request->message, diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index 22c602d..408494f 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -815,7 +815,7 @@ class SurveyorController extends Controller // If validation passes, update permohonan status $permohonan = Permohonan::findOrFail($id); $permohonan->update([ - 'status' => 'done', + 'status' => 'survey-completed', 'submitted_at' => now() ]); diff --git a/resources/views/activity/activitydetail.blade.php b/resources/views/activity/activitydetail.blade.php index d964608..e3b24ce 100644 --- a/resources/views/activity/activitydetail.blade.php +++ b/resources/views/activity/activitydetail.blade.php @@ -15,7 +15,7 @@
-

+

Activity Permohonan

@@ -54,8 +54,33 @@
-
- @include('lpj::component.history-permohonan') -
+ + @if ($permohonan->status === 'done') +
+ +
+

+ Hasil Laporan Penilaian +

+
+ + +
+ @endif + +
+ @include('lpj::component.history-permohonan') +
@endsection diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php index a68a798..be2f7a8 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -191,7 +191,7 @@ actions: { title: 'Action', render: (item, data) => { - if (data.status === 'done' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan') { + if (data.status === 'survey-completed' || data.status === 'proses-laporan' || data.status === 'paparan' || data.status === 'proses-paparan' || data.status === 'paparan') { return `