diff --git a/app/Http/Controllers/RegistrasiController.php b/app/Http/Controllers/RegistrasiController.php index 5f04aa6..6efb5a4 100644 --- a/app/Http/Controllers/RegistrasiController.php +++ b/app/Http/Controllers/RegistrasiController.php @@ -241,7 +241,8 @@ public function show($id) { - return view('lpj::registrasi.show', compact('id')); + $permohonan = Permohonan::find($id); + return view('lpj::registrasi.show', compact('id','permohonan')); } public function showData(Request $request): JsonResponse 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/Models/Permohonan.php b/app/Models/Permohonan.php index 46ae5a3..8e4676b 100644 --- a/app/Models/Permohonan.php +++ b/app/Models/Permohonan.php @@ -35,38 +35,52 @@ class Permohonan extends Base 'region_id', // andy add '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/module.json b/module.json index 8e6c2ec..d3775b8 100644 --- a/module.json +++ b/module.json @@ -5,280 +5,297 @@ "description": "", "keywords": [], "priority": 0, - "providers": ["Modules\\Lpj\\Providers\\LpjServiceProvider"], - - "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" - ] - }, - { - "_comment1": "andy add", - "title": "Registrasi", - "path": "registrasi", - "icon": "ki-filled ki-some-files text-lg", - "classes": "", - "attributes": [], - "permission": "", - "roles": [ - "Administrator" - ], - "_comment2": "andy add" - }, - { - "title": "Data Debitur", - "path": "debitur", - "icon": "ki-filled ki-people 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" - ] - } + "providers": [ + "Modules\\Lpj\\Providers\\LpjServiceProvider" + ], + "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" ], - "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": [] - } - ] - } + "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 text-danger", + "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-security-user text-lg", + "classes": "", + "attributes": [], + "permission": "", + "roles": [ + "administrator" + ] + }, + { + "title": "Registrasi", + "path": "registrasi", + "icon": "ki-filled ki-file-added text-lg", + "classes": "", + "attributes": [], + "permission": "", + "roles": [ + "Administrator" + ] + }, + { + "title": "Assignment", + "path": "penilaian", + "icon": "ki-filled ki-badge text-lg", + "classes": "", + "attributes": [], + "permission": "", + "roles": [ + "Administrator" + ] + }, + { + "title": "Activity", + "path": "activity", + "icon": "ki-filled ki-calendar-edit text-lg", + "classes": "", + "attributes": [], + "permission": "", + "roles": [ + "Administrator" + ] + }, + { + "title": "Laporan", + "path": "", + "icon": "ki-filled ki-filter-tablet 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" ], - "system": [] - } + "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": "Tujuan Penilaian KJPP", + "path": "basicdata.tujuan_penilaian_kjpp", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + }, + { + "title": "Ijin Usaha", + "path": "basicdata.ijin_usaha", + "classes": "", + "attributes": [], + "permission": "", + "roles": [] + } + ] + } + ], + "system": [] + } } - 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') +