Merge pull request #60 from Samstar10/fix-header-text

Fix header text
IntelliSOFT-Consulting · Aug 20, 2024 · 7f48e2f · 7f48e2f
2 parents 0479373 + 13b558a
commit 7f48e2f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/packages/esm-patient-visits-report-app/package.json b/packages/esm-patient-visits-report-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sjthc/esm-patient-visits-report-app",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "MPL-2.0",
   "description": "Custom Patient Visits Reports microfrontend for the OpenMRS SPA",
   "browser": "dist/sjthc-esm-patient-visits-report-app.js",
@@ -60,5 +60,5 @@
     "@types/uuid": "^9.0.4",
     "webpack": "^5.88.2"
   },
-  "gitHead": "31f56b9d0abaf463202e8207c356b6c8ef057cf8"
+  "gitHead": "2f0170c033f60ecc53f69fa7e7655e437cc2b395"
 }
diff --git a/packages/esm-patient-visits-report-app/src/home-dashboard/home-dashboard.component.tsx b/packages/esm-patient-visits-report-app/src/home-dashboard/home-dashboard.component.tsx
@@ -6,8 +6,6 @@ import MetricsCard from "./dashboard-card/dashboard-card.component";
 import {
   DatePicker,
   DatePickerInput,
-  Tile,
-  SkeletonPlaceholder,
   DataTableSkeleton,
   Link,
   Tab,
@@ -17,6 +15,7 @@ import {
   ContentSwitcher, 
   RadioButton, 
   ExpandableSearch,
+  InlineLoading
 } from "@carbon/react";
 import {ChartLineSmooth, Table as TableIcon} from "@carbon/react/icons";
 import { useOPDCategories } from "../hooks/useOPDCategories";
@@ -236,8 +235,8 @@ const PatientVisitsReportHome: React.FC<PatientVisistsReportHomeProps> = () => {
                   <Tab onClick={() => handleTabClick(3)}>Consultation</Tab>
                   <Tab onClick={() => handleTabClick(4)}>Dental</Tab>
                   <Tab onClick={() => handleTabClick(5)}>Ultrasound</Tab>
-                  <Tab>Pharmacy</Tab>
-                  <Tab>Laboratory</Tab>
+                  {/* <Tab>Pharmacy</Tab> */}
+                  {/* <Tab>Laboratory</Tab> */}
                 </TabList>
               </Tabs>
             </div>
@@ -315,8 +314,8 @@ const PatientVisitsReportHome: React.FC<PatientVisistsReportHomeProps> = () => {
                   {listActive ? (
                     <DataTableSkeleton columns={tableData?.length} rows={5} />
                   ) : (
-                    <div style={{ width: '100%', height: '400px' }}>
-                      <SkeletonPlaceholder style={{ width: '100%', height: '100%' }} />
+                    <div className={styles.loading} style={{ width: '100%', height: '400px' }}>
+                      <InlineLoading className={styles.loading} description={t('loading', 'Loading...')} />
                     </div>
                   )}
                 </div>

diff --git a/packages/esm-patient-visits-report-app/src/home-dashboard/home-dashboard.scss b/packages/esm-patient-visits-report-app/src/home-dashboard/home-dashboard.scss
@@ -48,6 +48,7 @@
   color: colors.$gray-100;
   margin: spacing.$spacing-03 0;
   // white-space: nowrap;
+  font-size: 1.5rem;
 }
 
 .subTitle {
@@ -279,3 +280,8 @@ html[dir='rtl'] {
   width: 100%;
 }
 
+.loading {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
diff --git a/...esm-patient-visits-report-app/src/home-dashboard/patient-queue-illustration.component.tsx b/...esm-patient-visits-report-app/src/home-dashboard/patient-queue-illustration.component.tsx
@@ -7,7 +7,7 @@ const PatientQueueIllustration: React.FC = () => {
     data-name="Layer 1"
     xmlns="http://www.w3.org/2000/svg"
     viewBox="0 0 64 64"
-    style={{ width: "100px", height: "100px" }}
+    style={{ width: "64px", height: "64px" }}
   >
     <title>medical, medicine, healthcare, health, chart, edit, clipboard</title>
     <rect