Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into andydev

app/Http/Controllers/DokumenJaminanController.php

@@ -79,6 +79,7 @@
                                 'jenis_legalitas_jaminan_id' => $value,
                                 'name'                       => $request->name[$key],
                                 'keterangan'                 => $request->keterangan[$key],
+                                'details'                    => isset($request->custom_field[$key]) ? json_encode($request->custom_field[$key]) : ''
                             ];
 
                             $dokumenJaminan = [];
@@ -234,6 +235,7 @@
                                 'jenis_legalitas_jaminan_id' => $value,
                                 'name'                       => $request->name[$key],
                                 'keterangan'                 => $request->keterangan[$key],
+                                'details'                    => isset($request->custom_field[$key]) ? json_encode($request->custom_field[$key]) : ''
                             ];
 
                             $dokumenJaminan = [];
@@ -392,6 +394,7 @@
 
             if ($zip->open($zipFilePath, ZipArchive::CREATE) === true) {
                 foreach ($documents as $document) {
+                    if($document->dokumen_jaminan) {
                         $files = is_array(json_decode($document->dokumen_jaminan)) ? json_decode(
                             $document->dokumen_jaminan,
                         ) : [$document->dokumen_jaminan];
@@ -406,6 +409,7 @@
                             }
                         }
                     }
+                }
                 $zip->close();
 
                 if (!file_exists($zipFilePath)) {
@@ -468,6 +472,9 @@
                                 'dokumen_jaminan'            => json_decode(
                                         $detail->dokumen_jaminan,
                                     ) ?? $detail->dokumen_jaminan,
+                                'dokumen_nomor'            => json_decode(
+                                        $detail->dokumen_nomor,
+                                    ) ?? $detail->dokumen_nomor,
                                 'custom_field'               => $detail->jenisLegalitasJaminan->custom_field,
                                 'custom_field_type'          => $detail->jenisLegalitasJaminan->custom_field_type,
                                 'details'                    => $detail->details,
@@ -486,6 +493,7 @@
                         'jenis_legalitas_jaminan_id' => $legalitas->id,
                         'name'                       => $legalitas->name,
                         'dokumen_jaminan'            => null,
+                        'dokumen_nomor'            => null,
                         'custom_field'               => $legalitas->custom_field,
                         'custom_field_type'          => $legalitas->custom_field_type,
                         'details'                    => null,

app/Http/Controllers/KJPPController.php

@@ -5,8 +5,6 @@ namespace Modules\Lpj\Http\Controllers;
 use Throwable;
 use Illuminate\Http\Request;
 use Modules\Lpj\Models\KJPP;
-use Illuminate\Http\Response;
-use Modules\Lpj\Models\Branch;
 use Modules\Location\Models\City;
 use Modules\Lpj\Models\IjinUsaha;
 use Modules\Lpj\Exports\KJPPExport;
@@ -58,6 +56,79 @@ class KJPPController extends Controller
         $validated = $request->validated();
 
         if ($validated) {
+            $detailEmailKantor = [];
+            $detailNamaPicReviewer = [];
+            $detailNomorHpPicReviewer = [];
+            $detailNamaPicAdmin = [];
+            $detailNomorHpPicAdmin = [];
+            $detailNamaPicMarketing = [];
+            $detailNomorHpPicMarketing = [];
+
+            $emailKantor = $request->input('detail_email_kantor.email_kantor', []);
+            $namaPicReviewer = $request->input('detail_nama_pic_reviewer.nama_pic_reviewer', []);
+            $nomorHpPicReviewer = $request->input('detail_nomor_hp_pic_reviewer.nomor_hp_pic_reviewer', []);
+            $namaPicAdmin = $request->input('detail_nama_pic_admin.nama_pic_admin', []);
+            $nomorHpPicAdmin = $request->input('detail_nomor_hp_pic_admin.nomor_hp_pic_admin', []);
+            $namaPicMarketing = $request->input('detail_nama_pic_marketing.nama_pic_marketing', []);
+            $nomorHpPicMarketing = $request->input('detail_nomor_hp_pic_marketing.nomor_hp_pic_marketing', []);
+
+            foreach ($emailKantor as $value) {
+                $detailEmailKantor[] = [
+                    'email_kantor' => $value
+                ];
+            }
+            // Encode to JSON and store
+            $detailEmailKantorJson = json_encode($detailEmailKantor);
+
+            // Process detail_nama_pic_reviewer
+            foreach ($namaPicReviewer as $value) {
+                $detailNamaPicReviewer[] = [
+                    'nama_pic_reviewer' => $value
+                ];
+            }
+            $detailNamaPicReviewerJson = json_encode($detailNamaPicReviewer);
+
+            // Process detail_nomor_hp_pic_reviewer
+            foreach ($nomorHpPicReviewer as $value) {
+                $detailNomorHpPicReviewer[] = [
+                    'nomor_hp_pic_reviewer' => $value
+                ];
+            }
+            $detailNomorHpPicReviewerJson = json_encode($detailNomorHpPicReviewer);
+
+            // Process detail_nama_pic_admin
+            foreach ($namaPicAdmin as $value) {
+                $detailNamaPicAdmin[] = [
+                    'nama_pic_admin' => $value
+                ];
+            }
+            $detailNamaPicAdminJson = json_encode($detailNamaPicAdmin);
+
+            // Process detail_nomor_hp_pic_admin
+            foreach ($nomorHpPicAdmin as $value) {
+                $detailNomorHpPicAdmin[] = [
+                    'nomor_hp_pic_admin' => $value
+                ];
+            }
+            $detailNomorHpPicAdminJson = json_encode($detailNomorHpPicAdmin);
+
+            // Process detail_nama_pic_marketing
+            foreach ($namaPicMarketing as $value) {
+                $detailNamaPicMarketing[] = [
+                    'nama_pic_marketing' => $value
+                ];
+            }
+            $detailNamaPicMarketingJson = json_encode($detailNamaPicMarketing);
+
+            // Process detail_nomor_hp_pic_marketing
+            foreach ($nomorHpPicMarketing as $value) {
+                $detailNomorHpPicMarketing[] = [
+                    'nomor_hp_pic_marketing' => $value
+                ];
+            }
+            $detailNomorHpPicMarketingJson = json_encode($detailNomorHpPicMarketing);
+
+
             $file = $request->file('attachment');
             $filename = $file ? time() . '.' . $file->getClientOriginalExtension() : 'default.pdf';
 
@@ -69,12 +140,20 @@ class KJPPController extends Controller
                 Storage::copy('public/test/default.pdf', 'public/uploads_pdf/' . $filename);
             }
 
-            $validated['ijin_usaha_id'] = json_encode($request->input('ijin_usaha_id'));
-            $validated['jenis_aset_id'] = json_encode($request->input('jenis_aset_id'));
-
+            $validated['detail_email_kantor'] = $detailEmailKantorJson;
+            $validated['detail_nama_pic_reviewer'] = $detailNamaPicReviewerJson;
+            $validated['detail_nomor_hp_pic_reviewer'] = $detailNomorHpPicReviewerJson;
+            $validated['detail_nama_pic_admin'] = $detailNamaPicAdminJson;
+            $validated['detail_nomor_hp_pic_admin'] = $detailNomorHpPicAdminJson;
+            $validated['detail_nama_pic_marketing'] = $detailNamaPicMarketingJson;
+            $validated['detail_nomor_hp_pic_marketing'] = $detailNomorHpPicMarketingJson;
+            $validated['ijin_usaha_id'] = json_encode($validated['ijin_usaha_id']);
+            $validated['jenis_aset_id'] = json_encode($validated['jenis_aset_id']);
             // Tambahkan nama file ke data yang divalidasi
             $validated['attachment'] = $filename;
 
+            // dd($validated);
+
             // Simpan data ke database
             KJPP::create($validated);
 
@@ -101,8 +180,36 @@ class KJPPController extends Controller
         $cities = City::where('code', $kjpp->city_code)->get();
         $districts = District::where('code', $kjpp->district_code)->get();
         $villages  = Village::where('code', $kjpp->village_code)->get();
-        // dd($branches);
-        return view('lpj::kjpp.show', compact('jenis_jaminan', 'ijin_usahas', 'ijin_usaha', 'kjpp', 'provinces', 'cities', 'districts', 'villages'));
+        $detailEmailKantor = json_decode($kjpp->detail_email_kantor);
+        $detailNamaPicReviewer = json_decode($kjpp->detail_nama_pic_reviewer);
+        $detailNomorHpPicReviewer = json_decode($kjpp->detail_nomor_hp_pic_reviewer);
+        $detailNamaPicAdmin = json_decode($kjpp->detail_nama_pic_admin);
+        $detailNomorHpPicAdmin = json_decode($kjpp->detail_nomor_hp_pic_admin);
+        $detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing);
+        $detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing);
+
+        $detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_reviewer' => $nama->nama_pic_reviewer,
+                'nomor_hp_pic_reviewer' => $nomor->nomor_hp_pic_reviewer
+            ];
+        }, $detailNamaPicReviewer, $detailNomorHpPicReviewer));
+
+        $detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_admin' => $nama->nama_pic_admin,
+                'nomor_hp_pic_admin' => $nomor->nomor_hp_pic_admin
+            ];
+        }, $detailNamaPicAdmin, $detailNomorHpPicAdmin));
+
+        $detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_marketing' => $nama->nama_pic_marketing,
+                'nomor_hp_pic_marketing' => $nomor->nomor_hp_pic_marketing
+            ];
+        }, $detailNamaPicMarketing, $detailNomorHpPicMarketing));
+
+        return view('lpj::kjpp.show', compact('jenis_jaminan', 'ijin_usahas', 'ijin_usaha', 'kjpp', 'provinces', 'cities', 'districts', 'villages', 'detailEmailKantor', 'detailJoinPicReviewer', 'detailJoinPicAdmin', 'detailJoinPicMarketing'));
     }
 
     /**
@@ -117,8 +224,36 @@ class KJPPController extends Controller
         $cities = City::where('province_code', $kjpp->province_code)->get();
         $districts = District::where('city_code', $kjpp->city_code)->get();
         $villages  = Village::where('district_code', $kjpp->district_code)->get();
+        $detailEmailKantor = json_decode($kjpp->detail_email_kantor);
+        $detailNamaPicReviewer = json_decode($kjpp->detail_nama_pic_reviewer);
+        $detailNomorHpPicReviewer = json_decode($kjpp->detail_nomor_hp_pic_reviewer);
+        $detailNamaPicAdmin = json_decode($kjpp->detail_nama_pic_admin);
+        $detailNomorHpPicAdmin = json_decode($kjpp->detail_nomor_hp_pic_admin);
+        $detailNamaPicMarketing = json_decode($kjpp->detail_nama_pic_marketing);
+        $detailNomorHpPicMarketing = json_decode($kjpp->detail_nomor_hp_pic_marketing);
 
-        return view('lpj::kjpp.create', compact('kjpp', 'ijin_usaha', 'jenis_aset', 'provinces', 'cities', 'districts', 'villages'));
+        $detailJoinPicReviewer = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_reviewer' => $nama->nama_pic_reviewer,
+                'nomor_hp_pic_reviewer' => $nomor->nomor_hp_pic_reviewer
+            ];
+        }, $detailNamaPicReviewer, $detailNomorHpPicReviewer));
+
+        $detailJoinPicAdmin = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_admin' => $nama->nama_pic_admin,
+                'nomor_hp_pic_admin' => $nomor->nomor_hp_pic_admin
+            ];
+        }, $detailNamaPicAdmin, $detailNomorHpPicAdmin));
+
+        $detailJoinPicMarketing = json_encode(array_map(function ($nama, $nomor) {
+            return [
+                'nama_pic_marketing' => $nama->nama_pic_marketing,
+                'nomor_hp_pic_marketing' => $nomor->nomor_hp_pic_marketing
+            ];
+        }, $detailNamaPicMarketing, $detailNomorHpPicMarketing));
+
+        return view('lpj::kjpp.create', compact('kjpp', 'ijin_usaha', 'jenis_aset', 'provinces', 'cities', 'districts', 'villages', 'detailJoinPicReviewer', 'detailJoinPicAdmin', 'detailJoinPicMarketing', 'detailEmailKantor'));
     }
 
     /**
@@ -128,7 +263,82 @@ class KJPPController extends Controller
     {
         $validated = $request->validated();
 
+        // dd($validated);
+
         if ($validated) {
+            $detailEmailKantor = [];
+            $detailNamaPicReviewer = [];
+            $detailNomorHpPicReviewer = [];
+            $detailNamaPicAdmin = [];
+            $detailNomorHpPicAdmin = [];
+            $detailNamaPicMarketing = [];
+            $detailNomorHpPicMarketing = [];
+
+            $emailKantor = $request->input('detail_email_kantor.email_kantor', []);
+            $namaPicReviewer = $request->input('detail_nama_pic_reviewer.nama_pic_reviewer', []);
+            $nomorHpPicReviewer = $request->input('detail_nomor_hp_pic_reviewer.nomor_hp_pic_reviewer', []);
+            $namaPicAdmin = $request->input('detail_nama_pic_admin.nama_pic_admin', []);
+            $nomorHpPicAdmin = $request->input('detail_nomor_hp_pic_admin.nomor_hp_pic_admin', []);
+            $namaPicMarketing = $request->input('detail_nama_pic_marketing.nama_pic_marketing', []);
+            $nomorHpPicMarketing = $request->input('detail_nomor_hp_pic_marketing.nomor_hp_pic_marketing', []);
+
+            foreach ($emailKantor as $value) {
+                $detailEmailKantor[] = [
+                    'email_kantor' => $value
+                ];
+            }
+            // Encode to JSON and store
+            $detailEmailKantorJson = json_encode($detailEmailKantor);
+
+            // Process detail_nama_pic_reviewer
+            foreach ($namaPicReviewer as $value) {
+                $detailNamaPicReviewer[] = [
+                    'nama_pic_reviewer' => $value
+                ];
+            }
+            $detailNamaPicReviewerJson = json_encode($detailNamaPicReviewer);
+
+            // Process detail_nomor_hp_pic_reviewer
+            foreach ($nomorHpPicReviewer as $value) {
+                $detailNomorHpPicReviewer[] = [
+                    'nomor_hp_pic_reviewer' => $value
+                ];
+            }
+            $detailNomorHpPicReviewerJson = json_encode($detailNomorHpPicReviewer);
+
+            // Process detail_nama_pic_admin
+            foreach ($namaPicAdmin as $value) {
+                $detailNamaPicAdmin[] = [
+                    'nama_pic_admin' => $value
+                ];
+            }
+            $detailNamaPicAdminJson = json_encode($detailNamaPicAdmin);
+
+            // Process detail_nomor_hp_pic_admin
+            foreach ($nomorHpPicAdmin as $value) {
+                $detailNomorHpPicAdmin[] = [
+                    'nomor_hp_pic_admin' => $value
+                ];
+            }
+            $detailNomorHpPicAdminJson = json_encode($detailNomorHpPicAdmin);
+
+            // Process detail_nama_pic_marketing
+            foreach ($namaPicMarketing as $value) {
+                $detailNamaPicMarketing[] = [
+                    'nama_pic_marketing' => $value
+                ];
+            }
+            $detailNamaPicMarketingJson = json_encode($detailNamaPicMarketing);
+
+            // Process detail_nomor_hp_pic_marketing
+            foreach ($nomorHpPicMarketing as $value) {
+                $detailNomorHpPicMarketing[] = [
+                    'nomor_hp_pic_marketing' => $value
+                ];
+            }
+            $detailNomorHpPicMarketingJson = json_encode($detailNomorHpPicMarketing);
+
+
             $file = $request->file('attachment');
             $filename = $file ? time() . '.' . $file->getClientOriginalExtension() : null;
 
@@ -148,6 +358,16 @@ class KJPPController extends Controller
                 $validated['attachment'] = $kjpp->attachment ?? 'default.pdf';
             }
 
+            $validated['detail_email_kantor'] = $detailEmailKantorJson;
+            $validated['detail_nama_pic_reviewer'] = $detailNamaPicReviewerJson;
+            $validated['detail_nomor_hp_pic_reviewer'] = $detailNomorHpPicReviewerJson;
+            $validated['detail_nama_pic_admin'] = $detailNamaPicAdminJson;
+            $validated['detail_nomor_hp_pic_admin'] = $detailNomorHpPicAdminJson;
+            $validated['detail_nama_pic_marketing'] = $detailNamaPicMarketingJson;
+            $validated['detail_nomor_hp_pic_marketing'] = $detailNomorHpPicMarketingJson;
+            $validated['ijin_usaha_id'] = json_encode($validated['ijin_usaha_id']);
+            $validated['jenis_aset_id'] = json_encode($validated['jenis_aset_id']);
+
             // Perbarui data di database
             KJPP::where('id', $id)->update($validated);
 

app/Http/Controllers/PenilaianController.php

@@ -222,7 +222,7 @@ class PenilaianController extends Controller
             });
         })->unique('id');
 
-        $existingTeamIds = $teamPenilai->pluck('id')->toArray();
+        $existingTeamIds = $userTeam->pluck('id')->toArray();
 
         $updateTeamPenilai = Teams::with(['regions', 'teamsUsers', 'teamsUsers.user'])
         ->whereNotIn('id', $existingTeamIds)
@@ -232,23 +232,14 @@ class PenilaianController extends Controller
         foreach ($userTeam as $item) {
             $regionName = $item->regions;
         }
-        // $regionName = $userTeam->first()?->regions->name;
-
-
 
         $penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first();
 
-
         $penilaianTeam = collect();
         if ($penilaian && $penilaian->id) {
             $penilaianTeam = PenilaianTeam::where('penilaian_id', $penilaian->id)->get();
         }
 
-        // return response()->json([
-        // 'penilaianTeam' => $penilaianTeam
-        // ]);
-
-
         return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian', 'regionName', 'updateTeamPenilai', 'penilaianTeam'));
     }
     /**

app/Http/Controllers/PermohonanController.php

@@ -21,10 +21,17 @@
     use Modules\Lpj\Models\Permohonan;
     use Modules\Lpj\Models\StatusPermohonan;
     use Modules\Lpj\Models\TujuanPenilaian;
+    use Modules\Lpj\Services\PermohonanHistoryService;
 
     class PermohonanController extends Controller
     {
         public $user;
+        protected $historyService;
+
+        public function __construct(PermohonanHistoryService $historyService)
+        {
+            $this->historyService = $historyService;
+        }
 
         public function index()
         {
@@ -36,8 +43,30 @@
             $validate = $request->validated();
             if ($validate) {
                 try {
+                    // Process file upload
+                    $filePath = null;
+                    if ($request->hasFile('attachment')) {
+                        $file = $request->file('attachment');
+                        $fileName = time() . '_' . $file->getClientOriginalName();
+                        $filePath = $file->storeAs('permohonan_attachments', $fileName, 'public');
+                    }
+
+                    // Get keterangan if provided
+                    $keterangan = $request->input('keterangan') ?? null;
+
+
                     // Save to database
-                    Permohonan::create($validate);
+                    $permohonan = Permohonan::create($validate);
+
+                    // Create history
+                    $this->historyService->createHistory(
+                        $permohonan,
+                        $validate['status'],
+                        $keterangan,
+                        [],  // beforeRequest is empty for new permohonan
+                        $permohonan->toArray(),
+                        $filePath
+                    );
                     return redirect()
                         ->route('permohonan.index')->with('success', 'Permohonan created successfully');
                 } catch (Exception $e) {
@@ -107,16 +136,41 @@
 
         public function update(PermohonanRequest $request, $id)
         {
+            $permohonan = Permohonan::findOrFail($id);
+            $beforeRequest = $permohonan->toArray();
+
             $validate = $request->validated();
             if ($validate) {
                 try {
                     // Update in database
-                    $permohonan = Permohonan::find($id);
+
                     if ($permohonan->status == 'revisi') {
                         $validate['status'] = 'order';
                     }
 
                     $permohonan->update($validate);
+
+                    $afterRequest = $permohonan->fresh()->toArray();
+                    // Process file upload
+                    $file = null;
+                    if ($request->hasFile('attachment')) {
+                        $file = $request->file('attachment');
+                    }
+
+                    // Get keterangan if provided
+                    $keterangan = $request->input('keterangan') ?? null;
+
+                    $status =$validate['status'] ?? $permohonan->status;
+
+                    $this->historyService->createHistory(
+                        $permohonan,
+                        $status,
+                        $keterangan,
+                        $beforeRequest,
+                        $afterRequest,
+                        $file
+                    );
+
                     return redirect()
                         ->route('permohonan.index')->with('success', 'Permohonan updated successfully');
                 } catch (Exception $e) {

app/Http/Controllers/RegistrasiFinalController.php

@@ -145,7 +145,6 @@
 
         public function edit($id)
         {
-            // $id => penawaran.id
             return view('lpj::registrasifinal.edit', compact('id'));
         }
 

app/Http/Controllers/SpkController.php

@@ -152,12 +152,6 @@ use Illuminate\Support\Facades\Auth;
                                                 'kjpp.address as kjpp_address',
                                                 'jenis_laporan.name as jenis_laporan_name'
                                     )->first();
-            // date_range
-            if($penawaran->start_date && $penawaran->end_date)
-            {
-                $penawaran->date_range = Carbon::parse($penawaran->start_date)->format('d M Y').' - '.Carbon::parse($penawaran->end_date)->format('d M Y');
-                
-            }
 
             $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
                                         ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
@@ -188,13 +182,6 @@ use Illuminate\Support\Facades\Auth;
                                                 'jenis_laporan.name as jenis_laporan_name'
                                     )->first();
 
-                                    // date_range
-            if($penawaran->start_date && $penawaran->end_date)
-            {
-                $penawaran->date_range = Carbon::parse($penawaran->start_date)->format('d M Y').' - '.Carbon::parse($penawaran->end_date)->format('d M Y');
-                
-            }
-
             $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
                                         ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
                                         ->leftJoin('jenis_jaminan', 'jenis_jaminan.id','=','dokumen_jaminan.jenis_jaminan_id')
@@ -254,4 +241,9 @@ use Illuminate\Support\Facades\Auth;
             return view('lpj::spk.dokumennya', compact('data', 'penawaran'));
         }
 
+        public function download($id) {
+            $document = Permohonan::find($id);
+
+            return response()->download(storage_path('app/public/' .$document->dokumen));
+        }
     }

app/Http/Controllers/SurveyorController.php

@@ -25,6 +25,7 @@ use Modules\Lpj\Models\SpekKategoritBangunan;
 use Modules\Lpj\Models\SaranaPelengkap;
 use Modules\Lpj\Models\ArahMataAngin;
 use Modules\Lpj\Models\Analisa;
+use Modules\Lpj\Models\PerkerasanJalan;
 use Modules\Lpj\Models\AnalisaFakta;
 use Modules\Lpj\Models\AnalisaLingkungan;
 use Modules\Lpj\Models\AnalisaTanahBagunan;
@@ -591,6 +592,7 @@ class SurveyorController extends Controller
         $golMasySekitar = GolonganMasySekitar::all();
         $tingkatKeramaian = TingkatKeramaian::all();
         $laluLintasLokasi = LaluLintasLokasi::all();
+        $perkerasanJalan = PerkerasanJalan::all();
 
 
         $analisa = Analisa::with('analisaTanahBangunan', 'analisaLingkungan', 'analisaFakta', 'jenisJaminan')
@@ -598,6 +600,7 @@ class SurveyorController extends Controller
     ->where('jenis_jaminan_id', $jaminanId)
     ->first();
 
+        // return response()->json($permohonan);
 
 
         return view('lpj::surveyor.components.inspeksi', compact(
@@ -622,7 +625,8 @@ class SurveyorController extends Controller
             'viewUnit',
             'golMasySekitar',
             'tingkatKeramaian',
-            'laluLintasLokasi'
+            'laluLintasLokasi',
+            'perkerasanJalan'
         ));
     }
 
@@ -842,6 +846,7 @@ class SurveyorController extends Controller
             'Golongan Masyarakat Sekitar' => GolonganMasySekitar::class,
             'Lantai Unit' => Lantai::class,
             'View Unit' => ViewUnit::class,
+            'Perkerasan jalan' => PerkerasanJalan::class
         ];
 
 
@@ -961,7 +966,8 @@ class SurveyorController extends Controller
     }
 
 
-    public function validateSubmit(){
+    public function validateSubmit()
+    {
 
     }
 
@@ -1039,6 +1045,7 @@ class SurveyorController extends Controller
         'spek-bangunan' => ['Spek Bangunan', 'spek-bangunan'],
         'lantai-unit' => ['Lantai Unit', 'lantai-unit'],
         'view-unit' => ['View Unit', 'view-unit'],
+        'perkerasan-jalan' => ['Perkerasan jalan', 'perkerasan-jalan']
     ];
 
 }

app/Http/Requests/KJPPRequest.php

@@ -3,7 +3,6 @@
 namespace Modules\Lpj\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use daengdeni\LaravelIdGenerator\IdGenerator;
 
 class KJPPRequest extends FormRequest
 {
@@ -17,21 +16,28 @@ class KJPPRequest extends FormRequest
             'jenis_kantor' => 'required',
             'nomor_ijin_usaha' => 'required',
             'province_code' => 'required',
-            'city_code' => 'required',
-            'district_code' => 'required',
-            'village_code' => 'required',
+            'city_code' => 'nullable',
+            'district_code' => 'nullable',
+            'village_code' => 'nullable',
             'address' => 'required',
-            'postal_code' => 'required|numeric',
-            'nomor_telepon_kantor' => 'required|numeric|digits_between:8,15',
+            'postal_code' => 'nullable|numeric',
+            'nomor_telepon_kantor' => 'nullable|numeric|digits_between:8,15',
             'email_kantor' => 'required|email',
+            'detail_email_kantor' => 'nullable',
             'nama_pimpinan' => 'required|string|not_regex:/^\d+$/|max:255',
             'nomor_hp_pimpinan' => 'required|numeric|digits_between:10,15',
-            'nama_pic_reviewer' => 'required|string|not_regex:/^\d+$/|max:255',
-            'nomor_hp_pic_reviewer' => 'required|numeric|digits_between:10,15',
-            'nama_pic_admin' => 'required|string|not_regex:/^\d+$/|max:255',
-            'nomor_hp_pic_admin' => 'required|numeric|digits_between:10,15',
-            'nama_pic_marketing' => 'required|string|not_regex:/^\d+$/|max:255',
-            'nomor_hp_pic_marketing' => 'required|numeric|digits_between:10,15',
+            'nama_pic_reviewer' => 'nullable|string|not_regex:/^\d+$/|max:255',
+            'detail_nama_pic_reviewer' => 'nullable',
+            'nomor_hp_pic_reviewer' => 'nullable|numeric|digits_between:10,15',
+            'detail_nomor_hp_pic_reviewer' => 'nullable',
+            'nama_pic_admin' => 'nullable|string|not_regex:/^\d+$/|max:255',
+            'detail_nama_pic_admin' => 'nullable',
+            'nomor_hp_pic_admin' => 'nullable|numeric|digits_between:10,15',
+            'detail_nomor_hp_pic_admin' => 'nullable',
+            'nama_pic_marketing' => 'nullable|string|not_regex:/^\d+$/|max:255',
+            'detail_nama_pic_marketing' => 'nullable',
+            'nomor_hp_pic_marketing' => 'nullable|numeric|digits_between:10,15',
+            'detail_nomor_hp_pic_marketing' => 'nullable',
             'ijin_usaha_id' => 'required|array',
             'ijin_usaha_id.*' => 'exists:ijin_usaha,code',
             'jenis_aset_id' => 'required|array',
@@ -69,13 +75,8 @@ class KJPPRequest extends FormRequest
             'nomor_ijin_usaha.required' => 'Nomor Ijin Usaha Wajib diisi!',
             'nomor_ijin_usaha.max'   => 'Nomor Ijin Usaha maksimal 255 huruf!',
             'province_code.required' => 'Provinsi Wajib diisi!',
-            'city_code.required' => 'Kota / Kabupaten Wajib diisi!',
-            'district_code.required' => 'Kecamatan Wajib diisi!',
-            'village_code.required' => 'Kelurahan Wajib diisi!',
-            'postal_code.required' => 'Kode Pos Wajib diisi!',
             'postal_code.numeric' => 'Kode Pos harus berupa angka!',
             'address.required' => 'Alamat Kantor Wajib diisi!',
-            'nomor_telepon_kantor.required' => 'Nomor Telepon Kantor Wajib diisi!',
             'nomor_telepon_kantor.numeric' => 'Nomor Telepon Kantor harus berupa angka!',
             'nomor_telepon_kantor.digits_between' => 'Nomor Telepon Kantor minimum 8 digit dan maksimum 15 digit!',
             'email_kantor.required' => 'Email Kantor Wajib diisi!',
@@ -85,25 +86,17 @@ class KJPPRequest extends FormRequest
             'nomor_hp_pimpinan.required' => 'Nomor HP Pimpinan Wajib diisi!',
             'nomor_hp_pimpinan.numeric' => 'Nomor HP Pimpinan harus berupa angka!',
             'nomor_hp_pimpinan.digits_between' => 'Nomor HP Pimpinan minimum 10 digit dan maksimum 15 digit!',
-            'nama_pic_reviewer.required' => 'Nama PIC Reviewer Wajib diisi!',
             'nama_pic_reviewer.not_regex' => 'Nama PIC Reviewer harus berupa huruf!',
-            'nomor_hp_pic_reviewer.required' => 'Nomor HP PIC Reviewer Wajib diisi!',
             'nomor_hp_pic_reviewer.numeric' => 'Nomor HP PIC Reviewer harus berupa angka!',
             'nomor_hp_pic_reviewer.digits_between' => 'Nomor HP PIC Reviewer minimum 10 digit dan maksimum 15 digit!',
-            'nama_pic_admin.required' => 'Nama PIC Admin Wajib diisi!',
             'nama_pic_admin.not_regex' => 'Nama PIC Admin harus berupa huruf!',
-            'nomor_hp_pic_admin.required' => 'Nomor HP PIC Admin Wajib diisi!',
             'nomor_hp_pic_admin.numeric' => 'Nomor HP PIC Admin harus berupa angka!',
             'nomor_hp_pic_admin.digits_between' => 'Nomor HP PIC Admin minimum 10 digit dan maksimum 15 digit!',
-            'nama_pic_marketing.required' => 'Nama PIC Marketing Wajib diisi!',
             'nama_pic_marketing.not_regex' => 'Nama PIC Marketing harus berupa huruf!',
-            'nomor_hp_pic_marketing.required' => 'Nomor HP PIC Marketing Wajib diisi!',
             'nomor_hp_pic_marketing.numeric' => 'Nomor HP PIC Marketing harus berupa angka!',
             'nomor_hp_pic_marketing.digits_between' => 'Nomor HP PIC Marketing minimum 10 digit dan maksimum 15 digit!',
             'ijin_usaha_id.required' => 'Ijin Usaha Wajib diisi!',
-            'ijin_usaha_id.min' => 'Ijin Usaha Wajib diisi minimal satu atau lebih!',
             'jenis_aset_id.required' => 'Jenis Aset Wajib diisi!',
-            'jenis_aset_id.min' => 'Jenis Aset Wajib diisi minimal satu atau lebih!',
             'attachment.mimes' => 'Attachment harus berformat pdf!',
             'attachment.max' => 'Attachment berukuran maksimum 1 MB!',
         ];

app/Models/KJPP.php

@@ -18,29 +18,5 @@ class KJPP extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected $fillable = [
-        'code',
-        'name',
-        'jenis_kantor',
-        'nomor_ijin_usaha',
-        'province_code',
-        'city_code',
-        'district_code',
-        'village_code',
-        'address',
-        'postal_code',
-        'nomor_telepon_kantor',
-        'email_kantor',
-        'nama_pimpinan',
-        'nomor_hp_pimpinan',
-        'nama_pic_reviewer',
-        'nomor_hp_pic_reviewer',
-        'nama_pic_admin',
-        'nomor_hp_pic_admin',
-        'nama_pic_marketing',
-        'nomor_hp_pic_marketing',
-        'ijin_usaha_id',
-        'jenis_aset_id',
-        'attachment'
-    ];
+    protected $guarded = ['id'];
 }

app/Models/PerkerasanJalan.php

@@ -10,6 +10,7 @@ class PerkerasanJalan extends Model
 {
     use HasFactory;
 
+    protected $table = 'perkerasan_jalan';
     /**
      * The attributes that are mass assignable.
      */

app/Models/PermohonanHistory.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+// use Modules\Lpj\Database\Factories\PermohonanHistoryFactory;
+
+class PermohonanHistory extends Base
+{
+    protected $fillable = [
+        'permohonan_id',
+        'status',
+        'keterangan',
+        'before_request',
+        'after_request',
+        'file_path',
+        'user_id'
+    ];
+
+
+    public function permohonan()
+    {
+        return $this->belongsTo(Permohonan::class);
+    }
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+}

app/Services/PermohonanHistoryService.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Modules\Lpj\Services;
+
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\PermohonanHistory;
+
+class PermohonanHistoryService
+{
+    public function createHistory(Permohonan $permohonan, string $status, ?string $keterangan, array $beforeRequest, array $afterRequest, ?string $file = null)
+    {
+
+        $filePath = null;
+        if ($file) {
+            $filePath = $file->store('permohonan_history_files', 'public');
+        }
+
+
+        try {
+            $history = PermohonanHistory::create([
+                'permohonan_id' => $permohonan->id,
+                'status' => $status,
+                'keterangan' => $keterangan,
+                'before_request' => json_encode($beforeRequest),
+                'after_request' => json_encode($afterRequest),
+                'file_path' => $filePath,
+                'user_id' => auth()->id(),
+            ]);
+
+        } catch (\Exception $e) {
+            // Log the error
+            \Log::error('Error creating PermohonanHistory: ' . $e->getMessage());
+
+            // You might want to delete the uploaded file if the database operation fails
+            if ($filePath) {
+                \Storage::disk('public')->delete($filePath);
+            }
+
+            // Rethrow the exception or handle it as per your application's error handling policy
+            throw new \Exception('Failed to create PermohonanHistory: ' . $e->getMessage());
+        }
+    }
+}

database/migrations/2024_09_18_084905_create_kjpp_table.php

@@ -18,23 +18,30 @@ return new class extends Migration
             $table->string('jenis_kantor');
             $table->string('nomor_ijin_usaha');
             $table->string('province_code');
-            $table->string('city_code');
-            $table->string('district_code');
-            $table->string('village_code');
+            $table->string('city_code')->nullable();
+            $table->string('district_code')->nullable();
+            $table->string('village_code')->nullable();
             $table->string('address');
-            $table->string('postal_code');
-            $table->string('nomor_telepon_kantor');
+            $table->string('postal_code')->nullable();
+            $table->string('nomor_telepon_kantor')->nullable();
             $table->string('email_kantor');
+            $table->string('detail_email_kantor')->nullable();
             $table->string('nama_pimpinan');
             $table->string('nomor_hp_pimpinan');
-            $table->string('nama_pic_reviewer');
-            $table->string('nomor_hp_pic_reviewer');
-            $table->string('nama_pic_admin');
-            $table->string('nomor_hp_pic_admin');
-            $table->string('nama_pic_marketing');
-            $table->string('nomor_hp_pic_marketing');
-            $table->string('ijin_usaha_id')->nullable();
-            $table->string('jenis_aset_id')->nullable();
+            $table->string('nama_pic_reviewer')->nullable();
+            $table->string('detail_nama_pic_reviewer')->nullable();
+            $table->string('nomor_hp_pic_reviewer')->nullable();
+            $table->string('detail_nomor_hp_pic_reviewer')->nullable();
+            $table->string('nama_pic_admin')->nullable();
+            $table->string('detail_nama_pic_admin')->nullable();
+            $table->string('nomor_hp_pic_admin')->nullable();
+            $table->string('detail_nomor_hp_pic_admin')->nullable();
+            $table->string('nama_pic_marketing')->nullable();
+            $table->string('detail_nama_pic_marketing')->nullable();
+            $table->string('nomor_hp_pic_marketing')->nullable();
+            $table->string('detail_nomor_hp_pic_marketing')->nullable();
+            $table->string('ijin_usaha_id');
+            $table->string('jenis_aset_id');
             $table->string('attachment')->nullable();
             $table->boolean('status')->default(true)->nullable();
             $table->char('authorized_status', 1)->nullable();

database/migrations/2024_11_08_081149_create_permohonan_histories_table.php

@@ -4,20 +4,22 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */
     public function up(): void
     {
-        Schema::create('penilaian_team', function (Blueprint $table) {
+        Schema::create('permohonan_histories', function (Blueprint $table) {
             $table->id();
-            $table->unsignedBigInteger('penilaian_id');
-            $table->unsignedBigInteger('team_id');
-            $table->unsignedBigInteger('user_id');
-            $table->string('role');
-            $table->boolean('status')->default(true);
-            $table->char('authorized_status', 1)->nullable();
+            $table->unsignedBigInteger('permohonan_id');
+            $table->string('status');
+            $table->text('keterangan')->nullable();
+            $table->json('before_request')->nullable();
+            $table->json('after_request')->nullable();
+            $table->string('file_path')->nullable();
+            $table->unsignedBigInteger('user_id')->nullable();
             $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
@@ -25,6 +27,9 @@ return new class () extends Migration {
             $table->unsignedBigInteger('created_by')->nullable();
             $table->unsignedBigInteger('updated_by')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
+
+            $table->foreign('permohonan_id')->references('id')->on('permohonan')->onDelete('cascade');
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('set null');
         });
     }
 
@@ -33,6 +38,6 @@ return new class () extends Migration {
      */
     public function down(): void
     {
-        Schema::dropIfExists('penilai_team');
+        Schema::dropIfExists('permohonan_histories');
     }
 };

database/seeders/JenisLegalitasJaminanSeeder.php

@@ -17,6 +17,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ001',
                 'name' => 'Sertifikat',
                 'slug' => 'sertifikat',
+                'custom_field' => 'Luas Tanah',
+                'custom_field_type' => 'number',
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -29,6 +31,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ002',
                 'name' => 'SHGB',
                 'slug' => 'shgb',
+                'custom_field' => null,
+                'custom_field_type' => null,
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -41,6 +45,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ003',
                 'name' => 'Copy PBB / NJOP Tahun Terakhir (Jika Ada)',
                 'slug' => 'copy-pbb-njop-tahun-terakhir-jika-ada',
+                'custom_field' => null,
+                'custom_field_type' => null,
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -53,6 +59,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ004',
                 'name' => 'Copy NPWP Perusahaan/Perorangan',
                 'slug' => 'copy-npwp-perusahaanperorangan',
+                'custom_field' => null,
+                'custom_field_type' => null,
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -65,6 +73,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ005',
                 'name' => 'Siteplan',
                 'slug' => 'siteplan',
+                'custom_field' => null,
+                'custom_field_type' => null,
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -77,6 +87,8 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'code' => 'JLJ006',
                 'name' => 'Surat Pernyataan Kebenaran Data (Surat Representasi)',
                 'slug' => 'surat-pernyataan-kebenaran-data-surat-representasi',
+                'custom_field' => null,
+                'custom_field_type' => null,
                 'status' => 1,
                 'created_at' => now(),
                 'updated_at' => now(),
@@ -85,6 +97,20 @@ class JenisLegalitasJaminanSeeder extends Seeder
                 'updated_by' => 1,
                 'deleted_by' => null
             ],
+            [
+                'code' => 'JLJ007',
+                'name' => 'IMB',
+                'slug' => 'imb',
+                'custom_field' => 'Luas Bangunan',
+                'custom_field_type' => 'number',
+                'status' => 1,
+                'created_at' => now(),
+                'updated_at' => now(),
+                'deleted_at' => null,
+                'created_by' => 1,
+                'updated_by' => 1,
+                'deleted_by' => null
+            ]
         ]);
     }
 }

database/seeders/LpjDatabaseSeeder.php

@@ -31,12 +31,12 @@ class LpjDatabaseSeeder extends Seeder
             TujuanPenilaianKJPPSeeder::class,
             IjinUsahaSeeder::class,
             JenisLaporanSeeder::class,
-            KJPPSeeder::class,
             DebitureSeeder::class,
             PermohonanSeeder::class,
             PemilikJaminanSeeder::class,
             DokumenJaminanSeeder::class,
             DetailDokumenJaminanSeeder::class,
+            KJPPSeeder::class,
             PenawaranSeeder::class,
             DetailPenawaranSeeder::class,
             PenilaianSeeder::class,

database/seeders/PermohonanSeeder.php

@@ -20,7 +20,7 @@ class PermohonanSeeder extends Seeder
                 'branch_id' => 1,
                 'tujuan_penilaian_id' => 1,
                 'debiture_id' => 1,
-                'status' => 'persetujuan-penawaran',
+                'status' => 'registered',
                 'created_at' => now(),
                 'updated_at' => now(),
                 'created_by' => 1,
@@ -38,7 +38,7 @@ class PermohonanSeeder extends Seeder
                 'branch_id' => 1,
                 'tujuan_penilaian_id' => 1,
                 'debiture_id' => 1,
-                'status' => 'tender',
+                'status' => 'registered',
                 'created_at' => now(),
                 'updated_at' => now(),
                 'created_by' => 1,

resources/views/activity/progres_activity/index.blade.php

@@ -33,6 +33,11 @@
             .dropdowns-content a:hover {
                 background-color: #f1f1f1;
             }
+
+            .break-words {
+                word-break: break-word;
+                white-space: normal;
+            }
         </style>
     @endpush
 
@@ -46,7 +51,6 @@
                 @php
 
                     $sortedTeamsActivity = $teamsActivity->sortBy(function ($item) {
-
                         return $item->team->penilaianTeam
                             ->filter(function ($penilaianTeam) use ($item) {
                                 return $penilaianTeam->user_id == $item->user->id;
@@ -64,8 +68,9 @@
                             style="margin-start: 10px">
                             <table class="table table-auto align-middle text-gray-700 font-medium text-sm">
                                 <tr>
-                                    <th class="min-w-[150px]">
-                                        <span class="text-base text-gray-900 font-normal">{{ $item->user->name }}</span>
+                                    <th class="min-w-[150px]" style="width: 600px">
+                                        <span
+                                            class="text-base text-gray-900 font-normal break-words">{{ $item->user->name }}</span>
                                     </th>
                                     <th class="min-w-[150px]">
                                         <span class="text-base text-gray-900 font-normal">
@@ -86,13 +91,14 @@
                                             class="ki-outline ki-minus text-gray-600 text-2sm accordion-active:block hidden"></i>
                                     </th>
                                 </tr>
+
                             </table>
                         </button>
                         <div class="accordion-content hidden" id="accordion_{{ $index }}content_{{ $index }}">
                             <div class="mx-8 pb-4" style="margin-bottom: 20px">
                                 <div class="card card-grid min-w-full" data-datatable="false"
                                     id="activity-table-{{ $index }}"
-                                    data-api-url="{{ route('activity.progres.datatables', ['id' => $item->user->id ]) }}">
+                                    data-api-url="{{ route('activity.progres.datatables', ['id' => $item->user->id]) }}">
                                     <div class="card-body">
                                         <div class="scrollable-x-auto">
                                             <table
@@ -176,7 +182,8 @@
                             },
                             jenis_asset: {
                                 title: 'Jenis Asset',
-                            render: (item, data) => `${data.permohonan.debiture.documents.map(d => d.jenis_jaminan.name) || ''}`,
+                                render: (item, data) =>
+                                    `${data.permohonan.debiture.documents.map(d => d.jenis_jaminan.name) || ''}`,
                             },
                             jenis_report: {
                                 title: 'Jenis Report',

resources/views/component/pdfviewer.blade.php

@@ -1,11 +1,17 @@
-<!-- Modal for PDF viewing -->
-<div id="pdfModal" class="fixed inset-0 bg-gray-800 bg-opacity-75 flex items-center justify-center hidden w-full">
+<!-- Modal for PDF and Image viewing -->
+<div id="previewModal" class="fixed inset-0 bg-gray-800 bg-opacity-75 flex items-center justify-center hidden w-full z-50">
     <div class="bg-white rounded-lg overflow-hidden shadow-xl transform transition-all min-w-3xl w-[1500px] h-[1200px]">
-        <div class="p-4 h-full">
-            <button onclick="closePDFModal()" class="float-right text-2xl">
+        <div class="p-4 h-full flex flex-col">
+            <div class="flex justify-between items-center mb-4">
+                <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>
+                    Download File
+                </button>
+                <button onclick="closePreviewModal()" class="text-2xl">
                     <i class="ki-filled ki-cross-square text-red-600"></i>
                 </button>
-            <div id="pdfViewer" class="h-full"></div>
+            </div>
+            <div id="previewContent" class="flex-grow"></div>
         </div>
     </div>
 </div>
@@ -13,13 +19,48 @@
 @push('scripts')
     <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfobject/2.3.0/pdfobject.min.js"></script>
     <script>
+        let currentFileUrl = '';
+
         function viewPDF(url) {
-            PDFObject.embed(url, "#pdfViewer");
-            document.getElementById('pdfModal').classList.remove('hidden');
+            currentFileUrl = url;
+            const fileExtension = url.split('.').pop().toLowerCase();
+            const previewContent = document.getElementById('previewContent');
+
+            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">`;
+            } else {
+                previewContent.innerHTML = '<p class="text-center">Unsupported file type</p>';
             }
 
-        function closePDFModal() {
-            document.getElementById('pdfModal').classList.add('hidden');
+            document.getElementById('previewModal').classList.remove('hidden');
+            document.addEventListener('keydown', handleEscKey);
         }
+
+        function closePreviewModal() {
+            document.getElementById('previewModal').classList.add('hidden');
+            document.removeEventListener('keydown', handleEscKey);
+        }
+
+        function handleEscKey(event) {
+            if (event.key === 'Escape') {
+                closePreviewModal();
+            }
+        }
+
+        // Close modal when clicking outside the content
+        document.getElementById('previewModal').addEventListener('click', function(event) {
+            if (event.target === this) {
+                closePreviewModal();
+            }
+        });
+
+        // Download functionality
+        document.getElementById('downloadBtn').addEventListener('click', function() {
+            if (currentFileUrl) {
+                window.open(currentFileUrl, '_blank');
+            }
+        });
     </script>
 @endpush

resources/views/debitur/components/dokumen.blade.php

@@ -161,23 +161,33 @@
                         <div class="flex flex-col w-full gap-2" id="file-container-{{$n}}">
                             <div class="flex items-center gap-2">
                                 <input class="flex-1 input" type="text" name="dokumen_nomor[{{ $n }}][]" placeholder="Nomor Dokumen">
-                                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[{{ $n }}][]">
+                                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[{{ $n }}][]" accept=".pdf,image/*">
                                 <button type="button" class="flex-none btn btn-primary w-[100px] text-center" onclick="addFileInput({{ $n }})">Add More</button>
                             </div>
                             <div id="additional-files-{{ $n }}"></div>
                         </div>
 
+                        @if(isset($detail->dokumen_jaminan))
                             @if(isset($detail->dokumen_jaminan))
                                 @php
                                     $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan];
+                                    $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) ? json_decode($detail->dokumen_nomor) : ($detail->dokumen_nomor ? [$detail->dokumen_nomor] : []);
                                 @endphp
+                                <div class="flex flex-col w-full gap-2">
                                     @foreach($dokumen_jaminan as $index => $dokumen)
+                                        <div class="flex w-full lg:w-[30%]">
+                                            @if(!empty($dokumen_nomor))
+                                                <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : {{ $dokumen_nomor[$index] }}</span>
+                                            @endif
                                             <a href="{{ route('debitur.jaminan.download', ['id' => $debitur->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
-                                   class="badge badge-sm badge-outline mt-2 mr-2">
+                                               class="flex-none badge badge-sm badge-outline mt-2 mr-2">
                                                 {{ basename($dokumen) }}
                                                 <i class="ki-filled ki-cloud-download"></i>
                                             </a>
+                                        </div>
                                     @endforeach
+                                </div>
+                            @endif
                         @endif
                     </div>
                 </div>
@@ -250,7 +260,7 @@
                         <div class="flex flex-col w-full gap-2" id="file-container-{{$n}}">
                             <div class="flex items-center gap-2">
                                 <input class="flex-1 input" type="text" name="dokumen_nomor[{{ $n }}][]" placeholder="Nomor Dokumen">
-                                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[{{ $n }}][]" multiple>
+                                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[{{ $n }}][]" accept=".pdf,image/*">
                                 <button type="button" class="flex-none btn btn-primary w-[100px] text-center" onclick="addFileInput({{ $n }})">Add More</button>
                             </div>
                             <div id="additional-files-{{ $n }}"></div>
@@ -510,10 +520,12 @@
                                 Dokumen Jaminan
                             </label>
                             <div class="flex flex-wrap items-baseline w-full" id="file-container-${index}">
-                                ${item.dokumen_jaminan ? renderExistingFiles(item.dokumen_jaminan, debiturId, item.id) : ''}
+                                <div class="flex flex-col w-full gap-2">
+                                    ${item.dokumen_jaminan ? renderExistingFiles(item.dokumen_jaminan, debiturId, item.id, item.dokumen_nomor) : ''}
+                                </div>
                                 <div class="flex items-center gap-2 my-2 w-full">
                                     <input class="flex-1 input" type="text" name="dokumen_nomor[${index}][]" placeholder="Nomor Dokumen">
-                                    <input class="flex-1 file-input" type="file" name="dokumen_jaminan[${index}][]" multiple>
+                                    <input class="flex-1 file-input" type="file" name="dokumen_jaminan[${index}][]" accept=".pdf,image/*">
                                     <button type="button" class="flex-none btn btn-primary w-[100px] text-center" onclick="addFileInput(${index})">Add File</button>
                                 </div>
                             </div>
@@ -544,32 +556,13 @@
                 .catch(error => console.error('Error:', error));
         }
 
-        function renderExistingFiles(dokumenJaminan, debiturId, itemId) {
-            if (typeof dokumenJaminan === 'string') {
-                return `
-            <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}" class="badge badge-sm badge-outline mt-2 mr-2">
-                ${dokumenJaminan.split('/').pop()}
-                <i class="ki-filled ki-cloud-download"></i>
-            </a>
-        `;
-            } else if (Array.isArray(dokumenJaminan)) {
-                return dokumenJaminan.map(file => `
-            <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}&file=${encodeURIComponent(file)}" class="badge badge-sm badge-outline mt-2 mr-2">
-                ${file.split('/').pop()}
-                <i class="ki-filled ki-cloud-download"></i>
-            </a>
-        `).join('');
-            }
-            return '';
-        }
-
         function addFileInput(index) {
             const container = document.getElementById(`file-container-${index}`);
             const newInput = document.createElement('div');
             newInput.className = 'flex items-center gap-2 mb-2 w-full';
             newInput.innerHTML = `
                 <input class="flex-1 input" type="text" name="dokumen_nomor[${index}][]" placeholder="Nomor Dokumen">
-                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[${index}][]" multiple>
+                <input class="flex-1 file-input" type="file" name="dokumen_jaminan[${index}][]" accept=".pdf,image/*">
                 <button type="button" class="flex-none btn btn-danger w-[100px] text-center" onclick="removeFileInput(this)">Remove</button>
             `;
             container.appendChild(newInput);
@@ -579,23 +572,53 @@
             button.closest('.flex.items-center.gap-2.mb-2').remove();
         }
 
-        function renderExistingFiles(dokumenJaminan, debiturId, itemId) {
-            if (typeof dokumenJaminan === 'string') {
+        function renderExistingFiles(dokumenJaminan, debiturId, itemId, dokumenNomor) {
+            if (typeof dokumenJaminan === 'string' && typeof dokumenNomor === 'string') {
                 return `
-                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}" class="badge badge-sm badge-outline mt-2">
+                <div class="flex w-full lg:w-[30%]">
+                    <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : ${dokumenNomor}</span>
+                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}" class="flex-none badge badge-sm badge-outline mt-2">
                         ${dokumenJaminan.split('/').pop()}
                         <i class="ki-filled ki-cloud-download"></i>
                     </a>
+                </div>
                 `;
-            } else if (Array.isArray(dokumenJaminan)) {
-                return dokumenJaminan.map(file => `
-                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}&file=${file}" class="badge badge-sm badge-outline mt-2 mr-2">
-                        ${file.split('/').pop()}
+            }else if (typeof dokumenJaminan === 'string' && dokumenNomor === null) {
+                return `
+                <div class="flex w-full lg:w-[30%]">
+                    <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : --</span>
+                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}" class="flex-none badge badge-sm badge-outline mt-2">
+                        ${dokumenJaminan.split('/').pop()}
                         <i class="ki-filled ki-cloud-download"></i>
                     </a>
+                </div>
+                `;
+            } else if (Array.isArray(dokumenJaminan) && Array.isArray(dokumenNomor)) {
+                return dokumenJaminan.map((file, index) => `<div class="flex w-full lg:w-[30%]">
+                    <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : ${dokumenNomor[index] || 'N/A'}</span>
+                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}&file=${file}" class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                        ${file.split('/').pop()}
+                        <i class="ki-filled ki-cloud-download"></i>
+                    </a></div>
+                `).join('');
+            } else if (Array.isArray(dokumenJaminan) && typeof dokumenNomor === 'string') {
+                return dokumenJaminan.map((file, index) => `<div class="flex w-full lg:w-[30%]">
+                    <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : ${dokumenNomor} || 'N/A'}</span>
+                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}&file=${file}" class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                        ${file.split('/').pop()}
+                        <i class="ki-filled ki-cloud-download"></i>
+                    </a></div>
+                `).join('');
+            } else if (Array.isArray(dokumenJaminan) && dokumenNomor === 'null') {
+                return dokumenJaminan.map((file, index) => `<div class="flex w-full lg:w-[30%]">
+                    <span class="flex-1 mt-2 text-info text-sm">Nomor Dokumen : ${dokumenNomor} || 'N/A'}</span>
+                    <a href="/debitur/${debiturId}/jaminan/download?dokumen=${itemId}&file=${file}" class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                        ${file.split('/').pop()}
+                        <i class="ki-filled ki-cloud-download"></i>
+                    </a></div>
                 `).join('');
             }
-            return '';
+            return dokumenNomor;
         }
 
         function getCustomFieldInput(type, fieldName, value) {

resources/views/debitur/components/jaminan.blade.php

@@ -71,10 +71,23 @@
                             {{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }}
                         </span>
                         <div>
+                            @if(isset($detail->dokumen_jaminan))
+                                @php
+                                    $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan)) ? json_decode($detail->dokumen_jaminan) : [$detail->dokumen_jaminan];
+                                    $dokumen_nomor = is_array(json_decode($detail->dokumen_nomor)) ? json_decode($detail->dokumen_nomor) : ($detail->dokumen_nomor ? [$detail->dokumen_nomor] : []);
+                                @endphp
+                                @foreach($dokumen_jaminan as $index => $dokumen)
                                         @if(in_array(Auth::user()->roles[0]->name,['administrator','pemohon-eo']))
-                            <a href="{{ route('debitur.jaminan.download',['id'=>$debitur->id,'dokumen'=>$detail->id]) }}" class="badge badge-sm badge-outline mt-2 badge-info"><i class="ki-filled ki-cloud-download mr-2"></i> Download</a>
+                                           <a href="{{ route('debitur.jaminan.download', ['id' => $debitur->id, 'dokumen' => $detail->id, 'index' => $index]) }}"
+                                               class="flex-none badge badge-sm badge-outline mt-2 mr-2">
+                                                {{ basename($dokumen) }}
+                                                <i class="ki-filled ki-cloud-download"></i>
+                                            </a>
+                                        @endif
+                                        <span class="badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($dokumen_jaminan[$index]) }}')"><i class="ki-filled ki-eye mr-2"></i>Preview</span>
+                                    <br>
+                                @endforeach
                             @endif
-                            <span class="badge badge-sm badge-outline badge-warning mt-2" onclick="viewPDF('{{ Storage::url($detail->dokumen_jaminan) }}')"><i class="ki-filled ki-eye mr-2"></i>Preview</span>
                         </div>
                     </div>
                     <div class="border-t border-gray-300 border-dashed">

resources/views/kjpp/create.blade.php

@@ -222,12 +222,32 @@
                         <label class="form-label max-w-56">
                             Email Kantor
                         </label>
-                        <div class="flex flex-wrap items-baseline w-full">
+                        <div class="flex flex-wrap items-baseline w-full gap-1.5">
                             <input class="input  @error('email_kantor') border-danger  @enderror" type="text"
                                 name="email_kantor" value="{{ $kjpp->email_kantor ?? old('email_kantor') }}">
                             @error('email_kantor')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
+                            <div id="detail_email_kantor" class="flex flex-wrap items-center w-full gap-2">
+                                @if (isset($kjpp->detail_email_kantor))
+                                    @foreach ($detailEmailKantor as $detail_email_kantor)
+                                        <div class="flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full">
+                                            <div class="flex flex-wrap items-baseline w-full">
+                                                <input class="input  @error('email_kantor') border-danger  @enderror"
+                                                    type="text" name="detail_email_kantor[email_kantor][]"
+                                                    value="{{ $detail_email_kantor->email_kantor ?? old('detail_email_kantor.email_kantor') }}">
+                                                @error('email_kantor')
+                                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                                @enderror
+                                            </div>
+                                            <button type="button"
+                                                class="btn btn-danger btn-xs delete-button-edit">Hapus</button>
+                                        </div>
+                                    @endforeach
+                                @endif
+                            </div>
+                            <button type="button" id="tambah_email_kantor" class="btn btn-primary btn-xs">Tambah
+                                Email Kantor</button>
                         </div>
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -277,6 +297,51 @@
                             @enderror
                         </div>
                     </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap">
+                        <div id="detail_nama_pic_reviewer" class="flex flex-wrap items-baseline w-full gap-2.5">
+                            @if (isset($kjpp->detail_nama_pic_reviewer) && isset($kjpp->detail_nomor_hp_pic_reviewer))
+                                @foreach (json_decode($detailJoinPicReviewer) as $detail_pic_reviewer)
+                                    <div class="flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full">
+                                        <label class="form-label max-w-56">
+                                            Nama PIC Reviewer
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nama_pic_reviewer') border-danger  @enderror"
+                                                type="text" name="detail_nama_pic_reviewer[nama_pic_reviewer][]"
+                                                value="{{ $detail_pic_reviewer->nama_pic_reviewer ?? old('detail_nama_pic_reviewer.nama_pic_reviewer') }}">
+                                            @error('nama_pic_reviewer')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <label class="form-label max-w-56">
+                                            Nomor HP PIC Reviewer
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nomor_hp_pic_reviewer') border-danger  @enderror"
+                                                type="text"
+                                                name="detail_nomor_hp_pic_reviewer[nomor_hp_pic_reviewer][]"
+                                                value="{{ $detail_pic_reviewer->nomor_hp_pic_reviewer ?? old('detail_nomor_hp_pic_reviewer.nomor_hp_pic_reviewer') }}">
+                                            @error('nomor_hp_pic_reviewer')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <button type="button" class="btn btn-danger btn-xs delete-button-edit">
+                                            Hapus
+                                        </button>
+                                    </div>
+                                @endforeach
+                            @endif
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            &nbsp;
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <button type="button" id="tambah_nama_pic_reviewer" class="btn btn-primary btn-xs">Tambah
+                                PIC Reviewer</button>
+                        </div>
+                    </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Nama PIC Admin
@@ -300,29 +365,115 @@
                             @enderror
                         </div>
                     </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap">
+                        <div id="detail_nama_pic_admin" class="flex flex-wrap items-baseline w-full gap-2.5">
+                            @if (isset($kjpp->detail_nama_pic_admin) && isset($kjpp->detail_nomor_hp_pic_admin))
+                                @foreach (json_decode($detailJoinPicAdmin) as $detail_pic_admin)
+                                    <div class="flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full">
+                                        <label class="form-label max-w-56">
+                                            Nama PIC Admin
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nama_pic_admin') border-danger  @enderror"
+                                                type="text" name="detail_nama_pic_admin[nama_pic_admin][]"
+                                                value="{{ $detail_pic_admin->nama_pic_admin ?? old('detail_nama_pic_admin.nama_pic_admin') }}">
+                                            @error('nama_pic_admin')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <label class="form-label max-w-56">
+                                            Nomor HP PIC Admin
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nomor_hp_pic_admin') border-danger  @enderror"
+                                                type="text" name="detail_nomor_hp_pic_admin[nomor_hp_pic_admin][]"
+                                                value="{{ $detail_pic_admin->nomor_hp_pic_admin ?? old('detail_nomor_hp_pic_admin.nomor_hp_pic_admin') }}">
+                                            @error('nomor_hp_pic_admin')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                        <button type="button" class="btn btn-danger btn-xs delete-button-edit">
+                                            Hapus
+                                        </button>
+                                    </div>
+                                @endforeach
+                            @endif
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            &nbsp;
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <button type="button" id="tambah_nama_pic_admin" class="btn btn-primary btn-xs">Tambah
+                                PIC Admin</button>
+                        </div>
+                    </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Nama PIC Marketing
                         </label>
-                        <div class="flex flex-wrap items-baseline w-full">
                         <input class="input  @error('nama_pic_marketing') border-danger  @enderror" type="text"
                             name="nama_pic_marketing"
                             value="{{ $kjpp->nama_pic_marketing ?? old('nama_pic_marketing') }}">
                         @error('nama_pic_marketing')
                             <em class="alert text-danger text-sm">{{ $message }}</em>
                         @enderror
+                        <label class="form-label max-w-56">
+                            Nomor HP PIC Marketing
+                        </label>
+                        <input class="input  @error('nomor_hp_pic_marketing') border-danger  @enderror" type="text"
+                            name="nomor_hp_pic_marketing"
+                            value="{{ $kjpp->nomor_hp_pic_marketing ?? old('nomor_hp_pic_marketing') }}">
+                        @error('nomor_hp_pic_marketing')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                        @enderror
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap">
+                        <div id="detail_nama_pic_marketing" class="flex flex-wrap items-baseline w-full gap-2.5">
+                            @if (isset($kjpp->detail_nama_pic_marketing) && isset($kjpp->detail_nomor_hp_pic_marketing))
+                                @foreach (json_decode($detailJoinPicMarketing) as $detail_pic_marketing)
+                                    <div class="flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full">
+                                        <label class="form-label max-w-56">
+                                            Nama PIC Marketing
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input class="input  @error('nama_pic_marketing') border-danger  @enderror"
+                                                type="text" name="detail_nama_pic_marketing[nama_pic_marketing][]"
+                                                value="{{ $detail_pic_marketing->nama_pic_marketing ?? old('detail_nama_pic_marketing.nama_pic_marketing') }}">
+                                            @error('nama_pic_marketing')
+                                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
                                         </div>
                                         <label class="form-label max-w-56">
                                             Nomor HP PIC Marketing
                                         </label>
                                         <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('nomor_hp_pic_marketing') border-danger  @enderror"
-                                type="text" name="nomor_hp_pic_marketing"
-                                value="{{ $kjpp->nomor_hp_pic_marketing ?? old('nomor_hp_pic_marketing') }}">
+                                            <input
+                                                class="input  @error('nomor_hp_pic_marketing') border-danger  @enderror"
+                                                type="text"
+                                                name="detail_nomor_hp_pic_marketing[nomor_hp_pic_marketing][]"
+                                                value="{{ $detail_pic_marketing->nomor_hp_pic_marketing ?? old('detail_nomor_hp_pic_marketing.nomor_hp_pic_marketing') }}">
                                             @error('nomor_hp_pic_marketing')
                                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                             @enderror
                                         </div>
+                                        <button type="button" class="btn btn-danger btn-xs delete-button-edit">
+                                            Hapus
+                                        </button>
+                                    </div>
+                                @endforeach
+                            @endif
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            &nbsp;
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <button type="button" id="tambah_nama_pic_marketing" class="btn btn-primary btn-xs">Tambah
+                                PIC Marketing</button>
+                        </div>
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
@@ -397,3 +548,5 @@
         </form>
     </div>
 @endsection
+
+@include('lpj::kjpp.scripts.index')

resources/views/kjpp/scripts/index.blade.php

@@ -0,0 +1,120 @@
+@push('scripts')
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            const emailKantorDiv = document.getElementById('detail_email_kantor');
+
+            function addDeleteListeners() {
+                document.querySelectorAll(".delete-button").forEach(button => {
+                    button.addEventListener("click", function() {
+                        this.closest(
+                                ".flex.flex-col.lg\\:flex-row.gap-2.items-baseline.lg\\:items-center.w-full"
+                            )
+                            .remove();
+                    });
+                });
+            }
+
+            function DeleteEditListeners() {
+                document.querySelectorAll(".delete-button-edit").forEach(button => {
+                    button.addEventListener("click", function() {
+                        this.closest(
+                                ".flex.flex-col.lg\\:flex-row.gap-2.items-baseline.lg\\:items-center.w-full"
+                            )
+                            .remove();
+                    });
+                });
+            }
+
+            DeleteEditListeners();
+
+            document.getElementById("tambah_email_kantor").addEventListener("click", function() {
+                const newDiv = document.createElement("div");
+                newDiv.className = "flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full";
+                newDiv.innerHTML = `
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_email_kantor[email_kantor][]" value="">
+                        </div>
+                        <button type="button" class="btn btn-danger btn-xs delete-button">Hapus</button>
+                    `;
+                emailKantorDiv.appendChild(newDiv);
+
+                addDeleteListeners();
+            });
+
+            const namaPicReviewerDiv = document.getElementById('detail_nama_pic_reviewer');
+
+            document.getElementById("tambah_nama_pic_reviewer").addEventListener("click", function() {
+                const newDiv = document.createElement("div");
+                newDiv.className = "flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full";
+                newDiv.innerHTML = `
+                        <label class="form-label max-w-56">
+                            Nama PIC Reviewer
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nama_pic_reviewer[nama_pic_reviewer][]" value="">
+                        </div>
+                        <label class="form-label max-w-56">
+                            Nomor HP PIC Reviewer
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nomor_hp_pic_reviewer[nomor_hp_pic_reviewer][]" value="">
+                        </div>
+                        <button type="button" class="btn btn-danger btn-xs delete-button">Hapus</button>
+                    `;
+                namaPicReviewerDiv.appendChild(newDiv);
+
+                addDeleteListeners();
+            })
+
+            const namaPicAdminDiv = document.getElementById('detail_nama_pic_admin');
+
+            document.getElementById("tambah_nama_pic_admin").addEventListener("click", function() {
+                const newDiv = document.createElement("div");
+                newDiv.className = "flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full";
+                newDiv.innerHTML = `
+                <label class="form-label max-w-56">
+                            Nama PIC Admin
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nama_pic_admin[nama_pic_admin][]" value="">
+                        </div>
+                        <label class="form-label max-w-56">
+                            Nomor HP PIC Admin
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nomor_hp_pic_admin[nomor_hp_pic_admin][]" value="">
+                        </div>
+                        <button type="button" class="btn btn-danger btn-xs delete-button">Hapus</button>
+                    `;
+                namaPicAdminDiv.appendChild(newDiv);
+
+                addDeleteListeners();
+            })
+
+            const namaPicMarketingDiv = document.getElementById('detail_nama_pic_marketing');
+
+            document.getElementById("tambah_nama_pic_marketing").addEventListener("click", function() {
+                const newDiv = document.createElement("div");
+                newDiv.className = "flex flex-col lg:flex-row gap-2 items-baseline lg:items-center w-full";
+                newDiv.innerHTML = `
+                <label class="form-label max-w-56">
+                            Nama PIC Marketing
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nama_pic_marketing[nama_pic_marketing][]" value="">
+                        </div>
+                        <label class="form-label max-w-56">
+                            Nomor HP PIC Marketing
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input" type="text" name="detail_nomor_hp_pic_marketing[nomor_hp_pic_marketing][]" value="">
+                        </div>
+                        <button type="button" class="btn btn-danger btn-xs delete-button">Hapus</button>
+                    `;
+                namaPicMarketingDiv.appendChild(newDiv);
+
+                addDeleteListeners();
+            })
+        });
+    </script>
+@endpush

resources/views/kjpp/show.blade.php

@@ -42,9 +42,7 @@
                     <label class="form-label max-w-56">Nomor Ijin Usaha</label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">
-                            @foreach ($ijin_usaha as $iu)
-                                {{ $iu->code }}
-                            @endforeach
+                            {{ $kjpp->nomor_ijin_usaha }}
                         </p>
                     </div>
                 </div>
@@ -53,22 +51,36 @@
                         Alamat Kantor
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->address }} , Kel.
+                        <p class="flex style-w-full text-gray-600 font-medium text-sm">{{ $kjpp->address }}
+                            @if (isset($kjpp->village_code))
+                                , Kel.
                                 @foreach ($villages as $village)
                                     {{ $village->name }}
-                            @endforeach , Kec.
+                                @endforeach
+                            @endif
+                            @if (isset($kjpp->district_code))
+                                , Kec.
                                 @foreach ($districts as $district)
                                     {{ $district->name }}
-                            @endforeach ,
-                            @foreach ($cities as $city)
+                                @endforeach
+                            @endif
+                            @if (isset($kjpp->city_code))
+                                ,@foreach ($cities as $city)
                                     {{ ucwords(strtolower($city->name)) }}
-                            @endforeach ,
+                                @endforeach
+                            @endif
+                            @if (isset($kjpp->province_code))
+                                ,
                                 @foreach ($provinces as $province)
                                     {{ $province->name }}
-                            @endforeach, Kode Pos.
+                                @endforeach
+                            @endif
+                            @if (isset($kjpp->postal_code))
+                                , Kode Pos.
                                 @foreach ($villages as $village)
                                     {{ $village->postal_code }}
                                 @endforeach
+                            @endif
                         </p>
                     </div>
                 </div>
@@ -84,6 +96,13 @@
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->email_kantor }}</p>
+                        @if (isset($kjpp->detail_email_kantor))
+                            @foreach (json_decode($kjpp->detail_email_kantor) as $detail_email_kantor)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_email_kantor->email_kantor }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -106,12 +125,26 @@
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nama_pic_reviewer }}</p>
+                        @if (isset($kjpp->detail_nama_pic_reviewer))
+                            @foreach (json_decode($kjpp->detail_nama_pic_reviewer) as $detail_nama_pic_reviewer)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nama_pic_reviewer->nama_pic_reviewer }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                     <label class="form-label max-w-56">
                         Nomor HP PIC Reviewer
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nomor_hp_pic_reviewer }}</p>
+                        @if (isset($kjpp->detail_nomor_hp_pic_reviewer))
+                            @foreach (json_decode($kjpp->detail_nomor_hp_pic_reviewer) as $detail_nomor_hp_pic_reviewer)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nomor_hp_pic_reviewer->nomor_hp_pic_reviewer }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -120,12 +153,26 @@
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nama_pic_admin }}</p>
+                        @if (isset($kjpp->detail_nama_pic_admin))
+                            @foreach (json_decode($kjpp->detail_nama_pic_admin) as $detail_nama_pic_admin)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nama_pic_admin->nama_pic_admin }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                     <label class="form-label max-w-56">
                         Nomor HP PIC Admin
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nomor_hp_pic_admin }}</p>
+                        @if (isset($kjpp->detail_nomor_hp_pic_admin))
+                            @foreach (json_decode($kjpp->detail_nomor_hp_pic_admin) as $detail_nomor_hp_pic_admin)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nomor_hp_pic_admin->nomor_hp_pic_admin }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -134,12 +181,26 @@
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nama_pic_marketing }}</p>
+                        @if (isset($kjpp->detail_nama_pic_marketing))
+                            @foreach (json_decode($kjpp->detail_nama_pic_marketing) as $detail_nama_pic_marketing)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nama_pic_marketing->nama_pic_marketing }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                     <label class="form-label max-w-56">
                         Nomor HP PIC Marketing
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">{{ $kjpp->nomor_hp_pic_marketing }}</p>
+                        @if (isset($kjpp->detail_nomor_hp_pic_marketing))
+                            @foreach (json_decode($kjpp->detail_nomor_hp_pic_marketing) as $detail_nomor_hp_pic_marketing)
+                                <p class="flex w-full text-gray-600 font-medium text-sm">
+                                    {{ $detail_nomor_hp_pic_marketing->nomor_hp_pic_marketing }}
+                                </p>
+                            @endforeach
+                        @endif
                     </div>
                 </div>
                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -209,3 +270,19 @@
         </div>
     </div>
 @endsection
+
+@push('styles')
+    <style>
+        @media (min-width: 1024px) {
+            .style-w-full {
+                max-width: 25rem;
+            }
+        }
+
+        @media (max-width: 1024px) {
+            .style-w-full {
+                width: 100%;
+            }
+        }
+    </style>
+@endpush

resources/views/penilaian/form.blade.php

@@ -210,11 +210,6 @@
                                 @enderror
                             </div>
                         </div>
-
-                        {{-- @php
-                            var_dump($penilaianTeam);
-                        @endphp --}}
-
                         <div
                             class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 {{ $penilaianTeam->isEmpty() ? '' : 'hidden' }}">
                             <label class="form-label max-w-56">
@@ -264,8 +259,7 @@
 
                                 @if (
                                     $penilaianTeam->isNotEmpty() &&
-                                    $penilaianTeam->contains(fn($item) => $item->role == 'surveyor' && is_null($item->user_id))
-                                )
+                                        $penilaianTeam->contains(fn($item) => $item->role == 'surveyor' && is_null($item->user_id)))
                                     <div id="surveyorId" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                                         <label class="form-label max-w-56">
                                             Surveyor yang di tunjuk
@@ -305,7 +299,7 @@
                                                     @endforeach
 
                                                     @if ($penilaianTeam->isEmpty())
-                                                        <option value="pilih_dari_region">pilih dari region berdeda
+                                                        <option value="pilih_dari_region">Pilih Surveyor Dari Region
                                                         </option>
                                                     @endif
                                                 </select>
@@ -345,9 +339,7 @@
 
                                 @if (
                                     $penilaianTeam->isNotEmpty() &&
-    $penilaianTeam->contains(fn($item) => $item->role == 'penilai' && is_null($item->user_id))
-)
-
+                                        $penilaianTeam->contains(fn($item) => $item->role == 'penilai' && is_null($item->user_id)))
                                     <div id="penilaiId" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                                         <label class="form-label max-w-56">
                                             Penilai yang di tunjuk
@@ -385,7 +377,7 @@
                                                         <option value="{{ $item->id }}">{{ $item->name }}</option>
                                                     @endforeach
                                                     @if ($penilaianTeam->isEmpty())
-                                                        <option value="pilih_dari_region">pilih dari region berdeda
+                                                        <option value="pilih_dari_region">Pilih Penilai Dari Region
                                                         </option>
                                                     @endif
                                                 </select>
@@ -437,6 +429,7 @@
                             </div>
                         </div>
 
+
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">
                                 Catatan
@@ -566,12 +559,6 @@
         });
 
 
-
-
-
-
-
-
         document.addEventListener('DOMContentLoaded', function() {
             const revisiForm = document.getElementById('revisiForm');
             const btnSubmit = document.getElementById('btnSubmit');
@@ -613,4 +600,9 @@
             });
         });
     </script>
+
+
+<script>
+
+</script>
 @endpush

resources/views/permohonan/authorization/show.blade.php

@@ -40,6 +40,24 @@
                     </span>
                 </div>
 
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Nilai Plafond:
+                    </h3>
+                    <span class="text-2sm text-gray-700">
+                        {{ $permohonan->nilaiPlafond->name }}
+                    </span>
+                </div>
+
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Status Bayar:
+                    </h3>
+                    <span class="text-md font-bold {{ $permohonan->status_bayar === 'belum_bayar' ? 'text-red-600' : 'text-green-600' }} uppercase">
+                        {{ str_replace('_',' ',$permohonan->status_bayar) }}
+                    </span>
+                </div>
+
             </div>
         </div>
 
@@ -139,7 +157,7 @@
         @include('lpj::component.detail-jaminan')
 
         <div class="card">
-            <form action="{{ route('authorization.update', $permohonan->id) }}" method="POST">
+            <form action="{{ route('authorization.update', $permohonan->id) }}" method="POST" id="authorizationForm">
                 <input type="hidden" name="_method" value="PUT">
                 @csrf
                 <div class="card-body lg:py-7.5">
@@ -149,6 +167,16 @@
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <textarea class="textarea" rows="3" type="number" id="keterangan" name="keterangan"></textarea>
+                            <em class="alert text-danger text-sm" id="keterangan-message"></em>
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 mt-2" id="fileUploadSection">
+                        <label class="form-label max-w-56">
+                            Upload File Revisi
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input type="file" class="file-input" id="revisionFile" name="revisionFile">
+                            <em class="alert text-danger text-sm hidden" id="file-message"></em>
                         </div>
                     </div>
                 </div>
@@ -156,7 +184,7 @@
                     <button type="submit" name="status" value="preregister" class="btn btn-success">
                         Approve
                     </button>
-                    <button type="submit" name="status" value="revisi" class="btn btn-warning ml-3">
+                    <button type="submit" name="status" value="revisi" id="revisi" class="btn btn-warning ml-3">
                         Revisi
                     </button>
                 </div>
@@ -164,3 +192,45 @@
         </div>
     </div>
 @endsection
+
+@push('scripts')
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            const form = document.getElementById('authorizationForm');
+            const keterangan = document.getElementById('keterangan');
+            const revisiBtn = document.getElementById('revisi');
+            const keteranganMessage = document.getElementById('keterangan-message');
+
+            const revisionFile = document.getElementById('revisionFile');
+            const fileMessage = document.getElementById('file-message');
+
+
+            form.addEventListener('submit', function(event) {
+                if (event.submitter === revisiBtn && keterangan.value.trim() === '') {
+                    event.preventDefault();
+                    keteranganMessage.textContent = 'Catatan harus diisi.';
+                } else {
+                    keteranganMessage.textContent = '';
+                }
+
+                if (!revisionFile.files.length) {
+                    event.preventDefault();
+                    fileMessage.textContent = 'File revisi harus diunggah.';
+                    fileMessage.classList.remove('hidden');
+                } else {
+                    fileMessage.classList.add('hidden');
+                }
+            });
+
+            // Add event listener for typing in keterangan textarea
+            keterangan.addEventListener('input', function() {
+                keteranganMessage.classList.add('hidden');
+            });
+
+            // Add event listener for file selection
+            revisionFile.addEventListener('change', function() {
+                fileMessage.classList.add('hidden');
+            });
+        });
+    </script>
+@endpush

resources/views/registrasifinal/index.blade.php

@@ -136,10 +136,10 @@
                     title: 'Status',
                     render: (item, data) => {
                         return `<div class="flex flex-nowrap justify-center">
-                            <a onclick="showRegistrasiFinal(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
+                            <a onclick="showRegistrasiFinal(${data.permohonan.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
                                 <i class="ki-outline ki-eye"></i>
                             </a>
-                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="registrasifinal/${data.id}/edit">
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="registrasifinal/${data.permohonan.id}/edit">
                                 <i class="ki-outline ki-notepad-edit"></i>
                             </a>
                         </div>`;

resources/views/spk/index.blade.php

@@ -161,27 +161,27 @@
             actions: {
                 title: 'Status',
                 render: (item, data) => {
-                    var iconSpkShow ='';
-                    var iconSpkCreate='';
+                    var spkShow ='';
+                    var spkCreate='';
                     if(!data.dokumen)
                     {
-                        iconSpkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" onclick="spkCreate(${data.id})" >
+                        spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" onclick="spkCreate(${data.penawaran.id})" >
                             <i class="ki-outline ki-notepad-edit"></i>
                         </a>`;
                     }
                     else
                     {
-                        iconSpkShow =`<div class="flex flex-nowrap justify-center">
-                        <a href="${data.dokumen}" class="btn btn-sm btn-icon btn-clear btn-primary" title="Download SPK" download >
+                        spkShow =`<div class="flex flex-nowrap justify-center">
+                        <a href="/spk/${data.id}/download" class="btn btn-sm btn-icon btn-clear btn-primary" title="Download SPK">
                             <i class="ki-filled ki-cloud-download"></i>
                         </a> `;
-                        iconSpkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.id})" >
+                        spkCreate=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Buat SPK" onclick="spkCreate(${data.penawaran.id})" >
                             <i class="ki-outline ki-notepad-edit"></i>
                         </a>`;
                     }
 
                     return `<div class="flex flex-nowrap justify-center">`
-                             +iconSpkShow+iconSpkCreate+
+                             +spkShow+spkCreate+
                              `</div>`;
                 },
             }

routes/registrasi.php

@@ -106,6 +106,8 @@ Route::middleware(['auth'])->group(function () {
         Route::get('/spk/{spk}', 'show')->name('spk.show');
         Route::get('/spk/{spk}/edit', 'edit')->name('spk.edit');
         Route::put('/spk/{spk}', 'update')->name('spk.update');	
+        
+        Route::get('spk/{spk}/download', 'download')->name('spk.download');
     });
 
     Route::controller(RegistrasiFinalController::class)->group(function(){