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

fix(spk): perbaiki penanganan data dan tampilan KJPP

Browse Source 
- 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:
Daeng Deni Mardaeni
2025-03-06 07:48:29 +07:00
parent 90be8d5730
commit 14ac13551b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/SpkController.php
View File

@@ -158,7 +158,7 @@ use Illuminate\Support\Facades\Auth;
$penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name; $penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name;
$penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code; $penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code;
$penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name; $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) $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id') ->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_name = $penawaran->jenisLaporan->name;
$penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code; $penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code;
$penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name; $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) $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id') ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')

6
resources/views/spk/documentSPK.blade.php
View File

@@ -60,7 +60,7 @@
</center> </center>
<br> <br>
<h3>Kepada</h3> <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> <p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p>
<br/> <br/>
<br/> <br/>
@@ -237,8 +237,8 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->name }}</span><br> <span style="color: red;">{{ getUser($penawaran->authorized_by)->name }}</span><br>
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->getRoleNames()[0] }}</span> <span style="color: red;">{{ getUser($penawaran->authorized_by)->getRoleNames()[0] }}</span>
</td> </td>
<td align="center">(……………………………………..)</td> <td align="center">(……………………………………..)</td>
</tr> </tr>

6
resources/views/spk/edit.blade.php
View File

@@ -76,7 +76,7 @@
</center> </center>
<br> <br>
<h3>Kepada</h3> <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> <p style="color: red; margin-left:25px">{{ $penawaran->kjpp_address }}</p>
<br/> <br/>
<br/> <br/>
@@ -258,8 +258,8 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->name }}</span><br> <span style="color: red;">{{ getUser($penawaran->authorized_by)->name }}</span><br>
<span style="color: red;">{{ $penawaran->persetujuan_penawaran->creator->getRoleNames()[0] }}</span> <span style="color: red;">{{ getUser($penawaran->authorized_by)->getRoleNames()[0] }}</span>
</td> </td>
<td align="center">(……………………………………..)</td> <td align="center">(……………………………………..)</td>
</tr> </tr>