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

3
resources/views/registrasifinal/edit.blade.php
View File

@@ -13,7 +13,8 @@
<div class="w-full grid gap-5 lg:gap-7.5 mx-auto"> <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
<form id="{{$route[0]}}_form" name="{{$route[0]}}_form" method="POST"> <form id="{{$route[0]}}_form" name="{{$route[0]}}_form" method="POST">
<input type="hidden" id="id" name="id" value="{{ $id }}"> <!-- $id => penawaran.id -->
<input type="hidden" id="{{$route[0]}}_id" name="id" value="{{ $id }}">
@method('PUT') @method('PUT')
@csrf @csrf
<div class="card pb-2.5"> <div class="card pb-2.5">

4
resources/views/registrasifinal/js/editjs.blade.php
View File

@@ -17,7 +17,8 @@
function setData() function setData()
{ {
let id = $("#id").val(); // id => penawaran.id
let id = $("#{{$route[0]}}_id").val();
let token = "{{ csrf_token() }}"; let token = "{{ csrf_token() }}";
// alert('token = ' + token); // alert('token = ' + token);
var useURL = "{{ route('registrasifinal.setData') }}"; var useURL = "{{ route('registrasifinal.setData') }}";
@@ -81,6 +82,7 @@
let token = "{{ csrf_token() }}"; let token = "{{ csrf_token() }}";
let _method = $('input[name=_method]').val(); let _method = $('input[name=_method]').val();
// id => penawaran.id
let id = $('#{{$route[0]}}_id').val(); let id = $('#{{$route[0]}}_id').val();
let region = $("#{{$route[0]}}_region").val(); let region = $("#{{$route[0]}}_region").val();
let catatan = $("#{{$route[0]}}_catatan").val(); let catatan = $("#{{$route[0]}}_catatan").val();