O3-3212: Ward App - add configurable extension to include address com…

…ponent (#1240) (don't display divider dot if no value present)
openmrs · Jul 18, 2024 · fbbaa35 · fbbaa35
1 parent 664edfa
commit fbbaa35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-age.tsx b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-age.tsx
@@ -6,12 +6,14 @@ const WardPatientAge: WardPatientCardElement = ({ patient }) => {
   const { t } = useTranslation();
   // TODO: BED-10
   // make the backend return patient.person.birthdate so we can use the age() function to calculate age
-  return (
+  return patient?.person?.age ? (
     <div>
       {t('yearsOld', '{{age}} yrs', {
         age: patient?.person?.age,
       })}
     </div>
+  ) : (
+    <></>
   );
 };
 

diff --git a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-header-address.tsx b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-header-address.tsx
@@ -11,7 +11,9 @@ const wardPatientAddress = (config: PatientAddressElementConfig) => {
 
     return (
       <div className={styles.wardPatientAddress}>
-        {addressFields?.map((field, i) => <div key={i}>{preferredAddress?.[field] as string}</div>)}
+        {addressFields?.map((field, i) =>
+          preferredAddress?.[field] ? <div key={i}>{preferredAddress?.[field] as string}</div> : <></>,
+        )}
       </div>
     );
   };