(fix) O3-3240: Fix appearance of card rows in admission request cards (…

…#1248)
openmrs · Jul 24, 2024 · 7f7fe3c · 7f7fe3c
1 parent 2de75c3
commit 7f7fe3c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/packages/esm-ward-app/src/ward-workspace/admission-request-card.component.tsx b/packages/esm-ward-app/src/ward-workspace/admission-request-card.component.tsx
@@ -10,11 +10,11 @@ interface AdmissionRequestCardProps {
 
 const AdmissionRequestCard: React.FC<AdmissionRequestCardProps> = ({ patient }) => {
   const { locationUuid } = useParams();
-  const admissionPatientCardSlots = usePatientCardRows(locationUuid);
+  const rows = usePatientCardRows(locationUuid);
   return (
-    <div className={styles.admissionRequestCardHeader}>
-      {admissionPatientCardSlots.map((AdmissionPatientCard, i) => (
-        <AdmissionPatientCard key={i} patient={patient} bed={null} visit={null} />
+    <div className={styles.admissionRequestCard}>
+      {rows.map((CardRow, i) => (
+        <CardRow key={i} patient={patient} bed={null} visit={null} />
       ))}
     </div>
   );

diff --git a/packages/esm-ward-app/src/ward-workspace/admission-request-card.scss b/packages/esm-ward-app/src/ward-workspace/admission-request-card.scss
@@ -1,19 +1,16 @@
 @use '@carbon/styles/scss/type';
 @use '@carbon/styles/scss/spacing';
+@use '@carbon/colors';
 @import '~@openmrs/esm-styleguide/src/vars';
 
-.admissionRequestCardHeader {
-  background-color: $ui-03;
-  padding: spacing.$spacing-03;
-  border: 1px solid $color-gray-30;
-  height: fit-content;
+.admissionRequestCard {
+  background-color: $ui-01;
+  border: 1px solid $ui-03;
   color: $color-gray-70;
   display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  > div:not(:first-of-type)::before {
-    content: '·';
-    padding: spacing.$spacing-02;
+  flex-direction: column;
+  > :not(:first-child) {
+    border-top: 1px colors.$gray-20 solid;
   }
 }