daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Perbaikan Feature Registrasi Final, Konsistensi id => penawaran.id

Browse Source
This commit is contained in:
Andy Chaerudin
2024-11-06 11:13:58 +07:00
parent 35e57365e2
commit a41d8e0edb
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Http/Controllers/RegistrasiFinalController.php
View File

@@ -47,6 +47,7 @@ use Modules\Lpj\Models\PenawaranTender;
}
// Retrieve data from the database
// data.id => penawaran.id
$query =PenawaranTender::query()
->select('penawaran.*', 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
@@ -135,7 +136,10 @@ use Modules\Lpj\Models\PenawaranTender;
public function show($id)
{
$permohonan = Permohonan::find($id);
// $id => penawaran.id
$penawaran = PenawaranTender::find($id);
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
if($permohonan->dokumen)
{
$pdfSPK_path = Storage::url($permohonan->dokumen);
@@ -148,6 +152,7 @@ use Modules\Lpj\Models\PenawaranTender;
public function edit($id)
{
// $id => penawaran.id
return view('lpj::registrasifinal.edit', compact('id'));
}
@@ -155,16 +160,17 @@ use Modules\Lpj\Models\PenawaranTender;
{
$data = array();
$datas = array();
$penawaran=null;
$regions=null;
if (request()->ajax()) {
// $id => penawaran.id
$id = $request->id;
$datas = Permohonan::find($id);
$penawaran = PenawaranTender::find($id);
$datas = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
if ($datas) {
$penawaran=null;
$regions=null;
$regions=Regions::pluck('name', 'id');
$penawaran = PenawaranTender::where('nomor_registrasi','=',$datas->nomor_registrasi)->first();
$penawaranString = "";
if($penawaran->status)
@@ -229,10 +235,10 @@ use Modules\Lpj\Models\PenawaranTender;
$dataPenawaran = ['status' => 'registrasi-final'];
$permohonan = Permohonan::find($id);
$penawaran = PenawaranTender::where('nomor_registrasi','=',$permohonan->nomor_registrasi)->first();
// $id => penawaran.id
$penawaran = PenawaranTender::find($id);
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
$permohonan->update($dataPermohonan);
$penawaran->update($dataPenawaran);
//