diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 904c721..24a60bf 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -603,8 +603,15 @@ class PenilaianController extends Controller
break;
case 'paparan':
if (Auth::user()->roles[0]->name === 'senior-officer' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so === null) {
+ $status = '3';
+ if (in_array($permohonan->nilai_plafond_id, [3])) {
+ $status = '1';
+ $permohonan->update([
+ 'status' => $authorization->request
+ ]);
+ }
$authorization->update([
- 'status' => '3',
+ 'status' => $status,
'status_so' => '1',
'approve_so' => Auth::user()->id,
'approve_so_at' => now(),
@@ -615,9 +622,10 @@ class PenilaianController extends Controller
'tanggal_paparan' => $request->tanggalPaparan,
'keterangan' => $request->keterangan
]);
+
} elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
$status = '2';
- if (in_array($permohonan->nilai_plafond_id, [1,2])) {
+ if (in_array($permohonan->nilai_plafond_id, [1,2, 3])) {
$status = '1';
$permohonan->update([
'status' => $authorization->request
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index 38c23cc..cf027b1 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -172,7 +172,7 @@
@if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) &&
$permohonan->approval_so &&
$permohonan->approval_eo == 0 &&
- in_array($permohonan->nilai_plafond_id, [1, 2, 4]))
+ in_array($permohonan->nilai_plafond_id, [1, 2,3, 4]))
@endif
- @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2,4]))
+ @if (Auth::user()->hasAnyRole(['administrator', 'EO Appraisal']) && $authorization->approve_so && $authorization->approve_eo == null && in_array($permohonan->nilai_plafond_id, [1, 2,3,4]) && $permohonan->status === 'proses-paparan')
@endif
- @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [4]))
+ @if (Auth::user()->hasAnyRole(['administrator', 'DD Appraisal']) && $authorization->approve_eo && $authorization->approve_dd == null && in_array($permohonan->nilai_plafond_id, [4]) &&$permohonan->status === 'proses-paparan')