From 9a238ddb8327afdc7b0311ea907b79319e8f86b9 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 19 Sep 2024 11:09:59 +0700
Subject: [PATCH] penambahan detail permonan pada form assignment

---
 app/Http/Controllers/PenilaianController.php  | 368 +++++++++---------
 app/Http/Controllers/PermohonanController.php | 156 +-------
 resources/views/penilaian/form.blade.php      | 228 ++++++++++-
 3 files changed, 413 insertions(+), 339 deletions(-)

diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 194cde6..dadfd09 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -1,211 +1,203 @@
 <?php
 
-namespace Modules\Lpj\Http\Controllers;
+    namespace Modules\Lpj\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Modules\Lpj\Models\StatusPermohonan;
-use Modules\Lpj\Models\Branch;
-use Modules\Lpj\Models\Debiture;
-use Modules\Lpj\Models\Permohonan;
-use Modules\Lpj\Models\TujuanPenilaian;
-use Modules\Lpj\Models\JenisPenilaian;
-use Modules\Lpj\Models\Teams;
-use Modules\Lpj\Models\TeamsUsers;
-use Modules\Lpj\Models\Penilaian;
-use Modules\Lpj\Models\JenisJaminan;
-use Modules\Lpj\Models\NilaiPlafond;
-use Modules\Lpj\Models\JenisFasilitasKredit;
-use Modules\Usermanagement\Models\User;
-use Modules\Lpj\Http\Requests\PenilaianRequest;
-use Modules\Lpj\Models\DetailDokumenJaminan;
-use Modules\Lpj\Models\DokumenJaminan;
-use Modules\Lpj\Exports\PermohonanExport;
+    use App\Http\Controllers\Controller;
+    use Exception;
+    use Illuminate\Http\Request;
+    use Modules\Lpj\Http\Requests\PenilaianRequest;
+    use Modules\Lpj\Models\JenisPenilaian;
+    use Modules\Lpj\Models\Penilaian;
+    use Modules\Lpj\Models\Permohonan;
+    use Modules\Lpj\Models\StatusPermohonan;
+    use Modules\Lpj\Models\Teams;
+    use Modules\Lpj\Models\TeamsUsers;
+    use Modules\Usermanagement\Models\User;
 
-class PenilaianController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     */
-    public function index()
+    class PenilaianController extends Controller
     {
-        $status_permohonan = StatusPermohonan::all();
+        /**
+         * Display a listing of the resource.
+         */
+        public function index()
+        {
+            $status_permohonan = StatusPermohonan::all();
 
-        return view('lpj::penilaian.index', compact('status_permohonan'));
-    }
+            return view('lpj::penilaian.index', compact('status_permohonan'));
+        }
 
-    /**
-     * Show the form for creating a new resource.
-     */
-    public function create($id)
-    {
-        return view('lpj::penilaian.form');
-    }
+        /**
+         * Store a newly created resource in storage.
+         */
+        public function store(PenilaianRequest $request)
+        {
+            $validatedData = $request->validated();
 
-    /**
-     * Store a newly created resource in storage.
-     */
-    public function store(PenilaianRequest $request)
-    {
-        $validatedData = $request->validated();
+            if ($validatedData) {
+                try {
+                    $penilaian = Penilaian::create($validatedData);
 
-        if ($validatedData) {
-            try {
+                    $permohonan = Permohonan::findOrFail($request->permohonan_id);
+                    $permohonan->update([
+                        'status' => 'assign',
+                    ]);
 
-                $penilaian = Penilaian::create($validatedData);
-
-                $permohonan = Permohonan::findOrFail($request->permohonan_id);
-                $permohonan->update([
-                    'status' => 'assign',
-                ]);
-
-                return redirect()->route('penilaian.index')->with('success', 'Penilaian berhasil disimpan');
-            } catch (Exception $e) {
-                return redirect()->route('penilaian.index')->with('error', $e->getMessage());
+                    return redirect()->route('penilaian.index')->with('success', 'Penilaian berhasil disimpan');
+                } catch (Exception $e) {
+                    return redirect()->route('penilaian.index')->with('error', $e->getMessage());
+                }
             }
         }
-    }
 
+        /**
+         * Show the form for creating a new resource.
+         */
+        public function create($id)
+        {
+            return view('lpj::penilaian.form');
+        }
 
-    /**
-     * Show the specified resource.
-     */
-    public function show($id)
-    {
-        return view('lpj::show');
-    }
+        /**
+         * Update the specified resource in storage.
+         */
+        public function update(PenilaianRequest $request, $id)
+        {
+            $validate = $request->validated();
 
-    /**
-     * Show the form for editing the specified resource.
-     */
-    public function edit($id)
-    {
+            if ($validate) {
+                try {
+                    $penilaian = Penilaian::where('permohonan_id', $id)->firstOrFail();
 
-        $permohonan = Permohonan::with(['user', 'debiture.province','debiture.city','debiture.district','debiture.village','branch', 'tujuanPenilaian'])->findOrFail($id);
+                    $penilaian->update($validate);
+                    $permohonan = Permohonan::findOrFail($id);
+                    $permohonan->update([
+                        'status' => 'assign',
+                    ]);
 
-        $jenisPenilaian = JenisPenilaian::all();
-        $teamPenilai = Teams::with(['regions', 'teamsUsers'])->get();
-
-        $penilaian = Penilaian::where('permohonan_id', $id)->first();
-
-        return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian'));
-    }
-
-    /**
-     * Update the specified resource in storage.
-     */
-    public function update(PenilaianRequest $request, $id)
-    {
-        $validate = $request->validated();
-
-        if ($validate) {
-            try {
-                $penilaian = Penilaian::where('permohonan_id', $id)->firstOrFail();
-
-                $penilaian->update($validate);
-                $permohonan = Permohonan::findOrFail($id);
-                $permohonan->update([
-                    'status' => 'assign',
-                ]);
-
-                return redirect()->route('penilaian.index', $id)->with('success', 'Penilaian berhasil diubah');
-            } catch (Exception $e) {
-                return redirect()->route('penilaian.index', $id)->with('error', $e->getMessage());
+                    return redirect()->route('penilaian.index', $id)->with('success', 'Penilaian berhasil diubah');
+                } catch (Exception $e) {
+                    return redirect()->route('penilaian.index', $id)->with('error', $e->getMessage());
+                }
             }
         }
-    }
 
-
-    /**
-     * Remove the specified resource from storage.
-     */
-    public function destroy($id)
-    {
-        //
-    }
-
-    public function dataForDatatables(Request $request)
-{
-    if (is_null($this->user) || !$this->user->can('debitur.view')) {
-        // abort(403, 'Sorry! You are not allowed to view users.');
-    }
-
-
-    $query = Permohonan::query();
-
-    if ($request->has('search') && !empty($request->get('search'))) {
-        $search = $request->get('search');
-        $query->where(function ($q) use ($search) {
-            $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-            $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-            $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
-            $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
-            $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
-            $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
-            $q->orWhere('status', 'LIKE', '%' . $search . '%');
-        });
-    }
-
-    // Filter to show only records with status 'register'
-    $query->where('status', 'register');
-
-
-    if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-        $order  = $request->get('sortOrder');
-        $column = $request->get('sortField');
-        $query->orderBy($column, $order);
-    }
-
-    $totalRecords = $query->count();
-
-    // Apply pagination if provided
-    if ($request->has('page') && $request->has('size')) {
-        $page   = $request->get('page');
-        $size   = $request->get('size');
-        $offset = ($page - 1) * $size; // Calculate the offset
-
-        $query->skip($offset)->take($size);
-    }
-
-    $filteredRecords = $query->count();
-
-    $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
-
-    $pageCount = ceil($totalRecords / $request->get('size'));
-
-    $currentPage = $page;
-
-
-    return response()->json([
-        'draw'            => $request->get('draw'),
-        'recordsTotal'    => $totalRecords,
-        'recordsFiltered' => $filteredRecords,
-        'pageCount'       => $pageCount,
-        'page'            => $currentPage,
-        'totalCount'      => $totalRecords,
-        'data'            => $data,
-    ]);
-}
-
-
-
-
-
-    public function getUserTeams($id)
-    {
-
-        $teamsUser = TeamsUsers::where('teams_id', $id)->get();
-        $userIds = $teamsUser->pluck('user_id');
-        $users = User::whereIn('id', $userIds)->get();
-
-        if ($users->isNotEmpty()) {
-            return response()->json($users, 200);
+        /**
+         * Show the specified resource.
+         */
+        public function show($id)
+        {
+            return view('lpj::show');
         }
 
-        return response()->json([], 200);
+        /**
+         * Show the form for editing the specified resource.
+         */
+        public function edit($id)
+        {
+            $permohonan = Permohonan::with(
+                [
+                    'user',
+                    'debiture.province',
+                    'debiture.city',
+                    'debiture.district',
+                    'debiture.village',
+                    'branch',
+                    'tujuanPenilaian',
+                ],
+            )->findOrFail($id);
+
+            $jenisPenilaian = JenisPenilaian::all();
+            $teamPenilai    = Teams::with(['regions', 'teamsUsers'])->get();
+
+            $penilaian = Penilaian::where('permohonan_id', $id)->first();
+
+            return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian'));
+        }
+
+        /**
+         * Remove the specified resource from storage.
+         */
+        public function destroy($id)
+        {
+            //
+        }
+
+        public function dataForDatatables(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('debitur.view')) {
+                // abort(403, 'Sorry! You are not allowed to view users.');
+            }
+
+
+            $query = Permohonan::query();
+
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = $request->get('search');
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                });
+            }
+
+            // Filter to show only records with status 'register'
+            $query->where('status', 'register');
+
+
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            $totalRecords = $query->count();
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            $filteredRecords = $query->count();
+
+            $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+
+            $pageCount = ceil($totalRecords / $request->get('size'));
+
+            $currentPage = $page;
+
+
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data,
+            ]);
+        }
+
+
+        public function getUserTeams($id)
+        {
+            $teamsUser = TeamsUsers::where('teams_id', $id)->get();
+            $userIds   = $teamsUser->pluck('user_id');
+            $users     = User::whereIn('id', $userIds)->get();
+
+            if ($users->isNotEmpty()) {
+                return response()->json($users, 200);
+            }
+
+            return response()->json([], 200);
+        }
+
+
     }
-
-
-}
diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php
index 5fe6996..2cd35d0 100644
--- a/app/Http/Controllers/PermohonanController.php
+++ b/app/Http/Controllers/PermohonanController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Lpj\Http\Controllers;
+    namespace Modules\Lpj\Http\Controllers;
 
     use App\Http\Controllers\Controller;
     use Exception;
@@ -21,18 +21,14 @@ namespace Modules\Lpj\Http\Controllers;
     use Modules\Lpj\Models\StatusPermohonan;
     use Modules\Lpj\Models\TujuanPenilaian;
 
-class PermohonanController extends Controller
-{
-    public $user;
-
-    public function index()
+    class PermohonanController extends Controller
     {
-        return view('lpj::permohonan.index');
-    }
+        public $user;
 
-    public function store(PermohonanRequest $request)
-    {
-        $validate = $request->validated();
+        public function index()
+        {
+            return view('lpj::permohonan.index');
+        }
 
         public function store(PermohonanRequest $request)
         {
@@ -53,7 +49,8 @@ class PermohonanController extends Controller
             } else {
                 return redirect()
                     ->route('permohonan.create')
-                    ->with('error', 'Failed to create permohonan' . $e->getMessage());
+                    ->with('success', 'error naon iye')
+                    ->withInput();
             }
         }
 
@@ -308,138 +305,3 @@ class PermohonanController extends Controller
             return redirect()->route('authorization.index')->with('success', 'Permohonan updated successfully');
         }
     }
-
-    public function create()
-    {
-
-        return view('lpj::permohonan.create');
-    }
-
-    public function createPermohonan($debitur)
-    {
-        $branches        = Branch::all();
-        $debitur         = Debiture::find($debitur);
-        $tujuanPenilaian = TujuanPenilaian::all();
-        $status          = StatusPermohonan::all();
-
-        return view('lpj::permohonan.form', compact('branches', 'debitur', 'tujuanPenilaian', 'status'));
-    }
-
-    public function edit($id)
-    {
-        $permohonan      = Permohonan::find($id);
-        $branches        = Branch::all();
-        $debitur       = Debiture::find($permohonan->debiture_id);
-        $tujuanPenilaian = TujuanPenilaian::all();
-        $status          = StatusPermohonan::all();
-
-        return view(
-            'lpj::permohonan.form',
-            compact('permohonan', 'branches', 'debitur', 'tujuanPenilaian', 'status'),
-        );
-    }
-
-    public function update(PermohonanRequest $request, $id)
-    {
-        $validate = $request->validated();
-
-        if ($validate) {
-            try {
-                // Update in database
-                $permohonan = Permohonan::find($id);
-                $permohonan->update($validate);
-                return redirect()
-                    ->route('permohonan.index')
-                    ->with('success', 'Permohonan updated successfully');
-            } catch (Exception $e) {
-                return redirect()
-                    ->route('permohonan.edit', $id)
-                    ->with('error', 'Failed to update permohonan');
-            }
-        }
-    }
-
-    public function destroy($id)
-    {
-        try {
-            // Delete from database
-            $permohonan = Permohonan::find($id);
-            $permohonan->delete();
-
-            echo json_encode(['success' => true, 'message' => 'Permohonan deleted successfully']);
-        } catch (Exception $e) {
-            echo json_encode(['success' => false, 'message' => 'Failed to delete permohonan']);
-        }
-    }
-
-    public function dataForDatatables(Request $request)
-    {
-        if (is_null($this->user) || !$this->user->can('debitur.view')) {
-            //abort(403, 'Sorry! You are not allowed to view users.');
-        }
-
-        // Retrieve data from the database
-        $query = Permohonan::query();
-
-        // Apply search filter if provided
-        if ($request->has('search') && !empty($request->get('search'))) {
-            $search = $request->get('search');
-            $query->where(function ($q) use ($search) {
-                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhere('status', 'LIKE', '%' . $search . '%');
-            });
-        }
-
-        // Apply sorting if provided
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField');
-            $query->orderBy($column, $order);
-        }
-
-        // Get the total count of records
-        $totalRecords = $query->count();
-
-        // Apply pagination if provided
-        if ($request->has('page') && $request->has('size')) {
-            $page   = $request->get('page');
-            $size   = $request->get('size');
-            $offset = ($page - 1) * $size; // Calculate the offset
-
-            $query->skip($offset)->take($size);
-        }
-
-        // Get the filtered count of records
-        $filteredRecords = $query->count();
-
-        // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
-
-        // Calculate the page count
-        $pageCount = ceil($totalRecords / $request->get('size'));
-
-        // Calculate the current page number
-        $currentPage = 0 + 1;
-
-        // Return the response data as a JSON object
-        return response()->json([
-            'draw'            => $request->get('draw'),
-            'recordsTotal'    => $totalRecords,
-            'recordsFiltered' => $filteredRecords,
-            'pageCount'       => $pageCount,
-            'page'            => $currentPage,
-            'totalCount'      => $totalRecords,
-            'data'            => $data,
-        ]);
-    }
-
-    public function export()
-    {
-        return Excel::download(new PermohonanExport(), 'permohonan.xlsx');
-    }
-}
diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php
index 6ea1260..68e7bc0 100644
--- a/resources/views/penilaian/form.blade.php
+++ b/resources/views/penilaian/form.blade.php
@@ -18,7 +18,229 @@
 
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+        <div class="card">
+            <div class="card-header" id="advanced_settings_appearance">
+                <h3 class="card-title">
+                    Data Permohonan
+                </h3>
+            </div>
+            <div class="card-body lg:py-7.5 grid grid-cols-3">
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Nomor Register Permohonan:
+                    </h3>
+                    <span class="text-2sm text-gray-700">
+                        {{ $permohonan->nomor_registrasi }}
+                    </span>
+                </div>
 
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Pemohon:
+                    </h3>
+                    <span class="text-2sm text-gray-700">
+                        {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
+                    </span>
+                </div>
+
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Tujan Permohonan:
+                    </h3>
+                    <span class="text-2sm text-gray-700">
+                        {{ $permohonan->tujuanPenilaian->name }}
+                    </span>
+                </div>
+
+            </div>
+        </div>
+
+        <div class="card min-w-full">
+            <div class="card-header">
+                <h3 class="card-title">
+                    Detail Debutur
+                </h3>
+            </div>
+            <div class="card-table scrollable-x-auto pb-3">
+                <div class="grid grid-cols-1 xl:grid-cols-2 gap-5 lg:gap-7.5">
+                    <div class="col-span-1">
+                        <table class="table align-middle text-sm text-gray-500">
+                            <tr>
+                                <td class="py-2 text-gray-600 font-normal">
+                                    Name
+                                </td>
+                                <td class="py-2 text-gray-800 font-normaltext-sm">
+                                    {{ $permohonan->debiture->name ?? "" }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="py-3">
+                                    Email
+                                </td>
+                                <td class="py-3 text-gray-700 text-2sm font-normal">
+                                    {{ $permohonan->debiture->email ?? "" }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="py-3">
+                                    Phone
+                                </td>
+                                <td class="py-3 text-gray-700 text-2sm font-normal">
+                                    {{ $permohonan->debiture->phone ?? "" }}
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td class="py-3 text-gray-600 font-normal">
+                                    Address
+                                </td>
+                                <td class="py-3 text-gray-700 text-sm font-normal">
+                                    {{ $permohonan->debiture->address ?? "" }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="py-3 text-gray-600 font-normal">
+                                    &nbsp;
+                                </td>
+                                <td class="py-3 text-gray-700 text-sm font-normal">
+                                    {{ $permohonan->debiture->village->name ?? "" }}, {{ $permohonan->debiture->district->name ?? "" }}, {{ $permohonan->debiture->city->name ?? "" }}, {{ $permohonan->debiture->province->name ?? "" }} - {{ $permohonan->debiture->village->postal_code ?? "" }}
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                    <div class="col-span-1">
+                        <table class="table align-middle text-sm text-gray-500">
+                            <tr>
+                                <td class="py-3 text-gray-600 font-normal">
+                                    Cabang
+                                </td>
+                                <td class="py-2 text-gray-800 font-normaltext-sm">
+                                    {{ $permohonan->debiture->branch->name  ?? "" }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="py-3 text-gray-600 font-normal">
+                                    CIF
+                                </td>
+                                <td class="py-2 text-gray-800 font-normaltext-sm">
+                                    {{ $permohonan->debiture->cif ?? "" }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="py-3 text-gray-600 font-normal">
+                                    Nomor Rekening
+                                </td>
+                                <td class="py-3 text-gray-700 text-sm font-normal">
+                                    {{ $permohonan->debiture->nomor_rekening ?? "" }}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="py-3">
+                                    NPWP
+                                </td>
+                                <td class="py-3 text-gray-700 text-2sm font-normal">
+                                    {{ $permohonan->debiture->npwp ?? "" }}
+                                </td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="card min-w-full">
+            <div class="card-header">
+                <h3 class="card-title">
+                    Data Jaminan
+                </h3>
+            </div>
+            <div data-accordion="true">
+                @foreach($permohonan->debiture->documents as $dokumen)
+                    <div class="accordion-item [&:not(:last-child)]:border-b border-b-gray-200" data-accordion-item="true" id="accordion_1_item_1">
+                        <button class="accordion-toggle py-4 group mx-8" data-accordion-toggle="#accordion_1_content_1">
+                            <span class="text-base text-gray-900 font-medium">
+                                Jaminan {{ $loop->index + 1 }}
+                            </span>
+                            <i class="ki-outline ki-plus text-gray-600 text-2sm accordion-active:hidden block">
+                            </i>
+                            <i class="ki-outline ki-minus text-gray-600 text-2sm accordion-active:block hidden">
+                            </i>
+                        </button>
+                        <div class="accordion-content hidden" id="accordion_1_content_1">
+                            <div class="card-body lg:py-7.5 grid grid-cols-2">
+                                <div class="mb-5">
+                                    <h3 class="text-md font-medium text-gray-900">
+                                        Pemilik Jaminan:
+                                    </h3>
+                                    <span class="text-2sm text-gray-700">
+                                        {{ $dokumen->pemilik->name?? "" }}
+                                    </span>
+                                </div>
+                                <div class="mb-5">
+                                    <h3 class="text-md font-medium text-gray-900">
+                                        Jenis Jaminan:
+                                    </h3>
+                                    <span class="text-2sm text-gray-700">
+                                        {{ $dokumen->jenisJaminan->name?? "" }}
+                                    </span>
+                                </div>
+                                <div class="mb-5">
+                                    <h3 class="text-md font-medium text-gray-900">
+                                        Hubungan Pemilik Jaminan:
+                                    </h3>
+                                    <span class="text-2sm text-gray-700">
+                                        {{ $dokumen->pemilik->hubungan_pemilik->name?? "" }}
+                                    </span>
+                                </div>
+                                <div class="mb-5">
+                                    <h3 class="text-md font-medium text-gray-900">
+                                        Alamat Pemilik Jaminan:
+                                    </h3>
+                                    <span class="text-2sm text-gray-700">
+                                        {{ $dokumen->pemilik->address ?? ""}},
+                                        <br> {{ $dokumen->pemilik->village->name ?? "" }}, {{ $dokumen->pemilik->district->name ?? "" }}, {{ $dokumen->pemilik->city->name ?? "" }}, {{ $dokumen->pemilik->province->name ?? "" }} - {{ $dokumen->pemilik->village->postal_code ?? "" }}
+                                    </span>
+                                </div>
+                            </div>
+                            <div class="card-table scrollable-x-auto pb-3">
+                                <table class="table align-middle text-sm text-gray-500">
+                                    @foreach($dokumen->detail as $detail)
+                                        <tr>
+                                            <td class="py-2 text-gray-600 font-normal max-w-[100px]">
+                                                {{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }}
+                                            </td>
+                                            <td class="py-2 text-gray-800 font-normaltext-sm">
+                                                {{ $detail->name ?? "" }}
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="py-3  max-w-[100px]">
+                                                Dokumen Jaminan
+                                            </td>
+                                            <td class="py-3 text-gray-700 text-2sm font-normal">
+                                                @if(isset($detail->dokumen_jaminan))
+                                                    <a href="{{ route('debitur.jaminan.download',['id'=>$permohonan->debiture->id,'dokumen'=>$detail->id]) }}" class="badge badge-sm badge-outline mt-2">{{ basename($detail->dokumen_jaminan) }}
+                                                        <i class="ki-filled ki-cloud-download"></i></a>
+                                                @endif
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="py-3  max-w-[100px]">
+                                                Keterangan
+                                            </td>
+                                            <td class="py-3 text-gray-700 text-2sm font-normal">
+                                                {{ $detail->keterangan ?? ""  }}
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+        </div>
+        
         <div class="card pb-2.5">
             <div class="card-header" id="basic_settings">
                 <h3 class="card-title">
@@ -34,12 +256,8 @@
                 <form
                     action="{{ isset($penilaian->permohonan_id) ? route('penilaian.update', $permohonan) : route('penilaian.store') }}"
                     method="POST" class="">
-
                     @if (isset($penilaian->permohonan_id))
                         @method('PUT')
-                        <input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
-                    @else
-                        <input type="number" name="permohonan_id" value="{{ $permohonan->id }}">
                     @endif
                     @csrf
                     <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5 p-5">
@@ -47,11 +265,13 @@
                             <label class="form-label max-w-56">
                                 Penilai yang Dilakukan oleh
                             </label>
+                            <input type="hidden" name="permohonan_id" value="{{ $penilaian->permohonan_id ?? $permohonan->id  }}">
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select
                                     class="input tomselect w-full @error('jenis_penilaian_id') border-danger bg-danger-light @enderror"
                                     name="jenis_penilaian_id" id="jenis_penilaian_id">
                                     <option value="">Jenis Penilaian</option>
+
                                     @foreach ($jenisPenilaian as $item)
                                         @if (isset($penilaian->permohonan_id))
                                             <option value="{{ $item->id }}"