Merge pull request 'changed logic in edit transporter bid' (#150) from ranjith-dev into master

Reviewed-on: #150

app/Exports/ProductionPlanExport.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Exports;
-
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Maatwebsite\Excel\Concerns\FromArray;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-
-class ProductionPlanExport implements FromArray, WithHeadings, WithMapping
-{
-
-    protected array $data;
-    protected array $dates;
-
-    public function __construct(array $data, array $dates)
-    {
-        $this->data = $data;
-        $this->dates = $dates;
-    }
-
-    public function array(): array
-    {
-        return $this->data;
-    }
-
-    public function headings(): array
-    {
-        $headings = [
-            'Plant Name',
-            'Line Name',
-            'Item Code',
-        ];
-
-        // Add dynamic headings for each date: Target / Produced
-        foreach ($this->dates as $date) {
-            $headings[] = $date . ' - Target Plan';
-            $headings[] = $date . ' - Produced Quantity';
-        }
-
-        return $headings;
-    }
-
-    public function map($row): array
-    {
-         $mapped = [
-            $row['plant_name'] ?? '',
-            $row['line_name'] ?? '',
-            $row['item_code'] ?? '',
-        ];
-
-        // Add daily target and produced quantity for each date
-        foreach ($this->dates as $date) {
-            // $mapped[] = $row['daily_target_dynamic'] ?? 0;
-            $mapped[] = $row['daily_target_dynamic'][$date] ?? '-';
-            $mapped[] = $row['produced_quantity'][$date] ?? 0;
-        }
-
-        return $mapped;
-    }
-
-}

app/Filament/Imports/ProductionPlanImporter.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Imports;
 
 use App\Models\Block;
-use App\Models\Item;
 use App\Models\Line;
 use App\Models\Plant;
 use App\Models\ProductionPlan;
@@ -24,33 +23,11 @@ class ProductionPlanImporter extends Importer
     public static function getColumns(): array
     {
         return [
-            // ImportColumn::make('created_at')
+            ImportColumn::make('created_at')
-            //     ->requiredMapping()
-            //     ->exampleHeader('Created DateTime')
-            //     ->example(['01-01-2025 08:00:00', '01-01-2025 19:30:00'])
-            //     ->label('Created DateTime')
-            //     ->rules(['required']),
-
-            ImportColumn::make('plant')
                 ->requiredMapping()
-                ->exampleHeader('Plant Code')
+                ->exampleHeader('Created DateTime')
-                ->example(['1000', '1000'])
+                ->example(['01-01-2025 08:00:00', '01-01-2025 19:30:00'])
-                ->label('Plant Code')
+                ->label('Created DateTime')
-                ->relationship(resolveUsing: 'code')
-                ->rules(['required']),
-            ImportColumn::make('line')
-                ->requiredMapping()
-                ->exampleHeader('Line Name')
-                ->example(['4 inch pump line', '4 inch pump line'])
-                ->label('Line Name')
-                ->relationship(resolveUsing: 'name')
-                ->rules(['required']),
-            ImportColumn::make('item')
-                ->requiredMapping()
-                ->exampleHeader('Item Code')
-                ->example(['123456', '210987'])
-                ->label('Item Code')
-                ->relationship(resolveUsing: 'code')
                 ->rules(['required']),
             ImportColumn::make('plan_quantity')
                 ->requiredMapping()
@@ -59,111 +36,175 @@ class ProductionPlanImporter extends Importer
                 ->label('Plan Quantity')
                 ->numeric()
                 ->rules(['required', 'integer']),
-            // ImportColumn::make('production_quantity')
+            ImportColumn::make('production_quantity')
-            //     ->requiredMapping()
+                ->requiredMapping()
-            //     ->exampleHeader('Production Quantity')
+                ->exampleHeader('Production Quantity')
-            //     ->example(['0', '0'])
+                ->example(['0', '0'])
-            //     ->label('Production Quantity')
+                ->label('Production Quantity')
-            //     ->numeric()
+                ->numeric()
-            //     ->rules(['required', 'integer']),
+                ->rules(['required', 'integer']),
-
+            ImportColumn::make('line')
-            // ImportColumn::make('block_reference')
+                ->requiredMapping()
-            //     ->requiredMapping() // Or optionalMapping() if not always present
+                ->exampleHeader('Line Name')
-            //     ->exampleHeader('Block Name')
+                ->example(['4 inch pump line', '4 inch pump line'])
-            //     ->example(['Block A', 'Block A'])
+                ->label('Line Name')
-            //     ->label('Block Name')
+                ->relationship(resolveUsing:'name')
-            //     ->rules(['required']), // Or remove if not required
+                ->rules(['required']),
-            // ImportColumn::make('shift')
+            ImportColumn::make('block_reference')
-            //     ->requiredMapping()
+                ->requiredMapping() // Or optionalMapping() if not always present
-            //     ->exampleHeader('Shift Name') // ID
+                ->exampleHeader('Block Name')
-            //     ->example(['Day', 'Night']) // '2', '7'
+                ->example(['Block A', 'Block A'])
-            //     ->label('Shift Name') // ID
+                ->label('Block Name')
-            //     ->relationship(resolveUsing: 'name')
+                ->rules(['required']), // Or remove if not required
-            //     ->rules(['required']),
+            ImportColumn::make('shift')
-
+                ->requiredMapping()
-            // ImportColumn::make('updated_at')
+                ->exampleHeader('Shift Name') //ID
-            //     ->requiredMapping()
+                ->example(['Day', 'Night']) //'2', '7'
-            //     ->exampleHeader('Updated DateTime')
+                ->label('Shift Name') // ID
-            //     ->example(['01-01-2025 08:00:00', '01-01-2025 19:30:00'])
+                ->relationship(resolveUsing: 'name')
-            //     ->label('Updated DateTime')
+                ->rules(['required']),
-            //     ->rules(['required']),
+            ImportColumn::make('plant')
-            // ImportColumn::make('operator_id')
+                ->requiredMapping()
-            //     ->requiredMapping()
+                ->exampleHeader('Plant Name')
-            //     ->exampleHeader('Operator ID')
+                ->example(['Ransar Industries-I', 'Ransar Industries-I'])
-            //     ->example([Filament::auth()->user()->name, Filament::auth()->user()->name])
+                ->label('Plant Name')
-            //     ->label('Operator ID')
+                ->relationship(resolveUsing:'name')
-            //     ->rules(['required']),
+                ->rules(['required']),
+            ImportColumn::make('updated_at')
+                ->requiredMapping()
+                ->exampleHeader('Updated DateTime')
+                ->example(['01-01-2025 08:00:00', '01-01-2025 19:30:00'])
+                ->label('Updated DateTime')
+                ->rules(['required']),
+            ImportColumn::make('operator_id')
+                ->requiredMapping()
+                ->exampleHeader('Operator ID')
+                ->example([Filament::auth()->user()->name, Filament::auth()->user()->name])
+                ->label('Operator ID')
+                ->rules(['required']),
         ];
     }
 
     public function resolveRecord(): ?ProductionPlan
     {
         $warnMsg = [];
-        $plantCod = $this->data['plant'];
+        $plant = Plant::where('name', $this->data['plant'])->first();
-        $itemCod = $this->data['item'];
-        $plant = null;
         $line = null;
         $block = null;
-
-        if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
-            $warnMsg[] = 'Invalid plant code found';
-        } else {
-            $plant = Plant::where('code', $plantCod)->first();
-        }
-
         if (!$plant) {
-            $warnMsg[] = 'Plant not found';
+            $warnMsg[] = "Plant not found";
-        } else {
+        }
+        else {
             $line = Line::where('name', $this->data['line'])->where('plant_id', $plant->id)->first();
+            //block_reference
+            $block = Block::where('name', $this->data['block_reference'])->where('plant_id', $plant->id)->first();
         }
-
         if (!$line) {
-            $warnMsg[] = 'Line not found';
+            $warnMsg[] = "Line not found";
         }
-
+        $shift = null;
-        if (Str::length($itemCod) < 6 || ! is_numeric($itemCod)) {
+        if (!$block) {
-            $warnMsg[] = 'Invalid item code found';
+            $warnMsg[] = "Block not found";
-        } else {
-            $item = Item::where('code', $itemCod)->first();
         }
-
+        else {
-        if (! $item) {
+            $shift = Shift::where('name', $this->data['shift'])->where('plant_id', $plant->id)->where('block_id', $block->id)->first();
-            $warnMsg[] = 'Item not found';
         }
-
+        //$shift = Shift::where('id', $this->data['shift'])->where('plant_id', $plant->id)->first();
-        $plantId = $plant->id;
+        if (!$shift) {
-
+            $warnMsg[] = "Shift not found";
-        $itemAgaPlant = Item::where('plant_id', $plantId)->where('code', $itemCod)->first();
-
-        if(!$itemAgaPlant){
-            $warnMsg[] = 'Item not found against plant code';
         }
-
-        $user = Filament::auth()->user();
-
-        $operatorName = $user->name;
-
         if (Str::length($this->data['plan_quantity']) < 0 || !is_numeric($this->data['plan_quantity']) || $this->data['plan_quantity'] <= 0) {
-            $warnMsg[] = 'Invalid plan quantity found';
+            $warnMsg[] = "Invalid plan quantity found";
+        }
+        if (Str::length($this->data['production_quantity']) < 0 || !is_numeric($this->data['production_quantity']) || $this->data['production_quantity'] < 0) {
+            $warnMsg[] = "Invalid production quantity found";
+        }
+
+        $fromDate = $this->data['created_at'];
+        $toDate = $this->data['updated_at'];
+
+        $formats = ['d-m-Y H:i', 'd-m-Y H:i:s']; //'07-05-2025 08:00' or '07-05-2025 08:00:00'
+
+        $fdateTime = null;
+        $tdateTime = null;
+        // Try parsing with multiple formats
+        foreach ($formats as $format) {
+            try {
+                $fdateTime = Carbon::createFromFormat($format, $fromDate);
+                break;
+            } catch (\Exception $e) {
+                // Optionally collect warning messages
+                // $warnMsg[] = "Date format mismatch with format: $format";
+            }
+        }
+
+        foreach ($formats as $format) {
+            try {
+                $tdateTime = Carbon::createFromFormat($format, $toDate);
+                break;
+            } catch (\Exception $e) {
+                // Optionally collect warning messages
+                // $warnMsg[] = "Date format mismatch with format: $format";
+            }
+        }
+
+        $fDateOnly = '';
+        if (!isset($fdateTime)) {
+            // throw new \Exception('Invalid date time format');
+            $warnMsg[] = "Invalid 'Created DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+        }
+        else {
+            $fDateOnly = $fdateTime->toDateString();
+        }
+        if (!isset($tdateTime)) {
+            $warnMsg[] = "Invalid 'Updated DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+        }
+
+        if (isset($fdateTime) && isset($tdateTime)) {
+            if ($fdateTime->greaterThan($tdateTime)) {
+                $warnMsg[] = "'Created DataTime' is greater than 'Updated DateTime'.";
+            }
+        }
+
+        // if (!$fromDate) {
+        //     $warnMsg[] = "Invalid 'Created DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+        // }
+        // else if (!$toDate) {
+        //     $warnMsg[] = "Invalid 'Updated DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
+        // }
+
+        $user = User::where('name', $this->data['operator_id'])->first();
+        if (!$user) {
+            $warnMsg[] = "Operator ID not found";
         }
 
         if (!empty($warnMsg)) {
             throw new RowImportFailedException(implode(', ', $warnMsg));
-        } else {
+        }
+        else { //if (empty($warnMsg))
             $productionPlan = ProductionPlan::where('plant_id', $plant->id)
+            ->where('shift_id', $shift->id)
             ->where('line_id', $line->id)
-                ->where('item_id', $itemAgaPlant->id)
+            ->whereDate('created_at', $fDateOnly)
+            // ->where('plan_quantity', $productionQuantity->plan_quantity)
             ->latest()
             ->first();
 
             if ($productionPlan) {
+                // if($productionPlan->production_quantity)
+                // {
+                //     throw new RowImportFailedException("{$productionPlan->created_at}, {$productionPlan->production_quantity}");
+                // }
+                // $warnMsg[] = "Production plan already exist on '{$fDateOnly}'!";
 
                 $productionPlan->update([
                     'plan_quantity' => $this->data['plan_quantity'],
-                    'operator_id' => $operatorName,
+                    // 'production_quantity' => $productionPlan->production_quantity,
+                    // 'created_at' => $productionPlan->created_at,//$fdateTime->format('Y-m-d H:i:s'),
+                    // 'updated_at' => $tdateTime->format('Y-m-d H:i:s'),
+                    'operator_id' => $this->data['operator_id'],
                 ]);
                 $productionPlan->save();
-
                 return null;
             }
         }
@@ -171,15 +212,20 @@ class ProductionPlanImporter extends Importer
         ProductionPlan::updateOrCreate([
             'plant_id' => $plant->id,
             'line_id' => $line->id,
-            'item_id' => $itemAgaPlant->id,
+            'shift_id' => $shift->id,
-            // 'shift_id' => $shift->id,
             'plan_quantity' => $this->data['plan_quantity'],
-            'created_at' =>now(),
+            'production_quantity' => $this->data['production_quantity'],
-            'updated_at' => now(),
+            'created_at' => $fdateTime->format('Y-m-d H:i:s'),//$this->data['created_at'],
-            'operator_id' => $operatorName,
+            'updated_at' => $tdateTime->format('Y-m-d H:i:s'),//$this->data['updated_at'],
+            'operator_id' => $this->data['operator_id'],
         ]);
-
         return null;
+        // return ProductionPlan::firstOrNew([
+        //     // Update existing records, matching them by `$this->data['column_name']`
+        //     'email' => $this->data['email'],
+        // ]);
+
+        // return new ProductionPlan();
     }
 
     public static function getCompletedNotificationBody(Import $import): string

app/Filament/Pages/ProductionCalender.php

@@ -1,163 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use App\Models\CustomerPoMaster;
-use App\Models\Plant;
-use App\Models\ProductionPlan;
-use App\Models\WireMasterPacking;
-use Filament\Facades\Filament;
-use Filament\Pages\Page;
-use Filament\Forms\Concerns\InteractsWithForms;
-use Filament\Forms\Form;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\DatePicker;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ViewField;
-use Filament\Notifications\Notification;
-use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\Hidden;
-
-class ProductionCalender extends Page
-{
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static string $view = 'filament.pages.production-calender';
-
-    use InteractsWithForms;
-
-    protected $listeners = ['setWorkingDays'];
-
-    public $pId;
-
-    public array $filters = [];
-
-    public function setWorkingDays($days = null)
-    {
-        $this->form->fill([
-            'working_days' => $days ?? 0,
-        ]);
-    }
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->statePath('filters')
-            ->schema([
-                Section::make('')
-                    ->schema([
-                        Select::make('plant_id')
-                            ->label('Plant')
-                            ->reactive()
-                            //->options(Plant::pluck('name', 'id'))
-                            ->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();
-                            })
-                            ->columnSpan(['default' => 10, 'sm' => 7])
-                            ->required()
-                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                $set('working_days', null);
-                            }),
-                        TextInput::make('working_days')
-                            ->label('No. of Working Days')
-                            ->numeric()
-                            ->readOnly()
-                            ->columnSpan(['default' => 10, 'sm' => 2])
-                            ->required()
-                            ->minValue(0)
-                            ->maxValue(31)
-                            ->placeholder('Enter working days')
-                            ->id('working_days'),
-
-                        Hidden::make('month')
-                            ->label('Month')
-                            ->id('month'),
-
-                        Hidden::make('year')
-                            ->label('Year')
-                            ->id('year'),
-
-                        Hidden::make('selected_dates')
-                            ->label('Selected Dates')
-                            ->id('selected_dates'),
-
-                        ViewField::make('save')
-                            ->view('forms.save')
-                            ->columnSpan(['default' => 10, 'sm' => 1]),
-
-                        ViewField::make('calendar')
-                            ->view('forms.calendar')
-                            ->columnspan(10),
-                    ])
-                    ->columns(10)
-            ]);
-    }
-
-    public function saveWorkingDays(){
-        $plantId = $this->filters['plant_id'] ?? null;
-        $workingDays = $this->filters['working_days'] ?? null;
-        $month = $this->filters['month'] ?? null;
-        $year = $this->filters['year'] ?? null;
-        $dates = $this->filters['selected_dates'] ?? null;
-
-        if (!$plantId) {
-            Notification::make()
-                ->title('Unknown Plant')
-                ->body("Please select a plant first!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (!$workingDays) {
-            Notification::make()
-                ->title('Unknown Working Days')
-                ->body("Working days can't be empty!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (!$month) {
-            Notification::make()
-                ->title('Unknown Month')
-                ->body("month can't be empty!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (!$year) {
-            Notification::make()
-                ->title('Unknown Year')
-                ->body("Year can't be empty!")
-                ->danger()
-                ->send();
-            return;
-        }
-
-        $updated = ProductionPlan::where('plant_id', $plantId)
-        ->whereMonth('created_at', $month)
-        ->whereYear('created_at', $year)
-        ->update([
-            'working_days' => $workingDays,
-            'leave_dates' => $dates,
-            'updated_at' => now(),
-        ]);
-
-        if ($updated) {
-            Notification::make()
-                ->title('Success')
-                ->body("Working days updated successfully!")
-                ->success()
-                ->send();
-        } else {
-            Notification::make()
-                ->title('No Records Updated')
-                ->body("No production plans found for this plant and month.")
-                ->warning()
-                ->send();
-        }
-    }
-
-}

app/Filament/Pages/ProductionTarget.php

@@ -1,173 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use App\Models\Plant;
-use Filament\Facades\Filament;
-use Filament\Forms\Components\DatePicker;
-use Filament\Pages\Page;
-use Filament\Forms\Form;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Notifications\Notification;
-
-class ProductionTarget extends Page
-{
-    protected static ?string $navigationIcon = 'heroicon-o-document-text';
-
-    protected static string $view = 'filament.pages.production-target';
-
-    public array $filters = [];
-
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->statePath('filters')
-            ->schema([
-                Section::make('')
-                    ->schema([
-                        Select::make('plant_id')
-                            ->label('Plant')
-                            ->reactive()
-                            ->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();
-                            })
-                            ->required()
-                            ->afterStateUpdated(function ($state, callable $get, $set) {
-                                $set('line_id', null);
-                                $set('year', null);
-                                $set('month', null);
-                                $this->dispatch('loadData',$state, '', '', '');
-                            }),
-                        Select::make('line_id')
-                            ->label('Line')
-                            ->required()
-                            ->columnSpan(1)
-                            ->options(function (callable $get) {
-                                if (!$get('plant_id')) {
-                                    return [];
-                                }
-
-                                return \App\Models\Line::where('plant_id', $get('plant_id'))
-                                    ->pluck('name', 'id')
-                                    ->toArray();
-                            })
-                            ->reactive()
-                            ->afterStateUpdated(function ($state, callable $get, $set) {
-                                $plantId = $get('plant_id');
-                                $set('year', null);
-                                $set('month', null);
-                                $this->dispatch('loadData',$plantId, $state, '', '');
-                            }),
-                        Select::make('year')
-                            ->label('Year')
-                            ->reactive()
-                            ->options([
-                                '2026' => '2026',
-                                '2027' => '2027',
-                                '2028' => '2028',
-                                '2029' => '2029',
-                                '2030' => '2030',
-                                '2031' => '2031',
-                                '2032' => '2032',
-                                '2033' => '2033',
-                                '2034' => '2034',
-                                '2035' => '2035',
-                                '2036' => '2036',
-                                '2037' => '2037',
-                                '2038' => '2038',
-                                '2039' => '2039',
-                                '2040' => '2040',
-                            ])
-                            ->required()
-                            ->afterStateUpdated(function ($state, callable $get, $set) {
-                                $set('month', null);
-                                $plantId = $get('plant_id');
-                                $lineId = $get('line_id');
-                                $this->dispatch('loadData',$plantId, $lineId, $state, '');
-                            }),
-
-                        Select::make('month')
-                            ->label('Month')
-                            ->reactive()
-                            ->options([
-                                '01' => 'January',
-                                '02' => 'February',
-                                '03' => 'March',
-                                '04' => 'April',
-                                '05' => 'May',
-                                '06' => 'June',
-                                '07' => 'July',
-                                '08' => 'August',
-                                '09' => 'September',
-                                '10' => 'October',
-                                '11' => 'November',
-                                '12' => 'December',
-                            ])
-                            ->required()
-                            ->afterStateUpdated(function ($state, callable $get) {
-
-                                $plantId = $get('plant_id');
-                                $lineId = $get('line_id');
-                                // $month = $get('month');
-                                $year = $get('year');
-
-                                $month = (int) $get('month');
-
-                                if (!$month) {
-                                    return;
-                                }
-                                $this->dispatch('loadData', $plantId, $lineId, $month, $year);
-                            }),
-
-                    ])
-                    ->columns(4)
-            ]);
-    }
-
-    public function export(){
-
-        $plantId = $this->filters['plant_id'] ?? null;
-        $lineId = $this->filters['line_id'] ?? null;
-        $year = $this->filters['year'] ?? null;
-        $month = $this->filters['month'] ?? null;
-
-        if (! $plantId) {
-            Notification::make()
-                ->title('Plant')
-                ->body("please select plant to export data..!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (! $lineId) {
-            Notification::make()
-                ->title('Line')
-                ->body("please select line to export data..!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (! $year) {
-            Notification::make()
-                ->title('Year')
-                ->body("please select year to export data..!")
-                ->danger()
-                ->send();
-            return;
-        }
-        else if (! $month) {
-            Notification::make()
-                ->title('Month')
-                ->body("please select month to export data..!")
-                ->danger()
-                ->send();
-            return;
-        }
-
-        $this->dispatch('loadData1' ,$plantId, $lineId, $year, $month);
-    }
-}

app/Filament/Resources/ItemResource.php

@@ -82,9 +82,6 @@ class ItemResource extends Resource
                         Forms\Components\TextInput::make('category')
                             ->label('Category')
                             ->placeholder('Scan the Category'),
-                        Forms\Components\TextInput::make('category')
-                            ->label('Category')
-                            ->placeholder('Scan the Category'),
                         Forms\Components\TextInput::make('code')
                             ->required()
                             ->placeholder('Scan the valid code')

app/Filament/Resources/LineResource.php

@@ -5,23 +5,23 @@ namespace App\Filament\Resources;
 use App\Filament\Exports\LineExporter;
 use App\Filament\Imports\LineImporter;
 use App\Filament\Resources\LineResource\Pages;
-use App\Models\Block;
+use App\Filament\Resources\LineResource\RelationManagers;
 use App\Models\Line;
 use App\Models\Plant;
 use App\Models\WorkGroupMaster;
 use Filament\Facades\Filament;
 use Filament\Forms;
-use Filament\Forms\Components\Section;
 use Filament\Forms\Form;
 use Filament\Forms\Get;
-use Filament\Forms\Set;
 use Filament\Resources\Resource;
 use Filament\Tables;
-use Filament\Tables\Actions\ExportAction;
 use Filament\Tables\Actions\ImportAction;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Set;
+use Filament\Tables\Actions\ExportAction;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Rules\Unique;
 
@@ -48,8 +48,7 @@ class LineResource extends Resource
                             ->reactive()
                             ->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();
-                                return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
                             })
                             ->default(function () {
                                 return optional(Line::latest()->first())->plant_id;
@@ -61,9 +60,10 @@ class LineResource extends Resource
                                 // Ensure `linestop_id` is not cleared
                                 if (!$plantId) {
                                     $set('lPlantError', 'Please select a plant first.');
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     $set('lPlantError', null);
                                 }
                             })
@@ -72,39 +72,6 @@ class LineResource extends Resource
                             ])
                             ->hint(fn ($get) => $get('lPlantError') ? $get('lPlantError') : null)
                             ->hintColor('danger'),
-                        Forms\Components\Select::make('block_id')
-                            ->label('Block')
-                            ->relationship('block', 'name')
-                            ->required()
-                            // ->nullable(),
-                            ->reactive()
-                            ->options(function (callable $get) {
-                                if (! $get('plant_id')) {
-                                    return [];
-                                }
-
-                                return Block::where('plant_id', $get('plant_id'))
-                                    ->pluck('name', 'id')
-                                    ->toArray();
-                            })
-                            ->default(function () {
-                                return optional(Block::latest()->first())->plant_id;
-                            })
-                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                $blockId = $get('block_id');
-                                if (! $blockId) {
-                                    $set('lblockError', 'Please select a Block first.');
-
-                                    return;
-                                } else {
-                                    $set('lblockError', null);
-                                }
-                            })
-                            ->extraAttributes(fn ($get) => [
-                                'class' => $get('lblockError') ? 'border-red-500' : '',
-                            ])
-                            ->hint(fn ($get) => $get('lblockError') ? $get('lblockError') : null)
-                            ->hintColor('danger'),
                         Forms\Components\TextInput::make('name')
                             ->required()
                             ->placeholder('Scan the valid name')
@@ -132,9 +99,10 @@ class LineResource extends Resource
                                 // Ensure `linestop_id` is not cleared
                                 if (!$lineNam) {
                                     $set('lNameError', 'Scan the valid name.');
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     // $exists = Line::where('name', $lineNam)
                                     //     ->where('plant_id', $get('plant_id'))
                                     //     ->exists();
@@ -188,9 +156,6 @@ class LineResource extends Resource
                                 'Base FG Line' => 'Base FG Line',
                                 'SFG Line' => 'SFG Line',
                                 'FG Line' => 'FG Line',
-                                'Process Base FG Line' => 'Process Base FG Line',
-                                'Process SFG Line' => 'Process SFG Line',
-                                'Process FG Line' => 'Process FG Line',
                                 'Machining Cell' => 'Machining Cell',
                                 'Blanking Cell' => 'Blanking Cell',
                                 'Forming Cell' => 'Forming Cell',
@@ -205,9 +170,10 @@ class LineResource extends Resource
                                 // Ensure `linestop_id` is not cleared
                                 if (!$lineTyp) {
                                     $set('lTypeError', 'Scan the valid type.');
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     $set('lTypeError', null);
                                 }
                             })
@@ -238,7 +204,7 @@ class LineResource extends Resource
 
                                 $partValidDispColumns = [
                                     'work_group1_actual_id', 'work_group2_actual_id', 'work_group3_actual_id', 'work_group4_actual_id', 'work_group5_actual_id',
-                                    'work_group6_actual_id', 'work_group7_actual_id', 'work_group8_actual_id', 'work_group9_actual_id', 'work_group10_actual_id',
+                                    'work_group6_actual_id', 'work_group7_actual_id', 'work_group8_actual_id', 'work_group9_actual_id', 'work_group10_actual_id'
                                 ];
 
                                 foreach ($partValidDispColumns as $column) {
@@ -289,7 +255,6 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group1_id_error', null);
                                     $set('work_group1_id', null);
-
                                     return;
                                 }
 
@@ -298,7 +263,6 @@ class LineResource extends Resource
 
                                 if (!$plantId) {
                                     $set('work_group1_id_error', 'Invalid plant name.');
-
                                     return;
                                 }
 
@@ -308,7 +272,6 @@ class LineResource extends Resource
 
                                 if (!$workGroupRecord) {
                                     $set('work_group1_id_error', 'Work group does not exist for this plant in master.');
-
                                     return;
                                 }
 
@@ -334,9 +297,10 @@ class LineResource extends Resource
                                         ->send();
                                     $set('work_group1_actual_id', '');
                                     $set('work_group1_id', null);
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     $set('work_group1_id_error', null);
                                     $set('work_group1_id', $workGroupRecord->id);
                                 }
@@ -368,7 +332,6 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group2_id_error', null);
                                     $set('work_group2_id', null);
-
                                     return;
                                 }
 
@@ -377,7 +340,6 @@ class LineResource extends Resource
 
                                 if (!$plantId) {
                                     $set('work_group2_id_error', 'Invalid plant name.');
-
                                     return;
                                 }
 
@@ -387,7 +349,6 @@ class LineResource extends Resource
 
                                 if (!$workGroupRecord) {
                                     $set('work_group2_id_error', 'Work group does not exist for this plant in master.');
-
                                     return;
                                 }
 
@@ -408,9 +369,10 @@ class LineResource extends Resource
                                         ->send();
                                     $set('work_group2_actual_id', '');
                                     $set('work_group2_id', null);
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     $set('work_group2_id_error', null);
                                     $set('work_group2_id', $workGroupRecord->id);
                                 }
@@ -442,7 +404,6 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group3_id_error', null);
                                     $set('work_group3_id', null);
-
                                     return;
                                 }
 
@@ -451,7 +412,6 @@ class LineResource extends Resource
 
                                 if (!$plantId) {
                                     $set('work_group3_id_error', 'Invalid plant name.');
-
                                     return;
                                 }
 
@@ -461,7 +421,6 @@ class LineResource extends Resource
 
                                 if (!$workGroupRecord) {
                                     $set('work_group3_id_error', 'Work group does not exist for this plant in master.');
-
                                     return;
                                 }
 
@@ -482,9 +441,10 @@ class LineResource extends Resource
                                         ->send();
                                     $set('work_group3_actual_id', '');
                                     $set('work_group3_id', null);
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     $set('work_group3_id_error', null);
                                     $set('work_group3_id', $workGroupRecord->id);
                                 }
@@ -516,7 +476,6 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group4_id_error', null);
                                     $set('work_group4_id', null);
-
                                     return;
                                 }
 
@@ -525,7 +484,6 @@ class LineResource extends Resource
 
                                 if (!$plantId) {
                                     $set('work_group4_id_error', 'Invalid plant name.');
-
                                     return;
                                 }
 
@@ -535,7 +493,6 @@ class LineResource extends Resource
 
                                 if (!$workGroupRecord) {
                                     $set('work_group4_id_error', 'Work group does not exist for this plant in master.');
-
                                     return;
                                 }
 
@@ -556,9 +513,10 @@ class LineResource extends Resource
                                         ->send();
                                     $set('work_group4_actual_id', '');
                                     $set('work_group4_id', null);
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     $set('work_group4_id_error', null);
                                     $set('work_group4_id', $workGroupRecord->id);
                                 }
@@ -590,7 +548,6 @@ class LineResource extends Resource
                         if ($state == null || trim($state) == '') {
                             $set('work_group5_id_error', null);
                             $set('work_group5_id', null);
-
                             return;
                         }
 
@@ -599,7 +556,6 @@ class LineResource extends Resource
 
                         if (!$plantId) {
                             $set('work_group5_id_error', 'Invalid plant name.');
-
                             return;
                         }
 
@@ -609,7 +565,6 @@ class LineResource extends Resource
 
                         if (!$workGroupRecord) {
                             $set('work_group5_id_error', 'Work group does not exist for this plant in master.');
-
                             return;
                         }
 
@@ -630,9 +585,10 @@ class LineResource extends Resource
                                 ->send();
                             $set('work_group5_actual_id', '');
                             $set('work_group5_id', null);
-
                             return;
-                                } else {
+                        }
+                        else
+                        {
                             $set('work_group5_id_error', null);
                             $set('work_group5_id', $workGroupRecord->id);
                         }
@@ -664,7 +620,6 @@ class LineResource extends Resource
                         if ($state == null || trim($state) == '') {
                             $set('work_group6_id_error', null);
                             $set('work_group6_id', null);
-
                             return;
                         }
 
@@ -673,7 +628,6 @@ class LineResource extends Resource
 
                         if (!$plantId) {
                             $set('work_group6_id_error', 'Invalid plant name.');
-
                             return;
                         }
 
@@ -683,7 +637,6 @@ class LineResource extends Resource
 
                         if (!$workGroupRecord) {
                             $set('work_group6_id_error', 'Work group does not exist for this plant in master.');
-
                             return;
                         }
 
@@ -704,9 +657,10 @@ class LineResource extends Resource
                                 ->send();
                             $set('work_group6_actual_id', '');
                             $set('work_group6_id', null);
-
                             return;
-                                } else {
+                        }
+                        else
+                        {
                             $set('work_group6_id_error', null);
                             $set('work_group6_id', $workGroupRecord->id);
                         }
@@ -738,7 +692,6 @@ class LineResource extends Resource
                         if ($state == null || trim($state) == '') {
                             $set('work_group7_id_error', null);
                             $set('work_group7_id', null);
-
                             return;
                         }
 
@@ -747,7 +700,6 @@ class LineResource extends Resource
 
                         if (!$plantId) {
                             $set('work_group7_id_error', 'Invalid plant name.');
-
                             return;
                         }
 
@@ -757,7 +709,6 @@ class LineResource extends Resource
 
                         if (!$workGroupRecord) {
                             $set('work_group7_id_error', 'Work group does not exist for this plant in master.');
-
                             return;
                         }
 
@@ -778,9 +729,10 @@ class LineResource extends Resource
                                 ->send();
                             $set('work_group7_actual_id', '');
                             $set('work_group7_id', null);
-
                             return;
-                                } else {
+                        }
+                        else
+                        {
                             $set('work_group7_id_error', null);
                             $set('work_group7_id', $workGroupRecord->id);
                         }
@@ -812,7 +764,6 @@ class LineResource extends Resource
                         if ($state == null || trim($state) == '') {
                             $set('work_group8_id_error', null);
                             $set('work_group8_id', null);
-
                             return;
                         }
 
@@ -821,7 +772,6 @@ class LineResource extends Resource
 
                         if (!$plantId) {
                             $set('work_group8_id_error', 'Invalid plant name.');
-
                             return;
                         }
 
@@ -831,7 +781,6 @@ class LineResource extends Resource
 
                         if (!$workGroupRecord) {
                             $set('work_group8_id_error', 'Work group does not exist for this plant in master.');
-
                             return;
                         }
 
@@ -852,9 +801,10 @@ class LineResource extends Resource
                                 ->send();
                             $set('work_group8_actual_id', '');
                             $set('work_group8_id', null);
-
                             return;
-                                } else {
+                        }
+                        else
+                        {
                             $set('work_group8_id_error', null);
                             $set('work_group8_id', $workGroupRecord->id);
                         }
@@ -886,7 +836,6 @@ class LineResource extends Resource
                         if ($state == null || trim($state) == '') {
                             $set('work_group9_id_error', null);
                             $set('work_group9_id', null);
-
                             return;
                         }
 
@@ -895,7 +844,6 @@ class LineResource extends Resource
 
                         if (!$plantId) {
                             $set('work_group9_id_error', 'Invalid plant name.');
-
                             return;
                         }
 
@@ -905,7 +853,6 @@ class LineResource extends Resource
 
                         if (!$workGroupRecord) {
                             $set('work_group9_id_error', 'Work group does not exist for this plant in master.');
-
                             return;
                         }
 
@@ -926,9 +873,10 @@ class LineResource extends Resource
                                 ->send();
                             $set('work_group9_actual_id', '');
                             $set('work_group9_id', null);
-
                             return;
-                                } else {
+                        }
+                        else
+                        {
                             $set('work_group9_id_error', null);
                             $set('work_group9_id', $workGroupRecord->id);
                         }
@@ -960,7 +908,6 @@ class LineResource extends Resource
                         if ($state == null || trim($state) == '') {
                             $set('work_group10_id_error', null);
                             $set('work_group10_id', null);
-
                             return;
                         }
 
@@ -969,7 +916,6 @@ class LineResource extends Resource
 
                         if (!$plantId) {
                             $set('work_group10_id_error', 'Invalid plant name.');
-
                             return;
                         }
 
@@ -979,7 +925,6 @@ class LineResource extends Resource
 
                         if (!$workGroupRecord) {
                             $set('work_group10_id_error', 'Work group does not exist for this plant in master.');
-
                             return;
                         }
 
@@ -1000,9 +945,10 @@ class LineResource extends Resource
                                 ->send();
                             $set('work_group10_actual_id', '');
                             $set('work_group10_id', null);
-
                             return;
-                                } else {
+                        }
+                        else
+                        {
                             $set('work_group10_id_error', null);
                             $set('work_group10_id', $workGroupRecord->id);
                         }
@@ -1038,7 +984,6 @@ class LineResource extends Resource
                         $paginator = $livewire->getTableRecords();
                         $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
                         $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
                         return ($currentPage - 1) * $perPage + $rowLoop->iteration;
                     }),
                 Tables\Columns\TextColumn::make('plant.name')
@@ -1046,11 +991,6 @@ class LineResource extends Resource
                     ->alignCenter()
                     ->sortable()
                     ->searchable(),
-                Tables\Columns\TextColumn::make('block.name')
-                    ->label('Block')
-                    ->alignCenter()
-                    ->sortable()
-                    ->searchable(),
                 Tables\Columns\TextColumn::make('name')
                     ->label('Line')
                     ->alignCenter()

app/Filament/Resources/ProductionPlanResource.php

@@ -6,8 +6,8 @@ use AlperenErsoy\FilamentExport\Actions\FilamentExportBulkAction;
 use App\Filament\Exports\ProductionPlanExporter;
 use App\Filament\Imports\ProductionPlanImporter;
 use App\Filament\Resources\ProductionPlanResource\Pages;
+use App\Filament\Resources\ProductionPlanResource\RelationManagers;
 use App\Models\Block;
-use App\Models\Item;
 use App\Models\Line;
 use App\Models\Plant;
 use App\Models\ProductionPlan;
@@ -16,18 +16,19 @@ use Carbon\Carbon;
 use Filament\Facades\Filament;
 use Filament\Forms;
 use Filament\Forms\Components\DateTimePicker;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Forms\Get;
 use Filament\Resources\Resource;
 use Filament\Tables;
-use Filament\Tables\Actions\ExportAction;
 use Filament\Tables\Actions\ImportAction;
-use Filament\Tables\Filters\Filter;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\SoftDeletingScope;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Select;
+use Filament\Tables\Actions\ExportAction;
+use Filament\Tables\Filters\Filter;
+use Illuminate\Support\Facades\Request;
 
 class ProductionPlanResource extends Resource
 {
@@ -54,8 +55,7 @@ class ProductionPlanResource extends Resource
                             ->reactive()
                             ->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();
-                                return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
                             })
                             ->default(function () {
                                 return optional(ProductionPlan::latest()->first())->plant_id;
@@ -67,9 +67,10 @@ class ProductionPlanResource extends Resource
                                 $set('block_name', null);
                                 if (!$plantId) {
                                     $set('ppPlantError', 'Please select a plant first.');
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     $set('ppPlantError', null);
                                 }
                             })
@@ -78,6 +79,102 @@ class ProductionPlanResource extends Resource
                             ])
                             ->hint(fn ($get) => $get('ppPlantError') ? $get('ppPlantError') : null)
                             ->hintColor('danger'),
+                        Forms\Components\Select::make('block_name')
+                            ->required()
+                            // ->nullable()
+                            ->label('Block')
+                            ->options(function (callable $get) {
+                                if (!$get('plant_id')) {
+                                    return [];
+                                }
+
+                                return Block::where('plant_id', $get('plant_id'))
+                                    ->pluck('name', 'id')
+                                    ->toArray();
+                            })
+                            ->reactive()
+                            ->default(function () {
+                                $latestShiftId = optional(ProductionPlan::latest()->first())->shift_id;
+                                return optional(Shift::where('id', $latestShiftId)->first())->block_id;
+                            })
+                            //->afterStateUpdated(fn ($set) => $set('shift_id', null))
+                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                                if($get('id'))
+                                {
+                                    $getShift = ProductionPlan::where('id', $get('id'))->first();
+                                    $getBlock = Shift::where('id', $getShift->shift_id)->first();
+                                    if($getBlock->block_id)
+                                    {
+                                        $set('block_name', $getBlock->block_id);
+                                        $set('ppBlockError', null);
+                                    }
+                                }
+
+                                $blockId = $get('block_name');
+                                $set('shift_id', null);
+
+                                if (!$blockId) {
+                                    $set('ppBlockError', 'Please select a block first.');
+                                    return;
+                                }
+                                else
+                                {
+                                    $set('ppBlockError', null);
+                                }
+                            })
+                            ->extraAttributes(fn ($get) => [
+                                'class' => $get('ppBlockError') ? 'border-red-500' : '',
+                            ])
+                            ->hint(fn ($get) => $get('ppBlockError') ? $get('ppBlockError') : null)
+                            ->hintColor('danger'),
+                        Forms\Components\Select::make('shift_id')
+                            ->relationship('shift', 'name')
+                            ->required()
+                            // ->nullable()
+                            ->autofocus(true)
+                            ->options(function (callable $get) {
+                                if (!$get('plant_id') || !$get('block_name')) {
+                                    return [];
+                                }
+
+                                return Shift::where('plant_id', $get('plant_id'))
+                                    ->where('block_id', $get('block_name'))
+                                    ->pluck('name', 'id')
+                                    ->toArray();
+                            })
+                            ->reactive()
+                            ->default(function () {
+                                return optional(ProductionPlan::latest()->first())->shift_id;
+                            })
+                            // ->afterStateUpdated(fn ($set) => $set('line_id', null))
+                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                                if($get('id'))
+                                {
+                                    $getShift = ProductionPlan::where('id', $get('id'))->first();
+                                    if($getShift->shift_id)
+                                    {
+                                        $set('shift_id', $getShift->shift_id);
+                                        $set('ppShiftError', null);
+                                    }
+                                }
+
+                                $curShiftId = $get('shift_id');
+                                $set('line_id', null);
+
+                                if (!$curShiftId) {
+                                    $set('ppShiftError', 'Please select a shift first.');
+                                    return;
+                                }
+                                else
+                                {
+                                    $set('ppShiftError', null);
+                                }
+                            })
+                            ->extraAttributes(fn ($get) => [
+                                'class' => $get('ppShiftError') ? 'border-red-500' : '',
+                            ])
+                            ->hint(fn ($get) => $get('ppShiftError') ? $get('ppShiftError') : null)
+                            ->hintColor('danger'),
                         Forms\Components\Select::make('line_id')
                             ->relationship('line', 'name')
                             ->required()
@@ -88,7 +185,7 @@ class ProductionPlanResource extends Resource
                             //     ->toArray() // Convert collection to array
                             // )
                             ->options(function (callable $get) {
-                                if (! $get('plant_id')) {
+                                if (!$get('plant_id') || !$get('block_name') || !$get('shift_id')) {
                                     return [];
                                 }
 
@@ -100,54 +197,207 @@ class ProductionPlanResource extends Resource
                             // ->default(function () {
                             //     return optional(ProductionPlan::latest()->first())->line_id;
                             // })
-                            // ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                            //     if ($get('id')) {
+                                if($get('id'))
-                            //         $getShift = ProductionPlan::where('id', $get('id'))->first();
+                                {
-                            //         if ($getShift->line_id) {
+                                    $getShift = ProductionPlan::where('id', $get('id'))->first();
-                            //             $set('line_id', $getShift->line_id);
+                                    if($getShift->line_id)
-                            //             $set('ppLineError', null);
+                                    {
-                            //         }
+                                        $set('line_id', $getShift->line_id);
-                            //     } else {
+                                        $set('ppLineError', null);
-                            //         $currentDT = Carbon::now()->toDateTimeString();
+                                    }
-                            //         $set('created_at', $currentDT);
+                                }
-                            //         $set('update_date', null);
+                                else
-                            //     }
+                                {
+                                    $currentDT = Carbon::now()->toDateTimeString();
+                                    $set('created_at', $currentDT);
+                                    $set('update_date', null);
+                                }
 
-                            //     $lineId = $get('line_id');
+                                $lineId = $get('line_id');
-                            //     // $set('plan_quantity', null);
+                                // $set('plan_quantity', null);
 
-                            //     if (! $lineId) {
+                                if (!$lineId) {
-                            //         $set('ppLineError', 'Please select a line first.');
+                                    $set('ppLineError', 'Please select a line first.');
+                                    return;
+                                }
+                                else
+                                {
+                                    $isUpdate = !empty($get('id'));
+                                    if (!$isUpdate)
+                                    {
+                                        $exists = ProductionPlan::where('plant_id', $get('plant_id'))
+                                        ->where('shift_id', $get('shift_id'))
+                                        ->where('line_id', $get('line_id'))
+                                        ->whereDate('created_at', today())
+                                        ->latest()
+                                        ->exists();
+
+                                        if ($exists)
+                                        {
+                                            $set('line_id', null);
+                                            $set('ppLineError', 'Production plan already updated.');
+                                            return;
+                                        }
+                                        else
+                                        {
+                                            $existShifts = ProductionPlan::where('plant_id', $get('plant_id'))
+                                            ->where('shift_id', $get('shift_id'))
+                                            ->where('line_id', $get('line_id'))
+                                            ->whereDate('created_at', Carbon::yesterday())
+                                            ->latest()
+                                            ->exists();
+
+                                            if ($existShifts) //if ($existShifts->count() > 0)
+                                            {
+                                                //$currentDate = date('Y-m-d');
+                                                $yesterday = date('Y-m-d', strtotime('-1 days'));
+
+                                                $shiftId = Shift::where('id', $get('shift_id'))
+                                                ->first();
+
+                                                [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                                                $hRs = (int) $hRs;
+                                                //   $miNs = (int) $miNs;-*/
+
+                                                $totalMinutes = $hRs * 60 + $miNs;
+
+                                                $from_dt = $yesterday . ' ' . $shiftId->start_time;
+
+                                                $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+
+                                                $currentDateTime = date('Y-m-d H:i:s');
+
+                                                // Check if current date time is within the range
+                                                if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
+                                                    //echo "Choosed a valid shift...";
+
+                                                    $set('line_id', null);
+                                                    $set('ppLineError', 'Production plan already updated.');
+                                                    // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                                                    return;
+                                                }
+                                                else
+                                                {
+                                                    $currentDate = date('Y-m-d');
+
+                                                    $shiftId = Shift::where('id', $get('shift_id'))
+                                                    ->first();
+
+                                                    [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                                                    $hRs = (int) $hRs;
+                                                    //   $miNs = (int) $miNs;-*/
+
+                                                    $totalMinutes = $hRs * 60 + $miNs;
+
+                                                    $from_dt = $currentDate . ' ' . $shiftId->start_time;
+
+                                                    $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+
+                                                    $currentDateTime = date('Y-m-d H:i:s');
+
+                                                    // Check if current date time is within the range
+                                                    if (!($currentDateTime >= $from_dt && $currentDateTime < $to_dt)) {
+                                                        //echo "Choosed a valid shift...";
+
+                                                        $set('line_id', null);
+                                                        $set('ppLineError', 'Choosed a invalid shift.');
+                                                        // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                                                        return;
+                                                    }
+                                                }
+
+                                                $set('ppLineError', null);
+                                                return;
+                                            }
+                                            else
+                                            {
+                                                //$currentDate = date('Y-m-d');
+                                                $yesterday = date('Y-m-d', strtotime('-1 days'));
+
+                                                $shiftId = Shift::where('id', $get('shift_id'))
+                                                ->first();
+
+                                                [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                                                $hRs = (int) $hRs;
+                                                //   $miNs = (int) $miNs;-*/
+
+                                                $totalMinutes = $hRs * 60 + $miNs;
+
+                                                $from_dt = $yesterday . ' ' . $shiftId->start_time;
+
+                                                $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+
+                                                $currentDateTime = date('Y-m-d H:i:s');
+
+                                                // Check if current date time is within the range
+                                                if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
+                                                    //echo "Choosed a valid shift...";
+
+                                                    // here i'm updating created as yesterday
+                                                    $set('created_at', $from_dt);
+                                                    $set('update_date', '1');
+
+                                                    $set('ppLineError', null);
+                                                    // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                                                    return;
+                                                }
+                                                else
+                                                {
+                                                    $currentDate = date('Y-m-d');
+
+                                                    $shiftId = Shift::where('id', $get('shift_id'))
+                                                    ->first();
+
+                                                    [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
+                                                    $hRs = (int) $hRs;
+                                                    //   $miNs = (int) $miNs;-*/
+
+                                                    $totalMinutes = $hRs * 60 + $miNs;
+
+                                                    $from_dt = $currentDate . ' ' . $shiftId->start_time;
+
+                                                    $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
+
+                                                    $currentDateTime = date('Y-m-d H:i:s');
+
+                                                    // Check if current date time is within the range
+                                                    if (!($currentDateTime >= $from_dt && $currentDateTime < $to_dt)) {
+                                                        //echo "Choosed a valid shift...";
+
+                                                        $set('line_id', null);
+                                                        $set('ppLineError', 'Choosed a invalid shift.');
+                                                        // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
+                                                        return;
+                                                    }
+                                                }
+
+                                                $set('ppLineError', null);
+                                                return;
+                                            }
 
-                            //         return;
-                            //     } else {
-                            //         $isUpdate = ! empty($get('id'));
-                            //         if (! $isUpdate) {
                                             // $exists = ProductionPlan::where('plant_id', $get('plant_id'))
-                            //                 ->where('shift_id', $get('shift_id'))
+                                            //     //->where('shift_id', $get('shift_id'))
                                             //     ->where('line_id', $get('line_id'))
                                             //     ->whereDate('created_at', today())
-                            //                 ->latest()
+                                            //     ->latest()  // Orders by created_at DESC
-                            //                 ->exists();
+                                            //     ->first();
 
-                            //             if ($exists) {
+                                            // if ($exists)
-                            //                 $set('line_id', null);
+                                            // {
-                            //                 $set('ppLineError', 'Production plan already updated.');
+                                            //     $existingShifts = ProductionPlan::where('plant_id', $get('plant_id'))
-
+                                            //     //->where('shift_id', $get('shift_id'))
-                            //                 return;
-                            //             } else {
-                            //                 $existShifts = ProductionPlan::where('plant_id', $get('plant_id'))
-                            //                     ->where('shift_id', $get('shift_id'))
                                             //     ->where('line_id', $get('line_id'))
-                            //                     ->whereDate('created_at', Carbon::yesterday())
+                                            //     // ->whereDate('created_at', today())
-                            //                     ->latest()
+                                            //     ->whereDate('created_at', today())
-                            //                     ->exists();
+                                            //     ->get();
 
-                            //                 if ($existShifts) { // if ($existShifts->count() > 0)
+                                            //     foreach ($existingShifts as $shift) {
-                            //                     // $currentDate = date('Y-m-d');
+                                            //         $curShiftId = $shift->shift_id;
-                            //                     $yesterday = date('Y-m-d', strtotime('-1 days'));
 
-                            //                     $shiftId = Shift::where('id', $get('shift_id'))
+                                            //         $currentDate = date('Y-m-d');
+
+                                            //         $shiftId = \App\Models\Shift::where('id', $curShiftId)
                                             //         ->first();
 
                                             //         [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
@@ -156,7 +406,7 @@ class ProductionPlanResource extends Resource
 
                                             //         $totalMinutes = $hRs * 60 + $miNs;
 
-                            //                     $from_dt = $yesterday.' '.$shiftId->start_time;
+                                            //         $from_dt = $currentDate . ' ' . $shiftId->start_time;
 
                                             //         $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
 
@@ -165,192 +415,30 @@ class ProductionPlanResource extends Resource
                                             //         // Check if current date time is within the range
                                             //         if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
                                             //             //echo "Choosed a valid shift...";
+                                            //             // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
 
                                             //             $set('line_id', null);
                                             //             $set('ppLineError', 'Production plan already updated.');
-
-                            //                         // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-                            //                         return;
-                            //                     } else {
-                            //                         $currentDate = date('Y-m-d');
-
-                            //                         $shiftId = Shift::where('id', $get('shift_id'))
-                            //                             ->first();
-
-                            //                         [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-                            //                         $hRs = (int) $hRs;
-                            //                         //   $miNs = (int) $miNs;-*/
-
-                            //                         $totalMinutes = $hRs * 60 + $miNs;
-
-                            //                         $from_dt = $currentDate.' '.$shiftId->start_time;
-
-                            //                         $to_dt = date('Y-m-d H:i:s', strtotime($from_dt." + $totalMinutes minutes"));
-
-                            //                         $currentDateTime = date('Y-m-d H:i:s');
-
-                            //                         // Check if current date time is within the range
-                            //                         if (! ($currentDateTime >= $from_dt && $currentDateTime < $to_dt)) {
-                            //                             // echo "Choosed a valid shift...";
-
-                            //                             $set('line_id', null);
-                            //                             $set('ppLineError', 'Choosed a invalid shift.');
-
-                            //                             // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
                                             //             return;
                                             //         }
-                            //                     }
+                                            //         // else {
-
+                                            //             //     $set('ppLineError', 'Choosed a invalid shift...');
-                            //                     $set('ppLineError', null);
-
-                            //                     return;
-                            //                 } else {
-                            //                     // $currentDate = date('Y-m-d');
-                            //                     $yesterday = date('Y-m-d', strtotime('-1 days'));
-
-                            //                     $shiftId = Shift::where('id', $get('shift_id'))
-                            //                         ->first();
-
-                            //                     [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-                            //                     $hRs = (int) $hRs;
-                            //                     //   $miNs = (int) $miNs;-*/
-
-                            //                     $totalMinutes = $hRs * 60 + $miNs;
-
-                            //                     $from_dt = $yesterday.' '.$shiftId->start_time;
-
-                            //                     $to_dt = date('Y-m-d H:i:s', strtotime($from_dt." + $totalMinutes minutes"));
-
-                            //                     $currentDateTime = date('Y-m-d H:i:s');
-
-                            //                     // Check if current date time is within the range
-                            //                     if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
-                            //                         // echo "Choosed a valid shift...";
-
-                            //                         // here i'm updating created as yesterday
-                            //                         $set('created_at', $from_dt);
-                            //                         $set('update_date', '1');
-
-                            //                         $set('ppLineError', null);
-
-                            //                         // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-                            //                         return;
-                            //                     } else {
-                            //                         $currentDate = date('Y-m-d');
-
-                            //                         $shiftId = Shift::where('id', $get('shift_id'))
-                            //                             ->first();
-
-                            //                         [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-                            //                         $hRs = (int) $hRs;
-                            //                         //   $miNs = (int) $miNs;-*/
-
-                            //                         $totalMinutes = $hRs * 60 + $miNs;
-
-                            //                         $from_dt = $currentDate.' '.$shiftId->start_time;
-
-                            //                         $to_dt = date('Y-m-d H:i:s', strtotime($from_dt." + $totalMinutes minutes"));
-
-                            //                         $currentDateTime = date('Y-m-d H:i:s');
-
-                            //                         // Check if current date time is within the range
-                            //                         if (! ($currentDateTime >= $from_dt && $currentDateTime < $to_dt)) {
-                            //                             // echo "Choosed a valid shift...";
-
-                            //                             $set('line_id', null);
-                            //                             $set('ppLineError', 'Choosed a invalid shift.');
-
-                            //                             // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-                            //                             return;
-                            //                         }
-                            //                     }
-
-                            //                     $set('ppLineError', null);
-
-                            //                     return;
-                            //                 }
-
-                            //                 // $exists = ProductionPlan::where('plant_id', $get('plant_id'))
-                            //                 //     //->where('shift_id', $get('shift_id'))
-                            //                 //     ->where('line_id', $get('line_id'))
-                            //                 //     ->whereDate('created_at', today())
-                            //                 //     ->latest()  // Orders by created_at DESC
-                            //                 //     ->first();
-
-                            //                 // if ($exists)
-                            //                 // {
-                            //                 //     $existingShifts = ProductionPlan::where('plant_id', $get('plant_id'))
-                            //                 //     //->where('shift_id', $get('shift_id'))
-                            //                 //     ->where('line_id', $get('line_id'))
-                            //                 //     // ->whereDate('created_at', today())
-                            //                 //     ->whereDate('created_at', today())
-                            //                 //     ->get();
-
-                            //                 //     foreach ($existingShifts as $shift) {
-                            //                 //         $curShiftId = $shift->shift_id;
-
-                            //                 //         $currentDate = date('Y-m-d');
-
-                            //                 //         $shiftId = \App\Models\Shift::where('id', $curShiftId)
-                            //                 //         ->first();
-
-                            //                 //         [$hRs, $miNs] = explode('.', $shiftId->duration) + [0, 0];
-                            //                 //         $hRs = (int) $hRs;
-                            //                 //         //   $miNs = (int) $miNs;-*/
-
-                            //                 //         $totalMinutes = $hRs * 60 + $miNs;
-
-                            //                 //         $from_dt = $currentDate . ' ' . $shiftId->start_time;
-
-                            //                 //         $to_dt = date('Y-m-d H:i:s', strtotime($from_dt . " + $totalMinutes minutes"));
-
-                            //                 //         $currentDateTime = date('Y-m-d H:i:s');
-
-                            //                 //         // Check if current date time is within the range
-                            //                 //         if ($currentDateTime >= $from_dt && $currentDateTime < $to_dt) {
-                            //                 //             //echo "Choosed a valid shift...";
-                            //                 //             // $set('ppLineError', 'Valid (From: '.$from_dt.', To: '.$to_dt.')');
-
-                            //                 //             $set('line_id', null);
-                            //                 //             $set('ppLineError', 'Production plan already updated.');
-                            //                 //             return;
-                            //                 //         }
-                            //                 //         // else {
-                            //                 //             //     $set('ppLineError', 'Choosed a invalid shift...');
-                            //                 //             //     return;
-                            //                 //             // }
-                            //                 //     }
-                            //                 //     $set('ppLineError', null);
                                             //             //     return;
                                             //             // }
                                             //     }
-                            //         }
                                             //     $set('ppLineError', null);
+                                            //     return;
                                             // }
-                            // })
+                                        }
-                            ->afterStateUpdated(function ($state, callable $set, callable $get) {
+                                    }
-                                $set('item_id', null);
+                                    $set('ppLineError', null);
-                                $set('plan_quantity', null);
+                                }
                             })
                             ->extraAttributes(fn ($get) => [
                                 'class' => $get('ppLineError') ? 'border-red-500' : '',
                             ])
                             ->hint(fn ($get) => $get('ppLineError') ? $get('ppLineError') : null)
                             ->hintColor('danger'),
-                        Forms\Components\Select::make('item_id')
-                            ->label('Item')
-                            ->reactive()
-                            ->searchable()
-                            ->required()
-                            ->options(function (callable $get) {
-                                if (! $get('plant_id')) {
-                                    return [];
-                                }
-
-                                return Item::where('plant_id', $get('plant_id'))
-                                    ->pluck('code', 'id')
-                                    ->toArray();
-                            }),
                         Forms\Components\TextInput::make('plan_quantity')
                             ->required()
                             ->integer()
@@ -361,8 +449,10 @@ class ProductionPlanResource extends Resource
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
                                 $planQuan = $get('plan_quantity');
 
-                                if (! $get('update_date')) {
+                                if(!$get('update_date') )
-                                    if (! $get('id')) {
+                                {
+                                    if(!$get('id'))
+                                    {
                                         $currentDT = Carbon::now()->toDateTimeString();
                                         $set('created_at', $currentDT);
                                     }
@@ -370,9 +460,10 @@ class ProductionPlanResource extends Resource
 
                                 if (!$planQuan) {
                                     $set('ppPlanQuanError', 'Scan the valid plan quantity.');
-
                                     return;
-                                } else {
+                                }
+                                else
+                                {
                                     $set('ppPlanQuanError', null);
                                 }
                             })
@@ -381,19 +472,29 @@ class ProductionPlanResource extends Resource
                             ])
                             ->hint(fn ($get) => $get('ppPlanQuanError') ? $get('ppPlanQuanError') : null)
                             ->hintColor('danger'),
-                        // Forms\Components\TextInput::make('production_quantity')
+                        Forms\Components\TextInput::make('production_quantity')
-                        //     ->required()
+                            ->required()
-                        //     ->integer()
+                            ->integer()
-                        //     ->label('Production Quantity')
+                            ->label('Production Quantity')
-                        //     ->readOnly(fn (callable $get) => ! $get('id'))
+                            ->readOnly(fn (callable $get) => !$get('id'))
-                        //     ->default(0),
+                            ->default(0),
                         Forms\Components\TextInput::make('id')
                             ->hidden()
                             ->readOnly(),
+                        Forms\Components\TextInput::make('update_date')
+                            ->hidden()
+                            ->reactive()
+                            ->readOnly(),
+                        Forms\Components\DateTimePicker::make('created_at')
+                            ->label('Created DateTime')
+                            ->hidden()
+                            ->reactive()
+                            ->required()
+                            ->readOnly(),
                         Forms\Components\Hidden::make('operator_id')
                             ->default(Filament::auth()->user()->name),
                         ])
-                    ->columns(4),
+                    ->columns(2),
             ]);
     }
 
@@ -428,55 +529,34 @@ class ProductionPlanResource extends Resource
                         $paginator = $livewire->getTableRecords();
                         $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
                         $currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
-
                         return ($currentPage - 1) * $perPage + $rowLoop->iteration;
                     }),
-                Tables\Columns\TextColumn::make('plant.name')
-                    ->label('Plant')
-                    ->alignCenter()
-                    ->sortable()
-                    ->searchable(),
-                Tables\Columns\TextColumn::make('line.name')
-                    ->label('Plant')
-                    ->alignCenter()
-                    ->sortable()
-                    ->searchable(),
-                Tables\Columns\TextColumn::make('item.code')
-                    ->label('Item')
-                    ->alignCenter()
-                    ->sortable()
-                    ->searchable(),
                 Tables\Columns\TextColumn::make('plan_quantity')
                     ->label('Plan Quantity')
                     ->alignCenter()
                     ->numeric()
-                    ->sortable()
+                    ->sortable(),
-                    ->searchable(),
-                Tables\Columns\TextColumn::make('working_days')
-                    ->label('Working Days')
-                    ->alignCenter()
-                    ->numeric()
-                    ->sortable()
-                    ->searchable(),
                 Tables\Columns\TextColumn::make('production_quantity')
                     ->label('Production Quantity')
                     ->alignCenter()
                     ->numeric()
-                    ->sortable()
+                    ->sortable(),
-                    ->searchable(),
+                Tables\Columns\TextColumn::make('line.name')
-                // Tables\Columns\TextColumn::make('line.name')
+                    ->label('Line')
-                //     ->label('Line')
+                    ->alignCenter()
-                //     ->alignCenter()
+                    ->sortable(),// ->searchable(),
-                //     ->sortable(), // ->searchable(),
+                Tables\Columns\TextColumn::make('shift.block.name')
-                // Tables\Columns\TextColumn::make('shift.block.name')
+                    ->label('Block')
-                //     ->label('Block')
+                    ->alignCenter()
-                //     ->alignCenter()
+                    ->sortable(),
-                //     ->sortable(),
+                Tables\Columns\TextColumn::make('shift.name')
-                // Tables\Columns\TextColumn::make('shift.name')
+                    ->label('Shift')
-                //     ->label('Shift')
+                    ->alignCenter()
-                //     ->alignCenter()
+                    ->sortable(),// ->searchable(),
-                //     ->sortable(), // ->searchable(),
+                Tables\Columns\TextColumn::make('plant.name')
-
+                    ->label('Plant')
+                    ->alignCenter()
+                    ->sortable(),// ->searchable(),
                 Tables\Columns\TextColumn::make('created_at')
                     ->label('Created At')
                     ->dateTime()
@@ -513,8 +593,7 @@ class ProductionPlanResource extends Resource
                             // })
                             ->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();
-                                return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
                             })
                             ->reactive()
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
@@ -533,7 +612,6 @@ class ProductionPlanResource extends Resource
                                 if (!$plantId ) {
                                     return [];
                                 }
-
                                 return Line::where('plant_id', $plantId)
                                 ->pluck('name', 'id');
                             })
@@ -549,7 +627,6 @@ class ProductionPlanResource extends Resource
                                 if (!$plantId ) {
                                     return [];
                                 }
-
                                 return Block::where('plant_id', $get('Plant'))->pluck('name', 'id');
                             })
                             ->reactive()
@@ -592,33 +669,25 @@ class ProductionPlanResource extends Resource
                             return $query->whereRaw('1 = 0');
                         }
 
-                        if (! empty($data['Plant'])) {// if ($plant = $data['Plant'] ?? null) {
+                        if ($plant = $data['Plant'] ?? null) {
-                            $query->where('plant_id', $data['Plant']);
+                            $query->where('plant_id', $plant);
-                        } else {
-                            $userHas = Filament::auth()->user()->plant_id;
-
-                            if ($userHas && strlen($userHas) > 0) {
-                                return $query->whereRaw('1 = 0');
-                            }
                         }
 
-                        if (! empty($data['Shift'])) {// if ($shift = $data['Shift'] ?? null) {
+                        if ($shift = $data['Shift'] ?? null) {
-                            $query->where('shift_id', $data['Shift']);
+                            $query->where('shift_id', $shift);
                         }
 
-
+                        if ($line = $data['Line'] ?? null) {
-                        if (! empty($data['Line'])) {// if ($line = $data['Line'] ?? null) {
+                            $query->where('line_id', $line);
-                            $query->where('line_id', $data['Line']);
                         }
 
-                        if (! empty($data['created_from'])) {// if ($from = $data['created_from'] ?? null) {
+                        if ($from = $data['created_from'] ?? null) {
-                            $query->where('created_at', '>=', $data['created_from']);
+                            $query->where('created_at', '>=', $from);
                         }
 
-                        if (! empty($data['created_to'])) {// if ($to = $data['created_to'] ?? null) {
+                        if ($to = $data['created_to'] ?? null) {
-                            $query->where('created_at', '<=', $data['created_to']);
+                            $query->where('created_at', '<=', $to);
                         }
-
                         return $query;
                     })
                     ->indicateUsing(function (array $data) {
@@ -626,12 +695,6 @@ class ProductionPlanResource extends Resource
 
                         if (!empty($data['Plant'])) {
                             $indicators[] = 'Plant: ' . Plant::where('id', $data['Plant'])->value('name');
-                        } else {
-                            $userHas = Filament::auth()->user()->plant_id;
-
-                            if ($userHas && strlen($userHas) > 0) {
-                                return 'Plant: Choose plant to filter records.';
-                            }
                         }
 
                         if (!empty($data['Shift'])) {
@@ -651,7 +714,7 @@ class ProductionPlanResource extends Resource
                         }
 
                         return $indicators;
-                    }),
+                    })
             ])
             ->filtersFormMaxHeight('280px')
             ->actions([
@@ -663,7 +726,7 @@ class ProductionPlanResource extends Resource
                     Tables\Actions\DeleteBulkAction::make(),
                     Tables\Actions\ForceDeleteBulkAction::make(),
                     Tables\Actions\RestoreBulkAction::make(),
-                    FilamentExportBulkAction::make('export'),
+                    FilamentExportBulkAction::make('export')
                 ]),
             ])
             ->headerActions([

app/Filament/Resources/RfqTransporterBidResource/Pages/EditRfqTransporterBid.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Resources\RfqTransporterBidResource\Pages;
 
 use App\Filament\Resources\RfqTransporterBidResource;
-use App\Models\RequestQuotation;
 use App\Models\RfqTransporterBid;
 use App\Models\SpotRateTransportMaster;
 use App\Models\User;
@@ -12,7 +11,6 @@ use Filament\Actions;
 use Filament\Facades\Filament;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
-use Illuminate\Support\Facades\Log;
 
 class EditRfqTransporterBid extends EditRecord
 {
@@ -24,39 +22,26 @@ class EditRfqTransporterBid extends EditRecord
             return;
         }
 
+        //  dd($this->record);
+
         $rank = RfqTransporterBid::where('request_quotation_id', $this->record->request_quotation_id)
+            ->where('spot_rate_transport_master_id', $this->record->spot_rate_transport_master_id)
             ->orderBy('total_freight_charge')
             ->pluck('id')
             ->search($this->record->id) + 1;
 
-        $requestQuotation = RequestQuotation::findOrFail(
+        $spotRate = SpotRateTransportMaster::findOrFail(
-            $this->record->request_quotation_id
+            $this->record->spot_rate_transport_master_id
         );
 
-        $spotRateId = $requestQuotation->spot_rate_transport_master_id;
+        $userNames = json_decode($spotRate->user_name, true);
-
-        $spotRate = SpotRateTransportMaster::findOrFail($spotRateId);
-
-        $userNames = $spotRate->user_name;
-
-        Log::info('User names from spot rate', [
-            'user_name_raw' => $spotRate->user_name,
-        ]);
 
         if (!is_array($userNames)) {
-            Log::warning('user_name is not array, resetting', [
-                'user_name' => $userNames,
-            ]);
             $userNames = [];
         }
 
-
         $users = User::whereIn('name', $userNames)->get();
 
-        Log::info('Matched users', [
-            'count' => $users->count(),
-            'user_ids' => $users->pluck('id'),
-        ]);
 
         // $recipients = User::role(['Super Admin', 'Rfq Supervisor', 'TransporterBid Employee'])->get();
 
@@ -75,8 +60,7 @@ class EditRfqTransporterBid extends EditRecord
         // $user1 = Filament::auth()->user();
 
 
-        $rfqNumber = $this->record->requestQuotation->rfq_number;
+        $body = "{$currentUser->name} current rank is #{$rank}";
-        $body = "{$currentUser->name} has updated the bid for RFQ No '{$rfqNumber}'. The current rank is #{$rank}.";
 
         // Notification::make()
         //     ->title('Rank Updated')
@@ -91,7 +75,7 @@ class EditRfqTransporterBid extends EditRecord
 
         Notification::make()
         ->title('Rank Updated')
-        ->body("{$currentUser->name} has updated the bid for RFQ No '{$rfqNumber}'. The current rank is #{$rank}.")
+        ->body("{$currentUser->name} current rank is #{$rank}")
         ->success()
         ->sendToDatabase($users);
 
@@ -104,61 +88,16 @@ class EditRfqTransporterBid extends EditRecord
         //     );
         // }
 
-        // foreach ($users as $user) {
-
-        // Log::info('Checking push subscription for user', [
-        //     'user_id' => $user->id,
-        //     'name' => $user->name,
-        //     'subscription_count' => $user->pushSubscriptions()->count(),
-        // ]);
-        //     if ($user->pushSubscriptions()->exists()) {
-
-        //         Log::info('Sending push notification', [
-        //             'user_id' => $user->id,
-        //         ]);
-        //         $user->notify(
-        //             new PushAlertNotification(
-        //                 'Rank Updated',
-        //                 $body
-        //             )
-        //         );
-        //     }
-        //     else {
-        //         Log::warning('User has NO push subscription', [
-        //             'user_id' => $user->id,
-        //         ]);
-        //     }
-        // }
-
-
         foreach ($users as $user) {
-
+            if ($user->pushSubscriptions()->exists()) {
-                $count = $user->pushSubscriptions()->count();
+                $user->notify(
-
+                    new PushAlertNotification(
-                Log::info('Checking push subscription for user', [
-                    'user_id' => $user->id,
-                    'name' => $user->name,
-                    'subscription_count' => $count,
-                ]);
-
-                if ($count == 0) {
-                    Log::warning('User has NO push subscription', [
-                        'user_id' => $user->id,
-                    ]);
-                    continue;
-                }
-
-                Log::info('Sending push notification', [
-                    'user_id' => $user->id,
-                ]);
-
-                // ✅ THIS IS ALL YOU NEED
-                $user->notify(new PushAlertNotification(
                         'Rank Updated',
                         $body
-                ));
+                    )
+                );
+            }
         }
-
 
 
     }

app/Livewire/ProductionTargetPlan.php

@@ -1,236 +0,0 @@
-<?php
-
-namespace App\Livewire;
-
-use App\Exports\ProductionPlanExport;
-use App\Models\ProductionPlan;
-use App\Models\ProductionQuantity;
-use Livewire\Component;
-use Carbon\Carbon;
-use DB;
-use Maatwebsite\Excel\Facades\Excel;
-
-class ProductionTargetPlan extends Component
-{
-
-    public $plantId, $lineId, $month, $year;
-
-    public $records = [];
-
-    public $dates = [];
-
-    public $leaveDates = [];
-
-    public $productionPlanDates = '';
-
-
-    protected $listeners = [
-        'loadData' => 'loadProductionData',
-        'loadData1' => 'exportProductionData',
-    ];
-
-    public function getMonthDates($month, $year)
-    {
-        $start = Carbon::createFromDate($year, $month, 1);
-        $days  = $start->daysInMonth;
-
-        $dates = [];
-
-        for ($i = 1; $i <= $days; $i++) {
-            $dates[] = Carbon::createFromDate($year, $month, $i)
-                ->format('Y-m-d');
-        }
-
-        return $dates;
-    }
-
-    public function loadProductionData($plantId, $lineId, $month, $year){
-
-        if (!$plantId || !$lineId || !$month || !$year) {
-            $this->records = [];
-            $this->dates = [];
-            $this->leaveDates = [];
-            return;
-        }
-
-        $this->dates = $this->getMonthDates($month, $year);
-
-        $data = ProductionPlan::query()
-        ->join('items', 'items.id', '=', 'production_plans.item_id')
-        ->join('lines', 'lines.id', '=', 'production_plans.line_id')
-        ->join('plants', 'plants.id', '=', 'production_plans.plant_id')
-        ->where('production_plans.plant_id', $plantId)
-        ->where('production_plans.line_id', $lineId)
-        ->whereMonth('production_plans.created_at', $month)
-        ->whereYear('production_plans.created_at', $year)
-        ->select(
-            'production_plans.created_at',
-            'production_plans.operator_id',
-            'plants.name as plant',
-            'items.code as item_code',
-            'items.description as item_description',
-            'lines.name as line_name',
-            'production_plans.leave_dates'
-        )
-        ->first();
-
-        if ($data && $data->leave_dates) {
-            $this->leaveDates = array_map('trim', explode(',', $data->leave_dates));
-        }
-
-        $producedData = ProductionQuantity::selectRaw("
-            plant_id,
-            line_id,
-            item_id,
-            DATE(created_at) as prod_date,
-            COUNT(*) as total_qty
-        ")
-        ->where('plant_id', $plantId)
-        ->where('line_id', $lineId)
-        ->whereMonth('created_at', $month)
-        ->whereYear('created_at', $year)
-        ->groupBy('plant_id', 'line_id', 'item_id', DB::raw('DATE(created_at)'))
-        ->get()
-        ->groupBy(function ($row) {
-            return $row->plant_id . '_' . $row->line_id . '_' . $row->item_id;
-        })
-        ->map(function ($group) {
-            return $group->keyBy('prod_date');
-        });
-
-        $this->records = ProductionPlan::query()
-            ->join('items', 'items.id', '=', 'production_plans.item_id')
-            ->join('lines', 'lines.id', '=', 'production_plans.line_id')
-            ->join('plants', 'plants.id', '=', 'production_plans.plant_id')
-            ->where('production_plans.plant_id', $plantId)
-            ->where('production_plans.line_id', $lineId)
-            ->whereMonth('production_plans.created_at', $month)
-            ->whereYear('production_plans.created_at', $year)
-            ->select(
-                'production_plans.item_id',
-                'production_plans.plant_id',
-                'production_plans.line_id',
-                'production_plans.plan_quantity',
-                'production_plans.working_days',
-                'items.code as item_code',
-                'items.description as item_description',
-                'lines.name as line_name',
-                'plants.name as plant_name'
-            )
-            ->get()
-            // ->map(function ($row) use ($producedData) {
-            //     $row = $row->toArray();
-
-            //     $row['daily_target'] = ($row['working_days'] > 0)
-            //         ? round($row['plan_quantity'] / $row['working_days'], 2)
-            //         : 0;
-
-            //     // $key = $row['plant_id'].'_'.$row['line_id'].'_'.$row['item_id'];
-
-            //     // foreach ($this->dates as $date) {
-            //     //     $found = $producedData[$key][$date] ?? null;
-            //     //     $row['produced_quantity'][$date] = $found->total_qty ?? 0;
-            //     // }
-
-            //     $remainingDays = $row['working_days'];
-            //     $pendingQty = 0;
-
-            //     $row['daily_target_dynamic'] = [];
-            //     $row['produced_quantity'] = [];
-
-            //     $key = $row['plant_id'].'_'.$row['line_id'].'_'.$row['item_id'];
-
-            //     foreach ($this->dates as $date) {
-
-            //         $found = $producedData[$key][$date] ?? null;
-            //         $producedQty = $found->total_qty ?? 0;
-
-            //         // today's adjusted target
-            //         $todayTarget = $baseDailyTarget;
-
-            //         if ($remainingDays > 1 && $pendingQty > 0) {
-            //             $todayTarget += $pendingQty / $remainingDays;
-            //         }
-
-            //         $row['daily_target_dynamic'][$date] = round($todayTarget, 2);
-            //         $row['produced_quantity'][$date] = $producedQty;
-
-            //         // calculate today's shortfall
-            //         $pendingQty += ($todayTarget - $producedQty);
-
-            //         if ($pendingQty < 0) {
-            //             $pendingQty = 0;
-            //         }
-
-            //         $remainingDays--;
-            //     }
-
-            //     return $row;
-            // })
-            ->map(function ($row) use ($producedData) {
-
-                $row = $row->toArray();
-
-                $remainingQty = $row['plan_quantity'];
-                $remainingDays = $row['working_days'];
-
-                $row['daily_target_dynamic'] = [];
-                $row['produced_quantity'] = [];
-
-                $key = $row['plant_id'].'_'.$row['line_id'].'_'.$row['item_id'];
-
-                foreach ($this->dates as $date) {
-
-                    // Skip leave dates
-                    if (in_array($date, $this->leaveDates)) {
-                        $row['daily_target_dynamic'][$date] = '-';
-                        $row['produced_quantity'][$date] = '-';
-                        continue;
-                    }
-
-                    $todayTarget = $remainingDays > 0
-                        ? round($remainingQty / $remainingDays, 2)
-                        : 0;
-
-                    //$todayTarget = $remainingDays > 0
-                    // ? $remainingQty / $remainingDays
-                    // : 0;
-
-                    $producedQty = isset($producedData[$key][$date])
-                        ? $producedData[$key][$date]->total_qty
-                        : 0;
-
-                    $row['daily_target_dynamic'][$date] = $todayTarget;
-                    $row['produced_quantity'][$date] = $producedQty;
-
-                    // Carry forward pending
-                    $remainingQty -= $producedQty;
-                    if ($remainingQty < 0) {
-                        $remainingQty = 0;
-                    }
-
-                    $remainingDays--;
-                }
-
-                return $row;
-            })
-            ->toArray();
-    }
-
-    public function exportProductionData()
-    {
-        return Excel::download(
-            new ProductionPlanExport($this->records, $this->dates),
-            'production_plan_data.xlsx'
-        );
-    }
-
-    public function render()
-    {
-        // return view('livewire.production-target-plan');
-        return view('livewire.production-target-plan', [
-            'records' => $this->records,
-            'dates'   => $this->dates,
-        ]);
-    }
-}

app/Models/Item.php

@@ -12,13 +12,11 @@ class Item extends Model
 
     protected $fillable = [
         'plant_id',
-        'line_id',
         'category',
         'code',
         'description',
         'hourly_quantity',
         'uom',
-        'line_capacity',
     ];
 
     public function plant(): BelongsTo
@@ -26,11 +24,6 @@ class Item extends Model
         return $this->belongsTo(Plant::class);
     }
 
-    public function line(): BelongsTo
-    {
-        return $this->belongsTo(Line::class);
-    }
-
     public function stickerMasters()
     {
         return $this->hasMany(StickerMaster::class, 'item_id', 'id');

app/Models/Line.php

@@ -13,7 +13,6 @@ class Line extends Model
 
     protected $fillable = [
         "plant_id",
-        "block_id",
         "name",
         "type",
         "group_work_center",
@@ -35,11 +34,6 @@ class Line extends Model
         return $this->belongsTo(Plant::class);
     }
 
-    public function block(): BelongsTo
-    {
-        return $this->belongsTo(Block::class);
-    }
-
     public function testingPanelReadings()
     {
         return $this->hasMany(TestingPanelReading::class);

app/Models/ProductionPlan.php

@@ -12,15 +12,12 @@ class ProductionPlan extends Model
 
     protected $fillable = [
         "plant_id",
-        "item_id",
         "shift_id",
         "created_at",
         "line_id",
         "plan_quantity",
         "production_quantity",
         "operator_id",
-        "working_days",
-        "leave_dates",
     ];
 
     public function plant(): BelongsTo
@@ -37,9 +34,4 @@ class ProductionPlan extends Model
     {
         return $this->belongsTo(Line::class);
     }
-
-    public function item(): BelongsTo
-    {
-        return $this->belongsTo(Item::class);
-    }
 }

app/Models/ProductionQuantity.php

@@ -16,7 +16,6 @@ class ProductionQuantity extends Model
 
     protected $fillable = [
         "plant_id",
-        "machine_id",
         "shift_id",
         "line_id",
         "item_id",
@@ -51,11 +50,6 @@ class ProductionQuantity extends Model
         return $this->belongsTo(Item::class);
     }
 
-    public function machine(): BelongsTo
-    {
-        return $this->belongsTo(Machine::class);
-    }
-
     protected static function booted()
     {
         static::created(function ($productionQuantity) {

database/migrations/2026_02_16_095917_add_foreign_key_item_id_column_to_production_plans.php

@@ -1,34 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            ALTER TABLE production_plans
-            ADD COLUMN item_id BIGINT DEFAULT NULL,
-            ADD CONSTRAINT production_plans_item_id_fkey
-            FOREIGN KEY (item_id) REFERENCES items(id);
-        SQL;
-
-        DB::statement($sql);
-
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('production_plans', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_02_16_100344_add_foreign_key_block_id_column_to_lines.php

@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            ALTER TABLE lines
-            ADD COLUMN block_id BIGINT DEFAULT NULL,
-            ADD CONSTRAINT lines_block_id_fkey
-            FOREIGN KEY (block_id) REFERENCES blocks(id);
-        SQL;
-
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('lines', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_02_16_100625_add_foreign_key_line_id_and_line_capacity_column_to_items.php

@@ -1,40 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql1 = <<<'SQL'
-            ALTER TABLE items
-            ADD COLUMN line_id BIGINT DEFAULT NULL,
-            ADD CONSTRAINT items_line_id_fkey
-            FOREIGN KEY (line_id) REFERENCES lines(id);
-        SQL;
-
-        DB::statement($sql1);
-
-        $sql2 = <<<'SQL'
-        ALTER TABLE items
-        ADD COLUMN line_capacity TEXT DEFAULT NULL
-        SQL;
-
-        DB::statement($sql2);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('items', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_02_16_100950_add_foreign_key_machine_id_to_production_quantities.php

@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql = <<<'SQL'
-            ALTER TABLE production_quantities
-            ADD COLUMN machine_id BIGINT DEFAULT NULL,
-            ADD CONSTRAINT production_quantities_machine_id_fkey
-            FOREIGN KEY (machine_id) REFERENCES machines(id);
-        SQL;
-
-        DB::statement($sql);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('production_quantities', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_02_16_101248_add_column_working_days_to_production_plans.php

@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql1 = <<<'SQL'
-        ALTER TABLE production_plans
-        ADD COLUMN working_days TEXT DEFAULT NULL
-        SQL;
-
-        DB::statement($sql1);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('production_plans', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

database/migrations/2026_02_16_101529_add_column_leave_dates_to_production_plans.php

@@ -1,31 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        $sql1 = <<<'SQL'
-        ALTER TABLE production_plans
-        ADD COLUMN leave_dates TEXT DEFAULT NULL
-        SQL;
-
-        DB::statement($sql1);
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        // Schema::table('production_plans', function (Blueprint $table) {
-        //     //
-        // });
-    }
-};

resources/views/filament/pages/notification-settings.blade.php

@@ -65,6 +65,7 @@
                 },
                 body: JSON.stringify(subscription)
             });
+
             alert("Push notifications enabled ✅");
         }
     </script>

resources/views/filament/pages/production-calender.blade.php

@@ -1,13 +0,0 @@
-<x-filament-panels::page>
-
-<div class="space-y-4">
-
-    {{-- Render the Select form fields --}}
-    <div class="space-y-4">
-        {{ $this->form }}
-    </div>
-
-
-</div>
-
-</x-filament-panels::page>

resources/views/filament/pages/production-quantity.blade.php

@@ -45,7 +45,7 @@
 </div> --}}
   <div class="flex gap-6 -mt-6">
         <!-- Scan QR Code -->
-        <div class="w-full">
+        <div class="w-1/2">
             <label for="qr-scan-input" class="block text-sm font-medium text-gray-700 mb-2">
                 SCAN QR CODE
             </label>
@@ -60,7 +60,7 @@
         </div>
 
         <!-- Last Scanned QR -->
-        {{-- <div class="w-1/2">
+        <div class="w-1/2">
             <label for="recent-qr-input" class="block text-sm font-medium text-gray-700 mb-2">
                 LAST SCANNED QR
             </label>
@@ -71,7 +71,7 @@
                 readonly
                 wire:model="recent_qr"
             />
-        </div> --}}
+        </div>
     </div>
 
 

resources/views/filament/pages/production-target.blade.php

@@ -1,19 +0,0 @@
-<x-filament-panels::page>
-<div class="space-y-4">
-
-    {{-- Render the Select form fields --}}
-    <div class="space-y-4">
-        {{ $this->form }}
-    </div>
-    <x-filament::button
-                wire:click="export"
-                color="primary"
-                class="mt-4"
-            >
-            Export
-            </x-filament::button>
-    <div class="bg-white shadow rounded-xl p-4 mt-6">
-        <livewire:production-target-plan />
-    </div>
-</div>
-</x-filament-panels::page>

resources/views/forms/calendar.blade.php

@@ -1,151 +0,0 @@
-<!-- <select id="yearSelect">
-    <option value="">Select Year</option>
-</select> -->
-
-
-<div id="calendar" wire:ignore></div>
-
-
-<!-- <input type="text" name="working_days" placeholder="Working Days"> -->
-
-<link href="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.8/index.global.min.css" rel="stylesheet">
-<script src="https://cdn.jsdelivr.net/npm/fullcalendar@6.1.8/index.global.min.js"></script>
-
-<script>
-document.addEventListener('DOMContentLoaded', function () {
-
-    let selectedDates = [];
-    let calendarEl = document.getElementById('calendar');
-
-    var calendar = new FullCalendar.Calendar(calendarEl, {
-    initialView: 'dayGridMonth',
-    height: 600,
-    showNonCurrentDates: true,
-
-    datesSet: function(info) {
-        // Clear previous month selections
-        selectedDates = [];
-
-        // Remove background events
-        calendar.removeAllEvents();
-
-        // Recalculate working days for new month
-        updateWorkingDays(info.view.currentStart);
-    },
-
-    dateClick: function(info) {
-
-        let viewMonth = calendar.view.currentStart.getMonth();
-        let clickedMonth = info.date.getMonth();
-
-        if (viewMonth != clickedMonth) return;
-
-        let dateStr = info.dateStr;
-
-        if (selectedDates.includes(dateStr)) {
-            selectedDates = selectedDates.filter(d => d !== dateStr);
-
-            calendar.getEvents().forEach(event => {
-                if (event.startStr == dateStr) event.remove();
-            });
-
-        } else {
-            selectedDates.push(dateStr);
-
-            calendar.addEvent({
-                start: dateStr,
-                display: 'background',
-                color: '#f03f17'
-            });
-        }
-
-        updateWorkingDays(info.date);
-    }
-});
-
-
-    // var calendar = new FullCalendar.Calendar(calendarEl, {
-    //     initialView: 'dayGridMonth',
-    //     height: 600,
-    //     showNonCurrentDates: true,
-
-    //     dateClick: function(info) {
-
-    //         let viewMonth = calendar.view.currentStart.getMonth();
-    //         let clickedMonth = info.date.getMonth();
-
-    //         // let month = info.date.getMonth() + 1; // JS month: 0-11 → 1-12
-    //         // let year = info.date.getFullYear();
-
-    //         if (viewMonth != clickedMonth) {
-    //             return; // Ignore next/prev month dates
-    //         }
-
-    //         let dateStr = info.dateStr;
-
-    //         if (selectedDates.includes(dateStr)) {
-    //             selectedDates = selectedDates.filter(d => d !== dateStr);
-
-    //             calendar.getEvents().forEach(event => {
-    //                 if (event.startStr == dateStr) {
-    //                     event.remove();
-    //                 }
-    //             });
-
-    //         } else {
-    //             selectedDates.push(dateStr);
-
-    //             calendar.addEvent({
-    //                 start: dateStr,
-    //                 display: 'background',
-    //                 color: '#f03f17'
-    //             });
-    //         }
-
-    //         updateWorkingDays(info.date);
-    //     }
-    // });
-
-    // yearSelect.addEventListener('change', function () {
-    //     let year = this.value;
-    //     if (!year) return;
-
-    //     let currentDate = calendar.getDate();
-    //     let newDate = new Date(year, currentDate.getMonth(), 1);
-
-    //     calendar.gotoDate(newDate);
-    // });
-
-    function updateWorkingDays(date) {
-        let totalDays = new Date(
-            date.getFullYear(),
-            date.getMonth()+1,
-            0
-        ).getDate();
-
-        let workingDays = totalDays - selectedDates.length;
-        // document.querySelector('input[name="working_days"]').value = workingDays;
-
-        const input = document.querySelector('#working_days');
-
-        input.value = workingDays;
-
-        input.dispatchEvent(new Event('input'));
-
-        const monthInput = document.querySelector('#month');
-        monthInput.value = date.getMonth() + 1; // 1–12 month number
-        monthInput.dispatchEvent(new Event('input'));
-
-        const yearInput = document.querySelector('#year');
-        yearInput.value = date.getFullYear();
-        yearInput.dispatchEvent(new Event('input'));
-
-        const selectedDatesInput = document.querySelector('#selected_dates');
-        selectedDatesInput.value = selectedDates.join(',');
-        selectedDatesInput.dispatchEvent(new Event('input'));
-
-    }
-
-    calendar.render();
-});
-</script>

resources/views/forms/save.php

@@ -1,9 +0,0 @@
-<div class="flex space-x-2 items-center">
-    <button
-        type="button"
-        class="inline-flex items-center px-3 py-1 bg-primary-600 text-white rounded hover:bg-primary-700"
-        wire:click="saveWorkingDays"
-    >
-        Save
-    </button>
-</div>

resources/views/livewire/production-target-plan.blade.php

@@ -1,85 +0,0 @@
-<div class="p-4">
-    <h2 class="text-lg font-bold mb-4 text-gray-700 uppercase tracking-wider">
-        PRODUCTION PLAN TABLE:
-    </h2>
-    <div class="overflow-x-auto rounded-lg shadow">
-        <table class="w-full divide-y divide-gray-200 text-sm text-center">
-            {{-- <thead class="bg-gray-100 text-s font-semibold uppercase text-gray-700">
-                <tr>
-                    <th class="border px-4 py-2">No</th>
-                    <th class="border px-4 py-2">Created Datetime</th>
-                    <th class="border px-4 py-2 whitespace-nowrap">Created By</th>
-                    <th class="border px-4 py-2 whitespace-nowrap">Plant</th>
-                    <th class="border px-4 py-2">Line</th>
-                    <th class="border px-4 py-2 whitespace-nowrap">Item Code</th>
-                    <th class="border px-4 py-2">Production Plan Dates</th>
-                </tr>
-            </thead> --}}
-            <thead class="bg-gray-100 text-s font-semibold uppercase text-gray-700">
-                <tr>
-                    <th class="border px-4 py-2" rowspan="3">No</th>
-                    <th class="border px-4 py-2 whitespace-nowrap" rowspan="3">Plant</th>
-                    <th class="border px-4 py-2 whitespace-nowrap" rowspan="3">Line</th>
-                    <th class="border px-4 py-2 whitespace-nowrap" rowspan="3">Item Code</th>
-
-                    <th class="border px-4 py-2 whitespace-nowrap" colspan="{{ count($dates) * 2 }}" class="text-center">
-                        Production Plan Dates
-                    </th>
-                </tr>
-                <tr>
-                    @foreach($dates as $date)
-                        <th colspan="2" class="text-center">
-                            {{ $date }}
-                        </th>
-                    @endforeach
-                </tr>
-                <tr>
-                    @foreach($dates as $date)
-                        <th class="border px-4 py-2 whitespace-nowrap">Target Plan</th>
-                        <th class="border px-4 py-2 whitespace-nowrap">Produced Quantity</th>
-                    @endforeach
-                </tr>
-            </thead>
-
-            <tbody class="divide-y divide-gray-100">
-                @forelse ($records as $index => $record)
-                    <tr class="hover:bg-gray-50">
-                            <td class="border px-4 py-2">{{ $index + 1 }}</td>
-                            <td class="border px-4 py-2 whitespace-nowrap">{{ $record['plant_name'] }}</td>
-                            <td class="border px-4 py-2 whitespace-nowrap">{{ $record['line_name'] }}</td>
-                            <td class="border px-4 py-2 whitespace-nowrap">{{ $record['item_code'] }}</td>
-
-                            {{-- @foreach($dates as $date)
-                                <td class="border px-4 py-2 whitespace-nowrap">{{ $record['target_plan'][$date] ?? '-' }}</td>
-                                <td class="border px-4 py-2 whitespace-nowrap">{{ $record['production_plan'][$date] ?? '-' }}</td>
-                            @endforeach --}}
-
-                            @foreach($dates as $date)
-                                @if(in_array($date, $leaveDates))
-                                    <td class="border px-4 py-2 whitespace-nowrap">-</td>
-                                    <td class="border px-4 py-2 whitespace-nowrap">-</td>
-                                @else
-                                    {{-- <td class="border px-4 py-2 whitespace-nowrap">{{ $record['daily_target'] ?? '-' }}</td> --}}
-                                    <td class="border px-4 py-2 whitespace-nowrap">
-                                        {{ $record['daily_target_dynamic'][$date] ?? '-' }}
-                                    </td>
-                                    <td class="border px-4 py-2 whitespace-nowrap">
-                                        {{ $record['produced_quantity'][$date] ?? '-' }}
-                                    </td>
-                                    {{-- <td class="border px-4 py-2 whitespace-nowrap">{{ $record['produced_quantity'] ?? '-' }}</td> --}}
-                                @endif
-                            @endforeach
-                    </tr>
-                @empty
-                    <tr>
-                        <td colspan="9" class="px-4 py-4 text-center text-gray-500">
-                            No production plan data found.
-                        </td>
-                    </tr>
-                @endforelse
-            </tbody>
-        </table>
-    </div>
-</div>
-
-

routes/api.php

@@ -25,15 +25,12 @@ use App\Http\Controllers\ObdController;
 use App\Http\Controllers\PalletController;
 use App\Http\Controllers\PdfController;
 use App\Http\Controllers\PlantController;
-use App\Http\Controllers\PrintController;
 use App\Http\Controllers\ProductionStickerReprintController;
 use App\Http\Controllers\SapFileController;
 use App\Http\Controllers\StickerMasterController;
 // use App\Http\Controllers\TelegramController;
 use App\Http\Controllers\TestingPanelController;
 use App\Http\Controllers\UserController;
-use App\Models\WebPushSubscription;
-use Filament\Facades\Filament;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
@@ -188,46 +185,3 @@ Route::post('file/store', [SapFileController::class, 'store'])->name('file.store
 // Route::post('send-telegram', [TelegramController::class, 'sendMessage']);
 
 // Route::post('invoice-exit', [InvoiceValidationController::class, 'handle']);
-
-
-Route::post('/print-pdf', [PrintController::class, 'print']);
-
-
- Route::post('/push/subscribe', function (Request $request) {
-
-    $user = Filament::auth()->user();
-    abort_if(!$user, 401);
-
-    $request->validate([
-        'endpoint' => 'required|string',
-        'keys.p256dh' => 'required|string',
-        'keys.auth' => 'required|string',
-    ]);
-
-    // WebPushSubscription::updateOrCreate(
-    //     ['endpoint' => $request->endpoint],
-    //     [
-    //         'subscribable_type' => get_class($user),
-    //         'subscribable_id'   => $user->id,
-    //         'public_key'        => $request->keys['p256dh'],
-    //         'auth_token'        => $request->keys['auth'],
-    //         'content_encoding'  => $request->contentEncoding ?? 'aesgcm',
-    //     ]
-    // );
-
-    WebPushSubscription::updateOrCreate(
-        [
-            'endpoint'          => $request->endpoint,
-            'subscribable_type' => get_class($user),
-            'subscribable_id'   => $user->id,
-        ],
-        [
-            'public_key'       => $request->keys['p256dh'],
-            'auth_token'       => $request->keys['auth'],
-            'content_encoding' => $request->contentEncoding ?? 'aesgcm',
-        ]
-    );
-
-
-    return response()->json(['success' => true]);
-});

routes/web.php

@@ -59,9 +59,10 @@ use App\Http\Livewire\CustomLogin;
     ]);
 
     WebPushSubscription::updateOrCreate(
+        // ✅ UNIQUE PER DEVICE
         ['endpoint' => $request->endpoint],
         [
-            'subscribable_type' => get_class($user),
+            'subscribable_type' => get_class($user), // 🔥 important
             'subscribable_id'   => $user->id,
             'public_key'        => $request->keys['p256dh'],
             'auth_token'        => $request->keys['auth'],
@@ -69,20 +70,6 @@ use App\Http\Livewire\CustomLogin;
         ]
     );
 
-    // WebPushSubscription::updateOrCreate(
-    //     [
-    //         'endpoint'          => $request->endpoint,
-    //         'subscribable_type' => get_class($user),
-    //         'subscribable_id'   => $user->id,
-    //     ],
-    //     [
-    //         'public_key'       => $request->keys['p256dh'],
-    //         'auth_token'       => $request->keys['auth'],
-    //         'content_encoding' => $request->contentEncoding ?? 'aesgcm',
-    //     ]
-    // );
-
-
     return response()->json(['success' => true]);
 });