From 4cc0366fbacf0373ff1e5862abb0acc319fe6d9f Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Wed, 23 Apr 2025 18:44:13 +0530 Subject: [PATCH] hourly production chart updated --- app/Filament/Widgets/ItemOverview.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/Filament/Widgets/ItemOverview.php b/app/Filament/Widgets/ItemOverview.php index ea9ddad23..d61db4101 100644 --- a/app/Filament/Widgets/ItemOverview.php +++ b/app/Filament/Widgets/ItemOverview.php @@ -31,13 +31,17 @@ class ItemOverview extends ChartWidget } if ($activeFilter === 'yesterday') { - $startDate = now()->subDay()->startOfDay(); - $endDate = now()->subDay()->endOfDay(); + $startDate = now()->subDay()->setTime(8, 0, 0); // yesterday 8:00 AM + $endDate = now()->setTime(8, 0, 0); // today 8:00 AM $groupBy = 'EXTRACT(HOUR FROM production_quantities.created_at)'; } else if ($activeFilter === 'this_week') { - $startDate = now()->startOfWeek(); // Monday 12:00 AM - $endDate = now()->endOfWeek(); // Sunday 11:59 PM + // Monday 8:00 AM of the current week + $startDate = now()->startOfWeek()->setTime(8, 0, 0); + + // Next Monday 8:00 AM (end of Sunday + 8 hrs) + $endDate = now()->endOfWeek()->addDay()->setTime(8, 0, 0); + $groupBy = 'EXTRACT(DOW FROM production_quantities.created_at)'; // Group by day of week } else if ($activeFilter === 'this_month') { @@ -47,8 +51,8 @@ class ItemOverview extends ChartWidget } else { - $startDate = now()->startOfDay(); - $endDate = now()->endOfDay(); + $startDate = now()->setTime(8, 0, 0); // today at 8:00 AM + $endDate = now()->copy()->addDay()->setTime(8, 0, 0); // tomorrow at 8:00 AM $groupBy = 'EXTRACT(HOUR FROM production_quantities.created_at)'; }