diff --git a/app/Filament/Exports/MfmParameterExporter.php b/app/Filament/Exports/MfmParameterExporter.php index 7849439..7ea9222 100644 --- a/app/Filament/Exports/MfmParameterExporter.php +++ b/app/Filament/Exports/MfmParameterExporter.php @@ -23,6 +23,8 @@ class MfmParameterExporter extends Exporter }), ExportColumn::make('plant.name') ->label('PLANT'), + ExportColumn::make('deviceName.name') + ->label('Device Name'), ExportColumn::make('name') ->label('NAME'), ExportColumn::make('mfmMeter.name') diff --git a/app/Filament/Imports/MfmParameterImporter.php b/app/Filament/Imports/MfmParameterImporter.php index 2e1ae09..e8a0e88 100644 --- a/app/Filament/Imports/MfmParameterImporter.php +++ b/app/Filament/Imports/MfmParameterImporter.php @@ -21,6 +21,13 @@ class MfmParameterImporter extends Importer ->label('Plant Name') ->relationship(resolveUsing:'name') ->rules(['required']), + ImportColumn::make('deviceName') + ->requiredMapping() + ->exampleHeader('Device Name') + ->example('REG001') + ->label('Device Name') + ->relationship(resolveUsing:'name') + ->rules(['required']), ImportColumn::make('mfmMeter') ->requiredMapping() ->exampleHeader('Mfm Meter Sequence') diff --git a/app/Filament/Resources/MfmParameterResource.php b/app/Filament/Resources/MfmParameterResource.php index b75e332..73568cf 100644 --- a/app/Filament/Resources/MfmParameterResource.php +++ b/app/Filament/Resources/MfmParameterResource.php @@ -36,14 +36,14 @@ class MfmParameterResource extends Resource ->label('Plant') ->relationship('plant', 'name') ->required(), - Forms\Components\Select::make('mfm_meter_id') - ->label('Mfm Meter') - ->relationship('mfmMeter', 'sequence') - ->required(), Forms\Components\Select::make('device_master_id') ->label('Device Master') ->relationship('deviceName', 'name') ->required(), + Forms\Components\Select::make('mfm_meter_id') + ->label('Mfm Meter') + ->relationship('mfmMeter', 'sequence') + ->required(), Forms\Components\TextInput::make('name') ->label('Parameter Name') ->required(), @@ -81,14 +81,14 @@ class MfmParameterResource extends Resource ->label('Plant') ->alignCenter() ->sortable(), - Tables\Columns\TextColumn::make('mfmMeter.name') - ->label('Sequence') - ->alignCenter() - ->sortable(), Tables\Columns\TextColumn::make('deviceName.name') ->label('Device Name') ->alignCenter() ->sortable(), + Tables\Columns\TextColumn::make('mfmMeter.name') + ->label('Sequence') + ->alignCenter() + ->sortable(), Tables\Columns\TextColumn::make('name') ->label('Parameter Name') ->alignCenter()