diff --git a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css index e05def83..c9adcdb3 100644 --- a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css +++ b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css @@ -1,5 +1,7 @@ .container { align-items: center; + flex-wrap: nowrap; + margin-inline-start: 12px; } .button:hover { diff --git a/pwa/src/context/filters.ts b/pwa/src/context/filters.ts index f263d509..187af7e6 100644 --- a/pwa/src/context/filters.ts +++ b/pwa/src/context/filters.ts @@ -5,14 +5,14 @@ export interface IFiltersContext { _search: string | undefined; "Ontvangstdatum[after]": string | undefined; "Ontvangstdatum[before]": string | undefined; - publicationType: string | undefined; + Categorie: string | undefined; } export const defaultFiltersContext: IFiltersContext = { _search: "", "Ontvangstdatum[after]": undefined, "Ontvangstdatum[before]": undefined, - publicationType: undefined, + Categorie: undefined, }; export const useFiltersContext = () => { diff --git a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx index 906d618c..c53a3500 100644 --- a/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx +++ b/pwa/src/templates/templateParts/filters/FiltersTemplate.tsx @@ -33,7 +33,7 @@ export const FiltersTemplate: React.FC = ({ isLoading }) = _search: data.title, "Ontvangstdatum[after]": data.year?.after, "Ontvangstdatum[before]": data.year?.before, - publicationType: data.publicationType?.value, + Categorie: data.category?.value, }); }; @@ -58,9 +58,9 @@ export const FiltersTemplate: React.FC = ({ isLoading }) = option.value === filters.publicationType)} + name="category" + placeholder="Onderwerp" + defaultValue={TEMP_PUBLICATION_TYPES.find((option) => option.value === filters.Categorie)} isClearable {...{ register, errors, control }} /> diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx index d8c1d6fa..84b8f50a 100644 --- a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx +++ b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.tsx @@ -23,7 +23,8 @@ export const TableResultsTemplate: React.FC = ({ requ - Name + Woo-verzoek + Onderwerp Ontvangstdatum Besluitdatum Besluit @@ -33,6 +34,7 @@ export const TableResultsTemplate: React.FC = ({ requ {requests.map((request) => ( navigate(request.id)}> {request.Titel} + {request.Categorie ?? "-"} {translateDate(i18n.language, request.Ontvangstdatum) ?? "-"} {translateDate(i18n.language, request.Besluitdatum) ?? "-"} {request.Besluit !== "" ? request.Besluit : "Geen besluit beschikbaar"}