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

Perbaikan CONFLICT Controller RegistrasiFinalController.php

Browse Source
This commit is contained in:
Andy Chaerudin
2024-11-06 11:19:06 +07:00
parent a41d8e0edb 315a52a78d
commit 30b349266f
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,6 @@ use Exception;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Modules\Lpj\Models\PenawaranTender; use Modules\Lpj\Models\PenawaranTender;
class RegistrasiFinalController extends Controller class RegistrasiFinalController extends Controller
@@ -52,15 +51,15 @@ use Modules\Lpj\Models\PenawaranTender;
->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')
->where('penawaran.status','=','spk') ->where('penawaran.status','=','spk')
->withCount('penawarandetails'); ->withCount('penawarandetails');
// Apply search filter if provided // Apply search filter if provided
if ($request->has('search') && !empty($request->get('search'))) { if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search'); $search = $request->get('search');
$query->where(function ($q) use ($search) { $query->where(function ($q) use ($search) {
$q->where('nomor_registrasi', 'LIKE', '%' . $search . '%'); $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
$q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%'); $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
$q->orWhere('status', 'LIKE', '%' . $search . '%'); $q->orWhere('status', 'LIKE', '%' . $search . '%');
}); });
} }
@@ -86,10 +85,10 @@ use Modules\Lpj\Models\PenawaranTender;
// Get the filtered count of records // Get the filtered count of records
$filteredRecords = $query->count(); $filteredRecords = $query->count();
// Get the data for the current page // Get the data for the current page
//$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get(); //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
$data = $query->get(); $data = $query->with(['permohonan'])->get();
// dd($data); // dd($data);
$i=0; $i=0;
foreach($data as $obj) foreach($data as $obj)
@@ -98,18 +97,18 @@ use Modules\Lpj\Models\PenawaranTender;
{ {
$data[$i]->tanggal_penilaian_sebelumnya = Carbon::parse($obj->tanggal_penilaian_sebelumnya)->format('d F Y H:i:s'); $data[$i]->tanggal_penilaian_sebelumnya = Carbon::parse($obj->tanggal_penilaian_sebelumnya)->format('d F Y H:i:s');
} }
if($obj->biaya_kjpp_sebelumnya) if($obj->biaya_kjpp_sebelumnya)
{ {
$data[$i]->biaya_kjpp_sebelumnya = formatRupiah($obj->biaya_kjpp_sebelumnya); $data[$i]->biaya_kjpp_sebelumnya = formatRupiah($obj->biaya_kjpp_sebelumnya);
} }
// date_range // date_range
if($obj->start_date && $obj->end_date) if($obj->start_date && $obj->end_date)
{ {
$data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y').' - '.Carbon::parse($obj->end_date)->format('d M Y'); $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y').' - '.Carbon::parse($obj->end_date)->format('d M Y');
} }
$i++; $i++;
@@ -209,14 +208,14 @@ use Modules\Lpj\Models\PenawaranTender;
$data = array(); $data = array();
$dataPermohonan = array(); $dataPermohonan = array();
$dataPenawaran = array(); $dataPenawaran = array();
if (request()->ajax()) { if (request()->ajax()) {
$validator = RegistrasiFinalController::rulesEditnya($request, $id); $validator = RegistrasiFinalController::rulesEditnya($request, $id);
if ($validator['fails']) { if ($validator['fails']) {
$data['message'] = $validator['errors']; $data['message'] = $validator['errors'];
$data['status'] = 'error'; $data['status'] = 'error';
} }
else else
{ {
DB::beginTransaction(); DB::beginTransaction();
@@ -230,7 +229,7 @@ use Modules\Lpj\Models\PenawaranTender;
'keterangan' => $request->catatan, 'keterangan' => $request->catatan,
'authorized_at' => now(), 'authorized_at' => now(),
'authorized_status' =>1, 'authorized_status' =>1,
'authorized_by' => Auth::id() 'authorized_by' => Auth::id()
]; ];
$dataPenawaran = ['status' => 'registrasi-final']; $dataPenawaran = ['status' => 'registrasi-final'];
@@ -241,7 +240,7 @@ use Modules\Lpj\Models\PenawaranTender;
$permohonan->update($dataPermohonan); $permohonan->update($dataPermohonan);
$penawaran->update($dataPenawaran); $penawaran->update($dataPenawaran);
// //
DB::commit(); DB::commit();
$data['status'] = 'success'; $data['status'] = 'success';
@@ -252,7 +251,7 @@ use Modules\Lpj\Models\PenawaranTender;
$data['message']['message_try_catch'] = array('Regitrasi Final '.$permohonan->nomor_registrasi.' failed.'); $data['message']['message_try_catch'] = array('Regitrasi Final '.$permohonan->nomor_registrasi.' failed.');
} }
} }
} else { } else {
$data['status'] = 'error'; $data['status'] = 'error';
$data['message']['message_ajax'] = array("no ajax request"); $data['message']['message_ajax'] = array("no ajax request");
@@ -265,7 +264,7 @@ use Modules\Lpj\Models\PenawaranTender;
public function rulesEditnya($request, $id) public function rulesEditnya($request, $id)
{ {
$validate_catatan=''; $validate_catatan='';
$validateIt = [ $validateIt = [
// 'name' diambil dari definisi parameter yang di kirim pada POST Data // 'name' diambil dari definisi parameter yang di kirim pada POST Data
'region' => 'required', 'region' => 'required',

4
resources/views/registrasifinal/index.blade.php
View File

@@ -133,10 +133,10 @@
title: 'Status', title: 'Status',
render: (item, data) => { render: (item, data) => {
return `<div class="flex flex-nowrap justify-center"> return `<div class="flex flex-nowrap justify-center">
<a onclick="showRegistrasiFinal(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail"> <a onclick="showRegistrasiFinal(${data.permohonan.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
<i class="ki-outline ki-eye"></i> <i class="ki-outline ki-eye"></i>
</a> </a>
<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="registrasifinal/${data.id}/edit"> <a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="registrasifinal/${data.permohonan.id}/edit">
<i class="ki-outline ki-notepad-edit"></i> <i class="ki-outline ki-notepad-edit"></i>
</a> </a>
</div>`; </div>`;