diff --git a/app/Http/Controllers/PenilaiController.php b/app/Http/Controllers/PenilaiController.php index 9c214d5..95bbf0f 100644 --- a/app/Http/Controllers/PenilaiController.php +++ b/app/Http/Controllers/PenilaiController.php @@ -497,7 +497,7 @@ class PenilaiController extends Controller }); } - $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?)', ['assign','survey-completed', 'proses-laporan', 'paparan', 'proses-paparan','paparan', 'revisi-laporan']); + $query->whereRaw('LOWER(status) IN (?, ?, ?, ?, ?, ?,?)', ['assign','survey-completed', 'proses-laporan', 'paparan', 'proses-paparan','paparan', 'revisi-laporan', 'done']); if (!Auth::user()->hasRole('administrator')) { $query->whereHas('penilaian.userPenilai', function ($q) { diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php index ac16dae..3b6611f 100644 --- a/resources/views/penilai/components/print-resume.blade.php +++ b/resources/views/penilai/components/print-resume.blade.php @@ -247,47 +247,14 @@ @endforeach - @if (!empty($resumeData['sesuai_imb'])) - - - - -
-
2. Sesuai IMB
-
- - - @foreach ($resumeData['sesuai_imb'] as $item) - - - - - - - - - - - - - - - - @endforeach -
SertifikatLuas TanahLuas BangunanNilai Pasar Wajar
- {{ $item['sertifikat'] ?? '' }} - {{ isset($item['luas_tanah']) ? $item['luas_tanah'] . ' m²' : '-' }} - {{ isset($item['luas_bangunan']) ? $item['luas_bangunan'] . ' m²' : '-' }} - {{ isset($item['nilai']) ? formatRupiah($item['nilai']) : '-' }}
- @endif @if (!empty($resumeData['tambahan'])) @foreach ($resumeData['tambahan'] as $index => $item) diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php index 87602f7..efd0832 100644 --- a/resources/views/penilai/components/resume.blade.php +++ b/resources/views/penilai/components/resume.blade.php @@ -297,72 +297,6 @@ -
- -
- -
- {{ $index + 3 }}. {{ $item['tambahan_nama_kesimpulan'] ?? '-' }} + {{ $index + 2 }}. {{ $item['tambahan_nama_kesimpulan'] ?? '-' }}
- - - - - - - - - - - - @if (!empty($resumeData['sesuai_imb'])) - @foreach ($resumeData['sesuai_imb'] as $item) - - - - - - - - @endforeach - @else - - - - - - - - @endif - -
SertipikatLuas TanahLuas BangunanNilai Pasar Wajar
- - - - - - - -
- - - - - - - -
- - - @if (!empty($resumeData['tambahan'])) @foreach ($resumeData['tambahan'] as $counter => $item)
@@ -425,7 +359,6 @@
-