diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index 27e5c8a..db08550 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -188,7 +188,7 @@ class ActivityController extends Controller
$userRole = $user->roles[0]->name ?? null;
if (in_array($userRole, ['surveyor', 'surveyor-penilai'])) {
- $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian',])
+ $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian'])
->whereHas('penilaian.userPenilai', function ($q) use ($user) {
$q->where('user_id', $user->id);
})
@@ -246,7 +246,12 @@ class ActivityController extends Controller
'permohonan.debiture',
'permohonan.tujuanPenilaian',
'permohonan.debiture.documents.jenisJaminan',
- 'userPenilai'
+ 'userPenilai',
+ 'permohonan.penilai',
+ 'permohonan.approveEo',
+ 'permohonan.approveDd',
+ 'permohonan.approveSo',
+
])
->whereHas('userPenilai', function ($q) use ($id) {
$q->where('user_id', $id);
diff --git a/resources/views/activity/progres_activity/index.blade.php b/resources/views/activity/progres_activity/index.blade.php
index 394708e..8f6eedb 100644
--- a/resources/views/activity/progres_activity/index.blade.php
+++ b/resources/views/activity/progres_activity/index.blade.php
@@ -185,22 +185,25 @@
},
jenis_report: {
title: 'Jenis Report',
- render: (item, data) => `${data.jenis_report || ''}`,
+ render: (item, data) => {
+ return data.permohonan.penilai?.type_penilai || '-';
+ },
},
register: {
title: 'Register',
render: (item, data) =>
- `${formatDateFromISO(data.permohonan.created_at) || ''}`,
+ `${window.formatTanggalIndonesia(data.permohonan.created_at) || ''}`,
},
assign: {
title: 'Assign',
- render: (item, data) => `${formatDateFromISO(data.created_at)}`,
+ render: (item, data) =>
+ `${window.formatTanggalIndonesia(data.created_at)}`,
},
tanggal_kunjungan: {
title: 'Tgl Kunjungan',
render: (item, data) =>
- `${formatDateFromISO(data.waktu_penilaian) || ''}`,
+ `${window.formatTanggalIndonesia(data.waktu_penilaian) || ''}`,
},
progress: {
title: 'Progress',
@@ -208,10 +211,12 @@
return `${data.permohonan.status}`;
}
},
+ // tanggal kunjungan h+2 jika plafon di
due_date: {
title: 'Due Date',
render: (item, data) => {
- const jenis_asset = data.permohonan.debiture?.documents?.map(d => d.jenis_jaminan.name );
+ const jenis_asset = data.permohonan.debiture?.documents
+ ?.map(d => d.jenis_jaminan.name);
return `${calculateDateSLA(jenis_asset, data.tanggal_kunjungan)}`;
},
@@ -223,8 +228,20 @@
},
approve: {
title: 'Approve',
- render: (item, data) => `${data.approve || ''}`,
+ render: (item, data) => {
+ // Gabungkan nama dengan
untuk pemisah baris baru
+ let dataHtml = `
+ ${data.permohonan?.approve_so?.name || ''}
+
+ ${data.permohonan?.approve_eo?.name || ''}
+
+ ${data.permohonan?.approve_dd?.name || ''}
+ `;
+ return dataHtml;
+ },
},
+
+
keterangan: {
title: 'Keterangan',
render: (item, data) => `${data.keterangan || ''}`,
@@ -258,7 +275,7 @@
}
- function calculateDateSLA($jenis, $date){
+ function calculateDateSLA($jenis, $date) {
let date = new Date($date);
return $jenis, $date;
}
diff --git a/resources/views/component/logo-bag.blade.php b/resources/views/component/logo-bag.blade.php
index 90d2f65..1b9d8a2 100644
--- a/resources/views/component/logo-bag.blade.php
+++ b/resources/views/component/logo-bag.blade.php
@@ -1 +1,5 @@
-
+@php
+ $width = $width ?? 240;
+ $height = $height ?? 51.67;
+@endphp
+