diff --git a/app/Filament/Exports/DeviceMasterExporter.php b/app/Filament/Exports/DeviceMasterExporter.php index f7da31a..7dc7d99 100644 --- a/app/Filament/Exports/DeviceMasterExporter.php +++ b/app/Filament/Exports/DeviceMasterExporter.php @@ -14,6 +14,7 @@ class DeviceMasterExporter extends Exporter public static function getColumns(): array { static $rowNumber = 0; + return [ ExportColumn::make('no') ->label('NO') @@ -21,32 +22,32 @@ class DeviceMasterExporter 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('DEVICE NAME'), + ->label('DEVICE NAME'), ExportColumn::make('mac_address') - ->label('MAC ADDRESS'), + ->label('MAC ADDRESS'), ExportColumn::make('ip_address') - ->label('IP ADDRESS'), + ->label('IP ADDRESS'), ExportColumn::make('created_at') - ->label('CREATED AT'), + ->label('CREATED AT'), ExportColumn::make('updated_at') - ->label('UPDATED AT'), + ->label('UPDATED AT'), ExportColumn::make('deleted_at') - ->enabledByDefault(false) - ->label('DELETED AT'), + ->enabledByDefault(false) + ->label('DELETED AT'), ExportColumn::make('created_by') - ->label('CREATED BY'), + ->label('CREATED BY'), ]; } public static function getCompletedNotificationBody(Export $export): string { - $body = 'Your device master export has completed and ' . number_format($export->successful_rows) . ' ' . str('row')->plural($export->successful_rows) . ' exported.'; + $body = 'Your device 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/DeviceMasterImporter.php b/app/Filament/Imports/DeviceMasterImporter.php index 8b72103..0560b72 100644 --- a/app/Filament/Imports/DeviceMasterImporter.php +++ b/app/Filament/Imports/DeviceMasterImporter.php @@ -16,10 +16,10 @@ class DeviceMasterImporter 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() @@ -53,15 +53,15 @@ class DeviceMasterImporter extends Importer // 'email' => $this->data['email'], // ]); - return new DeviceMaster(); + return new DeviceMaster; } public static function getCompletedNotificationBody(Import $import): string { - $body = 'Your device master import has completed and ' . number_format($import->successful_rows) . ' ' . str('row')->plural($import->successful_rows) . ' imported.'; + $body = 'Your device 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;