Merge pull request 'Added Block in line resource page' (#177) from ranjith-dev into master

Reviewed-on: #177

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\Filament\Resources\LineResource\RelationManagers;
+use App\Models\Block;
 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,7 +48,8 @@ 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;
@@ -60,10 +61,9 @@ 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,6 +72,39 @@ 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')
@@ -99,10 +132,9 @@ 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();
@@ -156,6 +188,9 @@ 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',
@@ -170,10 +205,9 @@ class LineResource extends Resource
                                 // Ensure `linestop_id` is not cleared
                                 if (! $lineTyp) {
                                     $set('lTypeError', 'Scan the valid type.');
+
                                     return;
-                                }
-                                else
-                                {
+                                } else {
                                     $set('lTypeError', null);
                                 }
                             })
@@ -204,7 +238,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) {
@@ -255,6 +289,7 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group1_id_error', null);
                                     $set('work_group1_id', null);
+
                                     return;
                                 }
 
@@ -263,6 +298,7 @@ class LineResource extends Resource
 
                                 if (! $plantId) {
                                     $set('work_group1_id_error', 'Invalid plant name.');
+
                                     return;
                                 }
 
@@ -272,6 +308,7 @@ class LineResource extends Resource
 
                                 if (! $workGroupRecord) {
                                     $set('work_group1_id_error', 'Work group does not exist for this plant in master.');
+
                                     return;
                                 }
 
@@ -297,10 +334,9 @@ 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);
                                 }
@@ -332,6 +368,7 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group2_id_error', null);
                                     $set('work_group2_id', null);
+
                                     return;
                                 }
 
@@ -340,6 +377,7 @@ class LineResource extends Resource
 
                                 if (! $plantId) {
                                     $set('work_group2_id_error', 'Invalid plant name.');
+
                                     return;
                                 }
 
@@ -349,6 +387,7 @@ class LineResource extends Resource
 
                                 if (! $workGroupRecord) {
                                     $set('work_group2_id_error', 'Work group does not exist for this plant in master.');
+
                                     return;
                                 }
 
@@ -369,10 +408,9 @@ 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);
                                 }
@@ -404,6 +442,7 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group3_id_error', null);
                                     $set('work_group3_id', null);
+
                                     return;
                                 }
 
@@ -412,6 +451,7 @@ class LineResource extends Resource
 
                                 if (! $plantId) {
                                     $set('work_group3_id_error', 'Invalid plant name.');
+
                                     return;
                                 }
 
@@ -421,6 +461,7 @@ class LineResource extends Resource
 
                                 if (! $workGroupRecord) {
                                     $set('work_group3_id_error', 'Work group does not exist for this plant in master.');
+
                                     return;
                                 }
 
@@ -441,10 +482,9 @@ 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);
                                 }
@@ -476,6 +516,7 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group4_id_error', null);
                                     $set('work_group4_id', null);
+
                                     return;
                                 }
 
@@ -484,6 +525,7 @@ class LineResource extends Resource
 
                                 if (! $plantId) {
                                     $set('work_group4_id_error', 'Invalid plant name.');
+
                                     return;
                                 }
 
@@ -493,6 +535,7 @@ class LineResource extends Resource
 
                                 if (! $workGroupRecord) {
                                     $set('work_group4_id_error', 'Work group does not exist for this plant in master.');
+
                                     return;
                                 }
 
@@ -513,10 +556,9 @@ 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);
                                 }
@@ -548,6 +590,7 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group5_id_error', null);
                                     $set('work_group5_id', null);
+
                                     return;
                                 }
 
@@ -556,6 +599,7 @@ class LineResource extends Resource
 
                                 if (! $plantId) {
                                     $set('work_group5_id_error', 'Invalid plant name.');
+
                                     return;
                                 }
 
@@ -565,6 +609,7 @@ class LineResource extends Resource
 
                                 if (! $workGroupRecord) {
                                     $set('work_group5_id_error', 'Work group does not exist for this plant in master.');
+
                                     return;
                                 }
 
@@ -585,10 +630,9 @@ 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);
                                 }
@@ -620,6 +664,7 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group6_id_error', null);
                                     $set('work_group6_id', null);
+
                                     return;
                                 }
 
@@ -628,6 +673,7 @@ class LineResource extends Resource
 
                                 if (! $plantId) {
                                     $set('work_group6_id_error', 'Invalid plant name.');
+
                                     return;
                                 }
 
@@ -637,6 +683,7 @@ class LineResource extends Resource
 
                                 if (! $workGroupRecord) {
                                     $set('work_group6_id_error', 'Work group does not exist for this plant in master.');
+
                                     return;
                                 }
 
@@ -657,10 +704,9 @@ 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);
                                 }
@@ -692,6 +738,7 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group7_id_error', null);
                                     $set('work_group7_id', null);
+
                                     return;
                                 }
 
@@ -700,6 +747,7 @@ class LineResource extends Resource
 
                                 if (! $plantId) {
                                     $set('work_group7_id_error', 'Invalid plant name.');
+
                                     return;
                                 }
 
@@ -709,6 +757,7 @@ class LineResource extends Resource
 
                                 if (! $workGroupRecord) {
                                     $set('work_group7_id_error', 'Work group does not exist for this plant in master.');
+
                                     return;
                                 }
 
@@ -729,10 +778,9 @@ 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);
                                 }
@@ -764,6 +812,7 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group8_id_error', null);
                                     $set('work_group8_id', null);
+
                                     return;
                                 }
 
@@ -772,6 +821,7 @@ class LineResource extends Resource
 
                                 if (! $plantId) {
                                     $set('work_group8_id_error', 'Invalid plant name.');
+
                                     return;
                                 }
 
@@ -781,6 +831,7 @@ class LineResource extends Resource
 
                                 if (! $workGroupRecord) {
                                     $set('work_group8_id_error', 'Work group does not exist for this plant in master.');
+
                                     return;
                                 }
 
@@ -801,10 +852,9 @@ 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);
                                 }
@@ -836,6 +886,7 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group9_id_error', null);
                                     $set('work_group9_id', null);
+
                                     return;
                                 }
 
@@ -844,6 +895,7 @@ class LineResource extends Resource
 
                                 if (! $plantId) {
                                     $set('work_group9_id_error', 'Invalid plant name.');
+
                                     return;
                                 }
 
@@ -853,6 +905,7 @@ class LineResource extends Resource
 
                                 if (! $workGroupRecord) {
                                     $set('work_group9_id_error', 'Work group does not exist for this plant in master.');
+
                                     return;
                                 }
 
@@ -873,10 +926,9 @@ 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);
                                 }
@@ -908,6 +960,7 @@ class LineResource extends Resource
                                 if ($state == null || trim($state) == '') {
                                     $set('work_group10_id_error', null);
                                     $set('work_group10_id', null);
+
                                     return;
                                 }
 
@@ -916,6 +969,7 @@ class LineResource extends Resource
 
                                 if (! $plantId) {
                                     $set('work_group10_id_error', 'Invalid plant name.');
+
                                     return;
                                 }
 
@@ -925,6 +979,7 @@ class LineResource extends Resource
 
                                 if (! $workGroupRecord) {
                                     $set('work_group10_id_error', 'Work group does not exist for this plant in master.');
+
                                     return;
                                 }
 
@@ -945,10 +1000,9 @@ 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);
                                 }
@@ -984,6 +1038,7 @@ 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')
@@ -991,6 +1046,11 @@ 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()