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

Merge remote-tracking branch 'composer/feature/senior-officer' into staging

Browse Source 
# Conflicts:
#	resources/views/component/kertas-kerja.blade.php
This commit is contained in:
Daeng Deni Mardaeni
2024-12-20 15:32:18 +07:00
parent 4b9685f14c 639bdfed98
commit 46fad96f7a
5 changed files with 132 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,8 +311,8 @@ class PenilaiController extends Controller
$data = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
// return view('lpj::component.kertas-kerja', compact('data'));
return Excel::download(new KertasKerjaExport($data), 'kertas-kerja.xlsx');
return view('lpj::component.kertas-kerja', compact('data'));
// return Excel::download(new KertasKerjaExport($data), 'kertas-kerja.xlsx');
}

2
app/Http/Controllers/SurveyorController.php
View File

@@ -478,7 +478,7 @@ class SurveyorController extends Controller
$dataPembanding = json_decode($inspeksi->data_pembanding, true);
// Get jenis jaminan to check if it needs denah
$jenisJaminan = JenisJaminan::find($inspeksi->jenis_jaminan_id);
$jenisJaminan = JenisJaminan::find($inspeksi->dokument_id);
$isTanahBangunan = !in_array(
strtoupper($jenisJaminan->name ?? ''),
['KAPAL', 'PESAWAT', 'KENDARAAN', 'ALAT BERAT']