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

Refactor OtorisasiPenawaranController indentation and formatting

Browse Source 
Merubah indentation dan formatting pada file OtorisasiPenawaranController.php untuk meningkatkan keterbacaan kode. Perubahan ini meliputi perbaikan penempatan namespace, import statements, dan penyesuaian indentasi method-method dalam controller tersebut tanpa mengubah logika bisnis.
This commit is contained in:
Daeng Deni Mardaeni
2024-11-20 22:48:18 +07:00
parent 08ebcb740c
commit 254274b40f
1 changed files with 289 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

262
app/Http/Controllers/OtorisasiPenawaranController.php
View File

@@ -1,27 +1,26 @@
<?php <?php
namespace Modules\Lpj\Http\Controllers; namespace Modules\Lpj\Http\Controllers;
use Illuminate\Http\Request; use App\Http\Controllers\Controller;
use Illuminate\Http\Response; use Carbon\Carbon;
use App\Http\Controllers\Controller; use Exception;
use Carbon\Carbon; use Illuminate\Http\JsonResponse;
use Exception; use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel; use Illuminate\Http\Response;
use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\DB; use Maatwebsite\Excel\Facades\Excel;
use Modules\Lpj\Models\KJPP; use Modules\Lpj\Models\KJPP;
use Modules\Lpj\Models\PenawaranDetailTender; use Modules\Lpj\Models\PenawaranDetailTender;
use Modules\Lpj\Models\PenawaranDetailTenderLog; use Modules\Lpj\Models\PenawaranDetailTenderLog;
use Modules\Lpj\Models\PenawaranTender; use Modules\Lpj\Models\PenawaranTender;
use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\Permohonan; class OtorisasiPenawaranController extends Controller
{
class OtorisasiPenawaranController extends Controller
{
public $user; public $user;
/** /**
@@ -40,22 +39,30 @@ class OtorisasiPenawaranController extends Controller
} }
// Retrieve data from the database // Retrieve data from the database
$query =PenawaranTender::query() $query = PenawaranTender::query()->select(
->select('penawaran.*', 'penawaran.*',
'debitures.name as debitures_name', 'debitures.name as debitures_name',
'permohonan.tanggal_permohonan', 'permohonan.tanggal_permohonan',
'users.name as user_pemohon', 'users.name as user_pemohon',
'branches.name as branches_name', 'branches.name as branches_name',
'tujuan_penilaian.name as tujuan_penilaian_name', 'tujuan_penilaian.name as tujuan_penilaian_name',
'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name') 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name',
->leftJoin('permohonan', 'permohonan.nomor_registrasi', '=', 'penawaran.nomor_registrasi') )->leftJoin('permohonan', 'permohonan.nomor_registrasi', '=', 'penawaran.nomor_registrasi')->leftJoin(
->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id') 'debitures',
->leftJoin('users', 'users.id', '=', 'permohonan.user_id') 'debitures.id',
->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id') '=',
->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id') 'permohonan.debiture_id',
->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id') )->leftJoin('users', 'users.id', '=', 'permohonan.user_id')->leftJoin(
->where('penawaran.status','=','proposal-tender') 'branches',
->withCount('penawarandetails'); 'branches.id',
'=',
'permohonan.branch_id',
)->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id', '=', 'permohonan.tujuan_penilaian_id')->leftJoin(
'tujuan_penilaian_kjpp',
'tujuan_penilaian_kjpp.id',
'=',
'penawaran.tujuan_penilaian_kjpp_id',
)->where('penawaran.status', '=', 'proposal-tender')->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'))) {
@@ -97,7 +104,6 @@ class OtorisasiPenawaranController extends Controller
// format date // format date
$i = 0; $i = 0;
foreach ($data as $obj) { foreach ($data as $obj) {
// tanggal_permohonan // tanggal_permohonan
if ($obj->tanggal_permohonan) { if ($obj->tanggal_permohonan) {
$data[$i]->tanggal_permohonan = Carbon::parse($obj->tanggal_permohonan)->format('d M Y'); $data[$i]->tanggal_permohonan = Carbon::parse($obj->tanggal_permohonan)->format('d M Y');
@@ -105,10 +111,10 @@ class OtorisasiPenawaranController extends Controller
// date_range // date_range
$data[$i]->date_range = "-"; $data[$i]->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(
$data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' . $obj->end_date,
Carbon::parse($obj->end_date)->format('d M Y'); )->format('d M Y');
} }
$i++; $i++;
@@ -129,7 +135,7 @@ class OtorisasiPenawaranController extends Controller
'pageCount' => $pageCount, 'pageCount' => $pageCount,
'page' => $currentPage, 'page' => $currentPage,
'totalCount' => $totalRecords, 'totalCount' => $totalRecords,
'data' => $data 'data' => $data,
]); ]);
} }
@@ -138,99 +144,104 @@ class OtorisasiPenawaranController extends Controller
return view('lpj::otorisasipenawaran.edit', compact('id')); return view('lpj::otorisasipenawaran.edit', compact('id'));
} }
public function setData(Request $request): JsonResponse public function setData(Request $request)
{ : JsonResponse {
$data = array(); $data = [];
$penawaran = array(); $penawaran = [];
$penawrandetails = array(); $penawrandetails = [];
$penawarandetailLogs = array(); $penawarandetailLogs = [];
if (request()->ajax()) { if (request()->ajax()) {
$id = $request->id; $id = $request->id;
$penawaran = PenawaranTender::where('status','=','proposal-tender')->find($id); $penawaran = PenawaranTender::where('status', '=', 'proposal-tender')->find($id);
if ($penawaran) { if ($penawaran) {
$penawarandetailLogs = PenawaranDetailTenderLog::where('penawaran_id',$id) $penawarandetailLogs = PenawaranDetailTenderLog::where('penawaran_id', $id)->leftJoin(
->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran_logs.kjpp_rekanan_id') 'kjpp',
->select('detail_penawaran_logs.*', DB::raw("DATE_FORMAT(detail_penawaran_logs.created_at, '%d-%m-%Y %H:%i') AS created_at2"),'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name') 'kjpp.id',
->get(); '=',
$penawrandetails = PenawaranDetailTender::where('penawaran_id','=',$id) 'detail_penawaran_logs.kjpp_rekanan_id',
->leftJoin('kjpp', 'kjpp.id', '=', 'detail_penawaran.kjpp_rekanan_id') )->select(
->select('detail_penawaran.*', 'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name') 'detail_penawaran_logs.*',
->where('detail_penawaran.status','=',1) DB::raw("DATE_FORMAT(detail_penawaran_logs.created_at, '%d-%m-%Y %H:%i') AS created_at2"),
->get(); 'kjpp.code AS kjpp_code',
'kjpp.name AS kjpp_name',
)->get();
$penawrandetails = PenawaranDetailTender::where('penawaran_id', '=', $id)->leftJoin(
'kjpp',
'kjpp.id',
'=',
'detail_penawaran.kjpp_rekanan_id',
)->select('detail_penawaran.*', 'kjpp.code AS kjpp_code', 'kjpp.name AS kjpp_name')->where(
'detail_penawaran.status',
'=',
1,
)->get();
if(sizeof($penawarandetailLogs)>0) if (sizeof($penawarandetailLogs) > 0) {
{ $h = 0;
$h=0; foreach ($penawarandetailLogs as $obj1) {
foreach($penawarandetailLogs as $obj1) if ($obj1->dokumen_persetujuan && Storage::disk('public')->exists(
{ $obj1->dokumen_persetujuan,
if($obj1->dokumen_persetujuan && Storage::disk('public')->exists($obj1->dokumen_persetujuan)) )) {
{ $penawarandetailLogs_path = Storage::url(
$penawarandetailLogs_path = Storage::url($obj1->dokumen_persetujuan); $obj1->dokumen_persetujuan,
);
$penawarandetailLogs[$h]->dokumen_persetujuan = $penawarandetailLogs_path; $penawarandetailLogs[$h]->dokumen_persetujuan = $penawarandetailLogs_path;
} }
$h++; $h++;
} }
} }
$i=0; $i = 0;
foreach($penawrandetails as $obj) foreach ($penawrandetails as $obj) {
{ if ($obj->dokumen_persetujuan && Storage::disk('public')->exists($obj->dokumen_persetujuan)) {
if($obj->dokumen_persetujuan && Storage::disk('public')->exists($obj->dokumen_persetujuan))
{
$penawrandetails_path = Storage::url($obj->dokumen_persetujuan); $penawrandetails_path = Storage::url($obj->dokumen_persetujuan);
$penawrandetails[$i]->dokumen_persetujuan = $penawrandetails_path; $penawrandetails[$i]->dokumen_persetujuan = $penawrandetails_path;
} }
$i++; $i++;
} }
$penawaranString = ""; $penawaranString = "";
if($penawaran->status) if ($penawaran->status) {
{
$penawaranString = convertSlug($penawaran->status); $penawaranString = convertSlug($penawaran->status);
$penawaran->status = $penawaranString; $penawaran->status = $penawaranString;
} }
$kjpp=null; $kjpp = null;
$kjpp = KJPP::pluck('name', 'id'); $kjpp = KJPP::pluck('name', 'id');
$data['penawaran'] = $penawaran; $data['penawaran'] = $penawaran;
$data['penawrandetails'] = $penawrandetails; $data['penawrandetails'] = $penawrandetails;
$data['penawarandetailLogs'] = $penawarandetailLogs; $data['penawarandetailLogs'] = $penawarandetailLogs;
$data['status'] = 'success'; $data['status'] = 'success';
$data['message']['message_success'] = array("data successfully found"); $data['message']['message_success'] = ["data successfully found"];
} else { } else {
$data['status'] = 'error'; $data['status'] = 'error';
$data['penawaran'] = null; $data['penawaran'] = null;
$data['penawrandetails'] = null; $data['penawrandetails'] = null;
$data['message']['message_data'] = array("data not found"); $data['message']['message_data'] = ["data not found"];
} }
} else { } else {
$data['status'] = 'error'; $data['status'] = 'error';
$data['message']['message_ajax'] = array("no ajax request"); $data['message']['message_ajax'] = ["no ajax request"];
} }
return response()->json($data); return response()->json($data);
} }
public function otorisasiPenawaranKJPP(Request $request, $id): JsonResponse public function otorisasiPenawaranKJPP(Request $request, $id)
{ : JsonResponse {
$data = array(); $data = [];
$dataDetailPenawaranLog=[]; $dataDetailPenawaranLog = [];
if (request()->ajax()) { if (request()->ajax()) {
// cek masa aktif penawaran // cek masa aktif penawaran
$detailpenawaran = PenawaranDetailTender::find($id); $detailpenawaran = PenawaranDetailTender::find($id);
$penawaran = PenawaranTender::findOrFail($detailpenawaran->penawaran_id); $penawaran = PenawaranTender::findOrFail($detailpenawaran->penawaran_id);
$checkActiveDateRange = checkActiveDateRangePenawaran($detailpenawaran->penawaran_id); $checkActiveDateRange = checkActiveDateRangePenawaran($detailpenawaran->penawaran_id);
// cek masa aktif penawaran // cek masa aktif penawaran
if($checkActiveDateRange) if ($checkActiveDateRange) {
{
DB::beginTransaction(); DB::beginTransaction();
try { try {
// update status KJPP yg tidak terpilih menjadi 2 -> kalah // update status KJPP yg tidak terpilih menjadi 2 -> kalah
// update status Penawaran menjadi SPK // update status Penawaran menjadi SPK
// update status Permohonan menjadi SPK // update status Permohonan menjadi SPK
@@ -239,54 +250,52 @@ class OtorisasiPenawaranController extends Controller
PenawaranDetailTender::where('status', 1) PenawaranDetailTender::where('status', 1)
->where('penawaran_id', $request->penawaran_id) ->where('penawaran_id', $request->penawaran_id)
->whereNotIn('id', [$id]) ->whereNotIn('id', [$id])
->update(['status' => 2, ->update([
'status' => 2,
'updated_by' => Auth::id(), 'updated_by' => Auth::id(),
'updated_at' => now() 'updated_at' => now(),
]); ]);
PenawaranTender::where('id', $request->penawaran_id) PenawaranTender::where('id', $request->penawaran_id)->update([
->update(['status'=>'spk', 'status' => 'spk',
'nama_kjpp_sebelumnya'=>$request->kjppName, 'nama_kjpp_sebelumnya' => $request->kjppName,
'biaya_kjpp_sebelumnya'=>$request->biaya_penawaran, 'biaya_kjpp_sebelumnya' => $request->biaya_penawaran,
'tanggal_penilaian_sebelumnya'=>now(), 'tanggal_penilaian_sebelumnya' => now(),
'authorized_status'=>1, 'authorized_status' => 1,
'authorized_at'=>now(), 'authorized_at' => now(),
'authorized_by'=>Auth::id(), 'authorized_by' => Auth::id(),
'updated_by' => Auth::id(), 'updated_by' => Auth::id(),
'updated_at' => now() 'updated_at' => now(),
]); ]);
Permohonan::where('nomor_registrasi',$request->noReg) Permohonan::where('nomor_registrasi', $request->noReg)->update([
->update(['status'=>'spk', 'status' => 'persetujuan-penawaran',
'updated_by' => Auth::id(), 'updated_by' => Auth::id(),
'updated_at' => now() 'updated_at' => now(),
]); ]);
// log // log
$detailPenawaran = PenawaranDetailTender::where('penawaran_id', $request->penawaran_id)->get(); $detailPenawaran = PenawaranDetailTender::where('penawaran_id', $request->penawaran_id)->get();
if(sizeof($detailPenawaran)>0) if (sizeof($detailPenawaran) > 0) {
{
foreach ($detailPenawaran as $model) { foreach ($detailPenawaran as $model) {
array_push($dataDetailPenawaranLog, [ array_push($dataDetailPenawaranLog, [
'detail_penawaran_id' =>$model->id, 'detail_penawaran_id' => $model->id,
'kjpp_rekanan_id' =>$model->kjpp_rekanan_id, 'kjpp_rekanan_id' => $model->kjpp_rekanan_id,
'penawaran_id' =>$model->penawaran_id, 'penawaran_id' => $model->penawaran_id,
'biaya_penawaran' =>$model->biaya_penawaran, 'biaya_penawaran' => $model->biaya_penawaran,
'attachment' =>$model->attachment, 'attachment' => $model->attachment,
'dokumen_persetujuan' =>$model->dokumen_persetujuan, 'dokumen_persetujuan' => $model->dokumen_persetujuan,
'status' =>$model->status, 'status' => $model->status,
'authorized_status' =>$model->authorized_status, 'authorized_status' => $model->authorized_status,
'authorized_at' =>$model->authorized_at, 'authorized_at' => $model->authorized_at,
'authorized_at' =>$model->authorized_at, 'authorized_at' => $model->authorized_at,
'created_at' =>$model->created_at, 'created_at' => $model->created_at,
'updated_at' =>$model->updated_at, 'updated_at' => $model->updated_at,
'deleted_at' =>$model->deleted_at, 'deleted_at' => $model->deleted_at,
'created_by' =>$model->created_by, 'created_by' => $model->created_by,
'updated_by' =>$model->updated_by, 'updated_by' => $model->updated_by,
'deleted_by' =>$model->deleted_by 'deleted_by' => $model->deleted_by,
]); ]);
} }
PenawaranDetailTenderLog::insert($dataDetailPenawaranLog); PenawaranDetailTenderLog::insert($dataDetailPenawaranLog);
@@ -295,22 +304,19 @@ class OtorisasiPenawaranController extends Controller
DB::commit(); DB::commit();
$data['status'] = 'success'; $data['status'] = 'success';
$data['message']['message_success'] = array('Otorisasi Penawaran KJPP '.$request->kjppName.' successfully'); $data['message']['message_success'] = ['Otorisasi Penawaran KJPP ' . $request->kjppName . ' successfully'];
} catch (Exception $e) { } catch (Exception $e) {
DB::rollBack(); DB::rollBack();
$data['status'] = 'error'; $data['status'] = 'error';
$data['message']['message_error'] = array("Otorisasi Penawaran KJPP failed.."); $data['message']['message_error'] = ["Otorisasi Penawaran KJPP failed.."];
} }
}
else
{
$data['status'] = 'error';
$data['message'] ['active_date_range'] = array("Penawaran sudah di tutup");
}
} else { } else {
$data['status'] = 'error'; $data['status'] = 'error';
$data['message']['message_ajax'] = array("no ajax request"); $data['message'] ['active_date_range'] = ["Penawaran sudah di tutup"];
}
} else {
$data['status'] = 'error';
$data['message']['message_ajax'] = ["no ajax request"];
} }
return response()->json($data); return response()->json($data);
} }
@@ -318,6 +324,6 @@ class OtorisasiPenawaranController extends Controller
public function show($id) public function show($id)
{ {
$prosespenawaran = PenawaranTender::find($id); $prosespenawaran = PenawaranTender::find($id);
return view('lpj::otorisasipenawaran.show', compact('id','prosespenawaran')); return view('lpj::otorisasipenawaran.show', compact('id', 'prosespenawaran'));
}
} }
}