diff --git a/app/Http/Controllers/AuthorizationController.php b/app/Http/Controllers/AuthorizationController.php new file mode 100644 index 0000000..5f6d270 --- /dev/null +++ b/app/Http/Controllers/AuthorizationController.php @@ -0,0 +1,200 @@ +get()); + return view('lpj::authorization.index'); + } + + public function store(BranchRequest $request) + { + $validate = $request->validated(); + + if ($validate) { + try { + // Save to database + Branch::create($validate); + return redirect() + ->route('basicdata.branch.index') + ->with('success', 'Branch created successfully'); + } catch (Exception $e) { + return redirect() + ->route('basicdata.branch.create') + ->with('error', 'Failed to create branch'); + } + } + } + + public function create() + { + return view('lpj::branch.create'); + } + + public function edit($id) + { + $branch = Branch::find($id); + return view('lpj::branch.create', compact('branch')); + } + + public function update(BranchRequest $request, $id) + { + $validate = $request->validated(); + + if ($validate) { + try { + // Update in database + $branch = Branch::find($id); + $branch->update($validate); + return redirect() + ->route('basicdata.branch.index') + ->with('success', 'Branch updated successfully'); + } catch (Exception $e) { + return redirect() + ->route('basicdata.branch.edit', $id) + ->with('error', 'Failed to update branch'); + } + } + } + + public function destroy($id) + { + try { + // Delete from database + $branch = Branch::find($id); + $branch->delete(); + + echo json_encode(['success' => true, 'message' => 'Branch deleted successfully']); + } catch (Exception $e) { + echo json_encode(['success' => false, 'message' => 'Failed to delete branch']); + } + } + + public function dataForDatatables(Request $request) + { + // if (is_null($this->user) || !$this->user->can('branch.view')) { + //abort(403, 'Sorry! You are not allowed to view users.'); + // } + + // Retrieve data from the database + $query = Permohonan::query(); + // 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(); + $data = $query->select('permohonan.id', 'permohonan.nomor_registrasi' + , 'branches.name AS branche_name' + , 'debitures.name AS debiture_name' + // , 'tujuan_penilaian.name AS debiture_name' + , DB::raw("CONCAT(tujuan_penilaian.code,' - ', tujuan_penilaian.name) AS nama_tujuan_penilaian") + , 'users.name AS account_officer') + ->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id') + ->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id') + ->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id', '=', 'permohonan.tujuan_penilaian_id') + ->leftJoin('users', 'users.id', '=', 'permohonan.user_id') + ->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, + ]); + /* + // Apply search filter if provided + if ($request->has('search') && !empty($request->get('search'))) { + $search = $request->get('search'); + $query->where(function ($q) use ($search) { + $q->where('code', 'LIKE', "%$search%"); + $q->orWhere('name', '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 BranchExport, 'branch.xlsx'); + } + } diff --git a/app/Http/Controllers/JenisFasilitasKreditController.php b/app/Http/Controllers/JenisFasilitasKreditController.php index 59b481d..8d8a886 100644 --- a/app/Http/Controllers/JenisFasilitasKreditController.php +++ b/app/Http/Controllers/JenisFasilitasKreditController.php @@ -9,9 +9,11 @@ use Modules\Lpj\Exports\JenisFasilitasKreditExport; use Modules\Lpj\Http\Requests\JenisFasilitasKreditRequest; use Modules\Lpj\Models\JenisFasilitasKredit; + use Modules\Lpj\Http\Library\LpjHelpers; class JenisFasilitasKreditController extends Controller { + use LpjHelpers; // <---- Using the LpjHelpers Trait public $user; public function index() @@ -26,11 +28,18 @@ if ($validate) { try { // Save to database + // andy add + $lastNumberCodeJFK = LpjHelpers::onLastCodeJFK(); + + $validate['name'] =strtoupper($request->name); + $validate['code'] =$lastNumberCodeJFK; + // andy add + JenisFasilitasKredit::create($validate); return redirect() ->route('basicdata.jenis-fasilitas-kredit.index') ->with('success', 'Jenis Fasilitas Kredit created successfully'); - } catch (Exception $e) { + } catch (Exception $e) {dd($e); return redirect() ->route('basicdata.jenis-fasilitas-kredit.create') ->with('error', 'Failed to create jenis fasilitas kredit'); @@ -57,11 +66,16 @@ try { // Update in database $jenisFasilitasKredit = JenisFasilitasKredit::find($id); + + // andy add + $validate['name'] =strtoupper($request->name); + // andy add + $jenisFasilitasKredit->update($validate); return redirect() ->route('basicdata.jenis-fasilitas-kredit.index') ->with('success', 'Jenis Fasilitas Kredit updated successfully'); - } catch (Exception $e) { + } catch (Exception $e) {dd($e); return redirect() ->route('basicdata.jenis-fasilitas-kredit.edit', $id) ->with('error', 'Failed to update jenis fasilitas kredit'); diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php new file mode 100644 index 0000000..5f04aa6 --- /dev/null +++ b/app/Http/Controllers/RegistrasiController.php @@ -0,0 +1,270 @@ +user) || !$this->user->can('debitur.view')) { + //abort(403, 'Sorry! You are not allowed to view users.'); + } + + // Retrieve data from the database + $query = Permohonan::query()->where('status','=','preregister'); + + // 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 edit($id) + { + return view('lpj::registrasi.edit', compact('id')); + } + + public function setData(Request $request): JsonResponse + { + $data = array(); + $datas = array(); + + if (request()->ajax()) { + $id = $request->id; + $datas = Permohonan::findOrFail($id); + $data['status'] = 'success'; + if ($datas) { + $jenisPenilaians=null; + $regions=null; + $regions=Regions::pluck('name', 'id'); + $jenisPenilaians=JenisPenilaian::pluck('name', 'id'); + + $data['regions'] = $regions; + $data['jenisPenilaians'] = $jenisPenilaians; + $data['datas'] = $datas; + $data['message'] = 'data successfully found'; + } else { + $data['datas'] = null; + $data['message'] = 'data not found'; + } + } else { + $data['status'] = 'error'; + $data['message'] = 'no ajax request'; + } + + return response()->json($data); + } + + public function update(Request $request, $id): JsonResponse + { + // init + $data = array(); + $dataku = array(); + $tindakan = null; + if (request()->ajax()) { + $validator = RegistrasiController::rulesEditnya($request, $id); + + if ($validator['fails']) { + $data['message'] = $validator['errors']; + $data['status'] = 'error'; + } + else + { + try { + + $tindakan=$request->tindakan; + $dataku = ['registrasi_by' => Auth::id(), + 'registrasi_at' => now() + ]; + + if($tindakan==0) + { + $dataku['jenis_penilaian_id'] =$request->jenis_penilaian; + $dataku['region_id'] =$request->region; + $dataku['status'] = 'registered'; + } + else + { + $dataku['registrasi_catatan'] =$request->catatan; + $dataku['status'] = 'revisi'; + } + + $data['dataku'] =$dataku; + + $modal = Permohonan::find($id); + + $modal->update($dataku); + // + $data['status'] = 'success'; + $data['message'] = 'Regitrasi '.$modal->nomor_registrasi.' successfully'; + } catch (Exception $e) { + + $data['status'] = 'error'; + $data['message'] = 'Jenis Fasilitas Kredit updated failed.'; + } + } + + } else { + $data['status'] = 'error'; + $data['message'] = 'no ajax request'; + } + + return response()->json($data); + + } + + public function rulesEditnya($request, $id) + { + $tindakan=null; + $jenis_penilaian=null; + $validate_catatan=''; + $tindakan=$request->tindakan; + $jenis_penilaian=$request->jenis_penilaian; + + $validateIt = [ + // 'name' diambil dari definisi parameter yang di kirim pada POST Data + 'tindakan' => 'required', + ]; + + $messageIt = [ + 'tindakan.required' => 'Silahkan pilih Tindakan' + ]; + + if($tindakan==0) + { + $validateIt['jenis_penilaian'] = ['required']; + $messageIt ['jenis_penilaian.required']= 'Silahkan pilih Jenis Penilaian'; + + // INTERNAL + if(1==$jenis_penilaian) + { + $validateIt['region'] = ['required']; + $messageIt ['region.required']= 'Silahkan pilih Region'; + } + } + elseif($tindakan==1) + { + $validateIt['catatan'] = ['required']; + $messageIt ['catatan.required']= 'Silahkan isi Catatan'; + } + + $validator = Validator::make($request->all(), $validateIt, $messageIt); + + $data['fails'] = $validator->fails(); + $data['errors'] = $validator->errors(); + + return $data; + } + + public function show($id) + { + return view('lpj::registrasi.show', compact('id')); + } + + public function showData(Request $request): JsonResponse + { + $data = array(); + $datas = array(); + + if (request()->ajax()) { + $id = $request->id; + $datas = Permohonan::findOrFail($id); + $data['status'] = 'success'; + if ($datas) { + $data['datas'] = $datas; + $data['message'] = 'data successfully found'; + } else { + $data['datas'] = null; + $data['message'] = 'data not found'; + } + } else { + $data['status'] = 'error'; + $data['message'] = 'no ajax request'; + } + + return response()->json($data); + } + } diff --git a/app/Http/Controllers/TeamsController.php b/app/Http/Controllers/TeamsController.php index bf0a39b..e360132 100644 --- a/app/Http/Controllers/TeamsController.php +++ b/app/Http/Controllers/TeamsController.php @@ -2,18 +2,19 @@ namespace Modules\Lpj\Http\Controllers; -use App\Http\Controllers\Controller; -use Illuminate\Http\RedirectResponse; +use Exception; use Illuminate\Http\Request; use Illuminate\Http\Response; -use Modules\Lpj\Models\Regions; -use Modules\Usermanagement\Models\User; use Modules\Lpj\Models\Teams; -use Modules\Lpj\Models\TeamsUsers; -use Modules\Lpj\Http\Requests\TeamsRequest; +use Modules\Lpj\Models\Regions; use Illuminate\Support\Facades\DB; -use Modules\Lpj\Exports\TeamPenilaianExport; +use Modules\Lpj\Models\TeamsUsers; +use App\Http\Controllers\Controller; use Maatwebsite\Excel\Facades\Excel; +use Illuminate\Http\RedirectResponse; +use Modules\Usermanagement\Models\User; +use Modules\Lpj\Http\Requests\TeamsRequest; +use Modules\Lpj\Exports\TeamPenilaianExport; class TeamsController extends Controller { @@ -39,8 +40,8 @@ class TeamsController extends Controller // cek user apakah sudah ada di tabel teams_users $userTeam = TeamsUsers::pluck('user_id')->toArray(); $user = User::whereNotIn('id', $userTeam) - ->with('roles') - ->get(); + ->with('roles') + ->get(); return view('lpj::teams.form', compact('region', 'user')); } @@ -69,15 +70,15 @@ class TeamsController extends Controller DB::commit(); return redirect() - ->route('basicdata.teams.index') - ->with('success', 'Data saved successfully. '); + ->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. '); + ->route('basicdata.teams.create') + ->with('error', 'Failed to save data. '); } } @@ -100,8 +101,8 @@ class TeamsController extends Controller $region = Regions::all(); $usedUsers = TeamsUsers::where('teams_id', '!=', $id)->pluck('user_id')->toArray(); $user = User::whereNotIn('id', $usedUsers) - ->with('roles') - ->get(); + ->with('roles') + ->get(); // Ambil user yang sudah ada di tim ini $selectedUsers = $teams->teamsUsers->pluck('user_id')->toArray(); @@ -136,15 +137,15 @@ class TeamsController extends Controller DB::commit(); return redirect() - ->route('basicdata.teams.index') - ->with('success', 'Data updated successfully. '); + ->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. '); + ->route('basicdata.teams.create') + ->with('error', 'Failed to update data. '); } } @@ -165,7 +166,6 @@ class TeamsController extends Controller DB::commit(); echo json_encode(['success' => true, 'message' => 'Team has been deleted successfully']); - } catch (Exception $e) { DB::rollBack(); echo json_encode(['success' => false, 'message' => 'Failed to delete Team']); @@ -190,8 +190,8 @@ class TeamsController extends Controller $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%"); + ->orWhere('regions.name', 'LIKE', "%$search%") + ->orWhere('users.name', 'LIKE', "%$search%"); }); } @@ -255,6 +255,4 @@ class TeamsController extends Controller { return Excel::download(new TeamPenilaianExport(), 'team-penilai.xlsx'); } - - } diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php index 0ac29a0..6829346 100644 --- a/app/Http/Controllers/TenderController.php +++ b/app/Http/Controllers/TenderController.php @@ -33,15 +33,14 @@ class TenderController extends Controller */ public function penawaran_create($id) { + $penawaran = PenawaranTender::find($id); + $status = StatusPermohonan::all(); $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all(); $jenis_laporan = JenisLaporan::all(); $kjpp = KJPP::all(); - $permohonan = Permohonan::find($id); - $permohonanId = $permohonan->id; - $permohonanNomorRegistrasi = $permohonan->nomor_registrasi; - return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'permohonanId', 'permohonanNomorRegistrasi')); + return view('lpj::penawaran/create', compact('status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'penawaran', 'id')); } /** @@ -52,10 +51,14 @@ class TenderController extends Controller $validated = $request->validated(); if ($validated) { - $validated['nomor_registrasi'] = $request->nomor_registrasi; + $penawaran = PenawaranTender::find($id); + + $validated['nomor_registrasi'] = $penawaran->nomor_registrasi; $validated['nama_kjpp_sebelumnya'] = json_encode($request->input('nama_kjpp_sebelumnya')); + dd($validated); + PenawaranTender::create($validated); return redirect() @@ -73,7 +76,8 @@ class TenderController extends Controller */ public function penawaran_show($id) { - return view('lpj::show'); + $penawaran = PenawaranTender::find($id); + return view('lpj::penawaran.show', compact('id', 'penawaran')); } /** diff --git a/app/Http/Library/LpjHelpers.php b/app/Http/Library/LpjHelpers.php new file mode 100644 index 0000000..f40380d --- /dev/null +++ b/app/Http/Library/LpjHelpers.php @@ -0,0 +1,27 @@ +max('code'); + + $noUrutAkhir=sprintf("%06s", 1); + $noUrutAwal = 'JFK'; + $noUrutAkhirString = $noUrutAkhir; + if($noUrutAkhir2){ + $noUrutAkhir = substr($noUrutAkhir2, 3, 6); + // $noUrutAwal = substr($noUrutAkhir2, 0, 3); + $noUrutAkhirString = sprintf("%06s", abs($noUrutAkhir + 1)); + } + + return $noUrutAwal . $noUrutAkhirString; + } +} diff --git a/app/Http/Requests/JenisFasilitasKreditRequest.php b/app/Http/Requests/JenisFasilitasKreditRequest.php index ea95974..60f8444 100644 --- a/app/Http/Requests/JenisFasilitasKreditRequest.php +++ b/app/Http/Requests/JenisFasilitasKreditRequest.php @@ -13,14 +13,16 @@ : array { $rules = [ - 'name' => 'required|max:255', + 'name' => 'required|max:255|unique:jenis_fasilitas_kredit,name' ]; if ($this->method() == 'PUT') { - $rules['code'] = 'required|max:50|unique:jenis_fasilitas_kredit,code,' . $this->id; + $rules['code'] = 'max:50|unique:jenis_fasilitas_kredit,code,' . $this->id; + $rules['name'] = 'required|unique:jenis_fasilitas_kredit,name,' . $this->id; } else { - $rules['code'] = 'required|max:50|unique:jenis_fasilitas_kredit,code'; + $rules['code'] = 'max:50|unique:jenis_fasilitas_kredit,code'; } + return $rules; } diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php index 5b63bdc..566a899 100644 --- a/app/Models/Permohonan.php +++ b/app/Models/Permohonan.php @@ -28,38 +28,52 @@ class Permohonan extends Base 'authorized_status', 'authorized_by', 'status_bayar', - 'nilai_njop' + 'nilai_njop', + // andy add + 'registrasi_catatan', + 'registrasi_by', + 'registrasi_at', + 'jenis_penilaian_id', + 'region_id' ]; - public function user(){ + public function user() + { return $this->belongsTo(User::class); } - public function branch(){ + public function branch() + { return $this->belongsTo(Branch::class); } - public function tujuanPenilaian(){ + public function tujuanPenilaian() + { return $this->belongsTo(TujuanPenilaian::class); } - public function debiture(){ + public function debiture() + { return $this->belongsTo(Debiture::class); } - public function documents(){ + public function documents() + { return $this->hasMany(DokumenJaminan::class); } - public function nilaiPlafond(){ + public function nilaiPlafond() + { return $this->belongsTo(NilaiPlafond::class); } - public function jenisFasilitasKredit(){ + public function jenisFasilitasKredit() + { return $this->belongsTo(JenisFasilitasKredit::class); } - public function penilaian(){ + public function penilaian() + { return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi'); } } diff --git a/app/Models/PermohonanJaminan.php b/app/Models/PermohonanJaminan.php new file mode 100644 index 0000000..86e4b3f --- /dev/null +++ b/app/Models/PermohonanJaminan.php @@ -0,0 +1,23 @@ +text('registrasi_catatan')->nullable()->comment('kebutuhan untuk feature Registrasi'); + $table->unsignedBigInteger('registrasi_by')->nullable()->after('registrasi_catatan')->comment('kebutuhan untuk feature Registrasi'); + $table->timestamp('registrasi_at')->nullable()->after('registrasi_by')->comment('kebutuhan untuk feature Registrasi'); + $table->unsignedBigInteger('jenis_penilaian_id')->nullable()->after('registrasi_at')->comment('kebutuhan untuk feature Registrasi'); + $table->unsignedBigInteger('region_id')->nullable()->after('jenis_penilaian_id')->comment('kebutuhan untuk feature Registrasi'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('permohonan', function (Blueprint $table) { + + }); + } +}; diff --git a/module.json b/module.json index 568633b..ef2a26a 100644 --- a/module.json +++ b/module.json @@ -6,6 +6,7 @@ "keywords": [], "priority": 0, "providers": ["Modules\\Lpj\\Providers\\LpjServiceProvider"], + "files": [], "menu": { "main": [ @@ -80,6 +81,24 @@ "permission": "", "roles": ["administrator"] }, + { + "title": "Assignment", + "path": "penilaian", + "icon": "ki-filled ki-badge", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["Administrator"] + }, + { + "title": "Activity", + "path": "activity", + "icon": "ki-filled ki-some-files text-lg", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["Administrator"] + }, { "title": "Laporan", "path": "", @@ -90,276 +109,155 @@ "roles": ["administrator"] } ], - "files": [], - "menu": { - "main": [ - { - "title": "Permohonan", - "path": "permohonan", - "icon": "ki-filled ki-questionnaire-tablet text-lg", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "administrator" - ] - }, - { - "title": "Tender", - "path": "tender", - "icon": "ki-filled ki-category text-lg", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "administrator" - ], - "sub": [ - { - "title": "Data Penawaran", - "path": "tender.penawaran", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Data Proses Penawaran", - "path": "tender.proses_penawaran", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Data Penawaran Ulang", - "path": "tender.penawaran_ulang", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - } - ] - }, - { - "title": "Pembatalan", - "path": "", - "icon": "ki-filled ki-file-deleted text-lg", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "administrator" - ] - }, - { - "title": "Data Debitur", - "path": "debitur", - "icon": "ki-filled ki-people text-lg", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "administrator" - ] - }, - { - "title": "Authorization", - "path": "authorization", - "icon": "ki-filled ki-some-files text-lg", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "administrator" - ] - }, - { - "title": "Assignment", - "path": "penilaian", - "icon": "ki-filled ki-badge", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "Administrator" - ] - }, - { - "title": "Activity", - "path": "activity", - "icon": "ki-filled ki-some-files text-lg", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "Administrator" - ] - }, - { - "title": "Laporan", - "path": "", - "icon": "ki-filled ki-some-files text-lg", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "administrator" - ] - } - ], - "master": [ - { - "title": "Basic Data", - "path": "basicdata", - "icon": "ki-filled ki-category text-lg", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "Administrator" - ], - "sub": [ - { - "title": "Cabang", - "path": "basicdata.branch", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Mata Uang", - "path": "basicdata.currency", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Jenis Fasilitas Kredit", - "path": "basicdata.jenis-fasilitas-kredit", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Jenis Legalitas Jaminan", - "path": "basicdata.jenis-legalitas-jaminan", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Jenis Aset", - "path": "basicdata.jenis-jaminan", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Jenis Dokumen", - "path": "basicdata.jenis-dokumen", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Tujuan Penilaian", - "path": "basicdata.tujuan-penilaian", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Nilai Plafond", - "path": "basicdata.nilai-plafond", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Hubungan Pemilik Jaminan", - "path": "basicdata.hubungan-pemilik-jaminan", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Hubungan Penghuni Jaminan", - "path": "basicdata.hubungan-penghuni-jaminan", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Arah Mata Angin", - "path": "basicdata.arah-mata-angin", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Status Permohonan", - "path": "basicdata.status-permohonan", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Region", - "path": "basicdata.region", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Staff Appraisal", - "path": "basicdata.teams", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Jenis Penilaian", - "path": "basicdata.jenis-penilaian", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "KJPP", - "path": "basicdata.kjpp", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - }, - { - "title": "Ijin Usaha", - "path": "basicdata.ijin_usaha", - "classes": "", - "attributes": [], - "permission": "", - "roles": [] - } - ] - } - ], - "system": [] - } -} + "master": [ + { + "title": "Basic Data", + "path": "basicdata", + "icon": "ki-filled ki-category text-lg", + "classes": "", + "attributes": [], + "permission": "", + "roles": ["Administrator"], + "sub": [ + { + "title": "Cabang", + "path": "basicdata.branch", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Mata Uang", + "path": "basicdata.currency", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Jenis Fasilitas Kredit", + "path": "basicdata.jenis-fasilitas-kredit", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Jenis Legalitas Jaminan", + "path": "basicdata.jenis-legalitas-jaminan", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Jenis Aset", + "path": "basicdata.jenis-jaminan", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Jenis Dokumen", + "path": "basicdata.jenis-dokumen", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Tujuan Penilaian", + "path": "basicdata.tujuan-penilaian", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Nilai Plafond", + "path": "basicdata.nilai-plafond", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Hubungan Pemilik Jaminan", + "path": "basicdata.hubungan-pemilik-jaminan", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Hubungan Penghuni Jaminan", + "path": "basicdata.hubungan-penghuni-jaminan", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Arah Mata Angin", + "path": "basicdata.arah-mata-angin", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Status Permohonan", + "path": "basicdata.status-permohonan", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Region", + "path": "basicdata.region", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Staff Appraisal", + "path": "basicdata.teams", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Jenis Penilaian", + "path": "basicdata.jenis-penilaian", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "KJPP", + "path": "basicdata.kjpp", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Ijin Usaha", + "path": "basicdata.ijin_usaha", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + } + ] + } + ], + "system": [] + } } diff --git a/resources/views/authorization/index.blade.php b/resources/views/authorization/index.blade.php new file mode 100644 index 0000000..320d9bb --- /dev/null +++ b/resources/views/authorization/index.blade.php @@ -0,0 +1,138 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render('authorization') }} +@endsection + +@section('content') +
+
+
+

+ Daftar Authorization +

+ +
+
+
+ + + + + + + + + + + + +
+ + + Nomor Permohonan + + + Cabang + + + Debitur + + + Tujuan Penilain + + + Account Officer + + Action
+
+ +
+
+
+@endsection + +@push('scripts') + + +@endpush + diff --git a/resources/views/jenis_fasilitas_kredit/create.blade.php b/resources/views/jenis_fasilitas_kredit/create.blade.php index fc4c2a6..ccdc11e 100644 --- a/resources/views/jenis_fasilitas_kredit/create.blade.php +++ b/resources/views/jenis_fasilitas_kredit/create.blade.php @@ -1,3 +1,7 @@ +@php + $route = explode('.', Route::currentRouteName()); +@endphp + @extends('layouts.main') @section('breadcrumbs') @@ -6,53 +10,56 @@ @section('content')
- @if(isset($jenisFasilitasKredit->id)) + @if (isset($jenisFasilitasKredit->id))
@method('PUT') - @else - - @endif - @csrf -
-
-

- {{ isset($jenisFasilitasKredit->id) ? 'Edit' : 'Tambah' }} Jenis Fasilitas Kredit -

-
- Back -
-
-
-
- -
- - @error('code') - {{ $message }} - @enderror -
-
-
- -
- - @error('name') - {{ $message }} - @enderror -
-
-
- -
-
-
-
+ @else +
+ @endif + @csrf +
+
+

+ {{ isset($jenisFasilitasKredit->id) ? 'Edit' : 'Tambah' }} Jenis Fasilitas Kredit +

+
+ Back +
+
+
+
+ +
+ + @error('code') + {{ $message }} + @enderror +
+
+
+ +
+ + @error('name') + {{ $message }} + @enderror +
+
+
+ +
+
+
+
@endsection diff --git a/resources/views/penawaran/create.blade.php b/resources/views/penawaran/create.blade.php index 9a081ec..c494a4e 100644 --- a/resources/views/penawaran/create.blade.php +++ b/resources/views/penawaran/create.blade.php @@ -6,7 +6,7 @@ @section('content')
-
+ @csrf
@@ -15,6 +15,8 @@ Tambah Data Penawaran
+ Detail Back @@ -26,9 +28,8 @@ Nomor Registrasi
- + @error('nomor_registrasi') {{ $message }} @enderror @@ -174,7 +175,8 @@ @if (isset($status)) @foreach ($status as $s) - @endforeach diff --git a/resources/views/penawaran/index.blade.php b/resources/views/penawaran/index.blade.php index 897f77e..93b5ad2 100644 --- a/resources/views/penawaran/index.blade.php +++ b/resources/views/penawaran/index.blade.php @@ -72,6 +72,24 @@ @push('scripts') + + +@endpush + diff --git a/resources/views/registrasi/js/editjs.blade.php b/resources/views/registrasi/js/editjs.blade.php new file mode 100644 index 0000000..bb23884 --- /dev/null +++ b/resources/views/registrasi/js/editjs.blade.php @@ -0,0 +1,196 @@ +@push('scripts') + +@endpush diff --git a/resources/views/registrasi/js/showjs.blade.php b/resources/views/registrasi/js/showjs.blade.php new file mode 100644 index 0000000..97a5110 --- /dev/null +++ b/resources/views/registrasi/js/showjs.blade.php @@ -0,0 +1,148 @@ +@push('scripts') + +@endpush diff --git a/resources/views/registrasi/show.blade.php b/resources/views/registrasi/show.blade.php new file mode 100644 index 0000000..7fbdcec --- /dev/null +++ b/resources/views/registrasi/show.blade.php @@ -0,0 +1,40 @@ +@extends('layouts.main') + +@section('breadcrumbs') + {{ Breadcrumbs::render(request()->route()->getName()) }} +@endsection +@php + // $route = Route::currentRouteName(); + // dd($route); registrasi.show + $route = explode('.', Route::currentRouteName()); +@endphp +@section('content') +
+
+
+

+ Detail Permohonan +

+ +
+
+ +
+ +
+ +
+
+ +
+
+
+@endsection +@include('lpj::registrasi.js.showjs') \ No newline at end of file diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index b70c5ec..db7e55d 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -397,6 +397,11 @@ Breadcrumbs::for('tender.penawaran', function (BreadcrumbTrail $trail) { $trail->push('Data Penawaran', route('tender.penawaran.index')); }); +Breadcrumbs::for('tender.penawaran.show', function (BreadcrumbTrail $trail, $id) { + $trail->parent('tender'); + $trail->push('Detail Penawaran', route('tender.penawaran.show', $id)); +}); + Breadcrumbs::for('tender.penawaran.createPenawaran', function (BreadcrumbTrail $trail, $id) { $trail->parent('tender.penawaran'); $trail->push('Tambah Data Penawaran', route('tender.penawaran.createPenawaran', $id)); diff --git a/routes/registrasi.php b/routes/registrasi.php new file mode 100644 index 0000000..8beb9ae --- /dev/null +++ b/routes/registrasi.php @@ -0,0 +1,25 @@ +group(function () { + + // andy add + // Route::name('registrasi.')->prefix('registrasi')->group(function () { + Route::controller(RegistrasiController::class)->group(function(){ + // Route::get('/', [RegistrasiController::class, 'index'])->name('registrasi.index'); + Route::get('/registrasi', 'index')->name('registrasi.index'); + Route::get('/registrasi/datatables', 'dataForDatatables')->name('registrasi.datatables'); + + // show data + Route::get('/registrasi/{registrasi}', 'show')->name('registrasi.show'); + Route::post('registrasi/showData', 'setData')->name('registrasi.showData'); + + Route::post('registrasi/setData', 'setData')->name('registrasi.setData'); + Route::get('/registrasi/{registrasi}/edit', 'edit')->name('registrasi.edit'); + Route::put('/registrasi/{registrasi}', 'update')->name('registrasi.update'); + + }); + // andy add +}); + diff --git a/routes/web.php b/routes/web.php index c40807e..bd9b9d0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,7 +1,7 @@ group(function () { }); 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('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'); @@ -98,7 +98,7 @@ Route::middleware(['auth'])->group(function () { Route::name('debitur.')->prefix('debitur')->group(function () { Route::get('restore/{id}', [DebitureController::class, 'restore'])->name('restore'); Route::get('datatables', [DebitureController::class, 'dataForDatatables']) - ->name('datatables'); + ->name('datatables'); Route::get('export', [DebitureController::class, 'export'])->name('export'); @@ -413,24 +413,13 @@ 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/{id}/create', [TenderController::class, 'penawaran_create'])->name('penawaran.createPenawaran'); - Route::post('penawaran/{id}/store', [TenderController::class, 'penawaran_store'])->name('penawaran.storePenawaran'); - Route::post('penawaran/{id}/update', [TenderController::class, 'penawaran_store'])->name('penawaran.updatePenawaran'); - Route::get('penawaran/exportPenawaran', [TenderController::class, 'exportPenawaran'])->name('penawaran.exportPenawaran'); - Route::get('penawaran/datatables', [TenderController::class, 'datatablesPenawaran']) - ->name('penawaran.datatables'); + // andy + // Route::name('authorization.')->prefix('authorization')->group(function () { + // Route::get('/', [AuthorizationController::class, 'index'])->name('index'); + // Route::get('datatables', [AuthorizationController::class, 'dataForDatatables']) + // ->name('datatables'); + // }); - // Proses Penawaran - Route::get('proses_penawaran', [TenderController::class, 'proses_penawaran_index'])->name( - 'proses_penawaran.index', - ); - - // Penawaran Ulang - Route::get('penawaran_ulang', [TenderController::class, 'penawaran_ulang_index'])->name( - 'penawaran_ulang.index', - ); - }); + // Route::resource('authorization', AuthorizationController::class); + // andy });