From df9b68ae4684908ee4c0a5128cfb9ec0fd71d7fb Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Thu, 5 Sep 2024 14:43:05 +0700
Subject: [PATCH 01/16] update migration and models (penilaian,
 jenis_penilaian, teams, teams_users

---
 app/Models/JenisPenilaian.php                 | 22 ++++++++++
 app/Models/Penilaian.php                      | 38 +++++++++++++++++
 app/Models/Regions.php                        | 26 ++++++++++++
 app/Models/Teams.php                          | 28 +++++++++++++
 app/Models/TeamsUsers.php                     | 32 ++++++++++++++
 ...2024_09_05_030302_create_regions_table.php | 36 ++++++++++++++++
 ...05_030338_create_jenis_penilaian_table.php | 37 ++++++++++++++++
 .../2024_09_05_030405_create_teams_table.php  | 41 ++++++++++++++++++
 ..._09_05_030417_create_teams_users_table.php | 41 ++++++++++++++++++
 ...24_09_05_070712_create_penilaian_table.php | 42 +++++++++++++++++++
 module.json                                   | 11 +++++
 11 files changed, 354 insertions(+)
 create mode 100644 app/Models/JenisPenilaian.php
 create mode 100644 app/Models/Penilaian.php
 create mode 100644 app/Models/Regions.php
 create mode 100644 app/Models/Teams.php
 create mode 100644 app/Models/TeamsUsers.php
 create mode 100644 database/migrations/2024_09_05_030302_create_regions_table.php
 create mode 100644 database/migrations/2024_09_05_030338_create_jenis_penilaian_table.php
 create mode 100644 database/migrations/2024_09_05_030405_create_teams_table.php
 create mode 100644 database/migrations/2024_09_05_030417_create_teams_users_table.php
 create mode 100644 database/migrations/2024_09_05_070712_create_penilaian_table.php

diff --git a/app/Models/JenisPenilaian.php b/app/Models/JenisPenilaian.php
new file mode 100644
index 0000000..2ac6459
--- /dev/null
+++ b/app/Models/JenisPenilaian.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Modules\Lpj\Database\Factories\JenisPenilaianFactory;
+
+class JenisPenilaian extends Model
+{
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'jenis_penilaian';
+
+    protected $fillable = [
+        'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by',
+        'created_at', 'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
+    ];
+
+
+}
diff --git a/app/Models/Penilaian.php b/app/Models/Penilaian.php
new file mode 100644
index 0000000..00064f1
--- /dev/null
+++ b/app/Models/Penilaian.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Lpj\Database\Factories\PenilaianFactory;
+use Modules\Lpj\Models\JenisPenilaian;
+use Modules\Lpj\Models\Teams;
+use Modules\Usermanagement\Models\User;
+
+class Penilaian extends Model
+{
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'penilaian';
+    protected $fillable = [
+        'jenis_penilaian_id', 'team_id', 'user_id', 'tanggal_kunjungan', 'keterangan', 
+        'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_at', 
+        'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
+    ];
+
+    public function jenis_penilaian(){
+        return $this->hasMany(JenisPenilaian::class);
+    }
+
+    public function teams(){
+        return $this->hasMany(Teams::class);
+    }
+
+    public function users(){
+        return $this->hasMany(User::class);
+    }
+
+
+}
diff --git a/app/Models/Regions.php b/app/Models/Regions.php
new file mode 100644
index 0000000..bfa8e0a
--- /dev/null
+++ b/app/Models/Regions.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Lpj\Database\Factories\RegionsFactory;
+
+class Regions extends Model
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'regions';
+    
+    protected $fillable = [
+        'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 
+        'created_at', 'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
+    ];
+
+    public function teams(){
+        return $this->hasMany(Teams::class, 'region_id', 'id');
+    }
+}
diff --git a/app/Models/Teams.php b/app/Models/Teams.php
new file mode 100644
index 0000000..bc9f7fe
--- /dev/null
+++ b/app/Models/Teams.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Lpj\Database\Factories\TeamsFactory;
+
+class Teams extends Model
+{
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'teams';
+    protected $fillable = [
+        'region_id', 'code', 'name', 'status', 'authorized_status', 'authorized_at', 
+        'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by', 
+        'deleted_at', 'deleted_by'
+    ];
+
+    public function regions(){
+        return $this->belongsTo(Regions::class, 'region_id', 'id');
+    }
+
+    public function teamsUsers(){
+        return $this->hasMany(TeamsUsers::class, 'team_id', 'id');
+    }
+}
diff --git a/app/Models/TeamsUsers.php b/app/Models/TeamsUsers.php
new file mode 100644
index 0000000..6516730
--- /dev/null
+++ b/app/Models/TeamsUsers.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Modules\Lpj\Database\Factories\TeamsUsersFactory;
+use Modules\User\Models\User;
+use Modules\Lpj\Models\Teams;
+
+class TeamsUsers extends Model
+{
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'teams_users';
+    protected $fillable = [
+        'team_id', 'user_id', 'status', 'authorized_status', 'authorized_at', 
+        'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by', 
+        'deleted_at', 'deleted_by'
+    ];
+
+    public function team()
+    {
+        return $this->belongsTo(Teams::class, 'team_id');
+    }
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+}
diff --git a/database/migrations/2024_09_05_030302_create_regions_table.php b/database/migrations/2024_09_05_030302_create_regions_table.php
new file mode 100644
index 0000000..3f942ff
--- /dev/null
+++ b/database/migrations/2024_09_05_030302_create_regions_table.php
@@ -0,0 +1,36 @@
+<?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::create('regions', function (Blueprint $table) {
+            $table->id();
+            $table->string('code')->unique()->index();
+            $table->string('name');
+            $table->char('status')->nullable();
+            $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
+            $table->timestamp('authorized_at')->nullable();
+            $table->unsignedBigInteger('authorized_by')->nullable();
+            $table->softDeletes();
+            $table->unsignedBigInteger('created_by')->nullable();
+            $table->unsignedBigInteger('updated_by')->nullable();
+            $table->unsignedBigInteger('deleted_by')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('regions');
+    }
+};
diff --git a/database/migrations/2024_09_05_030338_create_jenis_penilaian_table.php b/database/migrations/2024_09_05_030338_create_jenis_penilaian_table.php
new file mode 100644
index 0000000..bf31ab4
--- /dev/null
+++ b/database/migrations/2024_09_05_030338_create_jenis_penilaian_table.php
@@ -0,0 +1,37 @@
+<?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::create('jenis_penilaian', function (Blueprint $table) {
+            $table->id();
+            $table->string('code')->unique()->index();
+            $table->string('name');
+            $table->char('status')->nullable();
+            $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
+            $table->timestamp('authorized_at')->nullable();
+            $table->unsignedBigInteger('authorized_by')->nullable();
+            $table->softDeletes();
+            $table->unsignedBigInteger('created_by')->nullable();
+            $table->unsignedBigInteger('updated_by')->nullable();
+            $table->unsignedBigInteger('deleted_by')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('jenis_penilaian');
+    }
+};
diff --git a/database/migrations/2024_09_05_030405_create_teams_table.php b/database/migrations/2024_09_05_030405_create_teams_table.php
new file mode 100644
index 0000000..88ae841
--- /dev/null
+++ b/database/migrations/2024_09_05_030405_create_teams_table.php
@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Mudels\Lpj\Models\Regions;
+
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('teams', function (Blueprint $table) {
+            $table->id();
+            $table->foreignIdFor(Regions::class, 'region_id');
+            $table->string('code')->unique()->index();
+            $table->string('name');
+            $table->char('status')->nullable();
+            $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
+            $table->timestamp('authorized_at')->nullable();
+            $table->unsignedBigInteger('authorized_by')->nullable();
+            $table->softDeletes();
+            $table->unsignedBigInteger('created_by')->nullable();
+            $table->unsignedBigInteger('updated_by')->nullable();
+            $table->unsignedBigInteger('deleted_by')->nullable();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('teams');
+    }
+};
diff --git a/database/migrations/2024_09_05_030417_create_teams_users_table.php b/database/migrations/2024_09_05_030417_create_teams_users_table.php
new file mode 100644
index 0000000..9b4422e
--- /dev/null
+++ b/database/migrations/2024_09_05_030417_create_teams_users_table.php
@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\Users;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('teams_users', function (Blueprint $table) {
+            $table->id();
+            $table->foreignIdFor(Teams::class);
+            $table->foreignIdFor(Users::class);
+            
+    
+            $table->char('status')->nullable();
+            $table->char('authorized_status', 1)->nullable();
+            $table->timestamps();
+            $table->timestamp('authorized_at')->nullable();
+            $table->unsignedBigInteger('authorized_by')->nullable();
+            $table->softDeletes();
+            $table->unsignedBigInteger('created_by')->nullable();
+            $table->unsignedBigInteger('updated_by')->nullable();
+            $table->unsignedBigInteger('deleted_by')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('teams_users');
+    }
+};
diff --git a/database/migrations/2024_09_05_070712_create_penilaian_table.php b/database/migrations/2024_09_05_070712_create_penilaian_table.php
new file mode 100644
index 0000000..14d7766
--- /dev/null
+++ b/database/migrations/2024_09_05_070712_create_penilaian_table.php
@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Modules\Lpj\Models\Penilaian;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('penilaian', function (Blueprint $table) {
+            $table->id();
+            $table->foreignIdFor(Penilaian::class);
+            $table->foreignIdFor(Teams::class);
+            $table->foreignIdFor(Users::class);
+            $table->datetime('tanggal_kunjungan');
+            $table->text('keterangan');
+            $table->char('status');
+            $table->timestamps();
+            $table->char('authorized_status', 1)->nullable();
+            $table->timestamp('authorized_at')->nullable();
+            $table->softDeletes();
+            $table->unsignedBigInteger('created_by')->nullable();
+            $table->unsignedBigInteger('updated_by')->nullable();
+            $table->unsignedBigInteger('deleted_by')->nullable();
+            $table->unsignedBigInteger('authorized_by')->nullable();
+            
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('penilaian');
+    }
+};
diff --git a/module.json b/module.json
index 40ce5bd..de8b0cc 100644
--- a/module.json
+++ b/module.json
@@ -65,6 +65,17 @@
                 "roles": [
                     "Administrator"
                 ]
+            },
+            {
+                "title": "Region",
+                "path": "",
+                "icon": "ki-filled ki-some-files text-lg",
+                "classes": "",
+                "attributes": [],
+                "permission": "",
+                "roles": [
+                    "Administrator"
+                ]
             }
         ],
         "master": [

From a51d5fbeff77cbc6b3c037b3516a7306fc955faf Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Fri, 6 Sep 2024 08:50:57 +0700
Subject: [PATCH 02/16] update model jenispenilaian, penilaian dan teamsusers

---
 app/Models/JenisPenilaian.php |  3 +++
 app/Models/Penilaian.php      | 10 +++++-----
 app/Models/TeamsUsers.php     |  8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/Models/JenisPenilaian.php b/app/Models/JenisPenilaian.php
index 2ac6459..b809c91 100644
--- a/app/Models/JenisPenilaian.php
+++ b/app/Models/JenisPenilaian.php
@@ -18,5 +18,8 @@ class JenisPenilaian extends Model
         'created_at', 'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
     ];
 
+    public function penilaian(){
+        return $this->hasMany(Penilaian::class , 'jenis_penilaian_id', 'id');
+    }
 
 }
diff --git a/app/Models/Penilaian.php b/app/Models/Penilaian.php
index 00064f1..b3620db 100644
--- a/app/Models/Penilaian.php
+++ b/app/Models/Penilaian.php
@@ -17,21 +17,21 @@ class Penilaian extends Model
      */
     protected $table = 'penilaian';
     protected $fillable = [
-        'jenis_penilaian_id', 'team_id', 'user_id', 'tanggal_kunjungan', 'keterangan', 
-        'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_at', 
+        'jenis_penilaian_id', 'team_id', 'user_id', 'tanggal_kunjungan', 'keterangan',
+        'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_at',
         'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
     ];
 
     public function jenis_penilaian(){
-        return $this->hasMany(JenisPenilaian::class);
+        return $this->belongsTo(JenisPenilaian::class, 'jenis_penilaian_id', 'id');
     }
 
     public function teams(){
-        return $this->hasMany(Teams::class);
+        return $this->belongsTo(Teams::class, 'team_id', 'id');
     }
 
     public function users(){
-        return $this->hasMany(User::class);
+        return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
 
diff --git a/app/Models/TeamsUsers.php b/app/Models/TeamsUsers.php
index 6516730..4704fa9 100644
--- a/app/Models/TeamsUsers.php
+++ b/app/Models/TeamsUsers.php
@@ -15,18 +15,18 @@ class TeamsUsers extends Model
      */
     protected $table = 'teams_users';
     protected $fillable = [
-        'team_id', 'user_id', 'status', 'authorized_status', 'authorized_at', 
-        'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by', 
+        'team_id', 'user_id', 'status', 'authorized_status', 'authorized_at',
+        'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by',
         'deleted_at', 'deleted_by'
     ];
 
     public function team()
     {
-        return $this->belongsTo(Teams::class, 'team_id');
+        return $this->belongsTo(Teams::class, 'team_id', 'id');
     }
 
     public function user()
     {
-        return $this->belongsTo(User::class, 'user_id');
+        return $this->belongsTo(User::class, 'user_id', 'id');
     }
 }

From f9fea10607dbdae3b2101f5131683d8860ef8196 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 11 Sep 2024 08:31:47 +0700
Subject: [PATCH 03/16] update module senior officer

---
 app/Exports/RegionExport.php                  |  49 ++
 .../Controllers/JenisPenilaianController.php  | 156 ++++++
 app/Http/Controllers/PermohonanController.php |   2 +-
 app/Http/Controllers/RegionController.php     | 164 +++++++
 app/Http/Controllers/TeamsController.php      | 241 ++++++++++
 app/Http/Requests/JenisPenilaianRequest.php   |  42 ++
 app/Http/Requests/RegionRequest.php           |  38 ++
 app/Http/Requests/TeamsRequest.php            |  41 ++
 app/Models/JenisPenilaian.php                 |   2 +-
 app/Models/Penilaian.php                      |   8 +-
 app/Models/Regions.php                        |   8 +-
 app/Models/Teams.php                          |  20 +-
 app/Models/TeamsUsers.php                     |   7 +-
 ...24_08_12_023807_create_debitures_table.php |  54 +++
 .../2024_09_05_030405_create_teams_table.php  |   4 +-
 ..._09_05_030417_create_teams_users_table.php |   8 +-
 ...24_09_05_070712_create_penilaian_table.php |   9 +-
 module.json                                   |  36 +-
 .../views/jenis_penilaian/form.blade.php      |  64 +++
 .../views/jenis_penilaian/index.blade.php     | 160 +++++++
 resources/views/region/create.blade.php       |  61 +++
 resources/views/region/index.blade.php        | 152 ++++++
 resources/views/teams/form.blade.php          | 113 +++++
 resources/views/teams/index.blade.php         | 174 +++++++
 routes/breadcrumbs.php                        |  43 ++
 routes/web.php                                | 452 ++++++++++--------
 26 files changed, 1881 insertions(+), 227 deletions(-)
 create mode 100644 app/Exports/RegionExport.php
 create mode 100644 app/Http/Controllers/JenisPenilaianController.php
 create mode 100644 app/Http/Controllers/RegionController.php
 create mode 100644 app/Http/Controllers/TeamsController.php
 create mode 100644 app/Http/Requests/JenisPenilaianRequest.php
 create mode 100644 app/Http/Requests/RegionRequest.php
 create mode 100644 app/Http/Requests/TeamsRequest.php
 create mode 100644 database/migrations/2024_08_12_023807_create_debitures_table.php
 create mode 100644 resources/views/jenis_penilaian/form.blade.php
 create mode 100644 resources/views/jenis_penilaian/index.blade.php
 create mode 100644 resources/views/region/create.blade.php
 create mode 100644 resources/views/region/index.blade.php
 create mode 100644 resources/views/teams/form.blade.php
 create mode 100644 resources/views/teams/index.blade.php

diff --git a/app/Exports/RegionExport.php b/app/Exports/RegionExport.php
new file mode 100644
index 0000000..a7b2b51
--- /dev/null
+++ b/app/Exports/RegionExport.php
@@ -0,0 +1,49 @@
+<?php
+
+    namespace Modules\Lpj\Exports;
+
+    use Maatwebsite\Excel\Concerns\FromCollection;
+    use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+    use Maatwebsite\Excel\Concerns\WithHeadings;
+    use Maatwebsite\Excel\Concerns\WithMapping;
+    use Modules\Lpj\Models\Regions;
+    use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+    class RegionExport implements WithColumnFormatting, WithHeadings, FromCollection, withMapping
+    {
+        public function collection()
+        {
+            return Regions::all();
+        }
+
+        public function map($row)
+        : array
+        {
+            return [
+                $row->id,
+                $row->code,
+                $row->name,
+                $row->created_at
+            ];
+        }
+
+        public function headings()
+        : array
+        {
+            return [
+                'ID',
+                'Code',
+                'Name',
+                'Created At'
+            ];
+        }
+
+        public function columnFormats()
+        : array
+        {
+            return [
+                'A' => NumberFormat::FORMAT_NUMBER,
+                'D' => NumberFormat::FORMAT_DATE_DATETIME
+            ];
+        }
+    }
diff --git a/app/Http/Controllers/JenisPenilaianController.php b/app/Http/Controllers/JenisPenilaianController.php
new file mode 100644
index 0000000..c38f673
--- /dev/null
+++ b/app/Http/Controllers/JenisPenilaianController.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use Exception;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Modules\Lpj\Models\JenisPenilaian;
+
+use Modules\Lpj\Http\Requests\JenisPenilaianRequest;
+
+
+class JenisPenilaianController extends Controller
+{
+
+    public $user;
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('lpj::jenis_penilaian.index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('lpj::jenis_penilaian.form');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(JenisPenilaianRequest $request)
+    {
+        $validate = $request->validated();
+
+        try {
+            JenisPenilaian::create($validate);
+            return redirect()->route('basicdata.jenis-penilaian.index')->with('success', 'Jenis Penilaian created successfully');
+        } catch (Exception $e) {
+            return redirect()->route('basicdata.jenis-penilaian.create')->with('error', $e->getMessage());
+        }
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        $jenisPenilaian = JenisPenilaian::find($id);
+        return view('lpj::jenis_penilaian.form', compact('jenisPenilaian'));
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(JenisPenilaianRequest $request, $id)
+    {
+
+
+        $validate = $request->validate();
+
+        // dump($validate);
+
+        if ($validate) {
+            try {
+                $jenisPenilaian = JenisPenilaian::find($id);
+                $jenisPenilaian->update($validate);
+                return redirect()->route('basicdata.jenis-penilaian.index')->with('success', 'Jenis Penilaian updated successfully');
+            } catch (Exception $e) {
+                return redirect()->route('basicdata.jenis-penilaian.edit', $id)->with('error', $e->getMessage());
+            }
+        }
+
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        try {
+            $jenisPenilaian = JenisPenilaian::find($id);
+            $jenisPenilaian->delete();
+            echo json_encode(['success' => true, 'message' => 'Jenis Penilaian deleted successfully']);
+
+        } catch (Exception $e) {
+            echo json_encode(['success' => false, 'message' => 'Failed to delete Jenis Penilaian']);
+        }
+    }
+
+    public function dataForDatatables(Request $request)
+    {
+
+
+        if (is_null($this->user) || !$this->user->can('jenis_penilaian.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        $query = JenisPenilaian::query();
+
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('code', 'LIKE', "%$search%");
+                $q->orWhere('name', 'LIKE', "%$search%");
+            });
+        }
+
+        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');
+        $pageCount = 1;
+
+        if ($size > 0) {
+            if ($request->has('page') && $request->has('size')) {
+                $page = $request->get('page');
+                $offset = ($page - 1) * $size;
+                $query->skip($offset)->take($size);
+                $filteredRecords = $query->count();
+                $pageCount = ceil($totalRecords / $size);
+            }
+
+            $data = $query->get();
+        } else {
+            $filteredRecords = $totalRecords;
+            $data = $query->get();
+        }
+
+        $currentPage = $request->get('page') ?? 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
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php
index ea6d5f3..a6b3276 100644
--- a/app/Http/Controllers/PermohonanController.php
+++ b/app/Http/Controllers/PermohonanController.php
@@ -29,7 +29,7 @@
 
             if ($validate) {
                 try {
-                    // Save to database
+                    // Save to database qq
                     Permohonan::create($validate);
                     return redirect()
                         ->route('permohonan.index')
diff --git a/app/Http/Controllers/RegionController.php b/app/Http/Controllers/RegionController.php
new file mode 100644
index 0000000..e6aa981
--- /dev/null
+++ b/app/Http/Controllers/RegionController.php
@@ -0,0 +1,164 @@
+<?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\Regions;
+use Modules\Lpj\Http\Requests\RegionRequest;
+use Maatwebsite\Excel\Facades\Excel;
+use Modules\Lpj\Exports\RegionExport;
+
+
+class RegionController extends Controller
+{
+    public $user;
+    public function index()
+    {
+        return view('lpj::region.index');
+    }
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('lpj::region.create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(RegionRequest $request)
+    {
+        $validate = $request->validated();
+
+            if ($validate) {
+                try {
+                    // Save to database
+                    Regions::create($validate);
+                    return redirect()
+                        ->route('basicdata.region.index')
+                        ->with('success', 'region created successfully');
+                } catch (Exception $e) {
+                    return redirect()
+                        ->route('basicdata.region.create')
+                        ->with('error', 'Failed to create region');
+                }
+            }
+    }
+
+
+    public function edit($id)
+    {
+        $region = Regions::find($id);
+        return view('lpj::region.create', compact('region'));
+
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(RegionRequest $request, $id)
+    {
+        $validate = $request->validated();
+
+            if ($validate) {
+                try {
+                    // Update in database
+                    $region = Regions::find($id);
+                    $region->update($validate);
+                    return redirect()
+                        ->route('basicdata.region.index')
+                        ->with('success', 'Region updated successfully');
+                } catch (Exception $e) {
+                    return redirect()
+                        ->route('basicdata.region.edit', $id)
+                        ->with('error', 'Failed to update region');
+                }
+            }
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        try {
+            // Delete from database
+            $region = Regions::find($id);
+            $region->delete();
+
+            echo json_encode(['success' => true, 'message' => 'Region deleted successfully']);
+        } catch (Exception $e) {
+            echo json_encode(['success' => false, 'message' => 'Failed to delete region']);
+        }
+    }
+
+    public function dataForDatatables(Request $request)
+    {
+
+
+        if (is_null($this->user) || !$this->user->can('region.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        $query = Regions::query();
+
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('code', 'LIKE', "%$search%");
+                $q->orWhere('name', 'LIKE', "%$search%");
+            });
+        }
+
+        if($request->has('sortOrder') && !empty($request->get('sortOrder'))){
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        $totalRecords = $query->count();
+
+         // Apply pagination if provided
+         if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        $data = $query->get();
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = 0 + 1;
+
+        // dump($data);
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data
+        ]);
+    }
+
+    public function export()
+        {
+            return Excel::download(new RegionExport, 'region.xlsx');
+        }
+}
diff --git a/app/Http/Controllers/TeamsController.php b/app/Http/Controllers/TeamsController.php
new file mode 100644
index 0000000..fa6fbe7
--- /dev/null
+++ b/app/Http/Controllers/TeamsController.php
@@ -0,0 +1,241 @@
+<?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\Regions;
+use Modules\Usermanagement\Models\User;
+use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\TeamsUsers;
+use Modules\Lpj\Http\Requests\TeamsRequest;
+use Illuminate\Support\Facades\DB;
+
+class TeamsController extends Controller
+{
+    public $user;
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('lpj::teams.index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+
+        $region = Regions::all();
+        $user = User::all();
+
+        return view('lpj::teams.form', compact('region', 'user'));
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(TeamsRequest $request)
+    {
+        $validate = $request->validated();
+
+        DB::beginTransaction();
+        try {
+            $teams =  Teams::create($validate);
+
+            $users = $request->input('user', []);
+
+            // loop untuk insert data users ke tabel teams_users
+            foreach ($users as $user) {
+                TeamsUsers::create([
+                    'teams_id' => $teams->id,
+                    'user_id' => $user
+                ]);
+            }
+
+            DB::commit();
+
+            return redirect()
+                    ->route('basicdata.teams.index')
+                    ->with('success', 'Data saved successfully. ');
+        } catch (Exception $e) {
+
+            DB::rollBack();
+
+            return redirect()
+                    ->route('basicdata.teams.create')
+                    ->with('error', 'Failed to save data. ');
+        }
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+        return view('lpj::show');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        $teams = Teams::find($id);
+        $region = Regions::all();
+        $user = User::all();
+        $selectedUsers = $teams->teamsUsers->pluck('user_id')->toArray();
+
+        return view('lpj::teams.form', compact('teams', 'region', 'user', 'selectedUsers'));
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(TeamsRequest $request, $id)
+    {
+        $validate = $request->validated();
+
+        DB::beginTransaction();
+        try {
+            $teams = Teams::findOrFail($id);
+
+            // Update data tim
+            $teams->update($validate);
+            $userIds = $request->input('user', []);
+
+            $teams->teamsUsers()->delete();
+
+
+            foreach ($userIds as $userId) {
+                TeamsUsers::create([
+                    'teams_id' => $teams->id,
+                    'user_id' => $userId
+                ]);
+            }
+
+            DB::commit();
+
+            return redirect()
+                    ->route('basicdata.teams.index')
+                    ->with('success', 'Data updated successfully. ');
+        } catch (Exception $e) {
+
+            DB::rollBack();
+
+            return redirect()
+                    ->route('basicdata.teams.create')
+                    ->with('error', 'Failed to update data. ');
+        }
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        DB::beginTransaction();
+        try {
+
+            $teams = Teams::findOrFail($id);
+            $teams->teamsUsers()->delete();
+
+            // Hapus tim
+            $teams->delete();
+
+            DB::commit();
+
+            return redirect()
+                    ->route('basicdata.teams.index')
+                    ->with('success', 'Team has been deleted successfully.');
+        } catch (Exception $e) {
+            DB::rollBack();
+
+            return redirect()
+                    ->route('basicdata.teams.index')
+                    ->with('error', 'Failed to delete team. ');
+        }
+    }
+
+
+    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 = Teams::select('teams.id as id', 'teams.name as team_name', 'regions.name as region_name')
+            ->join('regions', 'teams.regions_id', '=', 'regions.id')
+            ->leftJoin('teams_users', 'teams.id', '=', 'teams_users.teams_id')
+            ->leftJoin('users', 'teams_users.user_id', '=', 'users.id')
+            ->addSelect('users.name as user_name');
+
+        // search filter
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('teams.name', 'LIKE', "%$search%")
+                  ->orWhere('regions.name', 'LIKE', "%$search%")
+                  ->orWhere('users.name', 'LIKE', "%$search%");
+            });
+        }
+
+        // sorting
+        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');
+        $pageCount = 1;
+
+        if ($size > 0) {
+            if ($request->has('page') && $request->has('size')) {
+                $page = $request->get('page');
+                $offset = ($page - 1) * $size;
+                $query->skip($offset)->take($size);
+                $filteredRecords = $query->count();
+                $pageCount = ceil($totalRecords / $size);
+            }
+
+            $data = $query->get();
+        } else {
+            $filteredRecords = $totalRecords;
+            $data = $query->get();
+        }
+
+        $currentPage = $request->get('page') ?? 1;
+
+        $formattedData = $data->groupBy('id')->map(function ($group) {
+            $team = $group->first();
+            $team->user_team = $group->map(function ($item) {
+                return [
+                    'nama' => $item->user_name,
+                    // 'role' => $item->role_name,
+                ];
+            })->toArray();
+            return $team;
+        })->values();
+
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $formattedData
+        ]);
+    }
+
+
+
+
+}
diff --git a/app/Http/Requests/JenisPenilaianRequest.php b/app/Http/Requests/JenisPenilaianRequest.php
new file mode 100644
index 0000000..58562ea
--- /dev/null
+++ b/app/Http/Requests/JenisPenilaianRequest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Modules\Lpj\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class JenisPenilaianRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+
+        $rules = [
+            'name'              => 'required|string|max:255',
+            'status'            => 'nullable|boolean',
+            'authorized_at'     => 'nullable|datetime',
+            'authorized_status' => 'nullable|string|max:1',
+            'authorized_by'     => 'nullable|exists:users,id',
+        ];
+
+        if ($this->method() == 'PUT') {
+
+            $rules['code'] = 'required|string|max:3|unique:jenis_penilaian,code,' . $this->route('id');
+
+
+        } else {
+            $rules['code'] = 'required|string|max:3|unique:jenis_penilaian,code';
+        }
+
+        return $rules;
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Http/Requests/RegionRequest.php b/app/Http/Requests/RegionRequest.php
new file mode 100644
index 0000000..fd9ab1d
--- /dev/null
+++ b/app/Http/Requests/RegionRequest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Modules\Lpj\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RegionRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'name'              => 'required|string|max:255',
+            'status'            => 'nullable|boolean',
+            'authorized_at'     => 'nullable|datetime',
+            'authorized_status' => 'nullable|string|max:1',
+            'authorized_by'     => 'nullable|exists:users,id',
+        ];
+
+        if ($this->method() == 'PUT') {
+            $rules['code'] = 'required|string|max:3|unique:regions,code,' . $this->id;
+        } else {
+            $rules['code'] = 'required|string|max:3|unique:regions,code';
+        }
+
+        return $rules;
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Http/Requests/TeamsRequest.php b/app/Http/Requests/TeamsRequest.php
new file mode 100644
index 0000000..0f1be4b
--- /dev/null
+++ b/app/Http/Requests/TeamsRequest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Modules\Lpj\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class TeamsRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'name'              => 'required|string|max:255',
+            'status'            => 'nullable|boolean',
+            'regions_id'         => 'nullable|exists:regions,id',
+            'user.*'            => 'nullable|exists:users,id',
+            'authorized_at'     => 'nullable|datetime',
+            'authorized_status' => 'nullable|string|max:1',
+            'authorized_by'     => 'nullable|exists:users,id',
+
+        ];
+
+        if ($this->method() == 'PUT') {
+            $rules['code'] = 'required|string|max:3|unique:teams,code,' . $this->id;
+        } else {
+            $rules['code'] = 'required|string|max:3|unique:teams,code';
+        }
+
+        return $rules;
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Models/JenisPenilaian.php b/app/Models/JenisPenilaian.php
index b809c91..f072a82 100644
--- a/app/Models/JenisPenilaian.php
+++ b/app/Models/JenisPenilaian.php
@@ -4,7 +4,7 @@ namespace Modules\Lpj\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Modules\Lpj\Database\Factories\JenisPenilaianFactory;
-
+use Modules\Lpj\Models\Penilaian;
 class JenisPenilaian extends Model
 {
 
diff --git a/app/Models/Penilaian.php b/app/Models/Penilaian.php
index b3620db..e4d6bdd 100644
--- a/app/Models/Penilaian.php
+++ b/app/Models/Penilaian.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\PenilaianFactory;
 use Modules\Lpj\Models\JenisPenilaian;
 use Modules\Lpj\Models\Teams;
-use Modules\Usermanagement\Models\User;
+// use Modules\Usermanagement\Models\User;
 
 class Penilaian extends Model
 {
@@ -30,9 +30,9 @@ class Penilaian extends Model
         return $this->belongsTo(Teams::class, 'team_id', 'id');
     }
 
-    public function users(){
-        return $this->belongsTo(User::class, 'user_id', 'id');
-    }
+    // public function users(){
+    //     return $this->belongsTo(User::class, 'user_id', 'id');
+    // }
 
 
 }
diff --git a/app/Models/Regions.php b/app/Models/Regions.php
index bfa8e0a..28836b5 100644
--- a/app/Models/Regions.php
+++ b/app/Models/Regions.php
@@ -5,6 +5,7 @@ namespace Modules\Lpj\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\RegionsFactory;
+use Modules\Lpj\Models\Teams;
 
 class Regions extends Model
 {
@@ -14,13 +15,12 @@ class Regions extends Model
      * The attributes that are mass assignable.
      */
     protected $table = 'regions';
-    
+
     protected $fillable = [
-        'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 
-        'created_at', 'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
+        'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by'
     ];
 
     public function teams(){
-        return $this->hasMany(Teams::class, 'region_id', 'id');
+        return $this->hasMany(Teams::class, 'regions_id', 'id');
     }
 }
diff --git a/app/Models/Teams.php b/app/Models/Teams.php
index bc9f7fe..0fd48a8 100644
--- a/app/Models/Teams.php
+++ b/app/Models/Teams.php
@@ -5,6 +5,10 @@ namespace Modules\Lpj\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\TeamsFactory;
+use Modules\Lpj\Models\TeamsUsers;
+use Modules\Lpj\Models\Regions;
+use Modules\Lpj\Models\Penilaian;
+
 
 class Teams extends Model
 {
@@ -13,16 +17,24 @@ class Teams extends Model
      */
     protected $table = 'teams';
     protected $fillable = [
-        'region_id', 'code', 'name', 'status', 'authorized_status', 'authorized_at', 
-        'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by', 
+        'regions_id', 'code', 'name', 'status', 'authorized_status', 'authorized_at',
+        'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by',
         'deleted_at', 'deleted_by'
     ];
 
     public function regions(){
-        return $this->belongsTo(Regions::class, 'region_id', 'id');
+        return $this->belongsTo(Regions::class, 'regions_id', 'id');
     }
 
     public function teamsUsers(){
-        return $this->hasMany(TeamsUsers::class, 'team_id', 'id');
+        return $this->hasMany(TeamsUsers::class, 'teams_id', 'id');
     }
+
+    public function penilaian(){
+        return $this->hasMany(Penilaian::class, 'teams_id', 'id');
+    }
+
+
+
 }
+
diff --git a/app/Models/TeamsUsers.php b/app/Models/TeamsUsers.php
index 4704fa9..c98b6d0 100644
--- a/app/Models/TeamsUsers.php
+++ b/app/Models/TeamsUsers.php
@@ -4,7 +4,7 @@ namespace Modules\Lpj\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Modules\Lpj\Database\Factories\TeamsUsersFactory;
-use Modules\User\Models\User;
+// use Modules\User\Models\User;
 use Modules\Lpj\Models\Teams;
 
 class TeamsUsers extends Model
@@ -15,16 +15,17 @@ class TeamsUsers extends Model
      */
     protected $table = 'teams_users';
     protected $fillable = [
-        'team_id', 'user_id', 'status', 'authorized_status', 'authorized_at',
+        'teams_id', 'user_id', 'status', 'authorized_status', 'authorized_at',
         'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by',
         'deleted_at', 'deleted_by'
     ];
 
     public function team()
     {
-        return $this->belongsTo(Teams::class, 'team_id', 'id');
+        return $this->belongsTo(Teams::class, 'teams_id', 'id');
     }
 
+
     public function user()
     {
         return $this->belongsTo(User::class, 'user_id', 'id');
diff --git a/database/migrations/2024_08_12_023807_create_debitures_table.php b/database/migrations/2024_08_12_023807_create_debitures_table.php
new file mode 100644
index 0000000..583c859
--- /dev/null
+++ b/database/migrations/2024_08_12_023807_create_debitures_table.php
@@ -0,0 +1,54 @@
+<?php
+
+    use Illuminate\Database\Migrations\Migration;
+    use Illuminate\Database\Schema\Blueprint;
+    use Illuminate\Support\Facades\Schema;
+    use Modules\Lpj\Models\Branch;
+
+    return new class extends Migration {
+        /**
+         * Run the migrations.
+         */
+        public function up()
+        : void
+        {
+            Schema::create('debitures', function (Blueprint $table) {
+                $table->id();
+                $table->foreignIdFor(Branch::class)->constrained()->onDelete('cascade');
+                $table->string('cif', 10)->unique();
+                $table->string('name');
+                $table->date('registered_at')->nullable();
+                $table->string('npwp', 16)->nullable();
+                $table->string('nomor_id', 16)->nullable();
+                $table->string('email', 100)->nullable();
+                $table->string('phone', 15)->nullable();
+                $table->string('nomor_rekening', 50)->nullable();
+                $table->string('province_code')->nullable()->index();
+                $table->string('city_code')->nullable()->index();
+                $table->string('district_code')->nullable()->index();
+                $table->string('village_code')->nullable()->index();
+                $table->string('postal_code', 5)->nullable();
+                $table->text('address')->nullable();
+
+                $table->boolean('status')->default(true)->nullable();
+                $table->timestamps();
+                $table->timestamp('authorized_at')->nullable();
+                $table->char('authorized_status', 1)->nullable();
+                $table->softDeletes();
+
+                $table->unsignedBigInteger('created_by')->nullable();
+                $table->unsignedBigInteger('updated_by')->nullable();
+                $table->unsignedBigInteger('deleted_by')->nullable();
+                $table->unsignedBigInteger('authorized_by')->nullable();
+            });
+        }
+
+        /**
+         * Reverse the migrations.
+         */
+        public function down()
+        : void
+        {
+            Schema::dropIfExists('debitures');
+        }
+    };
diff --git a/database/migrations/2024_09_05_030405_create_teams_table.php b/database/migrations/2024_09_05_030405_create_teams_table.php
index 88ae841..8ecffde 100644
--- a/database/migrations/2024_09_05_030405_create_teams_table.php
+++ b/database/migrations/2024_09_05_030405_create_teams_table.php
@@ -3,7 +3,7 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Mudels\Lpj\Models\Regions;
+use Modules\Lpj\Models\Regions;
 
 
 return new class extends Migration
@@ -15,7 +15,7 @@ return new class extends Migration
     {
         Schema::create('teams', function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(Regions::class, 'region_id');
+            $table->foreignIdFor(Regions::class)->constrained()->onDelete('cascade');
             $table->string('code')->unique()->index();
             $table->string('name');
             $table->char('status')->nullable();
diff --git a/database/migrations/2024_09_05_030417_create_teams_users_table.php b/database/migrations/2024_09_05_030417_create_teams_users_table.php
index 9b4422e..32167ee 100644
--- a/database/migrations/2024_09_05_030417_create_teams_users_table.php
+++ b/database/migrations/2024_09_05_030417_create_teams_users_table.php
@@ -15,11 +15,9 @@ return new class extends Migration
     {
         Schema::create('teams_users', function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(Teams::class);
-            $table->foreignIdFor(Users::class);
-            
-    
-            $table->char('status')->nullable();
+            $table->foreignIdFor(Teams::class)->constrained()->onDelete('cascade');
+            $table->unsignedBigInteger('user_id');
+            $table->boolean('status')->default(true)->nullable();
             $table->char('authorized_status', 1)->nullable();
             $table->timestamps();
             $table->timestamp('authorized_at')->nullable();
diff --git a/database/migrations/2024_09_05_070712_create_penilaian_table.php b/database/migrations/2024_09_05_070712_create_penilaian_table.php
index 14d7766..9764f04 100644
--- a/database/migrations/2024_09_05_070712_create_penilaian_table.php
+++ b/database/migrations/2024_09_05_070712_create_penilaian_table.php
@@ -3,7 +3,8 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Modules\Lpj\Models\Penilaian;
+use Modules\Lpj\Models\JenisPenilaian;
+use Modules\Lpj\Models\Teams;
 
 return new class extends Migration
 {
@@ -14,9 +15,9 @@ return new class extends Migration
     {
         Schema::create('penilaian', function (Blueprint $table) {
             $table->id();
-            $table->foreignIdFor(Penilaian::class);
+            $table->foreignIdFor(JenisPenilaian::class);
             $table->foreignIdFor(Teams::class);
-            $table->foreignIdFor(Users::class);
+            $table->unsignedBigInteger('user_id');
             $table->datetime('tanggal_kunjungan');
             $table->text('keterangan');
             $table->char('status');
@@ -28,7 +29,7 @@ return new class extends Migration
             $table->unsignedBigInteger('updated_by')->nullable();
             $table->unsignedBigInteger('deleted_by')->nullable();
             $table->unsignedBigInteger('authorized_by')->nullable();
-            
+
         });
     }
 
diff --git a/module.json b/module.json
index 559e479..568f490 100644
--- a/module.json
+++ b/module.json
@@ -65,17 +65,6 @@
                 "roles": [
                     "Administrator"
                 ]
-            },
-            {
-                "title": "Region",
-                "path": "",
-                "icon": "ki-filled ki-some-files text-lg",
-                "classes": "",
-                "attributes": [],
-                "permission": "",
-                "roles": [
-                    "Administrator"
-                ]
             }
         ],
         "master": [
@@ -193,7 +182,32 @@
                         "attributes": [],
                         "permission": "",
                         "roles": []
+                    },
+                    {
+                        "title": "Region",
+                        "path": "basicdata.region",
+                        "classes": "",
+                        "attributes": [],
+                        "permission": "",
+                        "roles": []
+                    },
+                    {
+                        "title": "Team Penilai",
+                        "path": "basicdata.teams",
+                        "classes": "",
+                        "attributes": [],
+                        "permission": "",
+                        "roles": []
+                    },
+                    {
+                        "title": "Jenis Penilaian",
+                        "path": "basicdata.jenispenilaian",
+                        "classes": "",
+                        "attributes": [],
+                        "permission": "",
+                        "roles": []
                     }
+
                 ]
             }
         ],
diff --git a/resources/views/jenis_penilaian/form.blade.php b/resources/views/jenis_penilaian/form.blade.php
new file mode 100644
index 0000000..ee73abe
--- /dev/null
+++ b/resources/views/jenis_penilaian/form.blade.php
@@ -0,0 +1,64 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+
+@section('content')
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+
+        <form
+            action="{{ isset($jenisPenilaian->id) ? route('basicdata.jenispenilaian.update', $jenisPenilaian->id) : route('basicdata.jenispenilaian.store') }}"
+            method="POST">
+
+            @if (isset($jenisPenilaian->id))
+                @method('PUT')
+                <input type="text" name="id" value="{{ $jenisPenilaian->id }}">
+            @endif
+
+            @csrf
+            <div class="card pb-2.5">
+                <div class="card-header" id="basic_settings">
+                    <h3 class="card-title">
+                        {{ isset($jenisPenilaian->id) ? 'Edit' : 'Tambah' }} jenis penilaian
+                    </h3>
+                    <div class="flex items-center gap-2">
+                        <a href="{{ route('basicdata.jenispenilaian.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">
+                            Code
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('code') border-danger bg-danger-light @enderror" type="text"
+                                name="code" value="{{ $jenisPenilaian->code ?? '' }}">
+                            @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">
+                            Name
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('name') border-danger bg-danger-light @enderror" type="text"
+                                name="name" value="{{ $jenisPenilaian->name ?? '' }}">
+                            @error('name')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
+                    </div>
+                    <div class="flex justify-end">
+                        <button type="submit" class="btn btn-primary">
+                            Save
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+@endsection
diff --git a/resources/views/jenis_penilaian/index.blade.php b/resources/views/jenis_penilaian/index.blade.php
new file mode 100644
index 0000000..4d027a6
--- /dev/null
+++ b/resources/views/jenis_penilaian/index.blade.php
@@ -0,0 +1,160 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render('basicdata.jenispenilaian') }}
+@endsection
+
+@section('content')
+    <div class="grid">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
+            data-datatable-state-save="false" id="jenis-penilaian-table"
+            data-api-url="{{ route('basicdata.jenispenilaian.datatables') }}">
+            <div class="card-header py-5 flex-wrap">
+                <h3 class="card-title">
+                    Daftar Jenis penilaian
+                </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 jenispenilaian" 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('basicdata.jenispenilaian.export') }}"> Export to
+                            Excel </a>
+                        <a class="btn btn-sm btn-primary" href="{{ route('basicdata.jenispenilaian.create') }}"> Tambah
+                            Jenis penilaian </a>
+                    </div>
+                </div>
+            </div>
+            <div class="card-body">
+                <div class="scrollable-x-auto max-h-[500px] overflow-y-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-[250px]" data-datatable-column="code">
+                                    <span class="sort"> <span class="sort-label"> Code </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[250px]" data-datatable-column="name">
+                                    <span class="sort"> <span class="sort-label"> Jenis penilaian </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 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(`basic-data/jenispenilaian/${data}`, {
+                        type: 'DELETE'
+                    }).then((response) => {
+                        swal.fire('Deleted!', 'User has been deleted.', 'success').then(() => {
+                            window.location.reload();
+                        });
+                    }).catch((error) => {
+                        console.error('Error:', error);
+                        Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
+                    });
+                }
+            })
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#jenis-penilaian-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();
+                    },
+                },
+                code: {
+                    title: 'Code',
+                },
+                name: {
+                    title: 'jenis-penilaian',
+                },
+                actions: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `<div class="flex flex-nowrap justify-center">
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" href="basic-data/jenispenilaian/${data.id}/edit">
+                                <i class="ki-outline ki-notepad-edit"></i>
+                            </a>
+                            <a onclick="deleteData(${data.id})" class="delete btn btn-sm btn-icon btn-clear btn-danger">
+                                <i class="ki-outline ki-trash"></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
diff --git a/resources/views/region/create.blade.php b/resources/views/region/create.blade.php
new file mode 100644
index 0000000..ed8ca6f
--- /dev/null
+++ b/resources/views/region/create.blade.php
@@ -0,0 +1,61 @@
+@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">
+        @if (isset($region->id))
+            <form action="{{ route('basicdata.region.update', $region->id) }}" method="POST">
+                <input type="hidden" name="id" value="{{ $region->id }}">
+                @method('PUT')
+            @else
+                <form method="POST" action="{{ route('basicdata.region.store') }}">
+        @endif
+        @csrf
+        <div class="card pb-2.5">
+            <div class="card-header" id="basic_settings">
+                <h3 class="card-title">
+                    {{ isset($region->id) ? 'Edit' : 'Tambah' }} region
+                </h3>
+                <div class="flex items-center gap-2">
+                    <a href="{{ route('basicdata.region.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">
+                        Code
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <input class="input  @error('code') border-danger bg-danger-light @enderror" type="text"
+                            name="code" value="{{ $region->code ?? '' }}">
+                        @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">
+                        Name
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <input class="input  @error('name') border-danger bg-danger-light @enderror" type="text"
+                            name="name" value="{{ $region->name ?? '' }}">
+                        @error('name')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                        @enderror
+                    </div>
+                </div>
+                <div class="flex justify-end">
+                    <button type="submit" class="btn btn-primary">
+                        Save
+                    </button>
+                </div>
+            </div>
+        </div>
+        </form>
+    </div>
+@endsection
diff --git a/resources/views/region/index.blade.php b/resources/views/region/index.blade.php
new file mode 100644
index 0000000..2d0bd32
--- /dev/null
+++ b/resources/views/region/index.blade.php
@@ -0,0 +1,152 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render('basicdata.region') }}
+@endsection
+
+@section('content')
+    <div class="grid">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="region-table" data-api-url="{{ route('basicdata.region.datatables') }}">
+            <div class="card-header py-5 flex-wrap">
+                <h3 class="card-title">
+                    Daftar Region
+                </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 region" 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('basicdata.region.export') }}"> Export to Excel </a>
+                        <a class="btn btn-sm btn-primary" href="{{ route('basicdata.region.create') }}"> Tambah Region </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-[250px]" data-datatable-column="code">
+                                <span class="sort"> <span class="sort-label"> Code </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[250px]" data-datatable-column="name">
+                                <span class="sort"> <span class="sort-label"> Region </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 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(`basic-data/region/${data}`, {
+                        type: 'DELETE'
+                    }).then((response) => {
+                        swal.fire('Deleted!', 'User has been deleted.', 'success').then(() => {
+                            window.location.reload();
+                        });
+                    }).catch((error) => {
+                        console.error('Error:', error);
+                        Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
+                    });
+                }
+            })
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#region-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();
+                    },
+                },
+                code: {
+                    title: 'Code',
+                },
+                name: {
+                    title: 'Region',
+                },
+                actions: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `<div class="flex flex-nowrap justify-center">
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" href="basic-data/region/${data.id}/edit">
+                                <i class="ki-outline ki-notepad-edit"></i>
+                            </a>
+                            <a onclick="deleteData(${data.id})" class="delete btn btn-sm btn-icon btn-clear btn-danger">
+                                <i class="ki-outline ki-trash"></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
+
+
+
diff --git a/resources/views/teams/form.blade.php b/resources/views/teams/form.blade.php
new file mode 100644
index 0000000..2070f8c
--- /dev/null
+++ b/resources/views/teams/form.blade.php
@@ -0,0 +1,113 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+
+@section('content')
+    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+
+        <form action="{{ isset($teams->id) ? route('basicdata.teams.update', $teams->id) : route('basicdata.teams.store') }}"
+            method="POST">
+
+            @if (isset($teams->id))
+                @method('PUT')
+                <input type="hidden" name="id" value="{{ $teams->id }}">
+            @endif
+            @csrf
+            <div class="card pb-2.5">
+                <div class="card-header" id="basic_settings">
+                    <h3 class="card-title">
+                        {{ isset($teams->id) ? 'Edit' : 'Tambah' }} Teams
+                    </h3>
+                    <div class="flex items-center gap-2">
+                        <a href="{{ route('basicdata.teams.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">
+                            Name
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('name') border-danger bg-danger-light @enderror" type="text"
+                                name="name" value="{{ $teams->name ?? '' }}">
+                            @error('name')
+                                <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">
+                            Code
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('code') border-danger bg-danger-light @enderror" type="text"
+                                name="code" value="{{ $teams->code ?? '' }}">
+                            @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">Region</label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <select class="input tomselect w-full border-danger bg-danger-light" name="regions_id">
+                                <option value="">Select Region</option>
+
+                                @if (isset($region))
+                                    @foreach ($region as $regions)
+                                        @if (isset($teams))
+                                            <option value="{{ $regions->id }}"
+                                                {{ $teams->regions_id == $regions->id ? 'selected' : '' }}>
+                                                {{ $regions->name }}</option>
+                                        @else
+                                            <option value="{{ $regions->id }}">{{ $regions->name }}</option>
+                                        @endif
+                                    @endforeach
+                                @endif
+
+
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">Team Group</label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <select class="input tomselect w-full border-danger bg-danger-light select2" name="user[]"
+                                multiple="multiple">
+                                <option value="">Select Team Group</option>
+                                @if (isset($user))
+                                    @foreach ($user as $users)
+                                        @if (isset($teams))
+                                            <option value="{{ $users->id }}"
+                                                {{ in_array($users->id, $selectedUsers) ? 'selected' : '' }}>
+                                                {{ $users->name }}</option>
+                                        @else
+                                            <option value="{{ $users->id }}">{{ $users->name }}</option>
+                                        @endif
+                                    @endforeach
+                                @endif
+
+                            </select>
+                        </div>
+                    </div>
+
+
+                    <div class="flex justify-end">
+                        <button type="submit" class="btn btn-primary">
+                            Save
+                        </button>
+                    </div>
+
+                </div>
+            </div>
+        </form>
+    </div>
+@endsection
diff --git a/resources/views/teams/index.blade.php b/resources/views/teams/index.blade.php
new file mode 100644
index 0000000..dff81d8
--- /dev/null
+++ b/resources/views/teams/index.blade.php
@@ -0,0 +1,174 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render('basicdata.teams') }}
+@endsection
+
+@section('content')
+    <div class="grid">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
+            data-datatable-state-save="false" id="teams-table" data-api-url="{{ route('basicdata.teams.datatables') }}">
+            <div class="card-header py-5 flex-wrap">
+                <h3 class="card-title">
+                    Daftar Teams
+                </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 teams" 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('basicdata.teams.export') }}"> Export to Excel </a>
+                        <a class="btn btn-sm btn-primary" href="{{ route('basicdata.teams.create') }}"> Tambah Teams </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-[250px]" data-datatable-column="code">
+                                    <span class="sort"> <span class="sort-label"> Region Name </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+
+                                <th class="min-w-[250px]" data-datatable-column="name">
+                                    <span class="sort"> <span class="sort-label"> Anggota Team </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 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(`basic-data/teams/${data}`, {
+                        type: 'DELETE'
+                    }).then((response) => {
+                        swal.fire('Deleted!', 'Team has been deleted.', 'success').then(() => {
+                            window.location.reload();
+                        });
+                    }).catch((error) => {
+                        console.error('Error:', error);
+                        Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
+                    });
+                }
+            })
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#teams-table');
+        const searchInput = document.getElementById('search');
+
+        const apiUrl = element.getAttribute('data-api-url');
+
+        console.log("API URL:", apiUrl);
+
+        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();
+                    },
+                },
+
+                region_name: {
+                    title: 'Region Name',
+                    render: (item, data) => {
+                        return (
+                            `<ul>
+                                 <li>${data.region_name}</li>
+                                 <li>${data.team_name}</li>
+                                </ul>
+                                 `)
+
+                    },
+                },
+
+                user_team: {
+                    title: 'User Team',
+                    render: (item, data) => {
+                        if (data.user_team && data.user_team.length) {
+                            return `<ul>${data.user_team.map(user => `<li>${user.nama}</li>`).join('')}</ul>`;
+                        } else {
+                            return '<ul><li>N/A</li></ul>';
+                        }
+                    },
+                },
+                actions: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `<div class="flex flex-nowrap justify-center">
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" href="basic-data/teams/${data.id}/edit">
+                                <i class="ki-outline ki-notepad-edit"></i>
+                            </a>
+                            <a onclick="deleteData(${data.id})" class="delete btn btn-sm btn-icon btn-clear btn-danger">
+                                <i class="ki-outline ki-trash"></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
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index f39cfcc..b850459 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -267,3 +267,46 @@
         $trail->push('Data Permohonan');
     });
 
+
+    Breadcrumbs::for('basicdata.region', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata');
+        $trail->push('Region', route('basicdata.region.index'));
+    });
+    Breadcrumbs::for('basicdata.region.create', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata.region');
+        $trail->push('Tambah Region', route('basicdata.region.create'));
+    });
+    Breadcrumbs::for('basicdata.region.edit', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata.region');
+        $trail->push('Edit Region');
+    });
+
+
+    Breadcrumbs::for('basicdata.teams', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata');
+        $trail->push('Team', route('basicdata.teams.index'));
+    });
+    Breadcrumbs::for('basicdata.teams.create', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata.teams');
+        $trail->push('Tambah Team', route('basicdata.teams.create'));
+    });
+
+    Breadcrumbs::for('basicdata.teams.edit', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata.teams');
+        $trail->push('Edit Team');
+    });
+
+
+    Breadcrumbs::for('basicdata.jenispenilaian', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata');
+        $trail->push('Jenis Penilaian', route('basicdata.jenispenilaian.index'));
+    });
+    Breadcrumbs::for('basicdata.jenispenilaian.create', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata.jenispenilaian');
+        $trail->push('Tambah Jenis Penilaian', route('basicdata.jenispenilaian.create'));
+    });
+
+    Breadcrumbs::for('basicdata.jenispenilaian.edit', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata.jenispenilaian');
+        $trail->push('Edit Jenis Penilaian');
+    });
diff --git a/routes/web.php b/routes/web.php
index d1737ef..e79efeb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,203 +1,279 @@
 <?php
 
-    use Illuminate\Support\Facades\Route;
-    use Modules\Lpj\Http\Controllers\ArahMataAnginController;
-    use Modules\Lpj\Http\Controllers\BranchController;
-    use Modules\Lpj\Http\Controllers\CurrencyController;
-    use Modules\Lpj\Http\Controllers\DebitureController;
-    use Modules\Lpj\Http\Controllers\DokumenJaminanController;
-    use Modules\Lpj\Http\Controllers\HubunganPemilikJaminanController;
-    use Modules\Lpj\Http\Controllers\HubunganPenghuniJaminanController;
-    use Modules\Lpj\Http\Controllers\JenisAsetController;
-    use Modules\Lpj\Http\Controllers\JenisDokumenController;
-    use Modules\Lpj\Http\Controllers\JenisFasilitasKreditController;
-    use Modules\Lpj\Http\Controllers\JenisJaminanController;
-    use Modules\Lpj\Http\Controllers\JenisLegalitasJaminanController;
-    use Modules\Lpj\Http\Controllers\NilaiPlafondController;
-    use Modules\Lpj\Http\Controllers\PemilikJaminanController;
-    use Modules\Lpj\Http\Controllers\PermohonanController;
-    use Modules\Lpj\Http\Controllers\StatusPermohonanController;
-    use Modules\Lpj\Http\Controllers\TujuanPenilaianController;
+use Illuminate\Support\Facades\Route;
+use Modules\Lpj\Http\Controllers\ArahMataAnginController;
+use Modules\Lpj\Http\Controllers\BranchController;
+use Modules\Lpj\Http\Controllers\CurrencyController;
+use Modules\Lpj\Http\Controllers\DebitureController;
+use Modules\Lpj\Http\Controllers\DokumenJaminanController;
+use Modules\Lpj\Http\Controllers\HubunganPemilikJaminanController;
+use Modules\Lpj\Http\Controllers\HubunganPenghuniJaminanController;
+use Modules\Lpj\Http\Controllers\JenisAsetController;
+use Modules\Lpj\Http\Controllers\JenisDokumenController;
+use Modules\Lpj\Http\Controllers\JenisFasilitasKreditController;
+use Modules\Lpj\Http\Controllers\JenisJaminanController;
+use Modules\Lpj\Http\Controllers\JenisLegalitasJaminanController;
+use Modules\Lpj\Http\Controllers\NilaiPlafondController;
+use Modules\Lpj\Http\Controllers\PemilikJaminanController;
+use Modules\Lpj\Http\Controllers\PermohonanController;
+use Modules\Lpj\Http\Controllers\StatusPermohonanController;
+use Modules\Lpj\Http\Controllers\TujuanPenilaianController;
+use Modules\Lpj\Http\Controllers\RegionController;
+use Modules\Lpj\Http\Controllers\TeamsController;
+use Modules\Lpj\Http\Controllers\JenisPenilaianController;
 
-    /*
-    |--------------------------------------------------------------------------
-    | 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!
-    |
-    */
+/*
+|--------------------------------------------------------------------------
+| 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('jenis-fasilitas-kredit.')->prefix('jenis-fasilitas-kredit')->group(function () {
-                Route::get('restore/{id}', [JenisFasilitasKreditController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisFasilitasKreditController::class, 'dataForDatatables'])
-                     ->name('datatables');
-                Route::get('export', [JenisFasilitasKreditController::class, 'export'])->name('export');
-            });
-            Route::resource('jenis-fasilitas-kredit', JenisFasilitasKreditController::class);
+Route::middleware(['auth'])->group(function () {
 
-            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('jenis-aset.')->prefix('jenis-aset')->group(function () {
-                Route::get('restore/{id}', [JenisAsetController::class, 'restore'])->name('restore');
-                Route::get('datatables', [JenisAsetController::class, 'dataForDatatables'])
-                     ->name('datatables');
-                Route::get('export', [JenisAsetController::class, 'export'])->name('export');
-            });
-            Route::resource('jenis-aset', JenisAsetController::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::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('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('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'])
+     /** ROUTE BASIC DATA ***/
+    Route::name('basicdata.')->prefix('basic-data')->group(function () {
+        Route::name('jenis-fasilitas-kredit.')->prefix('jenis-fasilitas-kredit')->group(function () {
+            Route::get('restore/{id}', [JenisFasilitasKreditController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisFasilitasKreditController::class, 'dataForDatatables'])
                  ->name('datatables');
-            Route::get('export', [PermohonanController::class, 'export'])->name('export');
+            Route::get('export', [JenisFasilitasKreditController::class, 'export'])->name('export');
         });
+        Route::resource('jenis-fasilitas-kredit', JenisFasilitasKreditController::class);
 
-        Route::resource('permohonan', PermohonanController::class);
-
-        Route::name('debitur.')->prefix('debitur')->group(function () {
-            Route::get('download/{id}', [DebitureController::class, 'download'])->name('download');
-            Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore');
-            Route::get('datatables', [DebitureController::class, 'dataForDatatables'])
+        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', [DebitureController::class, 'export'])->name('export');
+            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('jaminan.')->prefix('{id}/jaminan')->group(function () {
-                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('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('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('jenis-aset.')->prefix('jenis-aset')->group(function () {
+            Route::get('restore/{id}', [JenisAsetController::class, 'restore'])->name('restore');
+            Route::get('datatables', [JenisAsetController::class, 'dataForDatatables'])
+                 ->name('datatables');
+            Route::get('export', [JenisAsetController::class, 'export'])->name('export');
+        });
+        Route::resource('jenis-aset', JenisAsetController::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::resource('debitur', DebitureController::class);
+        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('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('jenispenilaian.')->prefix('jenispenilaian')->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('jenispenilaian', JenisPenilaianController::class, [
+            'names' => [
+                'index'   => 'jenispenilaian.index',
+                'show'    => 'jenispenilaian.show',
+                'create'  => 'jenispenilaian.create',
+                'store'   => 'jenispenilaian.store',
+                'edit'    => 'jenispenilaian.edit',
+                'update'  => 'jenispenilaian.update',
+                'destroy' => 'jenispenilaian.destroy',
+            ],
+        ]);
+
+
     });
+    /** END ROUTE BASIC DATA ***/
+
+    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::name('debitur.')->prefix('debitur')->group(function () {
+        Route::get('download/{id}', [DebitureController::class, 'download'])->name('download');
+        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('/', [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::get('/cities/{province_code}', [DebitureController::class, 'getCities']);
+    Route::get('/districts/{city_code}', [DebitureController::class, 'getDistricts']);
+    Route::get('/villages/{district_code}', [DebitureController::class, 'getVillages']);
+
+
+});

From e7d69c4e837976dcd3288f45a59ba0f16936aac9 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 11 Sep 2024 08:39:12 +0700
Subject: [PATCH 04/16] delete route city, district, vilage

---
 routes/web.php | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index e79efeb..fc30aa1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -35,7 +35,7 @@ use Modules\Lpj\Http\Controllers\JenisPenilaianController;
 
 Route::middleware(['auth'])->group(function () {
 
-     /** ROUTE BASIC DATA ***/
+    /** ROUTE BASIC DATA ***/
     Route::name('basicdata.')->prefix('basic-data')->group(function () {
         Route::name('jenis-fasilitas-kredit.')->prefix('jenis-fasilitas-kredit')->group(function () {
             Route::get('restore/{id}', [JenisFasilitasKreditController::class, 'restore'])->name('restore');
@@ -266,14 +266,4 @@ Route::middleware(['auth'])->group(function () {
     });
 
     Route::resource('debitur', DebitureController::class);
-
-
-
-
-
-    Route::get('/cities/{province_code}', [DebitureController::class, 'getCities']);
-    Route::get('/districts/{city_code}', [DebitureController::class, 'getDistricts']);
-    Route::get('/villages/{district_code}', [DebitureController::class, 'getVillages']);
-
-
 });

From eac8e21b2eef86402297b4b0a8ba16bf85ff6c1e Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 11 Sep 2024 14:39:47 +0700
Subject: [PATCH 05/16] Update export di module senior officer

---
 app/Exports/JenisPenilaianExport.php          |  46 +++++++
 app/Exports/TeamPenilaianExport.php           |  57 ++++++++
 .../Controllers/JenisPenilaianController.php  |  18 +--
 app/Http/Controllers/PenilaianController.php  |  67 +++++++++
 app/Http/Controllers/TeamsController.php      |  32 +++--
 app/Http/Requests/JenisPenilaianRequest.php   |   3 +-
 app/Http/Requests/PenilaianRequest.php        |  26 ++++
 module.json                                   |  10 +-
 .../views/jenis_penilaian/form.blade.php      |   4 +-
 .../views/jenis_penilaian/index.blade.php     |  14 +-
 resources/views/penilaian/index.blade.php     | 128 ++++++++++++++++++
 resources/views/teams/form.blade.php          |   2 +-
 routes/breadcrumbs.php                        |  19 ++-
 routes/web.php                                |  37 +++--
 14 files changed, 415 insertions(+), 48 deletions(-)
 create mode 100644 app/Exports/JenisPenilaianExport.php
 create mode 100644 app/Exports/TeamPenilaianExport.php
 create mode 100644 app/Http/Controllers/PenilaianController.php
 create mode 100644 app/Http/Requests/PenilaianRequest.php
 create mode 100644 resources/views/penilaian/index.blade.php

diff --git a/app/Exports/JenisPenilaianExport.php b/app/Exports/JenisPenilaianExport.php
new file mode 100644
index 0000000..7d633eb
--- /dev/null
+++ b/app/Exports/JenisPenilaianExport.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Modules\Lpj\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Modules\Lpj\Models\JenisPenilaian;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class JenisPenilaianExport implements WithColumnFormatting, WithHeadings, FromCollection, withMapping
+{
+    public function collection()
+    {
+        return JenisPenilaian::all();
+    }
+
+    public function map($row): array
+    {
+        return [
+            $row->id,
+            $row->code,
+            $row->name,
+            $row->created_at
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'ID',
+            'Code',
+            'Jenis Penilaian',
+            'Created At'
+        ];
+    }
+
+    public function columnFormats(): array
+    {
+        return [
+            'A' => NumberFormat::FORMAT_NUMBER,
+            'D' => NumberFormat::FORMAT_DATE_DATETIME
+        ];
+    }
+}
diff --git a/app/Exports/TeamPenilaianExport.php b/app/Exports/TeamPenilaianExport.php
new file mode 100644
index 0000000..3fdc1f7
--- /dev/null
+++ b/app/Exports/TeamPenilaianExport.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Modules\Lpj\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Modules\Lpj\Models\JenisPenilaian;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use Illuminate\Support\Facades\DB;
+use Modules\Lpj\Models\Teams;
+
+class TeamPenilaianExport implements WithColumnFormatting, WithHeadings, FromCollection, withMapping
+{
+    public function collection()
+    {
+        return Teams::select(
+                'teams.id as id',
+                'teams.name as team_name',
+                'regions.name as region_name',
+                DB::raw('STRING_AGG(users.name, \', \') as team_group')
+            )
+            ->join('regions', 'teams.regions_id', '=', 'regions.id')
+            ->leftJoin('teams_users', 'teams.id', '=', 'teams_users.teams_id')
+            ->leftJoin('users', 'teams_users.user_id', '=', 'users.id')
+            ->groupBy('teams.id', 'teams.name', 'regions.name')
+            ->get();
+    }
+
+    public function map($row): array
+    {
+        return [
+            $row->team_name,
+            $row->region_name,
+            $row->team_group,
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Name',
+            'Region',
+            'Anggota Team',
+        ];
+    }
+
+    public function columnFormats(): array
+    {
+        return [
+            'A' => NumberFormat::FORMAT_TEXT,
+            'B' => NumberFormat::FORMAT_TEXT,
+            'C' => NumberFormat::FORMAT_TEXT,
+        ];
+    }
+}
diff --git a/app/Http/Controllers/JenisPenilaianController.php b/app/Http/Controllers/JenisPenilaianController.php
index c38f673..3e16ce1 100644
--- a/app/Http/Controllers/JenisPenilaianController.php
+++ b/app/Http/Controllers/JenisPenilaianController.php
@@ -6,15 +6,12 @@ use Exception;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Modules\Lpj\Models\JenisPenilaian;
-
 use Modules\Lpj\Http\Requests\JenisPenilaianRequest;
-
-
+use Modules\Lpj\Exports\JenisPenilaianExport;
+use Maatwebsite\Excel\Facades\Excel;
 class JenisPenilaianController extends Controller
 {
-
     public $user;
     /**
      * Display a listing of the resource.
@@ -62,7 +59,6 @@ class JenisPenilaianController extends Controller
     public function update(JenisPenilaianRequest $request, $id)
     {
 
-
         $validate = $request->validate();
 
         // dump($validate);
@@ -96,8 +92,6 @@ class JenisPenilaianController extends Controller
 
     public function dataForDatatables(Request $request)
     {
-
-
         if (is_null($this->user) || !$this->user->can('jenis_penilaian.view')) {
             //abort(403, 'Sorry! You are not allowed to view users.');
         }
@@ -112,7 +106,7 @@ class JenisPenilaianController extends Controller
             });
         }
 
-        if($request->has('sortOrder') && !empty($request->get('sortOrder'))){
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
             $column = $request->get('sortField');
             $query->orderBy($column, $order);
@@ -153,4 +147,10 @@ class JenisPenilaianController extends Controller
             'data'            => $data
         ]);
     }
+
+
+    public function export()
+    {
+        return Excel::download(new JenisPenilaianExport(), 'jenis-penilaian.xlsx');
+    }
 }
diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
new file mode 100644
index 0000000..831c163
--- /dev/null
+++ b/app/Http/Controllers/PenilaianController.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+
+class PenilaianController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('lpj::penilaian.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)
+    {
+        return view('lpj::show');
+    }
+
+    /**
+     * 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
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/TeamsController.php b/app/Http/Controllers/TeamsController.php
index fa6fbe7..f52cf26 100644
--- a/app/Http/Controllers/TeamsController.php
+++ b/app/Http/Controllers/TeamsController.php
@@ -12,6 +12,8 @@ use Modules\Lpj\Models\Teams;
 use Modules\Lpj\Models\TeamsUsers;
 use Modules\Lpj\Http\Requests\TeamsRequest;
 use Illuminate\Support\Facades\DB;
+use Modules\Lpj\Exports\TeamPenilaianExport;
+use Maatwebsite\Excel\Facades\Excel;
 
 class TeamsController extends Controller
 {
@@ -30,8 +32,13 @@ class TeamsController extends Controller
     public function create()
     {
 
-        $region = Regions::all();
-        $user = User::all();
+        // cek region apakah sudah ada di tabel teams
+        $regionTeam = Teams::pluck('regions_id')->toArray();
+        $region = Regions::whereNotIn('id', $regionTeam)->get();
+
+        // cek user apakah sudah ada di tabel teams_users
+        $userTeam = TeamsUsers::pluck('user_id')->toArray();
+        $user = User::whereNotIn('id', $userTeam)->get();
 
         return view('lpj::teams.form', compact('region', 'user'));
     }
@@ -86,8 +93,13 @@ class TeamsController extends Controller
     public function edit($id)
     {
         $teams = Teams::find($id);
+
+
         $region = Regions::all();
-        $user = User::all();
+        $usedUsers = TeamsUsers::where('teams_id', '!=', $id)->pluck('user_id')->toArray();
+
+        $user = User::whereNotIn('id', $usedUsers)->get();
+        // Ambil user yang sudah ada di tim ini
         $selectedUsers = $teams->teamsUsers->pluck('user_id')->toArray();
 
         return view('lpj::teams.form', compact('teams', 'region', 'user', 'selectedUsers'));
@@ -149,15 +161,11 @@ class TeamsController extends Controller
 
             DB::commit();
 
-            return redirect()
-                    ->route('basicdata.teams.index')
-                    ->with('success', 'Team has been deleted successfully.');
+            echo json_encode(['success' => true, 'message' => 'Team has been deleted successfully']);
+
         } catch (Exception $e) {
             DB::rollBack();
-
-            return redirect()
-                    ->route('basicdata.teams.index')
-                    ->with('error', 'Failed to delete team. ');
+            echo json_encode(['success' => false, 'message' => 'Failed to delete Team']);
         }
     }
 
@@ -236,6 +244,10 @@ class TeamsController extends Controller
     }
 
 
+    public function export()
+    {
+        return Excel::download(new TeamPenilaianExport, 'team-penilai.xlsx');
+    }
 
 
 }
diff --git a/app/Http/Requests/JenisPenilaianRequest.php b/app/Http/Requests/JenisPenilaianRequest.php
index 58562ea..f8479f0 100644
--- a/app/Http/Requests/JenisPenilaianRequest.php
+++ b/app/Http/Requests/JenisPenilaianRequest.php
@@ -22,8 +22,7 @@ class JenisPenilaianRequest extends FormRequest
 
         if ($this->method() == 'PUT') {
 
-            $rules['code'] = 'required|string|max:3|unique:jenis_penilaian,code,' . $this->route('id');
-
+            $rules['code'] = 'required|string|max:3|unique:jenis_penilaian,code,' . $this->id;
 
         } else {
             $rules['code'] = 'required|string|max:3|unique:jenis_penilaian,code';
diff --git a/app/Http/Requests/PenilaianRequest.php b/app/Http/Requests/PenilaianRequest.php
new file mode 100644
index 0000000..8b29d51
--- /dev/null
+++ b/app/Http/Requests/PenilaianRequest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Modules\Lpj\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class PenilaianRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+}
diff --git a/module.json b/module.json
index 568f490..e3efca9 100644
--- a/module.json
+++ b/module.json
@@ -201,7 +201,15 @@
                     },
                     {
                         "title": "Jenis Penilaian",
-                        "path": "basicdata.jenispenilaian",
+                        "path": "basicdata.jenis-penilaian",
+                        "classes": "",
+                        "attributes": [],
+                        "permission": "",
+                        "roles": []
+                    },
+                    {
+                        "title": "Penilaian Jaminan",
+                        "path": "basicdata.penilaian",
                         "classes": "",
                         "attributes": [],
                         "permission": "",
diff --git a/resources/views/jenis_penilaian/form.blade.php b/resources/views/jenis_penilaian/form.blade.php
index ee73abe..3fd6197 100644
--- a/resources/views/jenis_penilaian/form.blade.php
+++ b/resources/views/jenis_penilaian/form.blade.php
@@ -8,7 +8,7 @@
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
 
         <form
-            action="{{ isset($jenisPenilaian->id) ? route('basicdata.jenispenilaian.update', $jenisPenilaian->id) : route('basicdata.jenispenilaian.store') }}"
+            action="{{ isset($jenisPenilaian->id) ? route('basicdata.jenis-penilaian.update', $jenisPenilaian->id) : route('basicdata.jenis-penilaian.store') }}"
             method="POST">
 
             @if (isset($jenisPenilaian->id))
@@ -23,7 +23,7 @@
                         {{ isset($jenisPenilaian->id) ? 'Edit' : 'Tambah' }} jenis penilaian
                     </h3>
                     <div class="flex items-center gap-2">
-                        <a href="{{ route('basicdata.jenispenilaian.index') }}" class="btn btn-xs btn-info"><i
+                        <a href="{{ route('basicdata.jenis-penilaian.index') }}" class="btn btn-xs btn-info"><i
                                 class="ki-filled ki-exit-left"></i> Back</a>
                     </div>
                 </div>
diff --git a/resources/views/jenis_penilaian/index.blade.php b/resources/views/jenis_penilaian/index.blade.php
index 4d027a6..7e26e37 100644
--- a/resources/views/jenis_penilaian/index.blade.php
+++ b/resources/views/jenis_penilaian/index.blade.php
@@ -1,14 +1,14 @@
 @extends('layouts.main')
 
 @section('breadcrumbs')
-    {{ Breadcrumbs::render('basicdata.jenispenilaian') }}
+    {{ Breadcrumbs::render('basicdata.jenis-penilaian') }}
 @endsection
 
 @section('content')
     <div class="grid">
         <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
             data-datatable-state-save="false" id="jenis-penilaian-table"
-            data-api-url="{{ route('basicdata.jenispenilaian.datatables') }}">
+            data-api-url="{{ route('basicdata.jenis-penilaian.datatables') }}">
             <div class="card-header py-5 flex-wrap">
                 <h3 class="card-title">
                     Daftar Jenis penilaian
@@ -16,14 +16,14 @@
                 <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 jenispenilaian" id="search" type="text" value="">
+                            <input placeholder="Search jenis 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('basicdata.jenispenilaian.export') }}"> Export to
+                        <a class="btn btn-sm btn-light" href="{{ route('basicdata.jenis-penilaian.export') }}"> Export to
                             Excel </a>
-                        <a class="btn btn-sm btn-primary" href="{{ route('basicdata.jenispenilaian.create') }}"> Tambah
+                        <a class="btn btn-sm btn-primary" href="{{ route('basicdata.jenis-penilaian.create') }}"> Tambah
                             Jenis penilaian </a>
                     </div>
                 </div>
@@ -91,7 +91,7 @@
                         }
                     });
 
-                    $.ajax(`basic-data/jenispenilaian/${data}`, {
+                    $.ajax(`basic-data/jenis-penilaian/${data}`, {
                         type: 'DELETE'
                     }).then((response) => {
                         swal.fire('Deleted!', 'User has been deleted.', 'success').then(() => {
@@ -135,7 +135,7 @@
                     title: 'Status',
                     render: (item, data) => {
                         return `<div class="flex flex-nowrap justify-center">
-                            <a class="btn btn-sm btn-icon btn-clear btn-info" href="basic-data/jenispenilaian/${data.id}/edit">
+                            <a class="btn btn-sm btn-icon btn-clear btn-info" href="basic-data/jenis-penilaian/${data.id}/edit">
                                 <i class="ki-outline ki-notepad-edit"></i>
                             </a>
                             <a onclick="deleteData(${data.id})" class="delete btn btn-sm btn-icon btn-clear btn-danger">
diff --git a/resources/views/penilaian/index.blade.php b/resources/views/penilaian/index.blade.php
new file mode 100644
index 0000000..cfd8309
--- /dev/null
+++ b/resources/views/penilaian/index.blade.php
@@ -0,0 +1,128 @@
+@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-header" id="basic_settings">
+                <h3 class="card-title">
+                    {{ isset($debitur->id) ? 'Edit' : 'Tambah' }} Debitur
+                </h3>
+                <div class="flex items-center gap-2">
+                    @if (isset($debitur->id))
+                        <a class="btn btn-sm btn-primary" href="{{ route('permohonan.create.debitur', $debitur->id) }}"> Buat
+                            Permohonan </a>
+                    @endif
+                    <a href="{{ route('debitur.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
+                        Back</a>
+                </div>
+            </div>
+            <div class="card-body">
+
+                <form action="" method="POST" class="grid gap-5">
+                    {{-- @if (isset($debitur->id))
+                    @method('PUT')
+                @endif
+                @csrf --}}
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            Cabang
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <select
+                                class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
+                                name="branch_id" id="branch_id">
+                                <option value="">Pilih Cabang</option>
+
+                            </select>
+
+                        </div>
+                    </div>
+                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                        <label class="form-label max-w-56">
+                            CIF
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('cif') border-danger bg-danger-light @enderror" type="number"
+                                name="cif" value="">
+                            @error('cif')
+                                <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">
+                            Nomor Rekening
+                        </label>
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('nomor_rekening') border-danger bg-danger-light @enderror"
+                                type="number" name="nomor_rekening" value=""
+                                @error('nomor_rekening')
+                        <em class="alert text-danger text-sm"></em>
+                        @enderror
+                                </div>
+                        </div>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Nama Debitur
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <input class="input  @error('name') border-danger bg-danger-light @enderror" type="text"
+                                    name="name" value="">
+                                @error('name')
+                                    <em class="alert text-danger text-sm"></em>
+                                @enderror
+                            </div>
+                        </div>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                NPWP
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <input class="input  @error('npwp') border-danger bg-danger-light @enderror" type="number"
+                                    name="npwp" value="{{ $debitur->npwp ?? '' }}">
+                                @error('npwp')
+                                    <em class="alert text-danger text-sm"></em>
+                                @enderror
+                            </div>
+                        </div>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Email
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <input class="input  @error('email') border-danger bg-danger-light @enderror" type="email"
+                                    name="email" value="{{ $debitur->email ?? '' }}">
+                                @error('email')
+                                    <em class="alert text-danger text-sm"></em>
+                                @enderror
+                            </div>
+                        </div>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                No Handphone
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <input class="input  @error('phone') border-danger bg-danger-light @enderror" type="number"
+                                    name="phone" value="">
+                                @error('phone')
+                                    <em class="alert text-danger text-sm"></em>
+                                @enderror
+                            </div>
+                        </div>
+
+                        <div class="flex justify-end">
+                            <button type="submit" class="btn btn-primary">
+                                Save
+                            </button>
+                        </div>
+                </form>
+            </div>
+        </div>
+
+    </div>
+@endsection
diff --git a/resources/views/teams/form.blade.php b/resources/views/teams/form.blade.php
index 2070f8c..3f0ab33 100644
--- a/resources/views/teams/form.blade.php
+++ b/resources/views/teams/form.blade.php
@@ -78,7 +78,7 @@
                     </div>
 
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">Team Group</label>
+                        <label class="form-label max-w-56">Users</label>
                         <div class="flex flex-wrap items-baseline w-full">
                             <select class="input tomselect w-full border-danger bg-danger-light select2" name="user[]"
                                 multiple="multiple">
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index b850459..8638b9c 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -297,16 +297,21 @@
     });
 
 
-    Breadcrumbs::for('basicdata.jenispenilaian', function (BreadcrumbTrail $trail) {
+    Breadcrumbs::for('basicdata.jenis-penilaian', function (BreadcrumbTrail $trail) {
         $trail->parent('basicdata');
-        $trail->push('Jenis Penilaian', route('basicdata.jenispenilaian.index'));
+        $trail->push('Jenis Penilaian', route('basicdata.jenis-penilaian.index'));
     });
-    Breadcrumbs::for('basicdata.jenispenilaian.create', function (BreadcrumbTrail $trail) {
-        $trail->parent('basicdata.jenispenilaian');
-        $trail->push('Tambah Jenis Penilaian', route('basicdata.jenispenilaian.create'));
+    Breadcrumbs::for('basicdata.jenis-penilaian.create', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata.jenis-penilaian');
+        $trail->push('Tambah Jenis Penilaian', route('basicdata.jenis-penilaian.create'));
     });
 
-    Breadcrumbs::for('basicdata.jenispenilaian.edit', function (BreadcrumbTrail $trail) {
-        $trail->parent('basicdata.jenispenilaian');
+    Breadcrumbs::for('basicdata.jenis-penilaian.edit', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata.jenis-penilaian');
         $trail->push('Edit Jenis Penilaian');
     });
+
+    Breadcrumbs::for('basicdata.penilaian', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata');
+        $trail->push('Jenis Penilaian', route('basicdata.penilaian.index'));
+    });
diff --git a/routes/web.php b/routes/web.php
index fc30aa1..cc62d10 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -21,6 +21,7 @@ use Modules\Lpj\Http\Controllers\TujuanPenilaianController;
 use Modules\Lpj\Http\Controllers\RegionController;
 use Modules\Lpj\Http\Controllers\TeamsController;
 use Modules\Lpj\Http\Controllers\JenisPenilaianController;
+use Modules\Lpj\Http\Controllers\PenilaianController;
 
 /*
 |--------------------------------------------------------------------------
@@ -205,21 +206,39 @@ Route::middleware(['auth'])->group(function () {
             ],
         ]);
 
-        Route::name('jenispenilaian.')->prefix('jenispenilaian')->group(function () {
+        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('jenispenilaian', JenisPenilaianController::class, [
+        Route::resource('jenis-penilaian', JenisPenilaianController::class, [
             'names' => [
-                'index'   => 'jenispenilaian.index',
-                'show'    => 'jenispenilaian.show',
-                'create'  => 'jenispenilaian.create',
-                'store'   => 'jenispenilaian.store',
-                'edit'    => 'jenispenilaian.edit',
-                'update'  => 'jenispenilaian.update',
-                'destroy' => 'jenispenilaian.destroy',
+                '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::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::resource('penilaian', PenilaianController::class, [
+            'names' => [
+                'index'   => 'penilaian.index',
+                'show'    => 'penilaian.show',
+                'create'  => 'penilaian.create',
+                'store'   => 'penilaian.store',
+                'edit'    => 'penilaian.edit',
+                'update'  => 'penilaian.update',
+                'destroy' => 'penilaian.destroy',
             ],
         ]);
 

From 53ccf7de117854bcc44eb220b1dc2d29fe9ae7f4 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Fri, 13 Sep 2024 17:02:04 +0700
Subject: [PATCH 06/16] prerbaikan export dan penambahan role di team penilai

---
 .../Controllers/JenisPenilaianController.php  |   8 +-
 app/Http/Controllers/PenilaianController.php  | 103 +++-
 app/Http/Controllers/PermohonanController.php | 342 ++++++------
 app/Http/Controllers/TeamsController.php      |  65 ++-
 app/Http/Requests/TeamsRequest.php            |   2 +-
 app/Models/Penilaian.php                      |   8 +-
 ...24_08_12_023807_create_debitures_table.php |  54 --
 module.json                                   |   1 +
 .../views/jenis_penilaian/form.blade.php      |   2 +-
 resources/views/penilaian/form.blade.php      | 511 ++++++++++++++++++
 resources/views/penilaian/index.blade.php     | 354 ++++++++----
 resources/views/teams/form.blade.php          |  33 +-
 resources/views/teams/index.blade.php         |   4 +-
 routes/breadcrumbs.php                        |   7 +-
 routes/web.php                                |   1 +
 15 files changed, 1107 insertions(+), 388 deletions(-)
 delete mode 100644 database/migrations/2024_08_12_023807_create_debitures_table.php
 create mode 100644 resources/views/penilaian/form.blade.php

diff --git a/app/Http/Controllers/JenisPenilaianController.php b/app/Http/Controllers/JenisPenilaianController.php
index 3e16ce1..e70fcdb 100644
--- a/app/Http/Controllers/JenisPenilaianController.php
+++ b/app/Http/Controllers/JenisPenilaianController.php
@@ -10,6 +10,7 @@ use Modules\Lpj\Models\JenisPenilaian;
 use Modules\Lpj\Http\Requests\JenisPenilaianRequest;
 use Modules\Lpj\Exports\JenisPenilaianExport;
 use Maatwebsite\Excel\Facades\Excel;
+
 class JenisPenilaianController extends Controller
 {
     public $user;
@@ -59,14 +60,13 @@ class JenisPenilaianController extends Controller
     public function update(JenisPenilaianRequest $request, $id)
     {
 
-        $validate = $request->validate();
+        $validated  = $request->validated();
 
-        // dump($validate);
 
-        if ($validate) {
+        if ($validated) {
             try {
                 $jenisPenilaian = JenisPenilaian::find($id);
-                $jenisPenilaian->update($validate);
+                $jenisPenilaian->update($validated);
                 return redirect()->route('basicdata.jenis-penilaian.index')->with('success', 'Jenis Penilaian updated successfully');
             } catch (Exception $e) {
                 return redirect()->route('basicdata.jenis-penilaian.edit', $id)->with('error', $e->getMessage());
diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 831c163..2e9dd5c 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -6,6 +6,18 @@ use App\Http\Controllers\Controller;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Modules\Lpj\Models\StatusPermohonan;
+use Modules\Lpj\Models\Branch;
+use Modules\Lpj\Models\Debiture;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\TujuanPenilaian;
+use Modules\Lpj\Models\JenisPenilaian;
+use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\JenisJaminan;
+use Modules\Lpj\Models\NilaiPlafond;
+use Modules\Lpj\Models\JenisFasilitasKredit;
+
+
 
 class PenilaianController extends Controller
 {
@@ -14,15 +26,17 @@ class PenilaianController extends Controller
      */
     public function index()
     {
-        return view('lpj::penilaian.index');
+        $status_permohonan = StatusPermohonan::all();
+
+        return view('lpj::penilaian.index', compact('status_permohonan'));
     }
 
     /**
      * Show the form for creating a new resource.
      */
-    public function create()
+    public function create($id)
     {
-        return view('lpj::create');
+        return view('lpj::penilaian.form');
     }
 
     /**
@@ -46,7 +60,22 @@ class PenilaianController extends Controller
      */
     public function edit($id)
     {
-        return view('lpj::edit');
+
+        $permohonan = Permohonan::with(['user', 'debiture.province','debiture.city','debiture.district','debiture.village','branch', 'tujuanPenilaian'])->findOrFail($id);
+
+        $jenisPenilaian = JenisPenilaian::all();
+        $teamPenilai = Teams::with(['regions', 'teamsUsers'])->get();
+
+        $jenisJaminan = JenisJaminan::all();
+
+        $nilaiPlafond = NilaiPlafond::all();
+        $jenisFasilitas = JenisFasilitasKredit::all();
+
+
+
+
+
+        return view('lpj::penilaian.form', compact('permohonan', 'jenisPenilaian', 'teamPenilai', 'jenisJaminan', 'nilaiPlafond', 'jenisFasilitas'));
     }
 
     /**
@@ -64,4 +93,70 @@ class PenilaianController extends Controller
     {
         //
     }
+
+    public function dataForDatatables(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('debitur.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        // Retrieve data from the database
+        $query = Permohonan::query();
+
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = 0 + 1;
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
 }
diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php
index a6b3276..4c54795 100644
--- a/app/Http/Controllers/PermohonanController.php
+++ b/app/Http/Controllers/PermohonanController.php
@@ -1,182 +1,184 @@
 <?php
 
-    namespace Modules\Lpj\Http\Controllers;
+namespace Modules\Lpj\Http\Controllers;
 
-    use App\Http\Controllers\Controller;
-    use Exception;
-    use Illuminate\Http\Request;
-    use Maatwebsite\Excel\Facades\Excel;
-    use Modules\Lpj\Exports\PermohonanExport;
-    use Modules\Lpj\Http\Requests\PermohonanRequest;
-    use Modules\Lpj\Models\Branch;
-    use Modules\Lpj\Models\Debiture;
-    use Modules\Lpj\Models\Permohonan;
-    use Modules\Lpj\Models\StatusPermohonan;
-    use Modules\Lpj\Models\TujuanPenilaian;
+use App\Http\Controllers\Controller;
+use Exception;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Facades\Excel;
+use Modules\Lpj\Exports\PermohonanExport;
+use Modules\Lpj\Http\Requests\PermohonanRequest;
+use Modules\Lpj\Models\Branch;
+use Modules\Lpj\Models\Debiture;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\StatusPermohonan;
+use Modules\Lpj\Models\TujuanPenilaian;
 
-    class PermohonanController extends Controller
+class PermohonanController extends Controller
+{
+    public $user;
+
+    public function index()
     {
-        public $user;
+        return view('lpj::permohonan.index');
+    }
 
-        public function index()
-        {
-            return view('lpj::permohonan.index');
-        }
+    public function store(PermohonanRequest $request)
+    {
+        $validate = $request->validated();
 
-        public function store(PermohonanRequest $request)
-        {
-            $validate = $request->validated();
-
-            if ($validate) {
-                try {
-                    // Save to database qq
-                    Permohonan::create($validate);
-                    return redirect()
-                        ->route('permohonan.index')
-                        ->with('success', 'Permohonan created successfully');
-                } catch (Exception $e) {
-                    return redirect()
-                        ->route('permohonan.create')
-                        ->with('error', 'Failed to create permohonan' . $e->getMessage());
-                }
-            } else {
+        // dump($validate);
+        if ($validate) {
+            try {
+                // Save to database qq
+                Permohonan::create($validate);
+                return redirect()
+                    ->route('permohonan.index')
+                    ->with('success', 'Permohonan created successfully');
+            } catch (Exception $e) {
                 return redirect()
                     ->route('permohonan.create')
-                    ->with('success', 'error naon iye')
-                    ->withInput();
+                    ->with('error', 'Failed to create permohonan' . $e->getMessage());
             }
-        }
-
-        public function create(){
-
-            return view('lpj::permohonan.create');
-        }
-
-        public function createPermohonan($debitur)
-        {
-            $branches        = Branch::all();
-            $debitur         = Debiture::find($debitur);
-            $tujuanPenilaian = TujuanPenilaian::all();
-            $status          = StatusPermohonan::all();
-
-            return view('lpj::permohonan.form', compact('branches', 'debitur', 'tujuanPenilaian', 'status'));
-        }
-
-        public function edit($id)
-        {
-            $permohonan      = Permohonan::find($id);
-            $branches        = Branch::all();
-            $debitur       = Debiture::find($permohonan->debiture_id);
-            $tujuanPenilaian = TujuanPenilaian::all();
-            $status          = StatusPermohonan::all();
-
-            return view(
-                'lpj::permohonan.form',
-                compact('permohonan', 'branches', 'debitur', 'tujuanPenilaian', 'status'),
-            );
-        }
-
-        public function update(PermohonanRequest $request, $id)
-        {
-            $validate = $request->validated();
-
-            if ($validate) {
-                try {
-                    // Update in database
-                    $permohonan = Permohonan::find($id);
-                    $permohonan->update($validate);
-                    return redirect()
-                        ->route('permohonan.index')
-                        ->with('success', 'Permohonan updated successfully');
-                } catch (Exception $e) {
-                    return redirect()
-                        ->route('permohonan.edit', $id)
-                        ->with('error', 'Failed to update permohonan');
-                }
-            }
-        }
-
-        public function destroy($id)
-        {
-            try {
-                // Delete from database
-                $permohonan = Permohonan::find($id);
-                $permohonan->delete();
-
-                echo json_encode(['success' => true, 'message' => 'Permohonan deleted successfully']);
-            } catch (Exception $e) {
-                echo json_encode(['success' => false, 'message' => 'Failed to delete permohonan']);
-            }
-        }
-
-        public function dataForDatatables(Request $request)
-        {
-            if (is_null($this->user) || !$this->user->can('debitur.view')) {
-                //abort(403, 'Sorry! You are not allowed to view users.');
-            }
-
-            // Retrieve data from the database
-            $query = Permohonan::query();
-
-            // Apply search filter if provided
-            if ($request->has('search') && !empty($request->get('search'))) {
-                $search = $request->get('search');
-                $query->where(function ($q) use ($search) {
-                    $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
-                    $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
-                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
-                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
-                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
-                });
-            }
-
-            // Apply sorting if provided
-            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-                $order  = $request->get('sortOrder');
-                $column = $request->get('sortField');
-                $query->orderBy($column, $order);
-            }
-
-            // Get the total count of records
-            $totalRecords = $query->count();
-
-            // Apply pagination if provided
-            if ($request->has('page') && $request->has('size')) {
-                $page   = $request->get('page');
-                $size   = $request->get('size');
-                $offset = ($page - 1) * $size; // Calculate the offset
-
-                $query->skip($offset)->take($size);
-            }
-
-            // Get the filtered count of records
-            $filteredRecords = $query->count();
-
-            // Get the data for the current page
-            $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
-
-            // Calculate the page count
-            $pageCount = ceil($totalRecords / $request->get('size'));
-
-            // Calculate the current page number
-            $currentPage = 0 + 1;
-
-            // Return the response data as a JSON object
-            return response()->json([
-                'draw'            => $request->get('draw'),
-                'recordsTotal'    => $totalRecords,
-                'recordsFiltered' => $filteredRecords,
-                'pageCount'       => $pageCount,
-                'page'            => $currentPage,
-                'totalCount'      => $totalRecords,
-                'data'            => $data,
-            ]);
-        }
-
-        public function export()
-        {
-            return Excel::download(new PermohonanExport, 'permohonan.xlsx');
+        } else {
+            return redirect()
+                ->route('permohonan.create')
+                ->with('success', 'error naon iye')
+                ->withInput();
         }
     }
+
+    public function create()
+    {
+
+        return view('lpj::permohonan.create');
+    }
+
+    public function createPermohonan($debitur)
+    {
+        $branches        = Branch::all();
+        $debitur         = Debiture::find($debitur);
+        $tujuanPenilaian = TujuanPenilaian::all();
+        $status          = StatusPermohonan::all();
+
+        return view('lpj::permohonan.form', compact('branches', 'debitur', 'tujuanPenilaian', 'status'));
+    }
+
+    public function edit($id)
+    {
+        $permohonan      = Permohonan::find($id);
+        $branches        = Branch::all();
+        $debitur       = Debiture::find($permohonan->debiture_id);
+        $tujuanPenilaian = TujuanPenilaian::all();
+        $status          = StatusPermohonan::all();
+
+        return view(
+            'lpj::permohonan.form',
+            compact('permohonan', 'branches', 'debitur', 'tujuanPenilaian', 'status'),
+        );
+    }
+
+    public function update(PermohonanRequest $request, $id)
+    {
+        $validate = $request->validated();
+
+        if ($validate) {
+            try {
+                // Update in database
+                $permohonan = Permohonan::find($id);
+                $permohonan->update($validate);
+                return redirect()
+                    ->route('permohonan.index')
+                    ->with('success', 'Permohonan updated successfully');
+            } catch (Exception $e) {
+                return redirect()
+                    ->route('permohonan.edit', $id)
+                    ->with('error', 'Failed to update permohonan');
+            }
+        }
+    }
+
+    public function destroy($id)
+    {
+        try {
+            // Delete from database
+            $permohonan = Permohonan::find($id);
+            $permohonan->delete();
+
+            echo json_encode(['success' => true, 'message' => 'Permohonan deleted successfully']);
+        } catch (Exception $e) {
+            echo json_encode(['success' => false, 'message' => 'Failed to delete permohonan']);
+        }
+    }
+
+    public function dataForDatatables(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('debitur.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        // Retrieve data from the database
+        $query = Permohonan::query();
+
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = 0 + 1;
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
+
+    public function export()
+    {
+        return Excel::download(new PermohonanExport(), 'permohonan.xlsx');
+    }
+}
diff --git a/app/Http/Controllers/TeamsController.php b/app/Http/Controllers/TeamsController.php
index f52cf26..bf0a39b 100644
--- a/app/Http/Controllers/TeamsController.php
+++ b/app/Http/Controllers/TeamsController.php
@@ -38,7 +38,9 @@ class TeamsController extends Controller
 
         // cek user apakah sudah ada di tabel teams_users
         $userTeam = TeamsUsers::pluck('user_id')->toArray();
-        $user = User::whereNotIn('id', $userTeam)->get();
+        $user = User::whereNotIn('id', $userTeam)
+        ->with('roles')
+        ->get();
 
         return view('lpj::teams.form', compact('region', 'user'));
     }
@@ -97,8 +99,9 @@ class TeamsController extends Controller
 
         $region = Regions::all();
         $usedUsers = TeamsUsers::where('teams_id', '!=', $id)->pluck('user_id')->toArray();
-
-        $user = User::whereNotIn('id', $usedUsers)->get();
+        $user = User::whereNotIn('id', $usedUsers)
+        ->with('roles')
+        ->get();
         // Ambil user yang sudah ada di tim ini
         $selectedUsers = $teams->teamsUsers->pluck('user_id')->toArray();
 
@@ -169,20 +172,20 @@ class TeamsController extends Controller
         }
     }
 
-
     public function dataForDatatables(Request $request)
     {
-        if (is_null($this->user) || !$this->user->can('debitur.view')) {
+        if (is_null($this->user) || !$this->user->can('teams.view')) {
             //abort(403, 'Sorry! You are not allowed to view users.');
         }
 
+        // Inisialisasi query
         $query = Teams::select('teams.id as id', 'teams.name as team_name', 'regions.name as region_name')
             ->join('regions', 'teams.regions_id', '=', 'regions.id')
             ->leftJoin('teams_users', 'teams.id', '=', 'teams_users.teams_id')
             ->leftJoin('users', 'teams_users.user_id', '=', 'users.id')
-            ->addSelect('users.name as user_name');
+            ->addSelect('users.id as user_id', 'users.name as user_name');
 
-        // search filter
+        // Filter pencarian
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');
             $query->where(function ($q) use ($search) {
@@ -192,41 +195,43 @@ class TeamsController extends Controller
             });
         }
 
-        // sorting
+        // 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();
 
-        $size = $request->get('size');
-        $pageCount = 1;
+        // Pagination
+        $size = $request->get('size', 10);
+        $page = $request->get('page', 1);
+        $offset = ($page - 1) * $size;
 
-        if ($size > 0) {
-            if ($request->has('page') && $request->has('size')) {
-                $page = $request->get('page');
-                $offset = ($page - 1) * $size;
-                $query->skip($offset)->take($size);
-                $filteredRecords = $query->count();
-                $pageCount = ceil($totalRecords / $size);
-            }
+        // Ambil data dengan pagination
+        $data = $query->skip($offset)->take($size)->get();
+        $filteredRecords = $data->count();
+        $pageCount = ceil($totalRecords / $size);
 
-            $data = $query->get();
-        } else {
-            $filteredRecords = $totalRecords;
-            $data = $query->get();
-        }
+        // Ambil ID pengguna dari hasil query
+        $userIds = $data->pluck('user_id')->unique();
 
-        $currentPage = $request->get('page') ?? 1;
+        // Ambil data pengguna dengan peran mereka
+        $users = User::whereIn('id', $userIds)
+            ->with('roles')
+            ->get()
+            ->keyBy('id');
 
-        $formattedData = $data->groupBy('id')->map(function ($group) {
+        // Format data
+        $formattedData = $data->groupBy('id')->map(function ($group) use ($users) {
             $team = $group->first();
-            $team->user_team = $group->map(function ($item) {
+            $team->user_team = $group->map(function ($item) use ($users) {
+                $user = $users->get($item->user_id);
                 return [
                     'nama' => $item->user_name,
-                    // 'role' => $item->role_name,
+                    'roles' => $user ? $user->roles->pluck('name')->toArray() : [],
                 ];
             })->toArray();
             return $team;
@@ -237,16 +242,18 @@ class TeamsController extends Controller
             'recordsTotal'    => $totalRecords,
             'recordsFiltered' => $filteredRecords,
             'pageCount'       => $pageCount,
-            'page'            => $currentPage,
+            'page'            => $page,
             'totalCount'      => $totalRecords,
             'data'            => $formattedData
         ]);
     }
 
 
+
+
     public function export()
     {
-        return Excel::download(new TeamPenilaianExport, 'team-penilai.xlsx');
+        return Excel::download(new TeamPenilaianExport(), 'team-penilai.xlsx');
     }
 
 
diff --git a/app/Http/Requests/TeamsRequest.php b/app/Http/Requests/TeamsRequest.php
index 0f1be4b..c77f4a5 100644
--- a/app/Http/Requests/TeamsRequest.php
+++ b/app/Http/Requests/TeamsRequest.php
@@ -14,7 +14,7 @@ class TeamsRequest extends FormRequest
         $rules = [
             'name'              => 'required|string|max:255',
             'status'            => 'nullable|boolean',
-            'regions_id'         => 'nullable|exists:regions,id',
+            'regions_id'         => 'required|nullable|exists:regions,id',
             'user.*'            => 'nullable|exists:users,id',
             'authorized_at'     => 'nullable|datetime',
             'authorized_status' => 'nullable|string|max:1',
diff --git a/app/Models/Penilaian.php b/app/Models/Penilaian.php
index e4d6bdd..b3620db 100644
--- a/app/Models/Penilaian.php
+++ b/app/Models/Penilaian.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\PenilaianFactory;
 use Modules\Lpj\Models\JenisPenilaian;
 use Modules\Lpj\Models\Teams;
-// use Modules\Usermanagement\Models\User;
+use Modules\Usermanagement\Models\User;
 
 class Penilaian extends Model
 {
@@ -30,9 +30,9 @@ class Penilaian extends Model
         return $this->belongsTo(Teams::class, 'team_id', 'id');
     }
 
-    // public function users(){
-    //     return $this->belongsTo(User::class, 'user_id', 'id');
-    // }
+    public function users(){
+        return $this->belongsTo(User::class, 'user_id', 'id');
+    }
 
 
 }
diff --git a/database/migrations/2024_08_12_023807_create_debitures_table.php b/database/migrations/2024_08_12_023807_create_debitures_table.php
deleted file mode 100644
index 583c859..0000000
--- a/database/migrations/2024_08_12_023807_create_debitures_table.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-    use Illuminate\Database\Migrations\Migration;
-    use Illuminate\Database\Schema\Blueprint;
-    use Illuminate\Support\Facades\Schema;
-    use Modules\Lpj\Models\Branch;
-
-    return new class extends Migration {
-        /**
-         * Run the migrations.
-         */
-        public function up()
-        : void
-        {
-            Schema::create('debitures', function (Blueprint $table) {
-                $table->id();
-                $table->foreignIdFor(Branch::class)->constrained()->onDelete('cascade');
-                $table->string('cif', 10)->unique();
-                $table->string('name');
-                $table->date('registered_at')->nullable();
-                $table->string('npwp', 16)->nullable();
-                $table->string('nomor_id', 16)->nullable();
-                $table->string('email', 100)->nullable();
-                $table->string('phone', 15)->nullable();
-                $table->string('nomor_rekening', 50)->nullable();
-                $table->string('province_code')->nullable()->index();
-                $table->string('city_code')->nullable()->index();
-                $table->string('district_code')->nullable()->index();
-                $table->string('village_code')->nullable()->index();
-                $table->string('postal_code', 5)->nullable();
-                $table->text('address')->nullable();
-
-                $table->boolean('status')->default(true)->nullable();
-                $table->timestamps();
-                $table->timestamp('authorized_at')->nullable();
-                $table->char('authorized_status', 1)->nullable();
-                $table->softDeletes();
-
-                $table->unsignedBigInteger('created_by')->nullable();
-                $table->unsignedBigInteger('updated_by')->nullable();
-                $table->unsignedBigInteger('deleted_by')->nullable();
-                $table->unsignedBigInteger('authorized_by')->nullable();
-            });
-        }
-
-        /**
-         * Reverse the migrations.
-         */
-        public function down()
-        : void
-        {
-            Schema::dropIfExists('debitures');
-        }
-    };
diff --git a/module.json b/module.json
index e3efca9..9b93b6e 100644
--- a/module.json
+++ b/module.json
@@ -20,6 +20,7 @@
                 "permission": "",
                 "roles": [
                     "Administrator"
+                    
                 ]
             },
             {
diff --git a/resources/views/jenis_penilaian/form.blade.php b/resources/views/jenis_penilaian/form.blade.php
index 3fd6197..9571d8f 100644
--- a/resources/views/jenis_penilaian/form.blade.php
+++ b/resources/views/jenis_penilaian/form.blade.php
@@ -13,7 +13,7 @@
 
             @if (isset($jenisPenilaian->id))
                 @method('PUT')
-                <input type="text" name="id" value="{{ $jenisPenilaian->id }}">
+                <input type="hidden" name="id" value="{{ $jenisPenilaian->id }}">
             @endif
 
             @csrf
diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php
new file mode 100644
index 0000000..7f094c9
--- /dev/null
+++ b/resources/views/penilaian/form.blade.php
@@ -0,0 +1,511 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+
+@push('styles')
+    <style>
+        .divider {
+            border: none;
+            height: 1px;
+            background-color: #ddd;
+            margin: 20px 0;
+        }
+
+        .h1 {
+            font-size: 16px;
+            font-weight: 600;
+            margin-bottom: 10px;
+        }
+    </style>
+@endpush
+
+
+@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">
+                <h3 class="card-title">
+                    Form Data Jaminan
+                </h3>
+                <div class="flex items-center gap-2">
+                    <a href="{{ route('basicdata.penilaian.index') }}" class="btn btn-xs btn-info"><i
+                            class="ki-filled ki-exit-left"></i>
+                        Back</a>
+                </div>
+            </div>
+            <div class="card-body">
+
+                <form action="" method="POST" class="">
+                    <div class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-5 lg:gap-7.5">
+                        <div class="grid gap-2.5">
+                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-24">
+                                    Nomor Registrasi
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+
+                                    <input class="input  @error('nomor_registrasi') border-danger bg-danger-light @enderror"
+                                        type="text" name="nomor_registrasi" 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-12">
+                                    Nama Pemohon
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                        type="text" name="cif" value="{{ $permohonan->user->name }}">
+                                </div>
+                            </div>
+
+                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-12">
+                                    Tanggal Pemohon
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                        type="date" name="cif" value="{{ $permohonan->tanggal_permohonan }}">
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="grid gap-2.5">
+                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label ">
+                                    Status
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                        type="text" name="cif" value="{{ $permohonan->status }}">
+                                </div>
+                            </div>
+
+                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label">
+                                    Cabang Pemohon
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                        type="text" name="cif" value="{{ $permohonan->branch->name }}">
+                                </div>
+                            </div>
+
+                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-24">
+                                    Cabang Penilai
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                        type="number" name="cif" value="">
+                                </div>
+                            </div>
+                        </div>
+
+
+                        <div class="grid gap-2.5">
+                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-24">
+                                    Nomor Registrasi cabang
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                        type="number" name="cif" value="">
+                                </div>
+                            </div>
+
+                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-24">
+                                    Nama Bagian
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                        type="number" name="cif" value="">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    </br>
+                    <div class="divider"></div>
+                    <div class="grid gap-5">
+                        <div>
+                            <h1 class="h1">1. IDENTITAS DEBITUR</h1>
+                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Nama Debitur
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                            type="text" name="cif" value="{{ $permohonan->debiture->name }}">
+                                    </div>
+                                </div>
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Alamat
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <p>
+                                            {{ $permohonan->debiture->address . ' ' . $permohonan->debiture->village->name . ', ' . $permohonan->debiture->district->name . ', ' . $permohonan->debiture->city->name . ', ' . $permohonan->debiture->province->name . ' ' . '(' . $permohonan->debiture->postal_code . ')' }}
+
+                                        </p>
+                                    </div>
+                                </div>
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Nomor Cif
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                            type="number" name="cif" value="{{ $permohonan->debiture->cif }}">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div>
+                            <h1 class="h1">2. LETAK JAMINAN</h1>
+                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Alamat jaminan
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <textarea class="textarea  @error('cif') border-danger bg-danger-light  @enderror" rows="3" type="number"
+                                            name="cif" value=""></textarea>
+                                    </div>
+                                </div>
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Kode Dati II
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <section class="input w-full">
+                                            <option value="">1</option>
+                                        </section>
+                                    </div>
+                                </div>
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Debitur/Wakil Debitur
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                            type="number" name="cif" value="">
+                                    </div>
+                                </div>
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Telepon
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input class="input  @error('cif') border-danger bg-danger-light @enderror"
+                                            type="number" name="cif" value="">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div>
+                            <h1 class="h1">3. FASILITAS KREDIT</h1>
+                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
+
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Jenis Fasilitas
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <select
+                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
+                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                            @foreach ($jenisFasilitas as $item)
+                                                <option value="">{{ $item->name }}</option>
+                                            @endforeach
+
+                                        </select>
+                                        @error('tujuan_penilaian_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">
+                                        Nilai Plafond
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <select
+                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
+                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                            @foreach ($nilaiPlafond as $item)
+                                                <option value="">{{ $item->name }}</option>
+                                            @endforeach
+
+                                        </select>
+                                        @error('tujuan_penilaian_id')
+                                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+
+
+                        <div>
+                            <h1 class="h1">4. TUJUAN PENILAIAN</h1>
+                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Jenis jaminan
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <select
+                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
+                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                            <option value="">{{ $permohonan->tujuanPenilaian->name }}</option>
+
+                                        </select>
+                                        @error('tujuan_penilaian_id')
+                                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div>
+                            <h1 class="h1">5. JENIS JAMINAN</h1>
+                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Jenis jaminan
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <select
+                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
+                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                            @foreach ($jenisJaminan as $item)
+                                                <option value="{{ $item->id }}">{{ $item->name }}</option>
+                                            @endforeach
+                                        </select>
+                                        @error('tujuan_penilaian_id')
+                                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+
+                        <div>
+                            <h1 class="h1">6. TIPE JAMINAN</h1>
+                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        tipe jaminan
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <select
+                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
+                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                            @foreach ($jenisJaminan as $item)
+                                                <option value="{{ $item->id }}">{{ $item->name }}</option>
+                                            @endforeach
+                                        </select>
+                                        @error('tujuan_penilaian_id')
+                                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
+
+
+                            </div>
+                        </div>
+
+                        <div>
+                            <h1 class="h1">7. DATA-DATA</h1>
+                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5 border">
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"">
+                                    <label class="form-label max-w-56 ">
+                                        Update By
+                                    </label>
+                                    <div class="flex flex-col lg:flex-row gap-2 w-full">
+                                        <div class="flex flex-col lg:flex-row gap-2 w-full">
+                                            <div class="flex flex-wrap items-baseline w-full">
+                                                <input
+                                                    class="input  @error('user') border-danger bg-danger-light @enderror"
+                                                    type="text" name="user" value="">
+                                                @error('province_code')
+                                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                                @enderror
+                                            </div>
+                                            <div class="flex flex-wrap items-baseline w-full">
+                                                <input
+                                                    class="input  @error('update_at') border-danger bg-danger-light @enderror"
+                                                    type="text" name="update_at" value="">
+                                                @error('city_code')
+                                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                                @enderror
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+
+                                </div>
+
+                            </div>
+                        </div>
+
+                        <div>
+                            <h1 class="h1">6. TIPE JAMINAN</h1>
+                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5 p-5">
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Penilai yang Dilakukan oleh
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <select
+                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
+                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                            @foreach ($jenisPenilaian as $item)
+                                                <option value="{{ $item->id }}">{{ $item->name }}</option>
+                                            @endforeach
+                                        </select>
+                                        @error('tujuan_penilaian_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">
+                                        Tim Penilai yang di tunjuk
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <select
+                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
+                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                            @foreach ($teamPenilai as $item)
+                                                <option value="{{ $item->id }}">{{ $item->regions->name }}</option>
+                                            @endforeach
+                                        </select>
+                                        @error('tujuan_penilaian_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">
+                                        Penilai yang di tunjuk
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input
+                                            class="input  @error('tanggal_kunjungan') border-danger bg-danger-light @enderror"
+                                            type="text" name="penilai_tunjuk" value="">
+                                    </div>
+                                </div>
+
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Jadwal Kunjungan
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input
+                                            class="input  @error('tanggal_kunjungan') border-danger bg-danger-light @enderror"
+                                            type="date" name="tanggal_kunjungan" value="">
+                                    </div>
+                                </div>
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Tanggal
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input
+                                            class="input  @error('tanggal_kunjungan') border-danger bg-danger-light @enderror"
+                                            type="date" name="tanggal_kunjungan" value="">
+                                    </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('keterangan') border-danger bg-danger-light  @enderror" rows="3"
+                                            type="text" name="keterangan" value=""></textarea>
+                                    </div>
+                                </div>
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"">
+                                    <label class="form-label max-w-56 ">
+                                        Update By
+                                    </label>
+                                    <div class="flex flex-col lg:flex-row gap-2 w-full">
+                                        <div class="flex flex-col lg:flex-row gap-2 w-full">
+                                            <div class="flex flex-wrap items-baseline w-full">
+                                                <input
+                                                    class="input  @error('user') border-danger bg-danger-light @enderror"
+                                                    type="text" name="user" value="">
+                                                @error('province_code')
+                                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                                @enderror
+                                            </div>
+                                            <div class="flex flex-wrap items-baseline w-full">
+                                                <input
+                                                    class="input  @error('update_at') border-danger bg-danger-light @enderror"
+                                                    type="text" name="update_at" value="">
+                                                @error('city_code')
+                                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                                @enderror
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+
+                    </div>
+
+                    <div class="divider"></div>
+                    <div class="flex justify-end gap-2">
+                        <button type="submit" class="btn btn-primary">
+                            Save
+                        </button>
+
+                        <button type="submit" class="btn btn-info">
+                            Assign
+                        </button>
+
+                        <button type="submit" class="btn btn-light">
+                            Print From
+                        </button>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+    </div>
+@endsection
diff --git a/resources/views/penilaian/index.blade.php b/resources/views/penilaian/index.blade.php
index cfd8309..8bbb9e8 100644
--- a/resources/views/penilaian/index.blade.php
+++ b/resources/views/penilaian/index.blade.php
@@ -1,128 +1,262 @@
 @extends('layouts.main')
 
 @section('breadcrumbs')
-    {{-- {{ Breadcrumbs::render('penilaian') }} --}}
+    {{ Breadcrumbs::render('basicdata.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-header" id="basic_settings">
-                <h3 class="card-title">
-                    {{ isset($debitur->id) ? 'Edit' : 'Tambah' }} Debitur
-                </h3>
-                <div class="flex items-center gap-2">
-                    @if (isset($debitur->id))
-                        <a class="btn btn-sm btn-primary" href="{{ route('permohonan.create.debitur', $debitur->id) }}"> Buat
-                            Permohonan </a>
+                <div class="card-title flex flex-row gap-1.5">
+                    @if (isset($status_permohonan))
+                        @foreach ($status_permohonan as $item)
+                            <a href="" class="btn btn-xs btn-outline btn-primary"> {{ $item->name }} </a>
+                        @endforeach
                     @endif
-                    <a href="{{ route('debitur.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
-                        Back</a>
+                </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('permohonan.datatables') }}">
+                <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 Permohonan" 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>
+                            <a class="btn btn-sm btn-primary" href="{{ route('permohonan.create') }}"> Tambah Permohonan </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
+
+{{-- @section('content')
+    <div class="grid">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="penilaian-table" data-api-url="{{ route('basicdata.penilaian.datatables') }}">
+            <div class="card-header py-5 flex-wrap">
+                <h3 class="card-title">
+                    Daftar penilaian
+                </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('basicdata.penilaian.export') }}"> Export to Excel </a>
+                        <a class="btn btn-sm btn-primary" href="{{ route('basicdata.penilaian.create') }}"> Tambah penilaian </a>
+                    </div>
                 </div>
             </div>
             <div class="card-body">
-
-                <form action="" method="POST" class="grid gap-5">
-                    {{-- @if (isset($debitur->id))
-                    @method('PUT')
-                @endif
-                @csrf --}}
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Cabang
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <select
-                                class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
-                                name="branch_id" id="branch_id">
-                                <option value="">Pilih Cabang</option>
-
-                            </select>
-
+                <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-[250px]" data-datatable-column="code">
+                                <span class="sort"> <span class="sort-label"> Code </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[250px]" data-datatable-column="name">
+                                <span class="sort"> <span class="sort-label"> penilaian </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 class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            CIF
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('cif') border-danger bg-danger-light @enderror" type="number"
-                                name="cif" value="">
-                            @error('cif')
-                                <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">
-                            Nomor Rekening
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('nomor_rekening') border-danger bg-danger-light @enderror"
-                                type="number" name="nomor_rekening" value=""
-                                @error('nomor_rekening')
-                        <em class="alert text-danger text-sm"></em>
-                        @enderror
-                                </div>
-                        </div>
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Nama Debitur
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input  @error('name') border-danger bg-danger-light @enderror" type="text"
-                                    name="name" value="">
-                                @error('name')
-                                    <em class="alert text-danger text-sm"></em>
-                                @enderror
-                            </div>
-                        </div>
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                NPWP
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input  @error('npwp') border-danger bg-danger-light @enderror" type="number"
-                                    name="npwp" value="{{ $debitur->npwp ?? '' }}">
-                                @error('npwp')
-                                    <em class="alert text-danger text-sm"></em>
-                                @enderror
-                            </div>
-                        </div>
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Email
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input  @error('email') border-danger bg-danger-light @enderror" type="email"
-                                    name="email" value="{{ $debitur->email ?? '' }}">
-                                @error('email')
-                                    <em class="alert text-danger text-sm"></em>
-                                @enderror
-                            </div>
-                        </div>
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                No Handphone
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input  @error('phone') border-danger bg-danger-light @enderror" type="number"
-                                    name="phone" value="">
-                                @error('phone')
-                                    <em class="alert text-danger text-sm"></em>
-                                @enderror
-                            </div>
-                        </div>
-
-                        <div class="flex justify-end">
-                            <button type="submit" class="btn btn-primary">
-                                Save
-                            </button>
-                        </div>
-                </form>
+                </div>
             </div>
         </div>
-
     </div>
-@endsection
+@endsection --}}
+
+
+
+@push('scripts')
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></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(`basic-data/penilaian/${data}`, {
+                        type: 'DELETE'
+                    }).then((response) => {
+                        swal.fire('Deleted!', 'User has been deleted.', 'success').then(() => {
+                            window.location.reload();
+                        });
+                    }).catch((error) => {
+                        console.error('Error:', error);
+                        Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
+                    });
+                }
+            })
+        }
+    </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-info" href="basic-data/penilaian/${data.id}/edit">
+                                <i class="ki-outline ki-notepad-edit"></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
diff --git a/resources/views/teams/form.blade.php b/resources/views/teams/form.blade.php
index 3f0ab33..6301281 100644
--- a/resources/views/teams/form.blade.php
+++ b/resources/views/teams/form.blade.php
@@ -57,9 +57,10 @@
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">Region</label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <select class="input tomselect w-full border-danger bg-danger-light" name="regions_id">
+                            <select
+                                class="input tomselect w-full @error('regions_id') border-danger bg-danger-light  @enderror"
+                                name="regions_id">
                                 <option value="">Select Region</option>
-
                                 @if (isset($region))
                                     @foreach ($region as $regions)
                                         @if (isset($teams))
@@ -71,31 +72,45 @@
                                         @endif
                                     @endforeach
                                 @endif
-
-
                             </select>
+
+                            @error('regions_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">Users</label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <select class="input tomselect w-full border-danger bg-danger-light select2" name="user[]"
-                                multiple="multiple">
+                            <select
+                                class="input tomselect w-full @error('regions_id') border-danger bg-danger-light @enderror  select2"
+                                name="user[]" multiple="multiple">
                                 <option value="">Select Team Group</option>
                                 @if (isset($user))
                                     @foreach ($user as $users)
                                         @if (isset($teams))
                                             <option value="{{ $users->id }}"
                                                 {{ in_array($users->id, $selectedUsers) ? 'selected' : '' }}>
-                                                {{ $users->name }}</option>
+                                                {{ $users->name . ' | ' }}
+                                                @foreach ($users->roles as $role)
+                                                    {{ $role->name }}
+                                                @endforeach
+                                            </option>
                                         @else
-                                            <option value="{{ $users->id }}">{{ $users->name }}</option>
+                                            <option value="{{ $users->id }}">{{ $users->name . ' | ' }}
+
+                                                @foreach ($users->roles as $role)
+                                                    {{ $role->name }}
+                                                @endforeach
+                                            </option>
                                         @endif
                                     @endforeach
                                 @endif
-
                             </select>
+                            @error('user')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
                         </div>
                     </div>
 
diff --git a/resources/views/teams/index.blade.php b/resources/views/teams/index.blade.php
index dff81d8..de782ec 100644
--- a/resources/views/teams/index.blade.php
+++ b/resources/views/teams/index.blade.php
@@ -141,7 +141,9 @@
                     title: 'User Team',
                     render: (item, data) => {
                         if (data.user_team && data.user_team.length) {
-                            return `<ul>${data.user_team.map(user => `<li>${user.nama}</li>`).join('')}</ul>`;
+                            return `<ul>${data.user_team.map(user =>
+                `<li>${user.nama} | ${user.roles.join(', ')}</li>`
+            ).join('')}</ul>`;
                         } else {
                             return '<ul><li>N/A</li></ul>';
                         }
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 8638b9c..5b39fe9 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -311,7 +311,12 @@
         $trail->push('Edit Jenis Penilaian');
     });
 
+
     Breadcrumbs::for('basicdata.penilaian', function (BreadcrumbTrail $trail) {
         $trail->parent('basicdata');
-        $trail->push('Jenis Penilaian', route('basicdata.penilaian.index'));
+        $trail->push('Penilaian', route('basicdata.penilaian.index'));
+    });
+    Breadcrumbs::for('basicdata.penilaian.edit', function (BreadcrumbTrail $trail) {
+        $trail->parent('basicdata.penilaian');
+        $trail->push('Buat Penilaian');
     });
diff --git a/routes/web.php b/routes/web.php
index 9a1da7b..e26f7c6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -285,4 +285,5 @@ Route::middleware(['auth'])->group(function () {
     });
 
     Route::resource('debitur', DebitureController::class);
+
 });

From eb92e1b8f76823457438def959c237c90cc65e21 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 18 Sep 2024 17:40:24 +0700
Subject: [PATCH 07/16] penambahan form assign so

---
 app/Http/Controllers/PenilaianController.php  | 205 +++---
 app/Http/Requests/PenilaianRequest.php        |  16 +-
 app/Models/Penilaian.php                      |   4 +-
 ...24_09_05_070712_create_penilaian_table.php |   6 +-
 module.json                                   |  21 +-
 resources/views/penilaian/form.blade.php      | 620 +++++-------------
 resources/views/penilaian/index.blade.php     | 111 +---
 routes/breadcrumbs.php                        |   8 +-
 routes/web.php                                |  65 +-
 9 files changed, 366 insertions(+), 690 deletions(-)

diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index 2e9dd5c..194cde6 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -13,11 +13,16 @@ use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\TujuanPenilaian;
 use Modules\Lpj\Models\JenisPenilaian;
 use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\TeamsUsers;
+use Modules\Lpj\Models\Penilaian;
 use Modules\Lpj\Models\JenisJaminan;
 use Modules\Lpj\Models\NilaiPlafond;
 use Modules\Lpj\Models\JenisFasilitasKredit;
-
-
+use Modules\Usermanagement\Models\User;
+use Modules\Lpj\Http\Requests\PenilaianRequest;
+use Modules\Lpj\Models\DetailDokumenJaminan;
+use Modules\Lpj\Models\DokumenJaminan;
+use Modules\Lpj\Exports\PermohonanExport;
 
 class PenilaianController extends Controller
 {
@@ -42,11 +47,28 @@ class PenilaianController extends Controller
     /**
      * Store a newly created resource in storage.
      */
-    public function store(Request $request): RedirectResponse
+    public function store(PenilaianRequest $request)
     {
-        //
+        $validatedData = $request->validated();
+
+        if ($validatedData) {
+            try {
+
+                $penilaian = Penilaian::create($validatedData);
+
+                $permohonan = Permohonan::findOrFail($request->permohonan_id);
+                $permohonan->update([
+                    'status' => 'assign',
+                ]);
+
+                return redirect()->route('penilaian.index')->with('success', 'Penilaian berhasil disimpan');
+            } catch (Exception $e) {
+                return redirect()->route('penilaian.index')->with('error', $e->getMessage());
+            }
+        }
     }
 
+
     /**
      * Show the specified resource.
      */
@@ -66,26 +88,36 @@ class PenilaianController extends Controller
         $jenisPenilaian = JenisPenilaian::all();
         $teamPenilai = Teams::with(['regions', 'teamsUsers'])->get();
 
-        $jenisJaminan = JenisJaminan::all();
+        $penilaian = Penilaian::where('permohonan_id', $id)->first();
 
-        $nilaiPlafond = NilaiPlafond::all();
-        $jenisFasilitas = JenisFasilitasKredit::all();
-
-
-
-
-
-        return view('lpj::penilaian.form', compact('permohonan', 'jenisPenilaian', 'teamPenilai', 'jenisJaminan', 'nilaiPlafond', 'jenisFasilitas'));
+        return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian'));
     }
 
     /**
      * Update the specified resource in storage.
      */
-    public function update(Request $request, $id): RedirectResponse
+    public function update(PenilaianRequest $request, $id)
     {
-        //
+        $validate = $request->validated();
+
+        if ($validate) {
+            try {
+                $penilaian = Penilaian::where('permohonan_id', $id)->firstOrFail();
+
+                $penilaian->update($validate);
+                $permohonan = Permohonan::findOrFail($id);
+                $permohonan->update([
+                    'status' => 'assign',
+                ]);
+
+                return redirect()->route('penilaian.index', $id)->with('success', 'Penilaian berhasil diubah');
+            } catch (Exception $e) {
+                return redirect()->route('penilaian.index', $id)->with('error', $e->getMessage());
+            }
+        }
     }
 
+
     /**
      * Remove the specified resource from storage.
      */
@@ -95,68 +127,85 @@ class PenilaianController extends Controller
     }
 
     public function dataForDatatables(Request $request)
-    {
-        if (is_null($this->user) || !$this->user->can('debitur.view')) {
-            //abort(403, 'Sorry! You are not allowed to view users.');
-        }
-
-        // Retrieve data from the database
-        $query = Permohonan::query();
-
-        // Apply search filter if provided
-        if ($request->has('search') && !empty($request->get('search'))) {
-            $search = $request->get('search');
-            $query->where(function ($q) use ($search) {
-                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhere('status', 'LIKE', '%' . $search . '%');
-            });
-        }
-
-        // Apply sorting if provided
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField');
-            $query->orderBy($column, $order);
-        }
-
-        // Get the total count of records
-        $totalRecords = $query->count();
-
-        // Apply pagination if provided
-        if ($request->has('page') && $request->has('size')) {
-            $page   = $request->get('page');
-            $size   = $request->get('size');
-            $offset = ($page - 1) * $size; // Calculate the offset
-
-            $query->skip($offset)->take($size);
-        }
-
-        // Get the filtered count of records
-        $filteredRecords = $query->count();
-
-        // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
-
-        // Calculate the page count
-        $pageCount = ceil($totalRecords / $request->get('size'));
-
-        // Calculate the current page number
-        $currentPage = 0 + 1;
-
-        // Return the response data as a JSON object
-        return response()->json([
-            'draw'            => $request->get('draw'),
-            'recordsTotal'    => $totalRecords,
-            'recordsFiltered' => $filteredRecords,
-            'pageCount'       => $pageCount,
-            'page'            => $currentPage,
-            'totalCount'      => $totalRecords,
-            'data'            => $data,
-        ]);
+{
+    if (is_null($this->user) || !$this->user->can('debitur.view')) {
+        // abort(403, 'Sorry! You are not allowed to view users.');
     }
+
+
+    $query = Permohonan::query();
+
+    if ($request->has('search') && !empty($request->get('search'))) {
+        $search = $request->get('search');
+        $query->where(function ($q) use ($search) {
+            $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+            $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+            $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+            $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+            $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+            $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+            $q->orWhere('status', 'LIKE', '%' . $search . '%');
+        });
+    }
+
+    // Filter to show only records with status 'register'
+    $query->where('status', 'register');
+
+
+    if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+        $order  = $request->get('sortOrder');
+        $column = $request->get('sortField');
+        $query->orderBy($column, $order);
+    }
+
+    $totalRecords = $query->count();
+
+    // Apply pagination if provided
+    if ($request->has('page') && $request->has('size')) {
+        $page   = $request->get('page');
+        $size   = $request->get('size');
+        $offset = ($page - 1) * $size; // Calculate the offset
+
+        $query->skip($offset)->take($size);
+    }
+
+    $filteredRecords = $query->count();
+
+    $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+
+    $pageCount = ceil($totalRecords / $request->get('size'));
+
+    $currentPage = $page;
+
+
+    return response()->json([
+        'draw'            => $request->get('draw'),
+        'recordsTotal'    => $totalRecords,
+        'recordsFiltered' => $filteredRecords,
+        'pageCount'       => $pageCount,
+        'page'            => $currentPage,
+        'totalCount'      => $totalRecords,
+        'data'            => $data,
+    ]);
+}
+
+
+
+
+
+    public function getUserTeams($id)
+    {
+
+        $teamsUser = TeamsUsers::where('teams_id', $id)->get();
+        $userIds = $teamsUser->pluck('user_id');
+        $users = User::whereIn('id', $userIds)->get();
+
+        if ($users->isNotEmpty()) {
+            return response()->json($users, 200);
+        }
+
+        return response()->json([], 200);
+    }
+
+
 }
diff --git a/app/Http/Requests/PenilaianRequest.php b/app/Http/Requests/PenilaianRequest.php
index 8b29d51..6be90ac 100644
--- a/app/Http/Requests/PenilaianRequest.php
+++ b/app/Http/Requests/PenilaianRequest.php
@@ -12,7 +12,13 @@ class PenilaianRequest extends FormRequest
     public function rules(): array
     {
         return [
-            //
+            'jenis_penilaian_id' => 'required|max:255',
+            'teams_id'           => 'required|max:255',
+            'user_id'            => 'required|max:255',
+            'tanggal_kunjungan'  => 'required|max:255',
+            'status'             => 'required|max:10',
+            'keterangan'         => 'nullable',
+            'permohonan_id'      => 'required',
         ];
     }
 
@@ -23,4 +29,12 @@ class PenilaianRequest extends FormRequest
     {
         return true;
     }
+
+    protected function prepareForValidation()
+    {
+        // Menetapkan nilai default untuk 'status' jika tidak ada dalam request
+        $this->merge([
+            'status' => $this->status ?? 'assign',
+        ]);
+    }
 }
diff --git a/app/Models/Penilaian.php b/app/Models/Penilaian.php
index b3620db..34a5098 100644
--- a/app/Models/Penilaian.php
+++ b/app/Models/Penilaian.php
@@ -17,7 +17,7 @@ class Penilaian extends Model
      */
     protected $table = 'penilaian';
     protected $fillable = [
-        'jenis_penilaian_id', 'team_id', 'user_id', 'tanggal_kunjungan', 'keterangan',
+        'jenis_penilaian_id', 'teams_id', 'user_id', 'tanggal_kunjungan', 'keterangan','permohonan_id',
         'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_at',
         'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
     ];
@@ -27,7 +27,7 @@ class Penilaian extends Model
     }
 
     public function teams(){
-        return $this->belongsTo(Teams::class, 'team_id', 'id');
+        return $this->belongsTo(Teams::class, 'teams_id', 'id');
     }
 
     public function users(){
diff --git a/database/migrations/2024_09_05_070712_create_penilaian_table.php b/database/migrations/2024_09_05_070712_create_penilaian_table.php
index 9764f04..da22785 100644
--- a/database/migrations/2024_09_05_070712_create_penilaian_table.php
+++ b/database/migrations/2024_09_05_070712_create_penilaian_table.php
@@ -6,8 +6,7 @@ use Illuminate\Support\Facades\Schema;
 use Modules\Lpj\Models\JenisPenilaian;
 use Modules\Lpj\Models\Teams;
 
-return new class extends Migration
-{
+return new class () extends Migration {
     /**
      * Run the migrations.
      */
@@ -19,8 +18,9 @@ return new class extends Migration
             $table->foreignIdFor(Teams::class);
             $table->unsignedBigInteger('user_id');
             $table->datetime('tanggal_kunjungan');
-            $table->text('keterangan');
+            $table->text('keterangan')->nullable();
             $table->char('status');
+            $table->integer('permohonan_id'); 
             $table->timestamps();
             $table->char('authorized_status', 1)->nullable();
             $table->timestamp('authorized_at')->nullable();
diff --git a/module.json b/module.json
index 9b93b6e..e91a8f7 100644
--- a/module.json
+++ b/module.json
@@ -20,7 +20,7 @@
                 "permission": "",
                 "roles": [
                     "Administrator"
-                    
+
                 ]
             },
             {
@@ -56,6 +56,17 @@
                     "Administrator"
                 ]
             },
+            {
+                "title": "Penilaian Jaminan",
+                "path": "penilaian",
+                "icon": "ki-filled ki-some-files text-lg",
+                "classes": "",
+                "attributes": [],
+                "permission": "",
+                "roles": [
+                    "Administrator"
+                ]
+            },
             {
                 "title": "Laporan",
                 "path": "",
@@ -207,14 +218,6 @@
                         "attributes": [],
                         "permission": "",
                         "roles": []
-                    },
-                    {
-                        "title": "Penilaian Jaminan",
-                        "path": "basicdata.penilaian",
-                        "classes": "",
-                        "attributes": [],
-                        "permission": "",
-                        "roles": []
                     }
 
                 ]
diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php
index 7f094c9..90ca57d 100644
--- a/resources/views/penilaian/form.blade.php
+++ b/resources/views/penilaian/form.blade.php
@@ -12,12 +12,6 @@
             background-color: #ddd;
             margin: 20px 0;
         }
-
-        .h1 {
-            font-size: 16px;
-            font-weight: 600;
-            margin-bottom: 10px;
-        }
     </style>
 @endpush
 
@@ -28,484 +22,194 @@
         <div class="card pb-2.5">
             <div class="card-header" id="basic_settings">
                 <h3 class="card-title">
-                    Form Data Jaminan
+                    Form Penilai Jaminan
                 </h3>
                 <div class="flex items-center gap-2">
-                    <a href="{{ route('basicdata.penilaian.index') }}" class="btn btn-xs btn-info"><i
-                            class="ki-filled ki-exit-left"></i>
+                    <a href="{{ route('penilaian.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
                         Back</a>
                 </div>
             </div>
+
             <div class="card-body">
+                <form
+                    action="{{ isset($penilaian->permohonan_id) ? route('penilaian.update', $permohonan) : route('penilaian.store') }}"
+                    method="POST" class="">
 
-                <form action="" method="POST" class="">
-                    <div class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-5 lg:gap-7.5">
-                        <div class="grid gap-2.5">
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-24">
-                                    Nomor Registrasi
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-
-                                    <input class="input  @error('nomor_registrasi') border-danger bg-danger-light @enderror"
-                                        type="text" name="nomor_registrasi" 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-12">
-                                    Nama Pemohon
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                        type="text" name="cif" value="{{ $permohonan->user->name }}">
-                                </div>
-                            </div>
-
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-12">
-                                    Tanggal Pemohon
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                        type="date" name="cif" value="{{ $permohonan->tanggal_permohonan }}">
-                                </div>
+                    @if (isset($penilaian->permohonan_id))
+                        @method('PUT')
+                        <input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
+                    @else
+                        <input type="number" name="permohonan_id" value="{{ $permohonan->id }}">
+                    @endif
+                    @csrf
+                    <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5 p-5">
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Penilai yang Dilakukan oleh
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select
+                                    class="input tomselect w-full @error('jenis_penilaian_id') border-danger bg-danger-light @enderror"
+                                    name="jenis_penilaian_id" id="jenis_penilaian_id">
+                                    <option value="">Jenis Penilaian</option>
+                                    @foreach ($jenisPenilaian as $item)
+                                        @if (isset($penilaian->permohonan_id))
+                                            <option value="{{ $item->id }}"
+                                                {{ $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
                             </div>
                         </div>
 
-                        <div class="grid gap-2.5">
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label ">
-                                    Status
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                        type="text" name="cif" value="{{ $permohonan->status }}">
-                                </div>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Tim Penilai yang di tunjuk
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select
+                                    class="input tomselect w-full @error('teams_id') border-danger bg-danger-light @enderror"
+                                    name="teams_id" id="teams_id">
+                                    <option value="">Pilih Tim Penilai</option>
+                                    @foreach ($teamPenilai as $item)
+                                        @if (isset($penilaian->permohonan_id))
+                                            <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
                             </div>
+                        </div>
 
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label">
-                                    Cabang Pemohon
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                        type="text" name="cif" value="{{ $permohonan->branch->name }}">
-                                </div>
-                            </div>
-
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-24">
-                                    Cabang Penilai
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                        type="number" name="cif" value="">
-                                </div>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Penilai yang di tunjuk
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select id="user_id" name="user_id"
+                                    class="input  @error('user_id') border-danger bg-danger-light @enderror  w-full">
+                                    <option value="">Pilih Penilai</option>
+                                </select>
                             </div>
                         </div>
 
 
-                        <div class="grid gap-2.5">
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-24">
-                                    Nomor Registrasi cabang
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                        type="number" name="cif" value="">
-                                </div>
-                            </div>
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Jadwal Kunjungan
+                            </label>
 
-                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                <label class="form-label max-w-24">
-                                    Nama Bagian
-                                </label>
-                                <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                        type="number" name="cif" value="">
-                                </div>
+                            <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="{{ isset($penilaian->tanggal_kunjungan) ? \Carbon\Carbon::createFromTimestamp($penilaian->tanggal_kunjungan)->format('Y-m-d\TH:i') : '' }}">
+                                @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 class="textarea  @error('keterangan') border-danger bg-danger-light  @enderror" rows="3" type="text"
+                                    name="keterangan">{{ $penilaian->keterangan ?? '' }}</textarea>
+                            </div>
+                            @error('keterangan')
+                                <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+                        </div>
                     </div>
-
-                    </br>
-                    <div class="divider"></div>
-                    <div class="grid gap-5">
-                        <div>
-                            <h1 class="h1">1. IDENTITAS DEBITUR</h1>
-                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Nama Debitur
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                            type="text" name="cif" value="{{ $permohonan->debiture->name }}">
-                                    </div>
-                                </div>
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Alamat
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <p>
-                                            {{ $permohonan->debiture->address . ' ' . $permohonan->debiture->village->name . ', ' . $permohonan->debiture->district->name . ', ' . $permohonan->debiture->city->name . ', ' . $permohonan->debiture->province->name . ' ' . '(' . $permohonan->debiture->postal_code . ')' }}
-
-                                        </p>
-                                    </div>
-                                </div>
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Nomor Cif
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                            type="number" name="cif" value="{{ $permohonan->debiture->cif }}">
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div>
-                            <h1 class="h1">2. LETAK JAMINAN</h1>
-                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Alamat jaminan
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <textarea class="textarea  @error('cif') border-danger bg-danger-light  @enderror" rows="3" type="number"
-                                            name="cif" value=""></textarea>
-                                    </div>
-                                </div>
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Kode Dati II
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <section class="input w-full">
-                                            <option value="">1</option>
-                                        </section>
-                                    </div>
-                                </div>
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Debitur/Wakil Debitur
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                            type="number" name="cif" value="">
-                                    </div>
-                                </div>
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Telepon
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <input class="input  @error('cif') border-danger bg-danger-light @enderror"
-                                            type="number" name="cif" value="">
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div>
-                            <h1 class="h1">3. FASILITAS KREDIT</h1>
-                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
-
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Jenis Fasilitas
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <select
-                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
-                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
-                                            @foreach ($jenisFasilitas as $item)
-                                                <option value="">{{ $item->name }}</option>
-                                            @endforeach
-
-                                        </select>
-                                        @error('tujuan_penilaian_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">
-                                        Nilai Plafond
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <select
-                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
-                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
-                                            @foreach ($nilaiPlafond as $item)
-                                                <option value="">{{ $item->name }}</option>
-                                            @endforeach
-
-                                        </select>
-                                        @error('tujuan_penilaian_id')
-                                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                                        @enderror
-                                    </div>
-                                </div>
-
-                            </div>
-                        </div>
-
-
-                        <div>
-                            <h1 class="h1">4. TUJUAN PENILAIAN</h1>
-                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Jenis jaminan
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <select
-                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
-                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
-                                            <option value="">{{ $permohonan->tujuanPenilaian->name }}</option>
-
-                                        </select>
-                                        @error('tujuan_penilaian_id')
-                                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                                        @enderror
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div>
-                            <h1 class="h1">5. JENIS JAMINAN</h1>
-                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Jenis jaminan
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <select
-                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
-                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
-                                            @foreach ($jenisJaminan as $item)
-                                                <option value="{{ $item->id }}">{{ $item->name }}</option>
-                                            @endforeach
-                                        </select>
-                                        @error('tujuan_penilaian_id')
-                                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                                        @enderror
-                                    </div>
-                                </div>
-
-                            </div>
-                        </div>
-
-                        <div>
-                            <h1 class="h1">6. TIPE JAMINAN</h1>
-                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5">
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        tipe jaminan
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <select
-                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
-                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
-                                            @foreach ($jenisJaminan as $item)
-                                                <option value="{{ $item->id }}">{{ $item->name }}</option>
-                                            @endforeach
-                                        </select>
-                                        @error('tujuan_penilaian_id')
-                                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                                        @enderror
-                                    </div>
-                                </div>
-
-
-                            </div>
-                        </div>
-
-                        <div>
-                            <h1 class="h1">7. DATA-DATA</h1>
-                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5 border">
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"">
-                                    <label class="form-label max-w-56 ">
-                                        Update By
-                                    </label>
-                                    <div class="flex flex-col lg:flex-row gap-2 w-full">
-                                        <div class="flex flex-col lg:flex-row gap-2 w-full">
-                                            <div class="flex flex-wrap items-baseline w-full">
-                                                <input
-                                                    class="input  @error('user') border-danger bg-danger-light @enderror"
-                                                    type="text" name="user" value="">
-                                                @error('province_code')
-                                                    <em class="alert text-danger text-sm">{{ $message }}</em>
-                                                @enderror
-                                            </div>
-                                            <div class="flex flex-wrap items-baseline w-full">
-                                                <input
-                                                    class="input  @error('update_at') border-danger bg-danger-light @enderror"
-                                                    type="text" name="update_at" value="">
-                                                @error('city_code')
-                                                    <em class="alert text-danger text-sm">{{ $message }}</em>
-                                                @enderror
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-
-                                </div>
-
-                            </div>
-                        </div>
-
-                        <div>
-                            <h1 class="h1">6. TIPE JAMINAN</h1>
-                            <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5 p-5">
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Penilai yang Dilakukan oleh
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <select
-                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
-                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
-                                            @foreach ($jenisPenilaian as $item)
-                                                <option value="{{ $item->id }}">{{ $item->name }}</option>
-                                            @endforeach
-                                        </select>
-                                        @error('tujuan_penilaian_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">
-                                        Tim Penilai yang di tunjuk
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <select
-                                            class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror"
-                                            name="tujuan_penilaian_id" id="tujuan_penilaian_id">
-                                            @foreach ($teamPenilai as $item)
-                                                <option value="{{ $item->id }}">{{ $item->regions->name }}</option>
-                                            @endforeach
-                                        </select>
-                                        @error('tujuan_penilaian_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">
-                                        Penilai yang di tunjuk
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <input
-                                            class="input  @error('tanggal_kunjungan') border-danger bg-danger-light @enderror"
-                                            type="text" name="penilai_tunjuk" value="">
-                                    </div>
-                                </div>
-
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Jadwal Kunjungan
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <input
-                                            class="input  @error('tanggal_kunjungan') border-danger bg-danger-light @enderror"
-                                            type="date" name="tanggal_kunjungan" value="">
-                                    </div>
-                                </div>
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">
-                                        Tanggal
-                                    </label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <input
-                                            class="input  @error('tanggal_kunjungan') border-danger bg-danger-light @enderror"
-                                            type="date" name="tanggal_kunjungan" value="">
-                                    </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('keterangan') border-danger bg-danger-light  @enderror" rows="3"
-                                            type="text" name="keterangan" value=""></textarea>
-                                    </div>
-                                </div>
-
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5"">
-                                    <label class="form-label max-w-56 ">
-                                        Update By
-                                    </label>
-                                    <div class="flex flex-col lg:flex-row gap-2 w-full">
-                                        <div class="flex flex-col lg:flex-row gap-2 w-full">
-                                            <div class="flex flex-wrap items-baseline w-full">
-                                                <input
-                                                    class="input  @error('user') border-danger bg-danger-light @enderror"
-                                                    type="text" name="user" value="">
-                                                @error('province_code')
-                                                    <em class="alert text-danger text-sm">{{ $message }}</em>
-                                                @enderror
-                                            </div>
-                                            <div class="flex flex-wrap items-baseline w-full">
-                                                <input
-                                                    class="input  @error('update_at') border-danger bg-danger-light @enderror"
-                                                    type="text" name="update_at" value="">
-                                                @error('city_code')
-                                                    <em class="alert text-danger text-sm">{{ $message }}</em>
-                                                @enderror
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                    </div>
-
-                    <div class="divider"></div>
-                    <div class="flex justify-end gap-2">
-                        <button type="submit" class="btn btn-primary">
-                            Save
-                        </button>
-
-                        <button type="submit" class="btn btn-info">
+                    <div class="flex justify-end card-footer">
+                        <button type="submit"
+                            @if ($permohonan->status == 'Assign') class="btn btn-success"
+                            @else
+                                class="btn btn-warning" @endif>
                             Assign
                         </button>
-
-                        <button type="submit" class="btn btn-light">
-                            Print From
-                        </button>
                     </div>
+
                 </form>
             </div>
         </div>
 
     </div>
 @endsection
+
+
+@push('scripts')
+    <script>
+        document.addEventListener('DOMContentLoaded', function() {
+            let teamsSelect = document.getElementById('teams_id');
+            let penilaiSelect = document.getElementById('user_id');
+
+            // Mengambil nilai user_id dari variabel PHP
+            let selectedUserId = @json($penilaian->user_id ?? null); // Gunakan null jika tidak ada
+
+            function fetchPenilai(teamId) {
+                penilaiSelect.innerHTML = '';
+
+                if (teamId) {
+                    fetch(`/penilaian/getUserTeams/${teamId}`)
+                        .then(response => response.json())
+                        .then(data => {
+                            if (data && data.length > 0) {
+                                data.forEach((user) => {
+                                    let option = document.createElement('option');
+                                    option.value = user.id;
+                                    option.text = user.name;
+                                    
+                                    if (selectedUserId && selectedUserId == user.id) {
+                                        option.selected = true;
+                                    }
+
+                                    penilaiSelect.appendChild(option);
+                                });
+                            } else {
+                                let option = document.createElement('option');
+                                option.value = '';
+                                option.text = 'Tidak ada penilai.';
+                                penilaiSelect.appendChild(option);
+                            }
+                        })
+                        .catch(error => {
+                            console.error('Error fetching team members:', error);
+                            let option = document.createElement('option');
+                            option.value = '';
+                            option.text = 'Terjadi kesalahan.';
+                            penilaiSelect.appendChild(option);
+                        });
+                } else {
+                    let option = document.createElement('option');
+                    option.value = '';
+                    option.text = 'Pilih tim terlebih dahulu.';
+                    penilaiSelect.appendChild(option);
+                }
+            }
+
+            teamsSelect.addEventListener('change', function() {
+                let teamId = this.value;
+                fetchPenilai(teamId);
+            });
+
+            let selectedTeamId = teamsSelect.value;
+            if (selectedTeamId) {
+                fetchPenilai(selectedTeamId);
+            }
+        });
+    </script>
+@endpush
diff --git a/resources/views/penilaian/index.blade.php b/resources/views/penilaian/index.blade.php
index 8bbb9e8..a8a29e6 100644
--- a/resources/views/penilaian/index.blade.php
+++ b/resources/views/penilaian/index.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.main')
 
 @section('breadcrumbs')
-    {{ Breadcrumbs::render('basicdata.penilaian') }}
+    {{ Breadcrumbs::render('penilaian') }}
 @endsection
 
 @section('content')
@@ -9,15 +9,8 @@
         <div class="card pb-2.5">
             <div class="card-header" id="basic_settings">
                 <div class="card-title flex flex-row gap-1.5">
-                    @if (isset($status_permohonan))
-                        @foreach ($status_permohonan as $item)
-                            <a href="" class="btn btn-xs btn-outline btn-primary"> {{ $item->name }} </a>
-                        @endforeach
-                    @endif
+                    Daftar Penilaian
                 </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('permohonan.datatables') }}">
                 <div class="card-header py-5 flex-wrap">
                     <h3 class="card-title">
                         {{-- Daftar {{}} --}}
@@ -25,16 +18,19 @@
                     <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 Permohonan" id="search" type="text" value="">
+                                <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>
-                            <a class="btn btn-sm btn-primary" href="{{ route('permohonan.create') }}"> Tambah Permohonan </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('permohonan.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">
@@ -93,99 +89,10 @@
     </div>
 @endsection
 
-{{-- @section('content')
-    <div class="grid">
-        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="penilaian-table" data-api-url="{{ route('basicdata.penilaian.datatables') }}">
-            <div class="card-header py-5 flex-wrap">
-                <h3 class="card-title">
-                    Daftar penilaian
-                </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('basicdata.penilaian.export') }}"> Export to Excel </a>
-                        <a class="btn btn-sm btn-primary" href="{{ route('basicdata.penilaian.create') }}"> Tambah penilaian </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-[250px]" data-datatable-column="code">
-                                <span class="sort"> <span class="sort-label"> Code </span>
-                                    <span class="sort-icon"> </span> </span>
-                            </th>
-                            <th class="min-w-[250px]" data-datatable-column="name">
-                                <span class="sort"> <span class="sort-label"> penilaian </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 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(`basic-data/penilaian/${data}`, {
-                        type: 'DELETE'
-                    }).then((response) => {
-                        swal.fire('Deleted!', 'User has been deleted.', 'success').then(() => {
-                            window.location.reload();
-                        });
-                    }).catch((error) => {
-                        console.error('Error:', error);
-                        Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
-                    });
-                }
-            })
-        }
-    </script>
       <script type="module">
         const element = document.querySelector('#permohonan-table');
         const searchInput = document.getElementById('search');
@@ -242,8 +149,8 @@
                     title: 'Status',
                     render: (item, data) => {
                         return `<div class="flex flex-nowrap justify-center">
-                            <a class="btn btn-sm btn-icon btn-clear btn-info" href="basic-data/penilaian/${data.id}/edit">
-                                <i class="ki-outline ki-notepad-edit"></i>
+                            <a class="btn btn-sm btn-icon btn-clear btn-warning " href="penilaian/${data.id}/edit">
+                                <i class="ki-outline ki-eye"></i>
                             </a>
                         </div>`;
                     },
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 5b39fe9..18c2af5 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -312,11 +312,11 @@
     });
 
 
-    Breadcrumbs::for('basicdata.penilaian', function (BreadcrumbTrail $trail) {
+    Breadcrumbs::for('penilaian', function (BreadcrumbTrail $trail) {
         $trail->parent('basicdata');
-        $trail->push('Penilaian', route('basicdata.penilaian.index'));
+        $trail->push('Penilaian', route('penilaian.index'));
     });
-    Breadcrumbs::for('basicdata.penilaian.edit', function (BreadcrumbTrail $trail) {
-        $trail->parent('basicdata.penilaian');
+    Breadcrumbs::for('penilaian.edit', function (BreadcrumbTrail $trail) {
+        $trail->parent('penilaian');
         $trail->push('Buat Penilaian');
     });
diff --git a/routes/web.php b/routes/web.php
index e26f7c6..6d3db9a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -224,25 +224,6 @@ Route::middleware(['auth'])->group(function () {
             ],
         ]);
 
-        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::resource('penilaian', PenilaianController::class, [
-            'names' => [
-                'index'   => 'penilaian.index',
-                'show'    => 'penilaian.show',
-                'create'  => 'penilaian.create',
-                'store'   => 'penilaian.store',
-                'edit'    => 'penilaian.edit',
-                'update'  => 'penilaian.update',
-                'destroy' => 'penilaian.destroy',
-            ],
-        ]);
-
-
     });
     /** END ROUTE BASIC DATA ***/
 
@@ -257,22 +238,22 @@ Route::middleware(['auth'])->group(function () {
 
     Route::resource('permohonan', PermohonanController::class);
 
-        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('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('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');
@@ -286,4 +267,22 @@ Route::middleware(['auth'])->group(function () {
 
     Route::resource('debitur', DebitureController::class);
 
+
+
+    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}/edit', [PenilaianController::class, 'edit'])->name('edit');
+        Route::put('{id}', [PenilaianController::class, 'update'])->name('update');
+        Route::post('create', [PenilaianController::class, 'create'])->name('create');
+        Route::post('store', [PenilaianController::class, 'store'])->name('store');
+
+    });
+
+
+
 });

From f679b7ea74eb96c13f02ee44675321a42eabe102 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Thu, 19 Sep 2024 09:55:00 +0700
Subject: [PATCH 08/16] perubahan nama ( assignment dan tombol aproved )

---
 module.json                              | 2 +-
 resources/views/penilaian/form.blade.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module.json b/module.json
index e91a8f7..ee2a861 100644
--- a/module.json
+++ b/module.json
@@ -57,7 +57,7 @@
                 ]
             },
             {
-                "title": "Penilaian Jaminan",
+                "title": "Assignment",
                 "path": "penilaian",
                 "icon": "ki-filled ki-some-files text-lg",
                 "classes": "",
diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php
index 90ca57d..6ea1260 100644
--- a/resources/views/penilaian/form.blade.php
+++ b/resources/views/penilaian/form.blade.php
@@ -22,7 +22,7 @@
         <div class="card pb-2.5">
             <div class="card-header" id="basic_settings">
                 <h3 class="card-title">
-                    Form Penilai Jaminan
+                    Form Assignment
                 </h3>
                 <div class="flex items-center gap-2">
                     <a href="{{ route('penilaian.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
@@ -139,7 +139,7 @@
                             @if ($permohonan->status == 'Assign') class="btn btn-success"
                             @else
                                 class="btn btn-warning" @endif>
-                            Assign
+                            Aproved
                         </button>
                     </div>
 
@@ -172,7 +172,7 @@
                                     let option = document.createElement('option');
                                     option.value = user.id;
                                     option.text = user.name;
-                                    
+
                                     if (selectedUserId && selectedUserId == user.id) {
                                         option.selected = true;
                                     }

From b0c8a433046d133be7f8c81961ffaeb94256723b Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 19 Sep 2024 10:27:02 +0700
Subject: [PATCH 09/16] Fix Slug Status Permohonan

---
 app/Http/Requests/StatusPermohonanRequest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Requests/StatusPermohonanRequest.php b/app/Http/Requests/StatusPermohonanRequest.php
index 21bd8e5..d0a9ac6 100644
--- a/app/Http/Requests/StatusPermohonanRequest.php
+++ b/app/Http/Requests/StatusPermohonanRequest.php
@@ -16,6 +16,7 @@
             $rules = [
                 'description' => 'nullable|max:255',
                 'status'      => 'required|boolean',
+                'slug'        => 'nullable|max:255',
             ];
 
             if ($this->method() == 'PUT') {
@@ -37,9 +38,9 @@
 
         public function prepareForValidation()
         {
-            $this->merge([
+            return $this->merge([
                 'status' => isset($this->status) ? 1 : 0,
-                'slug'=> Str::slug($this->name)
+                'slug'   => Str::slug($this->name),
             ]);
         }
     }

From 2cc5d75dbcd2c5e63f9e0018c05fd9ecf1f727ea Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 19 Sep 2024 10:27:32 +0700
Subject: [PATCH 10/16] Update Module Debitur Dokumen Jaminan

---
 resources/views/debitur/components/dokumen.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php
index 0dfcc6f..4485b8d 100644
--- a/resources/views/debitur/components/dokumen.blade.php
+++ b/resources/views/debitur/components/dokumen.blade.php
@@ -59,7 +59,7 @@
             @if(isset($document->id))
                 <input type="hidden" name="jenis_jaminan_id" value="{{ $document->jenis_jaminan_id }}">
             @endif
-            <select onchange="getLegalitasJaminan()" {{ isset($document->id) ? "disabled" : "" }} class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="jenis_jaminan_id" id="jenis_jaminan_id">
+            <select onchange="getLegalitasJaminan()" class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="jenis_jaminan_id" id="jenis_jaminan_id">
                 <option value="">Pilih Jenis Jaminan</option>
                 @foreach($jenisJaminan as $row)
                     @if(isset($document))

From 491e206229e16020341d9ccde989fb087d67b5b6 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 19 Sep 2024 10:27:56 +0700
Subject: [PATCH 11/16] update pemilik jaminan, add multiple nama pada
 sertifikat

---
 .../views/pemilik_jaminan/form.blade.php      | 68 ++++++++++++++++---
 1 file changed, 59 insertions(+), 9 deletions(-)

diff --git a/resources/views/pemilik_jaminan/form.blade.php b/resources/views/pemilik_jaminan/form.blade.php
index cc39a92..1efcb79 100644
--- a/resources/views/pemilik_jaminan/form.blade.php
+++ b/resources/views/pemilik_jaminan/form.blade.php
@@ -71,21 +71,31 @@
                             Nama Lengkap
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('name') border-danger bg-danger-light @enderror" type="text " id="name" name="name" value="{{ $pemilik->name ?? '' }}" placeholder="Nama Pemilik Jaminan">
-                            @error('name')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
+                            <div class="flex flex-col lg:flex-row gap-2 w-full">
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('name') border-danger bg-danger-light @enderror" type="text " id="name" name="name" value="{{ $pemilik->name ?? '' }}" placeholder="Nama Pemilik Jaminan">
+                                    @error('name')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    @enderror
+                                </div>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('nomor_id') border-danger bg-danger-light @enderror" type="number" name="nomor_id" value="{{ $debitur->nomor_id ?? '' }}" placeholder="Nomor ID/KTP">
+                                    @error('nomor_id')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    @enderror
+                                </div>
+                            </div>
                         </div>
+                    </div>
+                    <div id="nama_sertifikat">
+
                     </div>
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
-                            Nomor ID/KTP
+                            &nbsp;
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input class="input  @error('nomor_id') border-danger bg-danger-light @enderror" type="number" name="nomor_id" value="{{ $debitur->nomor_id ?? '' }}">
-                            @error('nomor_id')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
+                            <button type="button" id="tambah_sertifikat" class="btn btn-primary btn-xs">Tambah Nama di Sertifikat</button>
                         </div>
                     </div>
 
@@ -242,3 +252,43 @@
         </div>
     </div>
 @endsection
+
+
+@push('scripts')
+    <script>
+        document.getElementById('tambah_sertifikat').addEventListener('click', function() {
+            const namaSertifikatDiv = document.getElementById('nama_sertifikat');
+            const newDiv = document.createElement('div');
+            newDiv.innerHTML = `
+            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 mb-5">
+                <label class="form-label max-w-56">
+                    Nama Lengkap
+                </label>
+                <div class="flex flex-wrap items-baseline w-full">
+                    <div class="flex flex-col lg:flex-row gap-2 w-full">
+                        <div class="flex flex-wrap items-baseline w-full">
+                            <input class="input  @error('name') border-danger bg-danger-light @enderror" type="text" id="name" name="name" value="{{ $pemilik->name ?? '' }}" placeholder="Nama Pemilik Jaminan">
+                            @error('name')
+            <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+            </div>
+            <div class="flex flex-wrap items-baseline w-full">
+                <input class="input  @error('nomor_id') border-danger bg-danger-light @enderror" type="number" name="nomor_id" value="{{ $debitur->nomor_id ?? '' }}" placeholder="Nomor ID/KTP">
+                            @error('nomor_id')
+            <em class="alert text-danger text-sm">{{ $message }}</em>
+                            @enderror
+            </div>
+            <button type="button" class="btn btn-danger btn-xs delete-button">Hapus</button>
+        </div>
+    </div>
+</div>
+`;
+            namaSertifikatDiv.appendChild(newDiv);
+
+            // Event listener untuk tombol hapus
+            newDiv.querySelector('.delete-button').addEventListener('click', function() {
+                namaSertifikatDiv.removeChild(newDiv);
+            });
+        });
+    </script>
+@endpush

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

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

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

From 32fe243336bb795bd81fc094eb2cd97489b9f688 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Thu, 19 Sep 2024 11:17:53 +0700
Subject: [PATCH 13/16] penambahan field di table penilaiaan

---
 app/Models/Penilaian.php                      |  8 +++++-
 ...24_09_05_070712_create_penilaian_table.php |  7 ++++--
 resources/views/penilaian/form.blade.php      | 25 ++++++++++++++++++-
 resources/views/penilaian/index.blade.php     |  2 +-
 resources/views/teams/form.blade.php          |  2 +-
 routes/web.php                                |  2 +-
 6 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/app/Models/Penilaian.php b/app/Models/Penilaian.php
index 34a5098..65306aa 100644
--- a/app/Models/Penilaian.php
+++ b/app/Models/Penilaian.php
@@ -7,8 +7,10 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\PenilaianFactory;
 use Modules\Lpj\Models\JenisPenilaian;
 use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\Permohonan;
 use Modules\Usermanagement\Models\User;
 
+
 class Penilaian extends Model
 {
 
@@ -17,7 +19,7 @@ class Penilaian extends Model
      */
     protected $table = 'penilaian';
     protected $fillable = [
-        'jenis_penilaian_id', 'teams_id', 'user_id', 'tanggal_kunjungan', 'keterangan','permohonan_id',
+        'jenis_penilaian_id', 'teams_id', 'user_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'
     ];
@@ -34,5 +36,9 @@ class Penilaian extends Model
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
+    public function permohonan(){
+        return $this->belongsTo(Permohonan::class, 'nomor_registrasi', 'nomor_registrasi');
+    }
+
 
 }
diff --git a/database/migrations/2024_09_05_070712_create_penilaian_table.php b/database/migrations/2024_09_05_070712_create_penilaian_table.php
index da22785..d25274b 100644
--- a/database/migrations/2024_09_05_070712_create_penilaian_table.php
+++ b/database/migrations/2024_09_05_070712_create_penilaian_table.php
@@ -5,6 +5,7 @@ use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 use Modules\Lpj\Models\JenisPenilaian;
 use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\Permohonan;
 
 return new class () extends Migration {
     /**
@@ -16,11 +17,13 @@ return new class () extends Migration {
             $table->id();
             $table->foreignIdFor(JenisPenilaian::class);
             $table->foreignIdFor(Teams::class);
-            $table->unsignedBigInteger('user_id');
             $table->datetime('tanggal_kunjungan');
             $table->text('keterangan')->nullable();
             $table->char('status');
-            $table->integer('permohonan_id'); 
+            $table->foreignIdFor(Permohonan::class)->nullable();
+            $table->integer('penilaian_id');
+            $table->integer('surveyor_id')->nullable();
+            $table->integer('penilai_surveyor_id')->nullable();
             $table->timestamps();
             $table->char('authorized_status', 1)->nullable();
             $table->timestamp('authorized_at')->nullable();
diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php
index 6ea1260..224f44b 100644
--- a/resources/views/penilaian/form.blade.php
+++ b/resources/views/penilaian/form.blade.php
@@ -95,7 +95,7 @@
 
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">
-                                Penilai yang di tunjuk
+                                Surveyor yang di tunjuk
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select id="user_id" name="user_id"
@@ -105,6 +105,29 @@
                             </div>
                         </div>
 
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Surveyor dan penilai yang di tunjuk
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select id="user_id" name="user_id"
+                                    class="input  @error('user_id') border-danger bg-danger-light @enderror  w-full">
+                                    <option value="">Pilih Penilai</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Penilai yang di tunjuk
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select id="user_id" name="user_id"
+                                    class="input  @error('user_id') border-danger bg-danger-light @enderror  w-full">
+                                    <option value="">Pilih Penilai</option>
+                                </select>
+                            </div>
+                        </div>
 
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">
diff --git a/resources/views/penilaian/index.blade.php b/resources/views/penilaian/index.blade.php
index a8a29e6..278ae14 100644
--- a/resources/views/penilaian/index.blade.php
+++ b/resources/views/penilaian/index.blade.php
@@ -149,7 +149,7 @@
                     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="penilaian/${data.id}/edit">
+                            <a class="btn btn-sm btn-icon btn-clear btn-warning " href="penilaian/${data.id}/assignment">
                                 <i class="ki-outline ki-eye"></i>
                             </a>
                         </div>`;
diff --git a/resources/views/teams/form.blade.php b/resources/views/teams/form.blade.php
index 6301281..b9569f0 100644
--- a/resources/views/teams/form.blade.php
+++ b/resources/views/teams/form.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @section('content')
-    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
+    {{-- <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /> --}}
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
 
         <form action="{{ isset($teams->id) ? route('basicdata.teams.update', $teams->id) : route('basicdata.teams.store') }}"
diff --git a/routes/web.php b/routes/web.php
index 6d3db9a..f72a34b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -276,7 +276,7 @@ Route::middleware(['auth'])->group(function () {
         Route::get('/getUserTeams/{id}', [PenilaianController::class, 'getUserTeams']);
 
         Route::get('/', [PenilaianController::class, 'index'])->name('index');
-        Route::get('{id}/edit', [PenilaianController::class, 'edit'])->name('edit');
+        Route::get('{id}/assignment', [PenilaianController::class, 'edit'])->name('edit');
         Route::put('{id}', [PenilaianController::class, 'update'])->name('update');
         Route::post('create', [PenilaianController::class, 'create'])->name('create');
         Route::post('store', [PenilaianController::class, 'store'])->name('store');

From fc0e3575c64c95ce9e40b4487211b0f667f532e6 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Thu, 19 Sep 2024 15:02:33 +0700
Subject: [PATCH 14/16] update status bayar pada module permohonan

---
 app/Http/Requests/PermohonanRequest.php       |  2 +
 app/Models/Permohonan.php                     |  3 +-
 ...4_09_19_075113_update_permohonan_table.php | 30 ++++++++++
 resources/views/penilaian/form.blade.php      |  2 +-
 resources/views/permohonan/form.blade.php     | 56 +++++++++++++++++++
 5 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 database/migrations/2024_09_19_075113_update_permohonan_table.php

diff --git a/app/Http/Requests/PermohonanRequest.php b/app/Http/Requests/PermohonanRequest.php
index edd4169..8d6ef20 100644
--- a/app/Http/Requests/PermohonanRequest.php
+++ b/app/Http/Requests/PermohonanRequest.php
@@ -23,6 +23,8 @@
                 'status'                    => 'required|string',
                 'jenis_fasilitas_kredit_id' => 'required|exists:jenis_fasilitas_kredit,id',
                 'nilai_plafond_id'          => 'required|exists:nilai_plafond,id',
+                'status_bayar'              => 'required|string',
+                'nilai_njop'                => 'nullable|numeric'
             ];
 
             return $rules;
diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php
index cf6d5e6..be453ee 100644
--- a/app/Models/Permohonan.php
+++ b/app/Models/Permohonan.php
@@ -24,7 +24,8 @@ class Permohonan extends Base
         'authorized_at',
         'authorized_status',
         'authorized_by',
-
+        'status_bayar',
+        'nilai_njop'
     ];
 
     public function user(){
diff --git a/database/migrations/2024_09_19_075113_update_permohonan_table.php b/database/migrations/2024_09_19_075113_update_permohonan_table.php
new file mode 100644
index 0000000..ec58aca
--- /dev/null
+++ b/database/migrations/2024_09_19_075113_update_permohonan_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('permohonan', function (Blueprint $table) {
+            $table->enum('status_bayar',['sudah_bayar','belum_bayar'])->default('sudah_bayar');
+            $table->string('nilai_njop')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('permohonan', function (Blueprint $table) {
+            $table->dropColumn('status_bayar');
+            $table->dropColumn('nilai_njop');
+        });
+    }
+};
diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php
index 68e7bc0..abf0e9b 100644
--- a/resources/views/penilaian/form.blade.php
+++ b/resources/views/penilaian/form.blade.php
@@ -240,7 +240,7 @@
                 @endforeach
             </div>
         </div>
-        
+
         <div class="card pb-2.5">
             <div class="card-header" id="basic_settings">
                 <h3 class="card-title">
diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php
index 45be1d5..7c82edd 100644
--- a/resources/views/permohonan/form.blade.php
+++ b/resources/views/permohonan/form.blade.php
@@ -128,6 +128,34 @@
                                 </div>
                             </div>
 
+                            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                <label class="form-label max-w-56">
+                                    Status Bayar
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
+                                        <option value="">Pilih Status Bayar</option>
+                                        <option {{ $permohonan->status_bayar=="sudah_bayar" ? 'selected' : '' }} value="sudah_bayar">Sudah Bayar</option>
+                                        <option {{ $permohonan->status_bayar=="belum_bayar" ? 'selected' : '' }} value="belum_bayar">Belum Bayar</option>
+                                    </select>
+                                    @error('status')
+                                    <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">
+                                    Nilai NJOP
+                                </label>
+                                <div class="flex flex-wrap items-baseline w-full">
+                                    <input class="input  @error('nilai_njop') border-danger bg-danger-light @enderror" type="text" name="nilai_njop" value="{{ $permohonan->nilai_njop ?? '' }}">
+                                    @error('nilai_njop')
+                                    <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 Permohonan
@@ -282,6 +310,34 @@
                             </div>
                         </div>
 
+                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                            <label class="form-label max-w-56">
+                                Status Bayar
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
+                                    <option value="">Pilih Status Bayar</option>
+                                    <option value="sudah_bayar">Sudah Bayar</option>
+                                    <option value="belum_bayar">Belum Bayar</option>
+                                </select>
+                                @error('status')
+                                <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">
+                                Nilai NJOP
+                            </label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <input class="input  @error('nilai_njop') border-danger bg-danger-light @enderror" type="text" name="nilai_njop" value="{{ $permohonan->nilai_njop ?? '' }}">
+                                @error('nilai_njop')
+                                <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 Permohonan

From 00f568fb6d27bcc00dbc2e4c928335bdc4bd6267 Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Fri, 20 Sep 2024 15:05:53 +0700
Subject: [PATCH 15/16] update filed penilai, surveyor dan tambah buton revisi

---
 app/Http/Controllers/PenilaianController.php  | 374 +++++++++---------
 app/Http/Requests/PenilaianRequest.php        |  25 +-
 ...24_09_05_070712_create_penilaian_table.php |   6 +-
 module.json                                   |  13 +-
 resources/views/penilaian/form.blade.php      | 291 +++++++++-----
 resources/views/penilaian/index.blade.php     |   2 +-
 routes/breadcrumbs.php                        |   4 +-
 routes/web.php                                |   3 +-
 8 files changed, 429 insertions(+), 289 deletions(-)

diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index dadfd09..b7d91ea 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -1,203 +1,213 @@
 <?php
 
-    namespace Modules\Lpj\Http\Controllers;
+namespace Modules\Lpj\Http\Controllers;
 
-    use App\Http\Controllers\Controller;
-    use Exception;
-    use Illuminate\Http\Request;
-    use Modules\Lpj\Http\Requests\PenilaianRequest;
-    use Modules\Lpj\Models\JenisPenilaian;
-    use Modules\Lpj\Models\Penilaian;
-    use Modules\Lpj\Models\Permohonan;
-    use Modules\Lpj\Models\StatusPermohonan;
-    use Modules\Lpj\Models\Teams;
-    use Modules\Lpj\Models\TeamsUsers;
-    use Modules\Usermanagement\Models\User;
+use App\Http\Controllers\Controller;
+use Exception;
+use Illuminate\Http\Request;
+use Modules\Lpj\Http\Requests\PenilaianRequest;
+use Modules\Lpj\Models\JenisPenilaian;
+use Modules\Lpj\Models\Penilaian;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\StatusPermohonan;
+use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\TeamsUsers;
+use Modules\Usermanagement\Models\User;
 
-    class PenilaianController extends Controller
+class PenilaianController extends Controller
+{
+    public $user;
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
     {
-        /**
-         * Display a listing of the resource.
-         */
-        public function index()
-        {
-            $status_permohonan = StatusPermohonan::all();
+        $status_permohonan = StatusPermohonan::all();
 
-            return view('lpj::penilaian.index', compact('status_permohonan'));
-        }
+        return view('lpj::penilaian.index', compact('status_permohonan'));
+    }
 
-        /**
-         * Store a newly created resource in storage.
-         */
-        public function store(PenilaianRequest $request)
-        {
-            $validatedData = $request->validated();
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(PenilaianRequest $request)
+    {
+        $validatedData = $request->validated();
+        if ($validatedData) {
+            try {
+                $penilaian = Penilaian::create($validatedData);
 
-            if ($validatedData) {
-                try {
-                    $penilaian = Penilaian::create($validatedData);
+                $permohonan = Permohonan::where('nomor_registrasi', $request->nomor_registrasi);
+                $permohonan->update([
+                    'status' => 'assign',
+                ]);
 
-                    $permohonan = Permohonan::findOrFail($request->permohonan_id);
-                    $permohonan->update([
-                        'status' => 'assign',
-                    ]);
+                return redirect()->route('penilaian.index')->with('success', 'Penilaian berhasil disimpan');
+            } catch (Exception $e) {
 
-                    return redirect()->route('penilaian.index')->with('success', 'Penilaian berhasil disimpan');
-                } catch (Exception $e) {
-                    return redirect()->route('penilaian.index')->with('error', $e->getMessage());
-                }
+                return redirect()->route('penilaian.index')->with('error', $e->getMessage());
             }
         }
+    }
 
-        /**
-         * Show the form for creating a new resource.
-         */
-        public function create($id)
-        {
-            return view('lpj::penilaian.form');
-        }
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create($id)
+    {
+        return view('lpj::penilaian.form');
+    }
 
-        /**
-         * Update the specified resource in storage.
-         */
-        public function update(PenilaianRequest $request, $id)
-        {
-            $validate = $request->validated();
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(PenilaianRequest $request, $id)
+    {
+        $validate = $request->validated();
+        if ($validate) {
+            try {
+                $penilaian = Penilaian::where('nomor_registrasi', $request->nomor_registrasi)->firstOrFail();
+                $penilaian->update($validate);
+                $permohonan = Permohonan::where('nomor_registrasi', $request->nomor_registrasi);
+                $permohonan->update([
+                    'status' => 'assign',
+                ]);
 
-            if ($validate) {
-                try {
-                    $penilaian = Penilaian::where('permohonan_id', $id)->firstOrFail();
-
-                    $penilaian->update($validate);
-                    $permohonan = Permohonan::findOrFail($id);
-                    $permohonan->update([
-                        'status' => 'assign',
-                    ]);
-
-                    return redirect()->route('penilaian.index', $id)->with('success', 'Penilaian berhasil diubah');
-                } catch (Exception $e) {
-                    return redirect()->route('penilaian.index', $id)->with('error', $e->getMessage());
-                }
+                return redirect()->route('penilaian.index', $id)->with('success', 'Penilaian berhasil diubah');
+            } catch (Exception $e) {
+                return redirect()->route('penilaian.index', $id)->with('error', $e->getMessage());
             }
         }
+    }
 
-        /**
-         * Show the specified resource.
-         */
-        public function show($id)
-        {
-            return view('lpj::show');
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+        return view('lpj::show');
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function assignment($id)
+    {
+        $permohonan = Permohonan::with(
+            [
+                'user',
+                'debiture.province',
+                'debiture.city',
+                'debiture.district',
+                'debiture.village',
+                'branch',
+                'tujuanPenilaian',
+            ],
+        )->findOrFail($id);
+
+        $jenisPenilaian = JenisPenilaian::all();
+        $teamPenilai    = Teams::with(['regions', 'teamsUsers'])->get();
+
+        $penilaian = Penilaian::where('nomor_registrasi', $permohonan->nomor_registrasi)->first();
+
+        return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian'));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function revisi(Request $request, $nomor_registrasi)
+    {
+        $validate = $request->validate([
+            'keterangan_revisi' => 'required',
+            'dokumen_revisi' => 'required|file',
+        ]);
+        if ($validate) {
+                $permohonan = Permohonan::where('nomor_registrasi',
+                $nomor_registrasi);
+
+                $permohonan->update($validate);
         }
 
-        /**
-         * Show the form for editing the specified resource.
-         */
-        public function edit($id)
-        {
-            $permohonan = Permohonan::with(
-                [
-                    'user',
-                    'debiture.province',
-                    'debiture.city',
-                    'debiture.district',
-                    'debiture.village',
-                    'branch',
-                    'tujuanPenilaian',
-                ],
-            )->findOrFail($id);
-
-            $jenisPenilaian = JenisPenilaian::all();
-            $teamPenilai    = Teams::with(['regions', 'teamsUsers'])->get();
-
-            $penilaian = Penilaian::where('permohonan_id', $id)->first();
-
-            return view('lpj::penilaian.form', compact('permohonan', 'teamPenilai', 'jenisPenilaian', 'penilaian'));
-        }
-
-        /**
-         * Remove the specified resource from storage.
-         */
-        public function destroy($id)
-        {
-            //
-        }
-
-        public function dataForDatatables(Request $request)
-        {
-            if (is_null($this->user) || !$this->user->can('debitur.view')) {
-                // abort(403, 'Sorry! You are not allowed to view users.');
-            }
-
-
-            $query = Permohonan::query();
-
-            if ($request->has('search') && !empty($request->get('search'))) {
-                $search = $request->get('search');
-                $query->where(function ($q) use ($search) {
-                    $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
-                    $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
-                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
-                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
-                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
-                });
-            }
-
-            // Filter to show only records with status 'register'
-            $query->where('status', 'register');
-
-
-            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-                $order  = $request->get('sortOrder');
-                $column = $request->get('sortField');
-                $query->orderBy($column, $order);
-            }
-
-            $totalRecords = $query->count();
-
-            // Apply pagination if provided
-            if ($request->has('page') && $request->has('size')) {
-                $page   = $request->get('page');
-                $size   = $request->get('size');
-                $offset = ($page - 1) * $size; // Calculate the offset
-
-                $query->skip($offset)->take($size);
-            }
-
-            $filteredRecords = $query->count();
-
-            $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
-
-            $pageCount = ceil($totalRecords / $request->get('size'));
-
-            $currentPage = $page;
-
-
-            return response()->json([
-                'draw'            => $request->get('draw'),
-                'recordsTotal'    => $totalRecords,
-                'recordsFiltered' => $filteredRecords,
-                'pageCount'       => $pageCount,
-                'page'            => $currentPage,
-                'totalCount'      => $totalRecords,
-                'data'            => $data,
-            ]);
-        }
-
-
-        public function getUserTeams($id)
-        {
-            $teamsUser = TeamsUsers::where('teams_id', $id)->get();
-            $userIds   = $teamsUser->pluck('user_id');
-            $users     = User::whereIn('id', $userIds)->get();
-
-            if ($users->isNotEmpty()) {
-                return response()->json($users, 200);
-            }
-
-            return response()->json([], 200);
-        }
-
-
     }
+
+    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) = ?', ['register']);
+
+        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'])->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,
+        ]);
+    }
+
+
+
+    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()) {
+            return response()->json($users, 200);
+        }
+
+        return response()->json([], 200);
+    }
+
+
+}
diff --git a/app/Http/Requests/PenilaianRequest.php b/app/Http/Requests/PenilaianRequest.php
index 6be90ac..8e215e4 100644
--- a/app/Http/Requests/PenilaianRequest.php
+++ b/app/Http/Requests/PenilaianRequest.php
@@ -10,17 +10,20 @@ class PenilaianRequest extends FormRequest
      * Get the validation rules that apply to the request.
      */
     public function rules(): array
-    {
-        return [
-            'jenis_penilaian_id' => 'required|max:255',
-            'teams_id'           => 'required|max:255',
-            'user_id'            => 'required|max:255',
-            'tanggal_kunjungan'  => 'required|max:255',
-            'status'             => 'required|max:10',
-            'keterangan'         => 'nullable',
-            'permohonan_id'      => 'required',
-        ];
-    }
+{
+    return [
+        'jenis_penilaian_id'    => 'required|max:255',
+        'teams_id'              => 'required|max:255',
+        'tanggal_kunjungan'     => 'required|max:255',
+        'status'                => 'required|string',
+        'nomor_registrasi'      => 'required|string',
+        'surveyor_id'           => 'nullable|required_without:penilai_surveyor_id',
+        'penilaian_id'          => 'nullable|required_without:penilai_surveyor_id',
+        'penilai_surveyor_id'   => 'nullable|required_without:surveyor_id|required_without:penilaian_id',
+        'keterangan'            => 'nullable',
+    ];
+}
+
 
     /**
      * Determine if the user is authorized to make this request.
diff --git a/database/migrations/2024_09_05_070712_create_penilaian_table.php b/database/migrations/2024_09_05_070712_create_penilaian_table.php
index d25274b..cb0a397 100644
--- a/database/migrations/2024_09_05_070712_create_penilaian_table.php
+++ b/database/migrations/2024_09_05_070712_create_penilaian_table.php
@@ -19,9 +19,9 @@ return new class () extends Migration {
             $table->foreignIdFor(Teams::class);
             $table->datetime('tanggal_kunjungan');
             $table->text('keterangan')->nullable();
-            $table->char('status');
-            $table->foreignIdFor(Permohonan::class)->nullable();
-            $table->integer('penilaian_id');
+            $table->string('status')->nullable();
+            $table->string('nomor_registrasi')->references('nomor_registrasi')->on(Permohonan::class)->nullable();
+            $table->integer('penilaian_id')->nullable();
             $table->integer('surveyor_id')->nullable();
             $table->integer('penilai_surveyor_id')->nullable();
             $table->timestamps();
diff --git a/module.json b/module.json
index f2c4211..aabe3d6 100644
--- a/module.json
+++ b/module.json
@@ -59,6 +59,17 @@
             {
                 "title": "Assignment",
                 "path": "penilaian",
+                "icon": "ki-filled ki-badge",
+                "classes": "",
+                "attributes": [],
+                "permission": "",
+                "roles": [
+                    "Administrator"
+                ]
+            },
+            {
+                "title": "Activity",
+                "path": "penilaian",
                 "icon": "ki-filled ki-some-files text-lg",
                 "classes": "",
                 "attributes": [],
@@ -196,7 +207,7 @@
                         "roles": []
                     },
                     {
-                        "title": "Team Penilai",
+                        "title": "Staff Appraisal",
                         "path": "basicdata.teams",
                         "classes": "",
                         "attributes": [],
diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php
index 1a11cde..4112b0a 100644
--- a/resources/views/penilaian/form.blade.php
+++ b/resources/views/penilaian/form.blade.php
@@ -6,11 +6,15 @@
 
 @push('styles')
     <style>
-        .divider {
-            border: none;
-            height: 1px;
-            background-color: #ddd;
-            margin: 20px 0;
+        .modal {
+            width: 50%;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            position: fixed;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
         }
     </style>
 @endpush
@@ -70,7 +74,7 @@
                                     Name
                                 </td>
                                 <td class="py-2 text-gray-800 font-normaltext-sm">
-                                    {{ $permohonan->debiture->name ?? "" }}
+                                    {{ $permohonan->debiture->name ?? '' }}
                                 </td>
                             </tr>
                             <tr>
@@ -78,7 +82,7 @@
                                     Email
                                 </td>
                                 <td class="py-3 text-gray-700 text-2sm font-normal">
-                                    {{ $permohonan->debiture->email ?? "" }}
+                                    {{ $permohonan->debiture->email ?? '' }}
                                 </td>
                             </tr>
                             <tr>
@@ -86,7 +90,7 @@
                                     Phone
                                 </td>
                                 <td class="py-3 text-gray-700 text-2sm font-normal">
-                                    {{ $permohonan->debiture->phone ?? "" }}
+                                    {{ $permohonan->debiture->phone ?? '' }}
                                 </td>
                             </tr>
 
@@ -95,7 +99,7 @@
                                     Address
                                 </td>
                                 <td class="py-3 text-gray-700 text-sm font-normal">
-                                    {{ $permohonan->debiture->address ?? "" }}
+                                    {{ $permohonan->debiture->address ?? '' }}
                                 </td>
                             </tr>
                             <tr>
@@ -103,7 +107,11 @@
                                     &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 ?? "" }}
+                                    {{ $permohonan->debiture->village->name ?? '' }},
+                                    {{ $permohonan->debiture->district->name ?? '' }},
+                                    {{ $permohonan->debiture->city->name ?? '' }},
+                                    {{ $permohonan->debiture->province->name ?? '' }} -
+                                    {{ $permohonan->debiture->village->postal_code ?? '' }}
                                 </td>
                             </tr>
                         </table>
@@ -115,7 +123,7 @@
                                     Cabang
                                 </td>
                                 <td class="py-2 text-gray-800 font-normaltext-sm">
-                                    {{ $permohonan->debiture->branch->name  ?? "" }}
+                                    {{ $permohonan->debiture->branch->name ?? '' }}
                                 </td>
                             </tr>
                             <tr>
@@ -123,7 +131,7 @@
                                     CIF
                                 </td>
                                 <td class="py-2 text-gray-800 font-normaltext-sm">
-                                    {{ $permohonan->debiture->cif ?? "" }}
+                                    {{ $permohonan->debiture->cif ?? '' }}
                                 </td>
                             </tr>
                             <tr>
@@ -131,7 +139,7 @@
                                     Nomor Rekening
                                 </td>
                                 <td class="py-3 text-gray-700 text-sm font-normal">
-                                    {{ $permohonan->debiture->nomor_rekening ?? "" }}
+                                    {{ $permohonan->debiture->nomor_rekening ?? '' }}
                                 </td>
                             </tr>
                             <tr>
@@ -139,7 +147,7 @@
                                     NPWP
                                 </td>
                                 <td class="py-3 text-gray-700 text-2sm font-normal">
-                                    {{ $permohonan->debiture->npwp ?? "" }}
+                                    {{ $permohonan->debiture->npwp ?? '' }}
                                 </td>
                             </tr>
                         </table>
@@ -155,8 +163,9 @@
                 </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">
+                @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 }}
@@ -173,7 +182,7 @@
                                         Pemilik Jaminan:
                                     </h3>
                                     <span class="text-2sm text-gray-700">
-                                        {{ $dokumen->pemilik->name?? "" }}
+                                        {{ $dokumen->pemilik->name ?? '' }}
                                     </span>
                                 </div>
                                 <div class="mb-5">
@@ -181,7 +190,7 @@
                                         Jenis Jaminan:
                                     </h3>
                                     <span class="text-2sm text-gray-700">
-                                        {{ $dokumen->jenisJaminan->name?? "" }}
+                                        {{ $dokumen->jenisJaminan->name ?? '' }}
                                     </span>
                                 </div>
                                 <div class="mb-5">
@@ -189,7 +198,7 @@
                                         Hubungan Pemilik Jaminan:
                                     </h3>
                                     <span class="text-2sm text-gray-700">
-                                        {{ $dokumen->pemilik->hubungan_pemilik->name?? "" }}
+                                        {{ $dokumen->pemilik->hubungan_pemilik->name ?? '' }}
                                     </span>
                                 </div>
                                 <div class="mb-5">
@@ -197,20 +206,24 @@
                                         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 ?? "" }}
+                                        {{ $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)
+                                    @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 ?? "" }}
+                                                {{ $detail->name ?? '' }}
                                             </td>
                                         </tr>
                                         <tr>
@@ -218,8 +231,9 @@
                                                 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) }}
+                                                @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>
@@ -229,7 +243,7 @@
                                                 Keterangan
                                             </td>
                                             <td class="py-3 text-gray-700 text-2sm font-normal">
-                                                {{ $detail->keterangan ?? ""  }}
+                                                {{ $detail->keterangan ?? '' }}
                                             </td>
                                         </tr>
                                     @endforeach
@@ -240,32 +254,30 @@
                 @endforeach
             </div>
         </div>
-        
+
         <div class="card pb-2.5">
             <div class="card-header" id="basic_settings">
                 <h3 class="card-title">
                     Form Assignment
                 </h3>
-                <div class="flex items-center gap-2">
-                    <a href="{{ route('penilaian.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i>
-                        Back</a>
-                </div>
+
             </div>
 
             <div class="card-body">
                 <form
-                    action="{{ isset($penilaian->permohonan_id) ? route('penilaian.update', $permohonan) : route('penilaian.store') }}"
+                    action="{{ isset($penilaian->nomor_registrasi) ? route('penilaian.update', $permohonan) : route('penilaian.store') }}"
                     method="POST" class="">
-                    @if (isset($penilaian->permohonan_id))
+                    @if (isset($penilaian->nomor_registrasi))
                         @method('PUT')
                     @endif
                     @csrf
-                    <div class="pl-1 lg:pl-5 xl:pl-5 grid gap-2.5 p-5">
+                    <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">
                                 Penilai yang Dilakukan oleh
                             </label>
-                            <input type="hidden" name="permohonan_id" value="{{ $penilaian->permohonan_id ?? $permohonan->id  }}">
+                            <input type="hidden" name="nomor_registrasi"
+                                value="{{ $penilaian->nomor_registrasi ?? $permohonan->nomor_registrasi }}">
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select
                                     class="input tomselect w-full @error('jenis_penilaian_id') border-danger bg-danger-light @enderror"
@@ -273,7 +285,7 @@
                                     <option value="">Jenis Penilaian</option>
 
                                     @foreach ($jenisPenilaian as $item)
-                                        @if (isset($penilaian->permohonan_id))
+                                        @if (isset($penilaian->nomor_registrasi))
                                             <option value="{{ $item->id }}"
                                                 {{ $penilaian->teams_id == $item->id ? 'selected' : '' }}>
                                                 {{ $item->name }}</option>
@@ -294,11 +306,11 @@
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select
-                                    class="input tomselect w-full @error('teams_id') border-danger bg-danger-light @enderror"
+                                    class="input tomselect  w-full @error('teams_id') border-danger bg-danger-light @enderror"
                                     name="teams_id" id="teams_id">
                                     <option value="">Pilih Tim Penilai</option>
                                     @foreach ($teamPenilai as $item)
-                                        @if (isset($penilaian->permohonan_id))
+                                        @if (isset($penilaian->nomor_registrasi))
                                             <option value="{{ $item->id }}"
                                                 {{ $penilaian->teams_id == $item->id ? 'selected' : '' }}>
                                                 {{ $item->regions->name }}</option>
@@ -318,22 +330,14 @@
                                 Surveyor yang di tunjuk
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <select id="user_id" name="user_id"
-                                    class="input  @error('user_id') border-danger bg-danger-light @enderror  w-full">
-                                    <option value="">Pilih Penilai</option>
+                                <select id="surveyor_id" name=""
+                                    class="input select  @error('surveyor_id') border-danger bg-danger-light @enderror  w-full">
+                                    <option value="">Pilih Surveyor</option>
                                 </select>
-                            </div>
-                        </div>
 
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Surveyor dan penilai yang di tunjuk
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <select id="user_id" name="user_id"
-                                    class="input  @error('user_id') border-danger bg-danger-light @enderror  w-full">
-                                    <option value="">Pilih Penilai</option>
-                                </select>
+                                @error('surveyor_id')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                @enderror
                             </div>
                         </div>
 
@@ -342,13 +346,32 @@
                                 Penilai yang di tunjuk
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <select id="user_id" name="user_id"
-                                    class="input  @error('user_id') border-danger bg-danger-light @enderror  w-full">
+                                <select id="penilaian_id" name="penilaian_id"
+                                    class="input select @error('penilaian_id') border-danger bg-danger-light @enderror  w-full">
                                     <option value="">Pilih Penilai</option>
                                 </select>
+                                @error('penilaian_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">
+                                Surveyor dan penilai yang di tunjuk
+                            </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">
+                                    <option value="">Pilih Surveyor dan Penilai</option>
+                                </select>
+                                @error('penilai_surveyor_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">
                                 Jadwal Kunjungan
@@ -369,42 +392,98 @@
                                 Catatan
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <textarea class="textarea  @error('keterangan') border-danger bg-danger-light  @enderror" rows="3" type="text"
-                                    name="keterangan">{{ $penilaian->keterangan ?? '' }}</textarea>
+                                <textarea class="textarea  @error('keterangan') border-danger bg-danger-light  @enderror" rows="3"
+                                    type="text" name="keterangan">{{ $penilaian->keterangan ?? '' }}</textarea>
                             </div>
                             @error('keterangan')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                             @enderror
                         </div>
                     </div>
-                    <div class="flex justify-end card-footer">
-                        <button type="submit"
-                            @if ($permohonan->status == 'Assign') class="btn btn-success"
-                            @else
-                                class="btn btn-warning" @endif>
-                            Aproved
+                    <div class="flex justify-end card-footer mt-2">
+                        <button type="submit" class="btn btn-success">
+                            Aprove
+                        </button>
+
+                        <button type="button" data-modal-toggle="#modal_revisi" class="btn btn-warning ml-3">
+                            Revisi
                         </button>
                     </div>
 
                 </form>
+
+            </div>
+
+            <div class="modal" data-modal="true" id="modal_revisi">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h3 class="modal-title">
+                            Revisi
+                        </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="{{ route('penilaian.revisi', $penilaian->nomor_registrasi ?? $permohonan->nomor_registrasi) }}" method="POST" enctype="multipart/form-data">
+                            @csrf
+                            @method('PUT')
+
+                            <div class="pl-1 grid gap-2.5">
+                                <input type="hidden" name="nomor_registrasi" value="{{ $penilaian->nomor_registrasi ?? $permohonan->nomor_registrasi }}">
+
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">Dokumen Revisi</label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input class="file-input @error('dokumen_revisi') border-danger bg-danger-light @enderror" type="file" name="dokumen_revisi" value="">
+                                    </div>
+                                    @error('dokumen_revisi')
+                                        <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    @enderror
+                                </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('keterangan_revisi') border-danger bg-danger-light @enderror" rows="3" name="keterangan_revisi">{{ old('keterangan_revisi', $penilaian->keterangan ?? '') }}</textarea>
+                                    </div>
+                                    @error('keterangan')
+                                        <em class="alert text-danger text-sm">{{ $message }}</em>
+                                    @enderror
+                                </div>
+                            </div>
+
+                            <div class="modal-footer justify-end mt-2">
+                                <div class="flex gap-4">
+                                    <button class="btn btn-light" data-modal-dismiss="true">Cancel</button>
+                                    <button  class="btn btn-primary">Submit</button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+
+                </div>
             </div>
         </div>
-
     </div>
 @endsection
-
-
 @push('scripts')
     <script>
         document.addEventListener('DOMContentLoaded', function() {
             let teamsSelect = document.getElementById('teams_id');
-            let penilaiSelect = document.getElementById('user_id');
+            let penilaiSelect = document.getElementById('penilaian_id');
+            let surveyorSelect = document.getElementById('surveyor_id');
+            let penilaiSurveyorSelect = document.getElementById('penilai_surveyor_id');
 
-            // Mengambil nilai user_id dari variabel PHP
-            let selectedUserId = @json($penilaian->user_id ?? null); // Gunakan null jika tidak ada
+            let selectedSurveyorId = @json($penilaian->surveyor_id ?? null);
+            let selectedPenilaiId = @json($penilaian->penilai_id ?? null);
+            let selectedPenilaiSurveyorId = @json($penilaian->penilai_surveyor_id ?? null);
 
             function fetchPenilai(teamId) {
-                penilaiSelect.innerHTML = '';
+                penilaiSelect.innerHTML = '<option value="">Pilih Penilai</option>';
+                surveyorSelect.innerHTML = '<option value="">Pilih Surveyor</option>';
+                penilaiSurveyorSelect.innerHTML = '<option value="">Pilih Penilai Surveyor</option>';
 
                 if (teamId) {
                     fetch(`/penilaian/getUserTeams/${teamId}`)
@@ -412,35 +491,60 @@
                         .then(data => {
                             if (data && data.length > 0) {
                                 data.forEach((user) => {
-                                    let option = document.createElement('option');
-                                    option.value = user.id;
-                                    option.text = user.name;
+                                    let optionPenilai = document.createElement('option');
+                                    let optionSurveyor = document.createElement('option');
+                                    let optionPenilaiSurveyor = document.createElement('option');
 
-                                    if (selectedUserId && selectedUserId == user.id) {
-                                        option.selected = true;
+                                    optionPenilai.value = user.id;
+                                    optionSurveyor.value = user.id;
+                                    optionPenilaiSurveyor.value = user.id;
+
+                                    optionPenilai.text = user.name;
+                                    optionSurveyor.text = user.name;
+                                    optionPenilaiSurveyor.text = user.name;
+
+                                    // Tambahkan pengguna ke semua select
+                                    penilaiSelect.appendChild(optionPenilai);
+                                    surveyorSelect.appendChild(optionSurveyor);
+                                    penilaiSurveyorSelect.appendChild(optionPenilaiSurveyor);
+
+                                    // Jika dalam mode edit dan data sudah ada, set opsi yang sesuai sebagai selected
+                                    if (selectedPenilaiId && selectedPenilaiId == user.id) {
+                                        optionPenilai.selected = true;
+                                    }
+                                    if (selectedSurveyorId && selectedSurveyorId == user.id) {
+                                        optionSurveyor.selected = true;
+                                    }
+                                    if (selectedPenilaiSurveyorId && selectedPenilaiSurveyorId == user
+                                        .id) {
+                                        optionPenilaiSurveyor.selected = true;
                                     }
-
-                                    penilaiSelect.appendChild(option);
                                 });
                             } else {
-                                let option = document.createElement('option');
-                                option.value = '';
-                                option.text = 'Tidak ada penilai.';
-                                penilaiSelect.appendChild(option);
+                                let noUserOption = document.createElement('option');
+                                noUserOption.value = '';
+                                noUserOption.text = 'Tidak ada pengguna yang sesuai.';
+                                penilaiSelect.appendChild(noUserOption);
+                                surveyorSelect.appendChild(noUserOption.cloneNode(true));
+                                penilaiSurveyorSelect.appendChild(noUserOption.cloneNode(true));
                             }
                         })
                         .catch(error => {
                             console.error('Error fetching team members:', error);
-                            let option = document.createElement('option');
-                            option.value = '';
-                            option.text = 'Terjadi kesalahan.';
-                            penilaiSelect.appendChild(option);
+                            let errorOption = document.createElement('option');
+                            errorOption.value = '';
+                            errorOption.text = 'Terjadi kesalahan.';
+                            penilaiSelect.appendChild(errorOption);
+                            surveyorSelect.appendChild(errorOption.cloneNode(true));
+                            penilaiSurveyorSelect.appendChild(errorOption.cloneNode(true));
                         });
                 } else {
-                    let option = document.createElement('option');
-                    option.value = '';
-                    option.text = 'Pilih tim terlebih dahulu.';
-                    penilaiSelect.appendChild(option);
+                    let defaultOption = document.createElement('option');
+                    defaultOption.value = '';
+                    defaultOption.text = 'Pilih tim terlebih dahulu.';
+                    penilaiSelect.appendChild(defaultOption);
+                    surveyorSelect.appendChild(defaultOption.cloneNode(true));
+                    penilaiSurveyorSelect.appendChild(defaultOption.cloneNode(true));
                 }
             }
 
@@ -455,4 +559,15 @@
             }
         });
     </script>
+
+             <script>
+                document.addEventListener('DOMContentLoaded', function() {
+
+                    @if($errors->any())
+                        var modal = new Modal(document.getElementById('modal_revisi'));
+                        modal.show();
+                    @endif
+                });
+            </script>
+
 @endpush
diff --git a/resources/views/penilaian/index.blade.php b/resources/views/penilaian/index.blade.php
index 278ae14..0a5db4c 100644
--- a/resources/views/penilaian/index.blade.php
+++ b/resources/views/penilaian/index.blade.php
@@ -29,7 +29,7 @@
                 </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('permohonan.datatables') }}">
+            <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">
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index e93be5b..9fd18ba 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -299,9 +299,9 @@
         $trail->parent('basicdata');
         $trail->push('Penilaian', route('penilaian.index'));
     });
-    Breadcrumbs::for('penilaian.edit', function (BreadcrumbTrail $trail) {
+    Breadcrumbs::for('penilaian.assignment', function (BreadcrumbTrail $trail) {
         $trail->parent('penilaian');
-        $trail->push('Buat Penilaian');
+        $trail->push('Assignment');
     });
 
     Breadcrumbs::for('authorization.index', function (BreadcrumbTrail $trail) {
diff --git a/routes/web.php b/routes/web.php
index fdcfb0b..0853af9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -268,8 +268,9 @@
             Route::get('/getUserTeams/{id}', [PenilaianController::class, 'getUserTeams']);
 
             Route::get('/', [PenilaianController::class, 'index'])->name('index');
-            Route::get('{id}/edit', [PenilaianController::class, 'edit'])->name('edit');
+            Route::get('{id}/assignment', [PenilaianController::class, 'assignment'])->name('assignment');
             Route::put('{id}', [PenilaianController::class, 'update'])->name('update');
+            Route::put('{nomor_registrasi}', [PenilaianController::class, 'revisi'])->name('revisi');
             Route::post('create', [PenilaianController::class, 'create'])->name('create');
             Route::post('store', [PenilaianController::class, 'store'])->name('store');
 

From 91d70c9e2ee68f8017329b8b97f8497f631b2dcc Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Wed, 25 Sep 2024 09:44:35 +0700
Subject: [PATCH 16/16] penambahan menu activity dan perbaikan menu assingment

---
 app/Http/Controllers/ActivityController.php   | 152 +++++++++++++
 app/Http/Controllers/PenilaianController.php  |  48 ++--
 app/Http/Requests/PenilaianRequest.php        |  42 ++--
 app/Models/Penilaian.php                      |  12 +
 app/Models/Permohonan.php                     |   7 +
 app/Models/TeamsUsers.php                     |   2 +-
 ...4_09_24_014023_update_permohonan_table.php |  29 +++
 module.json                                   |   2 +-
 .../views/activity/activitydetail.blade.php   | 120 ++++++++++
 .../activity/components/status.blade.php      |  94 ++++++++
 resources/views/activity/index.blade.php      | 211 ++++++++++++++++++
 resources/views/penilaian/form.blade.php      | 150 ++++++++-----
 routes/breadcrumbs.php                        |  10 +-
 routes/web.php                                |  14 +-
 14 files changed, 805 insertions(+), 88 deletions(-)
 create mode 100644 app/Http/Controllers/ActivityController.php
 create mode 100644 database/migrations/2024_09_24_014023_update_permohonan_table.php
 create mode 100644 resources/views/activity/activitydetail.blade.php
 create mode 100644 resources/views/activity/components/status.blade.php
 create mode 100644 resources/views/activity/index.blade.php

diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
new file mode 100644
index 0000000..c24eee2
--- /dev/null
+++ b/app/Http/Controllers/ActivityController.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Exception;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\StatusPermohonan;
+
+class ActivityController extends Controller
+{
+    public $user;
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        $status_permohonan = StatusPermohonan::all();
+        return view('lpj::activity.index', compact('status_permohonan'));
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request): RedirectResponse
+    {
+        //
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+
+        $status_permohonan = StatusPermohonan::orderBy('id')->get();
+
+        $permohonan = Permohonan::with(
+            [
+                'user',
+                'debiture.province',
+                'debiture.city',
+                'debiture.district',
+                'debiture.village',
+                'branch',
+                'tujuanPenilaian',
+                'penilaian'
+            ],
+        )->findOrFail($id);
+
+        return view('lpj::activity.activitydetail', compact('id', 'status_permohonan', '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 dataForDatatables(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('debitur.view')) {
+            // abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        // Retrieve data from the database
+        $query = Permohonan::query();
+
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Apply status filter if provided
+        if ($request->has('status') && !empty($request->get('status'))) {
+            $status = $request->get('status');
+            $query->where('status', '=', $status);
+        }
+
+        // Default sorting if no sort provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        } else {
+            $query->orderBy('nomor_registrasi', 'asc'); // Default order by nomor_registrasi
+        }
+
+        // Get the total count of records before paginating
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page = (int) $request->get('page', 1);  // Default page is 1
+            $size = (int) $request->get('size', 10); // Default size is 10
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            // Limit results based on pagination
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records (after search & filters applied)
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+
+        // Calculate the total number of 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,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $request->get('page', 1),
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
+
+
+    /**
+     * Download the specified resource from storage.
+     */
+    public function download($id)
+    {
+        $document = Permohonan::find($id);
+        return response()->download(storage_path('app/public/' . $document->dokumen));
+    }
+}
diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php
index b7d91ea..0576671 100644
--- a/app/Http/Controllers/PenilaianController.php
+++ b/app/Http/Controllers/PenilaianController.php
@@ -32,6 +32,7 @@ class PenilaianController extends Controller
      */
     public function store(PenilaianRequest $request)
     {
+        //print_r($request->all());exit;
         $validatedData = $request->validated();
         if ($validatedData) {
             try {
@@ -80,14 +81,6 @@ class PenilaianController extends Controller
         }
     }
 
-    /**
-     * Show the specified resource.
-     */
-    public function show($id)
-    {
-        return view('lpj::show');
-    }
-
     /**
      * Show the form for editing the specified resource.
      */
@@ -116,21 +109,40 @@ class PenilaianController extends Controller
     /**
      * Remove the specified resource from storage.
      */
-    public function revisi(Request $request, $nomor_registrasi)
+
+    public function revisi(PenilaianRequest $request, $nomor_registrasi)
     {
-        $validate = $request->validate([
-            'keterangan_revisi' => 'required',
-            'dokumen_revisi' => 'required|file',
-        ]);
-        if ($validate) {
-                $permohonan = Permohonan::where('nomor_registrasi',
-                $nomor_registrasi);
+        $validatedData = $request->validated();
+        if ($validatedData) {
 
-                $permohonan->update($validate);
+            try {
+
+                if (isset($validatedData['dokumen']) && $request->hasFile('dokumen')) {
+                    $file_name = $validatedData['dokumen']->getClientOriginalName();
+                    $validatedData['dokumen']->storeAs('public/dokumen_revisi', $file_name);
+                }
+
+                $dataToUpdate = [
+                    'keterangan' => $validatedData['keterangan'],
+                    'dokumen' => 'dokumen_revisi/' . $file_name,
+                    '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());
+            }
         }
-
     }
 
+
+
     public function dataForDatatables(Request $request)
     {
         if (is_null($this->user) || !$this->user->can('debitur.view')) {
diff --git a/app/Http/Requests/PenilaianRequest.php b/app/Http/Requests/PenilaianRequest.php
index 8e215e4..0d9c1bf 100644
--- a/app/Http/Requests/PenilaianRequest.php
+++ b/app/Http/Requests/PenilaianRequest.php
@@ -9,20 +9,36 @@ class PenilaianRequest extends FormRequest
     /**
      * Get the validation rules that apply to the request.
      */
+
+
+
     public function rules(): array
-{
-    return [
-        'jenis_penilaian_id'    => 'required|max:255',
-        'teams_id'              => 'required|max:255',
-        'tanggal_kunjungan'     => 'required|max:255',
-        'status'                => 'required|string',
-        'nomor_registrasi'      => 'required|string',
-        'surveyor_id'           => 'nullable|required_without:penilai_surveyor_id',
-        'penilaian_id'          => 'nullable|required_without:penilai_surveyor_id',
-        'penilai_surveyor_id'   => 'nullable|required_without:surveyor_id|required_without:penilaian_id',
-        'keterangan'            => 'nullable',
-    ];
-}
+    {
+
+
+        $action = $this->input('action');
+
+        if ($action === 'revisi') {
+            return [
+                'dokumen' => 'required|file|mimes:pdf',
+                'keterangan' => 'required|string',
+            ];
+        }
+
+
+
+        return [
+            'jenis_penilaian_id' => 'required|max:255',
+            'teams_id'           => 'required|max:255',
+            'tanggal_kunjungan'  => 'required|max:255',
+            'status'             => 'required|string',
+            'nomor_registrasi'   => 'required|string',
+          'surveyor_id'        => 'nullable|required_without:penilai_surveyor_id',
+            'penilaian_id'       => 'nullable|required_without:penilai_surveyor_id',
+            'penilai_surveyor_id' => 'nullable|required_without_all:surveyor_id,penilaian_id',
+            'keterangan'         => 'nullable',
+        ];
+    }
 
 
     /**
diff --git a/app/Models/Penilaian.php b/app/Models/Penilaian.php
index 65306aa..93bd3e8 100644
--- a/app/Models/Penilaian.php
+++ b/app/Models/Penilaian.php
@@ -36,6 +36,18 @@ class Penilaian extends Model
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
+    public function userPenilai(){
+        return $this->belongsTo(User::class, 'penilaian_id', 'id');
+    }
+
+    public function userSurveyor(){
+        return $this->belongsTo(User::class, 'surveyor_id', 'id');
+    }
+
+    public function userPenilaiSurveyor(){
+        return $this->belongsTo(User::class, 'penilai_surveyor_id', 'id');
+    }
+
     public function permohonan(){
         return $this->belongsTo(Permohonan::class, 'nomor_registrasi', 'nomor_registrasi');
     }
diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php
index cf6d5e6..227246d 100644
--- a/app/Models/Permohonan.php
+++ b/app/Models/Permohonan.php
@@ -6,6 +6,8 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\PermohonanFactory;
 use Modules\Usermanagement\Models\User;
+use Modules\Lpj\Models\TujuanPenilaian;
+use Modules\Lpj\Models\JenisFasilitasKredit;
 
 class Permohonan extends Base
 {
@@ -18,6 +20,7 @@ class Permohonan extends Base
         'tujuan_penilaian_id',
         'debiture_id',
         'keterangan',
+        'dokumen',
         'jenis_fasilitas_kredit_id',
         'nilai_plafond_id',
         'status',
@@ -54,4 +57,8 @@ class Permohonan extends Base
     public function jenisFasilitasKredit(){
         return $this->belongsTo(JenisFasilitasKredit::class);
     }
+
+    public function penilaian(){
+        return $this->belongsTo(Penilaian::class,  'nomor_registrasi', 'nomor_registrasi');
+    }
 }
diff --git a/app/Models/TeamsUsers.php b/app/Models/TeamsUsers.php
index c98b6d0..a47cae9 100644
--- a/app/Models/TeamsUsers.php
+++ b/app/Models/TeamsUsers.php
@@ -4,7 +4,7 @@ namespace Modules\Lpj\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Modules\Lpj\Database\Factories\TeamsUsersFactory;
-// use Modules\User\Models\User;
+use Modules\Usermanagement\Models\User;
 use Modules\Lpj\Models\Teams;
 
 class TeamsUsers extends Model
diff --git a/database/migrations/2024_09_24_014023_update_permohonan_table.php b/database/migrations/2024_09_24_014023_update_permohonan_table.php
new file mode 100644
index 0000000..6103ce2
--- /dev/null
+++ b/database/migrations/2024_09_24_014023_update_permohonan_table.php
@@ -0,0 +1,29 @@
+<?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('permohonan', function (Blueprint $table) {
+            $table->string('dokumen')->nullable()->after('status');
+            $table->string('keterangan')->nullable()->after('dokumen');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('permohonan', function (Blueprint $table) {
+            $table->dropColumn('dokumen');
+            $table->dropColumn('keterangan');
+        });
+    }
+};
diff --git a/module.json b/module.json
index aabe3d6..4d62cc1 100644
--- a/module.json
+++ b/module.json
@@ -69,7 +69,7 @@
             },
             {
                 "title": "Activity",
-                "path": "penilaian",
+                "path": "activity",
                 "icon": "ki-filled ki-some-files text-lg",
                 "classes": "",
                 "attributes": [],
diff --git a/resources/views/activity/activitydetail.blade.php b/resources/views/activity/activitydetail.blade.php
new file mode 100644
index 0000000..ec335f0
--- /dev/null
+++ b/resources/views/activity/activitydetail.blade.php
@@ -0,0 +1,120 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+
+@section('content')
+    @push('styles')
+        <style>
+            .border-l-primary {
+                border-left-color: #0d6efd !important;
+            }
+        </style>
+    @endpush
+    <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">
+                Activity Permohonan
+            </h3>
+            <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>
+                    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">
+                    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
+                            class="flex items-center justify-center shrink-0 rounded-full
+                        {{ 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('order')
+                                    <i class="ki-filled ki-handcart text-base"></i>
+                                @break
+
+                                @case('revisi')
+                                    <i class="ki-filled ki-notepad-edit text-base"></i>
+                                @break
+
+                                @case('register')
+                                    <i class="ki-filled ki-note-2 text-base"></i>
+                                @break
+
+                                @case('assign')
+                                    <i class="ki-filled ki-file-added"></i>
+                                @break
+
+                                @case('survey')
+                                    <i class="ki-filled ki-map text-base"></i>
+                                @break
+
+                                @default
+                                    <i class="ki-filled ki-people text-base"></i>
+                            @endswitch
+
+                        </div>
+                        @include('lpj::activity.components.status')
+                    </div>
+                @endforeach
+            </div>
+        </div>
+        <div class="card-footer justify-center">
+
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/activity/components/status.blade.php b/resources/views/activity/components/status.blade.php
new file mode 100644
index 0000000..0952cc3
--- /dev/null
+++ b/resources/views/activity/components/status.blade.php
@@ -0,0 +1,94 @@
+<div class="pl-2.5 mb-7 text-md grow">
+    <div class="flex flex-col">
+        <div class="text-sm text-gray-800">
+            {{ $status->name . ' ' . $status->description }}
+        </div>
+        <span class="text-xs text-gray-600">
+            @if (strtolower($status->name) == 'order')
+                {{ $permohonan->created_at }}
+            @elseif (strtolower($status->name) == strtolower($permohonan->status))
+                {{ $permohonan->updated_at }}
+            @endif
+        </span>
+    </div>
+
+    @php
+        $isCurrentStatus = strtolower($status->name) == strtolower($permohonan->status);
+        $hasKeterangan = isset($permohonan->keterangan);
+    @endphp
+
+    {{-- Tampilkan keterangan jika status 'register' --}}
+    @if (strtolower($status->name) == 'register' && $hasKeterangan && $isCurrentStatus)
+        <div class="card shadow-none">
+            <div class="card-body">
+                <p class="text-xs text-gray-800 leading-[22px]">
+                    {{ $permohonan->keterangan }}
+                </p>
+            </div>
+        </div>
+    @endif
+
+    {{-- Tampilkan dokumen dan keterangan jika status 'revisi' --}}
+    @if (strtolower($status->name) == 'revisi' && $hasKeterangan)
+        <div class="card shadow-none">
+            <div class="card-body">
+                <a href="{{ route('activity.download', $permohonan->id) }}" class="badge badge-sm badge-outline">
+                    {{ basename($permohonan->dokumen) }}
+                    <i class="ki-filled ki-cloud-download"></i>
+                </a>
+                <p class="text-xs text-gray-800 leading-[22px]">
+                    {{ $permohonan->keterangan }}
+                </p>
+            </div>
+        </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>
+                </div>
+            </div>
+        </div>
+    @endif
+</div>
diff --git a/resources/views/activity/index.blade.php b/resources/views/activity/index.blade.php
new file mode 100644
index 0000000..4dd0179
--- /dev/null
+++ b/resources/views/activity/index.blade.php
@@ -0,0 +1,211 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render('activity') }}
+@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-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">
+                                <i class="ki-filled ki-magnifier"></i>
+                                <input placeholder="Search Penilaian" id="search" type="text" value="">
+                            </label>
+                        </div>
+
+                        <div class="flex">
+                            <select class="select select-sm w-28" name="select" id="status-filter">
+                                <option value="">Pilih Status</option>
+                                @foreach ($status_permohonan as $item)
+                                    <option value="{{ strtolower($item->name) }}">{{ $item->name }}</option>
+                                @endforeach
+                            </select>
+                        </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('activity.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 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 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 Permohonan'
+                },
+                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}`,
+                },
+                status: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        let badgeClass = '';
+                        switch (data.status.toLowerCase()) {
+                            case 'revisi':
+                                badgeClass = 'badge badge-pill badge-outline badge-warning';
+                                break;
+                            case 'order':
+                                badgeClass = 'badge badge-pill badge-outline badge-info';
+                                break;
+                            case 'register':
+                                badgeClass = 'badge badge-pill badge-outline badge-success';
+                                break;
+                            case 'survey':
+                                badgeClass = 'badge badge-pill badge-outline badge-primary';
+                                break;
+                            case 'assign':
+                                badgeClass = 'badge badge-pill badge-outline badge-dark';
+                                break;
+                            default:
+                                badgeClass = 'badge badge-pill badge-outline';
+                        }
+
+                        return `<span class="badge ${badgeClass}">${data.status}</span>`;
+                    },
+                },
+
+                actions: {
+                    title: 'Action',
+                    render: (item, data) => `
+                    <div class="flex flex-nowrap justify-center">
+                        <a class="btn btn-sm btn-icon btn-clear btn-warning" href="activity/${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);
+        });
+    </script>
+@endpush
diff --git a/resources/views/penilaian/form.blade.php b/resources/views/penilaian/form.blade.php
index 4112b0a..63b642c 100644
--- a/resources/views/penilaian/form.blade.php
+++ b/resources/views/penilaian/form.blade.php
@@ -27,6 +27,10 @@
                 <h3 class="card-title">
                     Data Permohonan
                 </h3>
+                <div class="flex items-center gap-2">
+                    <a href="{{ route('penilaian.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">
@@ -330,7 +334,7 @@
                                 Surveyor yang di tunjuk
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <select id="surveyor_id" name=""
+                                <select id="surveyor_id" name="surveyor_id"
                                     class="input select  @error('surveyor_id') border-danger bg-danger-light @enderror  w-full">
                                     <option value="">Pilih Surveyor</option>
                                 </select>
@@ -414,56 +418,65 @@
 
             </div>
 
-            <div class="modal" data-modal="true" id="modal_revisi">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h3 class="modal-title">
-                            Revisi
-                        </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="{{ route('penilaian.revisi', $penilaian->nomor_registrasi ?? $permohonan->nomor_registrasi) }}" method="POST" enctype="multipart/form-data">
-                            @csrf
-                            @method('PUT')
 
-                            <div class="pl-1 grid gap-2.5">
-                                <input type="hidden" name="nomor_registrasi" value="{{ $penilaian->nomor_registrasi ?? $permohonan->nomor_registrasi }}">
+        </div>
 
-                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                                    <label class="form-label max-w-56">Dokumen Revisi</label>
-                                    <div class="flex flex-wrap items-baseline w-full">
-                                        <input class="file-input @error('dokumen_revisi') border-danger bg-danger-light @enderror" type="file" name="dokumen_revisi" value="">
-                                    </div>
-                                    @error('dokumen_revisi')
-                                        <em class="alert text-danger text-sm">{{ $message }}</em>
-                                    @enderror
-                                </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('keterangan_revisi') border-danger bg-danger-light @enderror" rows="3" name="keterangan_revisi">{{ old('keterangan_revisi', $penilaian->keterangan ?? '') }}</textarea>
-                                    </div>
-                                    @error('keterangan')
-                                        <em class="alert text-danger text-sm">{{ $message }}</em>
-                                    @enderror
-                                </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">Revisi</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="{{ route('penilaian.revisi', $penilaian->nomor_registrasi ?? $permohonan->nomor_registrasi) }}"
+                    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">Dokumen Revisi</label>
+                            <div class="flex flex-wrap items-baseline w-full">
+                                <input id="dokumen"
+                                    class="file-input @error('dokumen') border-danger bg-danger-light @enderror"
+                                    type="file" name="dokumen">
+                                @error('dokumen')
+                                    <em class="alert text-danger text-sm">{{ $message }}</em>
+                                @enderror
                             </div>
+                        </div>
 
-                            <div class="modal-footer justify-end mt-2">
-                                <div class="flex gap-4">
-                                    <button class="btn btn-light" data-modal-dismiss="true">Cancel</button>
-                                    <button  class="btn btn-primary">Submit</button>
-                                </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>
-                        </form>
+                        </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>
@@ -477,7 +490,7 @@
             let penilaiSurveyorSelect = document.getElementById('penilai_surveyor_id');
 
             let selectedSurveyorId = @json($penilaian->surveyor_id ?? null);
-            let selectedPenilaiId = @json($penilaian->penilai_id ?? null);
+            let selectedPenilaiId = @json($penilaian->penilaian_id ?? null);
             let selectedPenilaiSurveyorId = @json($penilaian->penilai_surveyor_id ?? null);
 
             function fetchPenilai(teamId) {
@@ -508,7 +521,6 @@
                                     surveyorSelect.appendChild(optionSurveyor);
                                     penilaiSurveyorSelect.appendChild(optionPenilaiSurveyor);
 
-                                    // Jika dalam mode edit dan data sudah ada, set opsi yang sesuai sebagai selected
                                     if (selectedPenilaiId && selectedPenilaiId == user.id) {
                                         optionPenilai.selected = true;
                                     }
@@ -560,14 +572,46 @@
         });
     </script>
 
-             <script>
-                document.addEventListener('DOMContentLoaded', function() {
+<script>
+    document.addEventListener('DOMContentLoaded', function() {
+        const revisiForm = document.getElementById('revisiForm');
+        const btnSubmit = document.getElementById('btnSubmit');
 
-                    @if($errors->any())
-                        var modal = new Modal(document.getElementById('modal_revisi'));
-                        modal.show();
-                    @endif
-                });
-            </script>
+        btnSubmit.addEventListener('click', function(event) {
+            // Cegah form dari pengiriman default
+            event.preventDefault();
 
+            // Ambil nilai dari input dan textarea
+            const dokumenRevisi = document.getElementById('dokumen').value;
+            const keteranganRevisi = document.getElementById('keterangan').value.trim();
+
+            // Bersihkan pesan kesalahan sebelumnya
+            document.querySelectorAll('.alert.text-danger').forEach(el => el.remove());
+
+            // Validasi: jika ada field kosong, tampilkan pesan kesalahan
+            let isValid = true;
+
+            if (!dokumenRevisi) {
+                const errorMessage = document.createElement('em');
+                errorMessage.className = 'alert text-danger text-sm';
+                errorMessage.innerText = 'Dokumen Revisi harus diisi.';
+                document.getElementById('dokumen').parentElement.appendChild(errorMessage);
+                isValid = false; // Set isValid ke false
+            }
+
+            if (!keteranganRevisi) {
+                const errorMessage = document.createElement('em');
+                errorMessage.className = 'alert text-danger text-sm';
+                errorMessage.innerText = 'Catatan harus diisi.';
+                document.getElementById('keterangan').parentElement.appendChild(errorMessage);
+                isValid = false; // Set isValid ke false
+            }
+
+            // Jika semua field valid, kirim form
+            if (isValid) {
+                revisiForm.submit();
+            }
+        });
+    });
+</script>
 @endpush
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 9fd18ba..76d3098 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -296,7 +296,6 @@
 
 
     Breadcrumbs::for('penilaian', function (BreadcrumbTrail $trail) {
-        $trail->parent('basicdata');
         $trail->push('Penilaian', route('penilaian.index'));
     });
     Breadcrumbs::for('penilaian.assignment', function (BreadcrumbTrail $trail) {
@@ -313,3 +312,12 @@
         $trail->push('Detail Permohonan');
     });
 
+
+    Breadcrumbs::for('activity', function (BreadcrumbTrail $trail) {
+        $trail->push('Activity', route('activity.index'));
+    });
+
+    Breadcrumbs::for('activity.show', function (BreadcrumbTrail $trail) {
+        $trail->parent('activity');
+        $trail->push('Activity activity');
+    });
diff --git a/routes/web.php b/routes/web.php
index 0853af9..0f89fea 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -22,6 +22,7 @@
     use Modules\Lpj\Http\Controllers\StatusPermohonanController;
     use Modules\Lpj\Http\Controllers\TeamsController;
     use Modules\Lpj\Http\Controllers\TujuanPenilaianController;
+    use Modules\Lpj\Http\Controllers\ActivityController;
 
     /*
     |--------------------------------------------------------------------------
@@ -270,9 +271,20 @@
             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('{nomor_registrasi}', [PenilaianController::class, 'revisi'])->name('revisi');
+            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::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');
+        });
     });