Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Filtering] Add senior housing filtering to the filter modal #631

Merged
merged 2 commits into from
Sep 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. The format
- Partially Senior reserved community type ([#572](https://github.com/CityOfDetroit/bloom/pull/572))
- "About" page ([#589](https://github.com/CityOfDetroit/bloom/pull/589))
- RTL support ([#627](https://github.com/CityOfDetroit/bloom/pull/627))
- Add senior housing filtering to the filter modal ([#631](https://github.com/CityOfDetroit/bloom/pull/631))

## Detroit Team M11

Expand Down
25 changes: 12 additions & 13 deletions sites/public/pages/listings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,22 +123,20 @@ const ListingsPage = () => {
{ value: "n", label: t("t.no") },
{ value: "y", label: t("t.yes") },
]
const communityTypeOptions: SelectOption[] = [
EMPTY_OPTION,
{ value: "all", label: t("listingFilters.communityTypeOptions.all") },
{ value: "senior", label: t("listingFilters.communityTypeOptions.senior") },
{
value: "specialNeedsAndDisability",
label: t("listingFilters.communityTypeOptions.specialNeeds"),
},
]

const availabilityOptions: SelectOption[] = [
EMPTY_OPTION,
{ value: AvailabilityFilterEnum.hasAvailability, label: t("listingFilters.hasAvailability") },
{ value: AvailabilityFilterEnum.noAvailability, label: t("listingFilters.noAvailability") },
{ value: AvailabilityFilterEnum.waitlist, label: t("listingFilters.waitlist") },
]

const seniorHousingOptions: SelectOption[] = [
EMPTY_OPTION,
{ value: "true", label: t("t.yes") },
{ value: "false", label: t("t.no") },
]

function setQueryString(page: number, filters = filterState) {
void router.push(`/listings?page=${page}${encodeToFrontendFilterString(filters)}`, undefined, {
shallow: true,
Expand Down Expand Up @@ -263,14 +261,15 @@ const ListingsPage = () => {
register={register}
controlClassName="control"
options={adaCompliantOptions}
defaultValue={filterState?.seniorHousing?.toString()}
/>
<Select
id="communityType"
name="communityType"
label={t("listingFilters.communityType")}
id="seniorHousing"
name={FrontendListingFilterStateKeys.seniorHousing}
label={t("listingFilters.senior")}
register={register}
controlClassName="control"
options={communityTypeOptions}
options={seniorHousingOptions}
/>
</div>
<div className="text-center mt-6">
Expand Down
10 changes: 3 additions & 7 deletions ui-components/src/locales/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -1347,19 +1347,15 @@
"zipCode": "الرمز البريدي",
"zipCodeDescription": "أدخل الرمز البريدي",
"adaCompliant": "متوافق مع ADA",
"communityType": "نوع المجتمع",
"communityTypeOptions": {
"all": "الجميع",
"senior": "مساكن كبار السن (62+)",
"specialNeeds": "ذوي الاحتياجات الخاصة والإعاقة"
},
"availability": "توفر الوحدة",
"hasAvailability": "لديها توافر",
"noAvailability": "لا يوجد توافر",
"waitlist": "قائمة الانتظار",
"applyFilters": "تطبيق المرشحات",
"noResults": "لا نتائج",
"noResultsSubtitle": "تحرير أو إزالة عوامل التصفية للحصول على أفضل النتائج."
"noResultsSubtitle": "تحرير أو إزالة عوامل التصفية للحصول على أفضل النتائج.",
"senior": "مساكن كبار السن (62+)",
"specialNeeds": "ذوي الاحتياجات الخاصة والإعاقة"
},
"eligibility": {
"progress": {
Expand Down
10 changes: 3 additions & 7 deletions ui-components/src/locales/bn.json
Original file line number Diff line number Diff line change
Expand Up @@ -1347,19 +1347,15 @@
"zipCode": "জিপ কোড",
"zipCodeDescription": "জিপ কোড প্রবেশ",
"adaCompliant": "ADA অনুগত",
"communityType": "সম্প্রদায়ের ধরন",
"communityTypeOptions": {
"all": "সব",
"senior": "সিনিয়র হাউজিং (62+)",
"specialNeeds": "বিশেষ চাহিদা এবং অক্ষমতা"
},
"availability": "ইউনিট প্রাপ্যতা",
"hasAvailability": "প্রাপ্যতা আছে",
"noAvailability": "সক্ষমতা নেই",
"waitlist": "প্রতীক্ষার তালিকা",
"applyFilters": "ফিল্টার প্রয়োগ করুন",
"noResults": "কোন ফলাফল নেই",
"noResultsSubtitle": "সেরা ফলাফলের জন্য ফিল্টার সম্পাদনা বা অপসারণ করুন।"
"noResultsSubtitle": "সেরা ফলাফলের জন্য ফিল্টার সম্পাদনা বা অপসারণ করুন।",
"senior": "সিনিয়র হাউজিং (62+)",
"specialNeeds": "বিশেষ চাহিদা এবং অক্ষমতা"
},
"eligibility": {
"progress": {
Expand Down
10 changes: 3 additions & 7 deletions ui-components/src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1222,19 +1222,15 @@
"zipCode": "Código postal",
"zipCodeDescription": "Introduzca código postal",
"adaCompliant": "Cumple con la ADA",
"communityType": "Tipo de comunidad",
"communityTypeOptions": {
"all": "Todos",
"senior": "Vivienda para personas mayores (62+)",
"specialNeeds": "Necesidades especiales y discapacidad"
},
"availability": "Disponibilidad de la unidad",
"hasAvailability": "Tiene disponibilidad",
"noAvailability": "No disponible",
"waitlist": "Lista de espera",
"applyFilters": "Aplicar filtros",
"noResults": "No hay resultados",
"noResultsSubtitle": "Edite o elimine filtros para obtener mejores resultados."
"noResultsSubtitle": "Edite o elimine filtros para obtener mejores resultados.",
"senior": "Vivienda para personas mayores (62+)",
"specialNeeds": "Necesidades especiales y discapacidad"
},
"eligibility": {
"progress": {
Expand Down
10 changes: 3 additions & 7 deletions ui-components/src/locales/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -1368,19 +1368,15 @@
"zipCode": "Zip code",
"zipCodeDescription": "Enter zip code",
"adaCompliant": "ADA Compliant",
"communityType": "Community Type",
"communityTypeOptions": {
"all": "All",
"senior": "Senior housing (62+)",
"specialNeeds": "Special needs and disability"
},
"availability": "Unit Availability",
"hasAvailability": "Has Availability",
"noAvailability": "No Availability",
"waitlist": "Waitlist",
"applyFilters": "Apply Filters",
"noResults": "No results",
"noResultsSubtitle": "Edit or remove filters for best results."
"noResultsSubtitle": "Edit or remove filters for best results.",
"senior": "Senior housing (62+)",
"specialNeeds": "Special needs and disability"
},
"eligibility": {
"progress": {
Expand Down