From be47e0678a31ca554e1b2b2bb1bb04ce18485561 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 3 Sep 2024 13:41:05 +0700 Subject: [PATCH 01/68] Update Module Permohonan - Update Automaticly get branch id by user login - change static status permohonan to dynamic and database base - update create permohonan, update selection debiture to table base --- app/Http/Controllers/PermohonanController.php | 45 ++--- app/Http/Requests/JenisJaminanRequest.php | 23 ++- app/Http/Requests/PermohonanRequest.php | 3 +- ...073834_create_permohonan_jaminan_table.php | 38 ++++ resources/views/debitur/edit.blade.php | 12 +- resources/views/permohonan/create.blade.php | 184 ++++++++++++++++++ resources/views/permohonan/form.blade.php | 37 +--- routes/web.php | 2 +- 8 files changed, 266 insertions(+), 78 deletions(-) create mode 100644 database/migrations/2024_08_23_073834_create_permohonan_jaminan_table.php create mode 100644 resources/views/permohonan/create.blade.php diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php index d45c873..1392157 100644 --- a/app/Http/Controllers/PermohonanController.php +++ b/app/Http/Controllers/PermohonanController.php @@ -11,6 +11,7 @@ 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 @@ -24,7 +25,6 @@ public function store(PermohonanRequest $request) { - $validate = $request->validated(); if ($validate) { @@ -37,7 +37,7 @@ } catch (Exception $e) { return redirect() ->route('permohonan.create') - ->with('error', 'Failed to create permohonan'. $e->getMessage()); + ->with('error', 'Failed to create permohonan' . $e->getMessage()); } } else { return redirect() @@ -47,26 +47,19 @@ } } - public function create() + public function create(){ + + return view('lpj::permohonan.create'); + } + + public function createPermohonan($debitur) { $branches = Branch::all(); - $debitures = Debiture::all(); + $debitur = Debiture::find($debitur); $tujuanPenilaian = TujuanPenilaian::all(); - $status = [ - 'order' => 'Order', - 'revisi' => 'Revisi', - 'register' => 'Register', - 'assign' => 'Assign', - 'survey' => 'Survey', - 'finalisasi' => 'Proses Laporan', - 'approved' => 'Diterima', - 'rejected' => 'Ditolak', - 'cancel' => 'Dibatalkan', - 'finished' => 'Selesai', - 'not_started' => 'Belum dimulai', - ]; + $status = StatusPermohonan::all(); - return view('lpj::permohonan.form', compact('branches', 'debitures', 'tujuanPenilaian','status')); + return view('lpj::permohonan.form', compact('branches', 'debitur', 'tujuanPenilaian', 'status')); } public function edit($id) @@ -75,23 +68,11 @@ $branches = Branch::all(); $debitures = Debiture::all(); $tujuanPenilaian = TujuanPenilaian::all(); - $status = [ - 'order' => 'Order', - 'revisi' => 'Revisi', - 'register' => 'Register', - 'assign' => 'Assign', - 'survey' => 'Survey', - 'finalisasi' => 'Proses Laporan', - 'approved' => 'Diterima', - 'rejected' => 'Ditolak', - 'cancel' => 'Dibatalkan', - 'finished' => 'Selesai', - 'not_started' => 'Belum dimulai', - ]; + $status = StatusPermohonan::all(); return view( 'lpj::permohonan.form', - compact('permohonan', 'branches', 'debitures', 'tujuanPenilaian','status'), + compact('permohonan', 'branches', 'debitures', 'tujuanPenilaian', 'status'), ); } diff --git a/app/Http/Requests/JenisJaminanRequest.php b/app/Http/Requests/JenisJaminanRequest.php index 4e2da8f..0295054 100644 --- a/app/Http/Requests/JenisJaminanRequest.php +++ b/app/Http/Requests/JenisJaminanRequest.php @@ -2,6 +2,7 @@ namespace Modules\Lpj\Http\Requests; + use Haruncpi\LaravelIdGenerator\IdGenerator; use Illuminate\Foundation\Http\FormRequest; class JenisJaminanRequest extends FormRequest @@ -12,16 +13,10 @@ public function rules() : array { - $rules = [ + return [ + 'code' => 'required|max:5', 'name' => 'required|max:255', ]; - - if ($this->method() == 'PUT') { - $rules['code'] = 'required|max:50|unique:jenis_jaminan,code,' . $this->id; - } else { - $rules['code'] = 'required|max:50|unique:jenis_jaminan,code'; - } - return $rules; } /** @@ -32,4 +27,16 @@ { return true; } + + public function prepareForValidation() + : void + { + if ($this->method() == 'POST') { + $this->merge([ + 'code' => IdGenerator::generate( + ['table' => 'jenis_jaminan', 'length' => 5, 'prefix' => 'JJ', 'field' => 'code'], + ), + ]); + } + } } diff --git a/app/Http/Requests/PermohonanRequest.php b/app/Http/Requests/PermohonanRequest.php index 5a576dd..e4c4bd8 100644 --- a/app/Http/Requests/PermohonanRequest.php +++ b/app/Http/Requests/PermohonanRequest.php @@ -40,10 +40,11 @@ if (!$this->id) { $this->merge([ 'nomor_registrasi' => IdGenerator::generate( - ['table' => 'permohonan', 'length' => 10, 'prefix'=>'REG', 'field' => 'nomor_registrasi'], + ['table' => 'permohonan', 'length' => 10, 'prefix' => 'REG', 'field' => 'nomor_registrasi'], ), 'tanggal_permohonan' => date('Y-m-d'), 'user_id' => auth()->user()->id, + 'branch_id' => auth()->user()->branch_id, ]); } } diff --git a/database/migrations/2024_08_23_073834_create_permohonan_jaminan_table.php b/database/migrations/2024_08_23_073834_create_permohonan_jaminan_table.php new file mode 100644 index 0000000..ad46f00 --- /dev/null +++ b/database/migrations/2024_08_23_073834_create_permohonan_jaminan_table.php @@ -0,0 +1,38 @@ +id(); + $table->foreignIdFor(Permohonan::class)->constrained('permohonan'); + $table->foreignIdFor(DokumenJaminan::class)->constrained('dokumen_jaminan'); + $table->boolean('status')->default(true)->nullable(); + $table->timestamps(); + $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('permohonan_jaminan'); + } + }; diff --git a/resources/views/debitur/edit.blade.php b/resources/views/debitur/edit.blade.php index a8cca46..8e2935a 100644 --- a/resources/views/debitur/edit.blade.php +++ b/resources/views/debitur/edit.blade.php @@ -10,12 +10,16 @@
- Data Debitur - Dokumen Jaminan - Pemilk Jaminan + Data Debitur + Dokumen Jaminan + Pemilk Jaminan
- Back + @if(request()->get('from') == 'permohonan') + Back + @else + Back + @endif
diff --git a/resources/views/permohonan/create.blade.php b/resources/views/permohonan/create.blade.php new file mode 100644 index 0000000..eaf9e31 --- /dev/null +++ b/resources/views/permohonan/create.blade.php @@ -0,0 +1,184 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render(request()->route()->getName()) }} +@endsection + +@section('content') +
+
+
+

+ Daftar Debitur +

+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + +
+ + + Cif + + + Nomor Rekening + + + Debitur + + + Cabang + + + Email + + + Phone + + + Alamat + + Action
+
+
+
+ Show + per page +
+
+ + +
+
+
+
+
+@endsection + +@push('scripts') + + + +@endpush diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php index 091c4d5..8dbe82f 100644 --- a/resources/views/permohonan/form.blade.php +++ b/resources/views/permohonan/form.blade.php @@ -50,33 +50,6 @@
-
- -
- - @error('branch_id') - {{ $message }} - @enderror -
-
-
+ @endif
- + @error('name') {{ $message }} @enderror From 3a787fb1767b46407856539f95e7c2a763481e63 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 4 Sep 2024 20:27:13 +0700 Subject: [PATCH 04/68] Update Module Jenis Jaminan - Penambahan Slug - Penambahan Funtcion to get legalitas jaminan by id jenis jaminan --- .../Controllers/JenisJaminanController.php | 18 ++++++-- app/Http/Requests/JenisJaminanRequest.php | 16 +++++-- app/Models/JenisJaminan.php | 4 +- ...9_04_082059_update_jenis_jaminan_table.php | 28 ++++++++++++ .../views/jenis_jaminan/create.blade.php | 44 ++++++++++++++----- routes/web.php | 1 + 6 files changed, 90 insertions(+), 21 deletions(-) create mode 100644 database/migrations/2024_09_04_082059_update_jenis_jaminan_table.php diff --git a/app/Http/Controllers/JenisJaminanController.php b/app/Http/Controllers/JenisJaminanController.php index f9736d2..e1cbe82 100644 --- a/app/Http/Controllers/JenisJaminanController.php +++ b/app/Http/Controllers/JenisJaminanController.php @@ -9,6 +9,7 @@ use Modules\Lpj\Exports\JenisJaminanExport; use Modules\Lpj\Http\Requests\JenisJaminanRequest; use Modules\Lpj\Models\JenisJaminan; + use Modules\Lpj\Models\JenisLegalitasJaminan; class JenisJaminanController extends Controller { @@ -40,13 +41,15 @@ public function create() { - return view('lpj::jenis_jaminan.create'); + $jenisLegalitasJaminan = JenisLegalitasJaminan::all(); + return view('lpj::jenis_jaminan.create', compact('jenisLegalitasJaminan')); } public function edit($id) { - $jenisJaminan = JenisJaminan::find($id); - return view('lpj::jenis_jaminan.create', compact('jenisJaminan')); + $jenisJaminan = JenisJaminan::find($id); + $jenisLegalitasJaminan = JenisLegalitasJaminan::all(); + return view('lpj::jenis_jaminan.create', compact('jenisJaminan', 'jenisLegalitasJaminan')); } public function update(JenisJaminanRequest $request, $id) @@ -147,4 +150,13 @@ { return Excel::download(new JenisJaminanExport, 'jenis_jaminan.xlsx'); } + + public function legalitasJaminan($id) + { + $jenisJaminan = JenisJaminan::find($id); + $legalitasJaminan = $jenisJaminan->jenis_legalitas_jaminan_id; + + $legalitas = JenisLegalitasJaminan::whereIn('code', json_decode($legalitasJaminan, true))->get(); + echo json_encode($legalitas); + } } diff --git a/app/Http/Requests/JenisJaminanRequest.php b/app/Http/Requests/JenisJaminanRequest.php index 0295054..6f0325c 100644 --- a/app/Http/Requests/JenisJaminanRequest.php +++ b/app/Http/Requests/JenisJaminanRequest.php @@ -2,8 +2,9 @@ namespace Modules\Lpj\Http\Requests; - use Haruncpi\LaravelIdGenerator\IdGenerator; + use daengdeni\LaravelIdGenerator\IdGenerator; use Illuminate\Foundation\Http\FormRequest; + use Illuminate\Support\Str; class JenisJaminanRequest extends FormRequest { @@ -14,8 +15,10 @@ : array { return [ - 'code' => 'required|max:5', - 'name' => 'required|max:255', + 'code' => 'required|max:5', + 'name' => 'required|max:255', + 'slug' => 'required|max:255', + 'jenis_legalitas_jaminan_id' => 'nullable', ]; } @@ -35,8 +38,13 @@ $this->merge([ 'code' => IdGenerator::generate( ['table' => 'jenis_jaminan', 'length' => 5, 'prefix' => 'JJ', 'field' => 'code'], - ), + ) ]); } + + $this->merge([ + 'jenis_legalitas_jaminan_id' => json_encode($this->jenis_legalitas_jaminan_id), + 'slug' => Str::slug($this->name), + ]); } } diff --git a/app/Models/JenisJaminan.php b/app/Models/JenisJaminan.php index 1820e50..43ab899 100644 --- a/app/Models/JenisJaminan.php +++ b/app/Models/JenisJaminan.php @@ -2,10 +2,8 @@ namespace Modules\Lpj\Models; - use Modules\Lpj\Database\Factories\JenisJaminanFactory; - class JenisJaminan extends Base { protected $table = 'jenis_jaminan'; - protected $fillable = ['code', 'name']; + protected $fillable = ['code', 'name','slug','jenis_legalitas_jaminan_id']; } diff --git a/database/migrations/2024_09_04_082059_update_jenis_jaminan_table.php b/database/migrations/2024_09_04_082059_update_jenis_jaminan_table.php new file mode 100644 index 0000000..0f96b67 --- /dev/null +++ b/database/migrations/2024_09_04_082059_update_jenis_jaminan_table.php @@ -0,0 +1,28 @@ +string('jenis_legalitas_jaminan_id')->nullable()->after('slug'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('jenis_jaminan', function (Blueprint $table) { + $table->dropColumn('jenis_legalitas_jaminan_id'); + }); + } +}; diff --git a/resources/views/jenis_jaminan/create.blade.php b/resources/views/jenis_jaminan/create.blade.php index e627502..ed04b81 100644 --- a/resources/views/jenis_jaminan/create.blade.php +++ b/resources/views/jenis_jaminan/create.blade.php @@ -24,28 +24,50 @@
-
- -
- - @error('code') - {{ $message }} - @enderror + @if(isset($jenisJaminan->id)) +
+ +
+ + @error('code') + {{ $message }} + @enderror +
-
+ @endif
- + @error('name') {{ $message }} @enderror
+ +
+ +
+ @foreach($jenisLegalitasJaminan as $row) + + @endforeach +
+
+ +@push('scripts') + +@endpush From df9b68ae4684908ee4c0a5128cfb9ec0fd71d7fb Mon Sep 17 00:00:00 2001 From: majid Date: Thu, 5 Sep 2024 14:43:05 +0700 Subject: [PATCH 09/68] 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 @@ +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 @@ +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 @@ +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 @@ +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 @@ +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 @@ +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 @@ +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 @@ +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 @@ +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 Date: Fri, 6 Sep 2024 08:50:57 +0700 Subject: [PATCH 10/68] 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 797cf6bb5bacfb7e81ff9e62748f5780a78587c7 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 10 Sep 2024 17:53:46 +0700 Subject: [PATCH 11/68] update Module Dokumen Jaminan --- .../Controllers/DokumenJaminanController.php | 54 +++++-- .../Requests/DetailDokumenJaminanRequest.php | 43 +++++ app/Http/Requests/DokumenJaminanRequest.php | 4 - app/Models/DetailDokumenJaminan.php | 34 ++++ app/Models/DokumenJaminan.php | 8 - ...5_030400_create_dokumen_jaminan_table.php} | 4 - ...10_create_detail_dokumen_jaminan_table.php | 44 ++++++ .../debitur/components/dokumen.blade.php | 148 ++++++++---------- .../debitur/components/jaminan.blade.php | 9 +- 9 files changed, 231 insertions(+), 117 deletions(-) create mode 100644 app/Http/Requests/DetailDokumenJaminanRequest.php create mode 100644 app/Models/DetailDokumenJaminan.php rename database/migrations/{2024_08_20_090400_create_dokumen_jaminan_table.php => 2024_09_05_030400_create_dokumen_jaminan_table.php} (88%) create mode 100644 database/migrations/2024_09_05_035110_create_detail_dokumen_jaminan_table.php diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php index 1907fbf..520c20e 100644 --- a/app/Http/Controllers/DokumenJaminanController.php +++ b/app/Http/Controllers/DokumenJaminanController.php @@ -4,12 +4,14 @@ use App\Http\Controllers\Controller; use Exception; + use Illuminate\Support\Facades\DB; use Modules\Location\Models\City; use Modules\Location\Models\District; use Modules\Location\Models\Province; use Modules\Location\Models\Village; use Modules\Lpj\Http\Requests\DokumenJaminanRequest; use Modules\Lpj\Models\Debiture; + use Modules\Lpj\Models\DetailDokumenJaminan; use Modules\Lpj\Models\DokumenJaminan; use Modules\Lpj\Models\JenisJaminan; use Modules\Lpj\Models\JenisLegalitasJaminan; @@ -36,8 +38,10 @@ $debitur = Debiture::find($id); $validate = $request->validated(); + if ($validate) { try { + DB::beginTransaction(); $validate['debiture_id'] = $id; if ($validate['pemilik_jaminan_id'] == 0) { @@ -61,22 +65,54 @@ $validate['pemilik_jaminan_id'] = $pemilikJaminan->id; } - if ($request->hasFile('dokumen_jaminan')) { - $file = $request->file('dokumen_jaminan'); - $file_name = $file->getClientOriginalName(); - $file->storeAs('public/jaminan/' . $debitur->id, $file_name); - $validate['dokumen_jaminan'] = 'jaminan/' . $debitur->id . '/' . $file_name; + $document = DokumenJaminan::create($validate); + + try { + + foreach ($request->dokumen_jaminan as $key => $value) { + $file_name = $value->getClientOriginalName(); + + if ($file_name) { + try { + $file_name = $value->getClientOriginalName(); + $value->storeAs( + 'public/jaminan/' . $debitur->id . '/' . $document->id . '/', + $file_name + ); + + $detail = [ + 'dokumen_jaminan_id' => $document->id, + 'jenis_legalitas_jaminan_id' => $request->jenis_legalitas_jaminan_id[$key], + 'dokumen_jaminan' => 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name, + 'name' => $request->name[$key], + 'keterangan' => $request->keterangan[$key], + ]; + DetailDokumenJaminan::create($detail); + } catch (Exception $e) { + DB::rollBack(); + return redirect()->route('debitur.jaminan.index', $id)->with( + 'error', + 'Gagal upload file dokumen jaminan '. $key. ': '. $e->getMessage(), + ); + } + } + } + DB::commit(); + }catch (Exception $e) { + DB::rollBack(); + return redirect()->route('debitur.jaminan.index', $id)->with( + 'error', + 'gg'.$e->getMessage(), + ); } - - DokumenJaminan::create($validate); - return redirect()->route('debitur.jaminan.index', $id)->with( 'success', 'Dokumen Jaminan berhasil ditambahkan', ); } catch (Exception $e) { - return redirect()->route('debitur.jaminan.index', $id)->with('error', $e->getMessage()); + DB::rollBack(); + return redirect()->route('debitur.jaminan.index', $id)->with('error','ggl'. $e->getMessage()); } } } diff --git a/app/Http/Requests/DetailDokumenJaminanRequest.php b/app/Http/Requests/DetailDokumenJaminanRequest.php new file mode 100644 index 0000000..4cb22ce --- /dev/null +++ b/app/Http/Requests/DetailDokumenJaminanRequest.php @@ -0,0 +1,43 @@ + 'required|exists:debitures,id', + 'pemilik_jaminan_id' => 'required', + 'jenis_jaminan_id' => 'required', + 'jenis_legalitas_jaminan_id' => 'required', + 'dokumen_jaminan' => 'nullable|file|mimes:pdf', + 'keterangan' => 'nullable|string|max:255', + 'province_code' => 'nullable|exists:provinces,code', + 'city_code' => 'nullable|exists:cities,code', + 'district_code' => 'nullable|exists:districts,code', + 'village_code' => 'nullable|exists:villages,code', + 'name' => 'required', + 'address' => 'nullable|string', + 'postal_code' => 'nullable|string|max:10', + 'status' => 'nullable|boolean', + ]; + + return $rules; + } + + /** + * Determine if the user is authorized to make this request. + */ + public function authorize() + : bool + { + return true; + } + } diff --git a/app/Http/Requests/DokumenJaminanRequest.php b/app/Http/Requests/DokumenJaminanRequest.php index 4cb22ce..bc5cad4 100644 --- a/app/Http/Requests/DokumenJaminanRequest.php +++ b/app/Http/Requests/DokumenJaminanRequest.php @@ -16,14 +16,10 @@ 'debiture_id' => 'required|exists:debitures,id', 'pemilik_jaminan_id' => 'required', 'jenis_jaminan_id' => 'required', - 'jenis_legalitas_jaminan_id' => 'required', - 'dokumen_jaminan' => 'nullable|file|mimes:pdf', - 'keterangan' => 'nullable|string|max:255', 'province_code' => 'nullable|exists:provinces,code', 'city_code' => 'nullable|exists:cities,code', 'district_code' => 'nullable|exists:districts,code', 'village_code' => 'nullable|exists:villages,code', - 'name' => 'required', 'address' => 'nullable|string', 'postal_code' => 'nullable|string|max:10', 'status' => 'nullable|boolean', diff --git a/app/Models/DetailDokumenJaminan.php b/app/Models/DetailDokumenJaminan.php new file mode 100644 index 0000000..e164ea5 --- /dev/null +++ b/app/Models/DetailDokumenJaminan.php @@ -0,0 +1,34 @@ +belongsTo(JenisLegalitasJaminan::class, 'jenis_legalitas_jaminan_id', 'id'); + } + + public function dokumenJaminan(){ + return $this->belongsTo(DokumenJaminan::class, 'dokumen_jaminan_id', 'id'); + } + } diff --git a/app/Models/DokumenJaminan.php b/app/Models/DokumenJaminan.php index 83886f6..274f3c8 100644 --- a/app/Models/DokumenJaminan.php +++ b/app/Models/DokumenJaminan.php @@ -16,10 +16,6 @@ 'permohonan_id', 'pemilik_jaminan_id', 'jenis_jaminan_id', - 'jenis_legalitas_jaminan_id', - 'name', - 'dokumen_jaminan', - 'keterangan', 'province_code', 'city_code', 'district_code', @@ -64,10 +60,6 @@ return $this->belongsTo(JenisJaminan::class, 'jenis_jaminan_id', 'id'); } - public function jenisLegalitasJaminan(){ - return $this->belongsTo(JenisLegalitasJaminan::class, 'jenis_legalitas_jaminan_id', 'id'); - } - public function permohonan(){ return $this->belongsTo(Permohonan::class, 'permohonan_id', 'id'); } diff --git a/database/migrations/2024_08_20_090400_create_dokumen_jaminan_table.php b/database/migrations/2024_09_05_030400_create_dokumen_jaminan_table.php similarity index 88% rename from database/migrations/2024_08_20_090400_create_dokumen_jaminan_table.php rename to database/migrations/2024_09_05_030400_create_dokumen_jaminan_table.php index 979d973..2e663c9 100644 --- a/database/migrations/2024_08_20_090400_create_dokumen_jaminan_table.php +++ b/database/migrations/2024_09_05_030400_create_dokumen_jaminan_table.php @@ -18,20 +18,16 @@ use Illuminate\Support\Facades\Schema; { Schema::create('dokumen_jaminan', function (Blueprint $table) { $table->id(); - $table->string('name'); $table->foreignIdFor(Debiture::class)->constrained('debitures')->onDelete('cascade'); $table->foreignIdFor(Permohonan::class)->nullable()->constrained('permohonan')->onDelete('cascade'); $table->foreignIdFor(JenisJaminan::class)->constrained('jenis_jaminan')->onDelete('cascade'); $table->foreignIdFor(PemilikJaminan::class)->constrained('pemilik_jaminan')->onDelete('cascade'); - $table->foreignIdFor(JenisLegalitasJaminan::class)->constrained('jenis_legalitas_jaminan')->onDelete('cascade'); $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->string('dokumen_jaminan')->nullable(); - $table->string('keterangan')->nullable(); $table->boolean('status')->default(true)->nullable(); $table->timestamps(); diff --git a/database/migrations/2024_09_05_035110_create_detail_dokumen_jaminan_table.php b/database/migrations/2024_09_05_035110_create_detail_dokumen_jaminan_table.php new file mode 100644 index 0000000..cef5294 --- /dev/null +++ b/database/migrations/2024_09_05_035110_create_detail_dokumen_jaminan_table.php @@ -0,0 +1,44 @@ +id(); + $table->string('name'); + $table->foreignIdFor(DokumenJaminan::class)->constrained('dokumen_jaminan')->onDelete('cascade'); + $table->foreignIdFor(JenisLegalitasJaminan::class)->constrained('jenis_legalitas_jaminan')->onDelete('cascade'); + $table->string('dokumen_jaminan')->nullable(); + $table->string('keterangan')->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('detail_dokumen_jaminan'); + } +}; diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php index 5c77732..67063bf 100644 --- a/resources/views/debitur/components/dokumen.blade.php +++ b/resources/views/debitur/components/dokumen.blade.php @@ -73,67 +73,9 @@ @enderror
-
- -
- - @error('jenis_legalitas_jaminan_id') - {{ $message }} - @enderror -
-
-
- -
- - @error('name') - {{ $message }} - @enderror -
-
+
-
- -
- - @if(isset($document->dokumen_jaminan)) - {{ basename($document->dokumen_jaminan) }} - - @endif - @error('dokumen_jaminan') - {{ $message }} - @enderror -
-
- -
- -
- - @error('keterangan') - {{ $message }} - @enderror -
@@ -155,7 +97,8 @@ {{ $province->name }} @endif - ; @endforeach + ; + @endforeach @error('province_code') {{ $message }} @@ -253,29 +196,66 @@ @push('scripts') @endpush diff --git a/resources/views/debitur/components/jaminan.blade.php b/resources/views/debitur/components/jaminan.blade.php index d5009fc..4cfeb65 100644 --- a/resources/views/debitur/components/jaminan.blade.php +++ b/resources/views/debitur/components/jaminan.blade.php @@ -19,14 +19,7 @@
-
- - {{ $document->name }} - - - {{ $document->jenisJaminan->name }} | {{ $document->jenisLegalitasJaminan->name }} - -
+
From f9fea10607dbdae3b2101f5131683d8860ef8196 Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 11 Sep 2024 08:31:47 +0700 Subject: [PATCH 12/68] 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 @@ +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 @@ +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 @@ +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 @@ +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 @@ + '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 @@ + '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 @@ + '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 @@ +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') +
+ +
+ + @if (isset($jenisPenilaian->id)) + @method('PUT') + + @endif + + @csrf +
+
+

+ {{ isset($jenisPenilaian->id) ? 'Edit' : 'Tambah' }} jenis penilaian +

+
+ Back +
+
+
+
+ +
+ + @error('code') + {{ $message }} + @enderror +
+
+
+ +
+ + @error('name') + {{ $message }} + @enderror +
+
+
+ +
+
+
+
+
+@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') +
+
+
+

+ Daftar Jenis penilaian +

+
+
+ +
+
+
+ Export to + Excel + Tambah + Jenis penilaian +
+
+
+
+
+ + + + + + + + + +
+ + + Code + + + Jenis penilaian + + Action
+
+ + +
+
+ Show + per page +
+
+ + +
+
+
+
+
+@endsection + + + +@push('scripts') + + + +@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') +
+ @if (isset($region->id)) +
+ + @method('PUT') + @else + + @endif + @csrf +
+
+

+ {{ isset($region->id) ? 'Edit' : 'Tambah' }} region +

+
+ Back +
+
+
+
+ +
+ + @error('code') + {{ $message }} + @enderror +
+
+
+ +
+ + @error('name') + {{ $message }} + @enderror +
+
+
+ +
+
+
+
+
+@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') +
+
+
+

+ Daftar Region +

+
+
+ +
+
+
+ Export to Excel + Tambah Region +
+
+
+
+
+ + + + + + + + + +
+ + + Code + + + Region + + Action
+
+
+
+ Show + per page +
+
+ + +
+
+
+
+
+@endsection + + + +@push('scripts') + + + +@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') + +
+ +
+ + @if (isset($teams->id)) + @method('PUT') + + @endif + @csrf +
+
+

+ {{ isset($teams->id) ? 'Edit' : 'Tambah' }} Teams +

+
+ Back +
+
+
+
+ +
+ + @error('name') + {{ $message }} + @enderror +
+
+ +
+ +
+ + @error('code') + {{ $message }} + @enderror +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+
+
+@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') +
+
+
+

+ Daftar Teams +

+
+
+ +
+
+
+ Export to Excel + Tambah Teams +
+
+
+
+
+ + + + + + + + + + +
+ + + Region Name + + + Anggota Team + + Action
+
+
+
+ Show + per page +
+
+ + +
+
+
+
+
+@endsection + + + +@push('scripts') + + + +@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 @@ 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 Date: Wed, 11 Sep 2024 08:39:12 +0700 Subject: [PATCH 13/68] 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 ad4d8cf7407bfeff2d77349a26d2113096603d3d Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 11 Sep 2024 10:50:46 +0700 Subject: [PATCH 14/68] update detail dokumen jaminan, --- app/Http/Controllers/DebitureController.php | 6 --- .../Controllers/DokumenJaminanController.php | 7 ++- app/Models/DokumenJaminan.php | 4 ++ .../debitur/components/jaminan.blade.php | 51 +++++++++++-------- routes/web.php | 2 +- 5 files changed, 41 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/DebitureController.php b/app/Http/Controllers/DebitureController.php index 7929578..e6762e3 100644 --- a/app/Http/Controllers/DebitureController.php +++ b/app/Http/Controllers/DebitureController.php @@ -174,10 +174,4 @@ { return Excel::download(new DebitureExport, 'debitur.xlsx'); } - - public function download($id) - { - $document = DokumenJaminan::find($id); - return response()->download(storage_path('app/public/' . $document->dokumen_jaminan)); - } } diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php index 520c20e..9fe5d85 100644 --- a/app/Http/Controllers/DokumenJaminanController.php +++ b/app/Http/Controllers/DokumenJaminanController.php @@ -25,7 +25,7 @@ public function index($id) { $debitur = Debiture::find($id); - $documents = DokumenJaminan::with('pemilik')->where('debiture_id', $id)->get(); + $documents = DokumenJaminan::with('pemilik','detail')->where('debiture_id', $id)->get(); return view( 'lpj::debitur.edit', @@ -218,4 +218,9 @@ echo json_encode(['success' => false, 'message' => 'Failed to delete Dokumen Jaminan']); } } + + public function download($id){ + $document = DetailDokumenJaminan::find($id); + return response()->download(storage_path('app/public/' . $document->dokumen_jaminan)); + } } diff --git a/app/Models/DokumenJaminan.php b/app/Models/DokumenJaminan.php index 274f3c8..3454dc9 100644 --- a/app/Models/DokumenJaminan.php +++ b/app/Models/DokumenJaminan.php @@ -63,4 +63,8 @@ public function permohonan(){ return $this->belongsTo(Permohonan::class, 'permohonan_id', 'id'); } + + public function detail(){ + return $this->hasMany(DetailDokumenJaminan::class, 'dokumen_jaminan_id', 'id'); + } } diff --git a/resources/views/debitur/components/jaminan.blade.php b/resources/views/debitur/components/jaminan.blade.php index 4cfeb65..f06dea1 100644 --- a/resources/views/debitur/components/jaminan.blade.php +++ b/resources/views/debitur/components/jaminan.blade.php @@ -1,4 +1,4 @@ -
+
@foreach($documents as $document)
@@ -43,27 +43,7 @@
- @if($document->dokumen_jaminan) -
- - dokumen jaminan - - {{ basename($document->dokumen_jaminan) }} -
-
-
- @endif
- - keterangan - -

- {{ $document->keterangan }} -

-
-
-
-
alamat @@ -71,6 +51,35 @@ {{ $document->address.', '.$document->village->name.', '.$document->city->name.', '.$document->province->name.', '.$document->postal_code }}

+
+
+
+ + dokumen jaminan + +
+
+
+ @foreach($document->detail as $detail) +
+ + {{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }} + + {{ basename($detail->dokumen_jaminan) }} +
+
+
+
+ + keterangan + +

+ {{ $detail->keterangan }} +

+
+
+
+ @endforeach
@endforeach diff --git a/routes/web.php b/routes/web.php index d1737ef..dad4309 100644 --- a/routes/web.php +++ b/routes/web.php @@ -173,7 +173,6 @@ 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'); @@ -181,6 +180,7 @@ Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () { + Route::get('download/{id}', [DebitureController::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'); From bce89c2055d50f6d34c417f822533f4f1b45e7fb Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 11 Sep 2024 11:03:11 +0700 Subject: [PATCH 15/68] Fix Download Document --- resources/views/debitur/components/jaminan.blade.php | 2 +- routes/web.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/debitur/components/jaminan.blade.php b/resources/views/debitur/components/jaminan.blade.php index f06dea1..568d940 100644 --- a/resources/views/debitur/components/jaminan.blade.php +++ b/resources/views/debitur/components/jaminan.blade.php @@ -65,7 +65,7 @@ {{ $loop->index+1 }}. {{ $detail->jenisLegalitasJaminan->name }} - {{ basename($detail->dokumen_jaminan) }} + {{ basename($detail->dokumen_jaminan) }}
diff --git a/routes/web.php b/routes/web.php index dad4309..92a5cd3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -180,7 +180,7 @@ Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () { - Route::get('download/{id}', [DebitureController::class, 'download'])->name('download'); + 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'); From a6e90229d8c7b2d993d0e07c96fe15229e41378e Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 11 Sep 2024 12:00:50 +0700 Subject: [PATCH 16/68] Fix Update and Delete Dokumen Jaminan --- .../Controllers/DokumenJaminanController.php | 101 ++++++++++++++---- .../debitur/components/dokumen.blade.php | 55 +++++++++- 2 files changed, 131 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php index 9fe5d85..dca91a5 100644 --- a/app/Http/Controllers/DokumenJaminanController.php +++ b/app/Http/Controllers/DokumenJaminanController.php @@ -5,6 +5,7 @@ use App\Http\Controllers\Controller; use Exception; use Illuminate\Support\Facades\DB; + use Illuminate\Support\Facades\Storage; use Modules\Location\Models\City; use Modules\Location\Models\District; use Modules\Location\Models\Province; @@ -25,7 +26,7 @@ public function index($id) { $debitur = Debiture::find($id); - $documents = DokumenJaminan::with('pemilik','detail')->where('debiture_id', $id)->get(); + $documents = DokumenJaminan::with('pemilik', 'detail')->where('debiture_id', $id)->get(); return view( 'lpj::debitur.edit', @@ -68,7 +69,6 @@ $document = DokumenJaminan::create($validate); try { - foreach ($request->dokumen_jaminan as $key => $value) { $file_name = $value->getClientOriginalName(); @@ -77,7 +77,7 @@ $file_name = $value->getClientOriginalName(); $value->storeAs( 'public/jaminan/' . $debitur->id . '/' . $document->id . '/', - $file_name + $file_name, ); $detail = [ @@ -92,17 +92,17 @@ DB::rollBack(); return redirect()->route('debitur.jaminan.index', $id)->with( 'error', - 'Gagal upload file dokumen jaminan '. $key. ': '. $e->getMessage(), + 'Gagal upload file dokumen jaminan ' . $key . ': ' . $e->getMessage(), ); } } } DB::commit(); - }catch (Exception $e) { + } catch (Exception $e) { DB::rollBack(); return redirect()->route('debitur.jaminan.index', $id)->with( 'error', - 'gg'.$e->getMessage(), + 'gg' . $e->getMessage(), ); } @@ -112,7 +112,7 @@ ); } catch (Exception $e) { DB::rollBack(); - return redirect()->route('debitur.jaminan.index', $id)->with('error','ggl'. $e->getMessage()); + return redirect()->route('debitur.jaminan.index', $id)->with('error', 'ggl' . $e->getMessage()); } } } @@ -138,6 +138,7 @@ $validate = $request->validated(); if ($validate) { try { + DB::beginTransaction(); $validate['debiture_id'] = $id; if ($validate['pemilik_jaminan_id'] == 0) { @@ -160,29 +161,77 @@ ], $pemilik_jaminan); } - if ($request->hasFile('dokumen_jaminan')) { - $file = $request->file('dokumen_jaminan'); - $file_name = $file->getClientOriginalName(); - $file->storeAs('public/jaminan/' . $debitur->id, $file_name); - $validate['dokumen_jaminan'] = 'jaminan/' . $debitur->id . '/' . $file_name; - } - $document = DokumenJaminan::find($jaminan); $document->update($validate); + if ($request->detail_dokumen_jaminan_id) { + foreach ($request->detail_dokumen_jaminan_id as $key => $value) { + if (isset($request->dokumen_jaminan[$key])) { + $file = $request->dokumen_jaminan[$key]; + if ($file) { + $file_name = $file->getClientOriginalName(); + } + + if (isset($file_name)) { + $file->storeAs( + 'public/jaminan/' . $debitur->id . '/' . $document->id . '/', + $file_name, + ); + + $detail = [ + 'dokumen_jaminan_id' => $document->id, + 'jenis_legalitas_jaminan_id' => $request->jenis_legalitas_jaminan_id[$key], + 'dokumen_jaminan' => 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name, + 'name' => $request->name[$key], + 'keterangan' => $request->keterangan[$key], + ]; + if (isset($request->detail_dokumen_jaminan_id[$key])) { + $detailDocument = DetailDokumenJaminan::find( + $request->detail_dokumen_jaminan_id[$key], + ); + + $detailDocument->update($detail); + $detailDocument->save(); + } + } + } else { + $detail = [ + 'dokumen_jaminan_id' => $document->id, + 'jenis_legalitas_jaminan_id' => $request->jenis_legalitas_jaminan_id[$key], + 'name' => $request->name[$key], + 'keterangan' => $request->keterangan[$key], + ]; + + if (isset($request->detail_dokumen_jaminan_id[$key])) { + $detailDocument = DetailDokumenJaminan::find( + $request->detail_dokumen_jaminan_id[$key], + ); + $detailDocument->update($detail); + } + } + } + } + + DB::commit(); return redirect()->route('debitur.jaminan.index', $id)->with( 'success', 'Dokumen Jaminan berhasil diubah', ); - } catch (Exception $e) { + } catch + (Exception $e) { + DB::rollBack(); return redirect()->route('debitur.jaminan.index', $id)->with('error', $e->getMessage()); } } } - public function edit($id, $jaminan) - { + public + function edit( + $id, + $jaminan, + ) { $document = DokumenJaminan::find($jaminan); + $details = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->get(); $debitur = Debiture::find($document->debiture_id); $provinces = Province::all(); $cities = City::where('province_code', $document->province_code)->get(); @@ -200,6 +249,7 @@ 'jenisJaminan', 'jenisLegalitasJaminan', 'document', + 'details', 'cities', 'districts', 'villages', @@ -208,10 +258,18 @@ ); } - public function destroy($id, $jaminan_id) - { + public + function destroy( + $id, + $jaminan_id, + ) { try { $jaminan = DokumenJaminan::find($jaminan_id); + $details = DetailDokumenJaminan::where('dokumen_jaminan_id',$jaminan->id)->get(); + foreach ($details as $detail){ + Storage::delete('public/'. $detail->dokumen_jaminan); + $detail->delete(); + } $jaminan->delete(); echo json_encode(['success' => true, 'message' => 'Dokumen Jaminan deleted successfully']); } catch (Exception $e) { @@ -219,7 +277,10 @@ } } - public function download($id){ + public + function download( + $id, + ) { $document = DetailDokumenJaminan::find($id); return response()->download(storage_path('app/public/' . $document->dokumen_jaminan)); } diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php index 67063bf..0dfcc6f 100644 --- a/resources/views/debitur/components/dokumen.blade.php +++ b/resources/views/debitur/components/dokumen.blade.php @@ -56,7 +56,10 @@ Jenis Jaminan
- + @endif + +
+ + +
-
+
+ +
+ +
+
+ +
+ +
+ + @if(isset($detail->dokumen_jaminan)) + {{ basename($detail->dokumen_jaminan) }} + @endif +
+
+ +
+ +
+ +
+
+ @endforeach + @else +
+ +
+ @endif
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')
+ data-api-url="{{ route('basicdata.jenis-penilaian.datatables') }}">

Daftar Jenis penilaian @@ -16,14 +16,14 @@
- Export to + Export to Excel - Tambah + Tambah Jenis penilaian
@@ -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 `
- + 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') +
+ +
+ +
+ + + {{-- @if (isset($debitur->id)) + @method('PUT') + @endif + @csrf --}} +
+ +
+ + +
+
+
+ +
+ + @error('cif') + {{ $message }} + @enderror +
+
+
+ +
+ + @enderror +
+
+
+ +
+ + @error('name') + + @enderror +
+
+
+ +
+ + @error('npwp') + + @enderror +
+
+
+ +
+ + @error('email') + + @enderror +
+
+
+ +
+ + @error('phone') + + @enderror +
+
+ +
+ +
+ +
+
+ +
+@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 @@
- +
- - Code - - Status Permohonan From 1b1d00a73072bc24f0399f8a2311fb4784dd491e Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Wed, 11 Sep 2024 16:54:42 +0700 Subject: [PATCH 19/68] add slug master jenis_jaminan --- .../migrations/2024_09_04_082059_update_jenis_jaminan_table.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/database/migrations/2024_09_04_082059_update_jenis_jaminan_table.php b/database/migrations/2024_09_04_082059_update_jenis_jaminan_table.php index 0f96b67..f148718 100644 --- a/database/migrations/2024_09_04_082059_update_jenis_jaminan_table.php +++ b/database/migrations/2024_09_04_082059_update_jenis_jaminan_table.php @@ -12,6 +12,7 @@ return new class extends Migration public function up(): void { Schema::table('jenis_jaminan', function (Blueprint $table) { + $table->string('slug')->after('name'); $table->string('jenis_legalitas_jaminan_id')->nullable()->after('slug'); }); } @@ -22,6 +23,7 @@ return new class extends Migration public function down(): void { Schema::table('jenis_jaminan', function (Blueprint $table) { + $table->dropColumn('slug'); $table->dropColumn('jenis_legalitas_jaminan_id'); }); } From ed425c4b21d99528851b32e1847f39bf31dfc1f7 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 12 Sep 2024 11:03:00 +0700 Subject: [PATCH 20/68] Feature #18 : Module Approval Permohonan --- app/Http/Controllers/PermohonanController.php | 90 +++++++++ app/Models/Permohonan.php | 2 + module.json | 2 +- .../permohonan/authorization/index.blade.php | 191 ++++++++++++++++++ .../permohonan/authorization/show.blade.php | 164 +++++++++++++++ routes/breadcrumbs.php | 9 + routes/web.php | 6 + 7 files changed, 463 insertions(+), 1 deletion(-) create mode 100644 resources/views/permohonan/authorization/index.blade.php create mode 100644 resources/views/permohonan/authorization/show.blade.php diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php index ea6d5f3..73d6b37 100644 --- a/app/Http/Controllers/PermohonanController.php +++ b/app/Http/Controllers/PermohonanController.php @@ -179,4 +179,94 @@ { return Excel::download(new PermohonanExport, 'permohonan.xlsx'); } + + public function authorization() + { + return view('lpj::permohonan.authorization.index'); + } + + public function dataForAuthorization(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'])->where('status','=','order')->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 showAuthorization($id) + { + $permohonan = Permohonan::find($id); + return view('lpj::permohonan.authorization.show',compact('permohonan')); + } + + public function updateAuthorization(Request $request, $id){ + try { + $permohonan = Permohonan::find($id); + $permohonan->status = $request->status; + $permohonan->keterangan = $request->keterangan; + $permohonan->save(); + }catch (Exception $e) { + return redirect()->route('authorization.show', $id)->with('error', 'Failed to update permohonan'); + } + + return redirect()->route('authorization.index')->with('success', 'Permohonan updated successfully'); + } } diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php index 28b6de5..d1d4689 100644 --- a/app/Models/Permohonan.php +++ b/app/Models/Permohonan.php @@ -17,10 +17,12 @@ class Permohonan extends Base 'branch_id', 'tujuan_penilaian_id', 'debiture_id', + 'keterangan', 'status', 'authorized_at', 'authorized_status', 'authorized_by', + ]; public function user(){ diff --git a/module.json b/module.json index 2dbec76..c1f1567 100644 --- a/module.json +++ b/module.json @@ -46,7 +46,7 @@ }, { "title": "Authorization", - "path": "", + "path": "authorization", "icon": "ki-filled ki-some-files text-lg", "classes": "", "attributes": [], diff --git a/resources/views/permohonan/authorization/index.blade.php b/resources/views/permohonan/authorization/index.blade.php new file mode 100644 index 0000000..aed62c8 --- /dev/null +++ b/resources/views/permohonan/authorization/index.blade.php @@ -0,0 +1,191 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render(request()->route()->getName()) }} +@endsection + +@section('content') +
+ +
+
+

+ Daftar Permohonan +

+
+
+ +
+
+
+ Export to Excel +
+
+
+
+
+ + + + + + + + + + + + + + +
+ + + Nomor Registrasi + + + Tanggal Permohonan + + + User Pemohon + + + Cabang Pemohon + + + Debitur + + + Tujuan Penilaian + + + Status + + Action
+
+
+
+ Show + per page +
+
+ + +
+
+
+
+
+@endsection + +@push('scripts') + + + +@endpush diff --git a/resources/views/permohonan/authorization/show.blade.php b/resources/views/permohonan/authorization/show.blade.php new file mode 100644 index 0000000..7a857a5 --- /dev/null +++ b/resources/views/permohonan/authorization/show.blade.php @@ -0,0 +1,164 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render(request()->route()->getName()) }} +@endsection + +@section('content') +
+
+
+

+ Data Permohonan +

+
+
+
+

+ Nomor Register Permohonan: +

+ + {{ $permohonan->nomor_registrasi }} + +
+ +
+

+ Pemohon: +

+ + {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }} + +
+ +
+

+ Tujan Permohonan: +

+ + {{ $permohonan->tujuanPenilaian->name }} + +
+ +
+
+ +
+
+

+ Detail Debutur +

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ Name + + {{ $permohonan->debiture->name ?? "" }} +
+ Email + + {{ $permohonan->debiture->email ?? "" }} +
+ Phone + + {{ $permohonan->debiture->phone ?? "" }} +
+ Address + + {{ $permohonan->debiture->address ?? "" }} +
+   + + {{ $permohonan->debiture->village->name ?? "" }}, {{ $permohonan->debiture->district->name ?? "" }}, {{ $permohonan->debiture->city->name ?? "" }}, {{ $permohonan->debiture->province->name ?? "" }} - {{ $permohonan->debiture->village->postal_code ?? "" }} +
+
+
+ + + + + + + + + + + + + + + + + +
+ Cabang + + {{ $permohonan->debiture->branch->name ?? "" }} +
+ CIF + + {{ $permohonan->debiture->cif ?? "" }} +
+ Nomor Rekening + + {{ $permohonan->debiture->nomor_rekening ?? "" }} +
+ NPWP + + {{ $permohonan->debiture->npwp ?? "" }} +
+
+
+
+
+ +
+
+ + @csrf +
+
+ +
+ +
+
+
+
+ + +
+
+
+
+@endsection diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index f39cfcc..4ea45ad 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -267,3 +267,12 @@ $trail->push('Data Permohonan'); }); + Breadcrumbs::for('authorization.index', function (BreadcrumbTrail $trail) { + $trail->push('Permohonan', route('authorization.index')); + }); + + Breadcrumbs::for('authorization.show', function (BreadcrumbTrail $trail) { + $trail->parent('authorization.index'); + $trail->push('Detail Permohonan'); + }); + diff --git a/routes/web.php b/routes/web.php index 92a5cd3..cfa177a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -172,6 +172,12 @@ Route::resource('permohonan', PermohonanController::class); + Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index'); + Route::get('authorization/datatables', [PermohonanController::class, 'dataForAuthorization']) + ->name('authorization.datatables'); + Route::get('authorization/{id}/edit', [PermohonanController::class, 'showAuthorization'])->name('authorization.show'); + Route::put('authorization/{id}', [PermohonanController::class, 'updateAuthorization'])->name('authorization.update'); + Route::name('debitur.')->prefix('debitur')->group(function () { Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore'); Route::get('datatables', [DebitureController::class, 'dataForDatatables']) From 7eac0d0401382947df54713cfa7480d4f930b2c2 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 12 Sep 2024 11:28:17 +0700 Subject: [PATCH 21/68] Update Detail Approval --- app/Models/Debiture.php | 4 + .../permohonan/authorization/show.blade.php | 93 +++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/app/Models/Debiture.php b/app/Models/Debiture.php index df5b9d2..8980513 100644 --- a/app/Models/Debiture.php +++ b/app/Models/Debiture.php @@ -56,4 +56,8 @@ return $this->belongsTo(Village::class, 'village_code', 'code'); } + public function documents(){ + return $this->hasMany(DokumenJaminan::class); + } + } diff --git a/resources/views/permohonan/authorization/show.blade.php b/resources/views/permohonan/authorization/show.blade.php index 7a857a5..336a324 100644 --- a/resources/views/permohonan/authorization/show.blade.php +++ b/resources/views/permohonan/authorization/show.blade.php @@ -136,6 +136,99 @@
+
+
+

+ Data Jaminan +

+
+
+ @foreach($permohonan->debiture->documents as $dokumen) +
+ + +
+ @endforeach +
+
+
From dadec5a397588785b876563112c11282e34b821e Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 12 Sep 2024 14:29:12 +0700 Subject: [PATCH 22/68] Update Edit Permohonan --- app/Http/Controllers/PermohonanController.php | 39 ++- resources/views/debitur/edit.blade.php | 8 +- resources/views/permohonan/form.blade.php | 269 +++++++++++++----- routes/web.php | 34 +-- 4 files changed, 246 insertions(+), 104 deletions(-) diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php index 73d6b37..6e0bf9a 100644 --- a/app/Http/Controllers/PermohonanController.php +++ b/app/Http/Controllers/PermohonanController.php @@ -6,10 +6,15 @@ use Exception; use Illuminate\Http\Request; use Maatwebsite\Excel\Facades\Excel; + use Modules\Location\Models\City; + use Modules\Location\Models\District; + use Modules\Location\Models\Province; + use Modules\Location\Models\Village; 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\DokumenJaminan; use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\StatusPermohonan; use Modules\Lpj\Models\TujuanPenilaian; @@ -47,8 +52,8 @@ } } - public function create(){ - + public function create() + { return view('lpj::permohonan.create'); } @@ -66,13 +71,29 @@ { $permohonan = Permohonan::find($id); $branches = Branch::all(); - $debitur = Debiture::find($permohonan->debiture_id); + $debitur = Debiture::find($permohonan->debiture_id); $tujuanPenilaian = TujuanPenilaian::all(); $status = StatusPermohonan::all(); + $provinces = Province::all(); + $cities = City::where('province_code', $debitur->province_code)->get(); + $districts = District::where('city_code', $debitur->city_code)->get(); + $villages = Village::where('district_code', $debitur->district_code)->get(); + $documents = DokumenJaminan::with('pemilik', 'detail')->where('debiture_id', $id)->get(); return view( 'lpj::permohonan.form', - compact('permohonan', 'branches', 'debitur', 'tujuanPenilaian', 'status'), + compact( + 'permohonan', + 'branches', + 'debitur', + 'tujuanPenilaian', + 'status', + 'provinces', + 'cities', + 'districts', + 'villages', + 'documents' + ), ); } @@ -231,7 +252,8 @@ $filteredRecords = $query->count(); // Get the data for the current page - $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->where('status','=','order')->get(); + $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->where('status', '=', 'order')->get( + ); // Calculate the page count $pageCount = ceil($totalRecords / $request->get('size')); @@ -254,16 +276,17 @@ public function showAuthorization($id) { $permohonan = Permohonan::find($id); - return view('lpj::permohonan.authorization.show',compact('permohonan')); + return view('lpj::permohonan.authorization.show', compact('permohonan')); } - public function updateAuthorization(Request $request, $id){ + public function updateAuthorization(Request $request, $id) + { try { $permohonan = Permohonan::find($id); $permohonan->status = $request->status; $permohonan->keterangan = $request->keterangan; $permohonan->save(); - }catch (Exception $e) { + } catch (Exception $e) { return redirect()->route('authorization.show', $id)->with('error', 'Failed to update permohonan'); } diff --git a/resources/views/debitur/edit.blade.php b/resources/views/debitur/edit.blade.php index 0a8e218..8940f5a 100644 --- a/resources/views/debitur/edit.blade.php +++ b/resources/views/debitur/edit.blade.php @@ -6,21 +6,25 @@ @section('content')
-
+ @if(request()->get('permohonan_id')) + Data Permohonan + @endif Data Debitur Dokumen Jaminan Pemilk Jaminan
- @if(isset($debitur->id)) + @if(isset($debitur->id) && request()->get('permohonan_id') == null) Buat Permohonan @endif @if(request()->get('from') == 'permohonan') Back + @elseif(request()->get('permohonan_id')) + Back @else Back @endif diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php index 8615b75..baca23a 100644 --- a/resources/views/permohonan/form.blade.php +++ b/resources/views/permohonan/form.blade.php @@ -5,97 +5,212 @@ @endsection @section('content') -
+ @if(isset($permohonan)) +
+
+
+
+ Data Permohonan + Data Debitur + Dokumen Jaminan + Pemilk Jaminan +
+
+ @if(isset($debitur->id) && !isset($permohonan->id)) + Buat Permohonan + @endif -
-
-

- {{ isset($permohonan->id) ? 'Edit' : 'Tambah' }} Permohonan -

-
- Back + @if(request()->get('from') == 'permohonan') + Back + @elseif($permohonan->id) + Back + @else + Back + @endif +
+
+
+ @if(request()->routeIs('permohonan.edit', $permohonan)) + + @if(isset($permohonan->id)) + @method('PUT') + @endif + @csrf + +
+ +
+ +

{{ $debitur->name }}

+
+
+ +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+ +
+ +
+ + @error('status') + {{ $message }} + @enderror +
+
+ + +
+ +
+ + @elseif(request()->routeIs('debitur.edit', $debitur)) + @include('lpj::debitur.components.debitur') + @elseif(request()->routeIs('debitur.pemilik.index', $debitur)) + @include('lpj::debitur.components.pemilik') + @else + @include('lpj::debitur.components.jaminan') + @endif
-
-
- @if(isset($permohonan->id)) - @method('PUT') - @endif - @csrf +
+ @else +
-
- -
- -

{{ $debitur->name }}

-
+
+
+

+ {{ isset($permohonan->id) ? 'Edit' : 'Tambah' }} Permohonan +

+
+ Back
+
+
+ + @if(isset($permohonan->id)) + @method('PUT') + @endif + @csrf -
- -
- - @error('tujuan_penilaian_id') - {{ $message }} - @enderror +
+ +
+ +

{{ $debitur->name }}

+
-
-
- -
- - @error('status') - {{ $message }} +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+ +
+ +
+ + @error('status') + {{ $message }} @enderror
-
- -
- +
+ +
+ +
-
+ @endif @endsection diff --git a/routes/web.php b/routes/web.php index cfa177a..b0bfdee 100644 --- a/routes/web.php +++ b/routes/web.php @@ -185,24 +185,24 @@ 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'); - 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('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); From 72e4ff31609d52a15647ac1d74029ee51f02260b Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Fri, 13 Sep 2024 14:10:40 +0700 Subject: [PATCH 23/68] Update Module Permohonan, penambahan field jenis_fasilitas_kredit dan nilai_plafond --- app/Exports/PermohonanExport.php | 9 +- app/Http/Controllers/PermohonanController.php | 20 ++- app/Http/Requests/PermohonanRequest.php | 16 +-- app/Models/Permohonan.php | 10 ++ ...4_09_13_030119_update_permohonan_table.php | 33 +++++ resources/views/permohonan/form.blade.php | 116 +++++++++++++++++- 6 files changed, 187 insertions(+), 17 deletions(-) create mode 100644 database/migrations/2024_09_13_030119_update_permohonan_table.php diff --git a/app/Exports/PermohonanExport.php b/app/Exports/PermohonanExport.php index 07b83fe..c6ce0a2 100644 --- a/app/Exports/PermohonanExport.php +++ b/app/Exports/PermohonanExport.php @@ -28,6 +28,8 @@ $row->branch->name, $row->tujuanPenilaian->name, $row->debiture->name, + $row->fasilitasKredit->name, + $row->plafond->name, $row->status, $row->authorized_at, $row->authorized_status, @@ -47,7 +49,9 @@ 'Branch Pemohon', 'Tujuan Penilaian', 'Debitur', - 'Status', + 'Jenis Fasilitas Kredit', + 'Nilai Plafond', + 'Status Permohonan', 'Tanggal Pengesahan', 'Status Pengesahan', 'Pengesah', @@ -61,7 +65,8 @@ return [ 'A' => NumberFormat::FORMAT_NUMBER, 'C' => NumberFormat::FORMAT_DATE_DATETIME, - 'L' => NumberFormat::FORMAT_DATE_DATETIME + 'K' => NumberFormat::FORMAT_DATE_DATETIME, + 'N' => NumberFormat::FORMAT_DATE_DATETIME ]; } } diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php index 6e0bf9a..2cd35d0 100644 --- a/app/Http/Controllers/PermohonanController.php +++ b/app/Http/Controllers/PermohonanController.php @@ -15,6 +15,8 @@ use Modules\Lpj\Models\Branch; use Modules\Lpj\Models\Debiture; use Modules\Lpj\Models\DokumenJaminan; + use Modules\Lpj\Models\JenisFasilitasKredit; + use Modules\Lpj\Models\NilaiPlafond; use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\StatusPermohonan; use Modules\Lpj\Models\TujuanPenilaian; @@ -30,8 +32,8 @@ public function store(PermohonanRequest $request) { - $validate = $request->validated(); + $validate = $request->validated(); if ($validate) { try { // Save to database @@ -63,8 +65,13 @@ $debitur = Debiture::find($debitur); $tujuanPenilaian = TujuanPenilaian::all(); $status = StatusPermohonan::all(); + $fasilitasKredit = JenisFasilitasKredit::all(); + $plafond = NilaiPlafond::all(); - return view('lpj::permohonan.form', compact('branches', 'debitur', 'tujuanPenilaian', 'status')); + return view( + 'lpj::permohonan.form', + compact('branches', 'debitur', 'tujuanPenilaian', 'status', 'fasilitasKredit', 'plafond'), + ); } public function edit($id) @@ -78,7 +85,10 @@ $cities = City::where('province_code', $debitur->province_code)->get(); $districts = District::where('city_code', $debitur->city_code)->get(); $villages = Village::where('district_code', $debitur->district_code)->get(); - $documents = DokumenJaminan::with('pemilik', 'detail')->where('debiture_id', $id)->get(); + $documents = DokumenJaminan::with('pemilik', 'detail')->where('debiture_id', $id)->get(); + + $fasilitasKredit = JenisFasilitasKredit::all(); + $plafond = NilaiPlafond::all(); return view( 'lpj::permohonan.form', @@ -92,7 +102,9 @@ 'cities', 'districts', 'villages', - 'documents' + 'documents', + 'fasilitasKredit', + 'plafond', ), ); } diff --git a/app/Http/Requests/PermohonanRequest.php b/app/Http/Requests/PermohonanRequest.php index e4c4bd8..edd4169 100644 --- a/app/Http/Requests/PermohonanRequest.php +++ b/app/Http/Requests/PermohonanRequest.php @@ -14,13 +14,15 @@ : array { $rules = [ - 'nomor_registrasi' => 'nullable|string|max:10', - 'tanggal_permohonan' => 'nullable|date', - 'user_id' => 'nullable|exists:users,id', - 'branch_id' => 'required|exists:branches,id', - 'tujuan_penilaian_id' => 'required|exists:tujuan_penilaian,id', - 'debiture_id' => 'required|exists:debitures,id', - 'status' => 'required|string', + 'nomor_registrasi' => 'nullable|string|max:10', + 'tanggal_permohonan' => 'nullable|date', + 'user_id' => 'nullable|exists:users,id', + 'branch_id' => 'required|exists:branches,id', + 'tujuan_penilaian_id' => 'required|exists:tujuan_penilaian,id', + 'debiture_id' => 'required|exists:debitures,id', + 'status' => 'required|string', + 'jenis_fasilitas_kredit_id' => 'required|exists:jenis_fasilitas_kredit,id', + 'nilai_plafond_id' => 'required|exists:nilai_plafond,id', ]; return $rules; diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php index d1d4689..cf6d5e6 100644 --- a/app/Models/Permohonan.php +++ b/app/Models/Permohonan.php @@ -18,6 +18,8 @@ class Permohonan extends Base 'tujuan_penilaian_id', 'debiture_id', 'keterangan', + 'jenis_fasilitas_kredit_id', + 'nilai_plafond_id', 'status', 'authorized_at', 'authorized_status', @@ -44,4 +46,12 @@ class Permohonan extends Base public function documents(){ return $this->hasMany(DokumenJaminan::class); } + + public function nilaiPlafond(){ + return $this->belongsTo(NilaiPlafond::class); + } + + public function jenisFasilitasKredit(){ + return $this->belongsTo(JenisFasilitasKredit::class); + } } diff --git a/database/migrations/2024_09_13_030119_update_permohonan_table.php b/database/migrations/2024_09_13_030119_update_permohonan_table.php new file mode 100644 index 0000000..1906224 --- /dev/null +++ b/database/migrations/2024_09_13_030119_update_permohonan_table.php @@ -0,0 +1,33 @@ +foreignIdFor(JenisFasilitasKredit::class)->nullable()->onDelete('cascade'); + $table->foreignIdFor(NilaiPlafond::class)->nullable()->onDelete('cascade'); + $table->string('status')->default('order')->change(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('permohonan', function (Blueprint $table) { + $table->dropForeign(['fasilitas_kredit_id']); + $table->dropForeign(['nilai_plafond_id']); + }); + } +}; diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php index baca23a..45be1d5 100644 --- a/resources/views/permohonan/form.blade.php +++ b/resources/views/permohonan/form.blade.php @@ -22,9 +22,9 @@ @if(request()->get('from') == 'permohonan') Back - @elseif($permohonan->id) - Back - @else + @elseif($permohonan->id) + Back + @else Back @endif
@@ -74,6 +74,60 @@
+
+ +
+ + @error('status') + {{ $message }} + @enderror +
+
+ +
+ +
+ + @error('status') + {{ $message }} + @enderror +
+
+
+
+ +
+ + @error('status') + {{ $message }} + @enderror +
+
+ +
+ +
+ + @error('status') + {{ $message }} + @enderror +
+
+
- @if(isset($status)) @foreach($status as $row) From dcf9e4fd5e77f19f3627bfa790d9e1c14cf5ed83 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Fri, 13 Sep 2024 14:11:08 +0700 Subject: [PATCH 24/68] Remove Module Jenis Jaminan --- module.json | 10 +--------- routes/breadcrumbs.php | 21 +++------------------ routes/web.php | 10 +--------- 3 files changed, 5 insertions(+), 36 deletions(-) diff --git a/module.json b/module.json index c1f1567..2c5b5af 100644 --- a/module.json +++ b/module.json @@ -111,17 +111,9 @@ "permission": "", "roles": [] }, - { - "title": "Jenis Jaminan", - "path": "basicdata.jenis-jaminan", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, { "title": "Jenis Aset", - "path": "basicdata.jenis-aset", + "path": "basicdata.jenis-jaminan", "classes": "", "attributes": [], "permission": "", diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 4ea45ad..0068876 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -39,17 +39,17 @@ Breadcrumbs::for('basicdata.jenis-jaminan', function (BreadcrumbTrail $trail) { $trail->parent('basicdata'); - $trail->push('Jenis Jaminan', route('basicdata.jenis-jaminan.index')); + $trail->push('Jenis Aset', route('basicdata.jenis-jaminan.index')); }); Breadcrumbs::for('basicdata.jenis-jaminan.create', function (BreadcrumbTrail $trail) { $trail->parent('basicdata.jenis-jaminan'); - $trail->push('Tambah Jenis Jaminan', route('basicdata.jenis-jaminan.create')); + $trail->push('Tambah Jenis Aset', route('basicdata.jenis-jaminan.create')); }); Breadcrumbs::for('basicdata.jenis-jaminan.edit', function (BreadcrumbTrail $trail) { $trail->parent('basicdata.jenis-jaminan'); - $trail->push('Edit Jenis Jaminan'); + $trail->push('Edit Jenis Aset'); }); Breadcrumbs::for('basicdata.tujuan-penilaian', function (BreadcrumbTrail $trail) { @@ -67,21 +67,6 @@ $trail->push('Edit Tujuan Penilaian'); }); - Breadcrumbs::for('basicdata.jenis-aset', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Jenis Aset', route('basicdata.jenis-aset.index')); - }); - - Breadcrumbs::for('basicdata.jenis-aset.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-aset'); - $trail->push('Tambah Jenis Aset', route('basicdata.jenis-aset.create')); - }); - - Breadcrumbs::for('basicdata.jenis-aset.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-aset'); - $trail->push('Edit Jenis Aset'); - }); - Breadcrumbs::for('basicdata.jenis-dokumen', function (BreadcrumbTrail $trail) { $trail->parent('basicdata'); $trail->push('Jenis Dokumen', route('basicdata.jenis-dokumen.index')); diff --git a/routes/web.php b/routes/web.php index b0bfdee..0a8075f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -48,7 +48,7 @@ }); Route::resource('jenis-legalitas-jaminan', JenisLegalitasJaminanController::class); - Route::name('jenis-jaminan.')->prefix('jenis-jaminan')->group(function () { + Route::name('jenis-jaminan.')->prefix('jenis-aset')->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']) @@ -65,14 +65,6 @@ }); 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']) From 5619c52b0a8fb1f194e95216fd8291832ba3bc95 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Fri, 13 Sep 2024 14:11:35 +0700 Subject: [PATCH 25/68] Update Module Approval Permohonan, Chnage reject to Revisi --- resources/views/permohonan/authorization/show.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/permohonan/authorization/show.blade.php b/resources/views/permohonan/authorization/show.blade.php index 336a324..0267b19 100644 --- a/resources/views/permohonan/authorization/show.blade.php +++ b/resources/views/permohonan/authorization/show.blade.php @@ -247,8 +247,8 @@ -
From 9ecdaa0cddafa924a69c38a4c057b470f1217d66 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Fri, 13 Sep 2024 14:12:35 +0700 Subject: [PATCH 26/68] Update Module Debitur penambahan default cif 0x10 dan di buat mandatory update field npwp input harus minimal 15 dan maksimal 16 digit penambahan rules --- app/Http/Controllers/DebitureController.php | 1 + app/Http/Requests/DebitureRequest.php | 11 ++++---- app/Rules/UniqueCifExceptZero.php | 25 +++++++++++++++++++ .../debitur/components/debitur.blade.php | 3 ++- 4 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 app/Rules/UniqueCifExceptZero.php diff --git a/app/Http/Controllers/DebitureController.php b/app/Http/Controllers/DebitureController.php index e6762e3..b429265 100644 --- a/app/Http/Controllers/DebitureController.php +++ b/app/Http/Controllers/DebitureController.php @@ -71,6 +71,7 @@ public function update(DebitureRequest $request, $id) { + //print_r($request->all());exit; $validate = $request->validated(); if ($validate) { diff --git a/app/Http/Requests/DebitureRequest.php b/app/Http/Requests/DebitureRequest.php index ff87263..7f83fbb 100644 --- a/app/Http/Requests/DebitureRequest.php +++ b/app/Http/Requests/DebitureRequest.php @@ -3,6 +3,7 @@ namespace Modules\Lpj\Http\Requests; use Illuminate\Foundation\Http\FormRequest; + use Modules\Lpj\Rules\UniqueCifExceptZero; class DebitureRequest extends FormRequest { @@ -21,7 +22,7 @@ 'nomor_rekening' => 'nullable|string|max:50', 'name' => 'required', 'registered_at' => 'nullable|date', - 'npwp' => 'nullable|string|max:16', + 'npwp' => 'nullable|string|min:15|max:16', 'email' => 'nullable|email', 'phone' => 'nullable|string|max:15', 'address' => 'nullable|string', @@ -29,10 +30,10 @@ 'status' => 'nullable|boolean' ]; - if ($this->method() == 'PUT') { - $rules['cif'] = 'nullable|unique:debitures,cif,' . $this->id; - } else { - $rules['cif'] = 'nullable|unique:debitures,cif'; + if($this->method() == 'PUT'){ + $rules['cif'] = ['required', new UniqueCifExceptZero($this->id)]; + }else{ + $rules['cif'] = ['required', new UniqueCifExceptZero(null)]; } return $rules; diff --git a/app/Rules/UniqueCifExceptZero.php b/app/Rules/UniqueCifExceptZero.php new file mode 100644 index 0000000..e7236ce --- /dev/null +++ b/app/Rules/UniqueCifExceptZero.php @@ -0,0 +1,25 @@ +id = $id; + } + + public function validate($attribute, $value, $fail): void + { + if (Debiture::where($attribute, $value) + ->where('id', '!=', $this->id) + ->where($attribute, '!=', '000000') + ->exists()) { + $fail('The :attribute field must be uniquse.'.$this->id); + } + } +} diff --git a/resources/views/debitur/components/debitur.blade.php b/resources/views/debitur/components/debitur.blade.php index 8170af7..157ad1b 100644 --- a/resources/views/debitur/components/debitur.blade.php +++ b/resources/views/debitur/components/debitur.blade.php @@ -1,5 +1,6 @@
@if(isset($debitur->id)) + @method('PUT') @endif @csrf @@ -29,7 +30,7 @@ CIF
- + @error('cif') {{ $message }} @enderror From 53ccf7de117854bcc44eb220b1dc2d29fe9ae7f4 Mon Sep 17 00:00:00 2001 From: majid Date: Fri, 13 Sep 2024 17:02:04 +0700 Subject: [PATCH 27/68] 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 @@ 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 @@ -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') - + @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') + +@endpush + + +@section('content') +
+ +
+
+

+ Form Data Jaminan +

+
+ + Back +
+
+
+ + +
+
+
+ +
+ + +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+ + +
+
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+ +
+
+
+
+

1. IDENTITAS DEBITUR

+
+
+ +
+ +
+
+ +
+ +
+

+ {{ $permohonan->debiture->address . ' ' . $permohonan->debiture->village->name . ', ' . $permohonan->debiture->district->name . ', ' . $permohonan->debiture->city->name . ', ' . $permohonan->debiture->province->name . ' ' . '(' . $permohonan->debiture->postal_code . ')' }} + +

+
+
+ +
+ +
+ +
+
+
+
+ +
+

2. LETAK JAMINAN

+
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+

3. FASILITAS KREDIT

+
+ + +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+ + +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+ +
+
+ + +
+

4. TUJUAN PENILAIAN

+
+ +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+
+
+ +
+

5. JENIS JAMINAN

+
+ +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+ +
+
+ +
+

6. TIPE JAMINAN

+
+ +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+ + +
+
+ +
+

7. DATA-DATA

+
+ +
+ +
+
+
+ + @error('province_code') + {{ $message }} + @enderror +
+
+ + @error('city_code') + {{ $message }} + @enderror +
+
+
+
+ + +
+ +
+ +
+
+ +
+

6. TIPE JAMINAN

+
+ +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+ +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+ + @error('province_code') + {{ $message }} + @enderror +
+
+ + @error('city_code') + {{ $message }} + @enderror +
+
+
+
+
+
+ + +
+ +
+
+ + + + + +
+ +
+
+ +
+@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')
-
-

- {{ isset($debitur->id) ? 'Edit' : 'Tambah' }} Debitur -

-
- @if (isset($debitur->id)) - Buat - Permohonan +
+ @if (isset($status_permohonan)) + @foreach ($status_permohonan as $item) + {{ $item->name }} + @endforeach @endif - - Back +
+
+ +
+
+

+ {{-- Daftar {{}} --}} +

+
+
+ +
+
+
+ Export to Excel + Tambah Permohonan +
+
+
+
+
+ + + + + + + + + + + + + + +
+ + + Nomor Registrasi + + + Tanggal Permohonan + + + User Pemohon + + + Cabang Pemohon + + + Debitur + + + Tujuan Penilaian + + + Status + + Action
+
+
+
+ Show + per page +
+
+ + +
+
+
+
+
+
+@endsection + +{{-- @section('content') +
+
+
+

+ Daftar penilaian +

+
+
+ +
+
+
+ Export to Excel + Tambah penilaian +
- -
- {{-- @if (isset($debitur->id)) - @method('PUT') - @endif - @csrf --}} -
- -
- - +
+ + + + + + + + + +
+ + + Code + + + penilaian + + Action
+
+
+
+ Show + per page +
+
+ +
-
- -
- - @error('cif') - {{ $message }} - @enderror -
-
-
- -
- - @enderror -
-
-
- -
- - @error('name') - - @enderror -
-
-
- -
- - @error('npwp') - - @enderror -
-
-
- -
- - @error('email') - - @enderror -
-
-
- -
- - @error('phone') - - @enderror -
-
- -
- -
- +
-
-@endsection +@endsection --}} + + + +@push('scripts') + + + +@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 @@
- - @if (isset($region)) @foreach ($region as $regions) @if (isset($teams)) @@ -71,31 +72,45 @@ @endif @endforeach @endif - - + + @error('regions_id') + {{ $message }} + @enderror
- @if (isset($user)) @foreach ($user as $users) @if (isset($teams)) + {{ $users->name . ' | ' }} + @foreach ($users->roles as $role) + {{ $role->name }} + @endforeach + @else - + @endif @endforeach @endif - + @error('user') + {{ $message }} + @enderror
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 `
    ${data.user_team.map(user => `
  • ${user.nama}
    • `).join('')}
`; + return `
    ${data.user_team.map(user => + `
  • ${user.nama} | ${user.roles.join(', ')}
    • ` + ).join('')}
`; } else { return '
  • N/A
'; } 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 b2b7559ed02880080079526bcdbf69bfa64f649e Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Tue, 17 Sep 2024 09:31:09 +0700 Subject: [PATCH 28/68] Membuat tampilan menu Tender dan Sub Menu Tender --- app/Http/Controllers/TenderController.php | 77 ++++ module.json | 381 ++++++++-------- resources/views/penawaran/index.blade.php | 22 + .../views/penawaran_ulang/index.blade.php | 22 + .../views/proses_penawaran/index.blade.php | 22 + routes/breadcrumbs.php | 430 +++++++++--------- routes/web.php | 357 ++++++++------- 7 files changed, 750 insertions(+), 561 deletions(-) create mode 100644 app/Http/Controllers/TenderController.php create mode 100644 resources/views/penawaran/index.blade.php create mode 100644 resources/views/penawaran_ulang/index.blade.php create mode 100644 resources/views/proses_penawaran/index.blade.php diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php new file mode 100644 index 0000000..b21766b --- /dev/null +++ b/app/Http/Controllers/TenderController.php @@ -0,0 +1,77 @@ + + +
+
+

+ Data Penawaran +

+ +
+
+ {{-- @include('lpj::debitur.form') --}} +
+
+
+@endsection diff --git a/resources/views/penawaran_ulang/index.blade.php b/resources/views/penawaran_ulang/index.blade.php new file mode 100644 index 0000000..037539a --- /dev/null +++ b/resources/views/penawaran_ulang/index.blade.php @@ -0,0 +1,22 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render('tender.penawaran.ulang') }} +@endsection + +@section('content') +
+ +
+
+

+ Data Penawaran Ulang +

+ +
+
+ {{-- @include('lpj::debitur.form') --}} +
+
+
+@endsection diff --git a/resources/views/proses_penawaran/index.blade.php b/resources/views/proses_penawaran/index.blade.php new file mode 100644 index 0000000..a9f3007 --- /dev/null +++ b/resources/views/proses_penawaran/index.blade.php @@ -0,0 +1,22 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render('tender.proses.penawaran') }} +@endsection + +@section('content') +
+ +
+
+

+ Data Proses Penawaran +

+ +
+
+ {{-- @include('lpj::debitur.form') --}} +
+
+
+@endsection diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 0068876..c0bdc36 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -1,263 +1,281 @@ push('Basic Data'); - }); +Breadcrumbs::for('basicdata', function (BreadcrumbTrail $trail) { + $trail->push('Basic Data'); +}); - Breadcrumbs::for('basicdata.jenis-fasilitas-kredit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Jenis Fasilitas Kredit', route('basicdata.jenis-fasilitas-kredit.index')); - }); +Breadcrumbs::for('basicdata.jenis-fasilitas-kredit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Jenis Fasilitas Kredit', route('basicdata.jenis-fasilitas-kredit.index')); +}); - Breadcrumbs::for('basicdata.jenis-fasilitas-kredit.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-fasilitas-kredit'); - $trail->push('Tambah Jenis Fasilitas Kredit', route('basicdata.jenis-fasilitas-kredit.create')); - }); +Breadcrumbs::for('basicdata.jenis-fasilitas-kredit.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.jenis-fasilitas-kredit'); + $trail->push('Tambah Jenis Fasilitas Kredit', route('basicdata.jenis-fasilitas-kredit.create')); +}); - Breadcrumbs::for('basicdata.jenis-fasilitas-kredit.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-fasilitas-kredit'); - $trail->push('Edit Jenis Fasilitas Kredit'); - }); +Breadcrumbs::for('basicdata.jenis-fasilitas-kredit.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.jenis-fasilitas-kredit'); + $trail->push('Edit Jenis Fasilitas Kredit'); +}); - Breadcrumbs::for('basicdata.jenis-legalitas-jaminan', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Jenis Legalitas Jaminan', route('basicdata.jenis-legalitas-jaminan.index')); - }); +Breadcrumbs::for('basicdata.jenis-legalitas-jaminan', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Jenis Legalitas Jaminan', route('basicdata.jenis-legalitas-jaminan.index')); +}); - Breadcrumbs::for('basicdata.jenis-legalitas-jaminan.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-legalitas-jaminan'); - $trail->push('Tambah Jenis Legalitas Jaminan', route('basicdata.jenis-legalitas-jaminan.create')); - }); +Breadcrumbs::for('basicdata.jenis-legalitas-jaminan.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.jenis-legalitas-jaminan'); + $trail->push('Tambah Jenis Legalitas Jaminan', route('basicdata.jenis-legalitas-jaminan.create')); +}); - Breadcrumbs::for('basicdata.jenis-legalitas-jaminan.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-legalitas-jaminan'); - $trail->push('Edit Jenis Legalitas Jaminan'); - }); +Breadcrumbs::for('basicdata.jenis-legalitas-jaminan.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.jenis-legalitas-jaminan'); + $trail->push('Edit Jenis Legalitas Jaminan'); +}); - Breadcrumbs::for('basicdata.jenis-jaminan', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Jenis Aset', route('basicdata.jenis-jaminan.index')); - }); +Breadcrumbs::for('basicdata.jenis-jaminan', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Jenis Aset', route('basicdata.jenis-jaminan.index')); +}); - Breadcrumbs::for('basicdata.jenis-jaminan.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-jaminan'); - $trail->push('Tambah Jenis Aset', route('basicdata.jenis-jaminan.create')); - }); +Breadcrumbs::for('basicdata.jenis-jaminan.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.jenis-jaminan'); + $trail->push('Tambah Jenis Aset', route('basicdata.jenis-jaminan.create')); +}); - Breadcrumbs::for('basicdata.jenis-jaminan.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-jaminan'); - $trail->push('Edit Jenis Aset'); - }); +Breadcrumbs::for('basicdata.jenis-jaminan.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.jenis-jaminan'); + $trail->push('Edit Jenis Aset'); +}); - Breadcrumbs::for('basicdata.tujuan-penilaian', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Tujuan Penilaian', route('basicdata.tujuan-penilaian.index')); - }); +Breadcrumbs::for('basicdata.tujuan-penilaian', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Tujuan Penilaian', route('basicdata.tujuan-penilaian.index')); +}); - Breadcrumbs::for('basicdata.tujuan-penilaian.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.tujuan-penilaian'); - $trail->push('Tambah Tujuan Penilaian', route('basicdata.tujuan-penilaian.create')); - }); +Breadcrumbs::for('basicdata.tujuan-penilaian.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.tujuan-penilaian'); + $trail->push('Tambah Tujuan Penilaian', route('basicdata.tujuan-penilaian.create')); +}); - Breadcrumbs::for('basicdata.tujuan-penilaian.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.tujuan-penilaian'); - $trail->push('Edit Tujuan Penilaian'); - }); +Breadcrumbs::for('basicdata.tujuan-penilaian.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.tujuan-penilaian'); + $trail->push('Edit Tujuan Penilaian'); +}); - Breadcrumbs::for('basicdata.jenis-dokumen', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Jenis Dokumen', route('basicdata.jenis-dokumen.index')); - }); +Breadcrumbs::for('basicdata.jenis-dokumen', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Jenis Dokumen', route('basicdata.jenis-dokumen.index')); +}); - Breadcrumbs::for('basicdata.jenis-dokumen.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-dokumen'); - $trail->push('Tambah Jenis Dokumen', route('basicdata.jenis-dokumen.create')); - }); +Breadcrumbs::for('basicdata.jenis-dokumen.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.jenis-dokumen'); + $trail->push('Tambah Jenis Dokumen', route('basicdata.jenis-dokumen.create')); +}); - Breadcrumbs::for('basicdata.jenis-dokumen.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.jenis-dokumen'); - $trail->push('Edit Jenis Dokumen'); - }); +Breadcrumbs::for('basicdata.jenis-dokumen.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.jenis-dokumen'); + $trail->push('Edit Jenis Dokumen'); +}); - Breadcrumbs::for('basicdata.currency', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Mata Uang', route('basicdata.currency.index')); - }); +Breadcrumbs::for('basicdata.currency', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Mata Uang', route('basicdata.currency.index')); +}); - Breadcrumbs::for('basicdata.currency.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.currency'); - $trail->push('Tambah Mata Uang', route('basicdata.currency.create')); - }); +Breadcrumbs::for('basicdata.currency.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.currency'); + $trail->push('Tambah Mata Uang', route('basicdata.currency.create')); +}); - Breadcrumbs::for('basicdata.currency.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.currency'); - $trail->push('Edit Mata Uang'); - }); +Breadcrumbs::for('basicdata.currency.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.currency'); + $trail->push('Edit Mata Uang'); +}); - Breadcrumbs::for('basicdata.branch', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Cabang', route('basicdata.branch.index')); - }); +Breadcrumbs::for('basicdata.branch', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Cabang', route('basicdata.branch.index')); +}); - Breadcrumbs::for('basicdata.branch.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.branch'); - $trail->push('Tambah Cabang', route('basicdata.branch.create')); - }); +Breadcrumbs::for('basicdata.branch.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.branch'); + $trail->push('Tambah Cabang', route('basicdata.branch.create')); +}); - Breadcrumbs::for('basicdata.branch.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.branch'); - $trail->push('Edit Cabang'); - }); +Breadcrumbs::for('basicdata.branch.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.branch'); + $trail->push('Edit Cabang'); +}); - Breadcrumbs::for('basicdata.nilai-plafond', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Nilai Plafond', route('basicdata.nilai-plafond.index')); - }); +Breadcrumbs::for('basicdata.nilai-plafond', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Nilai Plafond', route('basicdata.nilai-plafond.index')); +}); - Breadcrumbs::for('basicdata.nilai-plafond.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.nilai-plafond'); - $trail->push('Tambah Nilai Plafond', route('basicdata.nilai-plafond.create')); - }); +Breadcrumbs::for('basicdata.nilai-plafond.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.nilai-plafond'); + $trail->push('Tambah Nilai Plafond', route('basicdata.nilai-plafond.create')); +}); - Breadcrumbs::for('basicdata.nilai-plafond.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.nilai-plafond'); - $trail->push('Edit Nilai Plafond'); - }); +Breadcrumbs::for('basicdata.nilai-plafond.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.nilai-plafond'); + $trail->push('Edit Nilai Plafond'); +}); - Breadcrumbs::for('basicdata.hubungan-pemilik-jaminan', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Hubungan Pemilik Jaminan', route('basicdata.hubungan-pemilik-jaminan.index')); - }); +Breadcrumbs::for('basicdata.hubungan-pemilik-jaminan', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Hubungan Pemilik Jaminan', route('basicdata.hubungan-pemilik-jaminan.index')); +}); - Breadcrumbs::for('basicdata.hubungan-pemilik-jaminan.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.hubungan-pemilik-jaminan'); - $trail->push('Tambah Hubungan Pemilik Jaminan', route('basicdata.hubungan-pemilik-jaminan.create')); - }); +Breadcrumbs::for('basicdata.hubungan-pemilik-jaminan.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.hubungan-pemilik-jaminan'); + $trail->push('Tambah Hubungan Pemilik Jaminan', route('basicdata.hubungan-pemilik-jaminan.create')); +}); - Breadcrumbs::for('basicdata.hubungan-pemilik-jaminan.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.hubungan-pemilik-jaminan'); - $trail->push('Edit Hubungan Pemilik Jaminan'); - }); +Breadcrumbs::for('basicdata.hubungan-pemilik-jaminan.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.hubungan-pemilik-jaminan'); + $trail->push('Edit Hubungan Pemilik Jaminan'); +}); - Breadcrumbs::for('basicdata.hubungan-penghuni-jaminan', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Hubungan Penghuni Jaminan', route('basicdata.hubungan-penghuni-jaminan.index')); - }); +Breadcrumbs::for('basicdata.hubungan-penghuni-jaminan', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Hubungan Penghuni Jaminan', route('basicdata.hubungan-penghuni-jaminan.index')); +}); - Breadcrumbs::for('basicdata.hubungan-penghuni-jaminan.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.hubungan-penghuni-jaminan'); - $trail->push('Tambah Hubungan Penghuni Jaminan', route('basicdata.hubungan-penghuni-jaminan.create')); - }); +Breadcrumbs::for('basicdata.hubungan-penghuni-jaminan.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.hubungan-penghuni-jaminan'); + $trail->push('Tambah Hubungan Penghuni Jaminan', route('basicdata.hubungan-penghuni-jaminan.create')); +}); - Breadcrumbs::for('basicdata.hubungan-penghuni-jaminan.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.hubungan-penghuni-jaminan'); - $trail->push('Edit Hubungan Penghuni Jaminan'); - }); +Breadcrumbs::for('basicdata.hubungan-penghuni-jaminan.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.hubungan-penghuni-jaminan'); + $trail->push('Edit Hubungan Penghuni Jaminan'); +}); - Breadcrumbs::for('basicdata.arah-mata-angin', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Arah Mata Angin', route('basicdata.arah-mata-angin.index')); - }); +Breadcrumbs::for('basicdata.arah-mata-angin', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Arah Mata Angin', route('basicdata.arah-mata-angin.index')); +}); - Breadcrumbs::for('basicdata.arah-mata-angin.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.arah-mata-angin'); - $trail->push('Tambah Arah Mata Angin', route('basicdata.arah-mata-angin.create')); - }); +Breadcrumbs::for('basicdata.arah-mata-angin.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.arah-mata-angin'); + $trail->push('Tambah Arah Mata Angin', route('basicdata.arah-mata-angin.create')); +}); - Breadcrumbs::for('basicdata.arah-mata-angin.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.hubungan-penghuni-jaminan'); - $trail->push('Edit Arah Mata Angin'); - }); +Breadcrumbs::for('basicdata.arah-mata-angin.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.hubungan-penghuni-jaminan'); + $trail->push('Edit Arah Mata Angin'); +}); - Breadcrumbs::for('basicdata.status-permohonan', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata'); - $trail->push('Status Permohonan', route('basicdata.status-permohonan.index')); - }); +Breadcrumbs::for('basicdata.status-permohonan', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Status Permohonan', route('basicdata.status-permohonan.index')); +}); - Breadcrumbs::for('basicdata.status-permohonan.create', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.status-permohonan'); - $trail->push('Tambah Status Permohonan', route('basicdata.status-permohonan.create')); - }); +Breadcrumbs::for('basicdata.status-permohonan.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.status-permohonan'); + $trail->push('Tambah Status Permohonan', route('basicdata.status-permohonan.create')); +}); - Breadcrumbs::for('basicdata.status-permohonan.edit', function (BreadcrumbTrail $trail) { - $trail->parent('basicdata.status-permohonan'); - $trail->push('Edit Status Permohonan'); - }); +Breadcrumbs::for('basicdata.status-permohonan.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.status-permohonan'); + $trail->push('Edit Status Permohonan'); +}); - Breadcrumbs::for('debitur', function (BreadcrumbTrail $trail) { - $trail->push('Debitur', route('debitur.index')); - }); +Breadcrumbs::for('debitur', function (BreadcrumbTrail $trail) { + $trail->push('Debitur', route('debitur.index')); +}); - Breadcrumbs::for('debitur.create', function (BreadcrumbTrail $trail) { - $trail->parent('debitur'); - $trail->push('Tambah Debitur', route('debitur.create')); - }); +Breadcrumbs::for('debitur.create', function (BreadcrumbTrail $trail) { + $trail->parent('debitur'); + $trail->push('Tambah Debitur', route('debitur.create')); +}); - Breadcrumbs::for('debitur.edit', function (BreadcrumbTrail $trail) { - $trail->parent('debitur'); - $trail->push('Data Debitur'); - }); +Breadcrumbs::for('debitur.edit', function (BreadcrumbTrail $trail) { + $trail->parent('debitur'); + $trail->push('Data Debitur'); +}); - Breadcrumbs::for('debitur.jaminan.index', function (BreadcrumbTrail $trail) { - $trail->parent('debitur'); - $trail->push('Data Jaminan Debitur'); - }); +Breadcrumbs::for('debitur.jaminan.index', function (BreadcrumbTrail $trail) { + $trail->parent('debitur'); + $trail->push('Data Jaminan Debitur'); +}); - Breadcrumbs::for('debitur.jaminan.create', function (BreadcrumbTrail $trail) { - $trail->parent('debitur.jaminan.index'); - $trail->push('Tambah Data Jaminan Debitur'); - }); +Breadcrumbs::for('debitur.jaminan.create', function (BreadcrumbTrail $trail) { + $trail->parent('debitur.jaminan.index'); + $trail->push('Tambah Data Jaminan Debitur'); +}); - Breadcrumbs::for('debitur.jaminan.edit', function (BreadcrumbTrail $trail) { - $trail->parent('debitur.jaminan.index'); - $trail->push('Edit Data Jaminan Debitur'); - }); +Breadcrumbs::for('debitur.jaminan.edit', function (BreadcrumbTrail $trail) { + $trail->parent('debitur.jaminan.index'); + $trail->push('Edit Data Jaminan Debitur'); +}); - Breadcrumbs::for('debitur.pemilik.index', function (BreadcrumbTrail $trail) { - $trail->parent('debitur'); - $trail->push('Data Pemilik Jaminan Debitur'); - }); +Breadcrumbs::for('debitur.pemilik.index', function (BreadcrumbTrail $trail) { + $trail->parent('debitur'); + $trail->push('Data Pemilik Jaminan Debitur'); +}); - Breadcrumbs::for('debitur.pemilik.create', function (BreadcrumbTrail $trail) { - $trail->parent('debitur.pemilik.index'); - $trail->push('Tambah Data Pemilik Jaminan Debitur'); - }); +Breadcrumbs::for('debitur.pemilik.create', function (BreadcrumbTrail $trail) { + $trail->parent('debitur.pemilik.index'); + $trail->push('Tambah Data Pemilik Jaminan Debitur'); +}); - Breadcrumbs::for('debitur.pemilik.edit', function (BreadcrumbTrail $trail) { - $trail->parent('debitur.pemilik.index'); - $trail->push('Edit Data Pemilik Jaminan Debitur'); - }); +Breadcrumbs::for('debitur.pemilik.edit', function (BreadcrumbTrail $trail) { + $trail->parent('debitur.pemilik.index'); + $trail->push('Edit Data Pemilik Jaminan Debitur'); +}); - Breadcrumbs::for('permohonan.index', function (BreadcrumbTrail $trail) { - $trail->push('Permohonan', route('permohonan.index')); - }); +Breadcrumbs::for('permohonan.index', function (BreadcrumbTrail $trail) { + $trail->push('Permohonan', route('permohonan.index')); +}); - Breadcrumbs::for('permohonan.create', function (BreadcrumbTrail $trail) { - $trail->parent('permohonan.index'); - $trail->push('Tambah Permohonan', route('permohonan.create')); - }); +Breadcrumbs::for('permohonan.create', function (BreadcrumbTrail $trail) { + $trail->parent('permohonan.index'); + $trail->push('Tambah Permohonan', route('permohonan.create')); +}); - Breadcrumbs::for('permohonan.create.debitur', function (BreadcrumbTrail $trail) { - $trail->parent('permohonan.index'); - $trail->push('Tambah Permohonan', route('permohonan.create')); - }); +Breadcrumbs::for('permohonan.create.debitur', function (BreadcrumbTrail $trail) { + $trail->parent('permohonan.index'); + $trail->push('Tambah Permohonan', route('permohonan.create')); +}); - Breadcrumbs::for('permohonan.edit', function (BreadcrumbTrail $trail) { - $trail->parent('permohonan.index'); - $trail->push('Data Permohonan'); - }); +Breadcrumbs::for('permohonan.edit', function (BreadcrumbTrail $trail) { + $trail->parent('permohonan.index'); + $trail->push('Data Permohonan'); +}); - Breadcrumbs::for('authorization.index', function (BreadcrumbTrail $trail) { - $trail->push('Permohonan', route('authorization.index')); - }); +Breadcrumbs::for('authorization.index', function (BreadcrumbTrail $trail) { + $trail->push('Permohonan', route('authorization.index')); +}); - Breadcrumbs::for('authorization.show', function (BreadcrumbTrail $trail) { - $trail->parent('authorization.index'); - $trail->push('Detail Permohonan'); - }); +Breadcrumbs::for('authorization.show', function (BreadcrumbTrail $trail) { + $trail->parent('authorization.index'); + $trail->push('Detail Permohonan'); +}); +Breadcrumbs::for('tender', function (BreadcrumbTrail $trail) { + $trail->push('Tender'); +}); + +Breadcrumbs::for('tender.penawaran', function (BreadcrumbTrail $trail) { + $trail->parent('tender'); + $trail->push('Data Penawaran', route('tender.penawaran.index')); +}); + +Breadcrumbs::for('tender.proses.penawaran', function (BreadcrumbTrail $trail) { + $trail->parent('tender'); + $trail->push('Data Proses Penawaran', route('tender.proses_penawaran.index')); +}); + +Breadcrumbs::for('tender.penawaran.ulang', function (BreadcrumbTrail $trail) { + $trail->parent('tender'); + $trail->push('Data Penawaran Ulang', route('tender.penawaran_ulang.index')); +}); diff --git a/routes/web.php b/routes/web.php index 0a8075f..fd299bf 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,25 +1,26 @@ 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('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::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-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-aset')->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('jenis-jaminan.')->prefix('jenis-aset')->group(function () { + Route::get('legalitas/{id}', [JenisJaminanController::class, 'legalitasJaminan'])->name('legalitas'); + Route::get('restore/{id}', [JenisJaminanController::class, 'restore'])->name('restore'); + Route::get('datatables', [JenisJaminanController::class, 'dataForDatatables']) + ->name('datatables'); + Route::get('export', [JenisJaminanController::class, 'export'])->name('export'); + }); + Route::resource('jenis-jaminan', JenisJaminanController::class); - Route::name('tujuan-penilaian.')->prefix('tujuan-penilaian')->group(function () { - Route::get('restore/{id}', [TujuanPenilaianController::class, 'restore'])->name('restore'); - Route::get('datatables', [TujuanPenilaianController::class, 'dataForDatatables']) - ->name('datatables'); - Route::get('export', [TujuanPenilaianController::class, 'export'])->name('export'); - }); - Route::resource('tujuan-penilaian', TujuanPenilaianController::class); + Route::name('tujuan-penilaian.')->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-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('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('currency.')->prefix('mata-uang')->group(function () { + Route::get('restore/{id}', [CurrencyController::class, 'restore'])->name('restore'); + Route::get('datatables', [CurrencyController::class, 'dataForDatatables']) + ->name('datatables'); + Route::get('export', [CurrencyController::class, 'export'])->name('export'); }); - Route::name('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('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('permohonan', PermohonanController::class); + 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::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index'); - Route::get('authorization/datatables', [PermohonanController::class, 'dataForAuthorization']) - ->name('authorization.datatables'); - Route::get('authorization/{id}/edit', [PermohonanController::class, 'showAuthorization'])->name('authorization.show'); - Route::put('authorization/{id}', [PermohonanController::class, 'updateAuthorization'])->name('authorization.update'); - - Route::name('debitur.')->prefix('debitur')->group(function () { - Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore'); - Route::get('datatables', [DebitureController::class, 'dataForDatatables']) - ->name('datatables'); - Route::get('export', [DebitureController::class, 'export'])->name('export'); - - - Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () { - Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download'); - Route::get('/', [DokumenJaminanController::class, 'index'])->name('index'); - Route::get('create', [DokumenJaminanController::class, 'create'])->name('create'); - Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit'); - Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update'); - Route::post('store', [DokumenJaminanController::class, 'store'])->name('store'); - Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy'); - }); - - Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () { - Route::get('/', [PemilikJaminanController::class, 'index'])->name('index'); - Route::get('create', [PemilikJaminanController::class, 'create'])->name('create'); - Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit'); - Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update'); - Route::post('store', [PemilikJaminanController::class, 'store'])->name('store'); - Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy'); - }); + 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::resource('debitur', DebitureController::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']) + ->name('datatables'); + Route::get('export', [PermohonanController::class, 'export'])->name('export'); + }); + + Route::resource('permohonan', PermohonanController::class); + + Route::get('authorization', [PermohonanController::class, 'authorization'])->name('authorization.index'); + Route::get('authorization/datatables', [PermohonanController::class, 'dataForAuthorization']) + ->name('authorization.datatables'); + Route::get('authorization/{id}/edit', [PermohonanController::class, 'showAuthorization'])->name('authorization.show'); + Route::put('authorization/{id}', [PermohonanController::class, 'updateAuthorization'])->name('authorization.update'); + + Route::name('debitur.')->prefix('debitur')->group(function () { + Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore'); + Route::get('datatables', [DebitureController::class, 'dataForDatatables']) + ->name('datatables'); + Route::get('export', [DebitureController::class, 'export'])->name('export'); + + + Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () { + Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download'); + Route::get('/', [DokumenJaminanController::class, 'index'])->name('index'); + Route::get('create', [DokumenJaminanController::class, 'create'])->name('create'); + Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit'); + Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update'); + Route::post('store', [DokumenJaminanController::class, 'store'])->name('store'); + Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy'); + }); + + Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () { + Route::get('/', [PemilikJaminanController::class, 'index'])->name('index'); + Route::get('create', [PemilikJaminanController::class, 'create'])->name('create'); + Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit'); + Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update'); + Route::post('store', [PemilikJaminanController::class, 'store'])->name('store'); + Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy'); + }); + }); + + Route::resource('debitur', DebitureController::class); + + Route::name('tender.')->prefix('tender')->group(function () { + Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index'); + Route::get('proses_penawaran', [TenderController::class, 'proses_penawaran_index'])->name('proses_penawaran.index'); + Route::get('penawaran_ulang', [TenderController::class, 'penawaran_ulang_index'])->name('penawaran_ulang.index'); + }); +}); From 2041b3898092b978261da908c24d0160b0ce8972 Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Wed, 18 Sep 2024 11:06:17 +0700 Subject: [PATCH 29/68] Membuat tampilan menu master ijin usaha --- app/Http/Controllers/IjinUsahaController.php | 166 ++++++++++++++++++ app/Http/Controllers/KJPPController.php | 135 ++++++++++++++ app/Http/Controllers/TenderController.php | 47 +++-- app/Http/Requests/IjinUsahaRequest.php | 37 ++++ app/Models/IjinUsaha.php | 24 +++ app/Models/KJPP.php | 32 ++++ ...4_09_18_014746_create_ijin_usaha_table.php | 28 +++ .../2024_09_18_084905_create_kjpp_table.php | 49 ++++++ module.json | 18 +- resources/views/Ijin_usaha/create.blade.php | 50 ++++++ resources/views/Ijin_usaha/index.blade.php | 143 +++++++++++++++ resources/views/kjpp/index.blade.php | 162 +++++++++++++++++ resources/views/penawaran/create.blade.php | 22 +++ resources/views/penawaran/index.blade.php | 7 +- routes/breadcrumbs.php | 20 +++ routes/web.php | 23 +++ 16 files changed, 943 insertions(+), 20 deletions(-) create mode 100644 app/Http/Controllers/IjinUsahaController.php create mode 100644 app/Http/Controllers/KJPPController.php create mode 100644 app/Http/Requests/IjinUsahaRequest.php create mode 100644 app/Models/IjinUsaha.php create mode 100644 app/Models/KJPP.php create mode 100644 database/migrations/2024_09_18_014746_create_ijin_usaha_table.php create mode 100644 database/migrations/2024_09_18_084905_create_kjpp_table.php create mode 100644 resources/views/Ijin_usaha/create.blade.php create mode 100644 resources/views/Ijin_usaha/index.blade.php create mode 100644 resources/views/kjpp/index.blade.php create mode 100644 resources/views/penawaran/create.blade.php diff --git a/app/Http/Controllers/IjinUsahaController.php b/app/Http/Controllers/IjinUsahaController.php new file mode 100644 index 0000000..fb30b5d --- /dev/null +++ b/app/Http/Controllers/IjinUsahaController.php @@ -0,0 +1,166 @@ +validated(); + + if ($validate) { + try { + IjinUsaha::create($validate); + return redirect() + ->route('basicdata.ijin_usaha.index') + ->with('success', 'Ijin Usaha created successfully'); + } catch (Exception $e) { + return redirect() + ->route('basicdata.ijin_usaha.create') + ->with('error', 'Failed to create ijin Usaha'); + } + } + } + + /** + * Show the specified resource. + */ + public function show($id) + { + // return view('lpj::show'); + } + + /** + * Show the form for editing the specified resource. + */ + public function edit($id) + { + $ijin_usaha = IjinUsaha::find($id); + return view('lpj::Ijin_usaha.create', compact('ijin_usaha')); + } + + /** + * Update the specified resource in storage. + */ + public function update(IjinUsahaRequest $request, $id) + { + $validate = $request->validated(); + + if ($validate) { + try { + // Update in database + $ijin_usaha = IjinUsaha::find($id); + $ijin_usaha->update($validate); + return redirect() + ->route('basicdata.ijin_usaha.index') + ->with('success', 'Ijin Usaha updated successfully'); + } catch (Exception $e) { + return redirect() + ->route('basicdata.ijin_usaha.edit', $id) + ->with('error', 'Failed to update ijin$ijin_usaha'); + } + } + } + + /** + * Remove the specified resource from storage. + */ + public function destroy($id) + { + try { + $ijin_usaha = IjinUsaha::find($id); + $ijin_usaha->delete(); + + echo json_encode(['success' => true, 'message' => 'Ijin Usaha deleted successfully']); + } catch (Exception $e) { + echo json_encode(['success' => false, 'message' => 'Failed to delete Ijin Usaha']); + } + } + + public function dataForDatatables(Request $request) + { + if (is_null($this->user) || !$this->user->can('Ijin_usaha.view')) { + //abort(403, 'Sorry! You are not allowed to view users.'); + } + + // Retrieve data from the database + $query = IjinUsaha::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('nama_ijin_usaha', '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->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/KJPPController.php b/app/Http/Controllers/KJPPController.php new file mode 100644 index 0000000..a3b5711 --- /dev/null +++ b/app/Http/Controllers/KJPPController.php @@ -0,0 +1,135 @@ +user) || !$this->user->can('kjpp.view')) { + //abort(403, 'Sorry! You are not allowed to view users.'); + } + + // Retrieve data from the database + $query = KJPP::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', 'LIKE', "%$search%"); + $q->orWhere('nama_kjpp', '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->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 CurrencyExport, 'currency.xlsx'); + } +} diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php index b21766b..d23fd30 100644 --- a/app/Http/Controllers/TenderController.php +++ b/app/Http/Controllers/TenderController.php @@ -6,6 +6,7 @@ use App\Http\Controllers\Controller; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Modules\Lpj\Models\Penawaran; class TenderController extends Controller { @@ -17,36 +18,42 @@ class TenderController extends Controller return view('lpj::penawaran/index'); } - public function proses_penawaran_index() - { - return view('lpj::proses_penawaran/index'); - } - - public function penawaran_ulang_index() - { - return view('lpj::penawaran_ulang/index'); - } - /** * Show the form for creating a new resource. */ - public function create() + public function penawaran_create() { - return view('lpj::create'); + return view('lpj::penawaran/create'); } /** * Store a newly created resource in storage. */ - public function store(Request $request): RedirectResponse + public function penawaran_store(Request $request): RedirectResponse { - // + // $validated = $request->validate([ + // 'nama_kjpp_sebelumnya' => 'required|string', + // 'biaya_kjpp_sebelumnya' => 'required|numeric', + // 'tgl_penilaian_sebelumnya' => 'required|date', + // 'nama_kjpp_1' => 'required|exists:kjpps,id', + // 'nama_kjpp_2' => 'required|exists:kjpps,id', + // 'nama_kjpp_3' => 'required|exists:kjpps,id', + // 'data_jaminan_legalitas' => 'required|string', + // 'tujuan_penilaian' => 'required|in:Penjaminan Hutang,Lelang,Revaluasi Aset', + // 'jenis_laporan' => 'required|in:Short report,Full report', + // 'batas_waktu' => 'required|date', + // 'catatan' => 'nullable|string' + // ]); + + // Penawaran::create($validated); + + // return redirect()->back()->with('success', 'Data berhasil disimpan!'); } /** * Show the specified resource. */ - public function show($id) + public function penawaran_show($id) { return view('lpj::show'); } @@ -74,4 +81,14 @@ class TenderController extends Controller { // } + + public function proses_penawaran_index() + { + return view('lpj::proses_penawaran/index'); + } + + public function penawaran_ulang_index() + { + return view('lpj::penawaran_ulang/index'); + } } diff --git a/app/Http/Requests/IjinUsahaRequest.php b/app/Http/Requests/IjinUsahaRequest.php new file mode 100644 index 0000000..1acbe41 --- /dev/null +++ b/app/Http/Requests/IjinUsahaRequest.php @@ -0,0 +1,37 @@ + 'required|string|not_regex:/^\d+$/|max:255' + ]; + + return $rules; + } + + /** + * Determine if the user is authorized to make this request. + */ + public function authorize(): bool + { + return true; + } + + public function messages(): array + { + return [ + 'nama_ijin_usaha.required' => 'Nama Ijin Usaha harus diisi!', + 'nama_ijin_usaha.not_regex' => 'Nama Ijin Usaha harus berupa huruf!', + 'nama_ijin_usaha.max' => 'Nama Ijin Usaha maksimal 255 huruf!' + ]; + } +} diff --git a/app/Models/IjinUsaha.php b/app/Models/IjinUsaha.php new file mode 100644 index 0000000..f1486fa --- /dev/null +++ b/app/Models/IjinUsaha.php @@ -0,0 +1,24 @@ + 'array', + 'pengalaman' => 'array', + 'kerjasama_sejak' => 'date', // For date fields + ]; + + // protected static function newFactory(): KJPPFactory + // { + // //return KJPPFactory::new(); + // } +} diff --git a/database/migrations/2024_09_18_014746_create_ijin_usaha_table.php b/database/migrations/2024_09_18_014746_create_ijin_usaha_table.php new file mode 100644 index 0000000..9766587 --- /dev/null +++ b/database/migrations/2024_09_18_014746_create_ijin_usaha_table.php @@ -0,0 +1,28 @@ +id(); + $table->string('nama_ijin_usaha'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('ijin_usaha'); + } +}; diff --git a/database/migrations/2024_09_18_084905_create_kjpp_table.php b/database/migrations/2024_09_18_084905_create_kjpp_table.php new file mode 100644 index 0000000..a7e747e --- /dev/null +++ b/database/migrations/2024_09_18_084905_create_kjpp_table.php @@ -0,0 +1,49 @@ +id(); + $table->string('nomor'); + $table->string('nama_kjpp'); + $table->string('kantor_pusat'); + $table->string('nomor_ijin_usaha'); + $table->string('kota'); + $table->date('kerjasama_sejak'); + $table->text('alamat_kantor'); + $table->string('no_tlp_kantor', 15); + $table->string('alamat_email'); + $table->string('nama_pimpinan_kantor'); + $table->string('no_hp_pimpinan', 15); + $table->string('nama_pic_reviewer'); + $table->string('no_pic_reviewer', 15); + $table->string('nama_pic_admin'); + $table->string('no_pic_admin', 15); + $table->string('nama_pic_marketing'); + $table->string('no_pic_marketing', 15); + $table->json('ijin_usaha'); + $table->json('pengalaman'); + $table->string('company_name'); + $table->string('ijin_ijin'); + $table->string('npwp'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('kjpp'); + } +}; diff --git a/module.json b/module.json index dfdeee7..64686ef 100644 --- a/module.json +++ b/module.json @@ -21,7 +21,7 @@ { "title": "Tender", "path": "tender", - "icon": "ki-filled ki-questionnaire-tablet text-lg", + "icon": "ki-filled ki-category text-lg", "classes": "", "attributes": [], "permission": "", @@ -108,6 +108,22 @@ "permission": "", "roles": [] }, + { + "title": "KJPP", + "path": "basicdata.kjpp", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Ijin Usaha", + "path": "basicdata.ijin_usaha", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, { "title": "Mata Uang", "path": "basicdata.currency", diff --git a/resources/views/Ijin_usaha/create.blade.php b/resources/views/Ijin_usaha/create.blade.php new file mode 100644 index 0000000..1bec879 --- /dev/null +++ b/resources/views/Ijin_usaha/create.blade.php @@ -0,0 +1,50 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render(request()->route()->getName()) }} +@endsection + +@section('content') +
+ @if (isset($ijin_usaha->id)) +
+ + @method('PUT') + @else + + @endif + @csrf +
+
+

+ {{ isset($ijin_usaha->id) ? 'Edit' : 'Tambah' }} Ijin Usaha +

+
+ Back +
+
+
+
+ +
+ + @error('nama_ijin_usaha') + {{ $message }} + @enderror +
+
+
+ +
+
+
+
+
+@endsection diff --git a/resources/views/Ijin_usaha/index.blade.php b/resources/views/Ijin_usaha/index.blade.php new file mode 100644 index 0000000..3262d52 --- /dev/null +++ b/resources/views/Ijin_usaha/index.blade.php @@ -0,0 +1,143 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render('basicdata.ijin_usaha') }} +@endsection + +@section('content') +
+
+
+

+ Ijin Usaha +

+
+
+ +
+
+
+ Tambah Ijin + Usaha + +
+
+
+
+
+ + + + + + + + +
+ + + Nama Ijin Usaha + + Action
+
+
+
+ Show + per page +
+
+ + +
+
+
+
+
+@endsection + +@push('scripts') + + + +@endpush diff --git a/resources/views/kjpp/index.blade.php b/resources/views/kjpp/index.blade.php new file mode 100644 index 0000000..421ece7 --- /dev/null +++ b/resources/views/kjpp/index.blade.php @@ -0,0 +1,162 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render('basicdata.kjpp') }} +@endsection + +@section('content') +
+
+
+

+ KJPP +

+
+
+ +
+
+
+ Export to Excel + + Tambah KJPP + +
+
+
+
+
+ + + + + + + + + + +
+ + + Nomor + + + Nama KJPP + + + Kota + + Action
+
+
+
+ Show + per page +
+
+ + +
+
+
+
+
+@endsection + +@push('scripts') + + + +@endpush diff --git a/resources/views/penawaran/create.blade.php b/resources/views/penawaran/create.blade.php new file mode 100644 index 0000000..08ec062 --- /dev/null +++ b/resources/views/penawaran/create.blade.php @@ -0,0 +1,22 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render('tender.penawaran') }} +@endsection + +@section('content') +
+ +
+
+

+ Tambah Data Penawaran +

+ +
+
+ {{-- @include('lpj::debitur.form') --}} +
+
+
+@endsection diff --git a/resources/views/penawaran/index.blade.php b/resources/views/penawaran/index.blade.php index 0357d4b..9158891 100644 --- a/resources/views/penawaran/index.blade.php +++ b/resources/views/penawaran/index.blade.php @@ -7,15 +7,14 @@ @section('content')
-
-
+
+

Data Penawaran

-
- {{-- @include('lpj::debitur.form') --}}
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index c0bdc36..9e78119 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -188,6 +188,26 @@ Breadcrumbs::for('basicdata.status-permohonan.edit', function (BreadcrumbTrail $ $trail->push('Edit Status Permohonan'); }); +Breadcrumbs::for('basicdata.kjpp', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('KJPP', route('basicdata.kjpp.index')); +}); + +Breadcrumbs::for('basicdata.ijin_usaha', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata'); + $trail->push('Ijin Usaha', route('basicdata.ijin_usaha.index')); +}); + +Breadcrumbs::for('basicdata.ijin_usaha.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.ijin_usaha'); + $trail->push('Tambah Ijin Usaha', route('basicdata.ijin_usaha.create')); +}); + +Breadcrumbs::for('basicdata.ijin_usaha.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.ijin_usaha'); + $trail->push('Edit Ijin Usaha'); +}); + Breadcrumbs::for('debitur', function (BreadcrumbTrail $trail) { $trail->push('Debitur', route('debitur.index')); }); diff --git a/routes/web.php b/routes/web.php index fd299bf..965c4a8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -8,11 +8,13 @@ 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\IjinUsahaController; 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\KJPPController; use Modules\Lpj\Http\Controllers\NilaiPlafondController; use Modules\Lpj\Http\Controllers\PemilikJaminanController; use Modules\Lpj\Http\Controllers\PermohonanController; @@ -152,6 +154,21 @@ Route::middleware(['auth'])->group(function () { Route::get('export', [StatusPermohonanController::class, 'export'])->name('export'); }); Route::resource('status-permohonan', StatusPermohonanController::class); + + Route::name('kjpp.')->prefix('kjpp')->group(function () { + Route::get('datatables', [KJPPController::class, 'dataForDatatables']) + ->name('datatables'); + Route::get('export', [KJPPController::class, 'export'])->name('export'); + }); + + Route::resource('kjpp', KJPPController::class); + + Route::name('ijin_usaha.')->prefix('ijin_usaha')->group(function () { + Route::get('datatables', [IjinUsahaController::class, 'dataForDatatables']) + ->name('datatables'); + }); + + Route::resource('ijin_usaha', IjinUsahaController::class); }); Route::name('permohonan.')->prefix('permohonan')->group(function () { @@ -201,8 +218,14 @@ Route::middleware(['auth'])->group(function () { Route::resource('debitur', DebitureController::class); Route::name('tender.')->prefix('tender')->group(function () { + // Penawaran Route::get('penawaran', [TenderController::class, 'penawaran_index'])->name('penawaran.index'); + Route::get('penawaran/create', [TenderController::class, 'penawaran_create'])->name('penawaran.create'); + + // Proses Penawaran Route::get('proses_penawaran', [TenderController::class, 'proses_penawaran_index'])->name('proses_penawaran.index'); + + // Penawaran Ulang Route::get('penawaran_ulang', [TenderController::class, 'penawaran_ulang_index'])->name('penawaran_ulang.index'); }); }); From 43e6f8d71edf76b5ecd9530b39444853d69d0b8b Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Wed, 18 Sep 2024 15:53:15 +0700 Subject: [PATCH 30/68] Mengubah tampilan menu master Ijin Usaha --- app/Http/Controllers/KJPPController.php | 14 +- app/Http/Requests/IjinUsahaRequest.php | 17 +- app/Models/Branch.php | 20 +-- app/Models/IjinUsaha.php | 8 +- app/Models/JenisAset.php | 14 +- app/Models/KJPP.php | 12 -- ...4_09_18_014746_create_ijin_usaha_table.php | 10 +- .../2024_09_18_084905_create_kjpp_table.php | 43 ++--- resources/views/Ijin_usaha/create.blade.php | 35 +++- resources/views/Ijin_usaha/index.blade.php | 11 +- .../views/jenis_jaminan/create.blade.php | 151 ++++++++++-------- resources/views/kjpp/create.blade.php | 90 +++++++++++ routes/breadcrumbs.php | 10 ++ 13 files changed, 300 insertions(+), 135 deletions(-) create mode 100644 resources/views/kjpp/create.blade.php diff --git a/app/Http/Controllers/KJPPController.php b/app/Http/Controllers/KJPPController.php index a3b5711..801d6a8 100644 --- a/app/Http/Controllers/KJPPController.php +++ b/app/Http/Controllers/KJPPController.php @@ -3,9 +3,11 @@ 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\Branch; +use Modules\Lpj\Models\IjinUsaha; +use Modules\Lpj\Models\JenisAset; use Modules\Lpj\Models\KJPP; class KJPPController extends Controller @@ -24,13 +26,17 @@ class KJPPController extends Controller */ public function create() { - return view('lpj::create'); + $branch = Branch::all(); + $ijin_usaha = IjinUsaha::all(); + $jenis_aset = JenisAset::all(); + + return view('lpj::kjpp.create', compact('branch', 'ijin_usaha', 'jenis_aset')); } /** * Store a newly created resource in storage. */ - public function store(Request $request): RedirectResponse + public function store(Request $request) { // } @@ -54,7 +60,7 @@ class KJPPController extends Controller /** * Update the specified resource in storage. */ - public function update(Request $request, $id): RedirectResponse + public function update(Request $request, $id) { // } diff --git a/app/Http/Requests/IjinUsahaRequest.php b/app/Http/Requests/IjinUsahaRequest.php index 1acbe41..6f5cd80 100644 --- a/app/Http/Requests/IjinUsahaRequest.php +++ b/app/Http/Requests/IjinUsahaRequest.php @@ -12,9 +12,15 @@ class IjinUsahaRequest extends FormRequest public function rules(): array { $rules = [ - 'nama_ijin_usaha' => 'required|string|not_regex:/^\d+$/|max:255' + 'name' => 'required|string|not_regex:/^\d+$/|max:255' ]; + if ($this->method() == 'PUT') { + $rules['code'] = 'required|max:50|unique:ijin_usaha,code,' . $this->id; + } else { + $rules['code'] = 'required|max:50|unique:ijin_usaha,code'; + } + return $rules; } @@ -29,9 +35,12 @@ class IjinUsahaRequest extends FormRequest public function messages(): array { return [ - 'nama_ijin_usaha.required' => 'Nama Ijin Usaha harus diisi!', - 'nama_ijin_usaha.not_regex' => 'Nama Ijin Usaha harus berupa huruf!', - 'nama_ijin_usaha.max' => 'Nama Ijin Usaha maksimal 255 huruf!' + 'code.required' => 'Kode Ijin Usaha harus diisi!', + 'code.max' => 'Kode Ijin Usaha maksimal 255 huruf!', + 'code.unique' => 'Kode Ijin Usaha tidak boleh sama!', + 'name.required' => 'Nama Ijin Usaha harus diisi!', + 'name.not_regex' => 'Nama Ijin Usaha harus berupa huruf!', + 'name.max' => 'Nama Ijin Usaha maksimal 255 huruf!' ]; } } diff --git a/app/Models/Branch.php b/app/Models/Branch.php index 836cca5..834b5cc 100644 --- a/app/Models/Branch.php +++ b/app/Models/Branch.php @@ -1,16 +1,16 @@ hasMany(Debiture::class, 'branch_id', 'id'); - } + return $this->hasMany(Debiture::class, 'branch_id', 'id'); } +} diff --git a/app/Models/IjinUsaha.php b/app/Models/IjinUsaha.php index f1486fa..e2e464a 100644 --- a/app/Models/IjinUsaha.php +++ b/app/Models/IjinUsaha.php @@ -4,7 +4,6 @@ namespace Modules\Lpj\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Modules\Lpj\Database\Factories\IjinUsahaFactory; class IjinUsaha extends Model { @@ -15,10 +14,5 @@ class IjinUsaha extends Model /** * The attributes that are mass assignable. */ - protected $fillable = ['nama_ijin_usaha']; - - // protected static function newFactory(): IjinUsahaFactory - // { - // //return IjinUsahaFactory::new(); - // } + protected $fillable = ['code', 'name']; } diff --git a/app/Models/JenisAset.php b/app/Models/JenisAset.php index 4a3edf8..6d18441 100644 --- a/app/Models/JenisAset.php +++ b/app/Models/JenisAset.php @@ -1,11 +1,11 @@ 'array', - 'pengalaman' => 'array', - 'kerjasama_sejak' => 'date', // For date fields - ]; - - // protected static function newFactory(): KJPPFactory - // { - // //return KJPPFactory::new(); - // } } diff --git a/database/migrations/2024_09_18_014746_create_ijin_usaha_table.php b/database/migrations/2024_09_18_014746_create_ijin_usaha_table.php index 9766587..af9e74f 100644 --- a/database/migrations/2024_09_18_014746_create_ijin_usaha_table.php +++ b/database/migrations/2024_09_18_014746_create_ijin_usaha_table.php @@ -13,8 +13,16 @@ return new class extends Migration { Schema::create('ijin_usaha', function (Blueprint $table) { $table->id(); - $table->string('nama_ijin_usaha'); + $table->string('code')->unique()->index(); + $table->string('name'); + $table->boolean('status')->default(true)->nullable(); + $table->char('authorized_status', 1)->nullable(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); $table->timestamps(); + $table->softDeletes(); + + $table->unsignedBigInteger('deleted_by')->nullable(); }); } diff --git a/database/migrations/2024_09_18_084905_create_kjpp_table.php b/database/migrations/2024_09_18_084905_create_kjpp_table.php index a7e747e..1a086d7 100644 --- a/database/migrations/2024_09_18_084905_create_kjpp_table.php +++ b/database/migrations/2024_09_18_084905_create_kjpp_table.php @@ -13,28 +13,35 @@ return new class extends Migration { Schema::create('kjpp', function (Blueprint $table) { $table->id(); - $table->string('nomor'); - $table->string('nama_kjpp'); - $table->string('kantor_pusat'); + $table->string('code'); + $table->string('name'); + $table->string('jenis_kantor'); $table->string('nomor_ijin_usaha'); - $table->string('kota'); - $table->date('kerjasama_sejak'); - $table->text('alamat_kantor'); - $table->string('no_tlp_kantor', 15); - $table->string('alamat_email'); - $table->string('nama_pimpinan_kantor'); - $table->string('no_hp_pimpinan', 15); + $table->string('province_code'); + $table->string('city_code'); + $table->string('district_code'); + $table->string('village_code'); + $table->string('address'); + $table->string('postal_code'); + $table->string('nomor_telepon_kantor'); + $table->string('email_kantor'); + $table->string('nomor_hp_pimpinan'); $table->string('nama_pic_reviewer'); - $table->string('no_pic_reviewer', 15); + $table->string('nomor_hp_pic_reviewer'); $table->string('nama_pic_admin'); - $table->string('no_pic_admin', 15); + $table->string('nomor_hp_pic_admin'); $table->string('nama_pic_marketing'); - $table->string('no_pic_marketing', 15); - $table->json('ijin_usaha'); - $table->json('pengalaman'); - $table->string('company_name'); - $table->string('ijin_ijin'); - $table->string('npwp'); + $table->string('nomor_hp_pic_marketing'); + $table->foreignId('ijin_usaha_id')->constrained()->onDelete('cascade'); + $table->foreignId('jenis_aset_id')->constrained()->onDelete('cascade'); + $table->string('attachment'); + $table->boolean('status')->default(true)->nullable(); + $table->char('authorized_status', 1)->nullable(); + $table->timestamp('authorized_at')->nullable(); + $table->unsignedBigInteger('authorized_by')->nullable(); + $table->softDeletes(); + + $table->unsignedBigInteger('deleted_by')->nullable(); $table->timestamps(); }); } diff --git a/resources/views/Ijin_usaha/create.blade.php b/resources/views/Ijin_usaha/create.blade.php index 1bec879..507268d 100644 --- a/resources/views/Ijin_usaha/create.blade.php +++ b/resources/views/Ijin_usaha/create.blade.php @@ -25,15 +25,42 @@
+ @if (isset($ijin_usaha->id)) +
+ +
+ + @error('code') + {{ $message }} + @enderror +
+
+ @else +
+ +
+ + @error('code') + {{ $message }} + @enderror +
+
+ @endif
- - @error('nama_ijin_usaha') + + @error('name') {{ $message }} @enderror
diff --git a/resources/views/Ijin_usaha/index.blade.php b/resources/views/Ijin_usaha/index.blade.php index 3262d52..8364f63 100644 --- a/resources/views/Ijin_usaha/index.blade.php +++ b/resources/views/Ijin_usaha/index.blade.php @@ -35,7 +35,11 @@ - + + Kode Ijin Usaha + + + Nama Ijin Usaha @@ -114,7 +118,10 @@ return checkbox.outerHTML.trim(); }, }, - nama_ijin_usaha: { + code: { + title: 'Kode Ijin Usaha', + }, + name: { title: 'Nama Ijin Usaha', }, actions: { diff --git a/resources/views/jenis_jaminan/create.blade.php b/resources/views/jenis_jaminan/create.blade.php index ed04b81..0f9d930 100644 --- a/resources/views/jenis_jaminan/create.blade.php +++ b/resources/views/jenis_jaminan/create.blade.php @@ -6,75 +6,94 @@ @section('content')
- @if(isset($jenisJaminan->id)) + @if (isset($jenisJaminan->id))
@method('PUT') - @else - - @endif - @csrf -
-
-

- {{ isset($jenisJaminan->id) ? 'Edit' : 'Tambah' }} Jenis Jaminan -

-
- Back -
-
-
- @if(isset($jenisJaminan->id)) -
- -
- - @error('code') - {{ $message }} - @enderror -
-
- @endif -
- -
- - @error('name') - {{ $message }} - @enderror -
-
- -
- -
- @foreach($jenisLegalitasJaminan as $row) - - @endforeach -
-
-
- -
-
+ @else + + @endif + @csrf +
+
+

+ {{ isset($jenisJaminan->id) ? 'Edit' : 'Tambah' }} Jenis Jaminan +

+
+ Back +
+
+
+ @if (isset($jenisJaminan->id)) +
+ +
+ + @error('code') + {{ $message }} + @enderror
- +
+ @else +
+ +
+ + @error('code') + {{ $message }} + @enderror +
+
+ @endif +
+ +
+ + @error('name') + {{ $message }} + @enderror +
+
+ +
+ +
+ @foreach ($jenisLegalitasJaminan as $row) + + @endforeach +
+
+
+ +
+
+
+
@endsection diff --git a/resources/views/kjpp/create.blade.php b/resources/views/kjpp/create.blade.php new file mode 100644 index 0000000..3082354 --- /dev/null +++ b/resources/views/kjpp/create.blade.php @@ -0,0 +1,90 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render(request()->route()->getName()) }} +@endsection + +@section('content') +
+ @if (isset($kjpp->id)) +
+ + @method('PUT') + @else + + @endif + @csrf +
+
+

+ {{ isset($kjpp->id) ? 'Edit' : 'Tambah' }} KJPP +

+
+ + Back +
+
+
+
+ +
+ + @error('nomor') + {{ $message }} + @enderror +
+
+
+ +
+ + @error('nama_kjpp') + {{ $message }} + @enderror +
+
+
+ +
+ +
+
+
+ +
+ + @error('nomor_ijin_usaha') + {{ $message }} + @enderror +
+
+
+ +
+
+
+
+
+@endsection diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 9e78119..04ee52d 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -193,6 +193,16 @@ Breadcrumbs::for('basicdata.kjpp', function (BreadcrumbTrail $trail) { $trail->push('KJPP', route('basicdata.kjpp.index')); }); +Breadcrumbs::for('basicdata.kjpp.create', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.kjpp'); + $trail->push('Tambah KJPP', route('basicdata.kjpp.create')); +}); + +Breadcrumbs::for('basicdata.kjpp.edit', function (BreadcrumbTrail $trail) { + $trail->parent('basicdata.kjpp'); + $trail->push('Edit KJPP'); +}); + Breadcrumbs::for('basicdata.ijin_usaha', function (BreadcrumbTrail $trail) { $trail->parent('basicdata'); $trail->push('Ijin Usaha', route('basicdata.ijin_usaha.index')); From d5e13245d4edb2cb6b2c0ee3acae61e5ea2c53ca Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Wed, 18 Sep 2024 16:07:50 +0700 Subject: [PATCH 31/68] Memperbaiki fitur pencarian pada master menu ijin usaha --- app/Http/Controllers/IjinUsahaController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/IjinUsahaController.php b/app/Http/Controllers/IjinUsahaController.php index fb30b5d..ea0cd95 100644 --- a/app/Http/Controllers/IjinUsahaController.php +++ b/app/Http/Controllers/IjinUsahaController.php @@ -117,7 +117,8 @@ class IjinUsahaController extends Controller if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); $query->where(function ($q) use ($search) { - $q->where('nama_ijin_usaha', 'LIKE', "%$search%"); + $q->where('code', 'LIKE', "%$search%"); + $q->orWhere('name', 'LIKE', "%$search%"); }); } From 8e73269f7645befe727f91105fdc12c90e8e1642 Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Wed, 18 Sep 2024 17:16:29 +0700 Subject: [PATCH 32/68] menambahkan fitur export to excel di menu master ijin usaha --- app/Exports/IjinUsahaExport.php | 47 +++++++++++++++++++ app/Http/Controllers/IjinUsahaController.php | 7 +++ app/Http/Controllers/KJPPController.php | 28 +++++++++--- app/Http/Requests/KJPPRequest.php | 48 ++++++++++++++++++++ app/Models/Branch.php | 5 ++ app/Models/IjinUsaha.php | 6 +++ app/Models/JenisJaminan.php | 14 ++++-- app/Models/KJPP.php | 18 ++++++++ resources/views/Ijin_usaha/index.blade.php | 2 + resources/views/kjpp/create.blade.php | 37 ++++++--------- resources/views/kjpp/index.blade.php | 18 ++++---- routes/web.php | 1 + 12 files changed, 189 insertions(+), 42 deletions(-) create mode 100644 app/Exports/IjinUsahaExport.php create mode 100644 app/Http/Requests/KJPPRequest.php diff --git a/app/Exports/IjinUsahaExport.php b/app/Exports/IjinUsahaExport.php new file mode 100644 index 0000000..a7d02e4 --- /dev/null +++ b/app/Exports/IjinUsahaExport.php @@ -0,0 +1,47 @@ +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, + 'B' => NumberFormat::FORMAT_NUMBER, + 'E' => NumberFormat::FORMAT_DATE_DATETIME + ]; + } +} diff --git a/app/Http/Controllers/IjinUsahaController.php b/app/Http/Controllers/IjinUsahaController.php index ea0cd95..360d223 100644 --- a/app/Http/Controllers/IjinUsahaController.php +++ b/app/Http/Controllers/IjinUsahaController.php @@ -6,6 +6,8 @@ use App\Http\Controllers\Controller; use Exception; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Maatwebsite\Excel\Facades\Excel; +use Modules\Lpj\Exports\IjinUsahaExport; use Modules\Lpj\Http\Requests\IjinUsahaRequest; use Modules\Lpj\Models\IjinUsaha; @@ -164,4 +166,9 @@ class IjinUsahaController extends Controller 'data' => $data, ]); } + + public function export() + { + return Excel::download(new IjinUsahaExport, 'ijin_usaha.xlsx'); + } } diff --git a/app/Http/Controllers/KJPPController.php b/app/Http/Controllers/KJPPController.php index 801d6a8..d06a80e 100644 --- a/app/Http/Controllers/KJPPController.php +++ b/app/Http/Controllers/KJPPController.php @@ -3,11 +3,13 @@ namespace Modules\Lpj\Http\Controllers; use App\Http\Controllers\Controller; +use Exception; use Illuminate\Http\Request; use Illuminate\Http\Response; +use Modules\Lpj\Http\Requests\KJPPRequest; use Modules\Lpj\Models\Branch; use Modules\Lpj\Models\IjinUsaha; -use Modules\Lpj\Models\JenisAset; +use Modules\Lpj\Models\JenisJaminan; use Modules\Lpj\Models\KJPP; class KJPPController extends Controller @@ -28,7 +30,7 @@ class KJPPController extends Controller { $branch = Branch::all(); $ijin_usaha = IjinUsaha::all(); - $jenis_aset = JenisAset::all(); + $jenis_aset = JenisJaminan::all(); return view('lpj::kjpp.create', compact('branch', 'ijin_usaha', 'jenis_aset')); } @@ -36,9 +38,22 @@ class KJPPController extends Controller /** * Store a newly created resource in storage. */ - public function store(Request $request) + public function store(KJPPRequest $request) { - // + $validate = $request->validated(); + + if ($validate) { + try { + KJPP::create($validate); + return redirect() + ->route('basicdata.kjpp.index') + ->with('success', 'Ijin Usaha created successfully'); + } catch (Exception $e) { + return redirect() + ->route('basicdata.kjpp.create') + ->with('error', 'Failed to create ijin Usaha'); + } + } } /** @@ -86,8 +101,9 @@ class KJPPController extends Controller if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); $query->where(function ($q) use ($search) { - $q->where('nomor', 'LIKE', "%$search%"); - $q->orWhere('nama_kjpp', 'LIKE', "%$search%"); + $q->where('code', 'LIKE', "%$search%"); + $q->orWhere('name', 'LIKE', "%$search%"); + $q->orWhere('jenis_kantor', 'LIKE', "%$search%"); }); } diff --git a/app/Http/Requests/KJPPRequest.php b/app/Http/Requests/KJPPRequest.php new file mode 100644 index 0000000..faa4b9c --- /dev/null +++ b/app/Http/Requests/KJPPRequest.php @@ -0,0 +1,48 @@ + 'required|string|not_regex:/^\d+$/|max:255', + 'jenis_kantor' => 'required' + ]; + + if ($this->method() == 'PUT') { + $rules['code'] = 'required|max:50|unique:kjpp,code,' . $this->id; + } else { + $rules['code'] = 'required|max:50|unique:kjpp,code'; + } + + return $rules; + } + + /** + * Determine if the user is authorized to make this request. + */ + public function authorize(): bool + { + return true; + } + + public function messages(): array + { + return [ + 'code.required' => 'Kode KJPP harus diisi!', + 'code.max' => 'Kode KJPP maksimal 255 huruf!', + 'code.unique' => 'Kode KJPP tidak boleh sama!', + 'name.required' => 'Nama KJPP harus diisi!', + 'name.not_regex' => 'Nama KJPP harus berupa huruf!', + 'name.max' => 'Nama KJPP maksimal 255 huruf!', + 'jenis_kantor.required' => 'Jenis Kantor harus diisi!' + ]; + } +} diff --git a/app/Models/Branch.php b/app/Models/Branch.php index 834b5cc..4ca5bd9 100644 --- a/app/Models/Branch.php +++ b/app/Models/Branch.php @@ -13,4 +13,9 @@ class Branch extends Base { return $this->hasMany(Debiture::class, 'branch_id', 'id'); } + + public function kjpp() + { + return $this->belongsTo(KJPP::class); + } } diff --git a/app/Models/IjinUsaha.php b/app/Models/IjinUsaha.php index e2e464a..522a183 100644 --- a/app/Models/IjinUsaha.php +++ b/app/Models/IjinUsaha.php @@ -15,4 +15,10 @@ class IjinUsaha extends Model * The attributes that are mass assignable. */ protected $fillable = ['code', 'name']; + + // relasi ke kjpp + public function kjpp() + { + return $this->belongsTo(KJPP::class); + } } diff --git a/app/Models/JenisJaminan.php b/app/Models/JenisJaminan.php index 43ab899..a630686 100644 --- a/app/Models/JenisJaminan.php +++ b/app/Models/JenisJaminan.php @@ -1,9 +1,15 @@ belongsTo(KJPP::class); } +} diff --git a/app/Models/KJPP.php b/app/Models/KJPP.php index 8d35c78..05cad4a 100644 --- a/app/Models/KJPP.php +++ b/app/Models/KJPP.php @@ -17,4 +17,22 @@ class KJPP extends Model * The attributes that are mass assignable. */ protected $guarded = ['id']; + + // relasi ke branch + public function branch() + { + return $this->hasOne(Branch::class, 'jenis_kantor'); + } + + // relasi ke jenis aset + public function jenis_aset() + { + return $this->hasMany(JenisJaminan::class, 'jenis_aset_id'); + } + + // relasi ke ijin usaha + public function ijin_usaha() + { + return $this->hasMany(IjinUsaha::class, 'ijin_usaha_id'); + } } diff --git a/resources/views/Ijin_usaha/index.blade.php b/resources/views/Ijin_usaha/index.blade.php index 8364f63..2d225d5 100644 --- a/resources/views/Ijin_usaha/index.blade.php +++ b/resources/views/Ijin_usaha/index.blade.php @@ -20,6 +20,8 @@
+ Export to Excel + Tambah Ijin Usaha diff --git a/resources/views/kjpp/create.blade.php b/resources/views/kjpp/create.blade.php index 3082354..a7320c8 100644 --- a/resources/views/kjpp/create.blade.php +++ b/resources/views/kjpp/create.blade.php @@ -31,9 +31,9 @@ Nomor KJPP
- - @error('nomor') + + @error('code') {{ $message }} @enderror
@@ -43,37 +43,28 @@ Nama KJPP
- - @error('nama_kjpp') + + @error('name') {{ $message }} @enderror
- +
- + @if (isset($branch)) @foreach ($branch as $branches) - + @endforeach @endif -
-
-
- -
- - @error('nomor_ijin_usaha') + @error('jenis_kantor') {{ $message }} @enderror
diff --git a/resources/views/kjpp/index.blade.php b/resources/views/kjpp/index.blade.php index 421ece7..cd131b7 100644 --- a/resources/views/kjpp/index.blade.php +++ b/resources/views/kjpp/index.blade.php @@ -36,16 +36,16 @@ - - Nomor + + Nomor KJPP - + Nama KJPP - - Kota + + Jenis Kantor / Cabang Action @@ -124,16 +124,16 @@ }, }, nomor: { - title: 'Nomor', + title: 'Nomor KJPP', }, nama_kjpp: { title: 'Nama KJPP', }, - kota: { - title: 'Kota', + jenis_kantor: { + title: 'Jenis Kantor / Cabang', }, actions: { - title: 'Status', + title: 'Action', render: (item, data) => { return `
diff --git a/routes/web.php b/routes/web.php index 965c4a8..bb1bd29 100644 --- a/routes/web.php +++ b/routes/web.php @@ -166,6 +166,7 @@ Route::middleware(['auth'])->group(function () { Route::name('ijin_usaha.')->prefix('ijin_usaha')->group(function () { Route::get('datatables', [IjinUsahaController::class, 'dataForDatatables']) ->name('datatables'); + Route::get('export', [IjinUsahaController::class, 'export'])->name('export'); }); Route::resource('ijin_usaha', IjinUsahaController::class); From eb92e1b8f76823457438def959c237c90cc65e21 Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 18 Sep 2024 17:40:24 +0700 Subject: [PATCH 33/68] 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; - } @endpush @@ -28,484 +22,194 @@
+
+
- -
-
-
- -
- - -
-
- -
- -
- -
-
- -
- -
- -
+ @if (isset($penilaian->permohonan_id)) + @method('PUT') + + @else + + @endif + @csrf +
+
+ +
+ + @error('jenis_penilaian_id') + {{ $message }} + @enderror
-
-
- -
- -
+
+ +
+ + @error('teams_id') + {{ $message }} + @enderror
+
-
- -
- -
-
- -
- -
- -
+
+ +
+
-
-
- -
- -
-
+
+ -
- -
- -
+
+ + @error('tanggal_kunjungan') + {{ $message }} + @enderror
+ +
+ +
+ +
+ @error('keterangan') + {{ $message }} + @enderror +
- -
-
-
-
-

1. IDENTITAS DEBITUR

-
-
- -
- -
-
- -
- -
-

- {{ $permohonan->debiture->address . ' ' . $permohonan->debiture->village->name . ', ' . $permohonan->debiture->district->name . ', ' . $permohonan->debiture->city->name . ', ' . $permohonan->debiture->province->name . ' ' . '(' . $permohonan->debiture->postal_code . ')' }} - -

-
-
- -
- -
- -
-
-
-
- -
-

2. LETAK JAMINAN

-
-
- -
- -
-
- -
- -
-
- -
-
-
- -
- -
- -
-
-
- -
- -
-
-
-
- -
-

3. FASILITAS KREDIT

-
- - -
- -
- - @error('tujuan_penilaian_id') - {{ $message }} - @enderror -
-
- - -
- -
- - @error('tujuan_penilaian_id') - {{ $message }} - @enderror -
-
- -
-
- - -
-

4. TUJUAN PENILAIAN

-
- -
- -
- - @error('tujuan_penilaian_id') - {{ $message }} - @enderror -
-
-
-
- -
-

5. JENIS JAMINAN

-
- -
- -
- - @error('tujuan_penilaian_id') - {{ $message }} - @enderror -
-
- -
-
- -
-

6. TIPE JAMINAN

-
- -
- -
- - @error('tujuan_penilaian_id') - {{ $message }} - @enderror -
-
- - -
-
- -
-

7. DATA-DATA

-
- -
- -
-
-
- - @error('province_code') - {{ $message }} - @enderror -
-
- - @error('city_code') - {{ $message }} - @enderror -
-
-
-
- - -
- -
- -
-
- -
-

6. TIPE JAMINAN

-
- -
- -
- - @error('tujuan_penilaian_id') - {{ $message }} - @enderror -
-
- -
- -
- - @error('tujuan_penilaian_id') - {{ $message }} - @enderror -
-
- -
- -
- -
-
- - -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
-
-
- - @error('province_code') - {{ $message }} - @enderror -
-
- - @error('city_code') - {{ $message }} - @enderror -
-
-
-
-
-
- - -
- -
-
- - - - -
+
@endsection + + +@push('scripts') + +@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 @@
- @if (isset($status_permohonan)) - @foreach ($status_permohonan as $item) - {{ $item->name }} - @endforeach - @endif + Daftar Penilaian
-
- -

{{-- Daftar {{}} --}} @@ -25,16 +18,19 @@
Export to Excel - Tambah Permohonan

+
+ +
+
@@ -93,99 +89,10 @@ @endsection -{{-- @section('content') -
-
-
-

- Daftar penilaian -

-
-
- -
-
-
- Export to Excel - Tambah penilaian -
-
-
-
-
-
- - - - - - - - -
- - - Code - - - penilaian - - Action
-
-
-
- Show - per page -
-
- - -
-
-
-
-
-@endsection --}} - @push('scripts') - +@endpush From 9a238ddb8327afdc7b0311ea907b79319e8f86b9 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 19 Sep 2024 11:09:59 +0700 Subject: [PATCH 38/68] 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 @@ 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 @@ 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')
+
+
+

+ Data Permohonan +

+
+
+
+

+ Nomor Register Permohonan: +

+ + {{ $permohonan->nomor_registrasi }} + +
+
+

+ Pemohon: +

+ + {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }} + +
+ +
+

+ Tujan Permohonan: +

+ + {{ $permohonan->tujuanPenilaian->name }} + +
+ +
+
+ +
+
+

+ Detail Debutur +

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ Name + + {{ $permohonan->debiture->name ?? "" }} +
+ Email + + {{ $permohonan->debiture->email ?? "" }} +
+ Phone + + {{ $permohonan->debiture->phone ?? "" }} +
+ Address + + {{ $permohonan->debiture->address ?? "" }} +
+   + + {{ $permohonan->debiture->village->name ?? "" }}, {{ $permohonan->debiture->district->name ?? "" }}, {{ $permohonan->debiture->city->name ?? "" }}, {{ $permohonan->debiture->province->name ?? "" }} - {{ $permohonan->debiture->village->postal_code ?? "" }} +
+
+
+ + + + + + + + + + + + + + + + + +
+ Cabang + + {{ $permohonan->debiture->branch->name ?? "" }} +
+ CIF + + {{ $permohonan->debiture->cif ?? "" }} +
+ Nomor Rekening + + {{ $permohonan->debiture->nomor_rekening ?? "" }} +
+ NPWP + + {{ $permohonan->debiture->npwp ?? "" }} +
+
+
+
+
+ +
+
+

+ Data Jaminan +

+
+
+ @foreach($permohonan->debiture->documents as $dokumen) +
+ + +
+ @endforeach +
+
+

@@ -34,12 +256,8 @@
- @if (isset($penilaian->permohonan_id)) @method('PUT') - - @else - @endif @csrf
@@ -47,11 +265,13 @@ +
+
+ +
+ +
+
+ +
+ +
+ +
+
- +

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 @@

+
+ +
+ + @error('status') + {{ $message }} + @enderror +
+
+ +
+ +
+ + @error('nilai_njop') + {{ $message }} + @enderror +
+
+
+
+ +
+ + @error('status') + {{ $message }} + @enderror +
+
+ +
+ +
+ + @error('nilai_njop') + {{ $message }} + @enderror +
+
+

- @foreach($permohonan->debiture->documents as $dokumen) -
+ @foreach ($permohonan->debiture->documents as $dokumen) +

- {{ $dokumen->pemilik->name?? "" }} + {{ $dokumen->pemilik->name ?? '' }}
@@ -181,7 +190,7 @@ Jenis Jaminan: - {{ $dokumen->jenisJaminan->name?? "" }} + {{ $dokumen->jenisJaminan->name ?? '' }}
@@ -189,7 +198,7 @@ Hubungan Pemilik Jaminan: - {{ $dokumen->pemilik->hubungan_pemilik->name?? "" }} + {{ $dokumen->pemilik->hubungan_pemilik->name ?? '' }}
@@ -197,20 +206,24 @@ Alamat Pemilik Jaminan: - {{ $dokumen->pemilik->address ?? ""}}, -
{{ $dokumen->pemilik->village->name ?? "" }}, {{ $dokumen->pemilik->district->name ?? "" }}, {{ $dokumen->pemilik->city->name ?? "" }}, {{ $dokumen->pemilik->province->name ?? "" }} - {{ $dokumen->pemilik->village->postal_code ?? "" }} + {{ $dokumen->pemilik->address ?? '' }}, +
{{ $dokumen->pemilik->village->name ?? '' }}, + {{ $dokumen->pemilik->district->name ?? '' }}, + {{ $dokumen->pemilik->city->name ?? '' }}, + {{ $dokumen->pemilik->province->name ?? '' }} - + {{ $dokumen->pemilik->village->postal_code ?? '' }}
- @foreach($dokumen->detail as $detail) + @foreach ($dokumen->detail as $detail) @@ -218,8 +231,9 @@ Dokumen Jaminan @@ -229,7 +243,7 @@ Keterangan @endforeach @@ -240,32 +254,30 @@ @endforeach - +

Form Assignment

-
- - Back -
+
- @if (isset($penilaian->permohonan_id)) + @if (isset($penilaian->nomor_registrasi)) @method('PUT') @endif @csrf -
+
- +
@foreach ($teamPenilai as $item) - @if (isset($penilaian->permohonan_id)) + @if (isset($penilaian->nomor_registrasi)) @@ -318,22 +330,14 @@ Surveyor yang di tunjuk
- + -
-
-
- -
- + @error('surveyor_id') + {{ $message }} + @enderror
@@ -342,13 +346,32 @@ Penilai yang di tunjuk
- + @error('penilaian_id') + {{ $message }} + @enderror
+
+ +
+ + @error('penilai_surveyor_id') + {{ $message }} + @enderror +
+
+ +
- +
@error('keterangan') {{ $message }} @enderror
-
- + +
+ +
+ +
-
@endsection - - @push('scripts') + + + @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 @@ -
+
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 8b4dd34b51cb20ebab2422aa8e025925c194900f Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Tue, 24 Sep 2024 11:51:53 +0700 Subject: [PATCH 42/68] Membuat Fitur Menu KJPP part 1 --- app/Exports/KJPPExport.php | 49 ++ app/Http/Controllers/KJPPController.php | 36 +- app/Http/Requests/KJPPRequest.php | 83 +++- app/Models/KJPP.php | 26 +- .../2024_09_18_084905_create_kjpp_table.php | 5 +- resources/views/kjpp/create.blade.php | 461 +++++++++++++++--- 6 files changed, 575 insertions(+), 85 deletions(-) create mode 100644 app/Exports/KJPPExport.php diff --git a/app/Exports/KJPPExport.php b/app/Exports/KJPPExport.php new file mode 100644 index 0000000..f8026c0 --- /dev/null +++ b/app/Exports/KJPPExport.php @@ -0,0 +1,49 @@ +id, + $row->code, + $row->name, + $row->jenis_kantor, + $row->created_at + ]; + } + + public function headings(): array + { + return [ + 'ID', + 'Code', + 'Name', + 'Jenis Kantor / Cabang', + 'Created At' + ]; + } + + public function columnFormats(): array + { + return [ + 'A' => NumberFormat::FORMAT_NUMBER, + 'B' => NumberFormat::FORMAT_NUMBER, + 'E' => NumberFormat::FORMAT_DATE_DATETIME + ]; + } +} diff --git a/app/Http/Controllers/KJPPController.php b/app/Http/Controllers/KJPPController.php index d06a80e..b854533 100644 --- a/app/Http/Controllers/KJPPController.php +++ b/app/Http/Controllers/KJPPController.php @@ -2,15 +2,21 @@ namespace Modules\Lpj\Http\Controllers; -use App\Http\Controllers\Controller; -use Exception; use Illuminate\Http\Request; -use Illuminate\Http\Response; -use Modules\Lpj\Http\Requests\KJPPRequest; -use Modules\Lpj\Models\Branch; -use Modules\Lpj\Models\IjinUsaha; -use Modules\Lpj\Models\JenisJaminan; use Modules\Lpj\Models\KJPP; +use Illuminate\Http\Response; +use Modules\Lpj\Models\Branch; +use Modules\Location\Models\City; +use Modules\Lpj\Models\IjinUsaha; +use Modules\Lpj\Exports\KJPPExport; +use App\Http\Controllers\Controller; +use Maatwebsite\Excel\Facades\Excel; +use Modules\Location\Models\District; +use Modules\Lpj\Models\JenisJaminan; +use Modules\Location\Models\Province; +use Modules\Location\Models\Village; +use Modules\Lpj\Http\Requests\KJPPRequest; +use Throwable; class KJPPController extends Controller { @@ -31,8 +37,9 @@ class KJPPController extends Controller $branch = Branch::all(); $ijin_usaha = IjinUsaha::all(); $jenis_aset = JenisJaminan::all(); + $provinces = Province::all(); - return view('lpj::kjpp.create', compact('branch', 'ijin_usaha', 'jenis_aset')); + return view('lpj::kjpp.create', compact('branch', 'ijin_usaha', 'jenis_aset', 'provinces')); } /** @@ -44,14 +51,19 @@ class KJPPController extends Controller if ($validate) { try { + $file = $request->file('attachment'); + $filename = time() . '.' . $file->getClientOriginalExtension(); + + $file->storeAs('uploads_pdf', $filename, 'public'); + KJPP::create($validate); return redirect() ->route('basicdata.kjpp.index') ->with('success', 'Ijin Usaha created successfully'); - } catch (Exception $e) { + } catch (Throwable $e) { return redirect() ->route('basicdata.kjpp.create') - ->with('error', 'Failed to create ijin Usaha'); + ->with('error', 'Failed to create ijin Usaha: ' . $e); } } } @@ -75,7 +87,7 @@ class KJPPController extends Controller /** * Update the specified resource in storage. */ - public function update(Request $request, $id) + public function update(KJPP $request, $id) { // } @@ -152,6 +164,6 @@ class KJPPController extends Controller public function export() { - // return Excel::download(new CurrencyExport, 'currency.xlsx'); + return Excel::download(new KJPPExport, 'currency.xlsx'); } } diff --git a/app/Http/Requests/KJPPRequest.php b/app/Http/Requests/KJPPRequest.php index faa4b9c..f8fd822 100644 --- a/app/Http/Requests/KJPPRequest.php +++ b/app/Http/Requests/KJPPRequest.php @@ -3,6 +3,7 @@ namespace Modules\Lpj\Http\Requests; use Illuminate\Foundation\Http\FormRequest; +use daengdeni\LaravelIdGenerator\IdGenerator; class KJPPRequest extends FormRequest { @@ -13,7 +14,27 @@ class KJPPRequest extends FormRequest { $rules = [ 'name' => 'required|string|not_regex:/^\d+$/|max:255', - 'jenis_kantor' => 'required' + 'jenis_kantor' => 'required', + 'nomor_ijin_usaha' => 'required', + 'province_code' => 'required', + 'city_code' => 'required', + 'district_code' => 'required', + 'village_code' => 'required', + 'address' => 'required', + 'postal_code' => 'required|numeric', + 'nomor_telepon_kantor' => 'required|numeric|digits_between:8,15', + 'email_kantor' => 'required|email', + 'nama_pimpinan' => 'required|string|not_regex:/^\d+$/|max:255', + 'nomor_hp_pimpinan' => 'required|numeric|digits_between:10,15', + 'nama_pic_reviewer' => 'required|string|not_regex:/^\d+$/|max:255', + 'nomor_hp_pic_reviewer' => 'required|numeric|digits_between:10,15', + 'nama_pic_admin' => 'required|string|not_regex:/^\d+$/|max:255', + 'nomor_hp_pic_admin' => 'required|numeric|digits_between:10,15', + 'nama_pic_marketing' => 'required|string|not_regex:/^\d+$/|max:255', + 'nomor_hp_pic_marketing' => 'required|numeric|digits_between:10,15', + 'ijin_usaha_id' => 'nullable|exists:ijin_usaha,id', + 'jenis_aset_id' => 'nullable|exists:jenis_jaminan,id', + 'attachment' => 'required|mimes:pdf|max:1024' ]; if ($this->method() == 'PUT') { @@ -33,16 +54,70 @@ class KJPPRequest extends FormRequest return true; } + public function prepareForValidation(): void + { + if ($this->method() == 'POST') { + $this->merge([ + 'code' => IdGenerator::generate( + ['table' => 'ijin_usaha', 'length' => 5, 'prefix' => 'IU', 'field' => 'code'], + ['table' => 'jenis_jaminan', 'length' => 5, 'prefix' => 'JJ', 'field' => 'code'], + ) + ]); + } + + $this->merge([ + 'ijin_usaha_id' => json_encode($this->ijin_usaha_id), + 'jenis_aset_id' => json_encode($this->jenis_aset_id) + ]); + } + public function messages(): array { return [ - 'code.required' => 'Kode KJPP harus diisi!', + 'code.required' => 'Kode KJPP Wajib diisi!', 'code.max' => 'Kode KJPP maksimal 255 huruf!', 'code.unique' => 'Kode KJPP tidak boleh sama!', - 'name.required' => 'Nama KJPP harus diisi!', + 'name.required' => 'Nama KJPP Wajib diisi!', 'name.not_regex' => 'Nama KJPP harus berupa huruf!', 'name.max' => 'Nama KJPP maksimal 255 huruf!', - 'jenis_kantor.required' => 'Jenis Kantor harus diisi!' + 'jenis_kantor.required' => 'Jenis Kantor Wajib diisi!', + 'nomor_ijin_usaha.required' => 'Nomor Ijin Usaha Wajib diisi!', + 'nomor_ijin_usaha.max' => 'Nomor Ijin Usaha maksimal 255 huruf!', + 'province_code.required' => 'Provinsi Wajib diisi!', + 'city_code.required' => 'Kota / Kabupaten Wajib diisi!', + 'district_code.required' => 'Kecamatan Wajib diisi!', + 'village_code.required' => 'Kelurahan Wajib diisi!', + 'postal_code.required' => 'Kode Pos Wajib diisi!', + 'postal_code.numeric' => 'Kode Pos harus berupa angka!', + 'address.required' => 'Alamat Kantor Wajib diisi!', + 'nomor_telepon_kantor.required' => 'Nomor Telepon Kantor Wajib diisi!', + 'nomor_telepon_kantor.numeric' => 'Nomor Telepon Kantor harus berupa angka!', + 'nomor_telepon_kantor.digits_between' => 'Nomor Telepon Kantor minimum 8 digit dan maksimum 15 digit!', + 'email_kantor.required' => 'Email Kantor Wajib diisi!', + 'email_kantor.email' => 'Email Kantor tidak valid!', + 'nama_pimpinan.required' => 'Nama Pimpinan Wajib diisi!', + 'nama_pimpinan.not_regex' => 'Nama Pimpinan harus berupa huruf!', + 'nomor_hp_pimpinan.required' => 'Nomor HP Pimpinan Wajib diisi!', + 'nomor_hp_pimpinan.numeric' => 'Nomor HP Pimpinan harus berupa angka!', + 'nomor_hp_pimpinan.digits_between' => 'Nomor HP Pimpinan minimum 10 digit dan maksimum 15 digit!', + 'nama_pic_reviewer.required' => 'Nama PIC Reviewer Wajib diisi!', + 'nama_pic_reviewer.not_regex' => 'Nama PIC Reviewer harus berupa huruf!', + 'nomor_hp_pic_reviewer.required' => 'Nomor HP PIC Reviewer Wajib diisi!', + 'nomor_hp_pic_reviewer.numeric' => 'Nomor HP PIC Reviewer harus berupa angka!', + 'nomor_hp_pic_reviewer.digits_between' => 'Nomor HP PIC Reviewer minimum 10 digit dan maksimum 15 digit!', + 'nama_pic_admin.required' => 'Nama PIC Admin Wajib diisi!', + 'nama_pic_admin.not_regex' => 'Nama PIC Admin harus berupa huruf!', + 'nomor_hp_pic_admin.required' => 'Nomor HP PIC Admin Wajib diisi!', + 'nomor_hp_pic_admin.numeric' => 'Nomor HP PIC Admin harus berupa angka!', + 'nomor_hp_pic_admin.digits_between' => 'Nomor HP PIC Admin minimum 10 digit dan maksimum 15 digit!', + 'nama_pic_marketing.required' => 'Nama PIC Marketing Wajib diisi!', + 'nama_pic_marketing.not_regex' => 'Nama PIC Marketing harus berupa huruf!', + 'nomor_hp_pic_marketing.required' => 'Nomor HP PIC Marketing Wajib diisi!', + 'nomor_hp_pic_marketing.numeric' => 'Nomor HP PIC Marketing harus berupa angka!', + 'nomor_hp_pic_marketing.digits_between' => 'Nomor HP PIC Marketing minimum 10 digit dan maksimum 15 digit!', + 'attachment.required' => 'Attachment Wajib diisi!', + 'attachment.mimes' => 'Attachment harus berformat pdf!', + 'attachment.max' => 'Attachment berukuran maksimum 1 MB!', ]; } } diff --git a/app/Models/KJPP.php b/app/Models/KJPP.php index 05cad4a..e535941 100644 --- a/app/Models/KJPP.php +++ b/app/Models/KJPP.php @@ -16,7 +16,31 @@ class KJPP extends Model /** * The attributes that are mass assignable. */ - protected $guarded = ['id']; + protected $fillable = [ + 'code', + 'name', + 'jenis_kantor', + 'nomor_ijin_usaha', + 'province_code', + 'city_code', + 'district_code', + 'village_code', + 'address', + 'postal_code', + 'nomor_telepon_kantor', + 'email_kantor', + 'nama_pimpinan', + 'nomor_hp_pimpinan', + 'nama_pic_reviewer', + 'nomor_hp_pic_reviewer', + 'nama_pic_admin', + 'nomor_hp_pic_admin', + 'nama_pic_marketing', + 'nomor_hp_pic_marketing', + 'ijin_usaha_id', + 'jenis_aset_id', + 'attachment' + ]; // relasi ke branch public function branch() diff --git a/database/migrations/2024_09_18_084905_create_kjpp_table.php b/database/migrations/2024_09_18_084905_create_kjpp_table.php index 1a086d7..8f8ae24 100644 --- a/database/migrations/2024_09_18_084905_create_kjpp_table.php +++ b/database/migrations/2024_09_18_084905_create_kjpp_table.php @@ -25,6 +25,7 @@ return new class extends Migration $table->string('postal_code'); $table->string('nomor_telepon_kantor'); $table->string('email_kantor'); + $table->string('nama_pimpinan'); $table->string('nomor_hp_pimpinan'); $table->string('nama_pic_reviewer'); $table->string('nomor_hp_pic_reviewer'); @@ -32,8 +33,8 @@ return new class extends Migration $table->string('nomor_hp_pic_admin'); $table->string('nama_pic_marketing'); $table->string('nomor_hp_pic_marketing'); - $table->foreignId('ijin_usaha_id')->constrained()->onDelete('cascade'); - $table->foreignId('jenis_aset_id')->constrained()->onDelete('cascade'); + $table->string('ijin_usaha_id')->nullable(); + $table->string('jenis_aset_id')->nullable(); $table->string('attachment'); $table->boolean('status')->default(true)->nullable(); $table->char('authorized_status', 1)->nullable(); diff --git a/resources/views/kjpp/create.blade.php b/resources/views/kjpp/create.blade.php index a7320c8..927857f 100644 --- a/resources/views/kjpp/create.blade.php +++ b/resources/views/kjpp/create.blade.php @@ -6,76 +6,405 @@ @section('content')
- @if (isset($kjpp->id)) -
+ + @if (isset($kjpp->id)) @method('PUT') - @else - - @endif - @csrf -
-
-

- {{ isset($kjpp->id) ? 'Edit' : 'Tambah' }} KJPP -

-
- - Back + @endif + @csrf +
+
+

+ {{ isset($kjpp->id) ? 'Edit' : 'Tambah' }} KJPP +

+
+ + Back +
+
+
+
+ +
+ + @error('code') + {{ $message }} + @enderror +
+ +
+ + @error('name') + {{ $message }} + @enderror +
+
+
+ +
+ + @error('jenis_kantor') + {{ $message }} + @enderror +
+ +
+ + @error('nomor_ijin_usaha') + {{ $message }} + @enderror +
+
+
+ +
+
+
+ + @error('province_code') + {{ $message }} + @enderror +
+
+ + @error('city_code') + {{ $message }} + @enderror +
+
+
+
+ + @error('district_code') + {{ $message }} + @enderror +
+
+ + @error('village_code') + {{ $message }} + @enderror +
+
+ + @error('postal_code') + {{ $message }} + @enderror +
+
+
+ + @error('address') + {{ $message }} + @enderror +
+
+
+
+ +
+ + @error('nomor_telepon_kantor') + {{ $message }} + @enderror +
+ +
+ + @error('email_kantor') + {{ $message }} + @enderror +
+
+
+ +
+ + @error('nama_pimpinan') + {{ $message }} + @enderror +
+ +
+ + @error('nomor_hp_pimpinan') + {{ $message }} + @enderror +
+
+
+ +
+ + @error('nama_pic_reviewer') + {{ $message }} + @enderror +
+ +
+ + @error('nomor_hp_pic_reviewer') + {{ $message }} + @enderror +
+
+
+ +
+ + @error('nama_pic_admin') + {{ $message }} + @enderror +
+ +
+ + @error('nomor_hp_pic_admin') + {{ $message }} + @enderror +
+
+
+ +
+ + @error('nama_pic_marketing') + {{ $message }} + @enderror +
+ +
+ + @error('nomor_hp_pic_marketing') + {{ $message }} + @enderror +
+
+
+ +
+ @foreach ($ijin_usaha as $row) + + @endforeach +
+
+
+ +
+ @foreach ($jenis_aset as $row) + + @endforeach +
+
+
+ +
+ + @error('attachment') + {{ $message }} + @enderror +
+
+
+ +
-
-
- -
- - @error('code') - {{ $message }} - @enderror -
-
-
- -
- - @error('name') - {{ $message }} - @enderror -
-
-
- -
- - @error('jenis_kantor') - {{ $message }} - @enderror -
-
-
- -
-
-
@endsection From 33ba88a2762f8fb72e3e7d3c5651b6163b926858 Mon Sep 17 00:00:00 2001 From: rahmatrafli1 Date: Tue, 24 Sep 2024 17:41:24 +0700 Subject: [PATCH 43/68] Membuat Fitur Menu KJPP part 2 --- app/Http/Controllers/KJPPController.php | 29 +++++++++---------- app/Http/Requests/KJPPRequest.php | 7 ++--- .../2024_09_18_084905_create_kjpp_table.php | 2 +- resources/views/kjpp/create.blade.php | 9 +++--- resources/views/kjpp/index.blade.php | 4 +-- 5 files changed, 24 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/KJPPController.php b/app/Http/Controllers/KJPPController.php index b854533..8be9d4d 100644 --- a/app/Http/Controllers/KJPPController.php +++ b/app/Http/Controllers/KJPPController.php @@ -6,17 +6,14 @@ use Illuminate\Http\Request; use Modules\Lpj\Models\KJPP; use Illuminate\Http\Response; use Modules\Lpj\Models\Branch; -use Modules\Location\Models\City; use Modules\Lpj\Models\IjinUsaha; use Modules\Lpj\Exports\KJPPExport; use App\Http\Controllers\Controller; use Maatwebsite\Excel\Facades\Excel; -use Modules\Location\Models\District; use Modules\Lpj\Models\JenisJaminan; use Modules\Location\Models\Province; -use Modules\Location\Models\Village; +use Illuminate\Support\Facades\Storage; use Modules\Lpj\Http\Requests\KJPPRequest; -use Throwable; class KJPPController extends Controller { @@ -49,22 +46,22 @@ class KJPPController extends Controller { $validate = $request->validated(); + if ($validate) { - try { - $file = $request->file('attachment'); - $filename = time() . '.' . $file->getClientOriginalExtension(); + $file = $request->file('attachment'); + $filename = $file ? time() . '.' . $file->getClientOriginalExtension() : 'default.pdf'; + if ($file) { $file->storeAs('uploads_pdf', $filename, 'public'); - - KJPP::create($validate); - return redirect() - ->route('basicdata.kjpp.index') - ->with('success', 'Ijin Usaha created successfully'); - } catch (Throwable $e) { - return redirect() - ->route('basicdata.kjpp.create') - ->with('error', 'Failed to create ijin Usaha: ' . $e); + } else { + Storage::copy('/home/bagi/Downloads/default.pdf', 'public/uploads_pdf/' . $filename); } + + dd($validate); + KJPP::create($validate); + return redirect() + ->route('basicdata.kjpp.index') + ->with('success', 'Ijin Usaha created successfully'); } } diff --git a/app/Http/Requests/KJPPRequest.php b/app/Http/Requests/KJPPRequest.php index f8fd822..b5f4622 100644 --- a/app/Http/Requests/KJPPRequest.php +++ b/app/Http/Requests/KJPPRequest.php @@ -32,9 +32,9 @@ class KJPPRequest extends FormRequest 'nomor_hp_pic_admin' => 'required|numeric|digits_between:10,15', 'nama_pic_marketing' => 'required|string|not_regex:/^\d+$/|max:255', 'nomor_hp_pic_marketing' => 'required|numeric|digits_between:10,15', - 'ijin_usaha_id' => 'nullable|exists:ijin_usaha,id', - 'jenis_aset_id' => 'nullable|exists:jenis_jaminan,id', - 'attachment' => 'required|mimes:pdf|max:1024' + 'ijin_usaha.*' => 'nullable', + 'jenis_jaminan.*' => 'nullable', + 'attachment' => 'nullable|mimes:pdf|max:1024' ]; if ($this->method() == 'PUT') { @@ -115,7 +115,6 @@ class KJPPRequest extends FormRequest 'nomor_hp_pic_marketing.required' => 'Nomor HP PIC Marketing Wajib diisi!', 'nomor_hp_pic_marketing.numeric' => 'Nomor HP PIC Marketing harus berupa angka!', 'nomor_hp_pic_marketing.digits_between' => 'Nomor HP PIC Marketing minimum 10 digit dan maksimum 15 digit!', - 'attachment.required' => 'Attachment Wajib diisi!', 'attachment.mimes' => 'Attachment harus berformat pdf!', 'attachment.max' => 'Attachment berukuran maksimum 1 MB!', ]; diff --git a/database/migrations/2024_09_18_084905_create_kjpp_table.php b/database/migrations/2024_09_18_084905_create_kjpp_table.php index 8f8ae24..387af1f 100644 --- a/database/migrations/2024_09_18_084905_create_kjpp_table.php +++ b/database/migrations/2024_09_18_084905_create_kjpp_table.php @@ -35,7 +35,7 @@ return new class extends Migration $table->string('nomor_hp_pic_marketing'); $table->string('ijin_usaha_id')->nullable(); $table->string('jenis_aset_id')->nullable(); - $table->string('attachment'); + $table->string('attachment')->nullable(); $table->boolean('status')->default(true)->nullable(); $table->char('authorized_status', 1)->nullable(); $table->timestamp('authorized_at')->nullable(); diff --git a/resources/views/kjpp/create.blade.php b/resources/views/kjpp/create.blade.php index 927857f..78db2c2 100644 --- a/resources/views/kjpp/create.blade.php +++ b/resources/views/kjpp/create.blade.php @@ -13,6 +13,7 @@ @method('PUT') @endif @csrf +

@@ -350,11 +351,11 @@ @if (isset($kjpp->ijin_usaha_id)) code, old('ijin_usaha_id', json_decode($kjpp->ijin_usaha_id, true)))) {{ 'checked' }} @endif - value="{{ $row->code }}" name="ijin_usaha_id[]" /> + value="{{ $row->code }}" name="ijin_usaha[]" /> @else code, old('ijin_usaha_id', []))) {{ 'checked' }} @endif - value="{{ $row->code }}" name="ijin_usaha_id[]" /> + value="{{ $row->code }}" name="ijin_usaha[]" /> @endif {{ $row->name }} @@ -373,11 +374,11 @@ @if (isset($kjpp->jenis_aset_id)) code, old('jenis_aset_id', json_decode($kjpp->jenis_aset_id, true)))) {{ 'checked' }} @endif - value="{{ $row->code }}" name="jenis_aset_id[]" /> + value="{{ $row->code }}" name="jenis_jaminan[]" /> @else code, old('jenis_aset_id', []))) {{ 'checked' }} @endif - value="{{ $row->code }}" name="jenis_aset_id[]" /> + value="{{ $row->code }}" name="jenis_jaminan[]" /> @endif {{ $row->name }} diff --git a/resources/views/kjpp/index.blade.php b/resources/views/kjpp/index.blade.php index cd131b7..40cf230 100644 --- a/resources/views/kjpp/index.blade.php +++ b/resources/views/kjpp/index.blade.php @@ -123,10 +123,10 @@ return checkbox.outerHTML.trim(); }, }, - nomor: { + code: { title: 'Nomor KJPP', }, - nama_kjpp: { + name: { title: 'Nama KJPP', }, jenis_kantor: { From 91d70c9e2ee68f8017329b8b97f8497f631b2dcc Mon Sep 17 00:00:00 2001 From: majid Date: Wed, 25 Sep 2024 09:44:35 +0700 Subject: [PATCH 44/68] 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 @@ +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 @@ +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') + + @endpush +
+
+
+

+ Activity Permohonan +

+
+ + Back +
+
+
+
+

+ Nomor Register Permohonan: +

+ + {{ $permohonan->nomor_registrasi }} + +
+ +
+

+ Pemohon: +

+ + {{ $permohonan->user->nik }} | {{ $permohonan->user->name }} | {{ $permohonan->user->branch->name }} + +
+ +
+

+ Tujan Permohonan: +

+ + {{ $permohonan->tujuanPenilaian->name }} + +
+ +
+
+ + +
+
+

+ Status Activity +

+
+
+
+ @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 + +
+ @if ($index < count($status_permohonan) - 1) +
+
+ @endif + +
+ @switch(strtolower($status->name)) + @case('order') + + @break + + @case('revisi') + + @break + + @case('register') + + @break + + @case('assign') + + @break + + @case('survey') + + @break + + @default + + @endswitch + +
+ @include('lpj::activity.components.status') +
+ @endforeach +
+
+
+ +
+
+
+@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 @@ +
+
+
+ {{ $status->name . ' ' . $status->description }} +
+ + @if (strtolower($status->name) == 'order') + {{ $permohonan->created_at }} + @elseif (strtolower($status->name) == strtolower($permohonan->status)) + {{ $permohonan->updated_at }} + @endif + +
+ + @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) +
+
+

+ {{ $permohonan->keterangan }} +

+
+
+ @endif + + {{-- Tampilkan dokumen dan keterangan jika status 'revisi' --}} + @if (strtolower($status->name) == 'revisi' && $hasKeterangan) +
+
+ + {{ basename($permohonan->dokumen) }} + + +

+ {{ $permohonan->keterangan }} +

+
+
+ @endif + + {{-- Tampilkan informasi assign jika status 'assign' --}} + @if (strtolower($status->name) == 'assign' && $isCurrentStatus) +
+
+ {{-- Informasi Penilai, Surveyor, dan Penilai Surveyor --}} +
+ @isset($permohonan->penilaian) + @if ($penilai = $permohonan->penilaian->userPenilai->name ?? null) +
+

Penilai:

+ {{ $penilai }} +
+ @endif + + @if ($surveyor = $permohonan->penilaian->userSurveyor->name ?? null) +
+

Surveyor:

+ {{ $surveyor }} +
+ @endif + + @if ($penilaiSurveyor = $permohonan->penilaian->userPenilaiSurveyor->name ?? null) +
+

Penilai Surveyor:

+ {{ $penilaiSurveyor }} +
+ @endif + @endisset +
+ + {{-- Teams --}} +
+

Teams:

+
    + @foreach ($permohonan->penilaian->teams->teamsUsers as $item) +
  • {{ $item->user->name }}
    • + @endforeach +
+
+ + {{-- Catatan --}} +
+

Catatan:

+ {{ $permohonan->penilaian->keterangan }} +
+
+
+ @endif +
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') +
+
+
+
+ Activity +
+
+

+ {{-- Daftar {{}} --}} +

+
+
+ +
+ +
+ +
+
+
+ Export to Excel +
+
+
+
+ +
+ +
+
+

{{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }} - {{ $detail->name ?? "" }} + {{ $detail->name ?? '' }}
- @if(isset($detail->dokumen_jaminan)) - {{ basename($detail->dokumen_jaminan) }} + @if (isset($detail->dokumen_jaminan)) + {{ basename($detail->dokumen_jaminan) }} @endif - {{ $detail->keterangan ?? "" }} + {{ $detail->keterangan ?? '' }}
+ + + + + + + + + + + + + +
+ + + Nomor Registrasi + + + + Tanggal Permohonan + + + + User Pemohon + + + + Cabang Pemohon + + + + Debitur + + + + Tujuan Penilaian + + + + Status + + + Action
+
+
+
+ Show + per + page +
+
+ + +
+
+
+
+
+ +@endsection + +@push('scripts') + +@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 @@

Data Permohonan

+
+ + Back +
@@ -330,7 +334,7 @@ Surveyor yang di tunjuk
- @@ -414,56 +418,65 @@
-