Fix Search Filter

This commit is contained in:
2022-08-15 12:50:10 +07:00
parent 34eee31a38
commit 96e7aa1b31
3 changed files with 7 additions and 5 deletions

View File

@@ -19,6 +19,7 @@ class CorporateFormulariumController extends Controller
public function index(Request $request, $corporate_id) public function index(Request $request, $corporate_id)
{ {
$formulariums = Formularium::query() $formulariums = Formularium::query()
->filter($request->all())
->with(['corporateFormulariums' => function ($query) use ($corporate_id) { ->with(['corporateFormulariums' => function ($query) use ($corporate_id) {
$query->where('corporate_id', $corporate_id); $query->where('corporate_id', $corporate_id);
}]) }])

View File

@@ -40,6 +40,7 @@ class Formularium extends Model
return $query return $query
->where('code', 'like', "%" . $search . "%") ->where('code', 'like', "%" . $search . "%")
->orWhere('name', 'like', "%" . $search . "%") ->orWhere('name', 'like', "%" . $search . "%")
->orWhere('id', $search)
; ;
}); });
} }

View File

@@ -14,10 +14,10 @@ export default function CorporateFormularium() {
const { corporate_id } = useParams(); const { corporate_id } = useParams();
return ( return (
<Page title="Division"> <Page title="Formularium">
<HeaderBreadcrumbs <HeaderBreadcrumbs
heading={'Division'} heading={'Formularium'}
links={[ links={[
{ {
name: 'Corporates', name: 'Corporates',
@@ -28,14 +28,14 @@ export default function CorporateFormularium() {
href: '/corporates/'+corporate_id, href: '/corporates/'+corporate_id,
}, },
{ {
name: 'Division', name: 'Formularium',
href: '/corporates/'+corporate_id+'/divisions', href: '/corporates/'+corporate_id+'/formularium',
}, },
]} ]}
/> />
<Card> <Card>
<CorporateTabNavigations position={'services'} /> <CorporateTabNavigations position={'formularium'} />
<List /> <List />
</Card> </Card>
</Page> </Page>