poc/pds
1
0
Fork 1
Code Issues Pull Requests 11 Actions Packages Projects Releases Wiki Activity

Merge pull request 'ranjith-dev' (#712) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s
Details

Browse Source 
Reviewed-on: #712
This commit was merged in pull request #712.
This commit is contained in:
jothi
2026-06-06 11:18:01 +00:00
parent 964d857b12 3bce7a1b0a
commit 254ae49cfd
2 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/Filament/Imports/MotorTestingMasterImporter.php
View File

@@ -216,18 +216,18 @@ class MotorTestingMasterImporter extends Importer
->label('Plant Code')
->relationship(resolveUsing: 'code')
->rules(['required']),
ImportColumn::make('created_by')
->requiredMapping()
->exampleHeader('Created By')
->example([Filament::auth()->user()->name, Filament::auth()->user()->name, Filament::auth()->user()->name])
->label('Created By')
->rules(['required']),
ImportColumn::make('updated_by')
->requiredMapping()
->exampleHeader('Updated By')
->example([Filament::auth()->user()->name, Filament::auth()->user()->name, Filament::auth()->user()->name])
->label('Updated By')
->rules(['required']),
// ImportColumn::make('created_by')
// ->requiredMapping()
// ->exampleHeader('Created By')
// ->example([Filament::auth()->user()->name, Filament::auth()->user()->name, Filament::auth()->user()->name])
// ->label('Created By')
// ->rules(['required']),
// ImportColumn::make('updated_by')
// ->requiredMapping()
// ->exampleHeader('Updated By')
// ->example([Filament::auth()->user()->name, Filament::auth()->user()->name, Filament::auth()->user()->name])
// ->label('Updated By')
// ->rules(['required']),
];
}
@@ -266,8 +266,8 @@ class MotorTestingMasterImporter extends Importer
$noloadPowUl = trim($this->data['noload_pow_ul']);
$noloadSpdLl = trim($this->data['noload_spd_ll']);
$noloadSpdUl = trim($this->data['noload_spd_ul']);
$createdBy = trim($this->data['created_by']);
$updatedBy = trim($this->data['updated_by']);
$createdBy = Filament::auth()->user()->name;
$updatedBy = Filament::auth()->user()->name;
$plant = null;
if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
@@ -387,19 +387,8 @@ class MotorTestingMasterImporter extends Importer
$created = $oldCode->created_by ? User::where('name', $oldCode->created_by)->first() : null;
if (! $created) {
$warnMsg[] = 'Created by not found on update';
}
$updated = User::where('name', $updatedBy)->first();
if (! $updated) {
$warnMsg[] = 'Updated by not found on update';
}
} else {
$created = User::where('name', $createdBy)->first();
if (! $created) {
$warnMsg[] = 'Created by not found';
}
$updated = User::where('name', $updatedBy)->first();
if (! $updated) {
$warnMsg[] = 'Updated by not found';
} else {
$createdBy = $created->name;
}
}
}
@@ -444,8 +433,8 @@ class MotorTestingMasterImporter extends Importer
'noload_pow_ul' => $noloadPowUl,
'noload_spd_ll' => $noloadSpdLl,
'noload_spd_ul' => $noloadSpdUl,
'created_by' => $created->name,
'updated_by' => $updated->name,
'created_by' => $createdBy,
'updated_by' => $updatedBy,
]
);

4
app/Filament/Resources/MachineResource.php
View File

@@ -75,7 +75,7 @@ class MachineResource extends Resource
->hintColor('danger'),
Forms\Components\Select::make('line_id')
->label('Line Name')
->relationship('line', 'name')
// ->relationship('line', 'name')
->searchable()
->required()
->columnSpan(1)
@@ -116,7 +116,7 @@ class MachineResource extends Resource
->hintColor('danger'),
Forms\Components\Select::make('work_group_master_id')
->label('Group Work Center')
->relationship('workGroupMaster', 'name')
// ->relationship('workGroupMaster', 'name')
->searchable()
->required()
->columnSpan(1)