Merge branch 'main' of github.com:DIPSAS/hello-open-dips

DIPSAS · Jun 26, 2024 · 26d7938 · 26d7938
2 parents f3b3520 + 3aa2c10
commit 26d7938
Show file tree

Hide file tree

Showing 9 changed files with 198 additions and 159 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -9,7 +9,7 @@ import clientContext from "../context/clientContext";
 
 function MyApp({ Component, pageProps }: AppProps) {
     const [client, setClient] = useState<Client>(undefined!);
-    const [loading, setLoading] = useState<boolean>(false);
+    const [loading, setLoading] = useState<boolean>(true);
 
 	useEffect(() => {
 		setLoading(true);
@@ -33,7 +33,7 @@ function MyApp({ Component, pageProps }: AppProps) {
         <clientContext.Provider value={{ client: client, setClient: setClient }}>
 		<Header/>
         <div className="wrapper">
-            <Component {...pageProps}>
+            <Component {...pageProps} clientLoading={loading}>
             </Component>
         </div>
         </clientContext.Provider>

diff --git a/src/pages/appointments/[id].tsx b/src/pages/appointments/[id].tsx
@@ -51,7 +51,6 @@ const Patient: React.FC = () => {
     if (!extensions) return 'No details available';
     for (let i = 0; i < extensions.length; i++) {
       const extension = extensions?.[i];
-      // console.log(extension);
       if (extension.valueCodeableConcept?.coding) {
         for (let j = 0; j < extension.valueCodeableConcept.coding.length; j++) {
           const coding = extension.valueCodeableConcept?.coding?.[j];
@@ -81,6 +80,7 @@ if (!patient) {
   );
 }
 
+
 if(patient && appointments && encounters){
 
     return (
@@ -112,7 +112,7 @@ if(patient && appointments && encounters){
               <AppointmentsEncountersInfo title= "Appointments" onClose={handleCloseList}>
                 <ul className={styles.appointmentList}>
                   <div> 
-                    <ul className={styles.appointmentWrapper}>
+                    {appointments?.total && <ul className={styles.appointmentWrapper}>
                       {appointments?.entry?.map((entry) => {
                         const resource = entry.resource as R4.IAppointment;
                         const display = getDisplayFromExtensions(resource.extension); 
@@ -125,7 +125,8 @@ if(patient && appointments && encounters){
                         </li>
                       );
                     })}
-                    </ul>
+                    </ul>}
+                    {!appointments?.total && <p className="conditions-error">The patient has no appointments.</p>}
                   </div>
                 </ul>
               </AppointmentsEncountersInfo>
@@ -137,7 +138,7 @@ if(patient && appointments && encounters){
               <AppointmentsEncountersInfo title="Encounters" onClose={handleCloseList}>
                 <ul className={styles.encounterList}>
                 <div>
-                  <ul className={styles.appointmentWrapper}>
+                  {encounters?.total && <ul className={styles.appointmentWrapper}>
                     {encounters?.entry?.map((entry) => {
                       const resource = entry.resource as R4.IEncounter; 
                       return (
@@ -150,7 +151,8 @@ if(patient && appointments && encounters){
                         </li>
                       )
                     })}
-                  </ul>
+                  </ul>}
+                  {!encounters?.total && <p className="conditions-error">The patient has no encounters.</p>}
                 </div>
                 </ul>
               </AppointmentsEncountersInfo>