poc/pds
1
0
Fork 1
Code Issues Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Removed commented text and Updated query functionality from DB to Model

Browse Source
This commit is contained in:
dhanabalan
2025-05-20 10:01:30 +05:30
parent 338449f3f8
commit ff75934526
1 changed files with 25 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

345
app/Filament/Widgets/InvoiceChart.php
View File

@@ -17,287 +17,6 @@ class InvoiceChart extends ChartWidget
protected $listeners = ['invoiceChart']; protected $listeners = ['invoiceChart'];
// protected function getData(): array
// {
// $selectedPlant = session('selec_plant');
// $selectedInvoice = session('select_invoice');
// $activeFilter = $this->filter;
// if (!$selectedPlant || !$selectedInvoice) {
// return [
// 'datasets' => [],
// 'labels' => [],
// ];
// }
// if ($activeFilter == 'yesterday') {
// $startDate = now()->subDay()->setTime(8, 0, 0);
// $endDate = now()->setTime(8, 0, 0);
// $groupBy = 'none'; // No grouping by hour
// } elseif ($activeFilter == 'this_week') {
// $startDate = now()->startOfWeek()->setTime(8, 0, 0);
// $endDate = now()->endOfWeek()->addDay()->setTime(8, 0, 0);
// $groupBy = 'day_of_week';
// } elseif ($activeFilter == 'this_month') {
// $startDate = now()->startOfMonth();
// $endDate = now()->endOfMonth();
// $groupBy = 'week_of_month';
// } else {
// $startDate = now()->setTime(8, 0, 0);
// $endDate = now()->copy()->addDay()->setTime(8, 0, 0);
// $groupBy = 'none'; // No grouping by hour
// }
// // Get fully scanned invoices
// if ($selectedInvoice == 'individual_material') {
// $allInvoiceNumbers = DB::table('invoice_validations')
// ->select('invoice_number')
// ->where('plant_id', $selectedPlant)
// ->where('quantity', 1)
// ->groupBy('invoice_number')
// ->pluck('invoice_number');
// $fullyScannedInvoiceNumbers = DB::table('invoice_validations')
// ->select('invoice_number')
// ->where('plant_id', $selectedPlant)
// ->where('quantity', 1)
// ->groupBy('invoice_number')
// ->havingRaw("SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END) = COUNT(*)")
// ->pluck('invoice_number');
// }
// else if($selectedInvoice == 'serial_invoice') {
// $allInvoiceNumbers = DB::table('invoice_validations')
// ->select('invoice_number')
// ->where('plant_id', $selectedPlant)
// ->whereNull('quantity')
// ->pluck('invoice_number');
// $fullyScannedInvoiceNumbers = DB::table('invoice_validations')
// ->select('invoice_number')
// ->where('plant_id', $selectedPlant)
// ->whereNull('quantity')
// ->groupBy('invoice_number')
// ->havingRaw("SUM(CASE WHEN scanned_status = 'Scanned' THEN 1 ELSE 0 END) = COUNT(*)")
// ->pluck('invoice_number');
// }
// if ($selectedInvoice == 'bundle_material') {
// //Get all invoice numbers that contain bundle materials
// $allInvoiceNumbers = DB::table('invoice_validations')
// ->select('invoice_number')
// ->where('plant_id', $selectedPlant)
// ->whereIn('invoice_number', function ($query) use ($selectedPlant) {
// $query->select('invoice_number')
// ->from('invoice_validations')
// ->where('plant_id', $selectedPlant)
// ->where('quantity', '>', 1);
// })
// ->groupBy('invoice_number')
// ->pluck('invoice_number');
// //Get fully scanned bundle invoices
// $fullyScannedBundle = DB::table('invoice_validations')
// ->select('invoice_number')
// ->where('plant_id', $selectedPlant)
// ->where('quantity', '>', 1)
// ->groupBy('invoice_number')
// ->havingRaw("SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END) = COUNT(*)")
// ->pluck('invoice_number');
// //Get individual invoice numbers
// $individualInvoices = DB::table('invoice_validations')
// ->select('invoice_number')
// ->where('plant_id', $selectedPlant)
// ->where('quantity', 1)
// ->groupBy('invoice_number')
// ->pluck('invoice_number');
// //Get fully scanned individual invoices
// $fullyScannedIndividual = DB::table('invoice_validations')
// ->select('invoice_number')
// ->where('plant_id', $selectedPlant)
// ->where('quantity', 1)
// ->groupBy('invoice_number')
// ->havingRaw("SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END) = COUNT(*)")
// ->pluck('invoice_number');
// //Find common invoices between bundle and individual
// $commonInvoices = $allInvoiceNumbers->intersect($individualInvoices);
// //Identify incomplete common invoices
// $notScannedInvoicesForBundle = $commonInvoices->filter(function ($invoice) use ($fullyScannedIndividual, $fullyScannedBundle) {
// return !($fullyScannedIndividual->contains($invoice) && $fullyScannedBundle->contains($invoice));
// });
// //Final fully scanned = only those that are scanned in both individual & bundle
// $fullyScannedInvoiceNumbers = $fullyScannedBundle->filter(function ($invoice) use ($fullyScannedIndividual) {
// return $fullyScannedIndividual->contains($invoice);
// });
// //Exclude invoices that should be marked as "not scanned"
// $fullyScannedInvoiceNumbers = $fullyScannedInvoiceNumbers->diff($notScannedInvoicesForBundle);
// //Calculate not scanned invoices = all - fully scanned
// $notScannedInvoiceNumbers = $allInvoiceNumbers->diff($fullyScannedInvoiceNumbers);
// }
// // Not scanned = all - scanned
// $notScannedInvoiceNumbers = $allInvoiceNumbers->diff($fullyScannedInvoiceNumbers);
// //Get timestamps
// $scannedTimestamps = DB::table('invoice_validations')
// ->selectRaw("MAX(updated_at) AS final_time, invoice_number")
// ->where('plant_id', $selectedPlant)
// ->whereIn('invoice_number', $fullyScannedInvoiceNumbers)
// ->whereBetween('updated_at', [$startDate, $endDate])
// ->groupBy('invoice_number')
// ->pluck('final_time', 'invoice_number');
// $notScannedTimestamps = DB::table('invoice_validations')
// ->selectRaw("MIN(created_at) AS first_time, invoice_number")
// ->where('plant_id', $selectedPlant)
// ->whereIn('invoice_number', $notScannedInvoiceNumbers)
// ->whereBetween('created_at', [$startDate, $endDate])
// ->groupBy('invoice_number')
// ->pluck('first_time', 'invoice_number');
// // // Group timestamps
// // $scannedGrouped = [];
// // $notScannedGrouped = [];
// // foreach ($scannedTimestamps as $timestamp) {
// // $time = \Carbon\Carbon::parse($timestamp);
// // if ($time->lt($startDate) || $time->gt($endDate)) continue;
// // $key = match ($groupBy) {
// // 'hour' => (int) $time->format('G'),
// // 'day_of_week' => (int) $time->dayOfWeek,
// // 'week_of_month' => (int) ceil($time->day / 7),
// // };
// // $scannedGrouped[$key] = ($scannedGrouped[$key] ?? 0) + 1;
// // }
// // foreach ($notScannedTimestamps as $timestamp) {
// // $time = \Carbon\Carbon::parse($timestamp);
// // if ($time->lt($startDate) || $time->gt($endDate)) continue;
// // $key = match ($groupBy) {
// // 'hour' => (int) $time->format('G'),
// // 'day_of_week' => (int) $time->dayOfWeek,
// // 'week_of_month' => (int) ceil($time->day / 7),
// // };
// // $notScannedGrouped[$key] = ($notScannedGrouped[$key] ?? 0) + 1;
// // }
// // // Build x-axis labels and data arrays
// // if ($groupBy == 'hour') {
// // $shiftedKeys = array_merge(range(8, 23), range(0, 7));
// // $labels = array_map(fn($h) => date("g A", strtotime("$h:00")), $shiftedKeys);
// // $scannedData = array_map(fn($h) => $scannedGrouped[$h] ?? 0, $shiftedKeys);
// // $notScannedData = array_map(fn($h) => $notScannedGrouped[$h] ?? 0, $shiftedKeys);
// // } elseif ($groupBy == 'day_of_week') {
// // $labels = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
// // $scannedData = array_fill(0, 7, 0);
// // $notScannedData = array_fill(0, 7, 0);
// // foreach ($scannedGrouped as $k => $v) $scannedData[$k] = $v;
// // foreach ($notScannedGrouped as $k => $v) $notScannedData[$k] = $v;
// // // Shift so Monday starts first
// // $scannedData = [$scannedData[1], $scannedData[2], $scannedData[3], $scannedData[4], $scannedData[5], $scannedData[6], $scannedData[0]];
// // $notScannedData = [$notScannedData[1], $notScannedData[2], $notScannedData[3], $notScannedData[4], $notScannedData[5], $notScannedData[6], $notScannedData[0]];
// // } else {
// // $weeksCount = ceil($endDate->day / 7);
// // $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)";
// // }
// // $scannedData = array_fill(1, $weeksCount, 0);
// // $notScannedData = array_fill(1, $weeksCount, 0);
// // foreach ($scannedGrouped as $k => $v) $scannedData[$k] = $v;
// // foreach ($notScannedGrouped as $k => $v) $notScannedData[$k] = $v;
// // $scannedData = array_values($scannedData);
// // $notScannedData = array_values($notScannedData);
// // }
// // return [
// // 'datasets' => [
// // [
// // 'label' => 'Scanned Invoices',
// // 'data' => $scannedData,
// // 'borderColor' => 'rgba(75, 192, 192, 1)',
// // 'backgroundColor' => 'rgba(23, 211, 80, 0.7)',
// // 'fill' => false,
// // 'tension' => 0.3,
// // ],
// // [
// // 'label' => 'Not Scanned Invoices',
// // 'data' => $notScannedData,
// // 'borderColor' => 'rgba(255, 99, 132, 1)',
// // 'backgroundColor' => 'rgba(214, 105, 32, 0.9)',
// // 'fill' => false,
// // 'tension' => 0.3,
// // ],
// // ],
// // 'labels' => $labels,
// // ];
// // Group timestamps
// // Build x-axis labels and data arrays
// $scannedGrouped = [];
// $notScannedGrouped = [];
// foreach ($scannedTimestamps as $timestamp) {
// $time = \Carbon\Carbon::parse($timestamp);
// if ($time->lt($startDate) || $time->gt($endDate)) continue;
// $key = match ($groupBy) {
// 'hour' => (int) $time->format('G'),
// 'day_of_week' => (int) $time->dayOfWeek,
// 'week_of_month' => (int) ceil($time->day / 7),
// };
// $scannedGrouped[$key] = ($scannedGrouped[$key] ?? 0) + 1;
// }
// foreach ($notScannedTimestamps as $timestamp) {
// $time = \Carbon\Carbon::parse($timestamp);
// if ($time->lt($startDate) || $time->gt($endDate)) continue;
// $key = match ($groupBy) {
// 'hour' => (int) $time->format('G'),
// 'day_of_week' => (int) $time->dayOfWeek,
// 'week_of_month' => (int) ceil($time->day / 7),
// };
// $notScannedGrouped[$key] = ($notScannedGrouped[$key] ?? 0) + 1;
// }
// $labels = ['Imported Invoice', 'Completed Invoice']; // Custom labels
// return [
// 'datasets' => [
// [
// 'label' => 'Imported Invoices',
// 'data' => [count($allInvoiceNumbers), count($fullyScannedInvoiceNumbers)],
// 'backgroundColor' => 'rgba(75, 192, 192, 1)',
// 'fill' => false,
// ],
// [
// 'label' => 'Completed Invoices',
// 'data' => [0, count($fullyScannedInvoiceNumbers)],
// 'backgroundColor' => 'rgba(23, 211, 80, 1)',
// 'fill' => false,
// ],
// ],
// 'labels' => $labels,
// ];
// }
protected function getData(): array protected function getData(): array
{ {
$selectedPlant = session('selec_plant'); $selectedPlant = session('selec_plant');
@@ -331,16 +50,15 @@ class InvoiceChart extends ChartWidget
} }
// Get the counts for Imported Invoices (unique invoice numbers) and Completed Invoices // Get the counts for Imported Invoices (unique invoice numbers) and Completed Invoices
if ($selectedInvoice == 'individual_material') { if ($selectedInvoice == 'individual_material')
$importedInvoicesCount = DB::table('invoice_validations') {
->where('plant_id', $selectedPlant) $importedInvoicesCount = InvoiceValidation::where('plant_id', $selectedPlant)
->where('quantity', 1) ->where('quantity', 1)
->whereBetween('created_at', [$startDate, $endDate]) // Filter by date range ->whereBetween('created_at', [$startDate, $endDate]) // Filter by date range
->distinct('invoice_number') // Only distinct invoice numbers ->distinct('invoice_number') // Only distinct invoice numbers
->count('invoice_number'); ->count('invoice_number');
$completedInvoicesCount = DB::table('invoice_validations') $completedInvoicesCount = InvoiceValidation::select('invoice_number')
->select('invoice_number')
->where('plant_id', $selectedPlant) ->where('plant_id', $selectedPlant)
->where('quantity', 1) ->where('quantity', 1)
->whereBetween('updated_at', [$startDate, $endDate]) ->whereBetween('updated_at', [$startDate, $endDate])
@@ -349,24 +67,16 @@ class InvoiceChart extends ChartWidget
"COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)" "COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)"
) )
->count(); ->count();
}
} elseif ($selectedInvoice == 'serial_invoice') { elseif ($selectedInvoice == 'serial_invoice')
$importedInvoicesCount = DB::table('invoice_validations') {
->where('plant_id', $selectedPlant) $importedInvoicesCount = InvoiceValidation::where('plant_id', $selectedPlant)
->whereNull('quantity') ->whereNull('quantity')
->whereBetween('created_at', [$startDate, $endDate]) ->whereBetween('created_at', [$startDate, $endDate])
->distinct('invoice_number') ->distinct('invoice_number')
->count('invoice_number'); ->count('invoice_number');
// $completedInvoicesCount = DB::table('invoice_validations') $completedInvoicesCount = InvoiceValidation::select('invoice_number')
// ->where('plant_id', $selectedPlant)
// ->whereNull('quantity')
// ->where('scanned_status', 'Scanned') // assuming scanned_status means completed
// ->whereBetween('updated_at', [$startDate, $endDate]) // Filter by date range
// ->distinct('invoice_number') // Only distinct invoice numbers
// ->count('invoice_number');
$completedInvoicesCount = DB::table('invoice_validations')
->select('invoice_number')
->where('plant_id', $selectedPlant) ->where('plant_id', $selectedPlant)
->whereNull('quantity') ->whereNull('quantity')
->whereBetween('updated_at', [$startDate, $endDate]) ->whereBetween('updated_at', [$startDate, $endDate])
@@ -376,23 +86,16 @@ class InvoiceChart extends ChartWidget
) )
->count(); ->count();
} elseif ($selectedInvoice == 'bundle_material') { }
$importedInvoicesCount = DB::table('invoice_validations') elseif ($selectedInvoice == 'bundle_material')
->where('plant_id', $selectedPlant) {
$importedInvoicesCount = InvoiceValidation::where('plant_id', $selectedPlant)
->where('quantity', '>', 1) ->where('quantity', '>', 1)
->whereBetween('created_at', [$startDate, $endDate]) // Filter by date range ->whereBetween('created_at', [$startDate, $endDate]) // Filter by date range
->distinct('invoice_number') // Only distinct invoice numbers ->distinct('invoice_number') // Only distinct invoice numbers
->count('invoice_number'); ->count('invoice_number');
// $completedInvoicesCount = DB::table('invoice_validations') $completedInvoicesCount = InvoiceValidation::select('invoice_number')
// ->where('plant_id', $selectedPlant)
// ->where('quantity', '>', 1)
// ->whereNotNull('serial_number') // assuming serial_number presence means completed
// ->whereBetween('updated_at', [$startDate, $endDate]) // Filter by date range
// ->distinct('invoice_number') // Only distinct invoice numbers
// ->count('invoice_number');
$completedInvoicesCount = DB::table('invoice_validations')
->select('invoice_number')
->where('plant_id', $selectedPlant) ->where('plant_id', $selectedPlant)
->where('quantity', '>', 1) ->where('quantity', '>', 1)
->whereBetween('updated_at', [$startDate, $endDate]) ->whereBetween('updated_at', [$startDate, $endDate])
@@ -401,7 +104,6 @@ class InvoiceChart extends ChartWidget
"COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)" "COUNT(*) = SUM(CASE WHEN serial_number IS NOT NULL AND serial_number != '' THEN 1 ELSE 0 END)"
) )
->count(); ->count();
} }
// Prepare the chart data // Prepare the chart data
@@ -428,11 +130,10 @@ class InvoiceChart extends ChartWidget
$dayStart = now()->startOfWeek()->addDays($index)->setTime(8, 0, 0); $dayStart = now()->startOfWeek()->addDays($index)->setTime(8, 0, 0);
$dayEnd = $dayStart->copy()->addDay()->setTime(8, 0, 0); $dayEnd = $dayStart->copy()->addDay()->setTime(8, 0, 0);
$query = DB::table('invoice_validations')->where('plant_id', $selectedPlant); $query = InvoiceValidation::where('plant_id', $selectedPlant);
// Build completedQuery with only 'invoice_number' in select // Build completedQuery with only 'invoice_number' in select
$completedQuery = DB::table('invoice_validations') $completedQuery = InvoiceValidation::select('invoice_number')
->select('invoice_number')
->where('plant_id', $selectedPlant); ->where('plant_id', $selectedPlant);
if ($selectedInvoice == 'individual_material') if ($selectedInvoice == 'individual_material')
@@ -513,19 +214,23 @@ class InvoiceChart extends ChartWidget
$queryImported = InvoiceValidation::where('plant_id', $selectedPlant) $queryImported = InvoiceValidation::where('plant_id', $selectedPlant)
->whereBetween('created_at', [$weekStart, $weekEnd]); ->whereBetween('created_at', [$weekStart, $weekEnd]);
if ($selectedInvoice == 'individual_material') { if ($selectedInvoice == 'individual_material')
{
$queryImported->where('quantity', 1); $queryImported->where('quantity', 1);
} elseif ($selectedInvoice == 'serial_invoice') { }
elseif ($selectedInvoice == 'serial_invoice')
{
$queryImported->whereNull('quantity'); $queryImported->whereNull('quantity');
} elseif ($selectedInvoice == 'bundle_material') { }
elseif ($selectedInvoice == 'bundle_material')
{
$queryImported->where('quantity', '>', 1); $queryImported->where('quantity', '>', 1);
} }
$importedInvoicesPerWeek[$weekIndex] = $queryImported->distinct('invoice_number')->count('invoice_number'); $importedInvoicesPerWeek[$weekIndex] = $queryImported->distinct('invoice_number')->count('invoice_number');
// --- Completed --- // --- Completed ---
$queryCompleted = DB::table('invoice_validations') $queryCompleted = InvoiceValidation::select('invoice_number')
->select('invoice_number')
->where('plant_id', $selectedPlant) ->where('plant_id', $selectedPlant)
->whereBetween('updated_at', [$weekStart, $weekEnd]); ->whereBetween('updated_at', [$weekStart, $weekEnd]);