From 63110298e7a5393a8adf712bbd8738623ffd268f Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Tue, 13 Jan 2026 16:46:43 +0530 Subject: [PATCH] Added plant code instead of plant name on import and export --- .../Exports/WorkGroupMasterExporter.php | 25 +++--- .../Imports/WorkGroupMasterImporter.php | 84 ++++++++++--------- 2 files changed, 57 insertions(+), 52 deletions(-) diff --git a/app/Filament/Exports/WorkGroupMasterExporter.php b/app/Filament/Exports/WorkGroupMasterExporter.php index ef1ff60..053cd2d 100644 --- a/app/Filament/Exports/WorkGroupMasterExporter.php +++ b/app/Filament/Exports/WorkGroupMasterExporter.php @@ -14,6 +14,7 @@ class WorkGroupMasterExporter extends Exporter public static function getColumns(): array { static $rowNumber = 0; + return [ ExportColumn::make('no') ->label('NO') @@ -21,32 +22,32 @@ class WorkGroupMasterExporter extends Exporter // Increment and return the row number return ++$rowNumber; }), - ExportColumn::make('plant.name') - ->label('PLANT'), + ExportColumn::make('plant.code') + ->label('PLANT CODE'), ExportColumn::make('name') - ->label('NAME'), + ->label('WORK GROUP NAME'), ExportColumn::make('description') - ->label('DESCRIPTION'), + ->label('WORK GROUP DESCRIPTION'), ExportColumn::make('operation_number') - ->label('OPERATION NUMBER'), + ->label('OPERATION NUMBER'), ExportColumn::make('created_by') - ->label('CREATED BY'), + ->label('CREATED BY'), ExportColumn::make('created_at') - ->label('CREATED AT'), + ->label('CREATED AT'), ExportColumn::make('updated_at') - ->label('UPDATED AT'), + ->label('UPDATED AT'), ExportColumn::make('deleted_at') - ->label('DELETED AT') - ->enabledByDefault(false), + ->label('DELETED AT') + ->enabledByDefault(false), ]; } public static function getCompletedNotificationBody(Export $export): string { - $body = 'Your work group master export has completed and ' . number_format($export->successful_rows) . ' ' . str('row')->plural($export->successful_rows) . ' exported.'; + $body = 'Your work group master export has completed and '.number_format($export->successful_rows).' '.str('row')->plural($export->successful_rows).' exported.'; if ($failedRowsCount = $export->getFailedRowsCount()) { - $body .= ' ' . number_format($failedRowsCount) . ' ' . str('row')->plural($failedRowsCount) . ' failed to export.'; + $body .= ' '.number_format($failedRowsCount).' '.str('row')->plural($failedRowsCount).' failed to export.'; } return $body; diff --git a/app/Filament/Imports/WorkGroupMasterImporter.php b/app/Filament/Imports/WorkGroupMasterImporter.php index 3c38a96..e0d417b 100644 --- a/app/Filament/Imports/WorkGroupMasterImporter.php +++ b/app/Filament/Imports/WorkGroupMasterImporter.php @@ -20,22 +20,22 @@ class WorkGroupMasterImporter extends Importer return [ ImportColumn::make('plant') ->requiredMapping() - ->exampleHeader('Plant Name') - ->example('Ransar Industries-I') - ->label('Plant Name') - ->relationship(resolveUsing:'name') + ->exampleHeader('Plant Code') + ->example('1000') + ->label('Plant Code') + ->relationship(resolveUsing: 'code') ->rules(['required']), ImportColumn::make('name') ->requiredMapping() - ->exampleHeader('Name') + ->exampleHeader('Work Group Name') ->example('RMGCEABC') - ->label('Name') + ->label('Work Group Name') ->rules(['required']), ImportColumn::make('description') ->requiredMapping() - ->exampleHeader('Description') + ->exampleHeader('Work Group Description') ->example('Testing Model 1') - ->label('Description') + ->label('Work Group Description') ->rules(['required']), ImportColumn::make('operation_number') ->requiredMapping() @@ -52,8 +52,6 @@ class WorkGroupMasterImporter extends Importer ]; } - - public function resolveRecord(): ?WorkGroupMaster { // return WorkGroupMaster::firstOrNew([ @@ -61,75 +59,81 @@ class WorkGroupMasterImporter extends Importer // 'email' => $this->data['email'], // ]); $warnMsg = []; - $plant = Plant::where('name', $this->data['plant'])->first(); - if (!$plant) { - $warnMsg[] = "Plant not found"; + $plantCod = $this->data['plant']; + $plantId = 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'; + } else { + $plantId = $plant->id; + } } - if (Str::length($this->data['name']) <= 0) { //|| !ctype_alnum($this->data['description']) - $warnMsg[] = "Invalid name found"; + if (Str::length($this->data['name']) <= 0) { // || !ctype_alnum($this->data['description']) + $warnMsg[] = 'Invalid work group name found'; } if (Str::length(trim($this->data['description'])) <= 0) { - $warnMsg[] = "Invalid description found"; + $warnMsg[] = 'Invalid work group description found'; } $desc = trim($this->data['description']); if (Str::length($desc) > 44) { - $warnMsg[] = "Description should be less than 44 digits."; + $warnMsg[] = ' work group description should be less than 44 digits.'; } if (Str::length($this->data['operation_number']) <= 0) { - $warnMsg[] = "Invalid operation number found"; + $warnMsg[] = 'Invalid operation number found'; } - if(!is_numeric($this->data['operation_number'])) - { - $warnMsg[] = "Invalid operation number found must be numeric"; + if (! is_numeric($this->data['operation_number'])) { + $warnMsg[] = 'Invalid operation number found must be numeric'; } $user = User::where('name', $this->data['created_by'])->first(); - if (!$user) { - $warnMsg[] = "Operator ID not found"; + if (! $user) { + $warnMsg[] = 'Operator ID not found'; } - if (!empty($warnMsg)) { + if (! empty($warnMsg)) { throw new RowImportFailedException(implode(', ', $warnMsg)); - } - else - { - //Check (plant_id, name) - $existingByName = WorkGroupMaster::where('plant_id', $plant->id) + } else { + // Check (plant_id, name) + $existingByName = WorkGroupMaster::where('plant_id', $plantId) ->where('name', $this->data['name']) ->first(); if ($existingByName) { - throw new RowImportFailedException("Work group name already exists for this plant!"); + throw new RowImportFailedException('Work group name already exists for this plant!'); } - //Check (plant_id, operation_number) - $existingByOpNum = WorkGroupMaster::where('plant_id', $plant->id) + // Check (plant_id, operation_number) + $existingByOpNum = WorkGroupMaster::where('plant_id', $plantId) ->where('operation_number', $this->data['operation_number']) ->where('name', $this->data['name']) ->first(); if ($existingByOpNum) { - throw new RowImportFailedException("Operation number already exists for this plant!"); + throw new RowImportFailedException('Operation number already exists for this plant!'); } - //Check (plant_id) - $existingByOperator = WorkGroupMaster::where('plant_id', $plant->id) + // Check (plant_id) + $existingByOperator = WorkGroupMaster::where('plant_id', $plantId) ->where('name', $this->data['name']) ->first(); if ($existingByOperator) { - throw new RowImportFailedException("Already work group name assigned to another plant!"); + throw new RowImportFailedException('Already work group name assigned to another plant!'); } } WorkGroupMaster::updateOrCreate([ - 'plant_id' => $plant->id, + 'plant_id' => $plantId, 'name' => $this->data['name'], 'description' => $this->data['description'], 'operation_number' => $this->data['operation_number'], @@ -138,15 +142,15 @@ class WorkGroupMasterImporter extends Importer return null; - //return new WorkGroupMaster(); + // return new WorkGroupMaster(); } public static function getCompletedNotificationBody(Import $import): string { - $body = 'Your work group master import has completed and ' . number_format($import->successful_rows) . ' ' . str('row')->plural($import->successful_rows) . ' imported.'; + $body = 'Your work group master import has completed and '.number_format($import->successful_rows).' '.str('row')->plural($import->successful_rows).' imported.'; if ($failedRowsCount = $import->getFailedRowsCount()) { - $body .= ' ' . number_format($failedRowsCount) . ' ' . str('row')->plural($failedRowsCount) . ' failed to import.'; + $body .= ' '.number_format($failedRowsCount).' '.str('row')->plural($failedRowsCount).' failed to import.'; } return $body;