Feature Generate SPK PDF, handle variable Jangka Waktu dan handle perubahan jenis laporan
This commit is contained in:
@@ -146,11 +146,14 @@ use Illuminate\Support\Facades\Auth;
|
||||
}
|
||||
|
||||
public function edit($id)
|
||||
{
|
||||
{
|
||||
// dd(Carbon::now()->addDays(1)->format('d F Y'));
|
||||
// dd(Carbon::now()->subDays(1)->format('d F Y')); jenis_laporan_name
|
||||
$penawaran = PenawaranTender::leftJoin('detail_penawaran', 'detail_penawaran.penawaran_id','=','penawaran.id')
|
||||
->leftJoin('jenis_laporan', 'jenis_laporan.id','=','penawaran.jenis_laporan_id')
|
||||
->leftJoin('kjpp', 'kjpp.id','=','detail_penawaran.kjpp_rekanan_id')
|
||||
->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
|
||||
->leftJoin('penilaian', 'penilaian.nomor_registrasi','=','penawaran.nomor_registrasi')
|
||||
->where('detail_penawaran.status','=',1)
|
||||
->where('penawaran.id','=', $id)
|
||||
->select('penawaran.*', 'detail_penawaran.attachment as attachmentku',
|
||||
@@ -161,7 +164,8 @@ use Illuminate\Support\Facades\Auth;
|
||||
'kjpp.address as kjpp_address',
|
||||
'jenis_laporan.name as jenis_laporan_name',
|
||||
'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name',
|
||||
'jenis_laporan.code as jenis_laporan_code'
|
||||
'jenis_laporan.code as jenis_laporan_code',
|
||||
'penilaian.waktu_penilaian as penilaian_waktu_penilain'
|
||||
)->first();
|
||||
|
||||
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
|
||||
@@ -182,8 +186,21 @@ use Illuminate\Support\Facades\Auth;
|
||||
$spk_no_last = onLastnumberCodePenawaranSPK($penawaran->jenis_laporan_code);
|
||||
$penawaran->spk_no = $spk_no_last;
|
||||
}
|
||||
|
||||
// pengecekan perubahan jenis report
|
||||
$array_no_last = explode("/",$spk_no_last);
|
||||
$jenis_report_old=trim($array_no_last[4]);
|
||||
if($jenis_report_old!=$penawaran->jenis_laporan_code)
|
||||
{
|
||||
$penawaran->spk_no=str_replace($jenis_report_old,$penawaran->jenis_laporan_code,$spk_no_last);
|
||||
}
|
||||
// pengecekan perubahan jenis report
|
||||
// generate no spk
|
||||
|
||||
// Jangka Waktu
|
||||
// date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final)
|
||||
$jangka_waktu='';
|
||||
// Jangka Waktu
|
||||
$persetujuan_no_proposal = $penawaran->detail_penawaran_no_proposal;
|
||||
$persetujuan_tgl_proposal = $penawaran->detail_penawaran_tgl_proposal;
|
||||
$persetujuan_sla_resume = '...';
|
||||
@@ -201,10 +218,19 @@ use Illuminate\Support\Facades\Auth;
|
||||
$persetujuan_sla_resume = $sla_resume_text.' ('.$sla_resume_text_terbilang.')';
|
||||
$persetujuan_sla_final = $sla_final_text.' ('.$sla_final_text_terbilang.')';
|
||||
|
||||
|
||||
if($penawaran->penilaian_waktu_penilain)
|
||||
{
|
||||
$jangka_waktu_date_start=Carbon::parse($penawaran->penilaian_waktu_penilain)->addDays(1)->format('d F Y');
|
||||
$jangka_waktu_date_end=Carbon::parse($penawaran->persetujuan->sla_final)->format('d F Y');
|
||||
// Jangka Waktu
|
||||
// date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final)
|
||||
$jangka_waktu=$jangka_waktu_date_start.' - '.$jangka_waktu_date_end;
|
||||
// Jangka Waktu
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
return view('lpj::spk.edit', compact('data', 'penawaran', 'persetujuan_no_proposal', 'persetujuan_tgl_proposal', 'persetujuan_sla_resume', 'persetujuan_sla_final'));
|
||||
return view('lpj::spk.edit', compact('data', 'penawaran', 'persetujuan_no_proposal', 'persetujuan_tgl_proposal', 'persetujuan_sla_resume', 'persetujuan_sla_final', 'jangka_waktu'));
|
||||
}
|
||||
|
||||
public function update(Request $request, $id): JsonResponse
|
||||
@@ -218,6 +244,7 @@ use Illuminate\Support\Facades\Auth;
|
||||
$penawaran = PenawaranTender::leftJoin('detail_penawaran', 'detail_penawaran.penawaran_id','=','penawaran.id')
|
||||
->leftJoin('jenis_laporan', 'jenis_laporan.id','=','penawaran.jenis_laporan_id')
|
||||
->leftJoin('kjpp', 'kjpp.id','=','detail_penawaran.kjpp_rekanan_id')
|
||||
->leftJoin('penilaian', 'penilaian.nomor_registrasi','=','penawaran.nomor_registrasi')
|
||||
->where('detail_penawaran.status','=',1)
|
||||
->where('penawaran.id','=', $id)
|
||||
->select('penawaran.*', 'detail_penawaran.attachment as attachmentku',
|
||||
@@ -227,7 +254,8 @@ use Illuminate\Support\Facades\Auth;
|
||||
'kjpp.name as kjpp_name',
|
||||
'kjpp.address as kjpp_address',
|
||||
'jenis_laporan.name as jenis_laporan_name',
|
||||
'jenis_laporan.code as jenis_laporan_code'
|
||||
'jenis_laporan.code as jenis_laporan_code',
|
||||
'penilaian.waktu_penilaian as penilaian_waktu_penilain'
|
||||
)->first();
|
||||
|
||||
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
|
||||
@@ -237,6 +265,11 @@ use Illuminate\Support\Facades\Auth;
|
||||
|
||||
$data = $permohonan->with(['user', 'debiture', 'branch', 'tujuanPenilaian','dokumenjaminan'])->first();
|
||||
|
||||
// Jangka Waktu
|
||||
// date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final)
|
||||
$jangka_waktu='';
|
||||
// Jangka Waktu
|
||||
|
||||
if($penawaran->detail_penawaran_tgl_proposal)
|
||||
$penawaran->detail_penawaran_tgl_proposal = Carbon::parse($penawaran->detail_penawaran_tgl_proposal)->format('d F Y');
|
||||
|
||||
@@ -252,6 +285,7 @@ use Illuminate\Support\Facades\Auth;
|
||||
|
||||
// update table penawaran
|
||||
$dataPenawaran['spk_dokumen_path'] = $newFileNameWithPath;
|
||||
// $spk_no_last=$penawaran->spk_no;
|
||||
if(!$penawaran->spk_no)
|
||||
{
|
||||
$spk_no_last = onLastnumberCodePenawaranSPK($penawaran->jenis_laporan_code);
|
||||
@@ -264,10 +298,23 @@ use Illuminate\Support\Facades\Auth;
|
||||
$penawaran->spk_no = $spk_no_last;
|
||||
|
||||
}
|
||||
|
||||
// pengecekan perubahan jenis report
|
||||
$spk_no_old=$penawaran->spk_no;
|
||||
$array_no_last = explode("/",$spk_no_old);
|
||||
$jenis_report_old=trim($array_no_last[4]);
|
||||
if($jenis_report_old!=$penawaran->jenis_laporan_code)
|
||||
{
|
||||
$penawaran_spk_no_new=str_replace($jenis_report_old,$penawaran->jenis_laporan_code,$spk_no_old);
|
||||
$penawaran->spk_no=$penawaran_spk_no_new;
|
||||
$dataPenawaran['spk_no'] = $penawaran_spk_no_new;
|
||||
}
|
||||
// pengecekan perubahan jenis report
|
||||
|
||||
$penawaranM = PenawaranTender::find($penawaran->id);
|
||||
$penawaranM->update($dataPenawaran);
|
||||
// update table penawaran
|
||||
|
||||
|
||||
// pdf path
|
||||
$spkpenawaran_path = Storage::url($newFileNameWithPath);
|
||||
|
||||
@@ -287,11 +334,22 @@ use Illuminate\Support\Facades\Auth;
|
||||
$persetujuan_tgl_proposal = Carbon::parse($penawaran->persetujuan->tanggal_proposal_penawaran)->format('d F Y');
|
||||
$persetujuan_sla_resume = $sla_resume_text.' ('.$sla_resume_text_terbilang.')';
|
||||
$persetujuan_sla_final = $sla_final_text.' ('.$sla_final_text_terbilang.')';
|
||||
|
||||
if($penawaran->penilaian_waktu_penilain)
|
||||
{
|
||||
$jangka_waktu_date_start=Carbon::parse($penawaran->penilaian_waktu_penilain)->addDays(1)->format('d F Y');
|
||||
$jangka_waktu_date_end=Carbon::parse($penawaran->persetujuan->sla_final)->format('d F Y');
|
||||
// Jangka Waktu
|
||||
// date_start (penilaian.waktu_penilain + 1 day) - date_end (persetujuan_penawaran.sla_final)
|
||||
$jangka_waktu=$jangka_waktu_date_start.' - '.$jangka_waktu_date_end;
|
||||
// Jangka Waktu
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
$pdf =Pdf::loadView('lpj::spk.documentSPK', compact('data', 'penawaran', 'persetujuan_no_proposal', 'persetujuan_tgl_proposal', 'persetujuan_sla_resume', 'persetujuan_sla_final'));
|
||||
$pdf =Pdf::loadView('lpj::spk.documentSPK', compact('data', 'penawaran', 'persetujuan_no_proposal', 'persetujuan_tgl_proposal', 'persetujuan_sla_resume', 'persetujuan_sla_final', 'jangka_waktu'));
|
||||
$pdf->setPaper('A4', 'portrait');
|
||||
$content = $pdf->download()->getOriginalContent();
|
||||
Storage::put('public/'.$newFileNameWithPath,$content);
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
<tr>
|
||||
<td>Jangka Waktu</td>
|
||||
<td>:</td>
|
||||
<td><span style="color: red;"> </span></td>
|
||||
<td><span style="color: red;"> {{ $jangka_waktu }}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="text-align: center;">i</td>
|
||||
|
||||
@@ -138,7 +138,7 @@
|
||||
<tr>
|
||||
<td>Jangka Waktu</td>
|
||||
<td>:</td>
|
||||
<td><span style="color: red;"> </span></td>
|
||||
<td><span style="color: red;"> {{ $jangka_waktu }}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="text-align: center;">i</td>
|
||||
|
||||
Reference in New Issue
Block a user