diff --git a/src/components/DoctorCard/Shared/index.js b/src/components/DoctorCard/Shared/index.js index 234ab749..39d44a83 100644 --- a/src/components/DoctorCard/Shared/index.js +++ b/src/components/DoctorCard/Shared/index.js @@ -71,10 +71,12 @@ export const DoubleChip = function DoubleChip({ type, ageGroup }) { {t(`${drType}`)} - - {t(`${drAgeGroup}`)} - - + {type === 'den' && ( + + {t(`${drAgeGroup}`)} + + + )} ); }; diff --git a/src/components/DoctorCard/dicts.js b/src/components/DoctorCard/dicts.js index cabbdba0..e61fb0ab 100644 --- a/src/components/DoctorCard/dicts.js +++ b/src/components/DoctorCard/dicts.js @@ -1,5 +1,6 @@ export const TypeTranslate = { gp: 'generalPractitioner', + ped: 'pediatrician', den: 'dentist', gyn: 'gynecologist', }; @@ -11,6 +12,7 @@ export const AgeGroupTranslate = { export const TypeIconTranslate = { gp: 'Family', + ped: 'Kids', den: 'Dentist', gyn: 'Gyno', }; diff --git a/src/components/Filters/ToggleDoctorType.js b/src/components/Filters/ToggleDoctorType.js index b5ff6c86..9d48a8ec 100644 --- a/src/components/Filters/ToggleDoctorType.js +++ b/src/components/Filters/ToggleDoctorType.js @@ -27,8 +27,11 @@ function withToggleGroup(Component) { useEffect(() => { const typeTranslate = { gp_adults: 'gp', - gp_youth: 'gp-y', + gp_youth: 'gp', gp_students: 'gp', + ped_adults: 'ped', + ped_students: 'ped', + ped_youth: 'ped', den_adults: 'den', den_students: 'den-s', den_youth: 'den-y', @@ -57,11 +60,11 @@ function withToggleGroup(Component) { iconNames={['FamilyDrWhite', 'Family']} /> + - {drType !== 'gyn' && ( + {drType === 'den' && ( - {drType === 'den' && ( - - )} + )} diff --git a/src/components/Filters/index.js b/src/components/Filters/index.js index 4e6e7017..81495a60 100644 --- a/src/components/Filters/index.js +++ b/src/components/Filters/index.js @@ -16,6 +16,7 @@ import * as Styled from './styles'; const DoctorTypeIcons = { gp: , + ped: , den: , gyn: , }; @@ -32,6 +33,7 @@ const AcceptsIcons = { const DoctorTypeText = { gp: 'generalPractitioner', + ped: 'pediatrician', den: 'dentist', gyn: 'gynecologist', }; diff --git a/src/const/doctors.js b/src/const/doctors.js index e227e495..33d2e10a 100644 --- a/src/const/doctors.js +++ b/src/const/doctors.js @@ -24,6 +24,7 @@ export const Provider = { export const DoctorTypes = { doctors: 'Splošni', + ped: 'Pediatri', gyno: 'Ginekologi', dentists: 'Zobozdravniki', }; diff --git a/src/locales/en.json b/src/locales/en.json index 9a7b78e1..4f2075b0 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -13,6 +13,7 @@ "all": "all", "generalPractitioner": "general practitioner", "dentist": "dentist", + "pediatrician": "pediatrician", "gynecologist": "gynecologist", "adults": "adults", "students": "students", diff --git a/src/locales/sl.json b/src/locales/sl.json index 0b42fd49..06bb34b9 100644 --- a/src/locales/sl.json +++ b/src/locales/sl.json @@ -13,6 +13,7 @@ "all": "vsi", "generalPractitioner": "družinski zdravnik", "dentist": "zobozdravnik", + "pediatrician": "pediater", "gynecologist": "ginekolog", "adults": "odrasli", "students": "študenti",