Added Stop approver_type on importer and resource page
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s
This commit is contained in:
@@ -22,79 +22,79 @@ class CharacteristicApproverMasterImporter extends Importer
|
|||||||
ImportColumn::make('plant')
|
ImportColumn::make('plant')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Plant Code')
|
->exampleHeader('Plant Code')
|
||||||
->examples(['1000', '1000'])
|
->examples(['1000', '1000', '1000'])
|
||||||
->label('Plant Code')
|
->label('Plant Code')
|
||||||
->relationship(resolveUsing: 'code')
|
->relationship(resolveUsing: 'code')
|
||||||
->rules(['required']),
|
->rules(['required']),
|
||||||
ImportColumn::make('machine')
|
ImportColumn::make('machine')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Work Center')
|
->exampleHeader('Work Center')
|
||||||
->examples(['RMGLAS02', 'RMGLAS02'])
|
->examples(['RMGLAS02', 'RMGLAS02', 'RMGLAS02'])
|
||||||
->label('Work Center')
|
->label('Work Center')
|
||||||
->relationship(resolveUsing: 'work_center')
|
->relationship(resolveUsing: 'work_center')
|
||||||
->rules(['required']),
|
->rules(['required']),
|
||||||
ImportColumn::make('approver_type')
|
ImportColumn::make('approver_type')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Approver Type')
|
->exampleHeader('Approver Type')
|
||||||
->examples(['Characteristic', 'Quality'])
|
->examples(['Characteristic', 'Quality', 'Stop'])
|
||||||
->label('Approver Type'),
|
->label('Approver Type'),
|
||||||
ImportColumn::make('machine_name')
|
ImportColumn::make('machine_name')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Machine Name')
|
->exampleHeader('Machine Name')
|
||||||
->examples(['15002635', '17002635'])
|
->examples(['15002635', '16002635', '17002635'])
|
||||||
->label('Machine Name'),
|
->label('Machine Name'),
|
||||||
ImportColumn::make('characteristic_field')
|
ImportColumn::make('characteristic_field')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Master Characteristic Field')
|
->exampleHeader('Master Characteristic Field')
|
||||||
->examples(['NIL', 'MV SERIES'])
|
->examples(['NIL', 'MV SERIES', 'MVHS SERIES'])
|
||||||
->label('Master Characteristic Field'),
|
->label('Master Characteristic Field'),
|
||||||
ImportColumn::make('name1')
|
ImportColumn::make('name1')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Approver Name 1')
|
->exampleHeader('Approver Name 1')
|
||||||
->examples(['Test 1', 'Test 4'])
|
->examples(['Test 1', 'Test 4', 'Test 7'])
|
||||||
->label('Approver Name 1'),
|
->label('Approver Name 1'),
|
||||||
ImportColumn::make('mail1')
|
ImportColumn::make('mail1')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Mail 1')
|
->exampleHeader('Mail 1')
|
||||||
->examples(['test1@cripumps.com', 'test4@cripumps.com'])
|
->examples(['test1@cripumps.com', 'test4@cripumps.com', 'test7@cripumps.com'])
|
||||||
->label('Mail 1'),
|
->label('Mail 1'),
|
||||||
ImportColumn::make('duration1')
|
ImportColumn::make('duration1')
|
||||||
->numeric()
|
->numeric()
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Duration 1')
|
->exampleHeader('Duration 1')
|
||||||
->examples(['0.05', '0.30'])
|
->examples(['0.05', '0.30', '0.30'])
|
||||||
->label('Duration 1'),
|
->label('Duration 1'),
|
||||||
ImportColumn::make('name2')
|
ImportColumn::make('name2')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Approver Name 2')
|
->exampleHeader('Approver Name 2')
|
||||||
->examples(['Test 2', 'Test 5'])
|
->examples(['Test 2', 'Test 5', 'Test 8'])
|
||||||
->label('Approver Name 2'),
|
->label('Approver Name 2'),
|
||||||
ImportColumn::make('mail2')
|
ImportColumn::make('mail2')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Mail 2')
|
->exampleHeader('Mail 2')
|
||||||
->examples(['test2@cripumps.com', 'test5@cripumps.com'])
|
->examples(['test2@cripumps.com', 'test5@cripumps.com', 'test8@cripumps.com'])
|
||||||
->label('Mail 2'),
|
->label('Mail 2'),
|
||||||
ImportColumn::make('duration2')
|
ImportColumn::make('duration2')
|
||||||
->numeric()
|
->numeric()
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Duration 2')
|
->exampleHeader('Duration 2')
|
||||||
->examples(['0.05', '0.30'])
|
->examples(['0.05', '0.30', '0.30'])
|
||||||
->label('Duration 2'),
|
->label('Duration 2'),
|
||||||
ImportColumn::make('name3')
|
ImportColumn::make('name3')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Approver Name 3')
|
->exampleHeader('Approver Name 3')
|
||||||
->examples(['Test 3', 'Test 6'])
|
->examples(['Test 3', 'Test 6', 'Test 9'])
|
||||||
->label('Approver Name 3'),
|
->label('Approver Name 3'),
|
||||||
ImportColumn::make('mail3')
|
ImportColumn::make('mail3')
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Mail 3')
|
->exampleHeader('Mail 3')
|
||||||
->examples(['test3@cripumps.com', 'test6@cripumps.com'])
|
->examples(['test3@cripumps.com', 'test6@cripumps.com', 'test9@cripumps.com'])
|
||||||
->label('Mail 3'),
|
->label('Mail 3'),
|
||||||
ImportColumn::make('duration3')
|
ImportColumn::make('duration3')
|
||||||
->numeric()
|
->numeric()
|
||||||
->requiredMapping()
|
->requiredMapping()
|
||||||
->exampleHeader('Duration 3')
|
->exampleHeader('Duration 3')
|
||||||
->examples(['0.05', '0.30'])
|
->examples(['0.05', '0.30', '0.30'])
|
||||||
->label('Duration 3'),
|
->label('Duration 3'),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -135,8 +135,8 @@ class CharacteristicApproverMasterImporter extends Importer
|
|||||||
if ($workCenter == null || $workCenter == '') {
|
if ($workCenter == null || $workCenter == '') {
|
||||||
$warnMsg[] = "Work center can't be empty!";
|
$warnMsg[] = "Work center can't be empty!";
|
||||||
}
|
}
|
||||||
if ($apprTyp == '' || $apprTyp == null || ($apprTyp != 'Characteristic' && $apprTyp != 'Quality')) {
|
if ($apprTyp == '' || $apprTyp == null || ($apprTyp != 'Characteristic' && $apprTyp != 'Quality' && $apprTyp != 'Stop')) {
|
||||||
$warnMsg[] = "Approver type must be either 'Characteristic' or 'Quality'!";
|
$warnMsg[] = "Approver type must be either 'Characteristic', 'Quality', or 'Stop'!";
|
||||||
}
|
}
|
||||||
if ($machineNam == null || $machineNam == '') {
|
if ($machineNam == null || $machineNam == '') {
|
||||||
$warnMsg[] = "Machine name can't be empty!";
|
$warnMsg[] = "Machine name can't be empty!";
|
||||||
|
|||||||
@@ -128,6 +128,7 @@ class CharacteristicApproverMasterResource extends Resource
|
|||||||
return [
|
return [
|
||||||
'Characteristic' => 'Characteristic',
|
'Characteristic' => 'Characteristic',
|
||||||
'Quality' => 'Quality',
|
'Quality' => 'Quality',
|
||||||
|
'Stop' => 'Stop',
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
->default(function () {
|
->default(function () {
|
||||||
@@ -452,6 +453,7 @@ class CharacteristicApproverMasterResource extends Resource
|
|||||||
->options([
|
->options([
|
||||||
'Characteristic' => 'Characteristic',
|
'Characteristic' => 'Characteristic',
|
||||||
'Quality' => 'Quality',
|
'Quality' => 'Quality',
|
||||||
|
'Stop' => 'Stop',
|
||||||
])
|
])
|
||||||
->placeholder('Select Type')
|
->placeholder('Select Type')
|
||||||
->afterStateUpdated(function ($state, callable $set) {
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
@@ -467,7 +469,7 @@ class CharacteristicApproverMasterResource extends Resource
|
|||||||
->placeholder('Enter Characteristic Field'),
|
->placeholder('Enter Characteristic Field'),
|
||||||
TextInput::make('name1')
|
TextInput::make('name1')
|
||||||
->label('Approver Name 1')
|
->label('Approver Name 1')
|
||||||
->placeholder('Enter Approver Name 2')
|
->placeholder('Enter Approver Name 1')
|
||||||
->afterStateUpdated(function ($state, callable $set) {
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
$set('name2', null);
|
$set('name2', null);
|
||||||
$set('name3', null);
|
$set('name3', null);
|
||||||
@@ -480,7 +482,7 @@ class CharacteristicApproverMasterResource extends Resource
|
|||||||
}),
|
}),
|
||||||
TextInput::make('name3')
|
TextInput::make('name3')
|
||||||
->label('Approver Name 3')
|
->label('Approver Name 3')
|
||||||
->placeholder('Enter Approver Name 2'),
|
->placeholder('Enter Approver Name 3'),
|
||||||
DateTimePicker::make(name: 'created_from')
|
DateTimePicker::make(name: 'created_from')
|
||||||
->label('Created From')
|
->label('Created From')
|
||||||
->placeholder('Select From DateTime')
|
->placeholder('Select From DateTime')
|
||||||
|
|||||||
Reference in New Issue
Block a user