From 53ccf7de117854bcc44eb220b1dc2d29fe9ae7f4 Mon Sep 17 00:00:00 2001 From: majid Date: Fri, 13 Sep 2024 17:02:04 +0700 Subject: [PATCH] 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); + });