Merge pull request 'Added logic is in production characteristics page' (#769) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 23s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 23s
Reviewed-on: #769
This commit was merged in pull request #769.
This commit is contained in:
@@ -253,7 +253,7 @@ class ProductionCharacteristicResource extends Resource
|
|||||||
->label('Spec. Value')
|
->label('Spec. Value')
|
||||||
// ->searchable()
|
// ->searchable()
|
||||||
->formatStateUsing(function ($record) {
|
->formatStateUsing(function ($record) {
|
||||||
$specVal = ProductCharacteristicsMaster::where('plant_id', $record->plant_id)->where('item_id', $record->item_id)->where('line_id', $record->line_id)->where('machine_id', $record->machine_id)->first();
|
$specVal = ProductCharacteristicsMaster::where('plant_id', $record->plant_id)->where('item_id', $record->item_id)->where('line_id', $record->line_id)->where('machine_id', $record->machine_id)->where('id', $record->product_characteristics_master_id)->first();
|
||||||
|
|
||||||
// return $record?->plant_id.'-'.$record?->item_id.'-'.$record->line_id.'-'.$record?->machine_id;
|
// return $record?->plant_id.'-'.$record?->item_id.'-'.$record->line_id.'-'.$record?->machine_id;
|
||||||
return $specVal?->lower.' - '.$specVal?->upper;
|
return $specVal?->lower.' - '.$specVal?->upper;
|
||||||
@@ -276,7 +276,7 @@ class ProductionCharacteristicResource extends Resource
|
|||||||
'Not Ok' => 'danger',
|
'Not Ok' => 'danger',
|
||||||
'NotOk' => 'danger',
|
'NotOk' => 'danger',
|
||||||
'ConditionallyAccepted' => 'success',
|
'ConditionallyAccepted' => 'success',
|
||||||
default => 'gray',
|
default => 'black',
|
||||||
})
|
})
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
|
|||||||
Reference in New Issue
Block a user