🔧(services): Selaraskan fallback path foto pada PreviewLaporanService dan tambah logging

- Menyelaraskan resolusi path file foto di PreviewLaporanService dengan logika fallback seperti pada komponen foto:
  - Menggunakan `originalPath = $path['path']` sebagai path utama
  - Jika `statusLpj == 1` dan file asli tidak ditemukan, maka:
    - Ekstrak dua bagian terakhir dari path (contoh: `251051/251051_2_2.png`)
    - Bangun `fallbackPath` dengan pola `surveyor/001/{lastTwoParts}`
  - Tentukan `pathToUse`:
    - Apabila `fallbackPath` ada dan file fallback ditemukan, gunakan `fallbackPath`
    - Jika tidak, tetap gunakan `originalPath`
  - Resolusi final: `storage_path('app/public/' . $pathToUse)`

- Menambahkan logging untuk setiap operasi penting dan setiap titik pengembalian:
  - `Log::warning` saat path kosong terdeteksi dalam daftar paths
  - `Log::info` saat fallback kandidat dibangun dari `originalPath`
  - `Log::warning` saat file tidak ditemukan pada original maupun fallback (dengan menyertakan ketiganya: original, fallback, resolved)
  - `Log::info` saat file berhasil ditambahkan ke daftar unduhan
  - `Log::warning` saat tidak ada file valid setelah resolusi path
  - `Log::info` saat mengunduh single file
  - `Log::info` saat zip file berhasil dibuat (dengan jumlah file)
  - `Log::error` saat zip file gagal dibuat

- Memindahkan logika resolusi path di dalam loop pengolahan `$paths` untuk setiap item:
  - Mengganti setting langsung `storage_path('app/public/' . $path['path'])` dengan resolusi path yang bisa fallback
  - Menjaga struktur kontrol dengan `continue` jika file final tetap tidak ditemukan

- Menambahkan komentar level-fungsi (docblock) pada `previewLaporan`:
  - Menjelaskan tanggung jawab fungsi dalam menghasilkan PDF atau unduhan foto
  - Menjelaskan skenario fallback path dan tujuan mengurangi gambar hilang
  - Mendokumentasikan parameter dan bentuk nilai kembali respons

app/Exports/LaporanUserLimitExport.php

@@ -0,0 +1,232 @@
+<?php
+
+namespace Modules\Lpj\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\WithCustomStartCell;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Events\AfterSheet;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\Branch;
+use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+
+class LaporanUserLimitExport implements FromCollection, WithHeadings, WithMapping, WithTitle, WithCustomStartCell, WithEvents
+{
+    protected $request;
+
+    public function __construct($request)
+    {
+        $this->request = $request;
+    }
+
+    public function collection()
+    {
+        $query = Permohonan::query();
+        $query = $query->where('status', 'done');
+
+        // Apply date range filter if provided
+        if ($this->request->has('start_date') || $this->request->has('end_date')) {
+             $startDate = $this->request->start_date ?? '1900-01-01';
+            $endDate = $this->request->end_date ?? now()->toDateString();
+
+            $query->where(function ($q) use ($startDate, $endDate) {
+
+                $q->whereHas('penilaian', function ($q2) use ($startDate, $endDate) {
+                    $q2->whereBetween('tanggal_kunjungan', [$startDate, $endDate]);
+                });
+
+                // OR check if has penawaran with date in range
+                $q->orWhereHas('penawaran', function ($q3) use ($startDate, $endDate) {
+                    $q3->whereBetween('tanggal_penilaian_sebelumnya', [$startDate, $endDate]);
+                });
+            });
+        }
+
+        // Apply branch filter if provided
+        if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+            $query->where('branch_id', $this->request->branch_id);
+        }
+
+        if ($this->request->has('penilai_id') && !empty($this->request->penilai_id)) {
+            $request = $this->request; // Store in a local variable
+            $query->whereHas('penilaian._user_penilai.userPenilaiTeam', function ($q) use ($request) {
+                $q->where('user_id', $request->penilai_id);
+            });
+        }
+
+        // Apply search filter if provided
+        if ($this->request->has('search') && !empty($this->request->search)) {
+            $search = $this->request->search;
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                 $q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search) . '%');
+
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Default ordering
+        $query->orderBy('nomor_registrasi', 'asc');
+
+        return $query->get();
+    }
+
+    protected $rowNumber = 0;
+
+    public function map($permohonan): array
+    {
+        $this->rowNumber++;
+        $npw = 0;
+
+        if (isset($permohonan->penilai->lpj)) {
+            $lpj = json_decode($permohonan->penilai->lpj, true);
+            $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
+        }
+
+        return [
+            $this->rowNumber,
+            $permohonan->nomor_registrasi,
+            $permohonan->debiture->branch->name ?? '',
+            $permohonan->debiture->name ?? '',
+            $permohonan->user->name ?? $permohonan->mig_nama_ao ?? '',
+            $permohonan->tanggal_permohonan ?? '',
+            $permohonan->penilaian->_user_penilai->userPenilaiTeam->name ?? '',
+            $permohonan->penilaian && $permohonan->penilaian->tanggal_kunjungan
+    ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan)
+    : '',
+             formatRupiah($npw, 2),
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'No',
+            'Nomor Registrasi',
+            'Cabang',
+            'Nama Debitur',
+            'Pemohon',
+            'Tanggal Permohonan',
+            'Nama Penilai',
+            'Tanggal Laporan',
+            'Nilai Pasar Wajar',
+
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Laporan User Limit';
+    }
+
+    /**
+     * @return string
+     */
+    public function startCell(): string
+    {
+        return 'A7';
+    }
+
+    /**
+     * @return array
+     */
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                // Get the sheet
+                $sheet = $event->sheet->getDelegate();
+
+                // Set the title
+                $sheet->setCellValue('A1', 'LAPORAN PENILAIAN JAMINAN');
+                $sheet->getStyle('A1')->getFont()->setBold(true)->setSize(16);
+
+                // Merge cells for title
+                $sheet->mergeCells('A1:AH1');
+                $sheet->getStyle('A1')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the branch information if filtered
+                $branchInfo = '';
+                if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+                    $branch = Branch::find($this->request->branch_id);
+                    if ($branch) {
+                        $branchInfo = 'Cabang: ' . $branch->name;
+                        $sheet->setCellValue('A2', $branchInfo);
+                        $sheet->mergeCells('A2:AH2');
+                        $sheet->getStyle('A2')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+                        $sheet->getStyle('A2')->getFont()->setBold(true);
+                    }
+                }
+
+                // Set the period
+                $startDate = $this->request->start_date ?? '';
+                $endDate = $this->request->end_date ?? '';
+
+                $rowIndex = $branchInfo ? 3 : 2;
+
+                if ($startDate && $endDate) {
+                    $startDateFormatted = Carbon::parse($startDate)->format('d F Y');
+                    $endDateFormatted = Carbon::parse($endDate)->format('d F Y');
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: ' . $startDateFormatted . ' - ' . $endDateFormatted);
+                } else {
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: Semua Data');
+                }
+                $sheet->mergeCells('A' . $rowIndex . ':AH' . $rowIndex);
+                $sheet->getStyle('A' . $rowIndex)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the date of export
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, 'Tanggal Export: ' . Carbon::now()->format('d F Y H:i:s'));
+
+                // Set the user who exported
+                $rowIndex++;
+                $userName = Auth::user() ? Auth::user()->name : 'System';
+                $sheet->setCellValue('A' . $rowIndex, 'Diexport oleh: ' . $userName);
+
+                // Add a blank line
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, '');
+
+                // Style the header row
+                $headerRange = 'A7:' . $sheet->getHighestColumn() . '7';
+                $sheet->getStyle($headerRange)->getFont()->setBold(true);
+                $sheet->getStyle($headerRange)->getFill()
+                      ->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)
+                      ->getStartColor()->setARGB('FFCCCCCC');
+
+                // Auto-size columns - fixed to handle columns beyond Z
+                $highestColumn = $sheet->getHighestColumn();
+                $highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn);
+
+                for ($i = 1; $i <= $highestColumnIndex; $i++) {
+                    $currentColumn = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::stringFromColumnIndex($i);
+                    $sheet->getColumnDimension($currentColumn)->setAutoSize(true);
+                }
+
+                // Add borders to all cells with data
+                $dataRange = 'A7:' . $sheet->getHighestColumn() . $sheet->getHighestRow();
+                $sheet->getStyle($dataRange)->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
+
+                // Center align the header row
+                $sheet->getStyle($headerRange)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set text wrap for header cells
+                $sheet->getStyle($headerRange)->getAlignment()->setWrapText(true);
+            },
+        ];
+    }
+}

app/Helpers/Lpj.php

@@ -15,6 +15,8 @@
     use Modules\Lpj\Models\Penilaian;
     use Modules\Lpj\Models\TeamsUsers;
     use Modules\Usermanagement\Models\User;
+    use Illuminate\Support\Facades\File;
+    use Illuminate\Support\Facades\Storage;
 
     function formatTanggalIndonesia($date, $time = false)
     {
@@ -531,7 +533,6 @@
 }
 
 function parsePembandingMigration($keterangan) {
-
    $keterangan = preg_replace('/[-]{5,}/', '',$keterangan);   // Hapus ------
    $keterangan = preg_replace('/[.]{5,}/', '',$keterangan);   // Hapus .....
 
@@ -551,9 +552,140 @@ function parsePembandingMigration($keterangan) {
                 return 'Rp. ' . number_format((int)$angka, 0, ',', '.');
             }, $line);
 
+            // Jika ada tanda pagar (#), pisahkan menjadi baris baru
+            $line = str_replace('#', "\n#", $line);
+
             $cleaned[] = $line;
         }
     }
 
     return implode("\n", $cleaned);
 }
+/**
+ * get full path to internal storage file or external storage file
+ *
+ * @param string $path
+ * @return string
+ */
+
+    function getFilePath($path)
+    {
+        // define base path external storage (use .env) example: 'F:\path\to\storage' in windows
+        $externalBase = env('EXTERNAL_STORAGE_BASE_PATH', 'F:LPJ/lpj/LPJ Gambar/001/');
+
+        $segments = explode('/', $path);
+
+        if(strtoupper($segments[0]) === 'SURVEYOR'){
+            $year = $segments[1];
+            $month = ucfirst(strtolower($segments[2]));
+            $date = $segments[3];
+            $code = $segments[4];
+            $file = $segments[5] ?? '';
+
+            $extenalFullpath = $externalBase . $year . '/' . $month . '/' . $date . '/' . $code . '/' . $file;
+
+            if(File::exists($extenalFullpath)){
+                return $extenalFullpath;
+            }
+        }
+
+        // if not found in external storage, try to find in internal storage
+        if (Storage::exists($path)) {
+            return Storage::url('app/' . $path);
+        }
+        return $path;
+    }
+
+
+    function parseTimestamp(?string $timestamp): ?string
+    {
+        if (!$timestamp) {
+            return null;
+        }
+
+        // Trim whitespace dan normalize
+        $timestamp = trim($timestamp);
+
+        // Log untuk debugging
+        Log::info('Mencoba parsing timestamp: "' . $timestamp . '"');
+
+        // Parsing dengan DateTime native PHP untuk lebih robust
+        try {
+            // Pattern untuk format d/m/Y H:i:s
+            if (preg_match('/^(\d{1,2})\/(\d{1,2})\/(\d{4})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})$/', $timestamp, $matches)) {
+                $day = (int) $matches[1];
+                $month = (int) $matches[2];
+                $year = (int) $matches[3];
+                $hour = (int) $matches[4];
+                $minute = (int) $matches[5];
+                $second = (int) $matches[6];
+
+                // Validasi nilai
+                if ($day >= 1 && $day <= 31 && $month >= 1 && $month <= 12 && $year >= 1900 && $year <= 2100 &&
+                    $hour >= 0 && $hour <= 23 && $minute >= 0 && $minute <= 59 && $second >= 0 && $second <= 59) {
+
+                    // Buat DateTime object langsung
+                    $dateTime = new \DateTime();
+                    $dateTime->setDate($year, $month, $day);
+                    $dateTime->setTime($hour, $minute, $second);
+
+                    $result = $dateTime->format('Y-m-d H:i:s');
+                    Log::info('Berhasil parsing dengan DateTime: ' . $timestamp . ' -> ' . $result);
+                    return $result;
+                }
+            }
+
+            // Pattern untuk format d/m/Y tanpa waktu
+            if (preg_match('/^(\d{1,2})\/(\d{1,2})\/(\d{4})$/', $timestamp, $matches)) {
+                $day = (int) $matches[1];
+                $month = (int) $matches[2];
+                $year = (int) $matches[3];
+
+                // Validasi nilai
+                if ($day >= 1 && $day <= 31 && $month >= 1 && $month <= 12 && $year >= 1900 && $year <= 2100) {
+
+                    // Buat DateTime object langsung
+                    $dateTime = new \DateTime();
+                    $dateTime->setDate($year, $month, $day);
+                    $dateTime->setTime(0, 0, 0);
+
+                    $result = $dateTime->format('Y-m-d H:i:s');
+                    Log::info('Berhasil parsing tanpa waktu dengan DateTime: ' . $timestamp . ' -> ' . $result);
+                    return $result;
+                }
+            }
+        } catch (\Exception $e) {
+            Log::error('Gagal parsing dengan DateTime: ' . $timestamp . '. Error: ' . $e->getMessage());
+        }
+
+        // Fallback ke format Carbon standar untuk format lainnya
+        $formats = [
+            'Y-m-d H:i:s',
+            'Y-m-d',
+            'd-m-Y H:i:s',
+            'd-m-Y',
+            'j-n-Y H:i:s',
+            'j-n-Y',
+        ];
+
+        foreach ($formats as $format) {
+            try {
+                $carbon = \Carbon\Carbon::createFromFormat($format, $timestamp);
+
+                if ($carbon && $carbon->format($format) === $timestamp) {
+                    // Jika format tidak mengandung waktu, set ke awal hari
+                    if (!str_contains($format, 'H:i:s')) {
+                        $carbon = $carbon->startOfDay();
+                    }
+                    Log::info('Berhasil parsing dengan format ' . $format . ': ' . $timestamp . ' -> ' . $carbon->toDateTimeString());
+                    return $carbon->toDateTimeString();
+                }
+            } catch (\Exception $e) {
+                // Lanjut ke format berikutnya
+                continue;
+            }
+        }
+
+        Log::error('Tidak dapat memparsing timestamp dengan format apapun: "' . $timestamp . '"');
+        return null;
+    }

app/Http/Controllers/LaporanController.php

@@ -75,11 +75,9 @@ class LaporanController extends Controller
         }
 
         // Retrieve data from the database
-        $query = Permohonan::query()->whereIn('status',['proses-laporan','done', 'paparan', 'proses-paparan'])->whereNotNull('approval_so_at')->whereNotNull('approval_eo_at')->where(function ($q) {
-            $q->whereIn('nilai_plafond_id', [1,4])
-              ->whereNotNull('approval_dd_at')
-              ->orWhereIn('nilai_plafond_id', [2,3]);
-        });
+        $query = Permohonan::query()
+            ->whereIn('status',['proses-laporan','done', 'paparan', 'proses-paparan']);
+
 
         $query = $query->orderBy('nomor_registrasi', 'desc');
         // Apply search filter if provided

app/Http/Controllers/LaporanUserController.php

@@ -4,6 +4,8 @@ namespace Modules\Lpj\Http\Controllers;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
+    use Maatwebsite\Excel\Facades\Excel;
+use Modules\Lpj\Exports\LaporanUserLimitExport;
 use Modules\Lpj\Services\LaporanUserService;
 
 class LaporanUserController extends Controller
@@ -38,4 +40,12 @@ class LaporanUserController extends Controller
         return $this->laporanUserService->dataForDatatables($request);
     }
 
+     public function export(Request $request)
+    {
+        $startDate = $request->start_date;
+        $endDate = $request->end_date;
+        // name of the file
+        $fileName = 'laporan_user_limit' . $startDate . '_' . $endDate . '.xlsx';
+        return Excel::download(new LaporanUserLimitExport($request), $fileName);
+    }
 }

app/Http/Controllers/NocController.php

@@ -20,7 +20,7 @@
          */
         public function index()
         {
-            return redirect()->route('noc.pembayaran');
+            return redirect()->route('noc.pembayaran.index');
         }
 
         public function pembayaran()
@@ -80,7 +80,7 @@
             }
             $noc->save();
 
-            // Update the status of the related permohonan to 'spk'
+            /* Update the status of the related permohonan to 'spk'
             $permohonan = Permohonan::find(request()->get('permohonan_id'));
             if ($permohonan) {
                 $permohonan->status_bayar = request()->get('status_pembayar');
@@ -99,7 +99,7 @@
                     ]);
                 }
                 // andy add, update status penawaran.status='spk'
-            }
+            }*/
 
             return redirect()
                 ->route('noc.index')->with('success', 'NOC berhasil disimpan.');
@@ -175,9 +175,7 @@
         /**
          * Display the specified resource.
          */
-        public function show(Request $request) {
-           $noc = Noc::find($request->get('id'));
-
+        public function show(Noc $noc) {
            return view('lpj::noc.memo', compact('noc'));
         }
 

app/Http/Controllers/PenilaiController.php

@@ -697,6 +697,7 @@ class PenilaiController extends Controller
             'lokasi_lengkap' => $data->lokasi_lengkap ?? '',
         ];
 
+        if(isset($dataPembanding)){
             // Extract data pembanding
             if (isset($dataPembanding['data_pembanding'])) {
                 foreach ($dataPembanding['data_pembanding'] as $index => $pembanding) {
@@ -709,6 +710,7 @@ class PenilaiController extends Controller
                     }
                 }
             }
+        }
 
         // Now create the export
         // return response()->json([ 'data' => $fotoForm]);

app/Models/Inspeksi.php

@@ -14,7 +14,7 @@ class Inspeksi extends Base
     /**
      * The attributes that are mass assignable.
      */
-    protected $fillable = ['data_form', 'foto_form', 'denah_form','permohonan_id', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_by', 'updated_by', 'deleted_by','dokument_id','data_pembanding'];
+    protected $fillable = ['data_form', 'foto_form', 'denah_form','permohonan_id', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_by', 'updated_by', 'deleted_by','dokument_id','data_pembanding','mig_detail_data_jaminan'];
 
     public function permohonan()
     {

app/Services/DaftarPustakaService.php

@@ -80,14 +80,10 @@ class DaftarPustakaService
         $today = now();
         $folderPath = 'daftar_pustaka/' . $today->format('Y/m/d');
 
-        if (!file_exists(public_path($folderPath))) {
-            mkdir(public_path($folderPath), 0755, true);
-        }
-
         $fileName = $file->getClientOriginalName();
-        $file->move(public_path($folderPath), $fileName);
+        $filePath = $file->storeAs($folderPath, $fileName, 'public');
 
-        return $folderPath . '/' . $fileName;
+        return $filePath;
     }
 
 

app/Services/LaporanBiayaService.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Modules\Lpj\Services;
+use Illuminate\Http\Request;
+use Modules\Lpj\Models\Permohonan;
+
+class LaporanBiayaService
+{
+    public function buildDataTableQuery(array $data){
+        $query = Permohonan::with([
+            'noc'
+        ]);
+
+        if($data['search']){
+
+        }
+
+
+        return $query;
+    }
+}

app/Services/LaporanSLAPenilaiService.php

@@ -5,6 +5,7 @@ namespace Modules\Lpj\Services;
 use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\Penilaian;
 use Illuminate\Http\Request;
+use Carbon\Carbon;
 
 class LaporanSLAPenilaiService
 {
@@ -70,27 +71,15 @@ class LaporanSLAPenilaiService
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-            $data = $query->with(['debiture.branch'])->get();
+        $data = $query->with(['documents','debiture.branch'])->get();
 
         $data = $data->map(function ($permohonan) {
-                $luas_tanah    = 0;
-                $luas_bangunan = 0;
-                $nilai_tanah     = 0;
-                $nilai_bangunan  = 0;
-                $npw = 0;
-                $nilai_liquidasi = 0;
-                if (isset($permohonan->penilai->lpj)) {
-                    $lpj = json_decode($permohonan->penilai->lpj, true);
-                    $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
 
-                    $luas_tanah    = $lpj['luas_tanah'] ?? 0;
-                    $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
-                    // Calculate nilai_tanah dynamically by looking for all keys that start with 'nilai_tanah_'
-                    $nilai_tanah     = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
+            $tgl_kunjungan = $permohonan->penilaian?->tanggal_kunjungan;
+            $tgl_otorisator = $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? $permohonan->approval_so_at;
+            $jangkaWaktu = $this->hitungTotalJangkaWaktuSla($tgl_kunjungan, $tgl_otorisator);
+
 
-                    $nilai_bangunan  = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
-                    $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
-                }
 
             return [
                 'id'                => $permohonan->id,
@@ -100,11 +89,12 @@ class LaporanSLAPenilaiService
                 'name'              => $permohonan->debiture?->name,
                 'pemohon'           => $permohonan->creator?->name,
                 'tujuan_penilaian'  => $permohonan->tujuanPenilaian?->name,
-                    'jenis_agunan'      => $permohonan->documents?->pluck('jenisJaminan.name')->unique()->implode(', '),
-
                 'tanggal_laporan'   => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
-                    'tanggal_review'    => $permohonan->penilaian?->tanggal_kunjungan ?? '',
+                'tanggal_approval'    => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
+                'tanggal_kunjungan'    => $permohonan->penilaian?->tanggal_kunjungan ?? '',
                 'nama_penilai'      => $permohonan->penilaian?->_user_penilai?->userPenilaiTeam?->name,
+                'jangka_waktu' => $jangkaWaktu,
+                'keterangan' => $permohonan->keterangan
             ];
         });
 
@@ -125,4 +115,9 @@ class LaporanSLAPenilaiService
             'data'            => $data,
         ]);
     }
+
+    private function hitungTotalJangkaWaktuSla($tgl_kunjungan,$tgl_otorisator){
+            $countHariKerja = hitungHariKerja($tgl_kunjungan, $tgl_otorisator);
+            return $countHariKerja;
+    }
 }

app/Services/LaporanUserService.php

@@ -1,8 +1,10 @@
 <?php
 
 namespace Modules\Lpj\Services;
+
 use Modules\Lpj\Models\Permohonan;
 use Illuminate\Http\Request;
+use Modules\Usermanagement\Models\User;
 
 class LaporanUserService
 {
@@ -25,36 +27,15 @@ class LaporanUserService
     {
 
         // Retrieve data from the database
-        $query = Permohonan::query();
-        $query = $query->where('status', 'done');
-
+        $query = User::query();
         // Apply search filter if provided
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = json_decode($request->get('search'));
-
-            if (isset($search->start_date) || isset($search->end_date)) {
-                $query->whereBetween('tanggal_permohonan', [
-                    $search->start_date ?? '1900-01-01',
-                    $search->end_date ?? now()->toDateString()
-                ]);
-            }
-
-            // Filter by branch if provided
-            if (isset($search->user_id) && !empty($search->user_id)) {
-                $query->where('user_id', $search->user_id);
-            }
-
             if (isset($search->search)) {
 
                 $query->where(function ($q) use ($search) {
-                    $q->where('nomor_registrasi', 'LIKE', '%' . $search->search . '%');
-                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search->search . '%');
-                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search->search . '%');
-                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
-                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search->search . '%');
-                    $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
-                    $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
-                    $q->orWhere('status', 'LIKE', '%' . $search->search . '%');
+                    $q->whereRaw('LOWER(name) LIKE ?', ['%' . strtolower($search) . '%']);
+                    $q->where('nik', 'LIKE', '%' . $search->search . '%');
                 });
             }
         }
@@ -82,99 +63,16 @@ class LaporanUserService
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        $data = $query->with(['debiture.branch'])->get();
+        $data = $query->with(['branch', 'roles'])->get();
 
-        $data = $data->map(function ($permohonan) {
-            $luas_tanah      = 0;
-            $luas_bangunan   = 0;
-            $nilai_tanah     = 0;
-            $nilai_bangunan  = 0;
-            $npw             = 0;
-            $nilai_liquidasi = 0;
-
-            if (isset($permohonan->penilai->lpj)) {
-                $lpj = json_decode($permohonan->penilai->lpj, true);
-                $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
-
-                $luas_tanah    = $lpj['luas_tanah'] ?? 0;
-                $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
-                // Calculate nilai_tanah dynamically by looking for all keys that start with 'nilai_tanah_'
-                $nilai_tanah = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
-
-                $nilai_bangunan  = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
-                $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
-            }
+        $data = $data->map(function ($user) {
 
             return [
-                'id'                        => $permohonan->id,
-                'nomor_registrasi'          => $permohonan->nomor_registrasi,
-                'jenis_penilaian'           => $permohonan->jenisPenilaian?->name,
-                'tujuan_penilaian'          => $permohonan->tujuanPenilaian?->name,
-                'jenis_fasilitas_kredit'    => $permohonan->jenisFasilitasKredit?->name,
-                'branch'                    => $permohonan->debiture->branch?->name,
-                'pemohon'                   => $permohonan->creator?->name,
-                'cif'                       => $permohonan->debiture->cif,
-                'name'                      => $permohonan->debiture?->name,
-                'jenis_agunan'              => $permohonan->documents?->pluck('jenisJaminan.name')
-                                                                     ->unique()
-                                                                     ->implode(', '),
-                'alamat_agunan'             => $permohonan->documents?->map(function ($document) {
-                    return formatAlamat($document);
-                })->unique()->implode(', '),
-                'bukti_kepemilikan' => (function () use ($permohonan) {
-                    $legalitasItems = $permohonan->documents?->flatMap(function ($document) {
-                        return $document->detail->map(function ($detail) {
-                            // Jika tidak ada jenis legalitas jaminan, lewati
-                            if (empty($detail->jenisLegalitasJaminan)) {
-                                return null;
-                            }
-
-                            // Hanya tampilkan detail yang memiliki dokumen_jaminan
-                            if (empty($detail->dokumen_jaminan)) {
-                                return null;
-                            }
-
-                            // Tampilkan nama legalitas jaminan saja
-                            return $detail->jenisLegalitasJaminan->name ?? '';
-                        });
-                    })->filter()->unique()->values()->toArray();
-
-                    // Buat daftar bernomor
-                    $result = '';
-                    foreach ($legalitasItems as $index => $item) {
-                        $result .= ($index + 1) . '. ' . $item . "\n";
-                    }
-
-                    return $result;
-                })(),
-                'nama_pemilik'              => $permohonan->documents?->pluck('pemilik.name')
-                                                                     ->unique()
-                                                                     ->implode(', '),
-                'luas_tanah'                => $luas_tanah . ' m²',
-                'nilai_tanah'               => formatRupiah($nilai_tanah, 2),
-                'luas_bangunan'             => $luas_bangunan . ' m²',
-                'nilai_bangunan'            => formatRupiah($nilai_bangunan, 2),
-                'nilai_njop'                => formatRupiah($permohonan->nilai_njop, 2),
-                'nilai_pasar_wajar'         => formatRupiah($npw, 2),
-                'nilai_likuidasi'           => formatRupiah($nilai_liquidasi, 2),
-                'tanggal_documen_diterima'  => $permohonan->documents?->map(function ($document) {
-                    return $document->created_at->format('d-m-Y');
-                }),
-                'tanggal_spk'               => '',
-                'nomor_spk'                 => '',
-                'tanggal_rencana_kunjunagn' => '',
-                'tanggal_kunjungan'         => '',
-                'taggal_delivered'          => '',
-                'jangka_waktu_sla'          => '',
-                'nama_penilai'              => $permohonan->penilaian?->_user_penilai?->userPenilaiTeam?->name,
-                'nama_team_leader'          => $permohonan->penilaian?->teams,
-                'saran'                     => '',
-                'catatan'                   => '',
-
-
-                'tanggal_permohonan' => $permohonan->tanggal_permohonan,
-                'tanggal_laporan'    => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
-                'tanggal_review'     => $permohonan->penilaian?->tanggal_kunjungan ?? '',
+                'id'                        => $user->id,
+                'nik'                    => $user->nik,
+                'name'          => $user->name,
+                'level'                      => $user->roles->pluck('name')->implode(', '),
+                'approval_limit'                   => 0,
             ];
         });
 

app/Services/PreviewLaporanService.php

@@ -2,76 +2,93 @@
 
 namespace Modules\Lpj\Services;
 
-use Modules\Lpj\Models\Debiture;
-use Modules\Lpj\Models\LaporanExternal;
-use Modules\Lpj\Models\Permohonan;
-use Modules\Lpj\Models\Branch;
-use Modules\Lpj\Models\Surveyor;
-use Modules\Lpj\Models\BentukTanah;
-use Modules\Lpj\Models\KonturTanah;
-use Modules\Location\Models\Province;
-use Modules\Location\Models\City;
-use Modules\Location\Models\District;
-use Modules\Location\Models\Village;
-use Modules\Lpj\Models\PosisiKavling;
-use Modules\Lpj\Models\KondisiFisikTanah;
-use Modules\Lpj\Models\FotoObjekJaminan;
-use Modules\Lpj\Models\Perizinan;
-use Modules\Lpj\Models\KetinggianTanah;
-use Modules\Lpj\Models\SifatBangunan;
-use Modules\Lpj\Models\JenisJaminan;
-use Modules\Lpj\Models\JenisBangunan;
-use Modules\Lpj\Models\KondisiBangunan;
-use Modules\Lpj\Models\SpekBangunan;
-use Modules\Lpj\Models\SpekKategoritBangunan;
-use Modules\Lpj\Models\SaranaPelengkap;
-use Modules\Lpj\Models\ArahMataAngin;
-use Modules\Lpj\Models\Analisa;
-use Modules\Lpj\Models\Penilaian;
-use Modules\Lpj\Models\PerkerasanJalan;
-use Modules\Lpj\Models\AnalisaFakta;
-use Modules\Lpj\Models\AnalisaLingkungan;
-use Modules\Lpj\Models\AnalisaTanahBagunan;
-use Modules\Lpj\Models\SpekBangunanAnalisa;
+
+use Carbon\Carbon;
+use App\Helpers\Lpj;
 use Modules\Lpj\Models\Denah;
-use Modules\Lpj\Models\FotoJaminan;
-use Modules\Lpj\Models\Lingkungan;
-use Modules\Lpj\Models\LantaiUnit;
 use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\Branch;
 use Modules\Lpj\Models\Lantai;
+use Barryvdh\DomPDF\Facade\Pdf;
+use Modules\Lpj\Models\Analisa;
+use Modules\Lpj\Models\Penilai;
+use Modules\Lpj\Models\Debiture;
 use Modules\Lpj\Models\Inspeksi;
+use Modules\Lpj\Models\Surveyor;
 use Modules\Lpj\Models\ViewUnit;
+use Modules\Location\Models\City;
 use Modules\Lpj\Models\JenisUnit;
+use Modules\Lpj\Models\Penilaian;
+use Modules\Lpj\Models\Perizinan;
 use Modules\Lpj\Models\BentukUnit;
-use Modules\Lpj\Models\PosisiUnit;
-use Modules\Lpj\Models\TerletakArea;
-use Modules\Lpj\Models\FasilitasObjek;
-use Modules\Lpj\Models\MerupakanDaerah;
-use Modules\Lpj\Models\ObjekJaminan;
-use Modules\Lpj\Models\ModelAlatBerat;
-use Modules\Lpj\Models\JenisPesawat;
-use Modules\Lpj\Models\DokumenJaminan;
-use Modules\Lpj\Models\DetailDokumenJaminan;
 use Modules\Lpj\Models\JenisKapal;
-use Modules\Lpj\Models\JenisKendaraan;
+use Modules\Lpj\Models\LantaiUnit;
+use Modules\Lpj\Models\Lingkungan;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\PosisiUnit;
+use Illuminate\Support\Facades\Log;
+use Modules\Lpj\Models\AnalisaUnit;
+use Modules\Lpj\Models\BentukTanah;
+use Modules\Lpj\Models\FotoJaminan;
+use Modules\Lpj\Models\KonturTanah;
 use Modules\Lpj\Models\RuteJaminan;
+use Modules\Location\Models\Village;
+use Modules\Lpj\Models\AnalisaFakta;
+use Modules\Lpj\Models\JenisJaminan;
+use Modules\Lpj\Models\JenisPesawat;
+use Modules\Lpj\Models\ObjekJaminan;
+use Modules\Lpj\Models\SpekBangunan;
+use Modules\Lpj\Models\TerletakArea;
+use Modules\Location\Models\District;
+use Modules\Location\Models\Province;
+use Modules\Lpj\Models\ArahMataAngin;
+use Modules\Lpj\Models\JenisBangunan;
+use Modules\Lpj\Models\PosisiKavling;
+use Modules\Lpj\Models\SifatBangunan;
+use Modules\Lpj\Models\DokumenJaminan;
+use Modules\Lpj\Models\FasilitasObjek;
+use Modules\Lpj\Models\JenisKendaraan;
+use Modules\Lpj\Models\ModelAlatBerat;
+use Modules\Lpj\Models\KetinggianTanah;
+use Modules\Lpj\Models\KondisiBangunan;
+use Modules\Lpj\Models\LaporanExternal;
+use Modules\Lpj\Models\MerupakanDaerah;
+use Modules\Lpj\Models\PerkerasanJalan;
+use Modules\Lpj\Models\SaranaPelengkap;
+use Modules\Lpj\Models\TujuanPenilaian;
+use Modules\Lpj\Models\FotoObjekJaminan;
+use Modules\Lpj\Models\LaluLintasLokasi;
+use Modules\Lpj\Models\TingkatKeramaian;
+use Modules\Lpj\Models\AnalisaLingkungan;
+use Modules\Lpj\Models\KondisiFisikTanah;
+use Modules\Lpj\Models\AnalisaTanahBagunan;
+use Modules\Lpj\Models\GolonganMasySekitar;
+use Modules\Lpj\Models\SpekBangunanAnalisa;
+use Modules\Lpj\Models\DetailDokumenJaminan;
+use Modules\Lpj\Models\SpekKategoritBangunan;
+use Modules\Lpj\Http\Requests\SurveyorRequest;
 use Modules\Lpj\Models\HubunganPemilikJaminan;
 use Modules\Lpj\Models\HubunganPenghuniJaminan;
-use Modules\Lpj\Models\AnalisaUnit;
-use Modules\Lpj\Models\GolonganMasySekitar;
-use Modules\Lpj\Models\TingkatKeramaian;
-use Modules\Lpj\Models\TujuanPenilaian;
-use Modules\Lpj\Models\LaluLintasLokasi;
 use Modules\Lpj\Models\SpekBagunanAnalisaDetail;
-use Modules\Lpj\Http\Requests\SurveyorRequest;
-use Modules\Lpj\Http\Requests\FormSurveyorRequest;
 use Modules\Lpj\Jobs\SendJadwalKunjunganEmailJob;
-use App\Helpers\Lpj;
-use Modules\Lpj\Models\Penilai;
-use Barryvdh\DomPDF\Facade\Pdf;
+use Modules\Lpj\Http\Requests\FormSurveyorRequest;
 
 class PreviewLaporanService
 {
+    /**
+     * Preview Laporan dan unduh foto terkait dengan logika fallback path.
+     *
+     * Menghasilkan PDF atau paket unduhan foto berdasarkan status laporan.
+     * Jika file foto asli tidak ditemukan dan status LPJ adalah 1, maka
+     * sistem akan mencoba menggunakan fallback path dengan pola
+     * `surveyor/001/{lastTwoParts}` untuk meminimalisir gambar hilang.
+     *
+     * @param  int     $permohonan_id  ID Permohonan
+     * @param  int     $dokumen_id     ID Dokumen
+     * @param  int     $jaminan_id     ID Jaminan
+     * @param  string  $back           URL atau rute kembali
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
     public function previewLaporan($permohonan_id, $dokumen_id, $jaminan_id, $back)
     {
         $permohonan = $this->getPermohonanJaminanId(
@@ -90,14 +107,19 @@ class PreviewLaporanService
         $inspeksi = Inspeksi::where('permohonan_id', $permohonan_id)->where('dokument_id', $dokumen_id)->first();
         $lpj = Penilai::where('permohonan_id', $permohonan_id)->where('dokument_id', $dokumen_id)->first();
 
+        $mig_permohonan = json_decode($permohonan->mig_permohonan);
+
         $nomorLaporan = getNomorLaporan($permohonan_id, $dokumen_id);
-        $tanggalLaporan =  $lpj->created_at ?? null;
+        $tanggalLaporan =  $permohonan->is_mig
+            ? ($mig_permohonan->mig_mst_jaminan_tgl_laporan ?? $mig_permohonan->mig_mst_jaminan_tgl_create ?? null)
+            : ($lpj->created_at ?? null);
         $forminspeksi = null;
         $lpjData = null;
         $formFoto  = null;
 
         // if ($inspeksi) {
         $forminspeksi = json_decode($inspeksi?->data_form, true) ?? null;
+
         $formFoto = json_decode($inspeksi?->foto_form, true) ?? null;
         // $denahForm = json_decode($data->denah_form, true);
         $dataPembanding = json_decode($inspeksi?->data_pembanding, true) ?? null;
@@ -129,12 +151,13 @@ class PreviewLaporanService
 
     public function printOutLaporan($permohonan_id, $document_id, $jaminan_id)
     {
-
         $tipeLaporanResponse = $this->checkPrintOutLaporan($permohonan_id, $document_id);
         $tipeLaporan = $tipeLaporanResponse->getData();
 
+        //dd($permohonan_id, $document_id, $tipeLaporan);
+
         if (!$tipeLaporan->status) {
-            return redirect()->back()->with('error', 'Laporan tidak valid');
+            //return redirect()->back()->with('error', 'Laporan tidak valid');
         }
         $permohonan = $this->getPermohonanJaminanId(
             $permohonan_id,
@@ -145,15 +168,27 @@ class PreviewLaporanService
         $basicData = $this->getCommonData();
 
         $inspeksi = Inspeksi::where('permohonan_id', $permohonan_id)->where('dokument_id', $document_id)->first();
-        $lpj = Penilai::where('permohonan_id', $permohonan_id)->where('dokument_id', $document_id)->first();
+        $lpj = Penilai::where('permohonan_id', $permohonan_id)->first(); //->where('dokument_id', $document_id)->first();
 
+        $mig_permohonan = json_decode($permohonan->mig_permohonan);
         $nomorLaporan = getNomorLaporan($permohonan_id, $document_id);
-        $tanggalLaporan = $lpj->created_at ?? null;
+
+        //Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_laporan)->format('Y-m-d H:i:s');
+
+         $tanggalLaporan =  $permohonan->is_mig
+            ? ($mig_permohonan->mig_mst_jaminan_tgl_laporan
+                ? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_laporan)->format('Y-m-d H:i:s')
+                : ($mig_permohonan->mig_mst_jaminan_tgl_oto
+                    ? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_oto)->format('Y-m-d H:i:s')
+                    : null))
+            : ($lpj->created_at ?? null);
+
 
         $forminspeksi = null;
         $lpjData = null;
         $formFoto  = null;
 
+        $dataPembanding ='';
         if ($inspeksi) {
             $forminspeksi = json_decode($inspeksi->data_form, true);
             $formFoto = json_decode($inspeksi->foto_form, true);
@@ -161,6 +196,7 @@ class PreviewLaporanService
             $dataPembanding = json_decode($inspeksi->data_pembanding, true);
         }
 
+
         if ($lpj) {
             $lpjData = json_decode($lpj->lpj, true);
             $memo = json_decode($lpj->memo, true);
@@ -181,7 +217,96 @@ class PreviewLaporanService
             ];
 
         $viewLaporan = $this->getViewLaporan($tipeLaporan->status);
+
         $statusLpj = 1;
+
+            $mig_permohonan = json_decode($permohonan->mig_permohonan);
+            if(($tipeLaporan->status === 'memo' && $permohonan->mig_permohonan) || $mig_permohonan->mig_mst_lpj_tot_nilai_pasar < 1){
+                $paths = $formFoto['upload_foto'] ?? null;
+
+                if (!is_array($paths) || empty($paths)) {
+                    return response()->json(['error' => 'No files to download'], 404);
+                }
+
+                $files = [];
+                foreach ($paths as $path) {
+                    if (!$path['path']) {
+                        Log::warning('PreviewLaporanService: Path kosong terdeteksi dalam daftar paths.');
+                        continue;
+                    }
+
+                    // Logika fallback untuk path file
+                    $originalPath = $path['path'];
+                    $fallbackPath = null;
+
+                    // Jika file asli tidak ditemukan, buat fallback path
+                    if ($statusLpj == 1) {
+                        $fullOriginalPath = storage_path('app/public/' . $originalPath);
+
+                        if (!file_exists($fullOriginalPath)) {
+                            // Ekstrak bagian akhir path (contoh: 251051/251051_2_2.png)
+                            $pathParts = explode('/', $originalPath);
+                            if (count($pathParts) >= 2) {
+                                $lastTwoParts = array_slice($pathParts, -2);
+                                $fallbackPath = 'surveyor/001/' . implode('/', $lastTwoParts);
+                                Log::info('PreviewLaporanService: Menggunakan fallback path kandidat.', [
+                                    'original' => $originalPath,
+                                    'fallback' => $fallbackPath,
+                                ]);
+                            }
+                        }
+                    }
+
+                    // Tentukan path yang akan digunakan
+                    $pathToUse = ($fallbackPath && $statusLpj == 1 && file_exists(storage_path('app/public/' . $fallbackPath)))
+                        ? $fallbackPath
+                        : $originalPath;
+
+                    $fullPath = storage_path('app/public/' . $pathToUse);
+                    if (!file_exists($fullPath)) {
+                        Log::warning('PreviewLaporanService: File tidak ditemukan untuk original maupun fallback.', [
+                            'original' => $originalPath,
+                            'fallback' => $fallbackPath,
+                            'resolved' => $pathToUse,
+                        ]);
+                        continue;
+                    }
+
+                    Log::info('PreviewLaporanService: Menambahkan file untuk diunduh.', [
+                        'resolved' => $pathToUse,
+                        'fullPath' => $fullPath,
+                    ]);
+                    $files[] = $fullPath;
+                }
+
+                if (empty($files)) {
+                    Log::warning('PreviewLaporanService: Tidak ada file valid ditemukan setelah resolusi path.');
+                    return response()->json(['error' => 'No valid files found'], 404);
+                }
+
+                // For single file, download directly
+                if (count($files) === 1) {
+                    Log::info('PreviewLaporanService: Mengunduh single file.', ['file' => $files[0]]);
+                    return response()->download($files[0]);
+                }
+
+                // For multiple files, create zip and download
+                $zipName = 'photos_' . time() . '.zip';
+                $zipPath = storage_path('app/public/' . $zipName);
+
+                $zip = new \ZipArchive();
+                if ($zip->open($zipPath, \ZipArchive::CREATE) === true) {
+                    foreach ($files as $file) {
+                        $zip->addFile($file, basename($file));
+                    }
+                    $zip->close();
+                    Log::info('PreviewLaporanService: Zip file berhasil dibuat.', ['zip' => $zipPath, 'count' => count($files)]);
+                    return response()->download($zipPath)->deleteFileAfterSend(true);
+                }
+
+                Log::error('PreviewLaporanService: Gagal membuat zip file.');
+                return response()->json(['error' => 'Failed to create zip file'], 500);
+            }
         try {
             $pdf = $this->generatePDF($viewLaporan, compact(
                 'permohonan',
@@ -214,6 +339,8 @@ class PreviewLaporanService
 
     private function generatePDF(string $viewLaporan, array $data)
     {
+        //return view('lpj::' . $viewLaporan, $data);
+
         $pdf = PDF::loadView('lpj::' . $viewLaporan, $data);
         $pdf->setPaper('A4', 'portrait');
         $pdf->set_option('isHtml5ParserEnabled', true);
@@ -239,12 +366,14 @@ class PreviewLaporanService
     public function checkPrintOutLaporan($permohonan_id, $dokumen_id)
     {
 
-
         // Ambil data berdasarkan ID
         $statusLpj = Penilai::where('permohonan_id', $permohonan_id)
-            ->where('dokument_id', $dokumen_id)
+            //->where('dokument_id', $dokumen_id)
             ->first();
 
+
+        $permohonan = Permohonan::where('id', $permohonan_id)->first();
+
         // Jika data tidak ditemukan, kembalikan status null
         if (!$statusLpj) {
             return response()->json(['status' => null]);
@@ -253,7 +382,7 @@ class PreviewLaporanService
         // Tentukan tipe berdasarkan kondisi
         $type = $statusLpj->type_penilai ?? null;
 
-        if ($type === 'memo') {
+        if ($type === 'memo' && $permohonan->is_mig!=1) {
             return $this->checkDataMemo($type, $statusLpj);
         }
 
@@ -281,6 +410,7 @@ class PreviewLaporanService
         // Ambil data JSON dari statusLpj
         $data = json_decode($statusLpj->memo, true) ?? [];
 
+
         $validationRules = [
             'memo' => [
                 'kepada',

resources/views/activity/index.blade.php

@@ -268,7 +268,7 @@
 
                         return `
             <div class="flex flex-nowrap justify-center">
-                <a class="btn btn-sm btn-icon btn-clear btn-warning" href="activity/${data.id}/show" title="Lihat Detail">
+                <a class="btn btn-sm btn-icon  ${status === 'freeze' ? 'btn-light' : 'btn-warning btn-clear'}" href="activity/${data.id}/show" title="Lihat Detail">
                     <i class="ki-outline ki-eye"></i>
                 </a>
                 ${
@@ -290,8 +290,38 @@
 
         };
 
+
+
+
         let dataTable = new KTDataTable(element, dataTableOptions);
 
+        function highlightFreezeRows() {
+            const table = document.querySelector('#permohonan-table table[data-datatable-table="true"]');
+            if (!table) return;
+
+            const rows = table.querySelectorAll('tbody tr');
+
+            rows.forEach(row => {
+                const statusCell = row.cells[7];
+                if (!statusCell) return;
+
+                const statusText = statusCell.textContent.trim().toLowerCase();
+
+                if (statusText === 'freeze') {
+                    row.classList.add('bg-red-400', 'text-white');
+                } else {
+                    row.classList.remove('bg-red-400', 'text-white');
+                }
+            });
+        }
+
+        // Polling setiap 1 detik untuk sementara
+        setInterval(() => {
+            highlightFreezeRows();
+        }, 500);
+
+
+
         searchInput.addEventListener('input', function() {
             const searchValue = this.value.trim();
             dataTable.search(searchValue, true);

resources/views/component/detail-lokasi.blade.php

@@ -1,10 +1,19 @@
 @if (is_array($details) && count($details) > 0)
+    @php $currentKey = ''; @endphp
     @foreach ($details as $value)
         @foreach ($value as $key => $item)
+
             @if (!empty($item))
                 <tr>
                     <td style="padding: 2px; width:25%;">
+                        @if ($currentKey !== $key)
                             {{ formatLabel($key) }}
+                        @endif
+                        @php
+                            if ($currentKey !== $key) {
+                                $currentKey = $key;
+                            }
+                        @endphp
                     </td>
                     <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
                     <td style="padding: 2px;">

resources/views/component/show-laporan-inspeksi.blade.php

@@ -13,9 +13,12 @@
                     <button id="tab-hasil" class="btn btn-sm btn-light">Hasil Inspeksi</button>
                 </div>
                 <div class="flex items-wrap gap-2.5">
-                    <a href="{{ $back ?? route()->previous()}}" class="btn btn-xs btn-info"><i
+                    {{-- <a href="{{ $back ?? route()->previous()}}" class="btn btn-xs btn-info"><i
                             class="ki-filled ki-exit-left"></i>
-                        Back</a>
+                        Back</a> --}}
+                           <a  id="back-button" class="btn btn-xs btn-info">
+                        <i class="ki-filled ki-exit-left"></i> Back
+                    </a>
                 </div>
             </div>
         </div>
@@ -87,6 +90,18 @@
                     hasilContent.classList.remove('hidden-tab');
                 });
             });
+
+            document.getElementById('back-button').addEventListener('click', function(e) {
+                e.preventDefault();
+
+                console.log('Back button clicked', window.history.length);
+                if (window.history.length > 1) {
+                    window.history.back();
+                } else {
+                    window.location.href = "{{ $back ?? route()->previous()}}";
+
+                }
+            });
         </script>
 
         <style>

resources/views/daftar-pustaka/create.blade.php

@@ -57,7 +57,7 @@
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 {{-- ambil nama file pathnya hilangkan --}}
-                                <a href="{{ asset($daftarPustaka->attachment) }}" class="badge badge-outline badge-md badge-info">{{ basename($daftarPustaka->attachment) }} &nbsp;
+                                <a href="{{ asset('storage/' .$daftarPustaka->attachment) }}" class="badge badge-outline badge-md badge-info">{{ basename($daftarPustaka->attachment) }} &nbsp;
                                    <i class="ki-filled ki-cloud-download"></i>
                                 </a>
                             </div>

resources/views/daftar-pustaka/index.blade.php

@@ -5,6 +5,15 @@
 @endsection
 
 @section('content')
+<style>
+    @media (max-width: 768px) {
+    #previewContent {
+        height: 400px;
+        overflow: auto;
+    }
+}
+
+</style>
 
     <div class="flex flex-col items-stretch gap-7">
         <div class="flex items-center gap-3 w-full">
@@ -66,10 +75,12 @@
             @if (isset($daftar_pustaka))
                 @foreach ($daftar_pustaka as $item)
                     <div class="card border shadow-none ">
-                        <a class="show-pustaka h-[300px] w-full block" href="{{ route('daftar-pustaka.show', $item->id) }}"
+                        <a class="show-pustaka h-[300px] bg-gray-200 w-full block" href="{{ route('daftar-pustaka.show', $item->id) }}"
                             data-url="{{ $item->attachment }}">
                             <div class="p-4 h-full w-full flex items-center justify-center overflow-hidden">
-                                <div class="preview-content h-full w-full"></div>
+                                <div class="  text-red-500 flex items-center justify-center rounded">
+                                <i class="ki-filled ki-document text-3xl"></i>
+                            </div>
                             </div>
                         </a>
 
@@ -84,18 +95,18 @@
                                 </p>
                             </a>
                             <div class="flex justify-between items-center gap-2.5 mt-2">
-                                <p class="badge  rounded-full badge-sm badge-outline badge-success text-xs text-gray-700">
+                                <p class="badge  rounded-full badge-xs badge-outline badge-success text-xs text-gray-700">
                                     # {{ $item->category->name }}</p>
 
                                 @auth
                                     @if (auth()->user()->hasRole(['administrator', 'admin']))
                                         <div>
-                                            <a class="btn btn-sm btn-danger" onclick="deleteData({{ $item->id }})">
+                                            <a class="btn btn-xs btn-danger" onclick="deleteData({{ $item->id }})">
                                                 <i class="ki-filled ki-trash">
                                                 </i>
                                                 Hapus
                                             </a>
-                                            <a class="btn btn-sm btn-info"
+                                            <a class="btn btn-xs btn-info"
                                                 href="{{ route('daftar-pustaka.edit', $item->id) }}">
                                                 <i class="ki-filled ki-pencil">
                                                 </i>
@@ -120,22 +131,24 @@
                         <div class="card-body flex items-center flex-wrap justify-between p-2 pe-5 gap-4.5">
                             <div class="flex items-center gap-3.5">
                                 <div
-                                    class="kt-card flex items-center justify-center bg-accent/50 h-[70px] w-[90px] shadow-none">
+                                    class="card bg-gray-200 flex items-center justify-center bg-accent/50 h-[70px] w-[90px] shadow-none">
                                     <a class="show-pustaka h-[90px] w-full block"
                                         href="{{ route('daftar-pustaka.show', $item->id) }}"
                                         data-url="{{ $item->attachment }}">
                                         <div class="p-4 h-full w-full flex items-center justify-center overflow-hidden">
-                                            <div class="preview-content h-full w-full"></div>
+                                            <div class="  text-red-500 flex items-center justify-center rounded">
+                                <i class="ki-filled ki-document text-3xl"></i>
+                            </div>
                                         </div>
                                     </a>
                                 </div>
-                                <div class="flex flex-col gap-2 cursor-pointer">
                                 <a href="{{ route('daftar-pustaka.show', $item->id) }}">
+                                <div class="flex flex-col gap-2 cursor-pointer">
                                         <div class="flex items-center mt-1">
                                             <a class="hover:text-primary text-sm font-medium text-mono leading-5.5">
                                                 {{ $item->judul }}
-                                            </a>
                                             </div>
+                                        </a>
                                         <div class="flex items-center flex-wrap gap-3">
                                             <span class="kt-badge kt-badge-warning kt-badge-sm rounded-full gap-1">
                                                 <span class="text-xs font-medium text-foreground">
@@ -144,8 +157,8 @@
                                             </span>
 
                                         </div>
-                                    </a>
                                     </div>
+                                </a>
                             </div>
                             <div class="flex items-center gap-1.5">
                                 <p class="badge  rounded-full badge-sm badge-outline badge-success text-xs text-gray-700">
@@ -202,7 +215,6 @@
 @endsection
 
 @push('scripts')
-    <script src="{{ asset('vendor/pdfobject.min.js') }}"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({
@@ -236,30 +248,7 @@
         }
 
 
-        document.addEventListener('DOMContentLoaded', function() {
-            document.querySelectorAll('.show-pustaka').forEach(function(element) {
-                const url = element.getAttribute('data-url');
-                const previewContent = element.querySelector('.preview-content');
 
-                if (!previewContent || !url) return;
-
-                const fileExtension = url.split('.').pop().toLowerCase();
-
-                if (fileExtension === 'pdf') {
-                    PDFObject.embed(url, previewContent, {
-                        height: "100%",
-                        width: "100%"
-                    });
-                } else if (['jpg', 'jpeg', 'png', 'gif'].includes(fileExtension)) {
-                    previewContent.innerHTML = `
-                <img src="${url}" alt="Preview"
-                     class="w-full h-full object-cover rounded" />
-            `;
-                } else {
-                    previewContent.innerHTML = '<p class="text-center">Unsupported file type</p>';
-                }
-            });
-        });
 
         function showGrid() {
             document.getElementById("daftar_pustaka_grid").classList.remove("hidden");

resources/views/daftar-pustaka/show.blade.php

@@ -1,12 +1,10 @@
 @extends('layouts.main')
 
 @section('breadcrumbs')
-    {{-- {{ Breadcrumbs::render(request()->route()->getName()) }} --}}
 @endsection
 
 @section('content')
 <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-
     <form
         action="{{ isset($daftarPustaka->id) ? route('daftar-pustaka.update', $daftarPustaka->id) : route('daftar-pustaka.store') }}"
         method="POST">
@@ -17,27 +15,47 @@
                     {{ $daftarPustaka->judul ?? '' }}
                 </h3>
                 <div class="flex items-center gap-2">
-                        <a href="{{ route('daftar-pustaka.index') }}" class="btn btn-xs btn-info"><i
-                                class="ki-filled ki-exit-left"></i> Back</a>
+                    <a href="{{ route('daftar-pustaka.index') }}" class="btn btn-xs btn-info">
+                        <i class="ki-filled ki-exit-left"></i> Back
+                    </a>
                 </div>
             </div>
             <div class="card-body grid gap-5">
-                    <div
-                        class=" min-w-3xl w-[1280px] h-[768px]">
+                <div class="min-w-3xl">
                     <div class="p-4 h-full flex flex-col">
                         <div class="flex justify-between items-center mb-4">
-                                <button type="button" id="downloadBtn" class="btn btn-primary btn-sm">
-                                    <i class="ki-duotone ki-cloud-download me-1"><span class="path1"></span><span
-                                            class="path2"></span></i>
+                            <a href="{{ asset('storage/' . $daftarPustaka->attachment) }}" class="btn btn-primary btn-sm">
+                                <i class="ki-duotone ki-cloud-download me-1"></i>
                                 Download File
-                                </button>
+                            </a>
                         </div>
-                            <div id="previewContent" class="flex-grow"></div>
+
+                        @php
+                            $fileExtension = pathinfo($daftarPustaka->attachment, PATHINFO_EXTENSION);
+                            $isPdf = strtolower($fileExtension) == 'pdf';
+                            $imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp'];
+                            $isImage = in_array(strtolower($fileExtension), $imageExtensions);
+                            $fileUrl = asset('storage/' . $daftarPustaka->attachment);
+                        @endphp
+
+                        @if ($isPdf)
+                            <canvas id="pdfViewer" class="w-full border rounded touch-pan-y"></canvas>
+                            <div class="flex justify-center gap-3 mt-3">
+                                <button type="button" id="prevPage" class="btn btn-primary btn-sm">Previous</button>
+                                <span>Page: <span id="pageNum">1</span> / <span id="pageCount">0</span></span>
+                                <button type="button" id="nextPage" class="btn btn-primary btn-sm">Next</button>
+                            </div>
+                        @elseif ($isImage)
+                            <img src="{{ $fileUrl }}" class="w-full object-contain rounded" />
+                        @else
+                            <p class="text-red-500">File tidak bisa ditampilkan, silakan 
+                                <a href="{{ $fileUrl }}" class="text-blue-500 underline" download>unduh di sini</a>.
+                            </p>
+                        @endif
                     </div>
                 </div>
 
-                    <div class="border border-t">
-                    </div>
+                <div class="border border-t"></div>
                 <div>
                     {{ $daftarPustaka->deskripsi ?? '' }}
                 </div>
@@ -48,23 +66,99 @@
 @endsection
 
 @push('scripts')
-    <script src="{{ asset('vendor/pdfobject.min.js') }}"></script>
-
+<!-- PDF.js CDN -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.11.174/pdf.min.js"></script>
 <script>
 document.addEventListener('DOMContentLoaded', function () {
-            let url = @json($daftarPustaka->attachment);
-            console.log(url);
+    const url = @json($fileUrl);
 
-            const fileExtension = url.split('.').pop().toLowerCase();
-            const previewContent = document.getElementById('previewContent');
+    if (url.endsWith('.pdf')) {
+        const pdfjsLib = window['pdfjs-dist/build/pdf'];
+        pdfjsLib.GlobalWorkerOptions.workerSrc = 'https://cdnjs.cloudflare.com/ajax/libs/pdf.js/3.11.174/pdf.worker.min.js';
 
-            if (['pdf'].includes(fileExtension)) {
-                PDFObject.embed(url, "#previewContent");
-            } else if (['jpg', 'jpeg', 'png', 'gif'].includes(fileExtension)) {
-                previewContent.innerHTML =
-                    `<img src="${url}" alt="Preview" class="max-w-full max-h-full object-contain">`;
+        let pdfDoc = null;
+        let pageNum = 1;
+        let pageRendering = false;
+        let pageNumPending = null;
+        const scale = 1.3;
+        const canvas = document.getElementById('pdfViewer');
+        const ctx = canvas.getContext('2d');
+
+        function renderPage(num) {
+            pageRendering = true;
+            pdfDoc.getPage(num).then(function (page) {
+                const viewport = page.getViewport({ scale: scale });
+                canvas.height = viewport.height;
+                canvas.width = viewport.width;
+
+                const renderContext = {
+                    canvasContext: ctx,
+                    viewport: viewport
+                };
+                const renderTask = page.render(renderContext);
+
+                renderTask.promise.then(function () {
+                    pageRendering = false;
+                    document.getElementById('pageNum').textContent = num;
+
+                    if (pageNumPending !== null) {
+                        renderPage(pageNumPending);
+                        pageNumPending = null;
+                    }
+                });
+            });
+        }
+
+        function queueRenderPage(num) {
+            if (pageRendering) {
+                pageNumPending = num;
             } else {
-                previewContent.innerHTML = '<p class="text-center">Unsupported file type</p>';
+                renderPage(num);
+            }
+        }
+
+        function onPrevPage() {
+            if (pageNum <= 1) return;
+            pageNum--;
+            queueRenderPage(pageNum);
+        }
+
+        function onNextPage() {
+            if (pageNum >= pdfDoc.numPages) return;
+            pageNum++;
+            queueRenderPage(pageNum);
+        }
+
+        document.getElementById('prevPage').addEventListener('click', onPrevPage);
+        document.getElementById('nextPage').addEventListener('click', onNextPage);
+
+        // Swipe gesture
+        let touchStartX = 0;
+        let touchEndX = 0;
+
+        canvas.addEventListener('touchstart', function (e) {
+            touchStartX = e.changedTouches[0].screenX;
+        });
+
+        canvas.addEventListener('touchend', function (e) {
+            touchEndX = e.changedTouches[0].screenX;
+            handleSwipe();
+        });
+
+        function handleSwipe() {
+            const swipeThreshold = 50; // min distance for swipe
+            if (touchEndX < touchStartX - swipeThreshold) {
+                onNextPage();
+            } else if (touchEndX > touchStartX + swipeThreshold) {
+                onPrevPage();
+            }
+        }
+
+        pdfjsLib.getDocument(url).promise.then(function (pdfDoc_) {
+            pdfDoc = pdfDoc_;
+            document.getElementById('pageCount').textContent = pdfDoc.numPages;
+            renderPage(pageNum);
+        });
     }
 });
 </script>

resources/views/laporan-biaya/external.blade.php

@@ -44,15 +44,6 @@
                             @endforeach
                         </select>
                     </div>
-                    <div class="flex flex-col">
-                        <label class="text-base font-medium mb-1">Penilai</label>
-                        <select class="select tomselect" id="penilai_filter">
-                            <option value="">Semua Penilai</option>
-                            @foreach(\MOdules\Usermanagement\Models\User::role(['penilai','surveyor'])->get() as $penilai)
-                                <option value="{{ $penilai->id }}">{{ $penilai->name }}</option>
-                            @endforeach
-                        </select>
-                    </div>
                 </div>
 
                 <!-- Buttons row at the bottom -->
@@ -73,7 +64,7 @@
         <div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="laporan-hasil-penilaian-jaminan-internal-external-table" data-api-url="{{ route('laporan-hasil-penilaian-jaminan-internal-external.data') }}">
             <div class="card-header bg-agi-50 py-5 flex-wrap">
                 <h3 class="card-title">
-                    Laporan Hasil Penilaian Jaminan Internal & External
+                    Rekap Penyelesaian External
                 </h3>
             </div>
 
@@ -89,130 +80,53 @@
                                 <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
                             <th class="min-w-[150px]" data-datatable-column="branch">
                                 <span class="sort"> <span class="sort-label"> Cabang </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="pemohon">
-                                <span class="sort"> <span class="sort-label"> Pemohon </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="cif">
-                                <span class="sort"> <span class="sort-label"> CIF </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
                                    <th class="min-w-[150px]" data-datatable-column="name">
                                 <span class="sort"> <span class="sort-label"> Nama Debitur </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
+                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                <span class="sort"> <span class="sort-label"> Tanggal KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
+                            <th class="min-w-[150px]" data-datatable-column="pemohon">
+                                <span class="sort"> <span class="sort-label"> Nomor KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="cif">
+                                <span class="sort"> <span class="sort-label"> Nominal KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
                             <th class="min-w-[150px]" data-datatable-column="jenis_penilaian">
-                                <span class="sort"> <span class="sort-label"> Jenis Penilaian </span>
+                                <span class="sort"> <span class="sort-label">Tanggal Penyelesaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian">
-                                <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
+                                <span class="sort"> <span class="sort-label"> Nominal Penyelesaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="jenis_fasilitas_kredit">
-                                <span class="sort"> <span class="sort-label"> Jenis Fasilitas Kredit </span>
+                                <span class="sort"> <span class="sort-label"> No. Rekening (Tujuan Akhir) </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="jenis_fasilitas_kredit">
+                                <span class="sort"> <span class="sort-label"> Sisa KSL </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="jenis_agunan">
-                                <span class="sort"> <span class="sort-label"> Jenis Agunan </span>
+                                <span class="sort"> <span class="sort-label"> Memo </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="alamat_agunan">
-                                <span class="sort"> <span class="sort-label"> Alamat Agunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="bukti_kepemilikan">
-                                <span class="sort"> <span class="sort-label"> Bukti Kepemilikan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_pemilik">
-                                <span class="sort"> <span class="sort-label"> Nama Pemilik </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_tanah">
-                                <span class="sort"> <span class="sort-label"> Luas Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_tanah">
-                                <span class="sort"> <span class="sort-label"> Nilai Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_bangunan">
-                                <span class="sort"> <span class="sort-label"> Luas Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_bangunan">
-                                <span class="sort"> <span class="sort-label"> Nilai Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_njop">
-                                <span class="sort"> <span class="sort-label"> Nilai NJOP </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_pasar_wajar">
-                                <span class="sort"> <span class="sort-label"> Nilai Pasar Wajar </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_likuidasi">
-                                <span class="sort"> <span class="sort-label"> Nilai Likuidasi </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_documen_diterima">
-                                <span class="sort"> <span class="sort-label"> Tanggal Dokumen Diterima </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_spk">
-                                <span class="sort"> <span class="sort-label"> Tanggal SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nomor_spk">
-                                <span class="sort"> <span class="sort-label"> Nomor SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_rencana_kunjunagn">
-                                <span class="sort"> <span class="sort-label"> Tanggal Rencana Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_kunjungan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="taggal_delivered">
-                                <span class="sort"> <span class="sort-label"> Tanggal Delivered </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="jangka_waktu_sla">
-                                <span class="sort"> <span class="sort-label"> Jangka Waktu SLA </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_laporan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Laporan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_review">
-                                <span class="sort"> <span class="sort-label"> Tanggal Review </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_penilai">
-                                <span class="sort"> <span class="sort-label"> Nama Penilai </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_team_leader">
-                                <span class="sort"> <span class="sort-label"> Nama Team Leader </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="saran">
-                                <span class="sort"> <span class="sort-label"> Saran </span>
+                                <span class="sort"> <span class="sort-label"> Status</span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
+
                             <th class="min-w-[150px]" data-datatable-column="catatan">
                                 <span class="sort"> <span class="sort-label"> Catatan </span>
                                     <span class="sort-icon"> </span> </span>
@@ -266,144 +180,41 @@
                 nomor_registrasi: {
                     title: 'Nomor Registrasi',
                 },
-                tanggal_permohonan: {
+                 branch: {
+                    title: 'Cabang',
+                },
+                 name: {
+                    title: 'Nama Debitur',
+                },
+                tanggal_ksl: {
                     title: 'Tanggal Permohonan',
                     render: (item, data) => {
                         return data.tanggal_permohonan ? window.formatTanggalIndonesia(data.tanggal_permohonan) : '-';
                     },
                 },
-                branch: {
-                    title: 'Cabang',
-                },
-                pemohon: {
-                    title: 'Pemohon',
-                },
-                cif: {
+                nomor_ksl: {
                     title: 'CIF',
                 },
-                name: {
-                    title: 'Nama Debitur',
-                },
-                jenis_penilaian: {
+                nominal_ksl: {
                     title: 'Jenis Penilaian',
                 },
-                tujuan_penilaian: {
+                tanggal_penyelesaian: {
                     title: 'Tujuan Penilaian',
                 },
-                jenis_fasilitas_kredit: {
+                nominal_penyelesaian: {
                     title: 'Jenis Fasilitas Kredit',
                 },
-                jenis_agunan: {
+                nomor_rekening: {
+                    title: 'Nomor Rekening',
+                },
+                sisa_ksl: {
                     title: 'Jenis Agunan',
                 },
-                alamat_agunan: {
-                    title: 'Alamat Agunan',
+                memo: {
+                    title: 'Memo',
                 },
-                bukti_kepemilikan: {
-                    title: 'Bukti Kepemilikan',
-                    render: (item, data) => {
-                        if (data.bukti_kepemilikan) {
-                            // Ganti karakter baris baru dengan tag <br> untuk HTML
-                            return data.bukti_kepemilikan.split('\n').join('<br>');
-                        }
-                        return '-';
-                    },
-                },
-                nama_pemilik: {
-                    title: 'Nama Pemilik',
-                },
-                luas_tanah: {
-                    title: 'Luas Tanah',
-                },
-                nilai_tanah: {
-                    title: 'Nilai Tanah',
-                    render: (item, data) => {
-                        return data.nilai_tanah ?? '-';
-                    },
-                },
-                luas_bangunan: {
-                    title: 'Luas Bangunan',
-                },
-                nilai_bangunan: {
-                    title: 'Nilai Bangunan',
-                    render: (item, data) => {
-                        return data.nilai_bangunan ?? '-';
-                    },
-                },
-                nilai_njop: {
-                    title: 'Nilai NJOP',
-                    render: (item, data) => {
-                        return data.nilai_njop ?? '-';
-                    },
-                },
-                nilai_pasar_wajar: {
-                    title: 'Nilai Pasar Wajar',
-                    render: (item, data) => {
-                        return data.nilai_pasar_wajar ?? '-';
-                    },
-                },
-                nilai_likuidasi: {
-                    title: 'Nilai Likuidasi',
-                    render: (item, data) => {
-                        return data.nilai_likuidasi ?? '-';
-                    },
-                },
-                tanggal_documen_diterima: {
-                    title: 'Tanggal Dokumen Diterima',
-                    render: (item, data) => {
-                        return data.tanggal_documen_diterima ? window.formatTanggalIndonesia(data.tanggal_documen_diterima) : '-';
-                    },
-                },
-                tanggal_spk: {
-                    title: 'Tanggal SPK',
-                    render: (item, data) => {
-                        return data.tanggal_spk ? window.formatTanggalIndonesia(data.tanggal_spk) : '-';
-                    },
-                },
-                nomor_spk: {
-                    title: 'Nomor SPK',
-                },
-                tanggal_rencana_kunjunagn: {
-                    title: 'Tanggal Rencana Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_rencana_kunjunagn ? window.formatTanggalIndonesia(data.tanggal_rencana_kunjunagn) : '-';
-                    },
-                },
-                tanggal_kunjungan: {
-                    title: 'Tanggal Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_kunjungan ? window.formatTanggalIndonesia(data.tanggal_kunjungan) : '-';
-                    },
-                },
-                taggal_delivered: {
-                    title: 'Tanggal Delivered',
-                    render: (item, data) => {
-                        return data.taggal_delivered ? window.formatTanggalIndonesia(data.taggal_delivered) : '-';
-                    },
-                },
-                jangka_waktu_sla: {
-                    title: 'Jangka Waktu SLA',
-                },
-                tanggal_laporan: {
-                    title: 'Tanggal Laporan',
-                    render: (item, data) => {
-                        return data.tanggal_laporan ? window.formatTanggalIndonesia(data.tanggal_laporan) : '-';
-                    },
-                },
-                tanggal_review: {
-                    title: 'Tanggal Review',
-                    render: (item, data) => {
-                        return data.tanggal_review ? window.formatTanggalIndonesia(data.tanggal_review) : '-';
-                    },
-                },
-                nama_penilai: {
-                    title: 'Nama Penilai',
-                },
-                nama_team_leader: {
-                    title: 'Nama Team Leader',
-                },
-                saran: {
-                    title: 'Saran',
+                status: {
+                    title: 'Status',
                 },
                 catatan: {
                     title: 'Catatan',

resources/views/laporan-biaya/internal.blade.php

@@ -44,15 +44,7 @@
                             @endforeach
                         </select>
                     </div>
-                    <div class="flex flex-col">
-                        <label class="text-base font-medium mb-1">Penilai</label>
-                        <select class="select tomselect" id="penilai_filter">
-                            <option value="">Semua Penilai</option>
-                            @foreach(\MOdules\Usermanagement\Models\User::role(['penilai','surveyor'])->get() as $penilai)
-                                <option value="{{ $penilai->id }}">{{ $penilai->name }}</option>
-                            @endforeach
-                        </select>
-                    </div>
+
                 </div>
 
                 <!-- Buttons row at the bottom -->
@@ -73,7 +65,7 @@
         <div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="laporan-hasil-penilaian-jaminan-internal-external-table" data-api-url="{{ route('laporan-hasil-penilaian-jaminan-internal-external.data') }}">
             <div class="card-header bg-agi-50 py-5 flex-wrap">
                 <h3 class="card-title">
-                    Laporan Hasil Penilaian Jaminan Internal & External
+                    Rekap Penyelesaian Internal
                 </h3>
             </div>
 
@@ -89,130 +81,49 @@
                                 <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
                             <th class="min-w-[150px]" data-datatable-column="branch">
                                 <span class="sort"> <span class="sort-label"> Cabang </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="pemohon">
-                                <span class="sort"> <span class="sort-label"> Pemohon </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="cif">
-                                <span class="sort"> <span class="sort-label"> CIF </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
                                    <th class="min-w-[150px]" data-datatable-column="name">
                                 <span class="sort"> <span class="sort-label"> Nama Debitur </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
+                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                <span class="sort"> <span class="sort-label"> Tanggal KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
+                            <th class="min-w-[150px]" data-datatable-column="pemohon">
+                                <span class="sort"> <span class="sort-label"> Nomor KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="cif">
+                                <span class="sort"> <span class="sort-label"> Nominal KSL </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+
                             <th class="min-w-[150px]" data-datatable-column="jenis_penilaian">
-                                <span class="sort"> <span class="sort-label"> Jenis Penilaian </span>
+                                <span class="sort"> <span class="sort-label">Tanggal Penyelesaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian">
-                                <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
+                                <span class="sort"> <span class="sort-label"> Nominal Penyelesaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="jenis_fasilitas_kredit">
-                                <span class="sort"> <span class="sort-label"> Jenis Fasilitas Kredit </span>
+                                <span class="sort"> <span class="sort-label"> Sisa KSL </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="jenis_agunan">
-                                <span class="sort"> <span class="sort-label"> Jenis Agunan </span>
+                                <span class="sort"> <span class="sort-label"> Memo </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="alamat_agunan">
-                                <span class="sort"> <span class="sort-label"> Alamat Agunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="bukti_kepemilikan">
-                                <span class="sort"> <span class="sort-label"> Bukti Kepemilikan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_pemilik">
-                                <span class="sort"> <span class="sort-label"> Nama Pemilik </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_tanah">
-                                <span class="sort"> <span class="sort-label"> Luas Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_tanah">
-                                <span class="sort"> <span class="sort-label"> Nilai Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_bangunan">
-                                <span class="sort"> <span class="sort-label"> Luas Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_bangunan">
-                                <span class="sort"> <span class="sort-label"> Nilai Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_njop">
-                                <span class="sort"> <span class="sort-label"> Nilai NJOP </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_pasar_wajar">
-                                <span class="sort"> <span class="sort-label"> Nilai Pasar Wajar </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_likuidasi">
-                                <span class="sort"> <span class="sort-label"> Nilai Likuidasi </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_documen_diterima">
-                                <span class="sort"> <span class="sort-label"> Tanggal Dokumen Diterima </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_spk">
-                                <span class="sort"> <span class="sort-label"> Tanggal SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nomor_spk">
-                                <span class="sort"> <span class="sort-label"> Nomor SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_rencana_kunjunagn">
-                                <span class="sort"> <span class="sort-label"> Tanggal Rencana Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_kunjungan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="taggal_delivered">
-                                <span class="sort"> <span class="sort-label"> Tanggal Delivered </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="jangka_waktu_sla">
-                                <span class="sort"> <span class="sort-label"> Jangka Waktu SLA </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_laporan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Laporan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_review">
-                                <span class="sort"> <span class="sort-label"> Tanggal Review </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_penilai">
-                                <span class="sort"> <span class="sort-label"> Nama Penilai </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_team_leader">
-                                <span class="sort"> <span class="sort-label"> Nama Team Leader </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="saran">
-                                <span class="sort"> <span class="sort-label"> Saran </span>
+                                <span class="sort"> <span class="sort-label"> Status</span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
+
                             <th class="min-w-[150px]" data-datatable-column="catatan">
                                 <span class="sort"> <span class="sort-label"> Catatan </span>
                                     <span class="sort-icon"> </span> </span>
@@ -266,144 +177,38 @@
                 nomor_registrasi: {
                     title: 'Nomor Registrasi',
                 },
-                tanggal_permohonan: {
+                 branch: {
+                    title: 'Cabang',
+                },
+                 name: {
+                    title: 'Nama Debitur',
+                },
+                tanggal_ksl: {
                     title: 'Tanggal Permohonan',
                     render: (item, data) => {
                         return data.tanggal_permohonan ? window.formatTanggalIndonesia(data.tanggal_permohonan) : '-';
                     },
                 },
-                branch: {
-                    title: 'Cabang',
-                },
-                pemohon: {
-                    title: 'Pemohon',
-                },
-                cif: {
+                nomor_ksl: {
                     title: 'CIF',
                 },
-                name: {
-                    title: 'Nama Debitur',
-                },
-                jenis_penilaian: {
+                nominal_ksl: {
                     title: 'Jenis Penilaian',
                 },
-                tujuan_penilaian: {
+                tanggal_penyelesaian: {
                     title: 'Tujuan Penilaian',
                 },
-                jenis_fasilitas_kredit: {
+                nominal_penyelesaian: {
                     title: 'Jenis Fasilitas Kredit',
                 },
-                jenis_agunan: {
+                sisa_ksl: {
                     title: 'Jenis Agunan',
                 },
-                alamat_agunan: {
-                    title: 'Alamat Agunan',
+                memo: {
+                    title: 'Memo',
                 },
-                bukti_kepemilikan: {
-                    title: 'Bukti Kepemilikan',
-                    render: (item, data) => {
-                        if (data.bukti_kepemilikan) {
-                            // Ganti karakter baris baru dengan tag <br> untuk HTML
-                            return data.bukti_kepemilikan.split('\n').join('<br>');
-                        }
-                        return '-';
-                    },
-                },
-                nama_pemilik: {
-                    title: 'Nama Pemilik',
-                },
-                luas_tanah: {
-                    title: 'Luas Tanah',
-                },
-                nilai_tanah: {
-                    title: 'Nilai Tanah',
-                    render: (item, data) => {
-                        return data.nilai_tanah ?? '-';
-                    },
-                },
-                luas_bangunan: {
-                    title: 'Luas Bangunan',
-                },
-                nilai_bangunan: {
-                    title: 'Nilai Bangunan',
-                    render: (item, data) => {
-                        return data.nilai_bangunan ?? '-';
-                    },
-                },
-                nilai_njop: {
-                    title: 'Nilai NJOP',
-                    render: (item, data) => {
-                        return data.nilai_njop ?? '-';
-                    },
-                },
-                nilai_pasar_wajar: {
-                    title: 'Nilai Pasar Wajar',
-                    render: (item, data) => {
-                        return data.nilai_pasar_wajar ?? '-';
-                    },
-                },
-                nilai_likuidasi: {
-                    title: 'Nilai Likuidasi',
-                    render: (item, data) => {
-                        return data.nilai_likuidasi ?? '-';
-                    },
-                },
-                tanggal_documen_diterima: {
-                    title: 'Tanggal Dokumen Diterima',
-                    render: (item, data) => {
-                        return data.tanggal_documen_diterima ? window.formatTanggalIndonesia(data.tanggal_documen_diterima) : '-';
-                    },
-                },
-                tanggal_spk: {
-                    title: 'Tanggal SPK',
-                    render: (item, data) => {
-                        return data.tanggal_spk ? window.formatTanggalIndonesia(data.tanggal_spk) : '-';
-                    },
-                },
-                nomor_spk: {
-                    title: 'Nomor SPK',
-                },
-                tanggal_rencana_kunjunagn: {
-                    title: 'Tanggal Rencana Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_rencana_kunjunagn ? window.formatTanggalIndonesia(data.tanggal_rencana_kunjunagn) : '-';
-                    },
-                },
-                tanggal_kunjungan: {
-                    title: 'Tanggal Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_kunjungan ? window.formatTanggalIndonesia(data.tanggal_kunjungan) : '-';
-                    },
-                },
-                taggal_delivered: {
-                    title: 'Tanggal Delivered',
-                    render: (item, data) => {
-                        return data.taggal_delivered ? window.formatTanggalIndonesia(data.taggal_delivered) : '-';
-                    },
-                },
-                jangka_waktu_sla: {
-                    title: 'Jangka Waktu SLA',
-                },
-                tanggal_laporan: {
-                    title: 'Tanggal Laporan',
-                    render: (item, data) => {
-                        return data.tanggal_laporan ? window.formatTanggalIndonesia(data.tanggal_laporan) : '-';
-                    },
-                },
-                tanggal_review: {
-                    title: 'Tanggal Review',
-                    render: (item, data) => {
-                        return data.tanggal_review ? window.formatTanggalIndonesia(data.tanggal_review) : '-';
-                    },
-                },
-                nama_penilai: {
-                    title: 'Nama Penilai',
-                },
-                nama_team_leader: {
-                    title: 'Nama Team Leader',
-                },
-                saran: {
-                    title: 'Saran',
+                status: {
+                    title: 'Status',
                 },
                 catatan: {
                     title: 'Catatan',

resources/views/laporan-monitoring/show.blade.php

@@ -35,21 +35,19 @@
                          <thead>
                              <tr>
                                  <th class="min-w-[100px]">Nama Debitur</th>
-                                 <th class="min-w-[100px]">Tujuan Penilaian</th>
-                                 <th class="min-w-[100px]">Status Bayar</th>
-                                 <th class="min-w-[100px]">Jenis Asset</th>
-                                 <th class="min-w-[100px]">Penugasan</th>
-                                 <th class="min-w-[100px]">Jenis Report</th>
-                                 <th class="min-w-[100px]">Tgl Register</th>
-                                 <th class="min-w-[100px]">Tgl Assign</th>
+                                 <th class="min-w-[100px]">Cabang</th>
+                                 <th class="min-w-[100px]">Lokasi Jaminan</th>
+                                 <th class="min-w-[100px]">TUjuan Penilaian</th>
                                  <th class="min-w-[100px]">Tgl Kunjungan</th>
-                                 <th class="min-w-[100px]">Tgl Reported</th>
-                                 <th class="min-w-[100px]">Progress</th>
-                                 <th class="min-w-[100px]">SLA Laporan</th>
-                                 <th class="min-w-[100px]">SLA Paparan</th>
-                                 <th class="min-w-[100px]">Approve</th>
+                                 <th class="min-w-[100px]">Tgl Lpj Done</th>
+                                 <th class="min-w-[100px]">SLA Buku Kjpp</th>
+                                 <th class="min-w-[100px]">Status</th>
+                                 <th class="min-w-[100px]">Poin</th>
+                                 <th class="min-w-[100px]">SLA INTERNAL</th>
+                                 <th class="min-w-[100px]">SLA PENDAMPINGAN KJPP</th>
+                                 <th class="min-w-[100px]">Absensi</th>
+                                 <th class="min-w-[100px]">Zabtu</th>
                                  <th class="min-w-[50px] text-center">Keterangan</th>
-                                 <th class="min-w-[50px] text-center">Action</th>
                              </tr>
                          </thead>
                          <tbody>
@@ -189,20 +187,7 @@
                          return `${window.formatTanggalIndonesia(data.paparan)}`;
                      }
                  },
-                 approve: {
-                     title: 'Approve',
-                     render: (item, data) => {
-                         // Gabungkan nama dengan <br> untuk pemisah baris baru
-                         let dataHtml = `
-            ${data.permohonan?.approve_so?.name || ''}
-            <br>
-            ${data.permohonan?.approve_eo?.name || ''}
-            <br>
-            ${data.permohonan?.approve_dd?.name || ''}
-        `;
-                         return dataHtml;
-                     },
-                 },
+
 
 
                  keterangan: {

resources/views/laporan-penilai-jaminan/index.blade.php

@@ -219,7 +219,8 @@
 @push('scripts')
     <script type="module">
         const element = document.querySelector('#laporan-penilai-jaminan-table');
-        const searchInput = document.getElementById('search');;
+
+        const searchInput = document.getElementById('search');
         const startDateInput = document.getElementById('start_date');
         const endDateInput = document.getElementById('end_date');
         const branchFilter = document.getElementById('branch_filter');
@@ -227,7 +228,6 @@
         const filterTanggalButton = document.getElementById('filter_tanggal');
         const exportButton = document.getElementById('export-btn');
 
-
         const selectAllCheckbox = document.getElementById('check-all');
         const statusCheckboxes = document.querySelectorAll('.status-checkbox');
 
@@ -242,6 +242,11 @@
         const exportType = document.getElementById('export_type');
         const exportSearch = document.getElementById('export_search');
         const apiUrl = element.getAttribute('data-api-url');
+
+        // Simple pagination state management
+        let currentPage = 1;
+        let isReturningFromDetail = false;
+
         const dataTableOptions = {
             apiEndpoint: apiUrl,
             pageSize: 5,
@@ -293,7 +298,6 @@
                         return data.debiture && data.debiture.name ? `${data.debiture.name}` : '-';
                     },
                 },
-
                 tujuan_penilaian_id: {
                     title: 'Tujuan Penilaian',
                     render: (item, data) => {
@@ -309,12 +313,10 @@
                         }).join(', ');
                     },
                 },
-
                 laporan: {
                     title: 'Status',
                     render: (item, data) => {
                         let badgeClass = '';
-
                         const statusLaporan = data.penilai?.type_penilai || '-';
 
                         switch (statusLaporan.toLowerCase()) {
@@ -343,7 +345,7 @@
                 actions: {
                     title: 'Action',
                     render: (item, data) => {
-                        const status = data.status; // Anggap status berada di dalam objek data
+                        const status = data.status;
                         const dokumenjaminan = data.dokumenjaminan || [];
 
                         return `
@@ -355,13 +357,12 @@
                             <a class="btn btn-sm btn-primary" href="surveyor/print-out-inspeksi/${data.id}/${dokumen.id}/${dokumen.jenis_jaminan_id}">
                                 <i class="ki-outline ki-printer"></i>Inspeksi
                             </a>
-                                     <a class="btn btn-sm btn-info" href="laporan-penilai-jaminan/show/${data.id}/${dokumen.id}/${dokumen.jenis_jaminan_id}" >
+                            <a class="btn btn-sm btn-info detail-btn" href="laporan-penilai-jaminan/show/${data.id}/${dokumen.id}/${dokumen.jenis_jaminan_id}">
                                 <i class="ki-filled ki-eye"></i>Lihat
                             </a>
                             <a class="btn btn-sm btn-success" href="penilai/print-out-laporan/${data.id}/${dokumen.id}/${dokumen.jenis_jaminan_id}">
                                 <i class="ki-filled ki-printer"></i>Laporan
                             </a>
-
                         `;
                     }).join('') : ''
                 }
@@ -369,12 +370,82 @@
         `;
                     }
                 }
-
             },
-
         };
 
         let dataTable = new KTDataTable(element, dataTableOptions);
+        const fromDetail = true;
+        if (fromDetail) {
+            isReturningFromDetail = true;
+            console.log('Returning from detail page');
+            // Remove the parameter from URL
+            window.history.replaceState({}, document.title, window.location.pathname);
+            setTimeout(() => {
+                restoreCurrentPage();
+                isReturningFromDetail = false;
+            }, 500);
+        }
+
+        function getCurrentPageFromDOM() {
+            const activePage = document.querySelector('.pagination .btn.active');
+            if (activePage) {
+                const pageText = activePage.textContent.trim();
+                const pageNum = parseInt(pageText);
+                return isNaN(pageNum) ? 1 : pageNum;
+            }
+            return 1;
+        }
+
+        function saveCurrentPage() {
+            const page = getCurrentPageFromDOM();
+            currentPage = page;
+            sessionStorage.setItem('currentTablePage', currentPage.toString());
+        }
+
+        function restoreCurrentPage() {
+            const savedPage = sessionStorage.getItem('currentTablePage');
+            if (savedPage && savedPage !== '1') {
+                currentPage = parseInt(savedPage);
+                console.log('Restoring to page:', currentPage);
+
+                // Use the goPage method to navigate to the saved page
+                dataTable.goPage(currentPage);
+            }
+        }
+
+        // Listen for pagination events to track current page
+        element.addEventListener('pagination', function(e) {
+            const page = e.detail.page;
+            currentPage = page;
+            console.log('Page changed to:', page);
+        });
+
+        // Alternative: Listen for pagination button clicks
+        document.addEventListener('click', function(e) {
+            if (e.target.matches('.pagination .btn') && !e.target.closest('.detail-btn')) {
+                setTimeout(() => {
+                    currentPage = getCurrentPageFromDOM();
+                    console.log('Current page updated to:', currentPage);
+                }, 100);
+            }
+        });
+
+        // Detail page redirection
+        document.addEventListener('click', function(e) {
+            if (e.target.closest('.detail-btn')) {
+                e.preventDefault();
+
+                // Save current page before navigating
+                const currentPageNum = getCurrentPageFromDOM();
+                currentPage = currentPageNum;
+                sessionStorage.setItem('currentTablePage', currentPage.toString());
+                console.log('Saving page before detail navigation:', currentPage);
+
+                const link = e.target.closest('.detail-btn');
+                const href = link.getAttribute('href');
+                window.location.href = href;
+            }
+        });
 
         // Search functionality
         searchInput.addEventListener('input', function() {
@@ -392,7 +463,6 @@
             const branch = branchFilter.value;
             const laporan = Array.from(laporanFilter.selectedOptions).map(option => option.value);
 
-
             let filters = {};
             if (searchInput.value) {
                 filters.search = searchInput.value;
@@ -438,10 +508,8 @@
 
             if (selectedStatuses.length === 0) {
                 dataTable.search('');
-                console.log(selectedStatuses);
             } else {
                 dataTable.search(selectedStatuses.join(','), true);
-                console.log(selectedStatuses);
             }
 
             dataTable.reload();
@@ -451,16 +519,13 @@
             selectAllCheckbox.checked = allChecked;
         }
 
-        // Single export button functionality
+        // Export functionality
         exportButton.addEventListener('click', function(e) {
             e.preventDefault();
 
-            // Check if any rows are selected
             const selectedIds = getSelectedRowIds();
 
-            // Determine export type based on context
             if (selectedIds.length > 0) {
-                // If rows are selected, export those
                 exportData({
                     selected_ids: selectedIds,
                     export_type: 'selected'
@@ -476,14 +541,11 @@
                     export_type: 'filtered'
                 });
             } else if (searchInput.value) {
-                // If only search is applied, export filtered results
                 exportData({
                     search: searchInput.value,
                     export_type: 'filtered'
                 });
-
             } else {
-                // If no selection and no filters, export all
                 exportData({
                     export_type: 'all'
                 });
@@ -491,7 +553,6 @@
         });
 
         function exportData(filters = {}) {
-            // Set filter values in the hidden form
             exportStartDate.value = filters.start_date || '';
             exportEndDate.value = filters.end_date || '';
             exportStatus.value = filters.status ? filters.status.join(',') : '';
@@ -500,7 +561,6 @@
             exportSelectedIds.value = filters.selected_ids ? filters.selected_ids.join(',') : '';
             exportType.value = filters.export_type || 'all';
             exportSearch.value = filters.search || '';
-            // Submit the form
             exportForm.submit();
         }
 
@@ -514,7 +574,12 @@
             const checkboxes = document.querySelectorAll('[data-datatable-row-check="true"]:checked');
             return Array.from(checkboxes).map(checkbox => checkbox.value);
         }
+
+        // Save page before leaving (only when not going to detail)
+        window.addEventListener('beforeunload', function() {
+            if (!isReturningFromDetail) {
+                saveCurrentPage();
+            }
+        });
     </script>
-
-
 @endpush

resources/views/laporan-sla-penilai/index.blade.php

@@ -104,10 +104,6 @@
                                 <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="jenis_agunan">
-                                <span class="sort"> <span class="sort-label"> Penilaian</span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
 
                             <th class="min-w-[150px]" data-datatable-column="tanggal_laporan">
                                 <span class="sort"> <span class="sort-label"> Tanggal Dokuemen </span>
@@ -199,20 +195,16 @@
                 tujuan_penilaian: {
                     title: 'Tujuan Penilaian',
                 },
-                jenis_agunan: {
-                    title: 'Jenis Agunan',
-                },
-
                 tanggal_laporan: {
                     title: 'Tanggal Laporan',
                     render: (item, data) => {
                         return data.tanggal_laporan ? window.formatTanggalIndonesia(data.tanggal_laporan) : '-';
                     },
                 },
-                tanggal_review: {
-                    title: 'Tanggal Review',
+                tanggal_approval: {
+                    title: 'Tanggal Approval',
                     render: (item, data) => {
-                        return data.tanggal_review ? window.formatTanggalIndonesia(data.tanggal_review) : '-';
+                        return data.tanggal_approval ? window.formatTanggalIndonesia(data.tanggal_approval) : '-';
                     },
                 },
                 tanggal_kunjungan: {
@@ -225,7 +217,7 @@
                 jangka_waktu: {
                     title: 'Jangka Waktu',
                     render: (item, data) => {
-                        return data.jangka_waktu ?? '3';
+                        return data.jangka_waktu ?? '-';
                     },
                 },
                 keterangan: {

resources/views/laporan-user/index.blade.php

@@ -6,63 +6,27 @@
 
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        <!-- Filter Card -->
-        <div class="card border border-agi-100">
-            <div class="card-header bg-agi-50 py-5">
-                <h3 class="card-title"> Laporan User Pemohon</h3>
-            </div>
-            <div class="card-body grid gap-4">
-                <!-- Search field at the top, full width -->
-                <div class="flex flex-col w-full">
-                    <label class="text-sm font-medium mb-1">Pencarian</label>
+
+        <!-- Data Table Card -->
+        <div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="laporan-user-table" data-api-url="{{ route('laporan-user.datatables') }}">
+            <div class="card-header bg-agi-50 py-5 flex-wrap">
+
+                <h3 class="card-title">
+                    Laporan User
+                </h3>
+                <div class="flex flex-wrap gap-2 lg:gap-5">
+                    <div class="flex flex-wrap gap-2 lg:gap-5">
                         <label class="input input-sm">
                         <i class="ki-filled ki-magnifier"></i>
                         <input placeholder="Search Laporan User" id="search" type="text" value="">
                     </label>
                 </div>
-
-                <!-- Other filter fields in grid layout -->
-                <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                    <div class="flex flex-col">
-                        <label class="text-base font-medium mb-1">Tanggal Awal</label>
-                        <label class="input">
-                            <input placeholder="Tanggal Awal" id="start_date" type="date">
-                        </label>
-                    </div>
-                    <div class="flex flex-col">
-                        <label class="text-base font-medium mb-1">Tanggal Akhir</label>
-                        <label class="input">
-                            <input placeholder="Tanggal Akhir" id="end_date" type="date">
-                        </label>
-                    </div>
-                    <div class="flex flex-col">
-                        <label class="text-base font-medium mb-1">User</label>
-                        <select class="select tomselect" id="user_id" name="user_id">
-
-                        </select>
-                    </div>
-                </div>
-
-                <!-- Buttons row at the bottom -->
-                <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mt-2">
-                    <button class="btn btn-sm btn-primary" id="filter_tanggal">
-                        <i class="ki-outline ki-filter fs-2 me-1"></i>
-                        Terapkan Filter
-                    </button>
-                    <a class="btn btn-sm btn-light" href="{{ route('laporan-hasil-penilaian-jaminan-internal-external.export') }}" id="export-btn">
+                <a class="btn btn-sm btn-light" href="{{ route('laporan-user.export') }}" id="export-btn">
                     <i class="ki-outline ki-file-down fs-2 me-1"></i>
                     Export to Excel
                 </a>
             </div>
-            </div>
-        </div>
 
-        <!-- Data Table Card -->
-        <div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="laporan-user-table" data-api-url="{{ route('laporan-user.datatables') }}">
-            <div class="card-header bg-agi-50 py-5 flex-wrap">
-                <h3 class="card-title">
-                    Laporan User Pemohon
-                </h3>
             </div>
 
             <div class="card-body">
@@ -73,136 +37,20 @@
                             <th class="w-14">
                                 <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
-                                <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="branch">
-                                <span class="sort"> <span class="sort-label"> Cabang </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="pemohon">
-                                <span class="sort"> <span class="sort-label"> Pemohon </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="cif">
-                                <span class="sort"> <span class="sort-label"> CIF </span>
+                            <th class="min-w-[150px]" data-datatable-column="nik">
+                                <span class="sort"> <span class="sort-label"> NIK</span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="name">
-                                <span class="sort"> <span class="sort-label"> Nama Debitur </span>
+                                <span class="sort"> <span class="sort-label"> Nama User</span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="jenis_penilaian">
-                                <span class="sort"> <span class="sort-label"> Jenis Penilaian </span>
+                              <th class="min-w-[150px]" data-datatable-column="level">
+                                <span class="sort"> <span class="sort-label"> Level Group </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian">
-                                <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="jenis_fasilitas_kredit">
-                                <span class="sort"> <span class="sort-label"> Jenis Fasilitas Kredit </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="jenis_agunan">
-                                <span class="sort"> <span class="sort-label"> Jenis Agunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="alamat_agunan">
-                                <span class="sort"> <span class="sort-label"> Alamat Agunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="bukti_kepemilikan">
-                                <span class="sort"> <span class="sort-label"> Bukti Kepemilikan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_pemilik">
-                                <span class="sort"> <span class="sort-label"> Nama Pemilik </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_tanah">
-                                <span class="sort"> <span class="sort-label"> Luas Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_tanah">
-                                <span class="sort"> <span class="sort-label"> Nilai Tanah </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="luas_bangunan">
-                                <span class="sort"> <span class="sort-label"> Luas Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_bangunan">
-                                <span class="sort"> <span class="sort-label"> Nilai Bangunan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_njop">
-                                <span class="sort"> <span class="sort-label"> Nilai NJOP </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_pasar_wajar">
-                                <span class="sort"> <span class="sort-label"> Nilai Pasar Wajar </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nilai_likuidasi">
-                                <span class="sort"> <span class="sort-label"> Nilai Likuidasi </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_documen_diterima">
-                                <span class="sort"> <span class="sort-label"> Tanggal Dokumen Diterima </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_spk">
-                                <span class="sort"> <span class="sort-label"> Tanggal SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nomor_spk">
-                                <span class="sort"> <span class="sort-label"> Nomor SPK </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_rencana_kunjunagn">
-                                <span class="sort"> <span class="sort-label"> Tanggal Rencana Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_kunjungan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Kunjungan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="taggal_delivered">
-                                <span class="sort"> <span class="sort-label"> Tanggal Delivered </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="jangka_waktu_sla">
-                                <span class="sort"> <span class="sort-label"> Jangka Waktu SLA </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_laporan">
-                                <span class="sort"> <span class="sort-label"> Tanggal Laporan </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="tanggal_review">
-                                <span class="sort"> <span class="sort-label"> Tanggal Review </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_penilai">
-                                <span class="sort"> <span class="sort-label"> Nama Penilai </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="nama_team_leader">
-                                <span class="sort"> <span class="sort-label"> Nama Team Leader </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="saran">
-                                <span class="sort"> <span class="sort-label"> Saran </span>
-                                                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[150px]" data-datatable-column="catatan">
-                                <span class="sort"> <span class="sort-label"> Catatan </span>
+                            <th class="min-w-[150px]" data-datatable-column="approval_limit">
+                                <span class="sort"> <span class="sort-label"> Approval Limit </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
                         </tr>
@@ -250,151 +98,21 @@
                         return checkbox.outerHTML.trim();
                     },
                 },
-                nomor_registrasi: {
+                nik: {
                     title: 'Nomor Registrasi',
                 },
-                tanggal_permohonan: {
-                    title: 'Tanggal Permohonan',
+                name: {
+                    title: 'Nama',
+                },
+                 level: {
+                    title: 'level',
+                },
+                approval_limit: {
+                    title: 'Approval Limit',
                     render: (item, data) => {
                         return data.tanggal_permohonan ? window.formatTanggalIndonesia(data.tanggal_permohonan) : '-';
                     },
                 },
-                branch: {
-                    title: 'Cabang',
-                },
-                pemohon: {
-                    title: 'Pemohon',
-                },
-                cif: {
-                    title: 'CIF',
-                },
-                name: {
-                    title: 'Nama Debitur',
-                },
-                jenis_penilaian: {
-                    title: 'Jenis Penilaian',
-                },
-                tujuan_penilaian: {
-                    title: 'Tujuan Penilaian',
-                },
-                jenis_fasilitas_kredit: {
-                    title: 'Jenis Fasilitas Kredit',
-                },
-                jenis_agunan: {
-                    title: 'Jenis Agunan',
-                },
-                alamat_agunan: {
-                    title: 'Alamat Agunan',
-                },
-                bukti_kepemilikan: {
-                    title: 'Bukti Kepemilikan',
-                    render: (item, data) => {
-                        if (data.bukti_kepemilikan) {
-                            // Ganti karakter baris baru dengan tag <br> untuk HTML
-                            return data.bukti_kepemilikan.split('\n').join('<br>');
-                        }
-                        return '-';
-                    },
-                },
-                nama_pemilik: {
-                    title: 'Nama Pemilik',
-                },
-                luas_tanah: {
-                    title: 'Luas Tanah',
-                },
-                nilai_tanah: {
-                    title: 'Nilai Tanah',
-                    render: (item, data) => {
-                        return data.nilai_tanah ?? '-';
-                    },
-                },
-                luas_bangunan: {
-                    title: 'Luas Bangunan',
-                },
-                nilai_bangunan: {
-                    title: 'Nilai Bangunan',
-                    render: (item, data) => {
-                        return data.nilai_bangunan ?? '-';
-                    },
-                },
-                nilai_njop: {
-                    title: 'Nilai NJOP',
-                    render: (item, data) => {
-                        return data.nilai_njop ?? '-';
-                    },
-                },
-                nilai_pasar_wajar: {
-                    title: 'Nilai Pasar Wajar',
-                    render: (item, data) => {
-                        return data.nilai_pasar_wajar ?? '-';
-                    },
-                },
-                nilai_likuidasi: {
-                    title: 'Nilai Likuidasi',
-                    render: (item, data) => {
-                        return data.nilai_likuidasi ?? '-';
-                    },
-                },
-                tanggal_documen_diterima: {
-                    title: 'Tanggal Dokumen Diterima',
-                    render: (item, data) => {
-                        return data.tanggal_documen_diterima ? window.formatTanggalIndonesia(data.tanggal_documen_diterima) : '-';
-                    },
-                },
-                tanggal_spk: {
-                    title: 'Tanggal SPK',
-                    render: (item, data) => {
-                        return data.tanggal_spk ? window.formatTanggalIndonesia(data.tanggal_spk) : '-';
-                    },
-                },
-                nomor_spk: {
-                    title: 'Nomor SPK',
-                },
-                tanggal_rencana_kunjunagn: {
-                    title: 'Tanggal Rencana Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_rencana_kunjunagn ? window.formatTanggalIndonesia(data.tanggal_rencana_kunjunagn) : '-';
-                    },
-                },
-                tanggal_kunjungan: {
-                    title: 'Tanggal Kunjungan',
-                    render: (item, data) => {
-                        return data.tanggal_kunjungan ? window.formatTanggalIndonesia(data.tanggal_kunjungan) : '-';
-                    },
-                },
-                taggal_delivered: {
-                    title: 'Tanggal Delivered',
-                    render: (item, data) => {
-                        return data.taggal_delivered ? window.formatTanggalIndonesia(data.taggal_delivered) : '-';
-                    },
-                },
-                jangka_waktu_sla: {
-                    title: 'Jangka Waktu SLA',
-                },
-                tanggal_laporan: {
-                    title: 'Tanggal Laporan',
-                    render: (item, data) => {
-                        return data.tanggal_laporan ? window.formatTanggalIndonesia(data.tanggal_laporan) : '-';
-                    },
-                },
-                tanggal_review: {
-                    title: 'Tanggal Review',
-                    render: (item, data) => {
-                        return data.tanggal_review ? window.formatTanggalIndonesia(data.tanggal_review) : '-';
-                    },
-                },
-                nama_penilai: {
-                    title: 'Nama Penilai',
-                },
-                nama_team_leader: {
-                    title: 'Nama Team Leader',
-                },
-                saran: {
-                    title: 'Saran',
-                },
-                catatan: {
-                    title: 'Catatan',
-                }
             }
         };
 
@@ -415,7 +133,6 @@
             if (startDate) {
                 filters.start_date = startDate;
             }
-
             if (endDate) {
                 filters.end_date = endDate;
             }
@@ -425,7 +142,6 @@
             }
 
 
-
             dataTable.search(filters);
         }
 

resources/views/laporan/index.blade.php

@@ -6,10 +6,10 @@
 
 
 @section('content')
-    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        <div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10"
+    <div class="grid gap-5 mx-auto w-full lg:gap-7.5">
+        <div class="min-w-full border card border-agi-100 card-grid" data-datatable="false" data-datatable-page-size="10"
             data-datatable-state-save="false" id="laporan-table" data-api-url="{{ route('laporan.datatables') }}">
-            <div class="card-header bg-agi-50 py-5 flex-wrap">
+            <div class="flex-wrap py-5 card-header bg-agi-50">
                 <h3 class="card-title">
                     Laporan
                 </h3>
@@ -28,7 +28,7 @@
 
             <div class="card-body">
                 <div class="scrollable-x-auto">
-                    <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
+                    <table class="table text-sm font-medium text-gray-700 align-middle table-auto table-border"
                         data-datatable-table="true">
                         <thead>
                             <tr>
@@ -74,13 +74,13 @@
                     </table>
                 </div>
                 <div
-                    class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
-                    <div class="flex items-center gap-2">
+                    class="flex-col gap-3 justify-center font-medium text-gray-600 card-footer md:justify-between md:flex-row text-2sm">
+                    <div class="flex gap-2 items-center">
                         Show
-                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
+                        <select class="w-16 select select-sm" data-datatable-size="true" name="perpage"> </select> per
                         page
                     </div>
-                    <div class="flex items-center gap-4">
+                    <div class="flex gap-4 items-center">
                         <span data-datatable-info="true"> </span>
                         <div class="pagination" data-datatable-pagination="true">
                         </div>
@@ -151,7 +151,7 @@
                 user_id: {
                     title: 'User Pemohon',
                     render: (item, data) => {
-                        return `${data.user.name}`;
+                        return `${data.user?.name}`;
                     },
                 },
                 tujuan_penilaian_id: {
@@ -180,16 +180,16 @@
                 jenis_fasilitas_kredit_id: {
                     title: 'Fasilitas Kredit',
                     render: (item, data) => {
-                        return `${data.jenis_fasilitas_kredit.name}`;
+                        return `${data.jenis_fasilitas_kredit?.name}`;
                     }
                 },
                 tanggal_survei: {
                     title: 'Tanggal Survei',
                     render: (item, data) => {
-                        if(data.penilaian.waktu_penilaian){
-                            return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`;
+                        if (data.penilaian?.waktu_penilaian) {
+                            return `${formatDate(new Date(data.penilaian?.waktu_penilaian))}`;
                         }
-                        return `${formatDate(new Date(data.penilaian.created_at))}`;
+                        return `${formatDate(new Date(data.penilaian?.created_at))}`;
                     },
                 },
                 due_date_sla: {
@@ -197,10 +197,10 @@
                     render: (item, data) => {
                         const tujuan_penilaian = data.tujuan_penilaian.name;
                         const tipe_laporan = data.penilai?.type;
-                        const nilai_plafond = data.penilaian.nilaiPlafond?.name;
-                        let waktu_penilaian = new Date(data.penilaian.created_at);
-                        if(data.penilaian.waktu_penilaian){
-                            waktu_penilaian = new Date(data.penilaian.waktu_penilaian);
+                        const nilai_plafond = data.penilaian?.nilaiPlafond?.name;
+                        let waktu_penilaian = new Date(data.penilaian?.created_at);
+                        if (data.penilaian?.waktu_penilaian) {
+                            waktu_penilaian = new Date(data.penilaian?.waktu_penilaian);
                         }
 
                         if (tujuan_penilaian.name === "RAP") {
@@ -224,7 +224,7 @@
                 status: {
                     title: 'Status',
                     render: (item, data) => {
-                        return `<span class="badge badge-sm badge-default uppercase flex justify-center">${data.status}</span>`;
+                        return `<span class="flex justify-center uppercase badge badge-sm badge-default">${data.status}</span>`;
                     }
                 },
                 actions: {
@@ -241,30 +241,25 @@
 
 
                         if (data.noc) {
-                            if (!data.noc?.tanggal_penyelesaian && !data.noc?.memo_penyelesaian) {
+                            if (!data.noc?.memo_penyelesaian) {
                                 penyelesaian = `
-                        <a href="{{ route('noc.penyelesaian') }}?id=${data.noc.id}&permohonanId=${data.noc.permohonan_id}&persetujuanPenawaranId=${data.noc.persetujuan_penawaran_id}" class="btn btn-sm btn-warning">
+                        <a href="{{ route('noc.index') }}/${data.noc.id}" class="btn btn-sm btn-warning">
                             Penyelesaian
                         </a>`;
                             }
                         }
 
-                        if(data.penilai.resume) {
+                        if (data.penilai?.resume) {
                             resumeButton = `
                         <a href="penilai/print-out-laporan/${data.id}/${dokumenID}/${jenisJaminanID}" class="btn btn-sm btn-success">
                             Resume
                         </a>`;
                         }
 
-                        if(data.nilai_liquidasi==null) {
-                            laporanButton = `
-                            <a href="laporan/${data.id}" class="btn btn-sm btn-primary">
-                                Laporan
-                            </a>`;
-                        }
 
-                        if((data.status_bayar=="sudah_bayar" || data.status_bayar=="tidak_bayar") && data.nilai_liquidasi >0) {
-                            if(data.penilai.type_penilai=='resume' && !data.penilai.resume){
+
+                        if ((data.status_bayar == "sudah_bayar" || data.status_bayar == "tidak_bayar")) {
+                            if (data.penilai?.type_penilai == 'resume' && !data.penilai?.resume) {
                                 laporanButton = `
                             <a href="penilai/print-out-laporan/${data.id}/${dokumenID}/${jenisJaminanID}" class="btn btn-sm btn-primary">
                                 Laporan
@@ -279,7 +274,7 @@
                         }
 
 
-                        return `<div class="flex flex-wrap justify-end gap-1.5"> ${penyelesaian}  ${resumeButton} ${laporanButton} </div>`;
+                        return `<div class="flex flex-wrap gap-1.5 justify-end"> ${penyelesaian}  ${resumeButton} ${laporanButton} </div>`;
                     },
                 }
             },

resources/views/noc/form.blade.php

@@ -15,110 +15,134 @@
 @endphp
 
 @section('content')
-    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        <div class="card border border-agi-100 pb-2.5">
+    <div class="grid gap-5 mx-auto w-full lg:gap-7.5">
+        <div class="pb-2.5 border card border-agi-100">
             <div class="card-header bg-agi-50" id="basic_settings">
-                <div class="card-title flex flex-row gap-1.5">
+                <div class="flex flex-row gap-1.5 card-title">
                     {{ $hasMemo ? 'Proses Penyelesaian NOC' : 'NOC' }}
                 </div>
-                <div class="flex items-center gap-2">
-                    <a href="{{ route('noc.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+                <div class="flex gap-2 items-center">
+                    <a href="{{ route('noc.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
+                        Back</a>
                 </div>
             </div>
             <div class="card-body">
-                <form action="{{ !$hasMemo ? route('noc.store') : route('noc.update',$persetujuanPenawaran) }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
+                <form action="{{ !$hasMemo ? route('noc.store') : route('noc.update', $persetujuanPenawaran) }}"
+                    method="POST" class="grid gap-5" enctype="multipart/form-data">
                     @csrf
                     @if ($hasMemo)
                         @method('PUT')
                     @endif
-                    <input type="hidden" name="penawaran_id" value="{{ $persetujuanPenawaran->penawaran_id ?? old('penawaran_id') }}">
-                    <input type="hidden" name="persetujuan_penawaran_id" value="{{ $persetujuanPenawaran->id ?? old('persetujuan_penawaran_id') }}">
-                    <input type="hidden" name="permohonan_id" value="{{ $persetujuanPenawaran->penawaran->permohonan->id ?? $persetujuanPenawaran->permohonan->id }}">
+                    <input type="hidden" name="penawaran_id"
+                        value="{{ $persetujuanPenawaran->penawaran_id ?? old('penawaran_id') }}">
+                    <input type="hidden" name="persetujuan_penawaran_id"
+                        value="{{ $persetujuanPenawaran->id ?? old('persetujuan_penawaran_id') }}">
+                    <input type="hidden" name="permohonan_id"
+                        value="{{ $persetujuanPenawaran->penawaran->permohonan->id ?? $persetujuanPenawaran->permohonan->id }}">
 
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                         <label class="form-label max-w-56">
                             Status Bayar
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <select class="input tomselect w-full @error('status_pembayar') border-danger bg-danger-light @enderror" name="status_pembayar" id="status_pembayar" {{ $hasMemo ? 'disabled' : '' }}>
+                            <select
+                                class="input tomselect w-full @error('status_pembayar') border-danger bg-danger-light @enderror"
+                                name="status_pembayar" id="status_pembayar" {{ $hasMemo ? 'disabled' : '' }}>
                                 <option value="">Pilih Status Bayar</option>
-                                <option value="sudah_bayar" {{ (old('status_pembayar') == 'sudah_bayar') || ($persetujuanPenawaran?->penawaran?->permohonan?->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
-                                <option value="belum_bayar" {{ (old('status_pembayar') == 'belum_bayar') || ($persetujuanPenawaran?->penawaran?->permohonan?->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
+                                <option value="sudah_bayar"
+                                    {{ old('status_pembayar') == 'sudah_bayar' || $persetujuanPenawaran?->penawaran?->permohonan?->status_bayar == 'sudah_bayar' ? 'selected' : '' }}>
+                                    Sudah Bayar</option>
+                                <option value="belum_bayar"
+                                    {{ old('status_pembayar') == 'belum_bayar' || $persetujuanPenawaran?->penawaran?->permohonan?->status_bayar == 'belum_bayar' ? 'selected' : '' }}>
+                                    Belum Bayar</option>
                             </select>
                             @error('status_bayar')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                <em class="text-sm alert text-danger">{{ $message }}</em>
                             @enderror
                         </div>
                     </div>
 
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                         <label class="form-label max-w-56">
                             Bukti Pembayaran
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             @if (!empty($persetujuanPenawaran->bukti_bayar))
-                                <div class="mt-2 flex items-center">
-                                    <a href="{{ Storage::url($persetujuanPenawaran->bukti_bayar) }}" target="_blank" class="badge badge-sm badge-outline badge-warning">
-                                        <i class="ki-filled ki-eye mr-2"></i> Lihat File
+                                <div class="flex items-center mt-2">
+                                    <a href="{{ Storage::url($persetujuanPenawaran->bukti_bayar) }}" target="_blank"
+                                        class="badge badge-sm badge-outline badge-warning">
+                                        <i class="mr-2 ki-filled ki-eye"></i> Lihat File
                                     </a>
                                 </div>
                             @endif
                         </div>
                     </div>
 
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                         <label class="form-label max-w-56">
                             Nominal Bayar
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="number" name="total_harus_bayar" id="total_harus_bayar" class="input w-full @error('total_harus_bayar') border-danger bg-danger-light @enderror" value="{{ old('total_harus_bayar', $persetujuanPenawaran->nominal_bayar ?? '') }}" readonly>
+                            <input type="number" name="total_harus_bayar" id="total_harus_bayar"
+                                class="input w-full @error('total_harus_bayar') border-danger bg-danger-light @enderror"
+                                value="{{ old('total_harus_bayar', $persetujuanPenawaran->nominal_bayar ?? '') }}"
+                                readonly>
                             @error('total_harus_bayar')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                <em class="text-sm alert text-danger">{{ $message }}</em>
                             @enderror
                         </div>
                     </div>
 
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                         <label class="form-label max-w-56">
                             Nominal Diterima
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="number" name="nominal_bayar" id="nominal_bayar" class="input w-full @error('nominal_bayar') border-danger bg-danger-light @enderror" value="{{ old('nominal_bayar', $persetujuanPenawaran->noc->nominal_bayar ?? '') }}" placeholder="Masukkan nominal bayar" {{ $hasMemo ? 'readonly' : '' }}>
+                            <input type="number" name="nominal_bayar" id="nominal_bayar"
+                                class="input w-full @error('nominal_bayar') border-danger bg-danger-light @enderror"
+                                value="{{ old('nominal_bayar', $persetujuanPenawaran->noc->nominal_bayar ?? '') }}"
+                                placeholder="Masukkan nominal bayar" {{ $hasMemo ? 'readonly' : '' }}>
                             @error('nominal_bayar')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                <em class="text-sm alert text-danger">{{ $message }}</em>
                             @enderror
                         </div>
                     </div>
 
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                         <label class="form-label max-w-56">
                             Tanggal Pembayaran
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="date" name="tanggal_pembayaran" id="tanggal_pembayaran" class="input w-full @error('tanggal_pembayaran') border-danger bg-danger-light @enderror" value="{{ old('tanggal_pembayaran', isset($persetujuanPenawaran->noc->tanggal_pembayaran) ? date('Y-m-d', strtotime($persetujuanPenawaran->noc->tanggal_pembayaran)) : '') }}" {{ $hasMemo ? 'readonly' : '' }}>
+                            <input type="date" name="tanggal_pembayaran" id="tanggal_pembayaran"
+                                class="input w-full @error('tanggal_pembayaran') border-danger bg-danger-light @enderror"
+                                value="{{ old('tanggal_pembayaran', isset($persetujuanPenawaran->noc->tanggal_pembayaran) ? date('Y-m-d', strtotime($persetujuanPenawaran->noc->tanggal_pembayaran)) : '') }}"
+                                {{ $hasMemo ? 'readonly' : '' }}>
                             @error('tanggal_pembayaran')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                <em class="text-sm alert text-danger">{{ $message }}</em>
                             @enderror
                         </div>
                     </div>
 
 
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                         <label class="form-label max-w-56">
                             Bukti KSL
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             @if (!$hasMemo)
-                                <input type="file" name="bukti_ksl" id="bukti_ksl" class="file-input w-full @error('bukti_ksl') border-danger bg-danger-light @enderror" accept=".pdf,.jpg,.jpeg,.png">
+                                <input type="file" name="bukti_ksl" id="bukti_ksl"
+                                    class="file-input w-full @error('bukti_ksl') border-danger bg-danger-light @enderror"
+                                    accept=".pdf,.jpg,.jpeg,.png">
                                 @error('bukti_ksl')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    <em class="text-sm alert text-danger">{{ $message }}</em>
                                 @enderror
                             @endif
 
                             @if (isset($persetujuanPenawaran->noc->bukti_ksl) && !empty($persetujuanPenawaran->noc->bukti_ksl))
-                                <div class="mt-2 flex items-center">
-                                    <a href="{{ Storage::url($persetujuanPenawaran->noc->bukti_ksl) }}" target="_blank" class="badge badge-sm badge-outline badge-warning">
-                                        <i class="ki-filled ki-eye mr-2"></i> Lihat File
+                                <div class="flex items-center mt-2">
+                                    <a href="{{ Storage::url($persetujuanPenawaran->noc->bukti_ksl) }}" target="_blank"
+                                        class="badge badge-sm badge-outline badge-warning">
+                                        <i class="mr-2 ki-filled ki-eye"></i> Lihat File
                                     </a>
                                 </div>
                             @endif
@@ -126,86 +150,101 @@
                     </div>
 
                     @if ($hasMemo)
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                             <label class="form-label max-w-56">
                                 Memo Penyelesaian
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 <div class="flex items-center">
-                                    <a href="{{ Storage::url($persetujuanPenawaran->noc->memo_penyelesaian) }}" target="_blank" class="badge badge-sm badge-outline badge-warning">
-                                        <i class="ki-filled ki-eye mr-2"></i> Lihat File
+                                    <a href="{{ Storage::url($persetujuanPenawaran->noc->memo_penyelesaian) }}"
+                                        target="_blank" class="badge badge-sm badge-outline badge-warning">
+                                        <i class="mr-2 ki-filled ki-eye"></i> Lihat File
                                     </a>
-                                    <input type="hidden" name="memo_penyelesaian_existing" value="{{ $persetujuanPenawaran->noc->memo_penyelesaian }}">
+                                    <input type="hidden" name="memo_penyelesaian_existing"
+                                        value="{{ $persetujuanPenawaran->noc->memo_penyelesaian }}">
                                 </div>
                             </div>
                         </div>
 
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                             <label class="form-label max-w-56">
                                 Bukti Penyelesaian
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <input type="file" name="bukti_penyelesaian" id="bukti_penyelesaian" class="file-input w-full @error('bukti_penyelesaian') border-danger bg-danger-light @enderror" accept=".pdf,.jpg,.jpeg,.png">
+                                <input type="file" name="bukti_penyelesaian" id="bukti_penyelesaian"
+                                    class="file-input w-full @error('bukti_penyelesaian') border-danger bg-danger-light @enderror"
+                                    accept=".pdf,.jpg,.jpeg,.png">
                                 @error('bukti_penyelesaian')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    <em class="text-sm alert text-danger">{{ $message }}</em>
                                 @enderror
 
                                 @if (isset($persetujuanPenawaran->noc->bukti_penyelesaian) && !empty($persetujuanPenawaran->noc->bukti_penyelesaian))
-                                    <div class="mt-2 flex items-center">
-                                        <a href="{{ Storage::url($persetujuanPenawaran->noc->bukti_penyelesaian) }}" target="_blank" class="badge badge-sm badge-outline badge-warning">
-                                            <i class="ki-filled ki-eye mr-2"></i> Lihat File
+                                    <div class="flex items-center mt-2">
+                                        <a href="{{ Storage::url($persetujuanPenawaran->noc->bukti_penyelesaian) }}"
+                                            target="_blank" class="badge badge-sm badge-outline badge-warning">
+                                            <i class="mr-2 ki-filled ki-eye"></i> Lihat File
                                         </a>
-                                        <input type="hidden" name="bukti_penyelesaian_existing" value="{{ $persetujuanPenawaran->noc->bukti_penyelesaian }}">
+                                        <input type="hidden" name="bukti_penyelesaian_existing"
+                                            value="{{ $persetujuanPenawaran->noc->bukti_penyelesaian }}">
                                     </div>
                                 @endif
                             </div>
                         </div>
 
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                             <label class="form-label max-w-56">
                                 Nominal Penyelesaian
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <input type="number" name="nominal_penyelesaian" id="nominal_penyelesaian" class="input w-full @error('nominal_penyelesaian') border-danger bg-danger-light @enderror" value="{{ old('nominal_penyelesaian', $persetujuanPenawaran->noc->nominal_penyelesaian ?? '') }}" placeholder="Masukkan nominal penyelesaian">
+                                <input type="number" name="nominal_penyelesaian" id="nominal_penyelesaian"
+                                    class="input w-full @error('nominal_penyelesaian') border-danger bg-danger-light @enderror"
+                                    value="{{ old('nominal_penyelesaian', $persetujuanPenawaran->noc->nominal_penyelesaian ?? '') }}"
+                                    placeholder="Masukkan nominal penyelesaian">
                                 @error('nominal_penyelesaian')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    <em class="text-sm alert text-danger">{{ $message }}</em>
                                 @enderror
                             </div>
                         </div>
 
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                             <label class="form-label max-w-56">
                                 Tanggal Penyelesaian
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <input type="date" name="tanggal_penyelesaian" id="tanggal_penyelesaian" class="input w-full @error('tanggal_penyelesaian') border-danger bg-danger-light @enderror" value="{{ old('tanggal_penyelesaian', isset($persetujuanPenawaran->noc->tanggal_penyelesaian) ? date('Y-m-d', strtotime($persetujuanPenawaran->noc->tanggal_penyelesaian)) : '') }}">
+                                <input type="date" name="tanggal_penyelesaian" id="tanggal_penyelesaian"
+                                    class="input w-full @error('tanggal_penyelesaian') border-danger bg-danger-light @enderror"
+                                    value="{{ old('tanggal_penyelesaian', isset($persetujuanPenawaran->noc->tanggal_penyelesaian) ? date('Y-m-d', strtotime($persetujuanPenawaran->noc->tanggal_penyelesaian)) : '') }}">
                                 @error('tanggal_penyelesaian')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    <em class="text-sm alert text-danger">{{ $message }}</em>
                                 @enderror
                             </div>
                         </div>
                     @endif
 
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                         <label class="form-label max-w-56">
                             Catatan
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <textarea name="catatan" id="catatan" rows="4" class="textarea w-full @error('catatan') border-danger bg-danger-light @enderror" readonly placeholder="Masukkan catatan">{{ old('catatan', $persetujuanPenawaran->catatan ?? '') }}</textarea>
+                            <textarea name="catatan" id="catatan" rows="4"
+                                class="textarea w-full @error('catatan') border-danger bg-danger-light @enderror" readonly
+                                placeholder="Masukkan catatan">{{ old('catatan', $persetujuanPenawaran->catatan ?? '') }}</textarea>
                             @error('catatan')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                <em class="text-sm alert text-danger">{{ $message }}</em>
                             @enderror
                         </div>
                     </div>
 
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <div class="flex flex-wrap gap-2.5 items-baseline lg:flex-nowrap">
                         <label class="form-label max-w-56">
                             Catatan NOC
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <textarea name="catatan_noc" id="catatan_noc" rows="4" class="textarea w-full @error('catatan_noc') border-danger bg-danger-light @enderror" placeholder="Masukkan catatan noc">{{ old('catatan_noc', $persetujuanPenawaran->noc->catatan_noc ?? '') }}</textarea>
+                            <textarea name="catatan_noc" id="catatan_noc" rows="4"
+                                class="textarea w-full @error('catatan_noc') border-danger bg-danger-light @enderror"
+                                placeholder="Masukkan catatan noc">{{ old('catatan_noc', $persetujuanPenawaran->noc->catatan_noc ?? '') }}</textarea>
                             @error('catatan_noc')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                <em class="text-sm alert text-danger">{{ $message }}</em>
                             @enderror
                         </div>
                     </div>

resources/views/noc/pembayaran.blade.php

@@ -5,9 +5,10 @@
 @endsection
 
 @section('content')
-    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        <div class="card border border-agi-100 card-grid min-w-full" data-datatable="false" data-datatable-page-size="10" data-datatable-state-save="false" id="noc-table" data-api-url="{{ route('noc.datatables.pembayaran') }}">
-            <div class="card-header bg-agi-50 py-5 flex-wrap">
+    <div class="grid gap-5 mx-auto w-full lg:gap-7.5">
+        <div class="min-w-full border card border-agi-100 card-grid" data-datatable="false" data-datatable-page-size="10"
+            data-datatable-state-save="false" id="noc-table" data-api-url="{{ route('noc.datatables.pembayaran') }}">
+            <div class="flex-wrap py-5 card-header bg-agi-50">
                 <h3 class="card-title">
                     Daftar NOC Pembayaran
                 </h3>
@@ -27,7 +28,8 @@
 
             <div class="card-body">
                 <div class="scrollable-x-auto">
-                    <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
+                    <table class="table text-sm font-medium text-gray-700 align-middle table-auto table-border"
+                        data-datatable-table="true">
                         <thead>
                             <tr>
                                 <th class="w-14">
@@ -75,13 +77,13 @@
                     </table>
                 </div>
                 <div
-                    class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
-                    <div class="flex items-center gap-2">
+                    class="flex-col gap-3 justify-center font-medium text-gray-600 card-footer md:justify-between md:flex-row text-2sm">
+                    <div class="flex gap-2 items-center">
                         Show
-                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
+                        <select class="w-16 select select-sm" data-datatable-size="true" name="perpage"> </select> per
                         page
                     </div>
-                    <div class="flex items-center gap-4">
+                    <div class="flex gap-4 items-center">
                         <span data-datatable-info="true"> </span>
                         <div class="pagination" data-datatable-pagination="true">
                         </div>
@@ -140,7 +142,7 @@
                         title: 'Cabang',
                     },
                     tanggal_setor: {
-                            title: 'Tanggal Setor',
+                        title: 'Tanggal KSL',
                     },
                     nominal_bayar: {
                         title: 'Nominal Bayar',

resources/views/penilai/components/analisa/informasi.blade.php

@@ -1,5 +1,56 @@
 <div class="no-break">
 <table style="width: 100%">
+    @if($permohonan->is_mig)
+        @if (!empty($forminspeksi['fakta']['keterangan']))
+            @foreach ($forminspeksi['fakta']['keterangan'] as $key => $item)
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; border: 1px solid #000; text-align: center;">
+                            {{ $key }}
+                        </td>
+                    </tr>
+                </table>
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; text-align: left;">
+                            @if (is_array($item))
+                                @foreach ($item as $data_)
+                                    {!! nl2br(e($data_)) !!}<br>
+                                @endforeach
+                            @else
+                                {!! nl2br(e($item)) !!}
+                            @endif
+                        </td>
+                    </tr>
+                </table>
+            @endforeach
+        @endif
+
+        @if (!empty($forminspeksi['fakta']['saran']))
+            @foreach ($forminspeksi['fakta']['saran'] as $key => $item)
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; border: 1px solid #000; text-align: center;">
+                            SARAN
+                        </td>
+                    </tr>
+                </table>
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; text-align: left;">
+                            @if (is_array($item))
+                                @foreach ($item as $data_)
+                                    {!! nl2br(e($data_)) !!}<br>
+                                @endforeach
+                            @else
+                                {!! nl2br(e($item)) !!}
+                            @endif
+                        </td>
+                    </tr>
+                </table>
+            @endforeach
+        @endif
+    @else
         <tr>
         <td width="25%" style="vertical-align: top;">Informasi Dinas Tata Ruang
         </td>
@@ -34,31 +85,6 @@
         </td>
     </tr>
 
-
-    @if (!empty($forminspeksi['fakta']['keterangan']))
-        <tr>
-            <td width="25%" style="vertical-align: top;">Catatan yang Perlu
-                Diperhatikan</td>
-            <td width="1%" style="vertical-align: top;">:</td>
-            <td style="vertical-align: top;">
-                @php
-                    $keterangan = $forminspeksi['fakta']['keterangan'] ?? '';
-                    if (is_array($keterangan)) {
-                        $keterangan = implode(', ', array_filter($keterangan));
-                    }
-                @endphp
-
-                @if (!empty($keterangan))
-                    <table style="width: 100%; border-collapse: collapse;">
-                        <tr>
-                            <td>{!! nl2br(e($keterangan)) !!}</td>
-
-                        </tr>
-                    </table>
-                @endif
-            </td>
-
-        </tr>
     @endif
 </table>
 </div>

resources/views/penilai/components/footer.blade.php

@@ -46,6 +46,7 @@
                     'foto_argis_region' => 'Blad Tata Ruang ',
                     'foto_tempat' => 'Peta Lokasi',
                 ];
+
             // Memindahkan foto_tempat ke depan jika ada
             if (($key = array_search('upload_gs', $fotoTypes)) !== false) {
                 unset($fotoTypes[$key]);
@@ -68,7 +69,7 @@
                     @endphp
                     @if ($imagePath && file_exists(storage_path('app/public/' . $imagePath)))
                         <tr>
-                            <td style="width: 100%; vertical-align: top; text-align: center" class="photo-item border">
+                            <td style="width: 100%; vertical-align: top; text-align: center" class="border photo-item">
                                 <p style="margin: 0; font-size: 10px; text-align: center;">
                                     {{ $customLabels[$type] ?? '' }}
                                 </p>

resources/views/penilai/components/foto-jaminan.blade.php

@@ -81,6 +81,32 @@
         $groupedPhotos = collect($photos)->groupBy('category');
 
         $mainPhotos = $groupedPhotos->filter(fn($_, $key) => strtolower($key) !== 'lainnya');
+
+        // Definisikan urutan yang diinginkan
+        $desiredOrder = [
+            'PETA LOKASI',
+            'GAMBAR SITUASI / SURAT UKUR',
+            'BLAD TATA KOTA',
+            'FOTO JAMINAN',
+            'DOKUMEN PENDUKUNG'
+        ];
+
+        // Urutkan ulang $mainPhotos sesuai urutan yang diinginkan
+        $orderedMainPhotos = collect();
+        foreach ($desiredOrder as $category) {
+            if ($mainPhotos->has($category)) {
+                $orderedMainPhotos->put($category, $mainPhotos->get($category));
+            }
+        }
+
+        // Tambahkan kategori lain yang tidak ada dalam urutan yang diinginkan
+        foreach ($mainPhotos as $category => $photos) {
+            if (!in_array($category, $desiredOrder)) {
+                $orderedMainPhotos->put($category, $photos);
+            }
+        }
+
+        $mainPhotos = $orderedMainPhotos;
         $otherPhotos = $groupedPhotos->get('lainnya', collect());
     @endphp
 
@@ -88,6 +114,9 @@
         <p class="text-gray-500">Tidak ada foto yang tersedia.</p>
     @else
         @foreach ($mainPhotos as $category => $photos)
+            @if($category=='DOKUMEN PENDUKUNG')
+                @php continue; @endphp
+            @endif
             @php
                 $groupedBySubcategory = $photos->groupBy('sub');
             @endphp
@@ -95,16 +124,42 @@
             @foreach ($groupedBySubcategory as $subcategory => $subPhotos)
                 @if (count($subPhotos) > 0)
                     @foreach ($subPhotos->chunk(2) as $chunkedPhotos)
+                        @if(!$loop->first)
+                        <div class="page-break"></div>
+                        @endif
                         <table width="100%" border="0"
                             style="align-content: center; text-align: center; margin-bottom: 20px">
                             @foreach ($chunkedPhotos as $item)
                                 @php
+                                    // Logika fallback untuk path file
+                                    $originalPath = $item['path'];
+                                    $fallbackPath = null;
+
+                                    // Jika file asli tidak ditemukan, buat fallback path
+                                    if ($statusLpj == 1) {
+                                        $fullOriginalPath = storage_path('app/public/' . $originalPath);
+
+                                        if (!file_exists($fullOriginalPath)) {
+                                            // Ekstrak bagian akhir path (contoh: 251051/251051_2_2.png)
+                                            $pathParts = explode('/', $originalPath);
+                                            if (count($pathParts) >= 2) {
+                                                $lastTwoParts = array_slice($pathParts, -2);
+                                                $fallbackPath = 'surveyor/001/' . implode('/', $lastTwoParts);
+                                            }
+                                        }
+                                    }
+
+                                    // Tentukan path yang akan digunakan
+                                    $pathToUse = ($fallbackPath && $statusLpj == 1 && file_exists(storage_path('app/public/' . $fallbackPath)))
+                                        ? $fallbackPath
+                                        : $originalPath;
+
                                     $filePath =
                                         $statusLpj == 1
-                                            ? storage_path('app/public/' . $item['path'])
-                                            : asset('storage/' . $item['path']);
+                                            ? storage_path('app/public/' . $pathToUse)
+                                            : asset('storage/' . $pathToUse);
 
-                                    $extension = strtolower(pathinfo($item['path'], PATHINFO_EXTENSION));
+                                    $extension = strtolower(pathinfo($pathToUse, PATHINFO_EXTENSION));
                                     $isImage = in_array($extension, [
                                         'jpg',
                                         'jpeg',
@@ -121,7 +176,7 @@
                                 @if ($isImage && $filePath)
                                     <tr>
                                         <td style="width: 100%; padding: 10px; align-content: center; text-align: center"
-                                            class="photo-item border">
+                                            class="border photo-item">
                                             <p style="font-weight: medium; font-size: 10px">{{ $category }} -
                                                 @isset($subcategory)
                                                     @if (trim($subcategory) !== '')
@@ -130,7 +185,7 @@
                                                 @endisset
                                                 {{ $item['name'] ?? '' }}
                                             </p>
-                                            <img src="{{ $filePath }}" alt="{{ $item['path'] }}" class="photo-image"
+                                            <img src="{{ $filePath }}" alt="{{ $pathToUse }}" class="photo-image"
                                                 style="align-content: center; text-align: center; max-width: 100%; height: auto;">
                                         </td>
                                     </tr>
@@ -138,7 +193,7 @@
                                 @elseif ($statusLpj != 1)
                                     <tr>
                                         <td style="width: 100%; padding: 10px; align-content: center; text-align: center"
-                                            class="photo-item border ">
+                                            class="border photo-item">
 
                                             <p style="font-weight: medium; font-size: 10px">{{ $category }} -
                                                 @isset($subcategory)
@@ -180,13 +235,13 @@
                                 <tr style="width: 100%;"></tr>
                             @endif
                         </table>
-                        <div class="page-break"></div>
                     @endforeach
                 @endif
             @endforeach
         @endforeach
 
         @if (!$otherPhotos->isEmpty())
+            @dd(!$otherPhotos->isEmpty())
             @foreach ($otherPhotos->groupBy('sub') as $subcategory => $subPhotos)
                 @if (count($subPhotos) > 0)
                     @foreach ($subPhotos->chunk(2) as $chunkedPhotos)
@@ -216,7 +271,7 @@
                                   @if ($isImage && $filePath)
                                     <tr>
                                         <td style="width: 100%; padding: 10px; align-content: center; text-align: center"
-                                            class="photo-item border">
+                                            class="border photo-item">
                                             <p style="font-weight: medium; font-size: 10px">{{ $category }} -
                                                 @isset($subcategory)
                                                     @if (trim($subcategory) !== '')
@@ -232,7 +287,7 @@
                                   @endif
                                 @elseif ($statusLpj != 1)
                                     <tr>
-                                        <td style="width: 100%; padding: 10px;" class="photo-item border">
+                                        <td style="width: 100%; padding: 10px;" class="border photo-item">
                                             <p style="font-weight: medium; font-size: 10px">Lainnya -
                                                 @isset($subcategory)
                                                     @if (trim($subcategory) !== '')

resources/views/penilai/components/print-out-rap.blade.php

@@ -47,7 +47,7 @@
             <td style="width: 79%;  padding: 2px;">{{ $rap['dari'] ?? '' }}</td>
         </tr>
         <tr>
-            <td style="width: 25%; padding: 2px;">Tanggal Survey</td>
+            <td style="width: 25%; padding: 2px;">Tanggal Penilaian</td>
             <td style="width: 1%;  padding: 2px;">:</td>
             <td style="width: 79%;  padding: 2px;">
                 {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}</td>

resources/views/penilai/components/print-out-sederhana.blade.php

@@ -6,6 +6,9 @@
         $jenisAset = $dokumen->jenisJaminan->name;
     }
     $data = rtrim($data, ', ');
+
+    $permohonan_migrasi = json_decode($permohonan->mig_permohonan);
+
 @endphp
 
 <main class="content">
@@ -43,7 +46,7 @@
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Permintaan (AO)</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">{{ $permohonan->user->name ?? '-' }}</td>
+                        <td style="padding: 2px; vertical-align: top;">{{ $permohonan->user->name ?? $permohonan_migrasi->mig_mst_jaminan_nama_ao ?? '-' }}</td>
                     </tr>
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">No Order</td>
@@ -57,18 +60,11 @@
                             {{ formatTanggalIndonesia($permohonan->tanggal_permohonan) }}</td>
                     </tr>
                     <tr>
-                        <td style="padding: 2px; vertical-align: top;">Tanggal Survey</td>
+                        <td style="padding: 2px; vertical-align: top;">Tanggal Penilaian</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
                         <td style="padding: 2px; vertical-align: top;">
                             {{ formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) }}</td>
                     </tr>
-                    <tr>
-                        <td style="padding: 2px; vertical-align: top;">User</td>
-                        <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">{{ $permohonan->user->name ?? '' }}</td>
-                    </tr>
-
-
                     @php
                         $senior_officer = null;
                         if ($permohonan->debiture && $permohonan->documents) {
@@ -97,7 +93,11 @@
                         }
 
                     @endphp
-
+                    <tr>
+                        <td style="padding: 2px; vertical-align: top;">User</td>
+                        <td style="padding: 2px; vertical-align: top;">:</td>
+                        <td style="padding: 2px; vertical-align: top;">{{ $penilai->user->name ?? '' }}</td>
+                    </tr>
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Pemeriksa</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
@@ -108,17 +108,32 @@
                         <td style="padding: 2px; vertical-align: top;">:</td>
                         <td style="padding: 2px; vertical-align: top;">{{ $permohonan->approveSo->name ?? '' }}</td>
                     </tr>
+                     @if($permohonan->is_mig)
+                     <tr>
+                        <td style="padding: 2px; vertical-align: top;">No Laporan</td>
+                        <td style="padding: 2px; vertical-align: top;">:</td>
+                        <td style="padding: 2px; vertical-align: top;">
+                           {{  $permohonan_migrasi->mig_mst_lpj_nomor_lpj ?? '-' }}
+                        </td>
+                    </tr>
+                    @endif
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Tanggal Laporan</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
                         <td style="padding: 2px; vertical-align: top;">
-                            {{ formatTanggalIndonesia($tanggalLaporan) ?? '' }}</td>
+                            {{ formatTanggalIndonesia($tanggalLaporan) ?? '' }}
+                        </td>
                     </tr>
                     <tr>
                         <td style="padding: 2px; vertical-align: top;">Waktu Penyelesaian</td>
                         <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">
-                            {{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, $tanggalLaporan) }}</td>
+                        <td>
+                            @if($permohonan->is_mig)
+                            {{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, \Carbon\Carbon::createFromFormat('d/m/Y H:i:s', $permohonan_migrasi->mig_mst_jaminan_tgl_oto)->format('Y-m-d H:i:s'))-1 }}
+                            @else
+                            {{ hitungHariKerja($permohonan->penilaian->tanggal_kunjungan, $tanggalLaporan) }}
+                            @endif
+                            </td>
                     </tr>
                 </table>
             </td>
@@ -142,8 +157,27 @@
                         <td style=" padding: 2px; vertical-align: top;">{{ $permohonan->tujuanPenilaian->name ?? '' }}
                         </td>
                     </tr>
-                    @if ($permohonan->is_mig == 1)
-        {{-- <table style="width: 100%; "> --}}
+
+                    @if ($permohonan->is_mig)
+                        @php
+                            $data = json_decode($inspeksi->mig_detail_data_jaminan, true);
+                        @endphp
+                        @foreach ($data as $key => $item)
+                            @if ($key == 'address')
+                                @php $key = 'Terletak di'; @endphp
+                            @endif
+                            @php
+                                // Remove suffix _2, _3, _4, _5 from key
+                                $key = preg_replace('/_([2-5])$/', '', $key);
+                            @endphp
+                            <tr>
+                                <td style=" padding: 2px; vertical-align: top;">{{ $key }}</td>
+                                <td style=" padding: 2px; vertical-align: top;">:</td>
+                                <td style=" padding: 2px; vertical-align: top;">{{ $item }}</td>
+                            </tr>
+                        @endforeach
+
+                    @else
                         @if (@isset($dokumen))
                             @foreach ($dokumen->detail as $detail)
                                 @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan))
@@ -160,7 +194,7 @@
                                 @endif
                             @endforeach
                         @endif
-        @else
+
                         <tr>
                             <td style=" padding: 2px; vertical-align: top;">Terletak di</td>
                             <td style=" padding: 2px; vertical-align: top;">:</td>
@@ -187,7 +221,7 @@
                             <td style=" padding: 2px; vertical-align: top;">{{ $alamat['province_code'] ?? '' }}</td>
                         </tr>
 
-                    @endif
+
                     @include('lpj::component.print-out-dokument')
 
                         @if (isset($forminspeksi['asset']['nomor_nib']))
@@ -202,6 +236,7 @@
                             <td style=" padding: 2px; vertical-align: top;">:</td>
                             <td style=" padding: 2px;">{{ $permohonan->debiture->name ?? '' }}</td>
                         </tr>
+                    @endif
 
                 </table>
             </td>
@@ -209,7 +244,7 @@
     </table>
 
     <div class="no-break">
-
+        @php $mig_detail_legalitas_jaminan = json_decode($inspeksi->mig_detail_legalitas_jaminan, true); @endphp
         <table width="100%">
             <tr>
                 <td style="width: 50%; border: 1px solid #000;">
@@ -217,27 +252,30 @@
                 </td>
 
                 <td style="width: 50%; border: 1px solid #000;">
-                SARANA PELENGKAP DAN LINGKUNGAN
+                    SARANA PELENGKAP DAN LINGKUNGAN --
                 </td>
             </tr>
             <tr>
-
                 <td style="vertical-align: top;">
                     <table style="vertical-align: top;">
                         <tr>
                             @php
-                            $cekHubDebitur = isset($forminspeksi['asset']['hub_cadeb']) &&
+                                $cekHubDebitur =
+                                    isset($forminspeksi['asset']['hub_cadeb']) &&
                                     $forminspeksi['asset']['hub_cadeb'] === 'sesuai'
                                         ? 'sesuai'
                                         : 'tidak sesuai';
 
                                 $hubCadebDebitur = isset($forminspeksi['asset']['hub_cadeb'][$cekHubDebitur])
                                     ? $forminspeksi['asset']['hub_cadeb']['tidak sesuai']
-                                : $forminspeksi['asset']['hub_cadeb']['sesuai'];
+                                    : (isset($forminspeksi['asset']['hub_cadeb']['sesuai']) ? $forminspeksi['asset']['hub_cadeb']['sesuai'] : '');
+
                             @endphp
-                        <td style=" width:49%; padding: 2px; vertical-align: top;">Hubungan Pemilik Jaminan dengan Debitur</td>
+                            <td style=" width:49%; padding: 2px; vertical-align: top;">Hubungan Pemilik Jaminan dengan
+                                Debitur</td>
                             <td style=" width:1%; padding: 2px; vertical-align: top;">:</td>
-                        <td style=" width:50%; padding: 2px; vertical-align: top;">{{ $hubCadebDebitur ?? '' }}</td>
+                            <td style=" width:50%; padding: 2px; vertical-align: top;">{{ $cekHubDebitur =='tidak sesuai' ? 'Lain-lain, ' : '' }} {{ $hubCadebDebitur ?? '' }}
+                            </td>
                         </tr>
                         <tr>
                             @php
@@ -250,9 +288,10 @@
 
                                 $hubCadeb = isset($forminspeksi['asset']['hub_cadeb_penghuni'][$cekHub])
                                     ? $forminspeksi['asset']['hub_cadeb_penghuni']['tidak sesuai']
-                                : $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'];
+                                    : (isset($forminspeksi['asset']['hub_cadeb_penghuni']['sesuai']) ? $forminspeksi['asset']['hub_cadeb_penghuni']['sesuai'] : '');
                             @endphp
-                        <td style=" padding: 2px; vertical-align: top;">Hubungan Penghuni Jaminan dengan Debitur</td>
+                            <td style=" padding: 2px; vertical-align: top;">Hubungan Penghuni Jaminan dengan Debitur
+                            </td>
                             <td style=" padding: 2px; vertical-align: top;">:</td>
                             <td style=" padding: 2px; vertical-align: top;">{{ $hubCadeb ?? '' }}</td>
                         </tr>
@@ -260,6 +299,20 @@
                 </td>
 
                 <td style="width: 50%; vertical-align: top;">
+                    @if ($permohonan->is_mig)
+                    @if(isset($mig_detail_legalitas_jaminan['SARANA PELENGKAP DAN LINGKUNGAN']))
+                        <table>
+                                @foreach ($mig_detail_legalitas_jaminan['SARANA PELENGKAP DAN LINGKUNGAN'] as $item)
+                                    <tr>
+                                        <td style="padding: 2px; vertical-align: top;">{{ $item['label'] }}</td>
+                                        <td style="padding: 2px; vertical-align: top;">:</td>
+                                        <td style="padding: 2px; vertical-align: top;">{{ ltrim($item['value'], ',') }}</td>
+                                    </tr>
+                                @endforeach
+
+                        </table>
+                        @endif
+                    @else
                         <table>
                             @php
                                 $lingkungan = $forminspeksi['lingkungan'];
@@ -270,19 +323,24 @@
                             <tr>
                                 <td style="padding: 2px; vertical-align: top;">Jarak Jalan Utama</td>
                                 <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">{{ $lingkungan['jarak_jalan_utama'] ?? '-' }} m
+                                <td style="padding: 2px; vertical-align: top;">
+                                    {{ $lingkungan['jarak_jalan_utama'] ?? '-' }} m
                                 </td>
                             </tr>
                             <tr>
                                 <td style="padding: 2px; vertical-align: top;">Jalan Lingkungan</td>
                                 <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">{{ $lingkungan['jalan_linkungan'] ?? '-' }} m
+                                <td style="padding: 2px; vertical-align: top;">
+                                    {{ $lingkungan['jalan_linkungan'] ?? '-' }}
+                                    m
                                 </td>
 
                             <tr>
                                 <td style="padding: 2px; vertical-align: top;">Jarak CBD</td>
                                 <td style="padding: 2px; vertical-align: top;">:</td>
-                        <td style="padding: 2px; vertical-align: top;">{{ $lingkungan['jarak_cbd_point'] ?? '-' }} m
+                                <td style="padding: 2px; vertical-align: top;">
+                                    {{ $lingkungan['jarak_cbd_point'] ?? '-' }}
+                                    m
                                     ({{ $lingkungan['nama_cbd_point'] ?? '-' }})</td>
                             </tr>
                             <tr>
@@ -296,7 +354,7 @@
                                 <td style="padding: 2px; vertical-align: top;">:
                                 </td>
                                 <td style="padding: 2px; vertical-align: top;">
-                            {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? $lingkungan['perkerasan_jalan'] ?? ['-']) }}
+                                    {{ implode(', ', $lingkungan['perkerasan_jalan']['perkerasan_jalan'] ?? ($lingkungan['perkerasan_jalan'] ?? ['-'])) }}
                                 </td>
                             </tr>
 
@@ -304,33 +362,33 @@
                             <tr>
                                 <td style="padding: 2px; vertical-align: top;">Lalu Lintas</td>
                                 <td style="padding: 2px; vertical-align: top;">:</td>
-        <td style="padding: 2px; vertical-align: top;">{{
-            $lingkungan['lalu_lintas']
+                                <td style="padding: 2px; vertical-align: top;">
+                                    {{ $lingkungan['lalu_lintas']
                                         ? (is_array($lingkungan['lalu_lintas'])
                                             ? implode(', ', $lingkungan['lalu_lintas'])
                                             : $lingkungan['lalu_lintas'])
-                : '-'
-        }}
+                                        : '-' }}
                                 </td>
                             </tr>
                             <tr>
                                 <td style="padding: 2px; vertical-align: top;">Golongan Masyarakat Sekitar</td>
                                 <td style="padding: 2px; vertical-align: top;">:</td>
-        <td style="padding: 2px; vertical-align: top;">{{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? $lingkungan['gol_mas_sekitar'] ?? ['-']) }}
+                                <td style="padding: 2px; vertical-align: top;">
+                                    {{ implode(', ', $lingkungan['gol_mas_sekitar'] ?? ($lingkungan['gol_mas_sekitar'] ?? ['-'])) }}
                                 </td>
                             </tr>
                             <tr>
                                 <td style="padding: 2px; vertical-align: top;">Tingkat Keramaian</td>
                                 <td style="padding: 2px; vertical-align: top;">:</td>
                                 <td style="padding: 2px; vertical-align: top;">
-            {{ implode(', ', $lingkungan['tingkat_keramaian']['tingkat_keramaian'] ?? $lingkungan['tingkat_keramaian'] ?? ['-']) }}
+                                    {{ implode(', ', $lingkungan['tingkat_keramaian']['tingkat_keramaian'] ?? ($lingkungan['tingkat_keramaian'] ?? ['-'])) }}
                                 </td>
                             </tr>
                             <tr>
                                 <td style="padding: 2px; vertical-align: top;">Terletak di Area</td>
                                 <td style="padding: 2px; vertical-align: top;">:</td>
                                 <td style="padding: 2px; vertical-align: top;">
-                            {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? $lingkungan['terletak_diarea'] ?? ['-']) }}
+                                    {{ implode(', ', $lingkungan['terletak_diarea']['terletak_diarea'] ?? ($lingkungan['terletak_diarea'] ?? ['-'])) }}
                                 </td>
                             </tr>
                             <tr>
@@ -394,11 +452,30 @@
                                 </tr>
                             @endif
                         </table>
+                    @endif
                 </td>
             </tr>
         </table>
     </div>
 
+    @if ($permohonan->is_mig)
+        @if(isset($mig_detail_legalitas_jaminan['ANALISA TANAH DAN BANGUNAN']))
+        <table width="100%">
+            <tr>
+                <td colspan="3" style="border: 1px solid #000;">
+                    ANALISA TANAH DAN BANGUNAN
+                </td>
+            </tr>
+                @foreach ($mig_detail_legalitas_jaminan['ANALISA TANAH DAN BANGUNAN'] as $item)
+                    <tr>
+                        <td style="padding: 2px; vertical-align: top;">{{ $item['label'] }}</td>
+                        <td style="padding: 2px; vertical-align: top;">:</td>
+                        <td style="padding: 2px; vertical-align: top;">{{ ltrim($item['value'], ',') }}</td>
+                    </tr>
+                @endforeach
+        </table>
+         @endif
+    @endif
         @foreach ($permohonan->documents as $dokumen)
             @if ($dokumen->jenisJaminan)
                 @php
@@ -410,17 +487,18 @@
                         $kategoriUnik = array_unique($kategoriArray);
                     @endphp
 
+                    @if(!$permohonan->is_mig)
                         @foreach ($kategoriUnik as $kategori)
-
-                        @if ($kategori !== 'lingkungan')
-                            @include('lpj::penilai.components.analisa.' . str_replace('-', '-', $kategori), [
+                            @include(
+                                'lpj::penilai.components.analisa.' . str_replace('-', '-', $kategori),
+                                    [
                                         'dokumen' => $dokumen,
-                        ])
-                        @endif
-
+                                    ]
+                                )
                         @endforeach
                     @endif
                 @endif
+            @endif
         @endforeach
 
     <div class="no-break">
@@ -431,7 +509,9 @@
                 </td>
             </tr>
         </table>
+        @if(isset($dataPembanding))
             @include('lpj::penilai.components.print-pembanding')
+        @endif
     </div>
     <div class="no-break">
         <table style="width: 100%">
@@ -445,11 +525,12 @@
                 <td style="padding: 8px; width: 100%;">
                     <table style="width: 100%; border-collapse: collapse;">
                         <tr>
-                            <td colspan="3" style="padding: 8px; text-align: left;">
+                            <td colspan="6" style="padding: 8px; text-align: left;">
                                 <strong>a. Total Nilai Pasar Wajar</strong>
                             </td>
                         </tr>
                         @php
+                            $totalNilaiPasarWajar = 0;
                             $labelNilai = [
                                 'bangunan' => 'Luas Bangunan',
                                 'tanah' => 'Luas Tanah',
@@ -465,77 +546,67 @@
                                 unset($labelNilai['tanah']);
                             }
                         @endphp
-                        @foreach ($labelNilai as $key => $label)
-                            @if (isset($lpjData['luas_' . $key]))
-                                <tr>
-                                    <td style="padding: 3px; text-align: right; width:30%; ">
-                                        {{ $label }} {{ $lpjData['luas_' . $key] ?? '' }} m<sup>2</sup>
-                                    </td>
-                                    <td style="padding: 3px; width:30%;">
-                                        <span style="padding-left:20px; padding-right: 20px">X</span> Rp
-                                        {{ $lpjData['nilai_' . $key . '_1'] ?? '' }}
-                                    </td>
-                                    <td style="padding: 3px; text-align: left; width:40%;">
-                                        <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
-                                        {{ $lpjData['nilai_' . $key . '_2'] ?? '' }}
-                                    </td>
-                                </tr>
-                            @endif
-                        @endforeach
+
                         @if (isset($lpjData['npw_tambahan']))
                             @foreach ($lpjData['npw_tambahan'] as $npw)
                                 <tr>
-                                    <td style="padding: 3px; text-align: right;">
-                                        {{ $npw['name'] }} {{ $npw['luas'] }} m<sup>2</sup>
+                                    <td width="30%" style="padding: 3px; text-align: right;">
+                                        {{ $npw['name'] }}</sup>
                                     </td>
-                                    <td style="padding: 3px;">
-                                        <span style="padding-left:20px; padding-right: 20px">X</span> Rp
-                                        {{ $npw['nilai_1'] }}
+                                    <td width="10%" style="padding: 3px; text-align: right;">
+                                        {{ $npw['luas'] }} m<sup>2</sup>
                                     </td>
-                                    <td style="padding: 3px; text-align: left; width:40%">
-                                        <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
-                                        {{ $npw['nilai_2'] }}
+                                    <td width="5%" style="padding: 3px; text-align: center;">X</td>
+                                    <td width="25%"  style="padding: 3px; text-align:right">
+                                        {{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }}
+                                    </td>
+                                    <td width="5"  style="padding: 3px; text-align: center;">
+                                        =
+                                    </td>
+                                    <td  width="25%"  style="padding: 3px; text-align: left; text-align: right;">
+                                        {{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }}
                                     </td>
                                 </tr>
+                                @php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp
                             @endforeach
                         @endif
                         <tr>
-                            <td style="padding: 3px; font-weight: bold; width:30%;">Total Nilai Pasar Wajar</td>
-                            <td style="padding: 3px; text-align: right; font-weight: bold; width:30%"></td>
-                            <td style="padding: 3px; text-align: left; font-weight: bold; width: 40%;">
-                                <span style="padding-left: 20px; padding-right: 20px;">=</span>
+                            <td style="padding: 3px; text-align: right; font-weight: bold; width:10%;" colspan="4">Total Nilai Pasar Wajar</td>
+                            <td style="padding: 3px; text-align: center; width:5%;font-weight: bold;" >=</td>
+                            <td style="padding: 3px; text-align: right; font-weight: bold; width: 40%;">
                                 <div style="display: inline-block; border-top: 1px solid black; padding-top: 3px;">
-                                    Rp {{ $lpjData['total_nilai_pasar_wajar'] ?? '' }}
+                                    {{ $lpjData['total_nilai_pasar_wajar'] ? number_format($lpjData['total_nilai_pasar_wajar'], 0, ',', '.') : number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
                                 </div>
                             </td>
                         </tr>
 
-                        @if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
-
-
                             <tr>
-                            <td colspan="3" style="padding: 8px; text-align: left; font-weight: bold;">
+                                <td colspan="6" style="padding: 8px; text-align: left; font-weight: bold;">
                                     b. Total Nilai Likuidasi
                                 </td>
                             </tr>
                             <tr>
-                            <td style="padding: 3px; text-align: right; width:20%">
-                                {{ $lpjData['likuidasi'] ?? '' }}%
+                                <td style="padding: 3px; text-align: right;" colspan="4">
+                                    {{ $lpjData['likuidasi'] ?? '' }}% <span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar
+                                    Wajar
                                 </td>
-                            <td style="padding: 3px; text-align: left; font-weight: bold; width:40%">
-                                <span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar Wajar
-                            </td>
-                            <td style="padding: 3px; text-align: left; width:40%;">
-                                <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
-                                {{ $lpjData['likuidasi_nilai_2'] ?? '' }}
+                                <td style="padding: 3px; text-align: center; font-weight: bold;">=</td>
+                                <td style="padding: 3px; text-align: right;font-weight: bold;">{{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
                                 </td>
                             </tr>
-                        @endif
                     </table>
                 </td>
             </tr>
         </table>
     </div>
+    @if($permohonan->is_mig)
+        @include(
+            'lpj::penilai.components.analisa.informasi',
+            [
+                'dokumen' => $dokumen,
+            ]
+        )
+    @endif
     <div class="no-break">
         <table style="width: 100%;">
             <tr>
@@ -570,7 +641,7 @@
                     maupun ekstern</td>
             </tr>
             <tr>
-                @include('lpj::penilai.components.signature-approval')
+                @include('lpj::penilai.components.signature-approval',['laporan' => 'sederhana','npw' => $totalNilaiPasarWajar])
             </tr>
         </table>
     </div>

resources/views/penilai/components/print-out-standar.blade.php

@@ -9,6 +9,8 @@
         $dokument = $dokumen;
     }
     $data = rtrim($data, ', ');
+
+     $permohonan_migrasi = json_decode($permohonan->mig_permohonan);
 @endphp
 <main class="content">
     @php
@@ -52,13 +54,19 @@
                         <td style="width: 25%; padding: 2px; vertical-align: top;">Cabang/Pemohon</td>
                         <td style="width: 1%; vertical-align: top;">:</td>
                         <td style="vertical-align: top;  vertical-align: top;">
-                            {{ $permohonan->debiture->branch->name ?? '' }}
+                            {{ $permohonan->branch->name ?? '' }}
                         </td>
                     </tr>
                     <tr>
                         <td style="width: 25%; padding: 2px;">Tujuan Penilai</td>
                         <td style="width: 1%; padding: 2px;">:</td>
                         <td style="vertical-align: top;  padding: 2px;">
+                            {{ $permohonan->tujuanPenilaian->name ?? '' }}</td>
+                    </tr>
+                    <tr>
+                        <td style=" padding: 2px; vertical-align: top;">Fasilitas Kredit</td>
+                        <td style="  padding: 2px; vertical-align: top;">:</td>
+                        <td style="  padding: 2px; vertical-align: top;">
                             {{ $permohonan->jenisFasilitasKredit->name ?? '' }}</td>
                     </tr>
                     <tr>
@@ -77,7 +85,7 @@
                             {{ formatTanggalIndonesia($permohonan->tanggal_permohonan) }}</td>
                     </tr>
                     <tr>
-                        <td style="width: 25%; padding: 2px;">Tanggal Survey</td>
+                        <td style="width: 25%; padding: 2px;">Tanggal Penilaian</td>
                         <td style="vertical-align: top; width: 1%;  padding: 2px;">:</td>
                         <td style="vertical-align: top; width: 79%;">
                             {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) }}
@@ -103,6 +111,13 @@
                 <td style="width: 1%; vertical-align: top;">:</td>
                 <td style="vertical-align: top; ">{{ $permohonan->debiture->name ?? '' }}</td>
             </tr>
+            <tr>
+                        <td>Alamat dan Telpon</td>
+                        <td style="padding: 2px; vertical-align: top;">:</td>
+                        <td style="padding: 2px; vertical-align: top;">
+                            {{ $permohonan->debiture->address ?? '' }} {{ $permohonan->debiture->phone ?? '' }}
+                        </td>
+                    </tr>
             <tr>
                 <td style="width: 25%; padding: 2px; vertical-align: top;">Debitur / Wakil Debitur</td>
                 <td style="width: 1%; vertical-align: top;">:</td>
@@ -137,14 +152,20 @@
                 </td>
             </tr>
         </table>
+
         @if ($permohonan->is_mig == 1)
         <table style="width: 100%; ">
-            @if (@isset($dokumen))
+            @if (isset($dokumen))
+            <tr>
+                        <td width="25%">Jenis Jaminan</td>
+                        <td width="1%">:</td>
+                        <td>{{ $dokumen->jenisJaminan?->name ?? '' }}</td>
+                    </tr>
             @foreach ($dokumen->detail as $detail)
                 @if (!empty($detail->name) && isset($detail->details) && !empty($detail->dokumen_jaminan))
-                    <tr>
+                    <!--<tr>
                         <td width="25%"><strong>{{ $detail->name ?? '' }}</strong></td>
-                    </tr>
+                    </tr>-->
                 @endif
 
                 @if (isset($detail->details) && $detail->name == 'LOKASI JAMINAN')
@@ -200,6 +221,7 @@
     </table>
     {{-- </div> --}}
 
+    @if (!$permohonan->is_mig)
     <div class="no-break">
         <table style="width: 100%; ">
             <tr>
@@ -243,13 +265,45 @@
             </tr>
         </table>
     </div>
+    @endif
 
-
+    @if ($permohonan->is_mig)
+        @php $mig_detail_legalitas_jaminan = json_decode($inspeksi->mig_detail_legalitas_jaminan, true); @endphp
+        @if($mig_detail_legalitas_jaminan)
+            @foreach($mig_detail_legalitas_jaminan as $key => $items)
+            <table width="100%">
+                <tr>
+                    <td colspan="3" style="border: 1px solid #000; text-align: center;">
+                        {{ $key }}
+                    </td>
+                </tr>
+                @php $currentLabel=''; @endphp
+                @foreach ($items as $item)
+                    <tr>
+                        <td style="padding: 2px; vertical-align: top;">
+                            @if ($currentLabel !== $item['label'])
+                            {{ $item['label'] }}
+                            @endif
+                            @php
+                                if ($currentLabel !== $item['label']) {
+                                    $currentLabel = $item['label'];
+                                }
+                            @endphp
+                        </td>
+                        <td style="padding: 2px; vertical-align: top;">:</td>
+                        <td style="padding: 2px; vertical-align: top;">{{ ltrim($item['value'], ',') }}</td>
+                    </tr>
+                @endforeach
+            </table>
+            @endforeach
+        @endif
+    @endif
         @foreach ($permohonan->documents as $dokumen)
             @if ($dokumen->jenisJaminan)
                 @php
                     $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true);
                 @endphp
+                @if(!$permohonan->is_mig)
                 @if (isset($formKategori) && $formKategori)
                     @php
                         $kategoriArray = is_array($formKategori) ? $formKategori : [$formKategori];
@@ -263,6 +317,7 @@
                     @endforeach
                 @endif
                 @endif
+            @endif
         @endforeach
 
     <div class="no-break">
@@ -273,7 +328,9 @@
                 </td>
             </tr>
         </table>
+        @if(isset($dataPembanding))
         @include('lpj::penilai.components.print-pembanding')
+        @endif
     </div>
 
     <div class="no-break">
@@ -284,92 +341,80 @@
                 </td>
             </tr>
         </table>
-        <table>
+        <table style="width: 100%;">
             <tr>
-                <td colspan="3" style=" padding: 8px; text-align: left;">1. Total Nilai Pasar Wajar
+                <td colspan="6" style=" padding: 8px; text-align: left;width:100%">1. Total Nilai Pasar Wajar
                 </td>
             </tr>
             @php
+                $totalNilaiPasarWajar = 0;
                 $labelNilai = [
                     'bangunan' => 'Luas Bangunan',
                     'tanah' => 'Luas Tanah',
                     'apartemen-kantor' => 'Luas Unit',
+                    'apartemen' => 'Luas Unit',
                     'alat-berat' => 'Luas Alat Berat',
                     'mesin' => 'Luas Mesin',
                     'kendaraan' => 'Luas Kendaraan',
                     'pesawat' => 'Luas Pesawat',
                     'kapal' => 'Luas Kapal',
                 ];
-
                 if (strcasecmp($jenisAset, 'RUKO/RUKAN') === 0) {
                     $labelNilai['bangunan'] = 'Luas Unit';
                     unset($labelNilai['tanah']);
                 }
 
+                if (strcasecmp($jenisAset, 'Apartemen') === 0) {
+                    $labelNilai['tanah'] = 'Luas Unit';
+                }
+
             @endphp
-            @foreach ($labelNilai as $key => $label)
-                @if (isset($lpjData['luas_' . $key]))
-                    <tr>
-                        <td style="padding: 3px; text-align: right; width:45%; ">
-                            {{ $label }} {{ $lpjData['luas_' . $key] ?? '' }} m<sup>2</sup>
-                        </td>
-                        <td style="padding: 3px; width:5%;">
-                            <span style="padding-left:20px; padding-right: 20px">X</span> Rp
-                            {{ $lpjData['nilai_' . $key . '_1'] ?? '' }}
-                        </td>
-                        <td style="padding: 3px; text-align: left; width:60%;">
-                            <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
-                            {{ $lpjData['nilai_' . $key . '_2'] ?? '' }}
-                        </td>
-                    </tr>
-                @endif
-            @endforeach
 
             @if (isset($lpjData['npw_tambahan']))
                 @foreach ($lpjData['npw_tambahan'] as $npw)
                     <tr>
-                        <td style="padding: 3px; text-align: right;">
-                            {{ $npw['name'] }} {{ $npw['luas'] }} m<sup>2</sup>
+                        <td width="30%" style="padding: 3px; text-align: right;">
+                            {{ $npw['name'] }}</sup>
                         </td>
-                        <td style="padding: 3px;">
-                            <span style="padding-left:20px; padding-right: 20px">X</span> Rp
-                            {{ $npw['nilai_1'] }}
+                        <td width="10%" style="padding: 3px; text-align: right;">
+                            {{ $npw['luas'] }} m<sup>2</sup>
                         </td>
-                        <td style="padding: 3px; text-align: left; width:70%">
-                            <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
-                            {{ $npw['nilai_2'] }}
+                        <td width="5%" style="padding: 3px; text-align: center;">X</td>
+                        <td width="25%"  style="padding: 3px; text-align:right">
+                            {{ number_format($npw['nilai_1'], 0, ',', '.') ?? '' }}
+                        </td>
+                        <td width="5"  style="padding: 3px; text-align: center;">=</td>
+                        <td  width="25%"  style="padding: 3px; text-align: left; text-align: right;">
+                            {{ number_format($npw['nilai_2'], 0, ',', '.') ?? '' }}
                         </td>
                     </tr>
+                    @php $totalNilaiPasarWajar += $npw['nilai_2']; @endphp
                 @endforeach
             @endif
+
             <tr>
-                <td style="padding: 3px; font-weight: bold; width:10%;">Total Nilai Pasar Wajar</td>
-                <td style="padding: 3px; text-align: right; font-weight: bold; width:10%"></td>
-                <td style="padding: 3px; text-align: left; font-weight: bold; width: 70%;">
-                    <span style="padding-left: 20px; padding-right: 20px;">=</span>
+                <td style="padding: 3px; text-align: right; font-weight: bold; width:10%;" colspan="4">Total Nilai Pasar Wajar</td>
+                <td style="padding: 3px; text-align: center; width:5%;font-weight: bold;" >=</td>
+                <td style="padding: 3px; text-align: right; font-weight: bold; width: 40%;">
                     <div style="display: inline-block; border-top: 1px solid black; padding-top: 3px;">
-                        Rp {{ $lpjData['total_nilai_pasar_wajar'] ?? '' }}
+                        {{ $lpjData['total_nilai_pasar_wajar'] ? number_format($lpjData['total_nilai_pasar_wajar'], 0, ',', '.') : number_format($totalNilaiPasarWajar, 0, ',', '.') ?? '' }}
                     </div>
                 </td>
             </tr>
 
             <!-- Total Nilai Likuidasi -->
-            @if (isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
+            @if (isset($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi) || isset($lpjData['likuidasi']) && $lpjData['likuidasi_nilai_2'] > 0)
             <tr>
-                <td colspan="3" style="padding: 8px; text-align: left">
+                <td colspan="6" style="padding: 8px; text-align: left">
                     2. Total Nilai Likuidasi
                 </td>
             </tr>
             <tr>
-                <td style="padding: 3px; text-align: right; width:10%">
-                    {{ $lpjData['likuidasi'] ?? '' }}%
+                <td style="padding: 3px; text-align: right;" colspan="4">
+                    {{ $lpjData['likuidasi'] ?? '' }}% <span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar Wajar
                 </td>
-                <td style="padding: 3px; text-align: left; font-weight: bold; width:10%">
-                    <span style="padding-left:20px; padding-right: 20px">X</span> Total Nilai Pasar Wajar
-                </td>
-                <td style="padding: 3px; text-align: left; width:70%;">
-                    <span style="padding-left:20px; padding-right: 20px"> = </span> Rp
-                    {{ $lpjData['likuidasi_nilai_2'] ?? '' }}
+                <td style="padding: 3px; text-align: center; font-weight: bold;">=</td>
+                <td style="padding: 3px; text-align: right;font-weight: bold;">{{ number_format($permohonan_migrasi->mig_mst_lpj_tot_nilai_likuidasi, 0, ',', '.') ?? '' }}
                 </td>
             </tr>
             @endif
@@ -381,6 +426,136 @@
             $keterangan = implode(', ', array_filter($keterangan));
         }
     @endphp
+    @if($permohonan->is_mig)
+        @if (!empty($forminspeksi['fakta']['fakta_positif']))
+            <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; border: 1px solid #000; text-align: center;">
+                            FAKTOR POSITIF
+                        </td>
+                    </tr>
+                </table>
+            @foreach ($forminspeksi['fakta']['fakta_positif'] as $key => $item)
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; text-align: left;">
+                            @if (is_array($item))
+                                @foreach ($item as $data_)
+                                    {!! nl2br(e($data_)) !!}<br>
+                                @endforeach
+                            @else
+                                {!! nl2br(e($item)) !!}
+                            @endif
+                        </td>
+                    </tr>
+                </table>
+            @endforeach
+        @endif
+        @if (!empty($forminspeksi['fakta']['fakta_negatif']))
+            <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; border: 1px solid #000; text-align: center;">
+                            FAKTOR NEGATIF
+                        </td>
+                    </tr>
+                </table>
+            @foreach ($forminspeksi['fakta']['fakta_negatif'] as $key => $item)
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; text-align: left;">
+                            @if (is_array($item))
+                                @foreach ($item as $data_)
+                                    {!! nl2br(e($data_)) !!}<br>
+                                @endforeach
+                            @else
+                                {!! nl2br(e($item)) !!}
+                            @endif
+                        </td>
+                    </tr>
+                </table>
+            @endforeach
+        @endif
+        @if (!empty($forminspeksi['fakta']['informasi_dokument']))
+            <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; border: 1px solid #000; text-align: center;">
+                            LAIN - LAIN
+                        </td>
+                    </tr>
+                </table>
+            @foreach ($forminspeksi['fakta']['informasi_dokument'] as $key => $item)
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; text-align: left;">
+                            @if (is_array($item))
+                                @foreach ($item as $data_)
+                                    {!! nl2br(e($data_)) !!}<br>
+                                @endforeach
+                            @else
+                                {!! nl2br(e($item)) !!}
+                            @endif
+                        </td>
+                    </tr>
+                </table>
+            @endforeach
+
+        @endif
+
+        @if (!empty($forminspeksi['fakta']['keterangan']))
+            @foreach ($forminspeksi['fakta']['keterangan'] as $key => $item)
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; border: 1px solid #000; text-align: center;">
+                            {{ $key }}
+                        </td>
+                    </tr>
+                </table>
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; text-align: left;">
+                            @if (is_array($item))
+                                @foreach ($item as $data_)
+                                    {!! nl2br(e($data_)) !!}<br>
+                                @endforeach
+                            @else
+                                {!! nl2br(e($item)) !!}
+                            @endif
+                        </td>
+                    </tr>
+                </table>
+            @endforeach
+        @endif
+
+        @if (!empty($forminspeksi['fakta']['saran']))
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; border: 1px solid #000; text-align: center;">
+                            SARAN
+                        </td>
+                    </tr>
+                </table>
+            @foreach ($forminspeksi['fakta']['saran'] as $key => $item)
+                <table class="judul"  style="width: 100%; ">
+                    <tr>
+                        <td style="width: 100%; text-align: left;">
+                            <ul style="margin: 0px;padding-left: 10px;">
+                                <li>
+                                    @if (is_array($item))
+                                        @foreach ($item as $data_)
+                                            {!! nl2br(e($data_)) !!}<br>
+                                        @endforeach
+                                    @else
+                                        {!! nl2br(e($item)) !!}
+                                    @endif
+                                </li>
+                            </ul>
+                        </td>
+                    </tr>
+                </table>
+            @endforeach
+        @endif
+    @endif
+
     @if (!empty($keterangan))
         <table style="width: 100%  margin-top: 20px">
             <tr>
@@ -395,7 +570,7 @@
             </tr>
         </table>
     @endif
-    <div class="no-break">
+    <div class="no-break" style="margin-top:20px;">
         <table style="width: 100%">
             <tr>
                 <td>Demikian laporan penilai jaminan ini di buat secara objektif, tanpa adanya pengaruh baik intern
@@ -403,7 +578,7 @@
             </tr>
         </table>
 
-        @include('lpj::penilai.components.signature-approval')
+        @include('lpj::penilai.components.signature-approval',['laporan' => 'standar','npw' => $totalNilaiPasarWajar])
     </div>
     <hr />
     <table style="width: 100%; ">

resources/views/penilai/components/print-pembanding.blade.php

@@ -41,7 +41,7 @@
                         <td style="width: 33%; vertical-align: top;">Keterangan</td>
                         <td style="width: 5%; vertical-align: top;">:</td>
                         <td style="width: 62%;">
-                            {{isset($data['keterangan']) ? parsePembandingMigration($data['keterangan']) : '' }}
+{!! isset($data['keterangan']) ? nl2br(e(parsePembandingMigration($data['keterangan']))) : '' !!}
                         </td>
                     </tr>
                     @else

resources/views/penilai/components/print-resume.blade.php

@@ -95,7 +95,7 @@
             <td>{{ $alamat['province_code'] ?? '' }}</td>
         </tr>
         <tr>
-            <td>Tanggal Survey</td>
+            <td>Tanggal Penilaian</td>
             <td>:</td>
             <td>{{ isset($permohonan->penilaian->tanggal_kunjungan) ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '' }}
             </td>

resources/views/penilai/components/signature-approval.blade.php

@@ -1,21 +1,29 @@
-<table style="width: 100%; border-collapse: collapse; text-align: center;">
+<table style="width: 100%; border-collapse: collapse; text-align: center;" border="1">
             @php
                 use Modules\Usermanagement\Models\User;
 
-                $penilaiUser = User::where('id', $penilai->userPenilaiTeam->id)->first();
-                $imagePathPenilai = storage_path(
-                    'app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign,
-                );
+                $laporan = $laporan ?? '';
+                $penilaiUser = isset($penilai->userPenilaiTeam) ? $penilai->userPenilaiTeam : null;
+                $imagePathPenilai = $penilaiUser && $penilaiUser->sign
+                    ? storage_path('app/public/signatures/' . $penilaiUser->id . '/' . $penilaiUser->sign)
+                    : null;
+
+                $soUser = $permohonan->approval_so ? User::find($permohonan->approval_so) : null;
+                $imagePathSo = $soUser && $soUser->sign
+                    ? storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign)
+                    : null;
+
+                $eoUser = $permohonan->approval_eo ? User::find($permohonan->approval_eo) : null;
+                $imagePathEO = $eoUser && $eoUser->sign
+                    ? storage_path('app/public/signatures/' . $eoUser->id . '/' . $eoUser->sign)
+                    : null;
+
+                $ddUser = $permohonan->approval_dd ? User::find($permohonan->approval_dd) : null;
+                $imagePathDD = $ddUser && $ddUser->sign
+                    ? storage_path('app/public/signatures/' . $ddUser->id . '/' . $ddUser->sign)
+                    : null;
 
-                $soUser = User::where('id', $senior_officer->id)->first();
-                $imagePathSo = storage_path('app/public/signatures/' . $soUser->id . '/' . $soUser->sign);
 
-                $imagePathEO = storage_path(
-                    'app/public/signatures/' .
-                        User::role('EO Appraisal')->first()->id .
-                        '/' .
-                        User::role('EO Appraisal')->first()->sign,
-                );
 
                 $imagePathDD = storage_path(
                     'app/public/signatures/' .
@@ -25,48 +33,112 @@
                 );
             @endphp
             <tr>
-                <td style=" padding: 4px;height: 50px">
+                <td style=" padding: 4px;height: 25px">
+                    <b>Penilaian Dibuat</b>
+                </td>
+                @if($soUser->name==$eoUser->name)
+                    @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;height: 25px">
+                            <b>Diperiksa dan Menyetujui</b>
+                        </td>
+                    @endif
+                @else
+                    @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;height: 25px">
+                            <b>Diperiksa</b>
+                        </td>
+                    @endif
+
+                    @if ($permohonan->approval_eo != null)
+                        <td style=" padding: 4px;height: 25px">
+                            <b>Menyetujui</b>
+                        </td>
+                    @endif
+                @endif
+
+                @if($permohonan->approval_dd!==$permohonan->approval_eo)
+                    @if ($permohonan->approval_dd != null)
+                        <td style=" padding: 4px;height: 25px">
+                            <b>Menyetujui</b>
+                        </td>
+                    @endif
+                @endif
+            </tr>
+
+            <tr>
+                <td style=" padding: 4px;height: 75px">
                     @if (file_exists($imagePathPenilai))
                         <img src="{{ $imagePathPenilai }}" alt="{{ $imagePathPenilai }}" width="80px">
                     @endif
                 </td>
+                @if($soUser->name==$eoUser->name)
                     @if ($permohonan->approval_so != null)
-                    <td style=" padding: 4px;height: 50px">
+                        <td style=" padding: 4px;height: 75px">
+                            @if (file_exists($imagePathSo))
+                                <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
+                            @endif
+                        </td>
+                    @endif
+                @else
+                    @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;height: 75px">
                             @if (file_exists($imagePathSo))
                                 <img src="{{ $imagePathSo }}" alt="{{ $imagePathSo }}" width="80px">
                             @endif
                         </td>
                     @endif
                     @if ($permohonan->approval_eo != null)
-                    <td style=" padding: 4px;height: 50px">
+                        <td style=" padding: 4px;height: 75px">
                             @if (file_exists($imagePathEO))
                                 <img src="{{ $imagePathEO }}" alt="{{ $imagePathEO }}" width="80px">
                             @endif
                         </td>
                     @endif
+                @endif
+                @if($permohonan->approval_dd!==$permohonan->approval_eo)
                     @if ($permohonan->approval_dd != null)
-                    <td style=" padding: 4px;height: 50px">
+                        <td style=" padding: 4px;height: 75px">
                             @if (file_exists($imagePathDD))
                                 <img src="{{ $imagePathDD }}" alt="{{ $imagePathDD }}" width="80px">
                             @endif
                         </td>
                     @endif
+                @endif
             </tr>
             <tr>
                 <td style=" padding: 4px;">{{ $penilai->userPenilaiTeam->name ?? '' }}</br>
                     <span>
-                        {{ ucwords(strtolower('PENILAI')) }}
+                        <b>{{ ucwords(strtolower('PENILAI')) }}</b>
                     </span>
                 </br>
                     <span>
-                        {{ isset($penilai->updated_at) ? formatTanggalIndonesia($penilai->updated_at) : '' }}
+                        {{ $permohonan_migrasi->mig_mst_jaminan_tgl_laporan ? formatTanggalIndonesia(parseTimestamp($permohonan_migrasi->mig_mst_jaminan_tgl_laporan)) : ($permohonan_migrasi->mig_mst_lpj_tgl_laporan ? formatTanggalIndonesia(parseTimestamp($permohonan_migrasi->mig_mst_lpj_tgl_laporan)) : '') }}
                     </span>
                 </td>
+
+                @if($soUser->name==$eoUser->name)
                     @if ($permohonan->approval_so != null)
                         <td style=" padding: 4px;">
-                        {{ $senior_officer->name ?? '' }}</br>
+                            {{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
                             <span>
-                            {{ ucwords(strtolower('SENIOR OFFICER')) }}
+                                @if($npw > 1000000000 && $npw < 5000000000)
+                                    <b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
+                                @else
+                                    <b>{{ ucwords(strtolower('SENIOR OFFICER')) }}</b>
+                                @endif
+                            </span>
+                            </br>
+                            <span>
+                                {{ isset($permohonan->approval_so_at) ? formatTanggalIndonesia($permohonan->approval_so_at) : '' }}
+                            </span>
+                        </td>
+                    @endif
+                @else
+                    @if ($permohonan->approval_so != null)
+                        <td style=" padding: 4px;">
+                            {{ $soUser->name ?? $senior_officer->name ?? '' }}</br>
+                            <span>
+                                <b>{{ ucwords(strtolower('SENIOR OFFICER')) }}</b>
                             </span>
                             </br>
                             <span>
@@ -77,9 +149,9 @@
 
                     @if ($permohonan->approval_eo != null)
                         <td style=" padding: 4px;">
-                        {{ User::role('EO Appraisal')->first()->name ?? '' }}</br>
+                            {{ $eoUser->name ?? User::role('EO Appraisal')->first()->name ?? '' }}</br>
                             <span>
-                            {{ ucwords(strtolower('EXECUTIVE OFFICER')) }}
+                                <b>{{ ucwords(strtolower('EXECUTIVE OFFICER')) }}</b>
                             </span>
                         </br>
                             <span>
@@ -87,11 +159,13 @@
                             </span>
                         </td>
                     @endif
+                @endif
+                @if($permohonan->approval_dd!==$permohonan->approval_eo)
                     @if ($permohonan->approval_dd != null)
                         <td style=" padding: 4px;">
-                        {{ User::role('DD Appraisal')->first()->name ?? '' }}</br>
+                            {{ $ddUser->name ?? User::role('DD Appraisal')->first()->name ?? '' }}</br>
                             <span>
-                            {{ ucwords(strtolower('DEPUTY DIRECTOR')) }}
+                                <b>{{ ucwords(strtolower('DEPUTY DIRECTOR')) }}</b>
                             </span>
                             </br>
                             <span>
@@ -101,5 +175,6 @@
                             </span>
                         </td>
                     @endif
+                @endif
             </tr>
         </table>

resources/views/penilai/index.blade.php

@@ -65,7 +65,7 @@
                                         <span class="sort-icon"> </span> </span>
                                 </th>
                                 <th class="min-w-[150px]" data-datatable-column="tanggal_survei">
-                                    <span class="sort"> <span class="sort-label"> Tanggal Survei </span>
+                                    <span class="sort"> <span class="sort-label"> Tanggal Penilaian </span>
                                         <span class="sort-icon"> </span> </span>
                                 </th>
                                 <th class="min-w-[150px]" data-datatable-column="due_date_sla">
@@ -183,7 +183,7 @@
                     },
                 },
                 tanggal_survei: {
-                    title: 'Tanggal Survei',
+                    title: 'Tanggal Penilaian',
                     render: (item, data) => {
                         if (data.penilaian.waktu_penilaian) {
                             return `${formatDate(new Date(data.penilaian.waktu_penilaian))}`;

resources/views/penilai/show.blade.php

@@ -95,7 +95,6 @@
                             {{ formatTanggalIndonesia($permohonan->penilaian->waktu_penilaian) ?? '' }}</p>
                     </div>
                     @if (!in_array(strtolower($permohonan->tujuanPenilaian->name), ['penilaian ulang', 'asuransi', 'lelang']))
-
                         <label class="form-label max-w-56 ">
                             Status Bayar
                         </label>
@@ -105,7 +104,6 @@
                                 {{ str_replace('_', ' ', $permohonan->status_bayar) }}
                             </span>
                         </div>
-
                     @endif
                 </div>
             </div>
@@ -164,7 +162,7 @@
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
-                            Tanggal Survei
+                            Tanggal Penilaian
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <p class="flex w-full text-gray-600 font-medium text-sm">
@@ -321,7 +319,7 @@
                                 </div>
                             </div>
 
-                        {{-- @if($permohonan->jenisPenilaian->name=="Eksternal")
+                            {{-- @if ($permohonan->jenisPenilaian->name == 'Eksternal')
                             @if (isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
                                 <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
                                     <button class="dropdown-toggle btn btn-primary">
@@ -429,7 +427,6 @@
 
                         // Ambil ID inspeksi pertama (jika ada)
 
-
                         // Ambil jenis jaminan jika ada
                         if ($firstDocument->jenisjaminan) {
                             $jenisJaminanId = $firstDocument->jenisjaminan->id;

routes/breadcrumbs.php

@@ -673,6 +673,10 @@ Breadcrumbs::for('noc', function (BreadcrumbTrail $trail) {
     $trail->push('NOC', route('noc.index'));
 });
 
+Breadcrumbs::for('noc.show', function (BreadcrumbTrail $trail) {
+    $trail->push('NOC', route('noc.index'));
+});
+
 Breadcrumbs::for('noc.pembayaran', function (BreadcrumbTrail $trail) {
     $trail->push('NOC Pembayaran', route('noc.pembayaran.index'));
 });

routes/web.php

@@ -748,6 +748,7 @@ Route::middleware(['auth'])->group(function () {
     // laporan user
     Route::prefix('laporan-user')->name('laporan-user.')->group(function () {
         Route::get('/', [LaporanUserController::class, 'index'])->name('index');
+        Route::get('export', [LaporanUserController::class, 'export'])->name('export');
         Route::get('api/user-pemohon', [LaporanUserController::class, 'searchUserPemohon'])->name('api.user-pemohon');
         Route::get('datatables', [LaporanUserController::class, 'dataTableForUserPemohon'])->name('datatables');
     });