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

Merge pull request 'perbaikan inputan data kjpp kantor cabang, dan tujuan penilaian' (#67) from feature/senior-officer into staging

Browse Source 
Reviewed-on: #67
This commit is contained in:
putrakuningan
2024-12-23 08:50:22 +00:00
parent 87b3337502 41b6f96ef7
commit 65a13f383a
2 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
app/Http/Controllers/ProsesPenawaranController.php
View File

@@ -22,7 +22,7 @@ use Modules\Lpj\Models\PenawaranTender;
use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\Permohonan;
use Modules\Lpj\Models\StatusPermohonan; use Modules\Lpj\Models\StatusPermohonan;
use Modules\Lpj\Models\TujuanPenilaianKJPP; use Modules\Lpj\Models\TujuanPenilaian;
class ProsesPenawaranController extends Controller class ProsesPenawaranController extends Controller
{ {
@@ -49,17 +49,17 @@ class ProsesPenawaranController extends Controller
// penawaran need union with permohonan // penawaran need union with permohonan
$query = PenawaranTender::query()->whereIn('penawaran.status', ['tender', 'proposal-tender']) $query = PenawaranTender::query()->whereIn('penawaran.status', ['tender', 'proposal-tender'])
->select('penawaran.id', ->select('penawaran.id',
'penawaran.nomor_registrasi', 'penawaran.nomor_registrasi',
'penawaran.code as penawaran_code', 'penawaran.code as penawaran_code',
'penawaran.start_date', 'penawaran.start_date',
'penawaran.end_date', 'penawaran.end_date',
'penawaran.status as statusnya', 'penawaran.status as statusnya',
'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'
) )
->withCount('penawarandetails') ->withCount('penawarandetails')
->leftJoin('permohonan', 'permohonan.nomor_registrasi', '=', 'penawaran.nomor_registrasi') ->leftJoin('permohonan', 'permohonan.nomor_registrasi', '=', 'penawaran.nomor_registrasi')
@@ -71,22 +71,22 @@ class ProsesPenawaranController extends Controller
$permohonanQuery = Permohonan::whereIn('permohonan.status', ['registered'])->where('permohonan.jenis_penilaian_id', '=', 2) $permohonanQuery = Permohonan::whereIn('permohonan.status', ['registered'])->where('permohonan.jenis_penilaian_id', '=', 2)
->select('permohonan.id', ->select('permohonan.id',
'permohonan.nomor_registrasi', 'permohonan.nomor_registrasi',
DB::raw('"" as penawaran_code'), DB::raw('"" as penawaran_code'),
DB::raw('"" as start_date'), DB::raw('"" as start_date'),
DB::raw('"" as end_date'), DB::raw('"" as end_date'),
'permohonan.status as statusnya', 'permohonan.status as statusnya',
'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',
DB::raw('"" as tujuan_penilaian_kjpp_name'), DB::raw('"" as tujuan_penilaian_kjpp_name'),
DB::raw('"-" as penawarandetails_count')) DB::raw('"-" as penawarandetails_count'))
->leftJoin('users', 'users.id', '=', 'permohonan.user_id') ->leftJoin('users', 'users.id', '=', 'permohonan.user_id')
->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id') ->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id')
->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id') ->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id')
->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id'); ->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id');
$query->union($permohonanQuery); $query->union($permohonanQuery);
// penawaran need union with permohonan // penawaran need union with permohonan
@@ -130,7 +130,7 @@ class ProsesPenawaranController 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');
@@ -138,9 +138,9 @@ class ProsesPenawaranController 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') . ' - ' . $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' .
Carbon::parse($obj->end_date)->format('d M Y'); Carbon::parse($obj->end_date)->format('d M Y');
} }
@@ -208,8 +208,8 @@ class ProsesPenawaranController extends Controller
->select('id', 'name', 'code') // Pilih beberapa kolom sekaligus ->select('id', 'name', 'code') // Pilih beberapa kolom sekaligus
->get(); ->get();
$sql=DB::getQueryLog(); $sql=DB::getQueryLog();
$data['sql'] = $sql; $data['sql'] = $sql;
$data['kjpps'] = $kjpps; $data['kjpps'] = $kjpps;
$data['penawaran'] = $penawaran; $data['penawaran'] = $penawaran;
$data['penawrandetails'] = $penawrandetails; $data['penawrandetails'] = $penawrandetails;
$data['status'] = 'success'; $data['status'] = 'success';
@@ -238,7 +238,7 @@ class ProsesPenawaranController extends Controller
$data = array(); $data = array();
$dataPenawaranDetail = array(); $dataPenawaranDetail = array();
if (request()->ajax()) { if (request()->ajax()) {
$penawarandetail = PenawaranDetailTender::find($id); $penawarandetail = PenawaranDetailTender::find($id);
// cek masa aktif penawaran // cek masa aktif penawaran
$checkActiveDateRange = checkActiveDateRangePenawaran($penawarandetail->penawaran_id); $checkActiveDateRange = checkActiveDateRangePenawaran($penawarandetail->penawaran_id);
@@ -290,13 +290,13 @@ class ProsesPenawaranController extends Controller
$data['status'] = 'error'; $data['status'] = 'error';
$data['message'] ['message_error_try_catch'] = array('Proses Penawarn KJPP failed.'); $data['message'] ['message_error_try_catch'] = array('Proses Penawarn KJPP failed.');
} }
} }
else else
{ {
$data['status'] = 'error'; $data['status'] = 'error';
$data['message']['active_date_range'] = array("Penawaran sudah di tutup"); $data['message']['active_date_range'] = array("Penawaran sudah di tutup");
} }
} else { } else {
$data['status'] = 'error'; $data['status'] = 'error';
@@ -339,7 +339,7 @@ class ProsesPenawaranController extends Controller
$data = array(); $data = array();
$dataPermohonan = array(); $dataPermohonan = array();
$dataPenawaran = array(); $dataPenawaran = array();
// cek masa aktif penawaran // cek masa aktif penawaran
$checkActiveDateRange = checkActiveDateRangePenawaran($id); $checkActiveDateRange = checkActiveDateRangePenawaran($id);
// cek status (penawaran.status = tender) // cek status (penawaran.status = tender)
@@ -406,7 +406,7 @@ class ProsesPenawaranController extends Controller
if($checkActiveDateRange && ('tender'==$penawaran->status)) if($checkActiveDateRange && ('tender'==$penawaran->status))
{ {
try { try {
// $data['id']=$id; // $data['id']=$id;
$dataDetailPenawaran = ['status' => '0', $dataDetailPenawaran = ['status' => '0',
@@ -446,7 +446,7 @@ class ProsesPenawaranController extends Controller
$data = array(); $data = array();
$dataPenawaranDetail = array(); $dataPenawaranDetail = array();
$failed = 0; $failed = 0;
// cek masa aktif penawaran // cek masa aktif penawaran
$checkActiveDateRange = checkActiveDateRangePenawaran($id); $checkActiveDateRange = checkActiveDateRangePenawaran($id);
// cek status (penawaran.status = tender) // cek status (penawaran.status = tender)
@@ -454,9 +454,9 @@ class ProsesPenawaranController extends Controller
if($checkActiveDateRange && ('tender'==$penawaran->status)) if($checkActiveDateRange && ('tender'==$penawaran->status))
{ {
DB::beginTransaction(); DB::beginTransaction();
try try
{ {
// update detail_penawaran // update detail_penawaran
$detail_penawaran_ids = $request->input('prosespenawaran_penawarandetail_id', []); $detail_penawaran_ids = $request->input('prosespenawaran_penawarandetail_id', []);
$no_proposals = $request->input('prosespenawaran_no_proposal', []); $no_proposals = $request->input('prosespenawaran_no_proposal', []);
$tgl_proposals = $request->input('prosespenawaran_tgl_proposal', []); $tgl_proposals = $request->input('prosespenawaran_tgl_proposal', []);
@@ -469,23 +469,23 @@ class ProsesPenawaranController extends Controller
// loop // loop
for($i=0;$i<$tot_kjpp;$i++) for($i=0;$i<$tot_kjpp;$i++)
{ {
$detail_penawaran_id= $detail_penawaran_ids[$i]; $detail_penawaran_id= $detail_penawaran_ids[$i];
$dataPenawaranDetail = [ $dataPenawaranDetail = [
'no_proposal' => $no_proposals[$i], 'no_proposal' => $no_proposals[$i],
'tgl_proposal' => $tgl_proposals[$i], 'tgl_proposal' => $tgl_proposals[$i],
'biaya_penawaran' => str_replace(".","",$biaya_penawarans[$i]), // 'biaya_penawaran' => str_replace(".","",$request->biaya_penawaran) 'biaya_penawaran' => str_replace(".","",$biaya_penawarans[$i]), // 'biaya_penawaran' => str_replace(".","",$request->biaya_penawaran)
'updated_by' => Auth::id(), 'updated_by' => Auth::id(),
'updated_at' => now(), 'updated_at' => now(),
]; ];
$penawarandetail = PenawaranDetailTender::find($detail_penawaran_id); $penawarandetail = PenawaranDetailTender::find($detail_penawaran_id);
if ($dokumen_penawarans) if ($dokumen_penawarans)
{ {
if (is_array($dokumen_penawarans) && array_key_exists($i, $dokumen_penawarans)) if (is_array($dokumen_penawarans) && array_key_exists($i, $dokumen_penawarans))
{ {
$file_tmp = $dokumen_penawarans[$i]; $file_tmp = $dokumen_penawarans[$i];
if($file_tmp->isValid()) if($file_tmp->isValid())
{ {
$folderPath = 'uploads/penawaran/'; $folderPath = 'uploads/penawaran/';
$myFile=$file_tmp->getClientOriginalName(); // nama file with extension $myFile=$file_tmp->getClientOriginalName(); // nama file with extension
@@ -500,16 +500,16 @@ class ProsesPenawaranController extends Controller
$dataPenawaranDetail['attachment'] = $myFile; $dataPenawaranDetail['attachment'] = $myFile;
$dataPenawaranDetail['dokumen_persetujuan'] = $newFileNameWithPath; $dataPenawaranDetail['dokumen_persetujuan'] = $newFileNameWithPath;
} }
} }
} }
$checkStatus = $penawarandetail->update($dataPenawaranDetail); $checkStatus = $penawarandetail->update($dataPenawaranDetail);
if(!$checkStatus) if(!$checkStatus)
$failed++; $failed++;
} }
if($failed>0) if($failed>0)
{ {
DB::rollBack(); DB::rollBack();
@@ -522,16 +522,16 @@ class ProsesPenawaranController extends Controller
$data['status'] = 'success'; $data['status'] = 'success';
$data['message'] ['message_success'] = array('Proses Draft Penawaran KJPP successfully'); $data['message'] ['message_success'] = array('Proses Draft Penawaran KJPP successfully');
} }
} }
else else
{ {
$data['status'] = 'error'; $data['status'] = 'error';
$data['message'] ['message_error'] = array('Data inti tidak ada.'); $data['message'] ['message_error'] = array('Data inti tidak ada.');
} }
} }
catch (Exception $e) catch (Exception $e)
{ {
// dd($e); // dd($e);
DB::rollBack(); DB::rollBack();
@@ -560,7 +560,7 @@ class ProsesPenawaranController extends Controller
$penawaran = PenawaranTender::find($request->penawaran_id); $penawaran = PenawaranTender::find($request->penawaran_id);
if($checkActiveDateRange && ('tender'==$penawaran->status)) if($checkActiveDateRange && ('tender'==$penawaran->status))
{ {
try try
{ {
$dataPenawaranDetail = [ $dataPenawaranDetail = [
'penawaran_id' => $request->penawaran_id, 'penawaran_id' => $request->penawaran_id,
@@ -570,22 +570,22 @@ class ProsesPenawaranController extends Controller
]; ];
PenawaranDetailTender::create($dataPenawaranDetail); PenawaranDetailTender::create($dataPenawaranDetail);
$data['status'] = 'success'; $data['status'] = 'success';
$data['message'] ['message_success'] = array('Proses Tambah KJPP successfully'); $data['message'] ['message_success'] = array('Proses Tambah KJPP successfully');
} }
catch (Exception $e) catch (Exception $e)
{ {
// dd($e); // dd($e);
$data['status'] = 'error'; $data['status'] = 'error';
$data['message'] ['message_error_try_catch'] = array('Proses Tambah KJPP failed.'); $data['message'] ['message_error_try_catch'] = array('Proses Tambah KJPP failed.');
} }
} }
else else
{ {
$data['status'] = 'error'; $data['status'] = 'error';
$data['message']['active_date_range'] = array("Penawaran sudah di tutup"); $data['message']['active_date_range'] = array("Penawaran sudah di tutup");
} }
return response()->json($data); return response()->json($data);
} }
@@ -639,7 +639,7 @@ class ProsesPenawaranController extends Controller
}) })
->select('id', 'name', 'code') // Pilih beberapa kolom sekaligus ->select('id', 'name', 'code') // Pilih beberapa kolom sekaligus
->get(); ->get();
$data['kjpps'] = $kjpps; $data['kjpps'] = $kjpps;
$data['penawaran'] = $penawaran; $data['penawaran'] = $penawaran;
$data['penawrandetails'] = $penawrandetails; $data['penawrandetails'] = $penawrandetails;
@@ -676,7 +676,7 @@ class ProsesPenawaranController extends Controller
if($checkActiveDateRange && ('proposal-tender'==$penawaran->status)) if($checkActiveDateRange && ('proposal-tender'==$penawaran->status))
{ {
try { try {
$data['id']=$id; $data['id']=$id;
$dataDetailPenawaran = ['status' => '0', $dataDetailPenawaran = ['status' => '0',
@@ -700,7 +700,7 @@ class ProsesPenawaranController extends Controller
$data['status'] = 'error'; $data['status'] = 'error';
$data['message']['active_date_range'] = array("Penawaran sudah di tutup"); $data['message']['active_date_range'] = array("Penawaran sudah di tutup");
// $data['message']['message_error'] = array("Penawaran sudah di tutup"); // $data['message']['message_error'] = array("Penawaran sudah di tutup");
} }
return response()->json($data); return response()->json($data);
} }
@@ -714,7 +714,7 @@ class ProsesPenawaranController extends Controller
$dataDetailPenawaran = array(); $dataDetailPenawaran = array();
$pleaseCommit= true; $pleaseCommit= true;
if (request()->ajax()) { if (request()->ajax()) {
$validator = ProsesPenawaranController::rulesEditUlangnya($request, $id); $validator = ProsesPenawaranController::rulesEditUlangnya($request, $id);
if ($validator['fails']) { if ($validator['fails']) {
@@ -884,7 +884,7 @@ class ProsesPenawaranController extends Controller
// cek apakah blm di approve (penawaran.status = proposal-tender) // cek apakah blm di approve (penawaran.status = proposal-tender)
if($checkActiveDateRange && ('proposal-tender'==$penawaran->status)) if($checkActiveDateRange && ('proposal-tender'==$penawaran->status))
{ {
try try
{ {
$biaya_penawaran=""; $biaya_penawaran="";
if($request->biaya_penawaran) if($request->biaya_penawaran)
@@ -931,16 +931,16 @@ class ProsesPenawaranController extends Controller
} }
PenawaranDetailTender::create($dataDetailPenawaran); PenawaranDetailTender::create($dataDetailPenawaran);
$data['status'] = 'success'; $data['status'] = 'success';
$data['message'] ['message_success'] = array('Proses Tambah KJPP Ulang successfully'); $data['message'] ['message_success'] = array('Proses Tambah KJPP Ulang successfully');
} }
catch (Exception $e) catch (Exception $e)
{ {
dd($e); dd($e);
$data['status'] = 'error'; $data['status'] = 'error';
$data['message'] ['message_error_try_catch'] = array('Proses Tambah KJPP Ulang failed.'); $data['message'] ['message_error_try_catch'] = array('Proses Tambah KJPP Ulang failed.');
} }
} }
else else
{ {
@@ -961,7 +961,7 @@ class ProsesPenawaranController extends Controller
$permohonan = Permohonan::find($id); $permohonan = Permohonan::find($id);
// dd($permohonan); // dd($permohonan);
$status = StatusPermohonan::all(); $status = StatusPermohonan::all();
$tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all(); $tujuan_penilaian_kjpp = TujuanPenilaian::all();
$jenis_laporan = JenisLaporan::all(); $jenis_laporan = JenisLaporan::all();
$kjpp = KJPP::all(); $kjpp = KJPP::all();

10
resources/views/prosespenawaran/createPenawaran.blade.php
View File

@@ -10,7 +10,7 @@
@section('content') @section('content')
<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">
<div class="card pb-2.5"> <div class="card pb-2.5">
<div class="card-header" id="basic_settings"> <div class="card-header" id="basic_settings">
<h3 class="card-title"> <h3 class="card-title">
@@ -78,7 +78,7 @@
@if (isset($kjpp)) @if (isset($kjpp))
<option value="{{ $row->id }}" <option value="{{ $row->id }}"
{{ in_array($row->id, old('kjpp', [])) ? 'selected' : '' }}> {{ in_array($row->id, old('kjpp', [])) ? 'selected' : '' }}>
{{ $row->name }} {{ $row->name }} || {{ $row->jenis_kantor }}
</option> </option>
@endif @endif
@endforeach @endforeach
@@ -197,8 +197,8 @@
</button> </button>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
@endsection @endsection
@push('styles') @push('styles')
@@ -219,4 +219,4 @@
display: none display: none
} }
</style> </style>
@endpush @endpush