Merge pull request #126 from sledilnik/pediatrician

Add pediatrician to doctor type selection
sledilnik · Dec 22, 2021 · 320b43c · 320b43c
2 parents 6325308 + 472edcf
commit 320b43c
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 19 deletions.
diff --git 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 }) {
         <Icons.Icon name={typeIcon} className="icon" />
         <span className="text">{t(`${drType}`)}</span>
       </Styled.PageInfo.First>
-      <Styled.PageInfo.Second direction="row" component="span" spacing={1}>
-        <span className="text">{t(`${drAgeGroup}`)}</span>
-        <Icons.Icon name={ageGroupIcon} className="icon" />
-      </Styled.PageInfo.Second>
+      {type === 'den' && (
+        <Styled.PageInfo.Second direction="row" component="span" spacing={1}>
+          <span className="text">{t(`${drAgeGroup}`)}</span>
+          <Icons.Icon name={ageGroupIcon} className="icon" />
+        </Styled.PageInfo.Second>
+      )}
     </Styled.PageInfo.DCWrapper>
   );
 };
diff --git 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
@@ -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']}
           />
           <IconToggleButton
-            value="den"
-            aria-label="dentist"
+            value="ped"
+            aria-label="pediatrician"
             accept={drType}
-            text={t('dentist')}
-            iconNames={['DentistWhite', 'Dentist']}
+            text={t('pediatrician')}
+            iconNames={['KidsWhite', 'Kids']}
           />
           <IconToggleButton
             value="gyn"
@@ -70,8 +73,15 @@ function withToggleGroup(Component) {
             text={t('gynecologist')}
             iconNames={['GynoWhite', 'Gyno']}
           />
+          <IconToggleButton
+            value="den"
+            aria-label="dentist"
+            accept={drType}
+            text={t('dentist')}
+            iconNames={['DentistWhite', 'Dentist']}
+          />
         </Component>
-        {drType !== 'gyn' && (
+        {drType === 'den' && (
           <Component {...injectedPropsAgeGroup}>
             <IconToggleButton
               value="adults"
@@ -87,15 +97,13 @@ function withToggleGroup(Component) {
               text={t('youth')}
               iconNames={['KidsWhite', 'Kids']}
             />
-            {drType === 'den' && (
-              <IconToggleButton
-                value="students"
-                aria-label="students"
-                accept={ageGroup}
-                text={t('students')}
-                iconNames={['StudentsWhite', 'Students']}
-              />
-            )}
+            <IconToggleButton
+              value="students"
+              aria-label="students"
+              accept={ageGroup}
+              text={t('students')}
+              iconNames={['StudentsWhite', 'Students']}
+            />
           </Component>
         )}
       </>

diff --git a/src/components/Filters/index.js b/src/components/Filters/index.js
@@ -16,6 +16,7 @@ import * as Styled from './styles';
 
 const DoctorTypeIcons = {
   gp: <Icons.Icon name="Family" />,
+  ped: <Icons.Icon name="Kids" />,
   den: <Icons.Icon name="Dentist" />,
   gyn: <Icons.Icon name="Gyno" />,
 };
@@ -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
@@ -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
@@ -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
@@ -13,6 +13,7 @@
     "all": "vsi",
     "generalPractitioner": "družinski zdravnik",
     "dentist": "zobozdravnik",
+    "pediatrician": "pediater",
     "gynecologist": "ginekolog",
     "adults": "odrasli",
     "students": "študenti",