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

Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

Browse Source
This commit is contained in:
rahmatrafli1
2025-05-07 15:13:34 +07:00
parent 6ad34ee019 e731e9cea0
commit 1c35d932d3
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@
$pageCount = ceil($totalRecords / $request->get('size')); $pageCount = ceil($totalRecords / $request->get('size'));
// Calculate the current page number // Calculate the current page number
$currentPage = $request->get('page', 1); $currentPage = $request->get('page') ?: 1;
// Return the response data as a JSON object // Return the response data as a JSON object
return response()->json([ return response()->json([

14
resources/views/laporan_hasil_penilaian_jaminan_internal_external/index.blade.php
View File

@@ -219,10 +219,19 @@
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody data-datatable-body="true">
</tbody>
</table> </table>
</div> </div>
<div class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
<div class="flex items-center gap-2">
Show
<select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
</div>
<div class="flex items-center gap-4">
<span data-datatable-info="true"> </span>
<div class="pagination" data-datatable-pagination="true">
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -437,6 +446,7 @@
// Update export URL with filters // Update export URL with filters
function updateExportUrl() { function updateExportUrl() {
dataTable.goPage(1);
let url = new URL(exportBtn.href); let url = new URL(exportBtn.href);
if (startDateInput.value) { if (startDateInput.value) {