diff --git a/app/Http/Controllers/P2h/P2hFormController.php b/app/Http/Controllers/P2h/P2hFormController.php index 7b667ab..64647c5 100644 --- a/app/Http/Controllers/P2h/P2hFormController.php +++ b/app/Http/Controllers/P2h/P2hFormController.php @@ -32,11 +32,19 @@ class P2hFormController extends Controller if ($request->filled('search')) { $search = trim($request->input('search')); - $query->where(function ($q) use ($search) { + $cleanSearch = preg_replace('/[^a-zA-Z0-9]/', '', $search); + + $query->where(function ($q) use ($search, $cleanSearch) { $q->where('code', 'like', "%{$search}%") ->orWhere('brand_type', 'like', "%{$search}%") ->orWhere('unit_category', 'like', "%{$search}%") - ->orWhere('location', 'like', "%{$search}%"); + ->orWhere('location', 'like', "%{$search}%") + ->orWhere('license_plate', 'like', "%{$search}%"); + + if (!empty($cleanSearch)) { + $q->orWhereRaw("REPLACE(REPLACE(code, ' ', ''), '-', '') LIKE ?", ["%{$cleanSearch}%"]) + ->orWhereRaw("REPLACE(REPLACE(license_plate, ' ', ''), '-', '') LIKE ?", ["%{$cleanSearch}%"]); + } }); } diff --git a/app/Http/Controllers/Public/VehicleActivityFormController.php b/app/Http/Controllers/Public/VehicleActivityFormController.php index 2724a84..c49f92c 100644 --- a/app/Http/Controllers/Public/VehicleActivityFormController.php +++ b/app/Http/Controllers/Public/VehicleActivityFormController.php @@ -35,11 +35,19 @@ class VehicleActivityFormController extends Controller if ($request->filled('search')) { $search = trim($request->input('search')); - $query->where(function ($q) use ($search) { + $cleanSearch = preg_replace('/[^a-zA-Z0-9]/', '', $search); + + $query->where(function ($q) use ($search, $cleanSearch) { $q->where('code', 'like', "%{$search}%") ->orWhere('brand_type', 'like', "%{$search}%") ->orWhere('license_plate', 'like', "%{$search}%") - ->orWhere('ownership', 'like', "%{$search}%"); + ->orWhere('ownership', 'like', "%{$search}%") + ->orWhere('unit_category', 'like', "%{$search}%"); + + if (!empty($cleanSearch)) { + $q->orWhereRaw("REPLACE(REPLACE(code, ' ', ''), '-', '') LIKE ?", ["%{$cleanSearch}%"]) + ->orWhereRaw("REPLACE(REPLACE(license_plate, ' ', ''), '-', '') LIKE ?", ["%{$cleanSearch}%"]); + } }); } diff --git a/app/Http/Controllers/Qma/SupportTimesheetController.php b/app/Http/Controllers/Qma/SupportTimesheetController.php index 4ec69af..28940af 100644 --- a/app/Http/Controllers/Qma/SupportTimesheetController.php +++ b/app/Http/Controllers/Qma/SupportTimesheetController.php @@ -85,17 +85,24 @@ class SupportTimesheetController extends Controller // Filter Pencarian Kata Kunci if ($request->filled('search')) { $search = trim($request->input('search')); - $query->where(function (Builder $q) use ($search) { + $cleanSearch = preg_replace('/[^a-zA-Z0-9]/', '', $search); + + $query->where(function (Builder $q) use ($search, $cleanSearch) { $q->where('timesheet_no', 'like', "%{$search}%") ->orWhere('location', 'like', "%{$search}%") ->orWhere('activity_type', 'like', "%{$search}%") ->orWhere('task_description', 'like', "%{$search}%") ->orWhere('notes', 'like', "%{$search}%") - ->orWhereHas('vehicle', function (Builder $vq) use ($search) { + ->orWhereHas('vehicle', function (Builder $vq) use ($search, $cleanSearch) { $vq->where('code', 'like', "%{$search}%") ->orWhere('brand_type', 'like', "%{$search}%") ->orWhere('license_plate', 'like', "%{$search}%") ->orWhere('serial_number', 'like', "%{$search}%"); + + if (!empty($cleanSearch)) { + $vq->orWhereRaw("REPLACE(REPLACE(code, ' ', ''), '-', '') LIKE ?", ["%{$cleanSearch}%"]) + ->orWhereRaw("REPLACE(REPLACE(license_plate, ' ', ''), '-', '') LIKE ?", ["%{$cleanSearch}%"]); + } }) ->orWhereHas('operator', function (Builder $oq) use ($search) { $oq->where('name', 'like', "%{$search}%") diff --git a/resources/views/mobilisasi/index.blade.php b/resources/views/mobilisasi/index.blade.php index c50c3a0..79370ae 100644 --- a/resources/views/mobilisasi/index.blade.php +++ b/resources/views/mobilisasi/index.blade.php @@ -52,9 +52,9 @@