minor application filters update
parent
066288bc49
commit
a8efcc6ad2
|
|
@ -51,6 +51,18 @@ class ApplicationFilters extends FiltersService {
|
||||||
'represented' => $this->getExperts($filters),
|
'represented' => $this->getExperts($filters),
|
||||||
'value' => ($val = $filters->get('expert')) ? fractal(CompanyMember::byUuids($val)->get(), new CompanyMemberTransformer()) : null
|
'value' => ($val = $filters->get('expert')) ? fractal(CompanyMember::byUuids($val)->get(), new CompanyMemberTransformer()) : null
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
'name' => 'applicant',
|
||||||
|
'title' => 'Организация-заявитель',
|
||||||
|
'type' => FieldType::STRING,
|
||||||
|
'value' => $filters->get('applicant')
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'name' => 'product_producer',
|
||||||
|
'title' => 'Изготовитель / разработчик',
|
||||||
|
'type' => FieldType::STRING,
|
||||||
|
'value' => $filters->get('product_producer')
|
||||||
|
],
|
||||||
[
|
[
|
||||||
'name' => 'product_name',
|
'name' => 'product_name',
|
||||||
'title' => 'Наименование продукции',
|
'title' => 'Наименование продукции',
|
||||||
|
|
@ -111,6 +123,8 @@ class ApplicationFilters extends FiltersService {
|
||||||
elseif ($prop === 'created_at') $this->applyDateFilter($query, 'created_at', $value);
|
elseif ($prop === 'created_at') $this->applyDateFilter($query, 'created_at', $value);
|
||||||
elseif ($prop === 'status') $query->whereIn('status', is_array($value) ? $value : [$value]);
|
elseif ($prop === 'status') $query->whereIn('status', is_array($value) ? $value : [$value]);
|
||||||
elseif ($prop === 'expert') $this->applyRelationFilter($query, 'expert', $value);
|
elseif ($prop === 'expert') $this->applyRelationFilter($query, 'expert', $value);
|
||||||
|
elseif ($prop === 'applicant') $this->applySearchFilter($query, $value, ['applicant']);
|
||||||
|
elseif ($prop === 'product_producer') $this->applySearchFilter($query, $value, [['product' => ['producer']]]);
|
||||||
elseif ($prop === 'product_name') $this->applySearchFilter($query, $value, [['product' => ['name']]]);
|
elseif ($prop === 'product_name') $this->applySearchFilter($query, $value, [['product' => ['name']]]);
|
||||||
elseif ($prop === 'product_purpose') $this->applySearchFilter($query, $value, [['product' => ['purpose']]]);
|
elseif ($prop === 'product_purpose') $this->applySearchFilter($query, $value, [['product' => ['purpose']]]);
|
||||||
elseif ($prop === 'product_usage') $this->applySearchFilter($query, $value, [['product' => ['usage']]]);
|
elseif ($prop === 'product_usage') $this->applySearchFilter($query, $value, [['product' => ['usage']]]);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue