diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 1a48914..e3e3229 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -539,6 +539,10 @@ class PenilaianController extends Controller
'approve_so_at' => now(),
'keterangan_so' => $request->message,
]);
+
+ $permohonan->update([
+ 'tanggal_paparan' => $request->tanggalPaparan
+ ]);
} elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
$status = '2';
if (!in_array($permohonan->nilai_plafond_id, [1, 4])) {
@@ -564,12 +568,11 @@ class PenilaianController extends Controller
]);
$permohonan->update([
- 'status' => 'paparan',
- 'tanggal_paparan' => $request->tanggalPaparan
+ 'status' => 'paparan'
]);
}
break;
-
+
default:
return response()->json([
'message' => 'Konteks otorisasi tidak valid.',
@@ -679,7 +682,10 @@ class PenilaianController extends Controller
},
'approveSo',
'approveEo',
- 'approveDd'
+ 'approveDd',
+ 'authorization.approveSo',
+ 'authorization.approveEo',
+ 'authorization.approveDd'
])->get();
diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php
index ec0604f..8bdb2f3 100644
--- a/app/Models/Permohonan.php
+++ b/app/Models/Permohonan.php
@@ -217,4 +217,8 @@
public function approveSo(){
return $this->belongsTo(User::class, 'approval_so', 'id');
}
+
+ public function authorization(){
+ return $this->belongsTo(Authorization::class, 'id', 'permohonan_id');
+ }
}
diff --git a/resources/views/laporan/index.blade.php b/resources/views/laporan/index.blade.php
index d522f6c..555b890 100644
--- a/resources/views/laporan/index.blade.php
+++ b/resources/views/laporan/index.blade.php
@@ -193,7 +193,7 @@
let resumeButton = '';
if(data.penilai.resume) {
- const resumeButton = `
+ resumeButton = `
Resume
`;
diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php
index ce1c1b8..b442693 100644
--- a/resources/views/penilaian/otorisator/show.blade.php
+++ b/resources/views/penilaian/otorisator/show.blade.php
@@ -159,13 +159,13 @@
@endif
@elseif($dataHeader == 'paparan')
-
- Lihat Data Paparan
-
-
+ @if($permohonan->penilai->file_paparan)
+ Lihat Data Paparan
+ @endif
@if(Auth::user()->hasAnyRole(['administrator','senior-officer']) && $authorization->approve_so==null)
-