diff --git a/app/Filament/Widgets/ItemOverview.php b/app/Filament/Widgets/ItemOverview.php index a0a81adb2..f7884fb3e 100644 --- a/app/Filament/Widgets/ItemOverview.php +++ b/app/Filament/Widgets/ItemOverview.php @@ -34,129 +34,96 @@ class ItemOverview extends ChartWidget ]; } - if ($activeFilter === 'yesterday') { - $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)'; - } + // Determine if line is FG Line + $line = \App\Models\Line::find($selectedLine); + $isFgLine = $line?->type == 'FG Line'; - else if ($activeFilter === 'this_week') { - // Monday 8:00 AM of the current week + // Set date range and groupBy logic + if ($activeFilter == 'yesterday') + { + $startDate = now()->subDay()->setTime(8, 0, 0); + $endDate = now()->setTime(8, 0, 0); + $groupBy = 'EXTRACT(HOUR FROM created_at)'; + } + elseif ($activeFilter == 'this_week') + { $startDate = now()->startOfWeek()->setTime(8, 0, 0); - $endDate = now()->endOfWeek()->addDay()->setTime(8, 0, 0); - - $groupBy = 'EXTRACT(DOW FROM production_quantities.created_at)'; // Group by day of week + $groupBy = 'EXTRACT(DOW FROM created_at)'; } - else if ($activeFilter === 'this_month') { + elseif ($activeFilter == 'this_month') + { $startDate = now()->startOfMonth(); $endDate = now()->endOfMonth(); - $groupBy = "FLOOR((EXTRACT(DAY FROM production_quantities.created_at) - 1) / 7) + 1"; + $groupBy = "FLOOR((EXTRACT(DAY FROM created_at) - 1) / 7) + 1"; } else { - $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)'; - + $startDate = now()->setTime(8, 0, 0); + $endDate = now()->copy()->addDay()->setTime(8, 0, 0); + $groupBy = 'EXTRACT(HOUR FROM created_at)'; } - $query = \DB::table('production_quantities') - ->join('plants', 'production_quantities.plant_id', '=', 'plants.id') //inner join - ->join('lines', 'production_quantities.line_id', '=', 'lines.id') - ->selectRaw("$groupBy AS time_unit, count(*) AS total_quantity") - //->whereBetween('production_quantities.created_at', [$startDate, $endDate]) - ->where('production_quantities.created_at', '>=', $startDate) // $startDate should be >= - ->where('production_quantities.created_at', '<', $endDate) // $endDate should be < - ->when($selectedPlant, function ($q) use ($selectedPlant) { - return $q->where('plants.id', $selectedPlant); - }) - ->when($selectedLine, function ($q) use ($selectedLine) { - return $q->where('lines.id', $selectedLine); - }) + $baseTable = $isFgLine ? 'quality_validations' : 'production_quantities'; - ->groupByRaw($groupBy) - ->orderByRaw($groupBy) - ->pluck('total_quantity', 'time_unit') - ->toArray(); + $query = \DB::table($baseTable) + ->selectRaw("$groupBy AS time_unit, COUNT(*) AS total_quantity") + ->where('created_at', '>=', $startDate) + ->where('created_at', '<', $endDate) + ->where('plant_id', $selectedPlant) + ->where('line_id', $selectedLine) + ->groupByRaw($groupBy) + ->orderByRaw($groupBy) + ->pluck('total_quantity', 'time_unit') + ->toArray(); + if ($activeFilter == 'this_month') + { + $weeksCount = ceil($endDate->day / 7); + $allWeeks = array_fill(1, $weeksCount, 0); + $data = array_replace($allWeeks, $query); - if ($activeFilter === 'this_month') { - $weeksCount = ceil($endDate->day / 7); // Calculate total weeks dynamically - $allWeeks = array_fill(1, $weeksCount, 0); // Initialize all weeks with 0 - $data = array_replace($allWeeks, $query); // Fill missing weeks with 0 - - // Generate dynamic week labels - $labels = []; - for ($i = 1; $i <= $weeksCount; $i++) { - $weekStart = $startDate->copy()->addDays(($i - 1) * 7)->format('d M'); - $weekEnd = $startDate->copy()->addDays($i * 7 - 1)->min($endDate)->format('d M'); - $labels[] = "Week $i ($weekStart - $weekEnd)"; - } - - $orderedData = array_values($data); + $labels = []; + for ($i = 1; $i <= $weeksCount; $i++) { + $weekStart = $startDate->copy()->addDays(($i - 1) * 7)->format('d M'); + $weekEnd = $startDate->copy()->addDays($i * 7 - 1)->min($endDate)->format('d M'); + $labels[] = "Week $i ($weekStart - $weekEnd)"; } - else if ($activeFilter === 'this_week') { - // Correct week labels: ['Mon', 'Tue', ..., 'Sun'] - $labels = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; - // Initialize default data for all 7 days - $data = array_fill(0, 7, 0); - - // Fill in data from query results - foreach ($query as $dow => $count) { - $data[$dow] = $count; - } - - // Ensure days are ordered from Monday to Sunday - $orderedData = [ - $data[1] ?? 0, // Monday - $data[2] ?? 0, // Tuesday - $data[3] ?? 0, // Wednesday - $data[4] ?? 0, // Thursday - $data[5] ?? 0, // Friday - $data[6] ?? 0, // Saturday - $data[0] ?? 0, // Sunday (move to last) - ]; + $orderedData = array_values($data); + } + elseif ($activeFilter == 'this_week') + { + $labels = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; + $data = array_fill(0, 7, 0); + foreach ($query as $dow => $count) { + $data[$dow] = $count; } - else if($activeFilter === 'yesterday') - { - - // Hourly data (same as before) - $allHours = array_fill(0, 24, 0); - $data = array_replace($allHours, $query); - - // Shift hours for proper display (8 AM to 7 AM) - $shiftedKeys = array_merge(range(8, 23), range(0, 7)); - $orderedData = array_map(fn($hour) => $data[$hour], $shiftedKeys); - - // Labels: ["8 AM", "9 AM", ..., "7 AM"] - $labels = array_map(fn ($hour) => date("g A", strtotime("$hour:00")), $shiftedKeys); + $orderedData = [ + $data[1] ?? 0, $data[2] ?? 0, $data[3] ?? 0, + $data[4] ?? 0, $data[5] ?? 0, $data[6] ?? 0, + $data[0] ?? 0, + ]; } else { - - // Hourly data (same as before) $allHours = array_fill(0, 24, 0); $data = array_replace($allHours, $query); - // Shift hours for proper display (8 AM to 7 AM) $shiftedKeys = array_merge(range(8, 23), range(0, 7)); $orderedData = array_map(fn($hour) => $data[$hour], $shiftedKeys); - // Labels: ["8 AM", "9 AM", ..., "7 AM"] $labels = array_map(fn ($hour) => date("g A", strtotime("$hour:00")), $shiftedKeys); } - return [ 'datasets' => [ [ 'label' => match ($activeFilter) { - 'this_week' => "Daily Production This Week", - 'this_month' => "Weekly Production This Month", // Updated Label - 'yesterday' => "Yesterday's Hourly Production", - default => "Today's Hourly Production", + 'this_week' => $isFgLine ? 'Daily FG Count This Week' : 'Daily Production This Week', + 'this_month' => $isFgLine ? 'Weekly FG Count This Month' : 'Weekly Production This Month', + 'yesterday' => $isFgLine ? "Yesterday's FG Count" : "Yesterday's Hourly Production", + default => $isFgLine ? "Today's FG Count" : "Today's Hourly Production", }, 'data' => $orderedData, 'interaction' => [ @@ -195,32 +162,6 @@ class ItemOverview extends ChartWidget } - // protected function getOptions(): array - // { - // return [ - // 'plugins' => [ - // 'datalabels' => [ - // 'color' => '#3490dc', - // 'font' => [ - // 'weight' => 'bold', - // 'size' => 14, - // ], - // 'backgroundColor' => 'rgba(255,255,255,0.8)', - // 'borderRadius' => 4, - // 'formatter' => \Illuminate\Support\Js::from( - // new Js('function(value, context) { - // if (Number(value) === 0) { - // return null; - // } - // return "Count: " + value; - // }') - // ), - // ] - // ] - // ]; - // } - - protected function getFilters(): ?array { return [