(fix) O3-4008 - Ward App - swap the position of patient card footer a…

…nd extension rows (#1320)
openmrs · Sep 19, 2024 · 4128769 · 4128769
1 parent 6822458
commit 4128769
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx b/packages/esm-ward-app/src/ward-patient-card/ward-patient-card.component.tsx
@@ -36,6 +36,16 @@ const WardPatientCard: WardPatientCard = (wardPatient) => {
         ))}
         <ExtensionSlot name={headerExtensionSlotName} state={wardPatient} />
       </div>
+      <div className={styles.wardPatientCardRow}>
+        {footerRowElements.map((elementId, i) => (
+          <WardPatientCardElement
+            key={`ward-card-${patient.uuid}-footer-${i}`}
+            elementId={elementId}
+            {...wardPatient}
+          />
+        ))}
+        <ExtensionSlot name={footerExtensionSlotName} state={wardPatient} />
+      </div>
       {wardPatient?.inpatientRequest || showPendingOrders ? (
         <div className={styles.wardPatientCardPendingItemsRow}>
           <Hourglass className={styles.hourGlassIcon} size="16" />:
@@ -52,16 +62,6 @@ const WardPatientCard: WardPatientCard = (wardPatient) => {
         state={wardPatient}
         className={classNames(styles.wardPatientCardExtensionSlot)}
       />
-      <div className={styles.wardPatientCardRow}>
-        {footerRowElements.map((elementId, i) => (
-          <WardPatientCardElement
-            key={`ward-card-${patient.uuid}-footer-${i}`}
-            elementId={elementId}
-            {...wardPatient}
-          />
-        ))}
-        <ExtensionSlot name={footerExtensionSlotName} state={wardPatient} />
-      </div>
       <button
         className={styles.wardPatientCardButton}
         onClick={() => {