memperbaiki conflicts --> add feature Data Proses Penawaran

app/Exports/PermohonanExport.php

@@ -28,8 +28,8 @@
                 $row->branch->name,
                 $row->tujuanPenilaian->name,
                 $row->debiture->name,
-                $row->fasilitasKredit->name,
+                $row->jenisFasilitasKredit->name,
-                $row->plafond->name,
+                $row->nilaiPlafond->name,
                 $row->status,
                 $row->authorized_at,
                 $row->authorized_status,

app/Http/Controllers/ActivityController.php

@@ -7,7 +7,11 @@ use Exception;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\Penilaian;
+use Modules\Lpj\Models\TeamsUsers;
 use Modules\Lpj\Models\StatusPermohonan;
+use Modules\Lpj\Exports\PermohonanExport;
+use Maatwebsite\Excel\Facades\Excel;
 
 class ActivityController extends Controller
 {
@@ -25,6 +29,39 @@ class ActivityController extends Controller
      * Show the form for creating a new resource.
      */
 
+
+    public function progres_activity()
+    {
+        // Ambil user yang sedang login
+        $user = auth()->user();
+        $roles = $user->load('roles');
+        $regionId = null;
+
+        // Cek apakah user memiliki role 'senior officer'
+        if ($roles->roles->pluck('name')->contains('senior officer')) {
+            $regionId = TeamsUsers::with('team.regions')
+                ->where('user_id', $user->id)
+                ->first()?->team->regions_id;
+        }
+
+        $teamsActivity = TeamsUsers::with(['user', 'team', 'team.regions'])
+            ->whereHas('team', function ($q) use ($regionId) {
+                if ($regionId) {
+                    $q->where('regions_id', $regionId);
+                }
+            })
+            ->where('user_id', '!=', $user->id)
+            ->get();
+
+        return view('lpj::activity.progres_activity.index', compact('teamsActivity'));
+    }
+
+
+    public function senior()
+    {
+        return view('lpj::activity.senior_officer.index');
+    }
+
     /**
      * Store a newly created resource in storage.
      */
@@ -39,7 +76,7 @@ class ActivityController extends Controller
     public function show($id)
     {
 
-        $status_permohonan = StatusPermohonan::orderBy('id')->get();
+        $status_permohonan = StatusPermohonan::orderBy('id')->get()->reverse();
 
         $permohonan = Permohonan::with(
             [
@@ -67,9 +104,9 @@ class ActivityController extends Controller
 
     /**
      * Update the specified resource in storage.
-     */
+     */public function dataForDatatables(Request $request)
-     public function dataForDatatables(Request $request)
     {
+        // Check permissions
         if (is_null($this->user) || !$this->user->can('debitur.view')) {
             // abort(403, 'Sorry! You are not allowed to view users.');
         }
@@ -81,20 +118,19 @@ class ActivityController extends Controller
         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->where('nomor_registrasi', 'LIKE', '%' . $search . '%')
-                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                  ->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%')
-                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                  ->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%')
-                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+                  ->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%')
-                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                  ->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%')
-                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                  ->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhere('status', 'LIKE', '%' . $search . '%');
-            });
-        }
 
-        // Apply status filter if provided
+                // Split search term by comma to allow multiple statuses
-        if ($request->has('status') && !empty($request->get('status'))) {
+                $statusKeywords = explode(',', $search);
-            $status = $request->get('status');
+                foreach ($statusKeywords as $keyword) {
-            $query->where('status', '=', $status);
+                    $q->orWhere('status', 'LIKE', '%' . trim($keyword) . '%');
+                }
+            });
         }
 
         // Default sorting if no sort provided
@@ -103,32 +139,29 @@ class ActivityController extends Controller
             $column = $request->get('sortField');
             $query->orderBy($column, $order);
         } else {
-            $query->orderBy('nomor_registrasi', 'asc'); // Default order by nomor_registrasi
+            $query->orderBy('nomor_registrasi', 'asc');
         }
 
-        // Get the total count of records before paginating
+        // Get total count of records before pagination
         $totalRecords = $query->count();
 
-        // Apply pagination if provided
+        // Pagination
         if ($request->has('page') && $request->has('size')) {
-            $page = (int) $request->get('page', 1);  // Default page is 1
+            $page = (int) $request->get('page', 1);
-            $size = (int) $request->get('size', 10); // Default size is 10
+            $size = (int) $request->get('size', 10);
-            $offset = ($page - 1) * $size; // Calculate the offset
+            $offset = ($page - 1) * $size;
-
-            // Limit results based on pagination
             $query->skip($offset)->take($size);
         }
 
-        // Get the filtered count of records (after search & filters applied)
+        // Get filtered count
         $filteredRecords = $query->count();
 
-        // Get the data for the current page
+        // Get data
         $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
 
-        // Calculate the total number of pages
+        // Calculate total pages
         $pageCount = ceil($totalRecords / $request->get('size', 10));
 
-        // Return the response data as a JSON object
         return response()->json([
             'draw'            => $request->get('draw'),
             'recordsTotal'    => $totalRecords,
@@ -141,6 +174,7 @@ class ActivityController extends Controller
     }
 
 
+
     /**
      * Download the specified resource from storage.
      */
@@ -149,4 +183,64 @@ class ActivityController extends Controller
         $document = Permohonan::find($id);
         return response()->download(storage_path('app/public/' . $document->dokumen));
     }
+
+    public function export()
+    {
+        return Excel::download(new PermohonanExport(), 'activity.xlsx');
+    }
+
+
+
+
+    public function dataTablesForActivity(Request $request, $id)
+    {
+        // Query Penilaian dengan relasi yang diperlukan
+        $query = Penilaian::with(['permohonan', 'permohonan.debiture', 'permohonan.tujuanPenilaian'])
+                    ->where(function($q) use ($id) {
+                        $q->where('surveyor_id', $id)
+                          ->orWhere('penilaian_id', $id)
+                          ->orWhere('penilai_surveyor_id', $id);
+                    });
+
+        // Filter pencarian
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', "%$search%")
+                  ->orWhere('status', 'LIKE', "%$search%");
+            });
+        }
+
+        // Sorting
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Hitung total records
+        $totalRecords = $query->count();
+
+        // Pagination
+        $size = $request->get('size', 10);
+        $page = $request->get('page', 1);
+        $offset = ($page - 1) * $size;
+
+        // Ambil data dengan pagination
+        $data = $query->skip($offset)->take($size)->get();
+        $filteredRecords = $data->count();
+        $pageCount = ceil($totalRecords / $size);
+
+        // Return data dalam bentuk JSON
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $page,
+            'totalCount'      => $totalRecords,
+            'data'            => $data
+        ]);
+    }
+
 }

app/Http/Controllers/KJPPController.php

@@ -35,7 +35,6 @@ class KJPPController extends Controller
      */
     public function create()
     {
-        $branch = Branch::all();
         $ijin_usaha = IjinUsaha::all();
         $jenis_aset = JenisJaminan::all();
         $provinces = Province::all();
@@ -48,7 +47,7 @@ class KJPPController extends Controller
         // Combine KJPP number with branch code
         $fullKjppNumber = $kjppNumber;
 
-        return view('lpj::kjpp.create', compact('branch', 'ijin_usaha', 'jenis_aset', 'provinces', 'fullKjppNumber'));
+        return view('lpj::kjpp.create', compact('ijin_usaha', 'jenis_aset', 'provinces', 'fullKjppNumber'));
     }
 
     /**
@@ -98,13 +97,12 @@ class KJPPController extends Controller
         $ijin_usaha = IjinUsaha::where('code', $kjpp->nomor_ijin_usaha)->get();
         $ijin_usahas = IjinUsaha::all();
         $jenis_jaminan = JenisJaminan::all();
-        $branches = Branch::where('name', $kjpp->jenis_kantor)->get();
         $provinces = Province::where('code', $kjpp->province_code)->get();
         $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', 'branches', 'kjpp', 'provinces', 'cities', 'districts', 'villages'));
+        return view('lpj::kjpp.show', compact('jenis_jaminan', 'ijin_usahas', 'ijin_usaha', 'kjpp', 'provinces', 'cities', 'districts', 'villages'));
     }
 
     /**
@@ -113,7 +111,6 @@ class KJPPController extends Controller
     public function edit($id)
     {
         $kjpp = KJPP::find($id);
-        $branch = Branch::all();
         $ijin_usaha = IjinUsaha::all();
         $jenis_aset = JenisJaminan::all();
         $provinces = Province::all();
@@ -121,7 +118,7 @@ class KJPPController extends Controller
         $districts = District::where('city_code', $kjpp->city_code)->get();
         $villages  = Village::where('district_code', $kjpp->district_code)->get();
 
-        return view('lpj::kjpp.create', compact('kjpp', 'branch', 'ijin_usaha', 'jenis_aset', 'provinces', 'cities', 'districts', 'villages'));
+        return view('lpj::kjpp.create', compact('kjpp', 'ijin_usaha', 'jenis_aset', 'provinces', 'cities', 'districts', 'villages'));
     }
 
     /**

app/Http/Controllers/PenilaianController.php

@@ -30,10 +30,11 @@ class PenilaianController extends Controller
     /**
      * Store a newly created resource in storage.
      */
+
     public function store(PenilaianRequest $request)
     {
-        //print_r($request->all());exit;
         $validatedData = $request->validated();
+
         if ($validatedData) {
             try {
                 $penilaian = Penilaian::create($validatedData);
@@ -98,12 +99,28 @@ class PenilaianController extends Controller
             ],
         )->findOrFail($id);
 
-        $jenisPenilaian = JenisPenilaian::all();
+        $idPenilaian =   $permohonan->jenis_penilaian_id;
-        $teamPenilai    = Teams::with(['regions', 'teamsUsers'])->get();
+        $idRegion = $permohonan->region_id;
+
+        $jenisPenilaian = JenisPenilaian::find($idPenilaian);
+
+
+        $teamPenilai = Teams::with(['regions', 'teamsUsers', 'teamsUsers.user', ])
+        ->whereHas('regions', function ($q) use ($idRegion) {
+            $q->where('id', $idRegion);
+        })->get();
+
+
+        $regionName = null;
+        foreach ($teamPenilai as $item) {
+            $regionName = $item->regions;
+        }
+
+        // dd($teamPenilai);
 
         $penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first();
 
-        return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian'));
+        return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian', 'regionName'));
     }
 
     /**
@@ -128,15 +145,13 @@ class PenilaianController extends Controller
                     'status' => 'revisi',
                 ];
 
-                // dump($dataToUpdate);
 
                 $permohonan = Permohonan::where('nomor_registrasi', $nomor_registrasi)->first();
 
                 $permohonan->update($dataToUpdate);
                 return redirect()->route('penilaian.index')->with('success', 'Penilaian berhasil direvisi');
             } catch (Exception $e) {
-                dump($e->getMessage());
+                return redirect()->route('penilaian.index')->with('error', $e->getMessage());
-                // return redirect()->route('penilaian.index')->with('error', $e->getMessage());
             }
         }
     }
@@ -164,7 +179,7 @@ class PenilaianController extends Controller
             });
         }
 
-        $query->whereRaw('LOWER(status) = ?', ['register']);
+        $query->whereRaw('LOWER(status) = ?', ['registered']);
 
         if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
@@ -205,20 +220,132 @@ class PenilaianController extends Controller
 
 
 
-    public function getUserTeams($id)
-    {
-        $teamsUser = TeamsUsers::where('teams_id', $id)->get();
-        $userIds   = $teamsUser->pluck('user_id');
-        $users     = User::whereIn('id', $userIds)
-        ->with('roles')
-        ->get();
 
 
-        if ($users->isNotEmpty()) {
+    public function otorisator(Request $request){
-            return response()->json($users, 200);
+
+        $type = $request->route('type');
+        $header = '';
+
+        switch ($type) {
+            case 'pelaporan':
+                $header = 'Pelaporan';
+                break;
+            case 'pembayaran':
+                $header = 'Pembayaran';
+                break;
+            case 'pembatalan':
+                $header = 'Pembatalan';
+                break;
+            case 'sla':
+                $header = 'SLA';
+                break;
+            default:
+                $header = 'Pelaporan';
+                break;
         }
 
-        return response()->json([], 200);
+        return view('lpj::penilaian.otorisator.index', compact('header'));
+    }
+
+    public function show($id){
+
+        $permohonan = Permohonan::find($id);
+
+        return view('lpj::penilaian.otorisator.show', compact('permohonan'));
+    }
+
+
+
+    public function dataForAuthorization(Request $request, $otorisator)
+    {
+
+        if (is_null($this->user) || !$this->user->can('debitur.view')) {
+            // abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+
+        $status = '';
+
+        switch ($otorisator) {
+            case 'Pelaporan':
+                $status = 'proses paparan';
+                break;
+            case 'Pembayaran':
+                $status = 'proses pembayaran';
+                break;
+            default:
+                $status = '';
+                break;
+        }
+
+
+        $query = Permohonan::query();
+
+        // Pencarian berdasarkan parameter search
+        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 . '%');
+            });
+        }
+
+
+        if (!empty($otorisator)) {
+            $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
+        }
+
+        // Sorting berdasarkan sortField dan sortOrder
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Hitung total records
+        $totalRecords = $query->count();
+
+        // Pagination (default page size 10)
+        $size = $request->get('size', 10);
+        if ($size == 0) {
+            $size = 10;
+        }
+
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page', 1);
+            $offset = ($page - 1) * $size;
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Filtered records
+        $filteredRecords = $query->count();
+
+        // Ambil data dengan relasi
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+
+        // Hitung jumlah halaman
+        $pageCount = ceil($totalRecords / $size);
+
+        // Ambil current page
+        $currentPage = max(1, $request->get('page', 1));
+
+        // Return JSON response
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
     }
 
 

app/Http/Controllers/ProsesPenawaranController.php

@@ -4,7 +4,6 @@ namespace Modules\Lpj\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Modules\Lpj\Models\Penawaran;
 use App\Http\Controllers\Controller;
 use Exception;
 use Maatwebsite\Excel\Facades\Excel;

app/Http/Controllers/SurveyorController.php

@@ -0,0 +1,140 @@
+<?php
+
+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\Permohonan;
+
+class SurveyorController extends Controller
+{
+    public $user;
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('lpj::surveyor.index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('lpj::create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+        $permohonan = Permohonan::with(
+            [
+                'user',
+                'debiture.province',
+                'debiture.city',
+                'debiture.district',
+                'debiture.village',
+                'branch',
+                'tujuanPenilaian',
+                'penilaian'
+            ],
+        )->findOrFail($id);
+        return view('lpj::surveyor.detail', compact('permohonan'));
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        return view('lpj::edit');
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, $id): RedirectResponse
+    {
+        //
+    }
+
+    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 . '%');
+            });
+        }
+
+        $query->whereRaw('LOWER(status) = ?', ['assign']);
+
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        $totalRecords = $query->count();
+
+        $size = $request->get('size', 10);
+        if ($size == 0) {
+            $size = 10;
+        }
+
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page', 1);
+            $offset = ($page - 1) * $size;
+
+            $query->skip($offset)->take($size);
+        }
+
+        $filteredRecords = $query->count();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'jenisFasilitasKredit'])->get();
+
+        $pageCount = ceil($totalRecords / $size);
+
+        $currentPage = max(1, $request->get('page', 1));
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}

app/Http/Controllers/TenderController.php

@@ -2,19 +2,20 @@
 
 namespace Modules\Lpj\Http\Controllers;
 
+use Exception;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
+use Modules\Lpj\Models\KJPP;
-use Modules\Lpj\Models\Penawaran;
+use Illuminate\Support\Facades\DB;
+use Modules\Lpj\Models\Permohonan;
 use App\Http\Controllers\Controller;
 use Maatwebsite\Excel\Facades\Excel;
-use Modules\Lpj\Models\PenawaranTender;
-use Modules\Lpj\Exports\PenawaranTenderExport;
-use Modules\Lpj\Http\Requests\TenderPenawaranRequest;
 use Modules\Lpj\Models\JenisLaporan;
-use Modules\Lpj\Models\KJPP;
+use Modules\Lpj\Models\PenawaranTender;
-use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\StatusPermohonan;
 use Modules\Lpj\Models\TujuanPenilaianKJPP;
+use Modules\Lpj\Models\PenawaranDetailTender;
+use Modules\Lpj\Exports\PenawaranTenderExport;
+use Modules\Lpj\Http\Requests\TenderPenawaranRequest;
 
 class TenderController extends Controller
 {
@@ -31,71 +32,218 @@ class TenderController extends Controller
     /**
      * Show the form for creating a new resource.
      */
-    public function penawaran_create($id)
+    public function penawaran_create($noreg)
     {
-        $penawaran = PenawaranTender::find($id);
+        $penawaranExists = PenawaranTender::where('nomor_registrasi', '=', $noreg)->exists();
+
+        // Jika nomor_registrasi sudah ada, kembalikan respon 403 Forbidden
+        if ($penawaranExists) {
+            return redirect()->route('tender.penawaran.editPenawaran', ['noreg' => $noreg])
+                ->with('error', 'Penawaran dengan nomor registrasi ini sudah ada, Anda akan diarahkan ke halaman edit.');
+        }
+
+        $permohonan = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
 
         $status = StatusPermohonan::all();
         $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all();
         $jenis_laporan = JenisLaporan::all();
+
         $kjpp = KJPP::all();
 
-        return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'penawaran', 'id'));
+        return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'noreg', 'permohonan'));
     }
 
     /**
      * Store a newly created resource in storage.
      */
-    public function penawaran_store(TenderPenawaranRequest $request, $id)
+    public function penawaran_store(TenderPenawaranRequest $request, $noreg)
     {
         $validated = $request->validated();
 
-        if ($validated) {
+        DB::beginTransaction();
-            $penawaran = PenawaranTender::find($id);
 
-            $validated['nomor_registrasi'] = $penawaran->nomor_registrasi;
+        try {
+            $permohonan = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
 
-            $validated['nama_kjpp_sebelumnya'] = json_encode($request->input('nama_kjpp_sebelumnya'));
+            // Add created_by/updated_by from the authenticated user
+            $userId = auth()->user()->id;
 
-            dd($validated);
+            $validated['nomor_registrasi'] = $permohonan->nomor_registrasi;
 
-            PenawaranTender::create($validated);
+            $validated['status'] = $request->input('status') ?? 'tender';
+            $validated['updated_by'] = $userId; // Updating the record
+            $permohonan->update($validated);
+
+            // Adding created_by for the new PenawaranTender record
+            $validated['created_by'] = $userId;
+            $penawaranId = PenawaranTender::create($validated);
+
+            $kjpps = $request->input('kjpp', []);
+
+            foreach ($kjpps as $kjpp) {
+                PenawaranDetailTender::create([
+                    'penawaran_id' => $penawaranId->id,
+                    'kjpp_rekanan_id' => $kjpp,
+                    'created_by' => $userId, // Set created_by for details
+                    'updated_by' => $userId
+                ]);
+            }
+
+            // Commit the transaction
+            DB::commit();
 
             return redirect()
                 ->route('tender.penawaran.index')
                 ->with('success', 'Data Penawaran created successfully');
-        } else {
+        } catch (Exception $e) {
+            DB::rollBack();
+
             return redirect()
-                ->route('tender.penawaran.createPenawaran', $id)
+                ->route('tender.penawaran.createPenawaran', $noreg)
-                ->with('error', 'Validation failed');
+                ->with('error', 'Validation failed: ' . $e);
         }
     }
 
     /**
      * Show the specified resource.
      */
-    public function penawaran_show($id)
+    public function penawaran_show($noreg)
     {
-        $penawaran = PenawaranTender::find($id);
+        $penawaran = null;
-        return view('lpj::penawaran.show', compact('id', 'penawaran'));
+        $kjpps = null;
+        $tujuan_penilaian_kjpp = null;
+        $jenis_laporan = null;
+
+        $penawaranExists = PenawaranTender::where('nomor_registrasi', $noreg)->exists();
+
+        $penawaran1 = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+        // dd($penawaran1->id);
+        if ($penawaran1) {
+            $penawaran = $penawaran1;
+            $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $penawaran1->id)->where('status', '=', 1)->pluck('kjpp_rekanan_id')->toArray();
+            $kjpps = KJPP::whereIn('id', $detail_penawaran)->get();
+            $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::where('id', $penawaran->tujuan_penilaian_kjpp_id)->get();
+            $jenis_laporan = JenisLaporan::where('id', $penawaran->jenis_laporan_id)->get();
+        } else {
+            $penawaran2 = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
+            $penawaran = $penawaran2;
+        }
+
+        // dd($kjpps);
+
+        return view('lpj::penawaran.show', compact('noreg', 'penawaran', 'kjpps', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'penawaranExists'));
     }
 
     /**
      * Show the form for editing the specified resource.
      */
-    public function edit($id)
+    public function penawaran_edit($noreg)
     {
-        return view('lpj::edit');
+        // Find the specific penawaran by its ID
+        $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+        $permohonan = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
+
+        $status = StatusPermohonan::all();
+        $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all();
+        $jenis_laporan = JenisLaporan::all();
+
+        $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $penawaran->id)->where('status', '=', 1)->pluck('kjpp_rekanan_id')->toArray();
+        $kjpps = KJPP::whereIn('id', $detail_penawaran)->pluck('id')->toArray();
+
+        $kjpp = KJPP::all();
+
+        return view('lpj::penawaran.edit', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'penawaran', 'noreg', 'kjpps', 'permohonan'));
     }
 
+
     /**
      * Update the specified resource in storage.
      */
-    public function update(Request $request, $id)
+    public function penawaran_update(TenderPenawaranRequest $request, $noreg)
     {
-        //
+        $validated = $request->validated();
+
+        DB::beginTransaction();
+
+        try {
+            // Ambil data penawaran berdasarkan nomor registrasi
+            $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+            $permohonan = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
+
+            // Ambil ID user yang sedang login
+            $userId = auth()->user()->id;
+
+            // Jangan ubah created_by untuk data yang sudah ada
+            $validated['nomor_registrasi'] = $penawaran->nomor_registrasi;
+            $validated['status'] = $request->input('status') ?? 'tender';
+            $validated['created_by'] = $userId;
+            $validated['updated_by'] = $userId; // Hanya update 'updated_by'
+
+            // Update data penawaran dan permohonan
+            $penawaran->update($validated);
+            $permohonan->update($validated);
+
+            $kjpps = $request->input('kjpp', []);
+
+            // Ubah status KJPP lama menjadi 0 jika tidak ada dalam request
+            foreach ($penawaran->penawaranKjpp as $kjpp) {
+                if (!in_array($kjpp->kjpp_rekanan_id, $kjpps)) {
+                    // Ubah status KJPP lama menjadi 0
+                    $kjpp->status = 0;
+                    $kjpp->created_by = $userId;
+                    $kjpp->updated_by = $userId; // Set updated_by
+                    $kjpp->save();
+                }
+            }
+
+            // Tangani penambahan atau perubahan KJPP baru
+            foreach ($kjpps as $kjpp) {
+                $existingDetail = PenawaranDetailTender::where('penawaran_id', $penawaran->id)
+                    ->where('kjpp_rekanan_id', $kjpp)
+                    ->first();
+
+                // dd($existingDetail);
+
+                if ($existingDetail) {
+                    // Jika KJPP sudah ada, pastikan statusnya aktif (1)
+                    if ($existingDetail->status == 0) {
+                        $existingDetail->status = 1;
+                        $existingDetail->created_by = $userId;
+                        $existingDetail->updated_by = $userId; // Set updated_by
+                        $existingDetail->save();
+                    }
+                } else {
+                    // Buat data baru jika tidak ada dalam database
+                    PenawaranDetailTender::create([
+                        'penawaran_id' => $penawaran->id,
+                        'kjpp_rekanan_id' => $kjpp,
+                        'status' => 1, // Default status untuk KJPP baru adalah 1
+                        'created_by' => $userId, // Set created_by untuk data baru
+                        'updated_by' => $userId, // Set updated_by juga
+                    ]);
+                }
+            }
+
+            // Commit transaksi
+            DB::commit();
+
+            return redirect()
+                ->route('tender.penawaran.index')
+                ->with('success', 'Data Penawaran updated successfully');
+        } catch (Exception $e) {
+            // Rollback jika ada kesalahan
+            DB::rollBack();
+
+            return redirect()
+                ->route('tender.penawaran.createPenawaran', $noreg)
+                ->with('error', 'Validation failed: ' . $e->getMessage());
+        }
     }
 
+
+
+
+
     /**
      * Remove the specified resource from storage.
      */
@@ -111,15 +259,19 @@ class TenderController extends Controller
         }
 
         // Retrieve data from the database
-        $query = PenawaranTender::query();
+        $query = Permohonan::query()->where('status', '=', 'registered')->where('jenis_penilaian_id', '=', 2);
 
         // 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('code', 'LIKE', "%$search%");
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                $q->orWhere('nama_kjpp_sebelumnya', 'LIKE', "%$search%");
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-                $q->orWhere('tanggal_penilaian_sebelumnya', '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 . '%');
             });
         }
 
@@ -146,7 +298,7 @@ class TenderController extends Controller
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        $data = $query->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $request->get('size'));
@@ -168,7 +320,79 @@ class TenderController extends Controller
 
     public function exportPenawaran()
     {
-        return Excel::download(new PenawaranTenderExport, 'kjpp.xlsx');
+        return Excel::download(new PenawaranTenderExport, 'penawarantender.xlsx');
+    }
+
+    // penawaran ulang
+    public function penawaran_ulang_index()
+    {
+        return view('lpj::penawaran_ulang/index');
+    }
+
+    public function datatablesPenawaranUlang(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('penawaran_ulang.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        // Retrieve data from the database
+        $query = Permohonan::query()->where('status', '=', 'tender')->where('jenis_penilaian_id', '=', 2);
+
+        // 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 proses_penawaran_index()
@@ -176,8 +400,13 @@ class TenderController extends Controller
         return view('lpj::proses_penawaran/index');
     }
 
-    public function penawaran_ulang_index()
+    // Tambahkan method untuk API di controller
+    public function checkPenawaranExistence($nomor_registrasi)
     {
-        return view('lpj::penawaran_ulang/index');
+        // Cek apakah nomor_registrasi ada dalam tabel penawaran
+        $exists = PenawaranTender::where('nomor_registrasi', $nomor_registrasi)->exists();
+
+        // Kembalikan hasil pengecekan sebagai JSON
+        return response()->json(['exists' => $exists]);
     }
 }

app/Http/Requests/TenderPenawaranRequest.php

@@ -12,21 +12,21 @@ class TenderPenawaranRequest extends FormRequest
     public function rules(): array
     {
         $rules = [
-            'nama_kjpp_sebelumnya' => 'required|array',
+            'nama_kjpp_sebelumnya' => 'nullable',
-            'nama_kjpp_sebelumnya.*' => 'exists:kjpp,name',
+            'biaya_kjpp_sebelumnya' => 'nullable|numeric',
-            'biaya_kjpp_sebelumnya' => 'required|numeric',
+            'tanggal_penilaian_sebelumnya' => 'nullable',
-            'tanggal_penilaian_sebelumnya' => 'required',
             'nomor_registrasi' => 'required',
+            'kjpp.*' => 'exists:kjpp,id',
             'tujuan_penilaian_kjpp_id' => 'required',
             'jenis_laporan_id' => 'required',
             'start_date' => 'required',
             'end_date' => 'required',
             'catatan' => 'nullable',
-            'status' => 'required'
+            'status' => 'nullable'
         ];
 
         if ($this->method() == 'PUT') {
-            $rules['code'] = 'required|max:50|unique:penawaran,code,' . $this->id;
+            $rules['code'] = 'required|max:50';
         } else {
             $rules['code'] = 'required|max:50|unique:penawaran,code';
         }
@@ -48,16 +48,11 @@ class TenderPenawaranRequest extends FormRequest
             'code.required' => 'Kode Penawaran Wajib diisi!',
             'code.max' => 'Kode Penawaran maksimal 255 huruf!',
             'code.unique' => 'Kode Penawaran tidak boleh sama!',
-            'nama_kjpp_sebelumnya.required' => 'Nama KJPP Sebelumnya Wajib diisi!',
-            'biaya_kjpp_sebelumnya.required' => 'Biaya KJPP Sebelumnya Wajib diisi!',
-            'biaya_kjpp_sebelumnya.numeric' => 'Biaya KJPP Sebelumnya harus berupa angka!',
-            'tanggal_penilaian_sebelumnya.required' => 'Tanggal Penilaian Sebelumnya Wajib diisi!',
             'nomor_registrasi.required' => 'Nomor Registrasi Wajib diisi!',
             'tujuan_penilaian_kjpp_id.required' => 'Tujuan Penilaian KJPP Wajib diisi!',
             'jenis_laporan_id.required' => 'Jenis Laporan Wajib diisi!',
             'start_date.required' => 'Tanggal Awal Wajib diisi!',
             'end_date.required' => 'Tanggal Akhir Wajib diisi!',
-            'status.required' => 'Status Wajib diisi!'
         ];
     }
 
@@ -66,10 +61,27 @@ class TenderPenawaranRequest extends FormRequest
         $validator->after(function ($validator) {
             $startDate = strtotime($this->input('start_date'));
             $endDate = strtotime($this->input('end_date'));
+            $today = strtotime(date('Y-m-d'));
 
             if ($endDate < $startDate) {
                 $validator->errors()->add('end_date', 'Tanggal Akhir tidak boleh lebih awal dari Tanggal Awal.');
             }
+
+            if ($startDate < $today) {
+                $validator->errors()->add('start_date', 'Tanggal Awal tidak boleh sebelum hari ini.');
+            }
+
+            // Validasi minimal 3 pilihan pada nama_kjpp
+            $namaKjpp = $this->input('kjpp', []);
+
+            // jika nama KJPP itu kosong
+            if (empty($namaKjpp)) {
+                $validator->errors()->add('kjpp', 'Nama KJPP wajib diisi.');
+            }
+            // jika terisi kurang dari 3 item
+            elseif (is_array($namaKjpp) && count($namaKjpp) < 3) {
+                $validator->errors()->add('kjpp', 'Nama KJPP Sebelumnya harus memiliki minimal 3 pilihan jika diisi.');
+            }
         });
     }
 }

app/Models/PenawaranDetailTender.php

@@ -5,6 +5,7 @@ namespace Modules\Lpj\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+// use Modules\Lpj\Database\Factories\PenawaranDetailTenderFactory;
 
 class PenawaranDetailTender extends Model
 {

app/Models/PenawaranTender.php

@@ -3,6 +3,7 @@
 namespace Modules\Lpj\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Modules\Lpj\Models\PenawaranDetailTender;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany; // andy add
 
@@ -23,4 +24,9 @@ class PenawaranTender extends Model
         return $this->hasMany(PenawaranDetailTender::class, 'penawaran_id', 'id')->where('status', '=', 1);
     }
     // andy add
+
+    public function penawaranKjpp()
+    {
+        return $this->hasMany(PenawaranDetailTender::class, 'penawaran_id');
+    }
 }

app/Models/Penilaian.php

@@ -10,45 +10,50 @@ use Modules\Lpj\Models\Teams;
 use Modules\Lpj\Models\Permohonan;
 use Modules\Usermanagement\Models\User;
 
-
 class Penilaian extends Model
 {
-
     /**
      * The attributes that are mass assignable.
      */
     protected $table = 'penilaian';
     protected $fillable = [
-        'jenis_penilaian_id', 'teams_id', 'user_id', 'tanggal_kunjungan', 'keterangan','nomor_registrasi','penilaian_id','surveyor_id','penilai_surveyor_id',
+        'jenis_penilaian_id', 'teams_id', 'tanggal_kunjungan', 'keterangan','nomor_registrasi','penilaian_id','surveyor_id','penilai_surveyor_id',
         'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_at',
         'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
     ];
 
-    public function jenis_penilaian(){
+    public function jenis_penilaian()
+    {
         return $this->belongsTo(JenisPenilaian::class, 'jenis_penilaian_id', 'id');
     }
 
-    public function teams(){
+    public function teams()
+    {
         return $this->belongsTo(Teams::class, 'teams_id', 'id');
     }
 
-    public function users(){
+    public function users()
+    {
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-    public function userPenilai(){
+    public function userPenilai()
+    {
         return $this->belongsTo(User::class, 'penilaian_id', 'id');
     }
 
-    public function userSurveyor(){
+    public function userSurveyor()
+    {
         return $this->belongsTo(User::class, 'surveyor_id', 'id');
     }
 
-    public function userPenilaiSurveyor(){
+    public function userPenilaiSurveyor()
+    {
         return $this->belongsTo(User::class, 'penilai_surveyor_id', 'id');
     }
 
-    public function permohonan(){
+    public function permohonan()
+    {
         return $this->belongsTo(Permohonan::class, 'nomor_registrasi', 'nomor_registrasi');
     }
 

app/Models/TeamsUsers.php

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Modules\Lpj\Database\Factories\TeamsUsersFactory;
 use Modules\Usermanagement\Models\User;
 use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\Penilaian;
 
 class TeamsUsers extends Model
 {
@@ -30,4 +31,10 @@ class TeamsUsers extends Model
     {
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
+
+    public function penilaian()
+    {
+        return $this->belongsTo(Penilaian::class, 'teams_id', 'id');
+    }
+
 }

database/migrations/2024_10_03_073923_update_penawaran_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('penawaran', function (Blueprint $table) {
+            $table->string('nama_kjpp_sebelumnya')->nullable()->change();
+            $table->string('biaya_kjpp_sebelumnya')->nullable()->change();
+            $table->datetime('tanggal_penilaian_sebelumnya')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('penawaran', function (Blueprint $table) {
+            $table->string('nama_kjpp_sebelumnya')->change();
+            $table->string('biaya_kjpp_sebelumnya')->change();
+            $table->datetime('tanggal_penilaian_sebelumnya')->change();
+        });
+    }
+};

database/migrations/2024_10_03_074430_update_penawaran_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('penawaran', function (Blueprint $table) {
+            $table->text('catatan')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('penawaran', function (Blueprint $table) {
+            $table->text('catatan')->change();
+        });
+    }
+};

database/migrations/2024_10_04_072406_update_penawaran_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('penawaran', function (Blueprint $table) {
+            $table->string('status')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('penawaran', function (Blueprint $table) {
+            $table->string('status')->change();
+        });
+    }
+};

database/migrations/2024_10_04_080210_update_detail_penawaran_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('detail_penawaran', function (Blueprint $table) {
+            $table->string('biaya_penawaran')->nullable()->change();
+            $table->string('attachment')->nullable()->change();
+            $table->string('dokumen_persetujuan')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('detail_penawaran', function (Blueprint $table) {
+            $table->string('biaya_penawaran')->change();
+            $table->string('attachment')->change();
+            $table->string('dokumen_persetujuan')->change();
+        });
+    }
+};

database/migrations/2024_10_08_075401_update_penawaran_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('penawaran', function (Blueprint $table) {
+            $table->unsignedBigInteger('created_by')->nullable()->after('created_at');
+            $table->unsignedBigInteger('updated_by')->nullable()->after('updated_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('penawaran', function (Blueprint $table) {
+            $table->dropColumn('created_by');
+            $table->dropColumn('updated_by');
+        });
+    }
+};

database/migrations/2024_10_08_075434_update_detail_penawaran_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('detail_penawaran', function (Blueprint $table) {
+            $table->unsignedBigInteger('created_by')->nullable()->after('created_at');
+            $table->unsignedBigInteger('updated_by')->nullable()->after('updated_at');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('detail_penawaran', function (Blueprint $table) {
+            $table->dropColumn('created_by');
+            $table->dropColumn('updated_by');
+        });
+    }
+};

module.json

@@ -5,9 +5,7 @@
   "description": "",
   "keywords": [],
   "priority": 0,
-  "providers": [
+  "providers": ["Modules\\Lpj\\Providers\\LpjServiceProvider"],
-    "Modules\\Lpj\\Providers\\LpjServiceProvider"
-  ],
   "files": [],
   "menu": {
     "main": [
@@ -18,9 +16,16 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": [
+        "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
-          "Administrator"
+      },
-        ]
+      {
+        "title": "Registrasi",
+        "path": "registrasi",
+        "icon": "ki-filled ki-file-added text-lg",
+        "classes": "",
+        "attributes": [],
+        "permission": "",
+        "roles": ["Administrator", "admin"]
       },
       {
         "title": "Tender",
@@ -29,9 +34,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": [
+        "roles": ["Administrator", "admin"],
-          "Administrator"
-        ],
         "sub": [
           {
             "title": "Data Penawaran",
@@ -39,7 +42,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "admin"]
           },
           {
             "title": "Data Proses Penawaran",
@@ -47,15 +50,15 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "admin"]
           },
           {
             "title": "Data Penawaran Ulang",
-            "path": "tender.penawaran_ulang",
+            "path": "tender.penawaran.ulang",
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "admin"]
           }
         ]
       },
@@ -66,9 +69,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": [
+        "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
-          "Administrator"
-        ]
       },
       {
         "title": "Data Debitur",
@@ -77,9 +78,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": [
+        "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
-          "Administrator"
-        ]
       },
       {
         "title": "Authorization",
@@ -88,20 +87,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": [
+        "roles": ["Administrator", "pemohon-eo"]
-          "Administrator"
-        ]
-      },
-      {
-        "title": "Registrasi",
-        "path": "registrasi",
-        "icon": "ki-filled ki-file-added text-lg",
-        "classes": "",
-        "attributes": [],
-        "permission": "",
-        "roles": [
-          "Administrator"
-        ]
       },
       {
         "title": "Assignment",
@@ -110,10 +96,61 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": [
+        "roles": ["Administrator", "so"]
-          "Administrator"
+      },
+      {
+        "title": "Team Activity",
+        "path": "activity.progres",
+        "icon": "ki-filled ki-questionnaire-tablet text-lg",
+        "classes": "",
+        "attributes": [],
+        "permission": "",
+        "roles": ["so"]
+      },
+      {
+        "title": "Otorisator",
+        "path": "otorisator",
+        "icon": "ki-filled ki-security-user text-lg",
+        "classes": "",
+        "attributes": [],
+        "permission": "",
+        "roles": ["so"],
+        "sub": [
+          {
+            "title": "Pelaporan",
+            "path": "otorisator.pelaporan",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["so"]
+          },
+          {
+            "title": "Pembayaran",
+            "path": "otorisator.pembayaran",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["so"]
+          },
+          {
+            "title": "Pembatalan",
+            "path": "otorisator.pembatalan",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["so"]
+          },
+          {
+            "title": "SLA",
+            "path": "otorisator.sla",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["so"]
+          }
         ]
       },
+
       {
         "title": "Activity",
         "path": "activity",
@@ -121,9 +158,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": [
+        "roles": ["Administrator", "pemohon-ao", "pemohon-eo", "admin"]
-          "Administrator"
-        ]
       },
       {
         "title": "Laporan",
@@ -132,9 +167,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": [
+        "roles": ["Administrator", "pemohon-ao", "pemohon-eo", "admin", "so"]
-          "Administrator"
-        ]
       }
     ],
     "master": [
@@ -145,9 +178,7 @@
         "classes": "",
         "attributes": [],
         "permission": "",
-        "roles": [
+        "roles": ["Administrator", "pemohon-ao", "pemohon-eo", "admin"],
-          "Administrator"
-        ],
         "sub": [
           {
             "title": "Cabang",
@@ -155,7 +186,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
           },
           {
             "title": "Mata Uang",
@@ -163,7 +194,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
           },
           {
             "title": "Jenis Fasilitas Kredit",
@@ -171,7 +202,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
           },
           {
             "title": "Jenis Legalitas Jaminan",
@@ -179,7 +210,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
           },
           {
             "title": "Jenis Aset",
@@ -187,7 +218,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
           },
           {
             "title": "Jenis Dokumen",
@@ -195,7 +226,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
           },
           {
             "title": "Tujuan Penilaian",
@@ -203,7 +234,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
           },
           {
             "title": "Nilai Plafond",
@@ -211,7 +242,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
           },
           {
             "title": "Hubungan Pemilik Jaminan",
@@ -219,7 +250,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
           },
           {
             "title": "Hubungan Penghuni Jaminan",
@@ -227,7 +258,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "pemohon-ao", "pemohon-eo"]
           },
           {
             "title": "Arah Mata Angin",
@@ -235,7 +266,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator"]
           },
           {
             "title": "Status Permohonan",
@@ -243,7 +274,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator"]
           },
           {
             "title": "Region",
@@ -251,7 +282,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "admin", "so"]
           },
           {
             "title": "Staff Appraisal",
@@ -259,7 +290,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "so"]
           },
           {
             "title": "Jenis Penilaian",
@@ -267,7 +298,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "admin", "so"]
           },
           {
             "title": "KJPP",
@@ -275,7 +306,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "admin"]
           },
           {
             "title": "Tujuan Penilaian KJPP",
@@ -283,7 +314,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "admin"]
           },
           {
             "title": "Ijin Usaha",
@@ -291,7 +322,7 @@
             "classes": "",
             "attributes": [],
             "permission": "",
-            "roles": []
+            "roles": ["Administrator", "admin"]
           }
         ]
       }

resources/views/activity/activitydetail.blade.php

@@ -13,108 +13,118 @@
         </style>
     @endpush
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-    <div class="card">
+        <div class="card">
-        <div class="card-header" id="advanced_settings_appearance">
+            <div class="card-header" id="advanced_settings_appearance">
-            <h3 class="card-title">
+                <h3 class="card-title">
-                Activity Permohonan
+                    Activity Permohonan
-            </h3>
+                </h3>
-            <div class="flex items-center gap-2">
+                <div class="flex items-center gap-2">
-                <a href="{{ route('activity.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
+                    <a href="{{ route('activity.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
-                    Back</a>
+                        Back</a>
+                </div>
+            </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">
+                        Tujuan Permohonan:
+                    </h3>
+                    <span class="text-2sm text-gray-700">
+                        {{ $permohonan->tujuanPenilaian->name }}
+                    </span>
+                </div>
+
             </div>
         </div>
-        <div class="card-body lg:py-7.5 grid grid-cols-3">
+
-            <div class="mb-5">
+        <div class="card grow" id="activity_2024">
+            <div class="card-header">
                 <h3 class="text-md font-medium text-gray-900">
-                    Nomor Register Permohonan:
+                    Status Activity
                 </h3>
-                <span class="text-2sm text-gray-700">
-                    {{ $permohonan->nomor_registrasi }}
-                </span>
             </div>
-
+            <div class="card-body">
-            <div class="mb-5">
+                <div class="flex flex-col">
-                <h3 class="text-md font-medium text-gray-900">
+                    @foreach ($status_permohonan as $index => $status)
-                    Pemohon:
+                        {{-- Cek apakah status adalah "Revisi" dan status permohonan tidak sama, maka tidak ditampilkan --}}
-                </h3>
+                        @if (strtolower($status->name) == 'revisi' && strtolower($status->name) != strtolower($permohonan->status))
-                <span class="text-2sm text-gray-700">
+                            @continue
-                    {{ $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 grow" id="activity_2024">
-        <div class="card-header">
-            <h3 class="text-md font-medium text-gray-900">
-                Status Activity
-            </h3>
-        </div>
-        <div class="card-body">
-            <div class="flex flex-col">
-                @foreach ($status_permohonan as $index => $status)
-                    {{-- Cek apakah status adalah "Revisi" dan status permohonan tidak sama, maka tidak ditampilkan --}}
-                    @if (strtolower($status->name) == 'revisi' && strtolower($status->name) != strtolower($permohonan->status))
-                        @continue
-                    @endif
-
-                    <div class="flex items-start relative">
-                        @if ($index < count($status_permohonan) - 1)
-                            <div
-                                class="w-9 left-0 top-9 absolute bottom-0 translate-x-1/2
-                                {{ strtolower($status->name) == strtolower($permohonan->status) ? 'border-l border-l-primary' : 'border-l border-l-gray-300' }}">
-                            </div>
                         @endif
 
-                        <div
+                        <div class="flex items-start relative">
-                            class="flex items-center justify-center shrink-0 rounded-full
+                            @if ($index > 0)
-                        {{ strtolower($status->name) == strtolower($permohonan->status) ? ' btn-outline btn-primary' : 'bg-gray-100 border-gray-300 text-gray-600' }}
+                                <div
-                        size-9">
+                                    class="w-9 left-0 top-9 absolute bottom-0 translate-x-1/2
-                            @switch(strtolower($status->name))
+                                    {{ strtolower($status->name) == strtolower($permohonan->status) ? 'border-l border-l-primary' : 'border-l border-l-gray-300' }}">
-                                @case('order')
+                                </div>
-                                    <i class="ki-filled ki-handcart text-base"></i>
+                            @endif
-                                @break
 
-                                @case('revisi')
+                            <div
-                                    <i class="ki-filled ki-notepad-edit text-base"></i>
+                                class="flex items-center justify-center shrink-0 rounded-full
-                                @break
+                                {{ strtolower($status->name) == strtolower($permohonan->status) ? 'btn-outline btn-primary' : 'bg-gray-100 border-gray-300 text-gray-600' }}
+                                size-9">
+                                @switch(strtolower($status->name))
+                                    @case('preregister')
+                                        <i class="ki-filled ki-note-2 text-base"></i>
+                                        @break
+                                    @case('order')
+                                        <i class="ki-filled ki-handcart text-base"></i>
+                                        @break
 
-                                @case('register')
+                                    @case('revisi')
-                                    <i class="ki-filled ki-note-2 text-base"></i>
+                                        <i class="ki-filled ki-notepad-edit text-base"></i>
-                                @break
+                                        @break
 
-                                @case('assign')
+                                    @case('register')
-                                    <i class="ki-filled ki-file-added"></i>
+                                        <i class="ki-filled ki-note-2 text-base"></i>
-                                @break
+                                        @break
 
-                                @case('survey')
+                                    @case('assign')
-                                    <i class="ki-filled ki-map text-base"></i>
+                                        <i class="ki-filled ki-file-added"></i>
-                                @break
+                                        @break
 
-                                @default
+                                    @case('survey')
-                                    <i class="ki-filled ki-people text-base"></i>
+                                        <i class="ki-filled ki-map text-base"></i>
-                            @endswitch
+                                        @break
+                                    @case('proses laporan')
+                                        <i class="ki-filled ki-paper-plane text-base"></i>
+                                        @break
+                                    @case('approved')
+                                        <i class="ki-filled ki-check text-base"></i>
+                                        @break
+                                    @case('delivered')
+                                        <i class="ki-filled ki-delivery-3 text-base"></i>
+                                        @break
+                                    @default
+                                        <i class="ki-filled ki-information text-base"></i>
+                                @endswitch
 
+                            </div>
+                            @include('lpj::activity.components.status')
                         </div>
-                        @include('lpj::activity.components.status')
+                    @endforeach
-                    </div>
+                </div>
-                @endforeach
+            </div>
+            <div class="card-footer justify-center">
+                <!-- Add footer content if necessary -->
             </div>
         </div>
-        <div class="card-footer justify-center">
-
-        </div>
     </div>
-</div>
 @endsection

resources/views/activity/components/status.blade.php

@@ -43,47 +43,10 @@
         </div>
     @endif
 
-    {{-- Tampilkan informasi assign jika status 'assign' --}}
     @if (strtolower($status->name) == 'assign' && $isCurrentStatus)
         <div class="card shadow-none">
             <div class="card-body grid grid-cols-3 gap-5">
-                {{-- Informasi Penilai, Surveyor, dan Penilai Surveyor --}}
-                <div>
-                    @isset($permohonan->penilaian)
-                        @if ($penilai = $permohonan->penilaian->userPenilai->name ?? null)
-                            <div class="mb-3">
-                                <p class="text-md font-medium text-gray-900">Penilai:</p>
-                                <span class="text-2sm text-gray-700">{{ $penilai }}</span>
-                            </div>
-                        @endif
 
-                        @if ($surveyor = $permohonan->penilaian->userSurveyor->name ?? null)
-                            <div class="mb-3">
-                                <p class="text-md font-medium text-gray-900">Surveyor:</p>
-                                <span class="text-2sm text-gray-700">{{ $surveyor }}</span>
-                            </div>
-                        @endif
-
-                        @if ($penilaiSurveyor = $permohonan->penilaian->userPenilaiSurveyor->name ?? null)
-                            <div class="mb-3">
-                                <p class="text-md font-medium text-gray-900">Penilai Surveyor:</p>
-                                <span class="text-2sm text-gray-700">{{ $penilaiSurveyor }}</span>
-                            </div>
-                        @endif
-                    @endisset
-                </div>
-
-                {{-- Teams --}}
-                <div>
-                    <h3 class="text-md font-medium text-gray-900">Teams:</h3>
-                    <ul>
-                        @foreach ($permohonan->penilaian->teams->teamsUsers as $item)
-                            <li class="text-xs text-gray-800 leading-[22px]">{{ $item->user->name }}</li>
-                        @endforeach
-                    </ul>
-                </div>
-
-                {{-- Catatan --}}
                 <div>
                     <h3 class="text-md font-medium text-gray-900">Catatan:</h3>
                     <span class="text-2sm text-gray-700">{{ $permohonan->penilaian->keterangan }}</span>

resources/views/activity/index.blade.php

@@ -4,16 +4,45 @@
     {{ Breadcrumbs::render('activity') }}
 @endsection
 @section('content')
+@push('styles')
+<style>
+    .dropdown {
+            position: relative;
+            display: inline-block;
+        }
+        .dropdowns-content {
+            display: none;
+            position: absolute;
+            background-color: white;
+            min-width: 224px;
+            box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+            z-index: 1;
+        }
+        .dropdown:hover .dropdowns-content {
+            display: block;
+        }
+        .dropdowns-content a {
+            color: black;
+            padding: 12px 16px;
+            text-decoration: none;
+            display: block;
+        }
+        .dropdowns-content a:hover {
+            background-color: #f1f1f1;
+        }
+</style>
+
+@endpush
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
         <div class="card pb-2.5">
             <div class="card-header" id="basic_settings">
                 <div class="card-title flex flex-row gap-1.5">
                     Activity
                 </div>
+
+
                 <div class="card-header py-5 flex-wrap">
-                    <h3 class="card-title">
+
-                        {{-- Daftar {{}} --}}
-                    </h3>
                     <div class="flex flex-wrap gap-2 lg:gap-5">
                         <div class="flex">
                             <label class="input input-sm">
@@ -22,14 +51,42 @@
                             </label>
                         </div>
 
-                        <div class="flex">
+
-                            <select class="select select-sm w-28" name="select" id="status-filter">
+                        <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
-                                <option value="">Pilih Status</option>
+                            <button
-                                @foreach ($status_permohonan as $item)
+                                class="dropdowns-toggle btn btn-sm btn-light inline-flex justify-between w-full items-center">
-                                    <option value="{{ strtolower($item->name) }}">{{ $item->name }}</option>
+                                Pilih Status
-                                @endforeach
+                                <i class="ki-outline ki-down dropdown-open:hidden">
-                            </select>
+                                </i>
+                                <i class="ki-outline ki-up hidden dropdown-open:block">
+                                </i>
+                            </button>
+                            <div
+                                class="dropdowns-content w-full  max-w-56 py-2 absolute mt-2 origin-top-right z-50 bg-white rounded-md shadow-lg ring-1 ring-black ring-opacity-5">
+                                <div class="menu menu-default flex flex-col w-full">
+                                    <!-- Checkbox untuk All Status -->
+                                    <div class="menu-item">
+                                        <label class="menu-link flex items-center px-4 py-2 text-sm text-gray-700">
+                                            <input id="select-all" type="checkbox"
+                                                class="form-checkbox h-4 w-4 text-blue-600">
+                                            <span class="ml-2">All Status</span>
+                                        </label>
+                                    </div>
+                                    <!-- Dinamis Status dari Backend -->
+                                    @foreach ($status_permohonan as $item)
+                                        <div class="menu-item">
+                                            <label class="menu-link flex items-center px-4 py-2 text-sm text-gray-700">
+                                                <input type="checkbox"
+                                                    class="form-checkbox status-checkbox h-4 w-4 text-blue-600"
+                                                    value="{{ strtolower($item->name) }}">
+                                                <span class="ml-2">{{ $item->name }}</span>
+                                            </label>
+                                        </div>
+                                    @endforeach
+                                </div>
+                            </div>
                         </div>
+
                         <div class="flex flex-wrap gap-2.5">
                             <div class="h-[24px] border border-r-gray-200"></div>
                             <a class="btn btn-sm btn-light" href="{{ route('activity.export') }}"> Export to Excel </a>
@@ -203,9 +260,44 @@
             dataTable.search(searchValue, true);
         });
 
-        statusFilter.addEventListener('change', function() {
+
-            const selectedStatus = this.value;
+        const selectAllCheckbox = document.getElementById('select-all');
-            dataTable.search(selectedStatus);
+        const statusCheckboxes = document.querySelectorAll('.status-checkbox');
+
+        statusCheckboxes.forEach(checkbox => {
+            checkbox.addEventListener('change', applyStatusFilter);
         });
+
+        // Event listener untuk "Select All"
+        selectAllCheckbox.addEventListener('change', function() {
+            const isChecked = this.checked;
+            statusCheckboxes.forEach(checkbox => {
+                checkbox.checked = isChecked;
+            });
+            applyStatusFilter();
+        });
+
+        function applyStatusFilter() {
+            const selectedStatuses = Array.from(statusCheckboxes)
+                .filter(checkbox => checkbox.checked)
+                .map(checkbox => checkbox.value);
+
+
+            if (selectedStatuses.length === 0) {
+                dataTable.search('');
+                console.log(selectedStatuses);
+
+            } else {
+
+                dataTable.search(selectedStatuses.join(','), true);
+                console.log(selectedStatuses);
+
+            }
+
+            const allChecked = Array.from(statusCheckboxes).every(cb => cb.checked);
+            selectAllCheckbox.checked = allChecked;
+        }
+
+
     </script>
 @endpush

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

@@ -0,0 +1,244 @@
+@extends('layouts.main')
+@section('breadcrumbs')
+    {{ Breadcrumbs::render('activity.progres') }}
+@endsection
+@section('content')
+    @push('styles')
+        <style>
+            .dropdown {
+                position: relative;
+                display: inline-block;
+            }
+
+            .dropdowns-content {
+                display: none;
+                position: absolute;
+                background-color: white;
+                min-width: 224px;
+                box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+                z-index: 1;
+            }
+
+            .dropdown:hover .dropdowns-content {
+                display: block;
+            }
+
+            .dropdowns-content a {
+                color: black;
+                padding: 12px 16px;
+                text-decoration: none;
+                display: block;
+            }
+
+            .dropdowns-content a:hover {
+                background-color: #f1f1f1;
+            }
+        </style>
+    @endpush
+
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+        <div class="card min-w-full">
+            <div class="card-header">
+                <h3 class="card-title">Team Activity</h3>
+            </div>
+            <div data-accordion="true">
+
+                @php
+
+                    $sortedTeamsActivity = $teamsActivity->sortBy(function ($item) {
+                        return $item->team->penilaian
+                            ->filter(function ($penilaian) use ($item) {
+                                return $penilaian->penilaian_id == $item->user->id ||
+                                    $penilaian->surveyor_id == $item->user->id ||
+                                    $penilaian->penilai_surveyor_id == $item->user->id;
+                            })
+                            ->count();
+                    });
+                @endphp
+
+                @foreach ($sortedTeamsActivity as $index => $item)
+                    <div class="accordion-item [&:not(:last-child)]:border-b border-b-gray-200" data-accordion-item="true"
+                        id="accordion_{{ $index }}">
+                        <button class="accordion-toggle py-4 group mx-8"
+                            data-accordion-toggle="#accordion_{{ $index }}content_{{ $index }}"
+                            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>
+                                    <th class="min-w-[150px]">
+                                        <span class="text-base text-gray-900 font-normal">
+                                            @php
+                                                $totalTasks = $item->team->penilaian
+                                                    ->filter(function ($penilaian) use ($item) {
+                                                        return $penilaian->penilaian_id == $item->user->id ||
+                                                            $penilaian->surveyor_id == $item->user->id ||
+                                                            $penilaian->penilai_surveyor_id == $item->user->id;
+                                                    })
+                                                    ->count();
+                                            @endphp
+                                            <p>Total Task: {{ $totalTasks }}</p>
+                                        </span>
+                                    </th>
+                                    <th>
+                                        <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>
+                                    </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 ]) }}">
+                                    <div class="card-body">
+                                        <div class="scrollable-x-auto">
+                                            <table
+                                                class="table table-auto align-middle text-gray-700 font-medium text-sm my-4"
+                                                data-datatable-table="true">
+                                                <thead>
+                                                    <tr>
+                                                        <th class="min-w-[100px]">Nama Debitur</th>
+                                                        <th class="min-w-[100px]">Tujuan Penilaian</th>
+                                                        <th class="min-w-[100px]">Jenis Asset</th>
+                                                        <th class="min-w-[100px]">Jenis Report</th>
+                                                        <th class="min-w-[100px]">Tgl Register</th>
+                                                        <th class="min-w-[100px]">Tgl Assign</th>
+                                                        <th class="min-w-[100px]">Tgl Kunjungan</th>
+                                                        <th class="min-w-[100px]">Progress</th>
+                                                        <th class="min-w-[100px]">Due Date SLA</th>
+                                                        <th class="min-w-[100px]">Paparan</th>
+                                                        <th class="min-w-[100px]">Approve</th>
+                                                        <th class="min-w-[50px] text-center">Keterangan</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    <tr>
+                                                        <td colspan="12" class="text-center">No data available</td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                        <div
+                                            class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                                            <div class="flex items-center gap-2">
+                                                Show
+                                                <select class="select select-sm w-16" data-datatable-size="true"
+                                                    name="perpage"></select> per page
+                                            </div>
+                                            <div class="flex items-center gap-4">
+                                                <span data-datatable-info="true"></span>
+                                                <div class="pagination" data-datatable-pagination="true"></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+    <script type="module">
+        document.addEventListener('DOMContentLoaded', () => {
+            const accordions = document.querySelectorAll('[data-accordion-item]');
+
+            accordions.forEach((accordion, index) => {
+                accordion.querySelector('.accordion-toggle').addEventListener('click', () => {
+                    const apiUrl = accordion.querySelector('.card-grid').getAttribute(
+                        'data-api-url');
+
+                    console.log("This is the API URL: " + apiUrl);
+
+                    const dataTableOptions = {
+                        apiEndpoint: apiUrl,
+                        pageSize: 5,
+                        order: [{
+                            column: 'nomor_registrasi',
+                            dir: 'asc'
+                        }],
+                        columns: {
+                            nama_debitur: {
+                                title: 'Nama Debitur',
+                                render: (item, data) => {
+                                    return `${data.permohonan.debiture.name}`
+                                },
+                            },
+                            tujuan_penilaian: {
+                                title: 'Tujuan Penilaian',
+                                render: (item, data) => {
+                                    return `${data.permohonan.tujuan_penilaian?.name || ''}`;
+                                },
+                            },
+                            jenis_asset: {
+                                title: 'Jenis Asset',
+                                render: (item, data) => `${data.jenis_asset || ''}`,
+                            },
+                            jenis_report: {
+                                title: 'Jenis Report',
+                                render: (item, data) => `${data.jenis_report || ''}`,
+                            },
+                            register: {
+                                title: 'Register',
+                                render: (item, data) =>
+                                    `${formatDateFromISO(data.permohonan.created_at) || ''}`,
+
+                            },
+                            assign: {
+                                title: 'Assign',
+                                render: (item, data) => `${formatDateFromISO(data.created_at)}`,
+                            },
+                            tanggal_kunjungan: {
+                                title: 'Tgl Kunjungan',
+                                render: (item, data) =>
+                                    `${formatDateFromISO(data.tanggal_kunjungan) || ''}`,
+                            },
+                            progress: {
+                                title: 'Progress',
+                                render: (item, data) => `${data.progress || ''}`,
+                            },
+                            due_date: {
+                                title: 'Due Date',
+                                render: (item, data) => `${data.due_date || ''}`,
+                            },
+                            paparan: {
+                                title: 'Paparan',
+                                render: (item, data) => `${data.paparan || ''}`,
+                            },
+                            approve: {
+                                title: 'Approve',
+                                render: (item, data) => `${data.approve || ''}`,
+                            },
+                            actions: {
+                                title: 'Keterangan',
+                                render: (item, data) => `${data.keterangan || ''}`,
+                            },
+                        },
+                    };
+
+                    // Initialize DataTable only for the active accordion
+                    if (!accordion.querySelector('.dataTable')) {
+                        const element = accordion.querySelector('.card-grid');
+                        new KTDataTable(element, dataTableOptions);
+                    }
+                });
+            });
+        });
+
+        function formatDateFromISO(isoDateString) {
+            const date = new Date(isoDateString);
+            const day = String(date.getDate()).padStart(2, '0');
+            const month = String(date.getMonth() + 1).padStart(2, '0');
+            const year = String(date.getFullYear()).slice(-2);
+            return `${day}-${month}-${year}`;
+        }
+    </script>
+@endpush

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

@@ -0,0 +1,15 @@
+@extends('layouts.main')
+
+{{-- @section('breadcrumbs')
+    {{ Breadcrumbs::render('activity') }}
+@endsection --}}
+@section('content')
+
+
+   <div class="row"></div>
+        <div class="col-md-12">
+            hello
+        </div>
+    </div>
+
+@endsection

resources/views/kjpp/create.blade.php

@@ -53,23 +53,25 @@
                         <div class="flex flex-wrap items-baseline w-full">
                             <select id="jenis_kantor" class="select w-full @error('jenis_kantor') border-danger  @enderror"
                                 name="jenis_kantor">
-                                <option value="">Pilih Jenis Kantor</option>
+                                @if (isset($kjpp->id))
-                                @if (isset($branch))
+                                    <option value="">Pilih Jenis Kantor</option>
-                                    @if (isset($kjpp))
+                                    <option value="Kantor Pusat"
-                                        @foreach ($branch as $branches)
+                                        {{ old('jenis_kantor', $kjpp->jenis_kantor) == 'Kantor Pusat' ? 'selected' : '' }}>
-                                            <option value="{{ $branches->name }}"
+                                        Kantor Pusat
-                                                {{ old('jenis_kantor', $kjpp->jenis_kantor) == $branches->name ? 'selected' : '' }}>
+                                    </option>
-                                                {{ $branches->name }}
+                                    <option value="Kantor Cabang"
-                                            </option>
+                                        {{ old('jenis_kantor', $kjpp->jenis_kantor) == 'Kantor Cabang' ? 'selected' : '' }}>
-                                        @endforeach
+                                        Kantor Cabang
-                                    @else
+                                    </option>
-                                        @foreach ($branch as $branches)
+                                @else
-                                            <option value="{{ $branches->name }}"
+                                    <option value="">Pilih Jenis Kantor</option>
-                                                {{ old('jenis_kantor') == $branches->name ? 'selected' : '' }}>
+                                    <option value="Kantor Pusat"
-                                                {{ $branches->name }}
+                                        {{ old('jenis_kantor') == 'Kantor Pusat' ? 'selected' : '' }}>Kantor Pusat
-                                            </option>
+                                    </option>
-                                        @endforeach
+                                    <option value="Kantor Cabang"
-                                    @endif
+                                        {{ old('jenis_kantor') == 'Kantor Cabang' ? 'selected' : '' }}>Kantor
+                                        Cabang
+                                    </option>
                                 @endif
                             </select>
                             @error('jenis_kantor')

resources/views/kjpp/show.blade.php

@@ -36,9 +36,7 @@
                     <label class="form-label max-w-56">Jenis Kantor</label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">
-                            @foreach ($branches as $branch)
+                            {{ $kjpp->jenis_kantor }}
-                                {{ $branch->name }}
-                            @endforeach
                         </p>
                     </div>
                     <label class="form-label max-w-56">Nomor Ijin Usaha</label>

resources/views/penawaran/create.blade.php

@@ -1,12 +1,12 @@
 @extends('layouts.main')
 
 @section('breadcrumbs')
-    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('id')) }}
+    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('noreg')) }}
 @endsection
 
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        <form action="{{ route('tender.penawaran.storePenawaran', $id) }}" method="POST">
+        <form action="{{ route('tender.penawaran.storePenawaran', $noreg) }}" method="POST">
             @csrf
 
             <div class="card pb-2.5">
@@ -15,8 +15,8 @@
                         Tambah Data Penawaran
                     </h3>
                     <div class="flex items-center gap-2">
-                        <a href="{{ route('tender.penawaran.show', $id) }}" class="btn btn-xs btn-primary" title="Detail"><i
+                        <a href="{{ route('tender.penawaran.show', $noreg) }}" class="btn btn-xs btn-primary"
-                                class="ki-outline ki-abstract-26"></i> Detail</a>
+                            title="Detail"><i class="ki-outline ki-abstract-26"></i> Detail</a>
                         <a href="{{ route('tender.penawaran.index') }}" class="btn btn-xs btn-info"><i
                                 class="ki-filled ki-exit-left"></i>
                             Back</a>
@@ -28,11 +28,33 @@
                             Nomor Registrasi
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="text" value="{{ $penawaran->nomor_registrasi ?? '-' }}" name="nomor_registrasi"
+                            <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
-                                class="flex w-full text-gray-600 font-medium text-sm" readonly>
+                                name="nomor_registrasi" readonly value="{{ $permohonan->nomor_registrasi ?? '-' }}">
-                            @error('nomor_registrasi')
+                        </div>
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                    </div>
-                            @enderror
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Nama KJPP Sebelumnya
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
+                                name="nama_kjpp_sebelumnya" readonly value="">
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Biaya KJPP Sebelumnya
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
+                                name="biaya_kjpp_sebelumnya" readonly value="">
+                        </div>
+                        <label class="form-label max-w-56">
+                            Tanggal Penilaian Sebelumnya
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
+                                name="tanggal_penilaian_sebelumnya" readonly value="">
                         </div>
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -40,7 +62,7 @@
                             Nomor Penawaran
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('code') border-danger  @enderror" type="text" name="code"
+                            <input class="input @error('code') border-danger  @enderror" type="text" name="code"
                                 value="{{ old('code') }}">
                             @error('code')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
@@ -49,44 +71,22 @@
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
-                            Nama KJPP Sebelumnya
+                            Data KJPP
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <select name="nama_kjpp_sebelumnya[]" multiple="multiple"
+                            <select name="kjpp[]" multiple="multiple"
-                                class="input tomselect w-full @error('nama_kjpp_sebelumnya') border-danger @enderror"
+                                class="input tomselect w-full @error('kjpp') border-danger @enderror" id="kjpp_select">
-                                id="nama_kjpp_sebelumnya_select">
+                                <option value="">Pilih Nama KJPP</option>
-                                <option value="">Pilih Nama KJPP Sebelumnya</option>
                                 @foreach ($kjpp as $row)
-                                    <option value="{{ $row->name }}"
+                                    @if (isset($kjpp))
-                                        {{ in_array($row->name, old('nama_kjpp_sebelumnya', [])) ? 'selected' : '' }}>
+                                        <option value="{{ $row->id }}"
-                                        {{ $row->name }}
+                                            {{ in_array($row->id, old('kjpp', [])) ? 'selected' : '' }}>
-                                    </option>
+                                            {{ $row->name }}
+                                        </option>
+                                    @endif
                                 @endforeach
                             </select>
-                            @error('nama_kjpp_sebelumnya')
+                            @error('kjpp')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Biaya KJPP Sebelumnya
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('biaya_kjpp_sebelumnya') border-danger  @enderror" type="text"
-                                name="biaya_kjpp_sebelumnya" value="{{ old('biaya_kjpp_sebelumnya') }}">
-                            @error('biaya_kjpp_sebelumnya')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
-                        </div>
-                        <label class="form-label max-w-56">
-                            Tanggal Penilaian Sebelumnya
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('tanggal_penilaian_sebelumnya') border-danger  @enderror"
-                                type="date" name="tanggal_penilaian_sebelumnya"
-                                value="{{ old('tanggal_penilaian_sebelumnya') }}">
-                            @error('tanggal_penilaian_sebelumnya')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
                         </div>
@@ -113,6 +113,39 @@
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
                         </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Tanggal Batas Waktu
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('start_date') border-danger  @enderror" type="date"
+                                name="start_date" value="{{ old('start_date') }}">
+                            @error('start_date')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                        -
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('end_date') border-danger  @enderror" type="date" name="end_date"
+                                value="{{ old('end_date') }}">
+                            @error('end_date')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Catatan
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <textarea class="textarea  @error('catatan') border-danger  @enderror" name="catatan" rows="3" id="address">{{ old('catatan') }}</textarea>
+                            @error('catatan')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Jenis Laporan
                         </label>
@@ -137,51 +170,24 @@
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
-                            Tanggal Awal
+                            Status
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('start_date') border-danger  @enderror" type="date"
+                            <select class="select w-full @error('status') border-danger  @enderror" name="status">
-                                name="start_date" value="{{ old('start_date') }}">
+                                <option value="">Pilih Status</option>
-                            @error('start_date')
+                                @if (isset($status))
+                                    @foreach ($status as $s)
+                                        <option value="{{ $s->name }}"
+                                            {{ old('status') == $s->name ? 'selected' : '' }}>
+                                            {{ $s->name }}
+                                        </option>
+                                    @endforeach
+                                @endif
+                            </select>
+                            @error('status')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
                         </div>
-                        <label class="form-label max-w-56">
-                            Tanggal Akhir
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('end_date') border-danger  @enderror" type="date" name="end_date"
-                                value="{{ old('end_date') }}">
-                            @error('end_date')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Catatan
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <textarea class="textarea  @error('catatan') border-danger  @enderror" name="catatan" rows="3" id="address">{{ old('catatan') }}</textarea>
-                            @error('catatan')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
-                        </div>
-                    </div>
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">Status</label>
-                        <select id="status" class="select w-full @error('status') border-danger  @enderror"
-                            name="status">
-                            <option value="">Pilih Status</option>
-                            @if (isset($status))
-                                @foreach ($status as $s)
-                                    <option value="{{ $s->name }}"
-                                        {{ old('status') == $s->name ? 'selected' : '' }}>
-                                        {{ $s->name }}
-                                    </option>
-                                @endforeach
-                            @endif
-                        </select>
                     </div>
                     <div class="flex justify-end">
                         <button type="submit" class="btn btn-primary">
@@ -193,3 +199,19 @@
         </form>
     </div>
 @endsection
+
+@push('styles')
+    <style>
+        input.input-custom:focus {
+            outline: none;
+            box-shadow: none;
+        }
+
+        @media (prefers-color-scheme: dark) {
+            input.input-custom {
+                background: none;
+                color: var(--tw-gray-600);
+            }
+        }
+    </style>
+@endpush

resources/views/penawaran/edit.blade.php

@@ -0,0 +1,223 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('noreg')) }}
+@endsection
+
+@section('content')
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+        <form action="{{ route('tender.penawaran.updatePenawaran', $noreg) }}" method="POST">
+            @csrf
+            @method('PUT')
+
+            <div class="card pb-2.5">
+                <div class="card-header" id="basic_settings">
+                    <h3 class="card-title">
+                        Penawaran Ulang
+                    </h3>
+                    <div class="flex items-center gap-2">
+                        <a href="{{ route('tender.penawaran.show', $noreg) }}" class="btn btn-xs btn-primary" title="Detail">
+                            <i class="ki-outline ki-abstract-26"></i> Detail
+                        </a>
+                        <a href="{{ route('tender.penawaran.index') }}" class="btn btn-xs btn-info">
+                            <i class="ki-filled ki-exit-left"></i> Back
+                        </a>
+                    </div>
+                </div>
+                <div class="card-body grid gap-5">
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Nomor Registrasi
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
+                                name="nomor_registrasi" readonly value="{{ $permohonan->nomor_registrasi ?? '-' }}">
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Nama KJPP Sebelumnya
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
+                                name="nama_kjpp_sebelumnya" readonly value="{{ $penawaran->nama_kjpp_sebelumnya ?? '' }}">
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Biaya KJPP Sebelumnya
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
+                                name="biaya_kjpp_sebelumnya" readonly value="{{ $penawaran->biaya_kjpp_sebelumnya ?? '' }}">
+                        </div>
+                        <label class="form-label max-w-56">
+                            Tanggal Penilaian Sebelumnya
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
+                                name="tanggal_penilaian_sebelumnya" readonly
+                                value="{{ $penawaran->tanggal_penilaian_sebelumnya ?? '' }}">
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Nomor Penawaran
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input border-warning bg-warning-light @error('code') border-danger  @enderror"
+                                type="text" name="code" value="{{ old('code', $penawaran->code) }}" readonly>
+                            @error('code')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Data KJPP
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <!-- Multi-select for KJPP -->
+                            <select name="kjpp[]" multiple="multiple"
+                                class="input tomselect w-full @error('kjpp') border-danger @enderror" id="kjpp_select">
+                                <option value="">Pilih Nama KJPP</option>
+                                @foreach ($kjpp as $row)
+                                    @if ($row->status == 1)
+                                        <option value="{{ $row->id }}"
+                                            {{ in_array($row->id, old('kjpp', $kjpps ?? [])) ? 'selected' : '' }}>
+                                            {{ $row->name }}
+                                        </option>
+                                    @endif
+                                @endforeach
+                            </select>
+                            @error('kjpp')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Tujuan Penilaian KJPP
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <select id="tujuan_penilaian_kjpp_id"
+                                class="select w-full @error('tujuan_penilaian_kjpp_id') border-danger  @enderror"
+                                name="tujuan_penilaian_kjpp_id">
+                                <option value="">Pilih Tujuan Penilaian KJPP</option>
+                                @if (isset($tujuan_penilaian_kjpp))
+                                    @foreach ($tujuan_penilaian_kjpp as $tp)
+                                        <option value="{{ $tp->id }}"
+                                            {{ old('tujuan_penilaian_kjpp_id', $penawaran->tujuan_penilaian_kjpp_id) == $tp->id ? 'selected' : '' }}>
+                                            {{ $tp->name }}
+                                        </option>
+                                    @endforeach
+                                @endif
+                            </select>
+                            @error('tujuan_penilaian_kjpp_id')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Tanggal Batas Waktu
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('start_date') border-danger  @enderror" type="date"
+                                name="start_date" value="{{ old('start_date', $penawaran->start_date) }}">
+                            @error('start_date')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                        -
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('end_date') border-danger  @enderror" type="date" name="end_date"
+                                value="{{ old('end_date', $penawaran->end_date) }}">
+                            @error('end_date')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Catatan
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <textarea class="textarea  @error('catatan') border-danger  @enderror" name="catatan" rows="3" id="address">{{ old('catatan', $penawaran->catatan) }}</textarea>
+                            @error('catatan')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Jenis Laporan
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <select id="jenis_laporan_id"
+                                class="select w-full @error('jenis_laporan_id') border-danger  @enderror"
+                                name="jenis_laporan_id">
+                                <option value="">Pilih Jenis Laporan</option>
+                                @if (isset($jenis_laporan))
+                                    @foreach ($jenis_laporan as $jl)
+                                        <option value="{{ $jl->id }}"
+                                            {{ old('jenis_laporan_id', $penawaran->jenis_laporan_id) == $jl->id ? 'selected' : '' }}>
+                                            {{ $jl->name }}
+                                        </option>
+                                    @endforeach
+                                @endif
+                            </select>
+                            @error('jenis_laporan_id')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Status
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <select class="select w-full @error('status') border-danger  @enderror" name="status">
+                                <option value="">Pilih Status</option>
+                                @if (isset($status))
+                                    @foreach ($status as $s)
+                                        <option value="{{ strtolower($s->name) }}"
+                                            {{ $penawaran->status == strtolower($s->name) ? 'selected' : '' }}>
+                                            {{ $s->name }}
+                                        </option>
+                                    @endforeach
+                                @endif
+                            </select>
+                            @error('status')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+
+                    <div class="flex justify-end">
+                        <button type="submit" class="btn btn-primary">
+                            Penawaran Ulang
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+@endsection
+
+@push('styles')
+    <style>
+        input.input-custom:focus {
+            outline: none;
+            box-shadow: none;
+        }
+
+        @media (prefers-color-scheme: dark) {
+            input.input-custom {
+                background: none;
+                color: var(--tw-gray-600);
+            }
+        }
+    </style>
+@endpush

resources/views/penawaran/index.blade.php

@@ -16,7 +16,7 @@
                 <div class="flex flex-wrap gap-2 lg:gap-5">
                     <div class="flex">
                         <label class="input input-sm"> <i class="ki-filled ki-magnifier"> </i>
-                            <input placeholder="Search KJPP" id="search" type="text" value="">
+                            <input placeholder="Search Penawaran Tender" id="search" type="text" value="">
                         </label>
                     </div>
                     <div class="flex flex-wrap gap-2.5">
@@ -36,16 +36,32 @@
                                 <th class="w-14">
                                     <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox" />
                                 </th>
-                                <th class="min-w-[250px]" data-datatable-column="code">
+                                <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
-                                    <span class="sort"> <span class="sort-label"> Nomor Penawaran </span>
+                                    <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
                                         <span class="sort-icon"> </span> </span>
                                 </th>
-                                <th class="min-w-[250px]" data-datatable-column="nama_kjpp_sebelumnya">
+                                <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
-                                    <span class="sort"> <span class="sort-label"> Nama KJPP Sebelumnya </span>
+                                    <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
                                         <span class="sort-icon"> </span> </span>
                                 </th>
-                                <th class="min-w-[50px]" data-datatable-column="tanggal_penilaian_sebelumnya">
+                                <th class="min-w-[150px]" data-datatable-column="user_id">
-                                    <span class="sort"> <span class="sort-label"> Tanggal Penilaian Sebelumnya </span>
+                                    <span class="sort"> <span class="sort-label"> User Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="branch_id">
+                                    <span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="debitur_id">
+                                    <span class="sort"> <span class="sort-label"> Debitur </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_id">
+                                    <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="status">
+                                    <span class="sort"> <span class="sort-label"> Status </span>
                                         <span class="sort-icon"> </span> </span>
                                 </th>
                                 <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
@@ -89,37 +105,50 @@
             return months[month -
                 1];
         }
-    </script>
-    <script type="text/javascript">
-        function deleteData(data) {
-            Swal.fire({
-                title: 'Are you sure?',
-                text: "You won't be able to revert this!",
-                icon: 'warning',
-                showCancelButton: true,
-                confirmButtonColor: '#3085d6',
-                cancelButtonColor: '#d33',
-                confirmButtonText: 'Yes, delete it!'
-            }).then((result) => {
-                if (result.isConfirmed) {
-                    $.ajaxSetup({
-                        headers: {
-                            'X-CSRF-TOKEN': '{{ csrf_token() }}'
-                        }
-                    });
 
-                    $.ajax(`tender/penawaran/${data}`, {
+        function capitalizeWords(str) {
-                        type: 'DELETE'
+            return str.replace(/\b\w/g, function(char) {
-                    }).then((response) => {
+                return char.toUpperCase();
-                        swal.fire('Deleted!', 'User has been deleted.', 'success').then(() => {
+            });
-                            window.location.reload();
+        }
-                        });
+
-                    }).catch((error) => {
+        // Function to check the existence of penawaran and update button
-                        console.error('Error:', error);
+        function checkPenawaranExistence(nomor_registrasi) {
-                        Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
+            // URL API untuk cek penawaran
-                    });
+            const url = `/api/check-penawaran/${nomor_registrasi}`;
-                }
+
-            })
+            // Fetch data dari server
+            fetch(url)
+                .then(response => response.json())
+                .then(data => {
+                    const actionDiv = document.getElementById(`action-${nomor_registrasi}`);
+                    if (data.exists) {
+                        // Jika penawaran ada, ganti tombol menjadi "Penawaran Ulang"
+                        actionDiv.innerHTML = `
+                        <a class="btn btn-sm btn-icon btn-clear btn-warning" title="Detail" href="/tender/penawaran/${nomor_registrasi}/show">
+                    <i class="ki-outline ki-abstract-26"></i>
+                </a>
+                    <a href="/tender/penawaran/${nomor_registrasi}/edit" class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran">
+                        <i class="ki-outline ki-arrow-circle-right"></i>
+                    </a>
+                `;
+                    } else {
+                        // Jika tidak ada, tampilkan tombol "Tambah Penawaran"
+                        actionDiv.innerHTML = `
+                        <a class="btn btn-sm btn-icon btn-clear btn-warning" title="Detail" href="/tender/penawaran/${nomor_registrasi}/show">
+                    <i class="ki-outline ki-abstract-26"></i>
+                </a>
+                    <a href="/tender/penawaran/${nomor_registrasi}/create" class="btn btn-sm btn-icon btn-clear btn-primary" title="Penawaran">
+                        <i class="ki-outline ki-arrow-circle-right"></i>
+                    </a>
+                `;
+                    }
+                })
+                .catch(error => {
+                    console.error('Error:', error);
+                    const actionDiv = document.getElementById(`action-${nomor_registrasi}`);
+                    actionDiv.innerHTML = `<span class="text-danger">Error loading action</span>`;
+                });
         }
     </script>
     <script type="module">
@@ -141,29 +170,64 @@
                         return checkbox.outerHTML.trim();
                     },
                 },
-                code: {
+                nomor_registrasi: {
-                    title: 'Nomor Penawaran',
+                    title: 'Nomor Registrasi',
                 },
-                nama_kjpp_sebelumnya: {
+                tanggal_permohonan: {
-                    title: 'Nama KJPP Sebelumnya',
+                    title: 'Tanggal Permohonan',
+                    render: (item, data) => {
+                        return `${formatDate(new Date(data.tanggal_permohonan))}`
+                    }
                 },
-                tanggal_penilaian_sebelumnya: {
+                user_id: {
-                    title: 'Tanggal Penilaian Sebelumnya',
+                    title: 'User Pemohon',
-                    render: (item, data) => formatDate(new Date(data.tanggal_penilaian_sebelumnya))
+                    render: (item, data) => {
+                        return `${data.user.name}`;
+                    },
+                },
+                branch_id: {
+                    title: 'Cabang Pemohon',
+                    render: (item, data) => {
+                        return `${data.branch.name}`;
+                    },
+                },
+                debitur_id: {
+                    title: 'Debitur',
+                    render: (item, data) => {
+                        return `${data.debiture.name}`;
+                    },
+                },
+                tujuan_penilaian_id: {
+                    title: 'Tujuan Penilaian',
+                    render: (item, data) => {
+                        return `${data.tujuan_penilaian.name}`;
+                    },
+                },
+                status: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return capitalizeWords(data.status)
+                    }
                 },
                 actions: {
                     title: 'Action',
                     render: (item, data) => {
-                        return `<div class="flex flex-nowrap justify-center">
+                        // Default action button, to be updated later
-                            <a class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail" href="tender/penawaran/${data.id}/show">
+                        let actionHtml = `
-                                 <i class="ki-outline ki-abstract-26"></i>
+            <div class="flex flex-nowrap justify-center" id="action-${data.nomor_registrasi}">
-                            </a>
+                <a class="btn btn-sm btn-icon btn-clear btn-secondary" title="Loading..." href="#">
-                            <a class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran" href="tender/penawaran/${data.id}/create">
+                    <i class="ki-outline ki-loading"></i>
-                                <i class="ki-outline ki-arrow-circle-right"></i>
+                </a>
-                            </a>
+            </div>
+        `;
 
-                        </div>`;
+                        // Call the checkPenawaranExistence function to update the action button dynamically
-                    },
+                        setTimeout(() => { // Using setTimeout to ensure DOM elements are rendered before updating
+                            checkPenawaranExistence(data.nomor_registrasi);
+                        }, 0);
+
+                        return actionHtml;
+                    }
                 }
             },
         };

resources/views/penawaran/show.blade.php

@@ -1,7 +1,39 @@
+@php
+    function formatTanggalIndonesia($date)
+    {
+        $carbonDate = \Carbon\Carbon::parse($date);
+        $indonesianMonths = [
+            'Januari',
+            'Februari',
+            'Maret',
+            'April',
+            'Mei',
+            'Juni',
+            'Juli',
+            'Agustus',
+            'September',
+            'Oktober',
+            'November',
+            'Desember',
+        ];
+        $month = $indonesianMonths[$carbonDate->month - 1];
+        return $carbonDate->format('d') . ' ' . $month . ' ' . $carbonDate->format('Y');
+    }
+
+    function formatRupiah($number)
+    {
+        // Convert to float if the input is a string
+        $number = (float) $number;
+
+        return 'Rp ' . number_format($number, 2, ',', '.');
+    }
+@endphp
+
+
 @extends('layouts.main')
 
 @section('breadcrumbs')
-    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('id')) }}
+    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('noreg')) }}
 @endsection
 
 @section('content')
@@ -12,8 +44,14 @@
                     Detail Penawaran
                 </h3>
                 <div class="flex items-center gap-2">
-                    <a href="{{ route('tender.penawaran.createPenawaran', $id) }}" class="btn btn-xs btn-primary"
+                    @if ($penawaranExists)
-                        title="Penawaran"><i class="ki-filled ki-arrow-circle-right"></i> Penawaran</a>
+                        <a href="{{ route('tender.penawaran.editPenawaran', $noreg) }}" class="btn btn-xs btn-danger"
+                            title="Penawaran"><i class="ki-filled ki-arrow-circle-left"></i> Penawaran Ulang</a>
+                    @endif
+                    @if (!$penawaranExists)
+                        <a href="{{ route('tender.penawaran.createPenawaran', $noreg) }}" class="btn btn-xs btn-primary"
+                            title="Penawaran"><i class="ki-filled ki-arrow-circle-right"></i> Tambah Penawaran</a>
+                    @endif
                     <a href="{{ route('tender.penawaran.index') }}" class="btn btn-xs btn-info"><i
                             class="ki-filled ki-exit-left"></i> Back</a>
                 </div>
@@ -25,12 +63,140 @@
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
                         <p class="flex w-full text-gray-600 font-medium text-sm">
-                            {{ $penawaran->nomor_registrasi }}
+                            {{ $penawaran->nomor_registrasi ?? '' }}
                         </p>
                     </div>
+                    @if ($penawaran->code)
+                        <label class="form-label max-w-56">
+                            No. Penawaran
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <p class="flex w-full text-gray-600 font-medium text-sm">
+                                {{ $penawaran->code }}
+                            </p>
+                        </div>
+                    @endif
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Status
+                    </label>
+                    @if (isset($penawaran->status))
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ ucwords($penawaran->status) }}
+                        </p>
+                    @else
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            Tidak Ada
+                        </p>
+                    @endif
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Nama KJPP Sebelumnya
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        @if (isset($penawaran->nama_kjpp_sebelumnya) && !empty($penawaran->nama_kjpp_sebelumnya))
+                            <div class="flex flex-row space-x-4 text-gray-600 font-medium text-sm">
+                                {{ $penawaran->nama_kjpp_sebelumnya }}
+                            </div>
+                        @else
+                            <div class="flex flex-row space-x-4 text-gray-600 font-medium text-sm">
+                                Tidak ada
+                            </div>
+                        @endif
+                    </div>
+                    <label class="form-label max-w-56">
+                        Biaya KJPP Sebelumnya
+                    </label>
+                    <p class="flex w-full text-gray-600 font-medium text-sm">
+                        @if (isset($penawaran->biaya_kjpp_sebelumnya))
+                            {{ formatRupiah($penawaran->biaya_kjpp_sebelumnya) }}
+                        @else
+                            {{ formatRupiah(0) }}
+                        @endif
+                    </p>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Tanggal Penilaian Sebelumnya
+                    </label>
+                    @if (isset($penawaran->tanggal_penilaian_sebelumnya) && !empty($penawaran->tanggal_penilaian_sebelumnya))
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ formatTanggalIndonesia($penawaran->tanggal_penilaian_sebelumnya) }}
+                        </p>
+                    @else
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            Tidak Ada
+                        </p>
+                    @endif
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Tujuan Penilaian KJPP
+                    </label>
+                    <p class="flex w-full text-gray-600 font-medium text-sm">
+                        @if (isset($tujuan_penilaian_kjpp))
+                            @foreach ($tujuan_penilaian_kjpp as $tpk)
+                                {{ $tpk->name }}
+                            @endforeach
+                        @else
+                            Tidak Ada
+                        @endif
+                    </p>
+                    <label class="form-label max-w-56">
+                        Jenis Laporan
+                    </label>
+                    <p class="flex w-full text-gray-600 font-medium text-sm">
+                        @if (isset($jenis_laporan))
+                            @foreach ($jenis_laporan as $jl)
+                                {{ $jl->name }}
+                            @endforeach
+                        @else
+                            Tidak Ada
+                        @endif
+                    </p>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Tanggal Batas Waktu
+                    </label>
+                    <p class="flex w-full text-gray-600 font-medium text-sm">
+                        {{ formatTanggalIndonesia($penawaran->start_date) }} -
+                        {{ formatTanggalIndonesia($penawaran->end_date) }}
+                    </p>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Catatan
+                    </label>
+                    @if (isset($penawaran->catatan))
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            {{ $penawaran->catatan }}
+                        </p>
+                    @else
+                        <p class="flex w-full text-gray-600 font-medium text-sm">
+                            Tidak Ada
+                        </p>
+                    @endif
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Nama KJPP
+                    </label>
+                    <div class="flex flex-row space-x-4 text-gray-600 font-medium text-sm gap-1">
+                        @if (isset($kjpps) && !empty(json_decode($kjpps, true)))
+                            @foreach ($kjpps as $kjpp)
+                                @if (isset($kjpp))
+                                    <div
+                                        class="flex flex-row space-x-4 text-white font-medium text-sm badge badge-dark dark-mode:badge dark-mode:text-gray-600 badge-xs">
+                                        {{ $kjpp->name }}</div>
+                                @endif
+                            @endforeach
+                        @else
+                            <div class="flex flex-row space-x-4 text-gray-600 font-medium text-sm">Tidak Ada</div>
+                        @endif
+                    </div>
                 </div>
-
             </div>
-        </div>
+        @endsection
-    </div>
-@endsection

resources/views/penawaran_ulang/index.blade.php

@@ -7,16 +7,238 @@
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
 
-        <div class="card pb-2.5">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
-            <div class="card-header" id="basic_settings">
+            data-datatable-state-save="false" id="penawaran-table"
+            data-api-url="{{ route('tender.penawaran.ulang.datatables') }}">
+            <div class="card-header py-5 flex-wrap" id="basic_settings">
                 <h3 class="card-title">
                     Data Penawaran Ulang
                 </h3>
-
+                <div class="flex flex-wrap gap-2 lg:gap-5">
+                    <div class="flex">
+                        <label class="input input-sm"> <i class="ki-filled ki-magnifier"> </i>
+                            <input placeholder="Search Penawaran Tender" id="search" type="text" value="">
+                        </label>
+                    </div>
+                    <div class="flex flex-wrap gap-2.5">
+                        <div class="h-[24px] border border-r-gray-200"></div>
+                        <a class="btn btn-sm btn-light" href="{{ route('tender.penawaran.exportPenawaran') }}"> Export to
+                            Excel
+                        </a>
+                    </div>
+                </div>
             </div>
             <div class="card-body">
-                {{-- @include('lpj::debitur.form') --}}
+                <div class="scrollable-x-auto">
+                    <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
+                        data-datatable-table="true">
+                        <thead>
+                            <tr>
+                                <th class="w-14">
+                                    <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox" />
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
+                                    <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                    <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="user_id">
+                                    <span class="sort"> <span class="sort-label"> User Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="branch_id">
+                                    <span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="debitur_id">
+                                    <span class="sort"> <span class="sort-label"> Debitur </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_id">
+                                    <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="status">
+                                    <span class="sort"> <span class="sort-label"> Status </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
+                            </tr>
+                        </thead>
+                    </table>
+                </div>
+                <div
+                    class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                    <div class="flex items-center gap-2">
+                        Show
+                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
+                    </div>
+                    <div class="flex items-center gap-4">
+                        <span data-datatable-info="true"> </span>
+                        <div class="pagination" data-datatable-pagination="true">
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
 @endsection
+
+@push('scripts')
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+    <script type="text/javascript">
+        function formatDate(date) {
+            const day = date.getDate().toString().padStart(2, '0');
+            const month = (date.getMonth() + 1).toString().padStart(2, '0');
+            // Months are 0-indexed
+            const year = date.getFullYear();
+
+            return `${day} ${getIndonesianMonth(month)} ${year}`;
+        }
+
+        function getIndonesianMonth(month) {
+            const months = ['Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni',
+                'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'
+            ];
+            return months[month -
+                1];
+        }
+
+        function capitalizeWords(str) {
+            return str.replace(/\b\w/g, function(char) {
+                return char.toUpperCase();
+            });
+        }
+
+        // Function to check the existence of penawaran and update button
+        function checkPenawaranExistence(nomor_registrasi) {
+            // URL API untuk cek penawaran
+            const url = `/api/check-penawaran/${nomor_registrasi}`;
+
+            // Fetch data dari server
+            fetch(url)
+                .then(response => response.json())
+                .then(data => {
+                    const actionDiv = document.getElementById(`action-${nomor_registrasi}`);
+                    if (data.exists) {
+                        // Jika penawaran ada, ganti tombol menjadi "Penawaran Ulang"
+                        actionDiv.innerHTML = `
+                        <a class="btn btn-sm btn-icon btn-clear btn-warning" title="Detail" href="/tender/penawaran/${nomor_registrasi}/show">
+                    <i class="ki-outline ki-abstract-26"></i>
+                </a>
+                    <a href="/tender/penawaran/${nomor_registrasi}/edit" class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran">
+                        <i class="ki-outline ki-arrow-circle-right"></i>
+                    </a>
+                `;
+                    } else {
+                        // Jika tidak ada, tampilkan tombol "Tambah Penawaran"
+                        actionDiv.innerHTML = `
+                        <a class="btn btn-sm btn-icon btn-clear btn-warning" title="Detail" href="/tender/penawaran/${nomor_registrasi}/show">
+                    <i class="ki-outline ki-abstract-26"></i>
+                </a>
+                    <a href="/tender/penawaran/${nomor_registrasi}/create" class="btn btn-sm btn-icon btn-clear btn-primary" title="Penawaran">
+                        <i class="ki-outline ki-arrow-circle-right"></i>
+                    </a>
+                `;
+                    }
+                })
+                .catch(error => {
+                    console.error('Error:', error);
+                    const actionDiv = document.getElementById(`action-${nomor_registrasi}`);
+                    actionDiv.innerHTML = `<span class="text-danger">Error loading action</span>`;
+                });
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#penawaran-table');
+        const searchInput = document.getElementById('search');
+
+        const apiUrl = element.getAttribute('data-api-url');
+        const dataTableOptions = {
+            apiEndpoint: apiUrl,
+            pageSize: 5,
+            columns: {
+                select: {
+                    render: (item, data, context) => {
+                        const checkbox = document.createElement('input');
+                        checkbox.className = 'checkbox checkbox-sm';
+                        checkbox.type = 'checkbox';
+                        checkbox.value = data.id.toString();
+                        checkbox.setAttribute('data-datatable-row-check', 'true');
+                        return checkbox.outerHTML.trim();
+                    },
+                },
+                nomor_registrasi: {
+                    title: 'Nomor Registrasi',
+                },
+                tanggal_permohonan: {
+                    title: 'Tanggal Permohonan',
+                    render: (item, data) => {
+                        return `${formatDate(new Date(data.tanggal_permohonan))}`
+                    }
+                },
+                user_id: {
+                    title: 'User Pemohon',
+                    render: (item, data) => {
+                        return `${data.user.name}`;
+                    },
+                },
+                branch_id: {
+                    title: 'Cabang Pemohon',
+                    render: (item, data) => {
+                        return `${data.branch.name}`;
+                    },
+                },
+                debitur_id: {
+                    title: 'Debitur',
+                    render: (item, data) => {
+                        return `${data.debiture.name}`;
+                    },
+                },
+                tujuan_penilaian_id: {
+                    title: 'Tujuan Penilaian',
+                    render: (item, data) => {
+                        return `${data.tujuan_penilaian.name}`;
+                    },
+                },
+                status: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return capitalizeWords(data.status);
+                    }
+                },
+                actions: {
+                    title: 'Action',
+                    render: (item, data) => {
+                        // Default action button, to be updated later
+                        let actionHtml = `
+            <div class="flex flex-nowrap justify-center" id="action-${data.nomor_registrasi}">
+                <a class="btn btn-sm btn-icon btn-clear btn-secondary" title="Loading..." href="#">
+                    <i class="ki-outline ki-loading"></i>
+                </a>
+            </div>
+        `;
+
+                        // Call the checkPenawaranExistence function to update the action button dynamically
+                        setTimeout(() => { // Using setTimeout to ensure DOM elements are rendered before updating
+                            checkPenawaranExistence(data.nomor_registrasi);
+                        }, 0);
+
+                        return actionHtml;
+                    }
+                }
+            },
+        };
+
+        let dataTable = new KTDataTable(element, dataTableOptions);
+        // Custom search functionality
+        searchInput.addEventListener('input', function() {
+            const searchValue = this.value.trim();
+            dataTable.search(searchValue, true);
+
+        });
+    </script>
+@endpush

resources/views/penilaian/form.blade.php

@@ -163,7 +163,7 @@
         <div class="card min-w-full">
             <div class="card-header">
                 <h3 class="card-title">
-                    Data Jaminan
+                    Laporan
                 </h3>
             </div>
             <div data-accordion="true">
@@ -283,21 +283,12 @@
                             <input type="hidden" name="nomor_registrasi"
                                 value="{{ $penilaian->nomor_registrasi ?? $permohonan->nomor_registrasi }}">
                             <div class="flex flex-wrap items-baseline w-full">
-                                <select
+                                <input class="input"
-                                    class="input tomselect w-full @error('jenis_penilaian_id') border-danger bg-danger-light @enderror"
+                                    type="hidden" name="jenis_penilaian_id" value="{{ $jenisPenilaian->id }}"
-                                    name="jenis_penilaian_id" id="jenis_penilaian_id">
+                                    >
-                                    <option value="">Jenis Penilaian</option>
+                                <input class="input  @error('jenis_penilaian_id') border-danger bg-danger-light @enderror"
-
+                                    type="text" value="{{ $jenisPenilaian->name }}"
-                                    @foreach ($jenisPenilaian as $item)
+                                    readonly>
-                                        @if (isset($penilaian->nomor_registrasi))
-                                            <option value="{{ $item->id }}"
-                                                {{ $penilaian->teams_id == $item->id ? 'selected' : '' }}>
-                                                {{ $item->name }}</option>
-                                        @else
-                                            <option value="{{ $item->id }}">{{ $item->name }}</option>
-                                        @endif
-                                    @endforeach
-                                </select>
                                 @error('jenis_penilaian_id')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
@@ -309,20 +300,11 @@
                                 Tim Penilai yang di tunjuk
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <select
+                                <input class="input"
-                                    class="input tomselect  w-full @error('teams_id') border-danger bg-danger-light @enderror"
+                                    type="hidden" name="teams_id" value="{{ $regionName->id }}"
-                                    name="teams_id" id="teams_id">
+                                    >
-                                    <option value="">Pilih Tim Penilai</option>
+                                <input class="input  @error('teams_id') border-danger bg-danger-light @enderror"
-                                    @foreach ($teamPenilai as $item)
+                                    type="text" value="{{ $regionName->name }}" readonly>
-                                        @if (isset($penilaian->nomor_registrasi))
-                                            <option value="{{ $item->id }}"
-                                                {{ $penilaian->teams_id == $item->id ? 'selected' : '' }}>
-                                                {{ $item->regions->name }}</option>
-                                        @else
-                                            <option value="{{ $item->id }}">{{ $item->regions->name }}</option>
-                                        @endif
-                                    @endforeach
-                                </select>
                                 @error('teams_id')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
@@ -335,8 +317,11 @@
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select id="surveyor_id" name="surveyor_id"
-                                    class="input select  @error('surveyor_id') border-danger bg-danger-light @enderror  w-full">
+                                    class="tomselect input  @error('surveyor_id') border-danger bg-danger-light @enderror  w-full">
                                     <option value="">Pilih Surveyor</option>
+                                    @foreach ($teamPenilai->first()->teamsUsers as $item)
+                                    <option value="{{ $item->user->id }}">{{ $item->user->name }}</option>
+                                @endforeach
                                 </select>
 
                                 @error('surveyor_id')
@@ -351,8 +336,11 @@
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select id="penilaian_id" name="penilaian_id"
-                                    class="input select @error('penilaian_id') border-danger bg-danger-light @enderror  w-full">
+                                    class="input  tomselect @error('penilaian_id') border-danger bg-danger-light @enderror  w-full">
                                     <option value="">Pilih Penilai</option>
+                                    @foreach ($teamPenilai->first()->teamsUsers as $item)
+                                    <option value="{{ $item->user->id }}">{{ $item->user->name }}</option>
+                                @endforeach
                                 </select>
                                 @error('penilaian_id')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
@@ -366,8 +354,11 @@
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select id="penilai_surveyor_id" name="penilai_surveyor_id"
-                                    class="input select  @error('penilai_surveyor_id') border-danger bg-danger-light @enderror  w-full">
+                                    class="input tomselect  @error('penilai_surveyor_id') border-danger bg-danger-light @enderror  w-full">
                                     <option value="">Pilih Surveyor dan Penilai</option>
+                                    @foreach ($teamPenilai->first()->teamsUsers as $item)
+                                        <option value="{{ $item->user->id }}">{{ $item->user->name }}</option>
+                                    @endforeach
                                 </select>
                                 @error('penilai_surveyor_id')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
@@ -482,7 +473,7 @@
     </div>
 @endsection
 @push('scripts')
-    <script>
+    {{-- <script>
         document.addEventListener('DOMContentLoaded', function() {
             let teamsSelect = document.getElementById('teams_id');
             let penilaiSelect = document.getElementById('penilaian_id');
@@ -570,48 +561,48 @@
                 fetchPenilai(selectedTeamId);
             }
         });
-    </script>
+    </script> --}}
 
-<script>
+    <script>
-    document.addEventListener('DOMContentLoaded', function() {
+        document.addEventListener('DOMContentLoaded', function() {
-        const revisiForm = document.getElementById('revisiForm');
+            const revisiForm = document.getElementById('revisiForm');
-        const btnSubmit = document.getElementById('btnSubmit');
+            const btnSubmit = document.getElementById('btnSubmit');
 
-        btnSubmit.addEventListener('click', function(event) {
+            btnSubmit.addEventListener('click', function(event) {
-            // Cegah form dari pengiriman default
+                // Cegah form dari pengiriman default
-            event.preventDefault();
+                event.preventDefault();
 
-            // Ambil nilai dari input dan textarea
+                // Ambil nilai dari input dan textarea
-            const dokumenRevisi = document.getElementById('dokumen').value;
+                const dokumenRevisi = document.getElementById('dokumen').value;
-            const keteranganRevisi = document.getElementById('keterangan').value.trim();
+                const keteranganRevisi = document.getElementById('keterangan').value.trim();
 
-            // Bersihkan pesan kesalahan sebelumnya
+                // Bersihkan pesan kesalahan sebelumnya
-            document.querySelectorAll('.alert.text-danger').forEach(el => el.remove());
+                document.querySelectorAll('.alert.text-danger').forEach(el => el.remove());
 
-            // Validasi: jika ada field kosong, tampilkan pesan kesalahan
+                // Validasi: jika ada field kosong, tampilkan pesan kesalahan
-            let isValid = true;
+                let isValid = true;
 
-            if (!dokumenRevisi) {
+                if (!dokumenRevisi) {
-                const errorMessage = document.createElement('em');
+                    const errorMessage = document.createElement('em');
-                errorMessage.className = 'alert text-danger text-sm';
+                    errorMessage.className = 'alert text-danger text-sm';
-                errorMessage.innerText = 'Dokumen Revisi harus diisi.';
+                    errorMessage.innerText = 'Dokumen Revisi harus diisi.';
-                document.getElementById('dokumen').parentElement.appendChild(errorMessage);
+                    document.getElementById('dokumen').parentElement.appendChild(errorMessage);
-                isValid = false; // Set isValid ke false
+                    isValid = false; // Set isValid ke false
-            }
+                }
 
-            if (!keteranganRevisi) {
+                if (!keteranganRevisi) {
-                const errorMessage = document.createElement('em');
+                    const errorMessage = document.createElement('em');
-                errorMessage.className = 'alert text-danger text-sm';
+                    errorMessage.className = 'alert text-danger text-sm';
-                errorMessage.innerText = 'Catatan harus diisi.';
+                    errorMessage.innerText = 'Catatan harus diisi.';
-                document.getElementById('keterangan').parentElement.appendChild(errorMessage);
+                    document.getElementById('keterangan').parentElement.appendChild(errorMessage);
-                isValid = false; // Set isValid ke false
+                    isValid = false; // Set isValid ke false
-            }
+                }
 
-            // Jika semua field valid, kirim form
+                // Jika semua field valid, kirim form
-            if (isValid) {
+                if (isValid) {
-                revisiForm.submit();
+                    revisiForm.submit();
-            }
+                }
+            });
         });
-    });
+    </script>
-</script>
 @endpush

resources/views/penilaian/index.blade.php

@@ -7,13 +7,10 @@
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
         <div class="card pb-2.5">
-            <div class="card-header" id="basic_settings">
+            <div class=" card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="permohonan-table" data-api-url="{{ route('penilaian.datatables') }}">
-                <div class="card-title flex flex-row gap-1.5">
-                    Daftar Penilaian
-                </div>
                 <div class="card-header py-5 flex-wrap">
                     <h3 class="card-title">
-                        {{-- Daftar {{}} --}}
+                        Daftar assignment
                     </h3>
                     <div class="flex flex-wrap gap-2 lg:gap-5">
                         <div class="flex">
@@ -27,9 +24,6 @@
                         </div>
                     </div>
                 </div>
-            </div>
-
-            <div class=" card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="permohonan-table" data-api-url="{{ route('penilaian.datatables') }}">
 
                 <div class="card-body">
                     <div class="scrollable-x-auto">

resources/views/penilaian/otorisator/index.blade.php

@@ -0,0 +1,163 @@
+@extends('layouts.main')
+
+{{-- @section('breadcrumbs')
+    {{ Breadcrumbs::render('penilaian') }}
+@endsection --}}
+
+@section('content')
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+        <div class="card pb-2.5">
+            <div class=" card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="permohonan-table" data-api-url="{{ route('otorisator.datatables', ['otorisator' => $header ]) }}">
+                <div class="card-header py-5 flex-wrap">
+                    <h3 class="card-title">
+                        Daftar {{$header}}
+                    </h3>
+                    <div class="flex flex-wrap gap-2 lg:gap-5">
+                        <div class="flex">
+                            <label class="input input-sm"> <i class="ki-filled ki-magnifier"> </i>
+                                <input placeholder="Search Penilaian" id="search" type="text" value="">
+                            </label>
+                        </div>
+                        <div class="flex flex-wrap gap-2.5">
+                            <div class="h-[24px] border border-r-gray-200"></div>
+                            <a class="btn btn-sm btn-light" href="{{ route('permohonan.export') }}"> Export to Excel </a>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="card-body">
+                    <div class="scrollable-x-auto">
+                        <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
+                            <thead>
+                            <tr>
+                                <th class="w-14">
+                                    <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
+                                    <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                    <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="user_id">
+                                    <span class="sort"> <span class="sort-label"> User Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="branch_id">
+                                    <span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="debitur_id">
+                                    <span class="sort"> <span class="sort-label"> Debitur </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_id">
+                                    <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="status">
+                                    <span class="sort"> <span class="sort-label"> Status </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
+                            </tr>
+                            </thead>
+                        </table>
+                    </div>
+                    <div class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                        <div class="flex items-center gap-2">
+                            Show
+                            <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
+                        </div>
+                        <div class="flex items-center gap-4">
+                            <span data-datatable-info="true"> </span>
+                            <div class="pagination" data-datatable-pagination="true">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+
+
+@push('scripts')
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+      <script type="module">
+        const element = document.querySelector('#permohonan-table');
+        const searchInput = document.getElementById('search');
+
+        const apiUrl = element.getAttribute('data-api-url');
+        const dataTableOptions = {
+            apiEndpoint: apiUrl,
+            pageSize: 5,
+            columns: {
+                select: {
+                    render: (item, data, context) => {
+                        const checkbox = document.createElement('input');
+                        checkbox.className = 'checkbox checkbox-sm';
+                        checkbox.type = 'checkbox';
+                        checkbox.value = data.id.toString();
+                        checkbox.setAttribute('data-datatable-row-check', 'true');
+                        return checkbox.outerHTML.trim();
+                    },
+                },
+                nomor_registrasi: {
+                    title: 'Nomor Registrasi',
+                },
+                tanggal_permohonan: {
+                    title: 'Tanggal Permohonan'
+                },
+                user_id: {
+                    title: 'User Pemohon',
+                    render: (item, data) => {
+                        return `${data.user.name}`;
+                    },
+                },
+                branch_id: {
+                    title: 'Cabang Pemohon',
+                    render: (item, data) => {
+                        return `${data.branch.name}`;
+                    },
+                },
+                debitur_id: {
+                    title: 'Debitur',
+                    render: (item, data) => {
+                        return `${data.debiture.name}`;
+                    },
+                },
+                tujuan_penilaian_id: {
+                    title: 'Tujuan Penilaian',
+                    render: (item, data) => {
+                        return `${data.tujuan_penilaian.name}`;
+                    },
+                },
+                status: {
+                    title: 'Status'
+                },
+                actions: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `<div class="flex flex-nowrap justify-center">
+                            <a class="btn btn-sm btn-icon btn-clear btn-warning " href="otorisator/show/${data.id}">
+                                <i class="ki-outline ki-eye"></i>
+                            </a>
+                        </div>`;
+                    },
+                }
+            },
+        };
+
+        let dataTable = new KTDataTable(element, dataTableOptions);
+        // Custom search functionality
+        searchInput.addEventListener('input', function () {
+            const searchValue = this.value.trim();
+            dataTable.search(searchValue, true);
+
+        });
+    </script>
+@endpush

resources/views/penilaian/otorisator/show.blade.php

@@ -0,0 +1,173 @@
+@extends('layouts.main')
+
+{{-- @section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection --}}
+
+@section('content')
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+        <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">
+                    Laporan
+                </h3>
+            </div>
+
+        </div>
+
+        <div class="card">
+            <form action="{{ route('authorization.update', $permohonan->id) }}" method="POST">
+                <input type="hidden" name="_method" value="PUT">
+                @csrf
+                <div class="card-body lg:py-7.5">
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Catatan
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <textarea class="textarea" rows="3" type="number" id="address" name="address"></textarea>
+                        </div>
+                    </div>
+                </div>
+                <div class="card-footer flex justify-end">
+                    <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">
+                        Revisi
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+@endsection

resources/views/registrasi/js/editjs.blade.php

@@ -5,8 +5,8 @@
     $(document).ready(function() {
         prepareForm();
     });
-      
+
-    function prepareForm() 
+    function prepareForm()
     {
         $("#registrasi_form")[0].reset();
         $(":radio[name='{{ $route[0] }}_tindakan'][value='0']").attr('checked', 'checked');
@@ -16,8 +16,8 @@
         // prepare data
         setData();
     }
-    
+
-    function setData() 
+    function setData()
     {
         let id = $("#id").val();
         let token =  "{{ csrf_token() }}";
@@ -53,20 +53,20 @@
 
     function setRegionList(datas, cid)
     {
-        $('#{{$route[0]}}_region').empty().append('<option value="0"> - Pilih Region - </option>'); 
+        $('#{{$route[0]}}_region').empty().append('<option value="0"> - Pilih Region - </option>');
-        
+
         $.each(datas, function(key, value){
-            
+
             $('#{{$route[0]}}_region').append(new Option(value, key));
         });
     }
 
     function setJenisPenilaianList(datas, cid)
     {
-        $('#{{$route[0]}}_jenis_penilaian').empty().append('<option value="0"> - Pilih Jenis Penilaian - </option>'); 
+        $('#{{$route[0]}}_jenis_penilaian').empty().append('<option value="0"> - Pilih Jenis Penilaian - </option>');
-        
+
         $.each(datas, function(key, value){
-            
+
             $('#{{$route[0]}}_jenis_penilaian').append(new Option(value, key));
         });
     }
@@ -85,7 +85,7 @@
         }
         else
         {
-            $("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true); 
+            $("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true);
             $("#{{ $route[0] }}_div_jenis_pilihan").hide();
             $("#{{ $route[0] }}_div_catatan").show();
         }
@@ -95,8 +95,8 @@
         e.preventDefault();
 
         //define variable
-        let token   = "{{ csrf_token() }}";   
+        let token   = "{{ csrf_token() }}";
-                 
+
         let _method   = $('input[name=_method]').val();
         let id   = $('#{{$route[0]}}_id').val();
         let tindakan = $('input[name="{{$route[0]}}_tindakan"]:checked').val();
@@ -108,7 +108,7 @@
             jenis_penilaian='';
         if(region==0)
             region='';
-        
+
         var input_data = new Object();
         input_data._token= token;
         input_data._method= _method;
@@ -117,7 +117,7 @@
         input_data.jenis_penilaian= jenis_penilaian;
         input_data.region= region;
         input_data.catatan = catatan;
-       
+
         let useURL= '{{ route($route[0].'.update', $id) }}';
         $.ajax({
             url: useURL,
@@ -128,7 +128,7 @@
             beforeSend: function() {
             },
             success: function(response) {
-                removeErrorCssMsg();
+
                 if ('error' == response.status) {
 
                     $.each(response.message, function(index, value) {
@@ -137,25 +137,25 @@
                             $("#{{$route[0]}}_catatan").addClass(" border-danger");
                             $("#{{$route[0]}}_catatan_msg").text(value);
                         }
-                        
+
                         if ("jenis_penilaian" === index) {
                             $("#{{$route[0]}}_jenis_penilaian").addClass(" border-danger");
                             $("#{{$route[0]}}_jenis_penilaian_msg").text(value);
                         }
-                        
+
                         if ("region" === index) {
                             $("#{{$route[0]}}_region").addClass(" border-danger");
                             $("#{{$route[0]}}_region_msg").text(value);
                         }
                     });
-                } 
+                }
-                else 
+                else
                 {
-                    toastr.success(response.message);
+                    //toastr.success(response.message);
-                    var url = "{{ route('registrasi.index') }}";    
+                    var url = "{{ route('registrasi.index') }}";
                     $(location).attr('href',url);
                 }
-                
+
             },
             error: function(response, textStatus, errorThrown) {
                 // var errors = response.responseJSON.errors;
@@ -168,15 +168,15 @@
             }
 
         });
-        //     
+        //
-        
+
-    });    
+    });
-    
+
     $('#{{$route[0]}}_jenis_penilaian').on('change', function (e) {
-        
+
         var idNya = $('#{{$route[0]}}_jenis_penilaian').find(":selected").val();
         // var textNya = $('#{{$route[0]}}_jenis_penilaian').find(":selected").text();
-            
+
         if('1'==idNya)
         {
             // INTERNAL, show region
@@ -188,11 +188,11 @@
             $("#{{ $route[0] }}_div_region").hide();
         }
     });
-    
+
     /*
     $('#{{$route[0]}}_jenis_penilaian').on('change', function() {
         console.log( this.value );
     });
     */
     </script>
-@endpush  
+@endpush

resources/views/registrasi/js/showjs.blade.php

@@ -1,16 +1,16 @@
 @push('scripts')
-    <script type="module">    
+    <script type="module">
-    
+
     $(document).ready(function() {
         prepareForm();
     });
-      
+
-    function prepareForm() 
+    function prepareForm()
     {
         setData();
     }
-    
+
-    function setData() 
+    function setData()
     {
         let id = $("#id").val();
         let token =  "{{ csrf_token() }}";
@@ -45,17 +45,17 @@
 
     function setJenisPenilaianList(datas, cid)
     {
-        $('#{{$route[0]}}_jenis_penilaian').empty().append('<option value="0"> - Pilih Jenis Penilaian - </option>'); 
+        $('#{{$route[0]}}_jenis_penilaian').empty().append('<option value="0"> - Pilih Jenis Penilaian - </option>');
-        
+
         $.each(datas, function(key, value){
-            
+
             $('#{{$route[0]}}_jenis_penilaian').append(new Option(value, key));
         });
     }
 
     $('input[type=radio][name={{ $route[0] }}_tindakan]').change(function() {
 
-        removeErrorCssMsg();
+
         if($(this).val()==0)
         {
             // show jenis pilihan
@@ -66,7 +66,7 @@
         }
         else
         {
-            $("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true); 
+            $("#{{$route[0]}}_jenis_penilaian option[value=0]").prop('selected', true);
             $("#{{ $route[0] }}_div_jenis_pilihan").hide();
             $("#{{ $route[0] }}_div_catatan").show();
         }
@@ -76,8 +76,8 @@
         e.preventDefault();
 
         //define variable
-        let token   = "{{ csrf_token() }}";   
+        let token   = "{{ csrf_token() }}";
-                 
+
         let _method   = $('input[name=_method]').val();
         let id   = $('#{{$route[0]}}_id').val();
         let tindakan = $('input[name="{{$route[0]}}_tindakan"]:checked').val();
@@ -86,7 +86,7 @@
 
         if(jenis_penilaian==0)
             jenis_penilaian='';
-        
+
         var input_data = new Object();
         input_data._token= token;
         input_data._method= _method;
@@ -94,7 +94,7 @@
         input_data.tindakan= tindakan;
         input_data.jenis_penilaian= jenis_penilaian;
         input_data.catatan = catatan;
-       
+
         let useURL= '{{ route($route[0].'.update', $id) }}';
         $.ajax({
             url: useURL,
@@ -105,7 +105,7 @@
             beforeSend: function() {
             },
             success: function(response) {
-                removeErrorCssMsg();
+
                 if ('error' == response.status) {
 
                     $.each(response.message, function(index, value) {
@@ -114,20 +114,20 @@
                             $("#{{$route[0]}}_catatan").addClass(" border-danger");
                             $("#{{$route[0]}}_catatan_msg").text(value);
                         }
-                        
+
                         if ("jenis_penilaian" === index) {
                             $("#{{$route[0]}}_jenis_penilaian").addClass(" border-danger");
                             $("#{{$route[0]}}_jenis_penilaian_msg").text(value);
                         }
                     });
-                } 
+                }
-                else 
+                else
                 {
                     toastr.success(response.message);
-                    var url = "{{ route('registrasi.index') }}";    
+                    var url = "{{ route('registrasi.index') }}";
                     $(location).attr('href',url);
                 }
-                
+
             },
             error: function(response, textStatus, errorThrown) {
                 // var errors = response.responseJSON.errors;
@@ -140,9 +140,9 @@
             }
 
         });
-        //     
+        //
-        
+
-    });    
+    });
 
     </script>
-@endpush  
+@endpush

resources/views/registrasi/show.blade.php

@@ -1,243 +1,316 @@
 @extends('layouts.main')
 
 @section('breadcrumbs')
-    {{ Breadcrumbs::render(request()->route()->getName()) }}
+	{{ Breadcrumbs::render(request()->route()->getName()) }}
 @endsection
 @php
-    // $route = Route::currentRouteName();
+	// $route = Route::currentRouteName();
-    // dd($route); registrasi.show
+	// dd($route); registrasi.show
-    $route = explode('.', Route::currentRouteName());
+	$route = explode('.', Route::currentRouteName());
 @endphp
 @section('content')
-<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+	<div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-    <div class="card pb-2.5">
+		<div class="card">
-        <div class="card-header" id="basic_settings">
+			<div class="card-header" id="advanced_settings_appearance">
-            <h3 class="card-title">
+				<h3 class="card-title">
-                Detail Permohonan
+					Data Permohonan
-            </h3>
+				</h3>
-            <div class="flex items-center gap-2">
-                <a href="{{ route('registrasi.edit', $id) }}" class="btn btn-xs btn-primary" title="Register"><i class="ki-filled ki-arrow-circle-right"></i> Registrasi</a>
-                <a href="{{ route('registrasi.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
-            </div>
-        </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">
+				<div class="flex items-center gap-2">
-                <h3 class="text-md font-medium text-gray-900">
+					<a href="{{ route('registrasi.edit', $id) }}" class="btn btn-xs btn-primary hidden" title="Register"><i class="ki-filled ki-arrow-circle-right"></i> Registrasi</a>
-                    Pemohon:
+					<a href="{{ route('registrasi.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
-                </h3>
+				</div>
-                <span class="text-2sm text-gray-700">
+			</div>
-                    {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
+			<div class="card-body lg:py-7.5 grid grid-cols-3">
-                </span>
+				<div class="mb-5">
-            </div>
+					<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">
+				<div class="mb-5">
-                <h3 class="text-md font-medium text-gray-900">
+					<h3 class="text-md font-medium text-gray-900">
-                    Tujan Permohonan:
+						Pemohon:
-                </h3>
+					</h3>
-                <span class="text-2sm text-gray-700">
+					<span class="text-2sm text-gray-700">
-                    {{ $permohonan->tujuanPenilaian->name }}
+						{{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }}
-                </span>
+					</span>
-            </div>
+				</div>
 
-        </div>
+				<div class="mb-5">
-    </div>
+					<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 class="card min-w-full">
+			</div>
-        <div class="card-header">
+		</div>
-            <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>
+		<div class="card min-w-full">
-                            <td class="py-3 text-gray-600 font-normal">
+			<div class="card-header">
-                                Address
+				<h3 class="card-title">
-                            </td>
+					Detail Debutur
-                            <td class="py-3 text-gray-700 text-sm font-normal">
+				</h3>
-                                {{ $permohonan->debiture->address ?? "" }}
+			</div>
-                            </td>
+			<div class="card-table scrollable-x-auto pb-3">
-                        </tr>
+				<div class="grid grid-cols-1 xl:grid-cols-2 gap-5 lg:gap-7.5">
-                        <tr>
+					<div class="col-span-1">
-                            <td class="py-3 text-gray-600 font-normal">
+						<table class="table align-middle text-sm text-gray-500">
-                                &nbsp;
+							<tr>
-                            </td>
+								<td class="py-2 text-gray-600 font-normal">
-                            <td class="py-3 text-gray-700 text-sm font-normal">
+									Name
-                                {{ $permohonan->debiture->village->name ?? "" }}, {{ $permohonan->debiture->district->name ?? "" }}, {{ $permohonan->debiture->city->name ?? "" }}, {{ $permohonan->debiture->province->name ?? "" }} - {{ $permohonan->debiture->village->postal_code ?? "" }}
+								</td>
-                            </td>
+								<td class="py-2 text-gray-800 font-normaltext-sm">
-                        </tr>
+									{{ $permohonan->debiture->name ?? "" }}
-                    </table>
+								</td>
-                </div>
+							</tr>
-                <div class="col-span-1">
+							<tr>
-                    <table class="table align-middle text-sm text-gray-500">
+								<td class="py-3">
-                        <tr>
+									Email
-                            <td class="py-3 text-gray-600 font-normal">
+								</td>
-                                Cabang
+								<td class="py-3 text-gray-700 text-2sm font-normal">
-                            </td>
+									{{ $permohonan->debiture->email ?? "" }}
-                            <td class="py-2 text-gray-800 font-normaltext-sm">
+								</td>
-                                {{ $permohonan->debiture->branch->name  ?? "" }}
+							</tr>
-                            </td>
+							<tr>
-                        </tr>
+								<td class="py-3">
-                        <tr>
+									Phone
-                            <td class="py-3 text-gray-600 font-normal">
+								</td>
-                                CIF
+								<td class="py-3 text-gray-700 text-2sm font-normal">
-                            </td>
+									{{ $permohonan->debiture->phone ?? "" }}
-                            <td class="py-2 text-gray-800 font-normaltext-sm">
+								</td>
-                                {{ $permohonan->debiture->cif ?? "" }}
+							</tr>
-                            </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">
+							<tr>
-        <div class="card-header">
+								<td class="py-3 text-gray-600 font-normal">
-            <h3 class="card-title">
+									Address
-                Data Jaminan
+								</td>
-            </h3>
+								<td class="py-3 text-gray-700 text-sm font-normal">
-        </div>
+									{{ $permohonan->debiture->address ?? "" }}
-        <div data-accordion="true">
+								</td>
-            @foreach($permohonan->debiture->documents as $dokumen)
+							</tr>
-                <div class="accordion-item [&:not(:last-child)]:border-b border-b-gray-200" data-accordion-item="true" id="accordion_1_item_1">
+							<tr>
-                    <button class="accordion-toggle py-4 group mx-8" data-accordion-toggle="#accordion_1_content_1">
+								<td class="py-3 text-gray-600 font-normal">
-                        <span class="text-base text-gray-900 font-medium">
+									&nbsp;
-                            Jaminan {{ $loop->index + 1 }}
+								</td>
-                        </span>
+								<td class="py-3 text-gray-700 text-sm font-normal">
-                        <i class="ki-outline ki-plus text-gray-600 text-2sm accordion-active:hidden block">
+									{{ $permohonan->debiture->village->name ?? "" }}, {{ $permohonan->debiture->district->name ?? "" }}, {{ $permohonan->debiture->city->name ?? "" }}, {{ $permohonan->debiture->province->name ?? "" }} - {{ $permohonan->debiture->village->postal_code ?? "" }}
-                        </i>
+								</td>
-                        <i class="ki-outline ki-minus text-gray-600 text-2sm accordion-active:block hidden">
+							</tr>
-                        </i>
+						</table>
-                    </button>
+					</div>
-                    <div class="accordion-content hidden" id="accordion_1_content_1">
+					<div class="col-span-1">
-                        <div class="card-body lg:py-7.5 grid grid-cols-2">
+						<table class="table align-middle text-sm text-gray-500">
-                            <div class="mb-5">
+							<tr>
-                                <h3 class="text-md font-medium text-gray-900">
+								<td class="py-3 text-gray-600 font-normal">
-                                    Pemilik Jaminan:
+									Cabang
-                                </h3>
+								</td>
-                                <span class="text-2sm text-gray-700">
+								<td class="py-2 text-gray-800 font-normaltext-sm">
-                                    {{ $dokumen->pemilik->name?? "" }}
+									{{ $permohonan->debiture->branch->name  ?? "" }}
-                                </span>
+								</td>
-                            </div>
+							</tr>
-                            <div class="mb-5">
+							<tr>
-                                <h3 class="text-md font-medium text-gray-900">
+								<td class="py-3 text-gray-600 font-normal">
-                                    Jenis Jaminan:
+									CIF
-                                </h3>
+								</td>
-                                <span class="text-2sm text-gray-700">
+								<td class="py-2 text-gray-800 font-normaltext-sm">
-                                    {{ $dokumen->jenisJaminan->name?? "" }}
+									{{ $permohonan->debiture->cif ?? "" }}
-                                </span>
+								</td>
-                            </div>
+							</tr>
-                            <div class="mb-5">
+							<tr>
-                                <h3 class="text-md font-medium text-gray-900">
+								<td class="py-3 text-gray-600 font-normal">
-                                    Hubungan Pemilik Jaminan:
+									Nomor Rekening
-                                </h3>
+								</td>
-                                <span class="text-2sm text-gray-700">
+								<td class="py-3 text-gray-700 text-sm font-normal">
-                                    {{ $dokumen->pemilik->hubungan_pemilik->name?? "" }}
+									{{ $permohonan->debiture->nomor_rekening ?? "" }}
-                                </span>
+								</td>
-                            </div>
+							</tr>
-                            <div class="mb-5">
+							<tr>
-                                <h3 class="text-md font-medium text-gray-900">
+								<td class="py-3">
-                                    Alamat Pemilik Jaminan:
+									NPWP
-                                </h3>
+								</td>
-                                <span class="text-2sm text-gray-700">
+								<td class="py-3 text-gray-700 text-2sm font-normal">
-                                    {{ $dokumen->pemilik->address ?? ""}},
+									{{ $permohonan->debiture->npwp ?? "" }}
-                                    <br> {{ $dokumen->pemilik->village->name ?? "" }}, {{ $dokumen->pemilik->district->name ?? "" }}, {{ $dokumen->pemilik->city->name ?? "" }}, {{ $dokumen->pemilik->province->name ?? "" }} - {{ $dokumen->pemilik->village->postal_code ?? "" }}
+								</td>
-                                </span>
+							</tr>
-                            </div>
+						</table>
-                        </div>
+					</div>
-                        <div class="card-table scrollable-x-auto pb-3">
+				</div>
-                            <table class="table align-middle text-sm text-gray-500">
+			</div>
-                                @foreach($dokumen->detail as $detail)
+		</div>
-                                    <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>
 
+		<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">
+					Registrasi
+				</h3>
+				<div class="flex items-center gap-2 hidden">
+					<a href="{{ route('registrasi.show', $id) }}" class="btn btn-xs btn-primary" title="Detail"><i class="ki-filled ki-abstract-26"></i> Detail</a>
+					<a href="{{ route('registrasi.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+				</div>
+			</div>
+			<div class="card-body lg:py-7.5">
+				<form id="{{$route[0]}}_form" name="{{$route[0]}}_form" method="POST">
+					<input type="hidden" id="id" name="id" value="{{ $id }}">
+					@method('PUT')
+					@csrf
+
+					<div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+						<label class="form-label max-w-56">
+							Tindakan
+						</label>
+						<div class="flex gap-12">
+							<label class="form-label flex items-center gap-2.5 text-nowrap">
+								<input class="radio" name="{{$route[0]}}_tindakan" type="radio" value="0" id="{{ $route[0] }}_tindakan_yes" />
+								Yes
+							</label>&nbsp;&nbsp;
+							<label class="form-label flex items-center gap-2.5 text-nowrap">
+								<input class="radio" name="{{$route[0]}}_tindakan" type="radio" value="1" id="{{ $route[0] }}_tindakan_no" />
+								No
+							</label>
+						</div>
+					</div>
+					<div id="{{$route[0]}}_div_jenis_pilihan" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 mt-5">
+						<label class="form-label max-w-56">
+							Data Jenis Penilaian (Pilihan registrasi)
+						</label>
+						<div class="flex flex-wrap items-baseline w-full">
+							<select class="inputku select" id="{{$route[0]}}_jenis_penilaian" name="{{$route[0]}}_jenis_penilaian">
+								<option></option>
+							</select>
+							<em id="{{$route[0]}}_jenis_penilaian_msg" class="alert text-danger text-sm"></em>
+						</div>
+					</div>
+					<div id="{{ $route[0] }}_div_catatan" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 mt-5">
+						<label class="form-label max-w-56">
+							Catatan
+						</label>
+						<div class="flex flex-wrap items-baseline w-full">
+							<textarea class="inputku textarea" name="{{$route[0]}}_catatan" id="{{$route[0]}}_catatan" placeholder="Catatan..." rows="6"></textarea>
+							<em id="{{$route[0]}}_catatan_msg" class="alert text-danger text-sm"></em>
+						</div>
+					</div>
+					<div id="{{ $route[0] }}_div_region" class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 mt-5">
+						<label class="form-label max-w-56">
+							Region
+						</label>
+						<div class="flex flex-wrap items-baseline w-full">
+							<select class="inputku select" id="{{$route[0]}}_region" name="{{$route[0]}}_region">
+								<option></option>
+							</select>
+							<em id="{{$route[0]}}_region_msg" class="alert text-danger text-sm"></em>
+						</div>
+					</div>
+					<div class="flex justify-end mt-5">
+						<button type="button" class="btn btn-primary" id="toEdit">
+							Save
+						</button>
+					</div>
+				</form>
+			</div>
+		</div>
+	</div>
 
 @endsection
 @include('lpj::registrasi.js.showjs')
+@include('lpj::registrasi.js.editjs')

resources/views/surveyor/detail.blade.php

@@ -0,0 +1,162 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+
+@section('content')
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+        <div class="card">
+            <div class="card-header" id="advanced_settings_appearance">
+                <h3 class="card-title">
+                    Surveyor
+                </h3>
+                <div class="flex items-center gap-2">
+                    <a href="{{ route('surveyor.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
+                        Back</a>
+                </div>
+            </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">
+                        Waktu Survei:
+                    </h3>
+                    <span class="text-2sm text-gray-700">
+                        {{ $permohonan->penilaian->tanggal_kunjungan }}
+                    </span>
+                </div>
+
+                <div class="mb-5">
+                    <h3 class="text-md font-medium text-gray-900">
+                        Keterangan:
+                    </h3>
+                    <span class="text-2sm text-gray-700">
+                        {{ $permohonan->penilaian->keterangan }}
+                    </span>
+                </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 min-w-full py-2 px-2">
+            {{-- <div class="card-header">
+            <h3 class="card-title">
+                Data Jaminan
+            </h3>
+        </div> --}}
+
+            <div class="flex flex-col gap-5 lg:gap-7.5">
+                
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/surveyor/index.blade.php

@@ -0,0 +1,270 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render('surveyor') }}
+@endsection
+@section('content')
+
+@push('styles')
+    <style>
+        .modal {
+            width: 50%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            position: fixed;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+        }
+    </style>
+@endpush
+
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+        <div class="card pb-2.5">
+            <div class="card-header" id="basic_settings">
+                <div class="card-title flex flex-row gap-1.5">
+                    Surveyor
+                </div>
+                <div class="card-header py-5 flex-wrap">
+                    <h3 class="card-title">
+                        {{-- Daftar {{}} --}}
+                    </h3>
+                    <div class="flex flex-wrap gap-2 lg:gap-5">
+                        <div class="flex">
+                            <label class="input input-sm">
+                                <i class="ki-filled ki-magnifier"></i>
+                                <input placeholder="Search Penilaian" id="search" type="text" value="">
+                            </label>
+                        </div>
+
+                        <div class="flex flex-wrap gap-2.5">
+                            <div class="h-[24px] border border-r-gray-200"></div>
+                            <a class="btn btn-sm btn-light" href="{{ route('activity.export') }}"> Export to Excel </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
+                data-datatable-state-save="false" id="permohonan-table" data-api-url="{{ route('surveyor.datatables') }}">
+
+                <div class="card-body">
+                    <div class="scrollable-x-auto">
+                        <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
+                            data-datatable-table="true">
+                            <thead>
+                                <tr>
+                                    <th class="w-14">
+                                        <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox" />
+                                    </th>
+                                    <th class="min-w-[150px]" data-datatable-column="nomor_registrasi">
+                                        <span class="sort"><span class="sort-label">Nomor Registrasi</span>
+                                            <span class="sort-icon"></span>
+                                        </span>
+                                    </th>
+                                    <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                        <span class="sort"><span class="sort-label">Tanggal Assigned</span>
+                                            <span class="sort-icon"></span>
+                                        </span>
+                                    </th>
+                                    <th class="min-w-[150px]" data-datatable-column="user_id">
+                                        <span class="sort"><span class="sort-label">User Pemohon</span>
+                                            <span class="sort-icon"></span>
+                                        </span>
+                                    </th>
+                                    <th class="min-w-[150px]" data-datatable-column="branch_id">
+                                        <span class="sort"><span class="sort-label">Cabang Pemohon</span>
+                                            <span class="sort-icon"></span>
+                                        </span>
+                                    </th>
+                                    <th class="min-w-[150px]" data-datatable-column="debitur_id">
+                                        <span class="sort"><span class="sort-label">Debitur</span>
+                                            <span class="sort-icon"></span>
+                                        </span>
+                                    </th>
+                                    <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_id">
+                                        <span class="sort"><span class="sort-label">Tujuan Penilaian</span>
+                                            <span class="sort-icon"></span>
+                                        </span>
+                                    </th>
+                                    <th class="min-w-[150px]" data-datatable-column="status">
+                                        <span class="sort"><span class="sort-label">Fasilitas Kredit</span>
+                                            <span class="sort-icon"></span>
+                                        </span>
+                                    </th>
+
+                                    <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
+                                </tr>
+                            </thead>
+                        </table>
+                    </div>
+                    <div
+                        class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                        <div class="flex items-center gap-2">
+                            Show
+                            <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per
+                            page
+                        </div>
+                        <div class="flex items-center gap-4">
+                            <span data-datatable-info="true"></span>
+                            <div class="pagination" data-datatable-pagination="true"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="modal fade" data-modal="true" id="modal_revisi" data-backdrop="static" data-keyboard="false">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3 class="modal-title">Kunjungan</h3>
+                <button class="btn btn-xs btn-icon btn-light" data-modal-dismiss="true">
+                    <i class="ki-outline ki-cross"></i>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form
+                    action=""
+                    method="POST" enctype="multipart/form-data" id="revisiForm">
+                    @csrf
+                    @method('PUT')
+
+                    <input type="hidden" name="action" value="revisi">
+                    {{-- <input type="hidden" name="nomor_registrasi"
+                        value="{{ $penilaian->nomor_registrasi ?? $permohonan->nomor_registrasi }}"> --}}
+
+                    <div class="pl-1 grid gap-2.5">
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">Tanggal Kunjungan</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+
+                                <input class="input @error('tanggal_kunjungan') border-danger bg-danger-light @enderror"
+                                    type="datetime-local" name="tanggal_kunjungan"
+                                    value="">
+                                @error('tanggal_kunjungan')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                @enderror
+                            </div>
+                        </div>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">Catatan</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <textarea id="keterangan" class="textarea @error('keterangan') border-danger bg-danger-light @enderror"
+                                    rows="3" name="keterangan"></textarea>
+                                @error('keterangan')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                @enderror
+                            </div>
+                        </div>
+
+
+                    </div>
+
+                    <div class="modal-footer justify-end mt-2">
+                        <div class="flex gap-4">
+                            <button type="button" class="btn btn-light" data-modal-dismiss="true">Cancel</button>
+                            <button id="btnSubmit" type="submit" class="btn btn-primary">Submit</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+    <script type="module">
+        const element = document.querySelector('#permohonan-table');
+        const searchInput = document.getElementById('search');
+        const statusFilter = document.getElementById('status-filter'); // Dropdown filter element
+
+        const apiUrl = element.getAttribute('data-api-url');
+        const dataTableOptions = {
+            apiEndpoint: apiUrl,
+            pageSize: 5,
+            order: [{
+                    column: 'nomor_registrasi',
+                    dir: 'asc'
+                } // Default order by 'nomor_registrasi' ascending
+            ],
+            columns: {
+                select: {
+                    render: (item, data, context) => {
+                        const checkbox = document.createElement('input');
+                        checkbox.className = 'checkbox checkbox-sm';
+                        checkbox.type = 'checkbox';
+                        checkbox.value = data.id.toString();
+                        checkbox.setAttribute('data-datatable-row-check', 'true');
+                        return checkbox.outerHTML.trim();
+                    },
+                },
+                nomor_registrasi: {
+                    title: 'Nomor Registrasi',
+                },
+                tanggal_permohonan: {
+                    title: 'Tanggal Assigned',
+                    render: (item, data) => {
+                        const createdAt = convertDate(data.penilaian.created_at);
+                        return createdAt;
+                    },
+                },
+
+                user_id: {
+                    title: 'User Pemohon',
+                    render: (item, data) => `${data.user.name}`,
+                },
+                branch_id: {
+                    title: 'Cabang Pemohon',
+                    render: (item, data) => `${data.branch.name}`,
+                },
+                debitur_id: {
+                    title: 'Debitur',
+                    render: (item, data) => `${data.debiture.name}`,
+                },
+                tujuan_penilaian_id: {
+                    title: 'Tujuan Penilaian',
+                    render: (item, data) => `${data.tujuan_penilaian.name}`,
+                },
+                jenis_fasilitas_kredit_id: {
+                    title: 'Fasilitas Kredit',
+                    render: (item, data) => `${data.jenis_fasilitas_kredit.name}`,
+                },
+                actions: {
+                    title: 'Action',
+                    render: (item, data) => `
+                    <div class="flex flex-nowrap justify-center">
+                        <a class="btn btn-sm btn-icon btn-clear btn-info" data-modal-toggle="#modal_revisi" >
+                            <i class="ki-outline ki-notepad-edit"></i>
+                        </a>
+                         <a class="btn btn-sm btn-icon btn-clear btn-warning" href="surveyor/${data.id}/show">
+                                <i class="ki-outline ki-eye"></i>
+                            </a>
+                    </div>`,
+                }
+            },
+        };
+
+        let dataTable = new KTDataTable(element, dataTableOptions);
+
+        searchInput.addEventListener('input', function() {
+            const searchValue = this.value.trim();
+            dataTable.search(searchValue, true);
+        });
+
+        statusFilter.addEventListener('change', function() {
+            const selectedStatus = this.value;
+            dataTable.search(selectedStatus);
+        });
+
+        function convertDate(date) {
+            const createdAt = new Date(date);
+            const day = String(createdAt.getDate()).padStart(2, '0');
+            const month = String(createdAt.getMonth() + 1).padStart(2, '0');
+            const year = createdAt.getFullYear();
+            return `${day}-${month}-${year}`;
+
+        }
+    </script>
+@endpush

resources/views/teams/form.blade.php

@@ -126,3 +126,4 @@
         </form>
     </div>
 @endsection
+

routes/breadcrumbs.php

@@ -388,6 +388,10 @@ Breadcrumbs::for('activity.show', function (BreadcrumbTrail $trail) {
     $trail->push('Activity activity');
 });
 
+Breadcrumbs::for('activity.progres', function (BreadcrumbTrail $trail) {
+    $trail->push('Team activity');
+});
+
 Breadcrumbs::for('tender', function (BreadcrumbTrail $trail) {
     $trail->push('Tender');
 });
@@ -397,9 +401,19 @@ Breadcrumbs::for('tender.penawaran', function (BreadcrumbTrail $trail) {
     $trail->push('Data Penawaran', route('tender.penawaran.index'));
 });
 
-Breadcrumbs::for('tender.penawaran.createPenawaran', function (BreadcrumbTrail $trail, $id) {
+Breadcrumbs::for('tender.penawaran.show', function (BreadcrumbTrail $trail, $noreg) {
+    $trail->parent('tender');
+    $trail->push('Detail Penawaran', route('tender.penawaran.show', $noreg));
+});
+
+Breadcrumbs::for('tender.penawaran.createPenawaran', function (BreadcrumbTrail $trail, $noreg) {
     $trail->parent('tender.penawaran');
-    $trail->push('Tambah Data Penawaran', route('tender.penawaran.createPenawaran', $id));
+    $trail->push('Tambah Data Penawaran', route('tender.penawaran.createPenawaran', $noreg));
+});
+
+Breadcrumbs::for('tender.penawaran.editPenawaran', function (BreadcrumbTrail $trail, $noreg) {
+    $trail->parent('tender.penawaran');
+    $trail->push('Penawaran Ulang', route('tender.penawaran.editPenawaran', $noreg));
 });
 
 Breadcrumbs::for('tender.proses.penawaran', function (BreadcrumbTrail $trail) {
@@ -410,10 +424,18 @@ Breadcrumbs::for('tender.proses.penawaran', function (BreadcrumbTrail $trail) {
 
 Breadcrumbs::for('tender.penawaran.ulang', function (BreadcrumbTrail $trail) {
     $trail->parent('tender');
-    $trail->push('Data Penawaran Ulang', route('tender.penawaran_ulang.index'));
+    $trail->push('Data Penawaran Ulang', route('tender.penawaran.ulang.index'));
+});
+
+Breadcrumbs::for('surveyor', function (BreadcrumbTrail $trail) {
+    $trail->push('Surveyor', route('surveyor.index'));
+});
+
+Breadcrumbs::for('surveyor.show', function (BreadcrumbTrail $trail) {
+    $trail->parent('surveyor');
+    $trail->push('Detail');
 });
 
-// andy add
 Breadcrumbs::for('registrasi', function (BreadcrumbTrail $trail) {
     $trail->push('Registrasi', route('registrasi.index'));
 });
@@ -444,3 +466,10 @@ Breadcrumbs::for('tender.prosespenawaran.show', function (BreadcrumbTrail $trail
     $trail->push('Detail Data Proses Penawaran');
 });
 // andy add 20241009
+
+
+
+Breadcrumbs::for('otorisator.pelaporan.index', function (BreadcrumbTrail $trail) {
+    $trail->parent('otorisator');
+    $trail->push('Otorisator', route('otorisator.pelaporan.index'));
+});

routes/web.php

@@ -1,383 +1,102 @@
 <?php
 
-    use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Route;
-    use Modules\Lpj\Http\Controllers\ActivityController;
+use Modules\Lpj\Http\Controllers\ActivityController;
-    use Modules\Lpj\Http\Controllers\ArahMataAnginController;
+use Modules\Lpj\Http\Controllers\ArahMataAnginController;
-    use Modules\Lpj\Http\Controllers\BranchController;
+use Modules\Lpj\Http\Controllers\BranchController;
-    use Modules\Lpj\Http\Controllers\CurrencyController;
+use Modules\Lpj\Http\Controllers\CurrencyController;
-    use Modules\Lpj\Http\Controllers\DebitureController;
+use Modules\Lpj\Http\Controllers\DebitureController;
-    use Modules\Lpj\Http\Controllers\DokumenJaminanController;
+use Modules\Lpj\Http\Controllers\DokumenJaminanController;
-    use Modules\Lpj\Http\Controllers\HubunganPemilikJaminanController;
+use Modules\Lpj\Http\Controllers\HubunganPemilikJaminanController;
-    use Modules\Lpj\Http\Controllers\HubunganPenghuniJaminanController;
+use Modules\Lpj\Http\Controllers\HubunganPenghuniJaminanController;
-    use Modules\Lpj\Http\Controllers\IjinUsahaController;
+use Modules\Lpj\Http\Controllers\IjinUsahaController;
-    use Modules\Lpj\Http\Controllers\JenisDokumenController;
+use Modules\Lpj\Http\Controllers\JenisDokumenController;
-    use Modules\Lpj\Http\Controllers\JenisFasilitasKreditController;
+use Modules\Lpj\Http\Controllers\JenisFasilitasKreditController;
-    use Modules\Lpj\Http\Controllers\JenisJaminanController;
+use Modules\Lpj\Http\Controllers\JenisJaminanController;
-    use Modules\Lpj\Http\Controllers\JenisLaporanController;
+use Modules\Lpj\Http\Controllers\JenisLaporanController;
-    use Modules\Lpj\Http\Controllers\JenisLegalitasJaminanController;
+use Modules\Lpj\Http\Controllers\JenisLegalitasJaminanController;
-    use Modules\Lpj\Http\Controllers\JenisPenilaianController;
+use Modules\Lpj\Http\Controllers\JenisPenilaianController;
-    use Modules\Lpj\Http\Controllers\KJPPController;
+use Modules\Lpj\Http\Controllers\KJPPController;
-    use Modules\Lpj\Http\Controllers\NilaiPlafondController;
+use Modules\Lpj\Http\Controllers\NilaiPlafondController;
-    use Modules\Lpj\Http\Controllers\PemilikJaminanController;
+use Modules\Lpj\Http\Controllers\PemilikJaminanController;
-    use Modules\Lpj\Http\Controllers\PenilaianController;
+use Modules\Lpj\Http\Controllers\PenilaianController;
-    use Modules\Lpj\Http\Controllers\PermohonanController;
+use Modules\Lpj\Http\Controllers\PermohonanController;
-    use Modules\Lpj\Http\Controllers\RegionController;
+use Modules\Lpj\Http\Controllers\RegionController;
-    use Modules\Lpj\Http\Controllers\StatusPermohonanController;
+use Modules\Lpj\Http\Controllers\StatusPermohonanController;
-    use Modules\Lpj\Http\Controllers\TeamsController;
+use Modules\Lpj\Http\Controllers\TeamsController;
-    use Modules\Lpj\Http\Controllers\TenderController;
+use Modules\Lpj\Http\Controllers\TenderController;
-    use Modules\Lpj\Http\Controllers\TujuanPenilaianController;
+use Modules\Lpj\Http\Controllers\TujuanPenilaianController;
-    use Modules\Lpj\Http\Controllers\TujuanPenilaianKJPPController;
+use Modules\Lpj\Http\Controllers\TujuanPenilaianKJPPController;
+// use Modules\Lpj\Http\Controllers\ActivityController;
+use Modules\Lpj\Http\Controllers\SurveyorController;
 
-    // use Modules\Lpj\Http\Controllers\ActivityController;
+/*
+    |--------------------------------------------------------------------------
+    | Web Routes
+    |--------------------------------------------------------------------------
+    |
+    | Here is where you can register web routes for your application. These
+    | routes are loaded by the RouteServiceProvider within a group which
+    | contains the "web" middleware group. Now create something great!
+    |
+    */
 
-    /*
+Route::middleware(['auth'])->group(function () {
-            |--------------------------------------------------------------------------
+    Route::get('api/check-penawaran/{nomor_registrasi}', [TenderController::class, 'checkPenawaranExistence']);
-            | Web Routes
-            |--------------------------------------------------------------------------
-            |
-            | Here is where you can register web routes for your application. These
-            | routes are loaded by the RouteServiceProvider within a group which
-            | contains the "web" middleware group. Now create something great!
-            |
-            */
 
-    Route::middleware(['auth'])->group(function () {
+    Route::name('basicdata.')->prefix('basic-data')->group(function () {
-        Route::name('basicdata.')->prefix('basic-data')->group(function () {
+        Route::name('jenis-fasilitas-kredit.')->prefix('jenis-fasilitas-kredit')->group(function () {
-            Route::name('jenis-fasilitas-kredit.')->prefix('jenis-fasilitas-kredit')->group(function () {
+            Route::get('restore/{id}', [JenisFasilitasKreditController::class, 'restore'])->name('restore');
-                Route::get('restore/{id}', [JenisFasilitasKreditController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisFasilitasKreditController::class, 'dataForDatatables'])->name(
-                Route::get('datatables', [JenisFasilitasKreditController::class, 'dataForDatatables'])->name(
+                'datatables',
-                        'datatables',
-                    );
-                Route::get('export', [JenisFasilitasKreditController::class, 'export'])->name('export');
-            });
-            Route::resource('jenis-fasilitas-kredit', JenisFasilitasKreditController::class);
-
-            Route::name('jenis-legalitas-jaminan.')->prefix('jenis-legalitas-jaminan')->group(function () {
-                Route::get('restore/{id}', [JenisLegalitasJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisLegalitasJaminanController::class, 'dataForDatatables'])->name(
-                        'datatables',
-                    );
-                Route::get('export', [JenisLegalitasJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('jenis-legalitas-jaminan', JenisLegalitasJaminanController::class);
-
-            Route::name('jenis-jaminan.')->prefix('jenis-jaminan')->group(function () {
-                Route::get('legalitas/{id}', [JenisJaminanController::class, 'legalitasJaminan'])->name('legalitas');
-                Route::get('restore/{id}', [JenisJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisJaminanController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [JenisJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('jenis-jaminan', JenisJaminanController::class);
-
-            Route::name('tujuan-penilaian.')->prefix('tujuan-penilaian')->group(function () {
-                Route::get('restore/{id}', [TujuanPenilaianController::class, 'restore'])->name('restore');
-                Route::get('datatables', [TujuanPenilaianController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [TujuanPenilaianController::class, 'export'])->name('export');
-            });
-            Route::resource('tujuan-penilaian', TujuanPenilaianController::class);
-
-            Route::name('tujuan_penilaian_kjpp.')->prefix('tujuan_penilaian_kjpp')->group(function () {
-                Route::get('datatables', [TujuanPenilaianKJPPController::class, 'dataForDatatables'])->name(
-                        'datatables',
-                    );
-                Route::get('export', [TujuanPenilaianKJPPController::class, 'export'])->name('export');
-            });
-            Route::resource('tujuan_penilaian_kjpp', TujuanPenilaianKJPPController::class);
-
-            Route::name('jenis-dokumen.')->prefix('jenis-dokumen')->group(function () {
-                Route::get('restore/{id}', [JenisDokumenController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisDokumenController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [JenisDokumenController::class, 'export'])->name('export');
-            });
-            Route::resource('jenis-dokumen', JenisDokumenController::class);
-            Route::name('currency.')->prefix('mata-uang')->group(function () {
-                Route::get('restore/{id}', [CurrencyController::class, 'restore'])->name('restore');
-                Route::get('datatables', [CurrencyController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [CurrencyController::class, 'export'])->name('export');
-            });
-
-            Route::name('debitur.')->prefix('debitur')->group(function () {
-                Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
-                Route::get('datatables', [DebitureController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [DebitureController::class, 'export'])->name('export');
-
-
-                Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () {
-                    Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download');
-                    Route::get('/', [DokumenJaminanController::class, 'index'])->name('index');
-                    Route::get('create', [DokumenJaminanController::class, 'create'])->name('create');
-                    Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit');
-                    Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update');
-                    Route::post('store', [DokumenJaminanController::class, 'store'])->name('store');
-                    Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy');
-                });
-
-                Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () {
-                    Route::get('/', [PemilikJaminanController::class, 'index'])->name('index');
-                    Route::get('create', [PemilikJaminanController::class, 'create'])->name('create');
-                    Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit');
-                    Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update');
-                    Route::post('store', [PemilikJaminanController::class, 'store'])->name('store');
-                    Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy');
-                });
-            });
-
-            Route::resource('debitur', DebitureController::class);
-
-            Route::name('branch.')->prefix('cabang')->group(function () {
-                Route::get('restore/{id}', [BranchController::class, 'restore'])->name('restore');
-                Route::get('datatables', [BranchController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [BranchController::class, 'export'])->name('export');
-            });
-
-            Route::resource('cabang', BranchController::class, [
-                'names' => [
-                    'index'   => 'branch.index',
-                    'show'    => 'branch.show',
-                    'create'  => 'branch.create',
-                    'store'   => 'branch.store',
-                    'edit'    => 'branch.edit',
-                    'update'  => 'branch.update',
-                    'destroy' => 'branch.destroy',
-                ],
-            ]);
-
-            Route::name('nilai-plafond.')->prefix('nilai-plafond')->group(function () {
-                Route::get('restore/{id}', [NilaiPlafondController::class, 'restore'])->name('restore');
-                Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [NilaiPlafondController::class, 'export'])->name('export');
-            });
-            Route::resource('nilai-plafond', NilaiPlafondController::class);
-
-            Route::name('hubungan-pemilik-jaminan.')->prefix('hubungan-pemilik-jaminan')->group(function () {
-                Route::get('restore/{id}', [HubunganPemilikJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])->name(
-                        'datatables',
-                    );
-                Route::get('export', [HubunganPemilikJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('hubungan-pemilik-jaminan', HubunganPemilikJaminanController::class);
-
-            Route::name('hubungan-penghuni-jaminan.')->prefix('hubungan-penghuni-jaminan')->group(function () {
-                Route::get('restore/{id}', [HubunganPenghuniJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])->name(
-                        'datatables',
-                    );
-                Route::get('export', [HubunganPenghuniJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('hubungan-penghuni-jaminan', HubunganPenghuniJaminanController::class);
-
-            Route::name('arah-mata-angin.')->prefix('arah-mata-angin')->group(function () {
-                Route::get('restore/{id}', [ArahMataAnginController::class, 'restore'])->name('restore');
-                Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
-            });
-            Route::resource('arah-mata-angin', ArahMataAnginController::class);
-
-
-            Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
-                Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [StatusPermohonanController::class, 'export'])->name('export');
-            });
-            Route::resource('status-permohonan', StatusPermohonanController::class);
-
-            Route::name('region.')->prefix('region')->group(function () {
-                Route::get('restore/{id}', [RegionController::class, 'restore'])->name('restore');
-                Route::get('datatables', [RegionController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [RegionController::class, 'export'])->name('export');
-            });
-
-
-            Route::resource('region', RegionController::class, [
-                'names' => [
-                    'index'   => 'region.index',
-                    'show'    => 'region.show',
-                    'create'  => 'region.create',
-                    'store'   => 'region.store',
-                    'edit'    => 'region.edit',
-                    'update'  => 'region.update',
-                    'destroy' => 'region.destroy',
-                ],
-            ]);
-
-            Route::resource('region', RegionController::class);
-
-
-            Route::name('teams.')->prefix('teams')->group(function () {
-                Route::get('restore/{id}', [TeamsController::class, 'restore'])->name('restore');
-                Route::get('datatables', [TeamsController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [TeamsController::class, 'export'])->name('export');
-            });
-
-            Route::resource('teams', TeamsController::class, [
-                'names' => [
-                    'index'   => 'teams.index',
-                    'show'    => 'teams.show',
-                    'create'  => 'teams.create',
-                    'store'   => 'teams.store',
-                    'edit'    => 'teams.edit',
-                    'update'  => 'teams.update',
-                    'destroy' => 'teams.destroy',
-                ],
-            ]);
-
-            Route::name('jenis-penilaian.')->prefix('jenis-penilaian')->group(function () {
-                Route::get('restore/{id}', [JenisPenilaianController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisPenilaianController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [JenisPenilaianController::class, 'export'])->name('export');
-            });
-
-            Route::resource('jenis-penilaian', JenisPenilaianController::class, [
-                'names' => [
-                    'index'   => 'jenis-penilaian.index',
-                    'show'    => 'jenis-penilaian.show',
-                    'create'  => 'jenis-penilaian.create',
-                    'store'   => 'jenis-penilaian.store',
-                    'edit'    => 'jenis-penilaian.edit',
-                    'update'  => 'jenis-penilaian.update',
-                    'destroy' => 'jenis-penilaian.destroy',
-                ],
-            ]);
-
-            Route::resource('mata-uang', CurrencyController::class, [
-                'names' => [
-                    'index'   => 'currency.index',
-                    'show'    => 'currency.show',
-                    'create'  => 'currency.create',
-                    'store'   => 'currency.store',
-                    'edit'    => 'currency.edit',
-                    'update'  => 'currency.update',
-                    'destroy' => 'currency.destroy',
-                ],
-            ]);
-
-            Route::name('branch.')->prefix('cabang')->group(function () {
-                Route::get('restore/{id}', [BranchController::class, 'restore'])->name('restore');
-                Route::get('datatables', [BranchController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [BranchController::class, 'export'])->name('export');
-            });
-
-            Route::resource('cabang', BranchController::class, [
-                'names' => [
-                    'index'   => 'branch.index',
-                    'show'    => 'branch.show',
-                    'create'  => 'branch.create',
-                    'store'   => 'branch.store',
-                    'edit'    => 'branch.edit',
-                    'update'  => 'branch.update',
-                    'destroy' => 'branch.destroy',
-                ],
-            ]);
-
-            Route::name('nilai-plafond.')->prefix('nilai-plafond')->group(function () {
-                Route::get('restore/{id}', [NilaiPlafondController::class, 'restore'])->name('restore');
-                Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [NilaiPlafondController::class, 'export'])->name('export');
-            });
-            Route::resource('nilai-plafond', NilaiPlafondController::class);
-
-            Route::name('hubungan-pemilik-jaminan.')->prefix('hubungan-pemilik-jaminan')->group(function () {
-                Route::get('restore/{id}', [HubunganPemilikJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])->name(
-                        'datatables',
-                    );
-                Route::get('export', [HubunganPemilikJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('hubungan-pemilik-jaminan', HubunganPemilikJaminanController::class);
-
-            Route::name('hubungan-penghuni-jaminan.')->prefix('hubungan-penghuni-jaminan')->group(function () {
-                Route::get('restore/{id}', [HubunganPenghuniJaminanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])->name(
-                        'datatables',
-                    );
-                Route::get('export', [HubunganPenghuniJaminanController::class, 'export'])->name('export');
-            });
-            Route::resource('hubungan-penghuni-jaminan', HubunganPenghuniJaminanController::class);
-
-            Route::name('arah-mata-angin.')->prefix('arah-mata-angin')->group(function () {
-                Route::get('restore/{id}', [ArahMataAnginController::class, 'restore'])->name('restore');
-                Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
-            });
-            Route::resource('arah-mata-angin', ArahMataAnginController::class);
-
-            Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () {
-                Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download');
-                Route::get('/', [DokumenJaminanController::class, 'index'])->name('index');
-                Route::get('create', [DokumenJaminanController::class, 'create'])->name('create');
-                Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit');
-                Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update');
-                Route::post('store', [DokumenJaminanController::class, 'store'])->name('store');
-                Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy');
-            });
-
-            Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () {
-                Route::get('/', [PemilikJaminanController::class, 'index'])->name('index');
-                Route::get('create', [PemilikJaminanController::class, 'create'])->name('create');
-                Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit');
-                Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update');
-                Route::post('store', [PemilikJaminanController::class, 'store'])->name('store');
-                Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy');
-            });
-
-            Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
-                Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
-                Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [StatusPermohonanController::class, 'export'])->name('export');
-            });
-            Route::resource('status-permohonan', StatusPermohonanController::class);
-
-            // Start Activity KJPP route
-            Route::name('kjpp.')->prefix('kjpp')->group(function () {
-                Route::get('datatables', [KJPPController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [KJPPController::class, 'export'])->name('export');
-            });
-
-            Route::resource('kjpp', KJPPController::class);
-            // End Activity KJPP route
-
-            // Start Activity Ijin Usaha route
-            Route::name('ijin_usaha.')->prefix('ijin_usaha')->group(function () {
-                Route::get('datatables', [IjinUsahaController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [IjinUsahaController::class, 'export'])->name('export');
-            });
-
-            Route::resource('ijin_usaha', IjinUsahaController::class);
-            // End Activity Ijin Usaha route
-
-            // Start Activity Jenis Laporan route
-            Route::name('jenis_laporan.')->prefix('jenis_laporan')->group(function () {
-                Route::get('datatables', [JenisLaporanController::class, 'dataForDatatables'])->name('datatables');
-                Route::get('export', [JenisLaporanController::class, 'export'])->name('export');
-            });
-
-            Route::resource('jenis_laporan', JenisLaporanController::class);
-            // End Activity Jenis Laporan route
-
-
-        });
-
-        Route::name('permohonan.')->prefix('permohonan')->group(function () {
-            Route::get('{id}/create', [PermohonanController::class, 'createPermohonan'])->name('create.debitur');
-            Route::get('download/{id}', [PermohonanController::class, 'download'])->name('download');
-            Route::get('restore/{id}', [PermohonanController::class, 'restore'])->name('restore');
-            Route::get('datatables', [PermohonanController::class, 'dataForDatatables'])->name('datatables');
-            Route::get('export', [PermohonanController::class, 'export'])->name('export');
-        });
-
-        Route::resource('permohonan', PermohonanController::class);
-
-        Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index');
-        Route::get('authorization/datatables', [PermohonanController::class, 'dataForAuthorization'])->name(
-                'authorization.datatables',
             );
-        Route::get('authorization/{id}/edit', [PermohonanController::class, 'showAuthorization'])->name(
+            Route::get('export', [JenisFasilitasKreditController::class, 'export'])->name('export');
-            'authorization.show',
+        });
-        );
+        Route::resource('jenis-fasilitas-kredit', JenisFasilitasKreditController::class);
-        Route::put('authorization/{id}', [PermohonanController::class, 'updateAuthorization'])->name(
+
-            'authorization.update',
+        Route::name('jenis-legalitas-jaminan.')->prefix('jenis-legalitas-jaminan')->group(function () {
-        );
+            Route::get('restore/{id}', [JenisLegalitasJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisLegalitasJaminanController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [JenisLegalitasJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('jenis-legalitas-jaminan', JenisLegalitasJaminanController::class);
+
+        Route::name('jenis-jaminan.')->prefix('jenis-jaminan')->group(function () {
+            Route::get('legalitas/{id}', [JenisJaminanController::class, 'legalitasJaminan'])->name('legalitas');
+            Route::get('restore/{id}', [JenisJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisJaminanController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [JenisJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('jenis-jaminan', JenisJaminanController::class);
+
+        Route::name('tujuan-penilaian.')->prefix('tujuan-penilaian')->group(function () {
+            Route::get('restore/{id}', [TujuanPenilaianController::class, 'restore'])->name('restore');
+            Route::get('datatables', [TujuanPenilaianController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [TujuanPenilaianController::class, 'export'])->name('export');
+        });
+        Route::resource('tujuan-penilaian', TujuanPenilaianController::class);
+
+        Route::name('tujuan_penilaian_kjpp.')->prefix('tujuan_penilaian_kjpp')->group(function () {
+            Route::get('datatables', [TujuanPenilaianKJPPController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [TujuanPenilaianKJPPController::class, 'export'])->name('export');
+        });
+        Route::resource('tujuan_penilaian_kjpp', TujuanPenilaianKJPPController::class);
+
+        Route::name('jenis-dokumen.')->prefix('jenis-dokumen')->group(function () {
+            Route::get('restore/{id}', [JenisDokumenController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisDokumenController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [JenisDokumenController::class, 'export'])->name('export');
+        });
+        Route::resource('jenis-dokumen', JenisDokumenController::class);
+        Route::name('currency.')->prefix('mata-uang')->group(function () {
+            Route::get('restore/{id}', [CurrencyController::class, 'restore'])->name('restore');
+            Route::get('datatables', [CurrencyController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [CurrencyController::class, 'export'])->name('export');
+        });
 
         Route::name('debitur.')->prefix('debitur')->group(function () {
             Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
@@ -407,58 +126,284 @@
 
         Route::resource('debitur', DebitureController::class);
 
-        Route::name('tender.')->prefix('tender')->group(function () {
+        Route::name('branch.')->prefix('cabang')->group(function () {
-            // Penawaran
+            Route::get('restore/{id}', [BranchController::class, 'restore'])->name('restore');
-            Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index');
+            Route::get('datatables', [BranchController::class, 'dataForDatatables'])->name('datatables');
-            Route::get('penawaran/{id}/show', [TenderController::class, 'penawaran_show'])->name('penawaran.show');
+            Route::get('export', [BranchController::class, 'export'])->name('export');
-            Route::get('penawaran/{id}/create', [TenderController::class, 'penawaran_create'])->name(
-                'penawaran.createPenawaran',
-            );
-            Route::post('penawaran/{id}/store', [TenderController::class, 'penawaran_store'])->name(
-                'penawaran.storePenawaran',
-            );
-            Route::post('penawaran/{id}/update', [TenderController::class, 'penawaran_store'])->name(
-                'penawaran.updatePenawaran',
-            );
-            Route::get('penawaran/exportPenawaran', [TenderController::class, 'exportPenawaran'])->name(
-                'penawaran.exportPenawaran',
-            );
-            Route::get('penawaran/datatables', [TenderController::class, 'datatablesPenawaran'])->name(
-                    'penawaran.datatables',
-                );
-
-            // Proses Penawaran
-            Route::get('proses_penawaran', [TenderController::class, 'proses_penawaran_index'])->name(
-                'proses_penawaran.index',
-            );
-
-            // Penawaran Ulang
-            Route::get('penawaran_ulang', [TenderController::class, 'penawaran_ulang_index'])->name(
-                'penawaran_ulang.index',
-            );
         });
 
-        Route::name('penilaian.')->prefix('penilaian')->group(function () {
+        Route::resource('cabang', BranchController::class, [
-            Route::get('restore/{id}', [PenilaianController::class, 'restore'])->name('restore');
+            'names' => [
-            Route::get('datatables', [PenilaianController::class, 'dataForDatatables'])->name('datatables');
+                'index'   => 'branch.index',
-            Route::get('export', [PenilaianController::class, 'export'])->name('export');
+                'show'    => 'branch.show',
-            Route::get('/getUserTeams/{id}', [PenilaianController::class, 'getUserTeams']);
+                'create'  => 'branch.create',
+                'store'   => 'branch.store',
+                'edit'    => 'branch.edit',
+                'update'  => 'branch.update',
+                'destroy' => 'branch.destroy',
+            ],
+        ]);
 
-            Route::get('/', [PenilaianController::class, 'index'])->name('index');
+        Route::name('nilai-plafond.')->prefix('nilai-plafond')->group(function () {
-            Route::get('{id}/assignment', [PenilaianController::class, 'assignment'])->name('assignment');
+            Route::get('restore/{id}', [NilaiPlafondController::class, 'restore'])->name('restore');
-            Route::put('{id}', [PenilaianController::class, 'update'])->name('update');
+            Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])->name('datatables');
-            Route::put('revisi/{nomor_registrasi}', [PenilaianController::class, 'revisi'])->name('revisi');
+            Route::get('export', [NilaiPlafondController::class, 'export'])->name('export');
-            Route::post('create', [PenilaianController::class, 'create'])->name('create');
+        });
-            Route::post('store', [PenilaianController::class, 'store'])->name('store');
+        Route::resource('nilai-plafond', NilaiPlafondController::class);
+
+        Route::name('hubungan-pemilik-jaminan.')->prefix('hubungan-pemilik-jaminan')->group(function () {
+            Route::get('restore/{id}', [HubunganPemilikJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [HubunganPemilikJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('hubungan-pemilik-jaminan', HubunganPemilikJaminanController::class);
+
+        Route::name('hubungan-penghuni-jaminan.')->prefix('hubungan-penghuni-jaminan')->group(function () {
+            Route::get('restore/{id}', [HubunganPenghuniJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [HubunganPenghuniJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('hubungan-penghuni-jaminan', HubunganPenghuniJaminanController::class);
+
+        Route::name('arah-mata-angin.')->prefix('arah-mata-angin')->group(function () {
+            Route::get('restore/{id}', [ArahMataAnginController::class, 'restore'])->name('restore');
+            Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
+        });
+        Route::resource('arah-mata-angin', ArahMataAnginController::class);
+
+
+        Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
+            Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [StatusPermohonanController::class, 'export'])->name('export');
+        });
+        Route::resource('status-permohonan', StatusPermohonanController::class);
+
+        Route::name('region.')->prefix('region')->group(function () {
+            Route::get('restore/{id}', [RegionController::class, 'restore'])->name('restore');
+            Route::get('datatables', [RegionController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [RegionController::class, 'export'])->name('export');
         });
 
-        Route::name('activity.')->prefix('activity')->group(function () {
+
-            Route::get('restore/{id}', [ActivityController::class, 'restore'])->name('restore');
+        Route::resource('region', RegionController::class, [
-            Route::get('datatables', [ActivityController::class, 'dataForDatatables'])->name('datatables');
+            'names' => [
-            Route::get('export', [ActivityController::class, 'export'])->name('export');
+                'index'   => 'region.index',
-            Route::get('/', [ActivityController::class, 'index'])->name('index');
+                'show'    => 'region.show',
-            Route::get('/{id}/show', [ActivityController::class, 'show'])->name('show');
+                'create'  => 'region.create',
-            Route::get('download/{id}', [ActivityController::class, 'download'])->name('download');
+                'store'   => 'region.store',
+                'edit'    => 'region.edit',
+                'update'  => 'region.update',
+                'destroy' => 'region.destroy',
+            ],
+        ]);
+
+        Route::resource('region', RegionController::class);
+
+
+        Route::name('teams.')->prefix('teams')->group(function () {
+            Route::get('restore/{id}', [TeamsController::class, 'restore'])->name('restore');
+            Route::get('datatables', [TeamsController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [TeamsController::class, 'export'])->name('export');
+        });
+
+        Route::resource('teams', TeamsController::class, [
+            'names' => [
+                'index'   => 'teams.index',
+                'show'    => 'teams.show',
+                'create'  => 'teams.create',
+                'store'   => 'teams.store',
+                'edit'    => 'teams.edit',
+                'update'  => 'teams.update',
+                'destroy' => 'teams.destroy',
+            ],
+        ]);
+
+        Route::name('jenis-penilaian.')->prefix('jenis-penilaian')->group(function () {
+            Route::get('restore/{id}', [JenisPenilaianController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisPenilaianController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [JenisPenilaianController::class, 'export'])->name('export');
+        });
+
+        Route::resource('jenis-penilaian', JenisPenilaianController::class, [
+            'names' => [
+                'index'   => 'jenis-penilaian.index',
+                'show'    => 'jenis-penilaian.show',
+                'create'  => 'jenis-penilaian.create',
+                'store'   => 'jenis-penilaian.store',
+                'edit'    => 'jenis-penilaian.edit',
+                'update'  => 'jenis-penilaian.update',
+                'destroy' => 'jenis-penilaian.destroy',
+            ],
+        ]);
+
+        Route::resource('mata-uang', CurrencyController::class, [
+            'names' => [
+                'index'   => 'currency.index',
+                'show'    => 'currency.show',
+                'create'  => 'currency.create',
+                'store'   => 'currency.store',
+                'edit'    => 'currency.edit',
+                'update'  => 'currency.update',
+                'destroy' => 'currency.destroy',
+            ],
+        ]);
+
+        Route::name('branch.')->prefix('cabang')->group(function () {
+            Route::get('restore/{id}', [BranchController::class, 'restore'])->name('restore');
+            Route::get('datatables', [BranchController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [BranchController::class, 'export'])->name('export');
+        });
+
+        Route::resource('cabang', BranchController::class, [
+            'names' => [
+                'index'   => 'branch.index',
+                'show'    => 'branch.show',
+                'create'  => 'branch.create',
+                'store'   => 'branch.store',
+                'edit'    => 'branch.edit',
+                'update'  => 'branch.update',
+                'destroy' => 'branch.destroy',
+            ],
+        ]);
+
+        Route::name('nilai-plafond.')->prefix('nilai-plafond')->group(function () {
+            Route::get('restore/{id}', [NilaiPlafondController::class, 'restore'])->name('restore');
+            Route::get('datatables', [NilaiPlafondController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [NilaiPlafondController::class, 'export'])->name('export');
+        });
+        Route::resource('nilai-plafond', NilaiPlafondController::class);
+
+        Route::name('hubungan-pemilik-jaminan.')->prefix('hubungan-pemilik-jaminan')->group(function () {
+            Route::get('restore/{id}', [HubunganPemilikJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [HubunganPemilikJaminanController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [HubunganPemilikJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('hubungan-pemilik-jaminan', HubunganPemilikJaminanController::class);
+
+        Route::name('hubungan-penghuni-jaminan.')->prefix('hubungan-penghuni-jaminan')->group(function () {
+            Route::get('restore/{id}', [HubunganPenghuniJaminanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [HubunganPenghuniJaminanController::class, 'dataForDatatables'])->name(
+                'datatables',
+            );
+            Route::get('export', [HubunganPenghuniJaminanController::class, 'export'])->name('export');
+        });
+        Route::resource('hubungan-penghuni-jaminan', HubunganPenghuniJaminanController::class);
+
+        Route::name('arah-mata-angin.')->prefix('arah-mata-angin')->group(function () {
+            Route::get('restore/{id}', [ArahMataAnginController::class, 'restore'])->name('restore');
+            Route::get('datatables', [ArahMataAnginController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [ArahMataAnginController::class, 'export'])->name('export');
+        });
+        Route::resource('arah-mata-angin', ArahMataAnginController::class);
+
+        Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () {
+            Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download');
+            Route::get('/', [DokumenJaminanController::class, 'index'])->name('index');
+            Route::get('create', [DokumenJaminanController::class, 'create'])->name('create');
+            Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit');
+            Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update');
+            Route::post('store', [DokumenJaminanController::class, 'store'])->name('store');
+            Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy');
+        });
+
+        Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () {
+            Route::get('/', [PemilikJaminanController::class, 'index'])->name('index');
+            Route::get('create', [PemilikJaminanController::class, 'create'])->name('create');
+            Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit');
+            Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update');
+            Route::post('store', [PemilikJaminanController::class, 'store'])->name('store');
+            Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy');
+        });
+
+        Route::name('status-permohonan.')->prefix('status-permohonan')->group(function () {
+            Route::get('restore/{id}', [StatusPermohonanController::class, 'restore'])->name('restore');
+            Route::get('datatables', [StatusPermohonanController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [StatusPermohonanController::class, 'export'])->name('export');
+        });
+        Route::resource('status-permohonan', StatusPermohonanController::class);
+
+        // Start Activity KJPP route
+        Route::name('kjpp.')->prefix('kjpp')->group(function () {
+            Route::get('datatables', [KJPPController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [KJPPController::class, 'export'])->name('export');
+        });
+
+        Route::resource('kjpp', KJPPController::class);
+        // End Activity KJPP route
+
+        // Start Activity Ijin Usaha route
+        Route::name('ijin_usaha.')->prefix('ijin_usaha')->group(function () {
+            Route::get('datatables', [IjinUsahaController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [IjinUsahaController::class, 'export'])->name('export');
+        });
+
+        Route::resource('ijin_usaha', IjinUsahaController::class);
+        // End Activity Ijin Usaha route
+
+        // Start Activity Jenis Laporan route
+        Route::name('jenis_laporan.')->prefix('jenis_laporan')->group(function () {
+            Route::get('datatables', [JenisLaporanController::class, 'dataForDatatables'])->name('datatables');
+            Route::get('export', [JenisLaporanController::class, 'export'])->name('export');
+        });
+
+        Route::resource('jenis_laporan', JenisLaporanController::class);
+        // End Activity Jenis Laporan route
+
+
+    });
+
+    Route::name('permohonan.')->prefix('permohonan')->group(function () {
+        Route::get('{id}/create', [PermohonanController::class, 'createPermohonan'])->name('create.debitur');
+        Route::get('download/{id}', [PermohonanController::class, 'download'])->name('download');
+        Route::get('restore/{id}', [PermohonanController::class, 'restore'])->name('restore');
+        Route::get('datatables', [PermohonanController::class, 'dataForDatatables'])->name('datatables');
+        Route::get('export', [PermohonanController::class, 'export'])->name('export');
+    });
+
+    Route::resource('permohonan', PermohonanController::class);
+
+    Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index');
+    Route::get('authorization/datatables', [PermohonanController::class, 'dataForAuthorization'])->name(
+        'authorization.datatables',
+    );
+    Route::get('authorization/{id}/edit', [PermohonanController::class, 'showAuthorization'])->name(
+        'authorization.show',
+    );
+    Route::put('authorization/{id}', [PermohonanController::class, 'updateAuthorization'])->name(
+        'authorization.update',
+    );
+
+    Route::name('debitur.')->prefix('debitur')->group(function () {
+        Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
+        Route::get('datatables', [DebitureController::class, 'dataForDatatables'])->name('datatables');
+        Route::get('export', [DebitureController::class, 'export'])->name('export');
+
+
+        Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () {
+            Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download');
+            Route::get('/', [DokumenJaminanController::class, 'index'])->name('index');
+            Route::get('create', [DokumenJaminanController::class, 'create'])->name('create');
+            Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit');
+            Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update');
+            Route::post('store', [DokumenJaminanController::class, 'store'])->name('store');
+            Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy');
+        });
+
+        Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () {
+            Route::get('/', [PemilikJaminanController::class, 'index'])->name('index');
+            Route::get('create', [PemilikJaminanController::class, 'create'])->name('create');
+            Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit');
+            Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update');
+            Route::post('store', [PemilikJaminanController::class, 'store'])->name('store');
+            Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy');
         });
     });
 
@@ -467,24 +412,89 @@
     Route::name('tender.')->prefix('tender')->group(function () {
         // Penawaran
         Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index');
-        Route::get('penawaran/{id}/create', [TenderController::class, 'penawaran_create'])->name('penawaran.createPenawaran');
+        Route::get('penawaran/{noreg}/show', [TenderController::class, 'penawaran_show'])->name('penawaran.show');
-        Route::post('penawaran/{id}/store', [TenderController::class, 'penawaran_store'])->name('penawaran.storePenawaran');
+        Route::get('penawaran/{noreg}/create', [TenderController::class, 'penawaran_create'])->name(
-        Route::post('penawaran/{id}/update', [TenderController::class, 'penawaran_store'])->name('penawaran.updatePenawaran');
+            'penawaran.createPenawaran',
-        Route::get('penawaran/exportPenawaran', [TenderController::class, 'exportPenawaran'])->name('penawaran.exportPenawaran');
+        );
-        Route::get('penawaran/datatables', [TenderController::class, 'datatablesPenawaran'])
+        Route::post('penawaran/{noreg}/store', [TenderController::class, 'penawaran_store'])->name(
-            ->name('penawaran.datatables');
+            'penawaran.storePenawaran',
+        );
+        Route::get('penawaran/{noreg}/edit', [TenderController::class, 'penawaran_edit'])->name(
+            'penawaran.editPenawaran',
+        );
+        Route::put('penawaran/{noreg}/update', [TenderController::class, 'penawaran_update'])->name(
+            'penawaran.updatePenawaran',
+        );
+        Route::get('penawaran/exportPenawaran', [TenderController::class, 'exportPenawaran'])->name(
+            'penawaran.exportPenawaran',
+        );
+        Route::get('penawaran/datatables', [TenderController::class, 'datatablesPenawaran'])->name(
+            'penawaran.datatables',
+        );
+
+        // Penawaran Ulang
+        Route::get('penawaran/ulang', [TenderController::class, 'penawaran_ulang_index'])->name(
+            'penawaran.ulang.index',
+        );
+        Route::get('penawaran/ulang/datatables', [TenderController::class, 'datatablesPenawaranUlang'])->name(
+            'penawaran.ulang.datatables',
+        );
 
         // Proses Penawaran
         Route::get('proses_penawaran', [TenderController::class, 'proses_penawaran_index'])->name(
             'proses_penawaran.index',
         );
-
-        // Penawaran Ulang
-        Route::get('penawaran_ulang', [TenderController::class, 'penawaran_ulang_index'])->name(
-            'penawaran_ulang.index',
-        );
     });
 
-// andy add
+    Route::name('penilaian.')->prefix('penilaian')->group(function () {
+        Route::get('restore/{id}', [PenilaianController::class, 'restore'])->name('restore');
+        Route::get('datatables', [PenilaianController::class, 'dataForDatatables'])->name('datatables');
+        Route::get('export', [PenilaianController::class, 'export'])->name('export');
+        Route::get('/getUserTeams/{id}', [PenilaianController::class, 'getUserTeams']);
+
+        Route::get('/', [PenilaianController::class, 'index'])->name('index');
+        Route::get('{id}/assignment', [PenilaianController::class, 'assignment'])->name('assignment');
+        Route::put('{id}', [PenilaianController::class, 'update'])->name('update');
+        Route::put('revisi/{nomor_registrasi}', [PenilaianController::class, 'revisi'])->name('revisi');
+        Route::post('create', [PenilaianController::class, 'create'])->name('create');
+        Route::post('store', [PenilaianController::class, 'store'])->name('store');
+    });
+
+    /**
+     * Route start activity
+     */
+
+    Route::name('activity.')->prefix('activity')->group(function () {
+        Route::get('restore/{id}', [ActivityController::class, 'restore'])->name('restore');
+        Route::get('datatables', [ActivityController::class, 'dataForDatatables'])->name('datatables');
+        Route::get('export', [ActivityController::class, 'export'])->name('export');
+        Route::get('/', [ActivityController::class, 'index'])->name('index');
+
+        Route::get('/{id}/show', [ActivityController::class, 'show'])->name('show');
+        Route::get('download/{id}', [ActivityController::class, 'download'])->name('download');
+        Route::get('senior', [ActivityController::class, 'senior'])->name('senior');
+
+        Route::name('progres.')->prefix('progres')->group(function () {
+            Route::get('/', [ActivityController::class, 'progres_activity'])->name('index');
+            Route::get('/datatables/{id}', [ActivityController::class, 'dataTablesForActivity'])->name('datatables');
+        });
+
+        Route::get('/teams/{regionId}', [ActivityController::class, 'dataTablesForActivity']);
+    });
+
+    /**
+     * Route end activity
+     */
+
+
+    Route::name('otorisator.')->prefix('otorisator')->group(function () {
+        Route::get('pelaporan', [PenilaianController::class, 'otorisator'])->name('pelaporan.index')->defaults('type', 'pelaporan');
+        Route::get('pembayaran', [PenilaianController::class, 'otorisator'])->name('pembayaran.index')->defaults('type', 'pembayaran');
+        Route::get('pembatalan', [PenilaianController::class, 'otorisator'])->name('pembatalan.index')->defaults('type', 'pembatalan');
+        Route::get('sla', [PenilaianController::class, 'otorisator'])->name('sla.index')->defaults('type', 'sla');
+        Route::get('/datatables/{otorisator}', [PenilaianController::class, 'dataForAuthorization'])->name('datatables');
+        Route::get('show/{id}', [PenilaianController::class, 'show'])->name('show');
+    });
+});
+
 require __DIR__ . '/registrasi.php';
-// andy add