Merge pull request 'Added filter logic in process order screen' (#62) from ranjith-dev into master

Reviewed-on: #62

.github/workflows/gemini-pr-review.yaml

@@ -36,8 +36,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-npm-global-
 
-      - name: Install Gemini CLI globally
+#      - name: Install Gemini CLI globally
-        run: npm install -g --loglevel=http @google/gemini-cli
+#        run: npm install -g --loglevel=http @google/gemini-cli
 
       - name: Generate git diff and review with Gemini
         id: review

app/Console/Commands/Scheduler.php

@@ -0,0 +1,202 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Console\Scheduling\Schedule;
+use App\Models\AlertMailRule;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Log;
+
+class Scheduler extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    // protected $signature = 'app:scheduler';
+
+    protected $signature = 'custom:scheduler';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    // protected $description = 'Command description';
+
+    protected $description = 'Manually trigger scheduler logic';
+
+    /**
+     * Execute the console command.
+     */
+    // public function handle()
+    // {
+    //     //
+    // }
+
+    public function handle()
+    {
+
+        // --- Production Rules ---
+        $productionRules = AlertMailRule::where('module', 'ProductionQuantities')
+            ->where('rule_name', 'ProductionMail')
+            ->select('plant', 'schedule_type')
+            ->distinct()
+            ->get();
+
+        foreach ($productionRules as $rule) {
+            switch ($rule->schedule_type) {
+                case 'Live':
+                    // Run every minute
+                    \Artisan::call('send:production-report', [
+                        'schedule_type' => $rule->schedule_type,
+                        'plant' => $rule->plant,
+                    ]);
+                    break;
+                case 'Hourly':
+                    if (now()->minute == 0) {
+                        \Artisan::call('send:production-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+                case 'Daily':
+                    if (now()->format('H:i') == '07:59') {
+                        \Artisan::call('send:production-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+            }
+        }
+
+
+        // --- Invoice Validation Rules ---
+        $invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
+            ->where('rule_name', 'InvoiceMail')
+            ->select('plant', 'schedule_type')
+            ->distinct()
+            ->get();
+
+        foreach ($invoiceRules as $rule) {
+
+            switch ($rule->schedule_type) {
+                case 'Live':
+                    // Run every minute
+                    \Artisan::call('send:invoice-report', [
+                        'schedule_type' => $rule->schedule_type,
+                        'plant' => $rule->plant,
+                    ]);
+                    break;
+
+                case 'Hourly':
+                    if (now()->minute == 0) {
+                        \Artisan::call('send:invoice-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+                case 'Daily':
+                    if (now()->format('H:i') == '07:59') {
+                        \Artisan::call('send:invoice-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+            }
+        }
+        // foreach ($invoiceRules as $rule) {
+
+        //     switch ($rule->schedule_type) {
+        //         case 'Live':
+        //             try {
+        //                 Artisan::call('send:invoice-report', [
+        //                     'schedule_type' => $rule->schedule_type,
+        //                     'plant' => $rule->plant,
+        //                 ]);
+
+        //                 Log::info('Invoice report sent | Plant: '.$rule->plant);
+        //             } catch (\Throwable $e) {
+        //                 Log::error("Invoice Live Failed ({$rule->plant}): ".$e->getMessage());
+        //             }
+        //             break;
+
+        //         case 'Hourly':
+        //             if (now()->minute == 0) {
+        //                 Artisan::call('send:invoice-report', [
+        //                     'schedule_type' => $rule->schedule_type,
+        //                     'plant' => $rule->plant,
+        //                 ]);
+        //             }
+        //             break;
+
+        //         case 'Daily':
+        //             if (now()->format('H:i') == '07:59') {
+        //                 Artisan::call('send:invoice-report', [
+        //                     'schedule_type' => $rule->schedule_type,
+        //                     'plant' => $rule->plant,
+        //                 ]);
+        //             }
+        //             break;
+        //     }
+        // }
+
+
+        // --- Invoice Data Report Rules ---
+        $invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
+            ->where('rule_name', 'InvoiceDataMail')
+            ->select('plant', 'schedule_type')
+            ->distinct()
+            ->get();
+
+        foreach ($invoiceDataRules as $rule) {
+
+            switch ($rule->schedule_type) {
+                case 'Live':
+                    // Run every minute
+                    \Artisan::call('send:invoice-data-report', [
+                        'schedule_type' => $rule->schedule_type,
+                        'plant' => $rule->plant,
+                    ]);
+                    break;
+                case 'Hourly':
+                    if (now()->minute == 0) {
+                        \Artisan::call('send:invoice-data-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+                case 'Daily':
+                    if (now()->format('H:i') == '10:00') {
+                        \Artisan::call('send:invoice-data-report', [
+                            'schedule_type' => $rule->schedule_type,
+                            'plant' => $rule->plant,
+                        ]);
+                    }
+                    break;
+            }
+        }
+    }
+
+
+    /**
+     * Helper to call Artisan commands with parameters.
+     */
+    protected function callArtisanCommand($commandName, $rule)
+    {
+        \Artisan::call($commandName, [
+            'schedule_type' => $rule->schedule_type,
+            'plant' => $rule->plant,
+        ]);
+
+        $this->info("Executed {$commandName} for plant: {$rule->plant}");
+        \Log::info("Executed {$commandName} for plant: {$rule->plant}");
+    }
+}

app/Console/Commands/SendInvoiceReport.php

@@ -2,11 +2,11 @@
 
 namespace App\Console\Commands;
 
+use App\Mail\test;
 use App\Models\InvoiceValidation;
 use App\Models\Plant;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Mail;
-use App\Mail\test;
 
 class SendInvoiceReport extends Command
 {
@@ -15,9 +15,8 @@ class SendInvoiceReport extends Command
      *
      * @var string
      */
-   // protected $signature = 'app:send-invoice-report';
+    // protected $signature = 'app:send-invoice-report';
-   protected $signature = 'send:invoice-report{schedule_type} {plant}';
+    protected $signature = 'send:invoice-report {schedule_type} {plant}';
-
 
     /**
      * The console command description.
@@ -29,12 +28,10 @@ class SendInvoiceReport extends Command
     /**
      * Execute the console command.
      */
-
-
     public function handle()
     {
         $schedule = $this->argument('schedule_type');
-        //$scheduleType = $this->argument('scheduleType');
+        // $scheduleType = $this->argument('scheduleType');
         $plantIdArg = (int) $this->argument('plant'); // can be 0 for all plants
 
         $mailRules = \App\Models\AlertMailRule::where('module', 'InvoiceValidation')->get()->groupBy('rule_name');
@@ -52,18 +49,14 @@ class SendInvoiceReport extends Command
             : [$plantIdArg];
 
         $no = 1;
-        if (strtolower($schedule) == 'daily')
+        if (strtolower($schedule) == 'daily') {
-        {
             $startDate = now()->subDay()->setTime(8, 0, 0);
             $endDate = now()->setTime(8, 0, 0);
-        }
+        } else {
-        else
-        {
             $startDate = now()->setTime(8, 0, 0);
             $endDate = now()->copy()->addDay()->setTime(8, 0, 0);
         }
-        foreach ($plantIds as $plantId)
+        foreach ($plantIds as $plantId) {
-        {
             $plant = Plant::find($plantId);
             $plantName = $plant ? $plant->name : $plantId;
 
@@ -89,7 +82,7 @@ class SendInvoiceReport extends Command
 
             $scannedInvoiceQuan = InvoiceValidation::where('plant_id', $plantId)
                 ->where('scanned_status', 'Scanned')
-                ->where(function($query) {
+                ->where(function ($query) {
                     $query->whereNull('quantity')
                         ->orWhere('quantity', 0);
                 })
@@ -128,7 +121,7 @@ class SendInvoiceReport extends Command
             $scannedMatInvoiceQuan = InvoiceValidation::where('plant_id', $plantId)
                 ->where('quantity', 1)
                 ->whereNotNull('serial_number')
-                ->where('serial_number','!=', '')
+                ->where('serial_number', '!=', '')
                 ->whereBetween('updated_at', [$startDate, $endDate])
                 ->count();
 
@@ -164,7 +157,7 @@ class SendInvoiceReport extends Command
             $scannedBundleInvoiceQuan = InvoiceValidation::where('plant_id', $plantId)
                 ->where('quantity', '>', 1)
                 ->whereNotNull('serial_number')
-                ->where('serial_number','!=', '')
+                ->where('serial_number', '!=', '')
                 ->whereBetween('updated_at', [$startDate, $endDate])
                 ->count();
 
@@ -193,7 +186,6 @@ class SendInvoiceReport extends Command
             }
         }
 
-
         // Send to MaterialInvoiceMail recipients (material + bundle table)
         if ($mailRules->has('MaterialInvoiceMail')) {
             $emails = $mailRules['MaterialInvoiceMail']->pluck('email')->unique()->toArray();
@@ -212,16 +204,14 @@ class SendInvoiceReport extends Command
 
         // Show preview in console
         $this->info('--- Serial Invoice Table ---');
-        $this->table(['#', 'Plant', 'Total Invoice', 'Scanned Invoice','TotalInvoice Quantity', 'ScannedInvoice Quantity'], $serialTableData);
+        $this->table(['#', 'Plant', 'Total Invoice', 'Scanned Invoice', 'TotalInvoice Quantity', 'ScannedInvoice Quantity'], $serialTableData);
 
         $this->info('--- Material Invoice Table ---');
-        $this->table(['#', 'Plant', 'Total Invoice', 'Scanned Invoice','TotalInvoice Quantity', 'ScannedInvoice Quantity'], $materialTableData);
+        $this->table(['#', 'Plant', 'Total Invoice', 'Scanned Invoice', 'TotalInvoice Quantity', 'ScannedInvoice Quantity'], $materialTableData);
 
         $this->info('--- Bundle Invoice Table ---');
-        $this->table(['#', 'Plant', 'Total Invoice', 'Scanned Invoice','TotalInvoice Quantity', 'ScannedInvoice Quantity'], $bundleTableData);
+        $this->table(['#', 'Plant', 'Total Invoice', 'Scanned Invoice', 'TotalInvoice Quantity', 'ScannedInvoice Quantity'], $bundleTableData);
 
         $this->info($contentVars['wishes'] ?? '');
     }
-
-
 }

app/Filament/Resources/AlertMailRuleResource.php

@@ -70,7 +70,6 @@ class AlertMailRuleResource extends Resource
                     ->label('CC Emails'),
                 Forms\Components\Select::make('schedule_type')
                     ->label('Schedule Type')
-                    ->required()
                     ->options([
                     'Live' => 'Live',
                     'Hourly' => 'Hourly',

app/Filament/Resources/ProcessOrderResource.php

@@ -24,6 +24,12 @@ use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 use Smalot\PdfParser\Parser;
 use Storage;
+use Filament\Forms\Components\DateTimePicker;
+use Filament\Tables\Filters\Filter;
+use Filament\Forms\Components\Select;
+use App\Models\Line;
+use Filament\Forms\Components\TextInput;
+use App\Models\Item;
 
 class ProcessOrderResource extends Resource
 {
@@ -122,6 +128,7 @@ class ProcessOrderResource extends Resource
                     ->hidden()
                     ->readOnly(),
                 // ->readOnly(true),
+
                 Forms\Components\TextInput::make('process_order')
                     ->label('Process Order')
                     ->reactive()
@@ -490,9 +497,131 @@ class ProcessOrderResource extends Resource
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),
             ])
-            ->filters([
+            // ->filters([
-                Tables\Filters\TrashedFilter::make(),
+            //     Tables\Filters\TrashedFilter::make(),
+            // ])
+             ->filters([
+
+            Tables\Filters\TrashedFilter::make(),
+            Filter::make('advanced_filters')
+                ->label('Advanced Filters')
+                ->form([
+                    Select::make('Plant')
+                        ->label('Select Plant')
+                        ->nullable()
+                        ->options(function (callable $get) {
+                            $userHas = Filament::auth()->user()->plant_id;
+                            return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
+                        })
+                        ->reactive()
+                        ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                            $set('Item', null);
+                        }),
+                    Select::make('Item')
+                        ->label('Item Code')
+                        ->nullable()
+                        ->options(function (callable $get) {
+                                $plantId = $get('Plant');
+
+                                return $plantId ? Item::where('plant_id', $plantId)->pluck('code', 'id') : [];
+                            })
+                        ->reactive()
+                        ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                            $set('process_order', null);
+                        }),
+                    TextInput::make('process_order')
+                        ->label('Process Order')
+                        ->placeholder('Enter Process Order'),
+                    TextInput::make('sfg_number')
+                        ->label('Sfg Number')
+                        ->placeholder(placeholder: 'Enter Sfg Number'),
+                    TextInput::make('machine_name')
+                        ->label('Machine Name')
+                        ->placeholder(placeholder: 'Enter Machine Name'),
+                    DateTimePicker::make(name: 'created_from')
+                        ->label('Created From')
+                        ->placeholder(placeholder: 'Select From DateTime')
+                        ->reactive()
+                        ->native(false),
+                    DateTimePicker::make('created_to')
+                        ->label('Created To')
+                        ->placeholder(placeholder: 'Select To DateTime')
+                        ->reactive()
+                        ->native(false),
+                ])
+                ->query(function ($query, array $data) {
+                    // Hide all records initially if no filters are applied
+                    if (empty($data['Plant']) && empty($data['Item']) && empty($data['process_order']) && empty($data['sfg_number']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['machine_name'])) {
+                        return $query->whereRaw('1 = 0');
+                    }
+
+                    if (!empty($data['Plant'])) {
+                        $query->where('plant_id', $data['Plant']);
+                    }
+
+                    if (!empty($data['Item'])) {
+                        $query->where('item_id', $data['Item']);
+                    }
+
+                    if (!empty($data['process_order'])) {
+                        $query->where('process_order', $data['process_order']);
+                    }
+
+                    if (!empty($data['sfg_number'])) {
+                        $query->where('sfg_number', $data['sfg_number']);
+                    }
+
+                    if (!empty($data['machine_name'])) {
+                        // $query->where('machine_name', $data['machine_name']);
+                        $query->where('machine_name', 'like', '%' . $data['machine_name'] . '%');
+                    }
+
+                    if (!empty($data['created_from'])) {
+                        $query->where('created_at', '>=', $data['created_from']);
+                    }
+
+                    if (!empty($data['created_to'])) {
+                        $query->where('created_at', '<=', $data['created_to']);
+                    }
+
+
+                    //$query->orderBy('created_at', 'asc');
+                })
+                ->indicateUsing(function (array $data) {
+                    $indicators = [];
+
+                    if (!empty($data['Plant'])) {
+                        $indicators[] = 'Plant: ' . Plant::where('id', $data['Plant'])->value('name');
+                    }
+
+                    if (!empty($data['Item'])) {
+                        $indicators[] = 'Item: ' . Item::where('id', $data['Item'])->value('code');
+                    }
+
+                    if (!empty($data['process_order'])) {
+                        $indicators[] = 'Process Order: ' . $data['process_order'];
+                    }
+
+                    if (!empty($data['sfg_number'])) {
+                        $indicators[] = 'Sfg Number: ' . $data['sfg_number'];
+                    }
+
+                    if (!empty($data['machine_name'])) {
+                        $indicators[] = 'Machine Name: ' . $data['machine_name'];
+                    }
+
+                    if (!empty($data['created_from'])) {
+                        $indicators[] = 'From: ' . $data['created_from'];
+                    }
+
+                    if (!empty($data['created_to'])) {
+                        $indicators[] = 'To: ' . $data['created_to'];
+                    }
+
+                    return $indicators;
+                })
             ])
+            ->filtersFormMaxHeight('280px')
             ->actions([
                 Tables\Actions\ViewAction::make(),
                 Tables\Actions\EditAction::make(),

routes/console.php

@@ -2,8 +2,6 @@
 
 use Illuminate\Foundation\Inspiring;
 use Illuminate\Support\Facades\Artisan;
-use App\Models\AlertMailRule;
-use Illuminate\Console\Scheduling\Schedule;
 
 
 
@@ -11,87 +9,93 @@ Artisan::command('inspire', function () {
     $this->comment(Inspiring::quote());
 })->purpose('Display an inspiring quote');
 
+
+Artisan::command('auto:scheduler', function () {
+    $this->call('custom:scheduler');
+})->everyMinute();
+
+
 //     Schedule::command('send:invoice-report');
 //   Schedule::command('send:production-report');
 
-app()->booted(function () {
+// app()->booted(function () {
-    $schedule = app(Schedule::class);
+//     $schedule = app(Schedule::class);
 
-    // $schedule->command('report:send-daily-production')->dailyAt('07:59');
+//     // $schedule->command('report:send-daily-production')->dailyAt('07:59');
-        // Production report scheduling
+//         // Production report scheduling
-        $productionRules = AlertMailRule::where('module', 'ProductionQuantities')
+//         $productionRules = AlertMailRule::where('module', 'ProductionQuantities')
-            ->where('rule_name', 'ProductionMail')
+//             ->where('rule_name', 'ProductionMail')
-            ->select('plant', 'schedule_type')
+//             ->select('plant', 'schedule_type')
-            ->distinct()
+//             ->distinct()
-            ->get();
+//             ->get();
 
-        foreach ($productionRules as $rule) {
+//         foreach ($productionRules as $rule) {
-            $type = $rule->schedule_type;
+//             $type = $rule->schedule_type;
-            $plantId = $rule->plant;
+//             $plantId = $rule->plant;
 
-            $command = $schedule->command('send:production-report', [$type, $plantId]);
+//             $command = $schedule->command('send:production-report', [$type, $plantId]);
-            // ->appendOutputTo(storage_path('logs/scheduler.log'));
+//             // ->appendOutputTo(storage_path('logs/scheduler.log'));
 
-            switch ($type) {
+//             switch ($type) {
-                case 'Live':
+//                 case 'Live':
-                    $command->everyMinute();
+//                     $command->everyMinute();
-                    break;
+//                     break;
-                case 'Hourly':
+//                 case 'Hourly':
-                    $command->hourly();
+//                     $command->hourly();
-                    break;
+//                     break;
-                case 'Daily':
+//                 case 'Daily':
-                    $command->dailyAt('07:59');
+//                     $command->dailyAt('07:59');
-                    break;
+//                     break;
-            }
+//             }
-        }
+//         }
 
-        // Invoice report scheduling
+//         // Invoice report scheduling
-        $invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
+//         $invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
-            ->select('plant', 'schedule_type')
+//             ->select('plant', 'schedule_type')
-            ->distinct()
+//             ->distinct()
-            ->get();
+//             ->get();
 
-        foreach ($invoiceRules as $rule) {
+//         foreach ($invoiceRules as $rule) {
-            $type = $rule->schedule_type;
+//             $type = $rule->schedule_type;
-            $plantId = $rule->plant;
+//             $plantId = $rule->plant;
 
-            $command = $schedule->command('send:invoice-report', [$type, $plantId]);
+//             $command = $schedule->command('send:invoice-report', [$type, $plantId]);
 
-            switch ($type) {
+//             switch ($type) {
-                case 'Live':
+//                 case 'Live':
-                    $command->everyMinute();
+//                     $command->everyMinute();
-                    break;
+//                     break;
-                case 'Hourly':
+//                 case 'Hourly':
-                    $command->hourly();
+//                     $command->hourly();
-                    break;
+//                     break;
-                case 'Daily':
+//                 case 'Daily':
-                    $command->dailyAt('07:59');
+//                     $command->dailyAt('07:59');
-                    break;
+//                     break;
-            }
+//             }
-        }
+//         }
 
-        // Invoice Data Report Scheduling
+//         // Invoice Data Report Scheduling
-        $invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
+//         $invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
-            ->select('plant', 'schedule_type')
+//             ->select('plant', 'schedule_type')
-            ->distinct()
+//             ->distinct()
-            ->get();
+//             ->get();
 
-        foreach ($invoiceDataRules as $rule) {
+//         foreach ($invoiceDataRules as $rule) {
-            $type = $rule->schedule_type;
+//             $type = $rule->schedule_type;
-            $plantId = $rule->plant;
+//             $plantId = $rule->plant;
 
-            $command = $schedule->command('send:invoice-data-report', [$type, $plantId]);
+//             $command = $schedule->command('send:invoice-data-report', [$type, $plantId]);
 
-            switch ($type) {
+//             switch ($type) {
-                case 'Live':
+//                 case 'Live':
-                    $command->everyMinute();
+//                     $command->everyMinute();
-                    break;
+//                     break;
-                case 'Hourly':
+//                 case 'Hourly':
-                    $command->hourly();
+//                     $command->hourly();
-                    break;
+//                     break;
-                case 'Daily':
+//                 case 'Daily':
-                    $command->dailyAt('10:00');
+//                     $command->dailyAt('10:00');
-                    break;
+//                     break;
-            }
+//             }
-        }
+//         }
-});
+// });