fix(spk): perbaiki penanganan data dan tampilan KJPP
- Tambahkan penanganan default untuk waktu penilaian yang mungkin null. - Ubah tampilan nama KJPP di dokumen SPK dan halaman edit untuk menambahkan label "KJPP". - Ganti pengambilan nama dan peran creator persetujuan penawaran dengan fungsi getUser untuk meningkatkan keterbacaan.
This commit is contained in:
@@ -158,7 +158,7 @@ use Illuminate\Support\Facades\Auth;
|
||||
$penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name;
|
||||
$penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code;
|
||||
$penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name;
|
||||
$penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian;
|
||||
$penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian ?? "";
|
||||
|
||||
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
|
||||
->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
|
||||
@@ -244,7 +244,7 @@ use Illuminate\Support\Facades\Auth;
|
||||
$penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name;
|
||||
$penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code;
|
||||
$penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name;
|
||||
$penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian;
|
||||
$penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian ?? "";
|
||||
|
||||
$permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
|
||||
->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
</center>
|
||||
<br>
|
||||
<h3>Kepada</h3>
|
||||
<p style="color: red; margin-left:25px">{{ $penawaran->kjpp_name }}</p>
|
||||
<p style="color: red; margin-left:25px">KJPP {{ $penawaran->kjpp_name }}</p>
|
||||
<p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p>
|
||||
<br/>
|
||||
<br/>
|
||||
@@ -237,8 +237,8 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->name }}</span><br>
|
||||
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->getRoleNames()[0] }}</span>
|
||||
<span style="color: red;">{{ getUser($penawaran->authorized_by)->name }}</span><br>
|
||||
<span style="color: red;">{{ getUser($penawaran->authorized_by)->getRoleNames()[0] }}</span>
|
||||
</td>
|
||||
<td align="center">(……………………………………..)</td>
|
||||
</tr>
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
</center>
|
||||
<br>
|
||||
<h3>Kepada</h3>
|
||||
<p style="color: red; margin-left:25px">{{ $penawaran->kjpp_name }}</p>
|
||||
<p style="color: red; margin-left:25px">KJPP {{ $penawaran->kjpp_name }}</p>
|
||||
<p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p>
|
||||
<br/>
|
||||
<br/>
|
||||
@@ -258,8 +258,8 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->name }}</span><br>
|
||||
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->getRoleNames()[0] }}</span>
|
||||
<span style="color: red;">{{ getUser($penawaran->authorized_by)->name }}</span><br>
|
||||
<span style="color: red;">{{ getUser($penawaran->authorized_by)->getRoleNames()[0] }}</span>
|
||||
</td>
|
||||
<td align="center">(……………………………………..)</td>
|
||||
</tr>
|
||||
|
||||
Reference in New Issue
Block a user