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

Fix Master Province

Browse Source
This commit is contained in:
Daeng Deni Mardaeni 2024-08-09 15:02:27 +07:00
parent aa3289bd56
commit 5f95adddd5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exports/ProvincesExport.php
View File

@ -35,7 +35,7 @@ class ProvincesExport implements WithColumnFormatting, WithHeadings, FromCollect
public function columnFormats(): array{ public function columnFormats(): array{
return [ return [
'A' => \PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_NUMBER, 'A' => \PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_NUMBER,
'C' => \PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME 'D' => \PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_DATE_DATETIME
]; ];
} }
} }

7
app/Http/Controllers/ProvincesController.php
View File

@ -79,7 +79,8 @@ class ProvincesController extends Controller
if ($request->has('search') && !empty($request->get('search'))) { if ($request->has('search') && !empty($request->get('search'))) {
$search = $request->get('search'); $search = $request->get('search');
$query->where(function ($q) use ($search) { $query->where(function ($q) use ($search) {
$q->where('name', 'LIKE', "%$search%"); $q->where('code', 'LIKE', "%$search%");
$q->orWhere('name', 'LIKE', "%$search%");
}); });
} }
@ -106,7 +107,7 @@ class ProvincesController extends Controller
$filteredRecords = $query->count(); $filteredRecords = $query->count();
// Get the data for the current page // Get the data for the current page
$roles = $query->get(); $provinces = $query->get();
// Calculate the page count // Calculate the page count
$pageCount = ceil($totalRecords/$request->get('size')); $pageCount = ceil($totalRecords/$request->get('size'));
@ -122,7 +123,7 @@ class ProvincesController extends Controller
'pageCount' => $pageCount, 'pageCount' => $pageCount,
'page' => $currentPage, 'page' => $currentPage,
'totalCount' => $totalRecords, 'totalCount' => $totalRecords,
'data' => $roles, 'data' => $provinces,
]); ]);
} }

2
routes/web.php
View File

@ -17,7 +17,7 @@ use Modules\Location\Http\Controllers\LocationController;
Route::middleware(['auth'])->group(function () { Route::middleware(['auth'])->group(function () {
Route::name('locations.')->prefix('locations')->group(function () { Route::name('locations.')->prefix('locations')->group(function () {
Route::name('provinces.')->prefix('roles')->group(function () { Route::name('provinces.')->prefix('provinces')->group(function () {
Route::get('restore/{id}', [ProvincesController::class, 'restore'])->name('restore'); Route::get('restore/{id}', [ProvincesController::class, 'restore'])->name('restore');
Route::get('datatables', [ProvincesController::class, 'dataForDatatables'])->name('datatables'); Route::get('datatables', [ProvincesController::class, 'dataForDatatables'])->name('datatables');
Route::get('export', [ProvincesController ::class, 'export'])->name('export'); Route::get('export', [ProvincesController ::class, 'export'])->name('export');