From 94fc66a48f192c230368e613fe832dad2bc165e1 Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 26 Feb 2025 12:08:55 +0700 Subject: [PATCH] fix(penilai/so) : perbaikkan nilai resume dan sla activity --- app/Http/Controllers/PenilaiController.php | 2 +- resources/views/activity/progres_activity/index.blade.php | 4 ++-- resources/views/penilai/components/resume.blade.php | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index d2de8f5..9c214d5 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -1406,7 +1406,7 @@ class PenilaiController extends Controller // Validasi struktur data di dalam array foreach ($value as $item) { - $requiredKeys = ['sertifikat', 'luas_tanah', 'luas_bangunan', 'nilai']; + $requiredKeys = ['sertifikat', 'luas_tanah', 'nilai']; foreach ($requiredKeys as $requiredKey) { if (!isset($item[$requiredKey])) { $missingFields[] = $field . '.' . $requiredKey; diff --git a/resources/views/activity/progres_activity/index.blade.php b/resources/views/activity/progres_activity/index.blade.php index fdb221c..11c5fac 100644 --- a/resources/views/activity/progres_activity/index.blade.php +++ b/resources/views/activity/progres_activity/index.blade.php @@ -246,7 +246,7 @@ title: 'Due Date', render: (item, data) => { if (!data.due_date_sla) { - return `Sudah melewati batas`; + return ``; } return `${window.formatTanggalIndonesia(data.due_date_sla)}`; } @@ -256,7 +256,7 @@ title: 'Paparan', render: (item, data) => { if (!data.due_date_sla) { - return `Sudah melewati batas`; + return `-`; } return `${window.formatTanggalIndonesia(data.due_date_sla)}`; } diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php index 33c5ab6..87602f7 100644 --- a/resources/views/penilai/components/resume.blade.php +++ b/resources/views/penilai/components/resume.blade.php @@ -220,8 +220,8 @@ - @if (!empty($resumeData['sesuai_imb'])) - @foreach ($resumeData['sesuai_imb'] as $item) + @if (!empty($resumeData['fisik'])) + @foreach ($resumeData['fisik'] as $item) - @if (!empty($resumeData['fisik'])) - @foreach ($resumeData['fisik'] as $item) + @if (!empty($resumeData['sesuai_imb'])) + @foreach ($resumeData['sesuai_imb'] as $item)