Merge pull request 'removed model type in filter of class characteristics' (#617) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Reviewed-on: #617
This commit was merged in pull request #617.
This commit is contained in:
@@ -2031,9 +2031,6 @@ class ClassCharacteristicResource extends Resource
|
|||||||
TextInput::make('zmm_heading')
|
TextInput::make('zmm_heading')
|
||||||
->label('Heading')
|
->label('Heading')
|
||||||
->placeholder('Enter Heading'),
|
->placeholder('Enter Heading'),
|
||||||
TextInput::make('model_type')
|
|
||||||
->label('Model Type')
|
|
||||||
->placeholder('Enter Model Type'),
|
|
||||||
DateTimePicker::make(name: 'created_from')
|
DateTimePicker::make(name: 'created_from')
|
||||||
->label('Created From')
|
->label('Created From')
|
||||||
->placeholder('Select From DateTime')
|
->placeholder('Select From DateTime')
|
||||||
@@ -2047,7 +2044,7 @@ class ClassCharacteristicResource extends Resource
|
|||||||
])
|
])
|
||||||
->query(function ($query, array $data) {
|
->query(function ($query, array $data) {
|
||||||
// Hide all records initially if no filters are applied
|
// Hide all records initially if no filters are applied
|
||||||
if (empty($data['Plant']) && empty($data['machine']) && empty($data['item_id']) && empty($data['aufnr']) && empty($data['gernr']) && empty($data['zmm_heading']) && empty($data['model_type']) && empty($data['created_from']) && empty($data['created_to'])) {
|
if (empty($data['Plant']) && empty($data['machine']) && empty($data['item_id']) && empty($data['aufnr']) && empty($data['gernr']) && empty($data['zmm_heading']) && empty($data['created_from']) && empty($data['created_to'])) {
|
||||||
return $query->whereRaw('1 = 0');
|
return $query->whereRaw('1 = 0');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2081,10 +2078,6 @@ class ClassCharacteristicResource extends Resource
|
|||||||
$query->where('zmm_heading', 'like', '%'.$data['zmm_heading'].'%');
|
$query->where('zmm_heading', 'like', '%'.$data['zmm_heading'].'%');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($data['model_type'])) {
|
|
||||||
$query->where('model_type', 'like', '%'.$data['model_type'].'%');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! empty($data['created_from'])) {
|
if (! empty($data['created_from'])) {
|
||||||
$query->where('created_at', '>=', $data['created_from']);
|
$query->where('created_at', '>=', $data['created_from']);
|
||||||
}
|
}
|
||||||
@@ -2126,10 +2119,6 @@ class ClassCharacteristicResource extends Resource
|
|||||||
$indicators[] = 'Heading: '.$data['zmm_heading'];
|
$indicators[] = 'Heading: '.$data['zmm_heading'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($data['model_type'])) {
|
|
||||||
$indicators[] = 'Model Type: '.$data['model_type'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! empty($data['created_from'])) {
|
if (! empty($data['created_from'])) {
|
||||||
$indicators[] = 'From: '.$data['created_from'];
|
$indicators[] = 'From: '.$data['created_from'];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user