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

update print out

Browse Source
This commit is contained in:
majid
2024-12-23 16:27:49 +07:00
parent f5ef883a0d
commit 886e75da82
14 changed files with 896 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ use Modules\Lpj\Models\HubunganPenghuniJaminan;
use Modules\Lpj\Models\AnalisaUnit;
use Modules\Lpj\Models\GolonganMasySekitar;
use Modules\Lpj\Models\TingkatKeramaian;
use Modules\Lpj\Models\TujuanPenilaian;
use Modules\Lpj\Models\LaluLintasLokasi;
use Modules\Lpj\Models\SpekBagunanAnalisaDetail;
use Modules\Lpj\Http\Requests\SurveyorRequest;
@@ -787,9 +788,13 @@ class SurveyorController extends Controller
}
// Fields lainnya dalam asset
else {
if (!isset($dataForm['asset'][$field])) {
$dataForm['asset'][$field] = [];
}
$dataForm['asset'][$field] = $newValue;
}
$needsSave = true;
}
}
@@ -1526,7 +1531,13 @@ class SurveyorController extends Controller
$filteredRecords = $query->count();
// Get the data for the current page
$data = $query->get();
if ($type == 'Spek Bangunan') {
$data = $query->with(['bangunanKategori'])->get();
}else{
$data = $query->get();
}
// Calculate the page count
$pageCount = ceil($totalRecords / $request->get('size'));
@@ -1534,6 +1545,7 @@ class SurveyorController extends Controller
// Calculate the current page number
$currentPage = 0 + 1;
// Return the response data as a JSON object
return response()->json([
'draw' => $request->get('draw'),
@@ -1663,6 +1675,7 @@ class SurveyorController extends Controller
'hubPenghuni' => HubunganPenghuniJaminan::all(),
'perkerasanJalan' => PerkerasanJalan::all(),
'terletakDiArea' => TerletakArea::all(),
'tujuanPenilaian' => TujuanPenilaian::all()
];
}