diff --git a/app/Http/Controllers/Qma/ActivityLogController.php b/app/Http/Controllers/Qma/ActivityLogController.php
index 276ee78..e053168 100644
--- a/app/Http/Controllers/Qma/ActivityLogController.php
+++ b/app/Http/Controllers/Qma/ActivityLogController.php
@@ -19,11 +19,19 @@ class ActivityLogController extends Controller
$query = VehicleActivity::with(['vehicle', 'driver', 'gate', 'securityGuard'])
->latest('recorded_at');
- // Filter Rentang Tanggal
- if ($request->filled('start_date') && $request->filled('end_date')) {
- $startDate = Carbon::parse($request->input('start_date'))->startOfDay();
- $endDate = Carbon::parse($request->input('end_date'))->endOfDay();
- $query->whereBetween('recorded_at', [$startDate, $endDate]);
+ // Filter Rentang Tanggal (Default Hari Ini)
+ $today = Carbon::today()->toDateString();
+ $startDate = $request->input('start_date', $today);
+ $endDate = $request->input('end_date', $today);
+
+ if ($startDate && $endDate) {
+ $start = Carbon::parse($startDate)->startOfDay();
+ $end = Carbon::parse($endDate)->endOfDay();
+ $query->whereBetween('recorded_at', [$start, $end]);
+ } elseif ($startDate) {
+ $query->where('recorded_at', '>=', Carbon::parse($startDate)->startOfDay());
+ } elseif ($endDate) {
+ $query->where('recorded_at', '<=', Carbon::parse($endDate)->endOfDay());
}
// Filter Gerbang
@@ -59,7 +67,7 @@ class ActivityLogController extends Controller
$activities = $query->paginate(20)->withQueryString();
$gates = Gate::where('is_active', true)->orderBy('name')->get();
- return view('qma.activity_log', compact('activities', 'gates'));
+ return view('qma.activity_log', compact('activities', 'gates', 'startDate', 'endDate'));
}
/**
diff --git a/resources/views/qma/activity_log.blade.php b/resources/views/qma/activity_log.blade.php
index 2c8d0f3..2e13a8f 100644
--- a/resources/views/qma/activity_log.blade.php
+++ b/resources/views/qma/activity_log.blade.php
@@ -112,7 +112,7 @@
@@ -124,7 +124,7 @@
diff --git a/tests/Feature/VehicleActivityTest.php b/tests/Feature/VehicleActivityTest.php
index 1e98a7e..68cb008 100644
--- a/tests/Feature/VehicleActivityTest.php
+++ b/tests/Feature/VehicleActivityTest.php
@@ -203,6 +203,16 @@ class VehicleActivityTest extends TestCase
$responseFiltered->assertSee('Reset Filter', false);
}
+ public function test_qma_log_defaults_date_filter_to_today(): void
+ {
+ $qmaAdmin = User::where('role', 'qma_admin')->first();
+ $today = Carbon::today()->toDateString();
+
+ $response = $this->actingAs($qmaAdmin)->get('/qma/activity-log');
+ $response->assertStatus(200);
+ $response->assertSee('value="' . $today . '"', false);
+ }
+
public function test_admin_pg_can_store_security_guard_and_creates_login_account(): void
{
$adminPg = User::where('role', 'pg_admin')->first();