Merge pull request 'ranjith-dev' (#630) from ranjith-dev into master

Reviewed-on: #630

app/Filament/Exports/ProductCharacteristicsMasterExporter.php

@@ -38,6 +38,8 @@ class ProductCharacteristicsMasterExporter extends Exporter
                 ->label('CHARACTERISTICS TYPE'),
             ExportColumn::make('name')
                 ->label('CHARACTERISTICS NAME'),
+            ExportColumn::make('category')
+                ->label('CATEGORY'),
             ExportColumn::make('inspection_type')
                 ->label('INSPECTION TYPE'),
             ExportColumn::make('lower')

app/Filament/Imports/ProductCharacteristicsMasterImporter.php

@@ -70,6 +70,11 @@ class ProductCharacteristicsMasterImporter extends Importer
                 ->exampleHeader('CHARACTERISTICS NAME')
                 ->example(['TEST01', 'TEST02'])
                 ->rules(['required']),
+            ImportColumn::make('category')
+                ->label('CATEGORY')
+                ->requiredMapping()
+                ->exampleHeader('CATEGORY')
+                ->example(['Open Pump', 'Submersible Pump']),
             ImportColumn::make('inspection_type')
                 ->label('INSPECTION TYPE')
                 ->requiredMapping()
@@ -110,6 +115,7 @@ class ProductCharacteristicsMasterImporter extends Importer
         $workCenter = trim($this->data['machine']) ?? null;
         $charTyp = trim($this->data['characteristics_type']) ?? null;
         $charNam = trim($this->data['name']) ?? null;
+        $category = trim($this->data['category']) ?? null;
         $inspectTyp = trim($this->data['inspection_type']) ?? null;
         $lower = trim($this->data['lower']) ?? null;
         $middle = trim($this->data['middle']) ?? null;
@@ -295,6 +301,7 @@ class ProductCharacteristicsMasterImporter extends Importer
                     'name' => $charNam,
                 ],
                 [
+                    'category' => $category,
                     'inspection_type' => $inspectTyp,
                     'lower' => $lower,
                     'middle' => $middle,

app/Filament/Resources/VehicleEntryResource.php

@@ -119,7 +119,8 @@ class VehicleEntryResource extends Resource
                     ->label('Vehicle Number')
                     ->alignCenter()
                     ->sortable()
-                    ->searchable(),
+                    ->searchable()
+                    ->formatStateUsing(fn ($state) => strtoupper($state)),
                 Tables\Columns\TextColumn::make('entry_time')
                     ->label('Entry Time')
                     ->alignCenter()
@@ -183,7 +184,7 @@ class VehicleEntryResource extends Resource
                                 // return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
                             })
                             ->afterStateUpdated(function ($state, callable $set, callable $get) {
-                                $set('Line', null);
+                                $set('vehicle_number', null);
                             }),
                         TextInput::make('vehicle_number')
                             ->label('Vehicle Number')