Feature/deactivate account fix

src/FhirClientProvider.tsx

@@ -46,14 +46,18 @@ export default function FhirClientProvider(props: Props): JSX.Element {
       console.log("Using stored patient id ", queryPatientId);
       return getFhirData(client, "/Patient/" + queryPatientId).then(
         (value: any) => {
-          return Patient.from(value);
+          let patient: Patient = Patient.from(value)
+          let active_patient: Patient = patient.active == true ? patient : undefined;
+          return active_patient;
         }
       );
     }
     // Get the Patient resource
     return await client.patient.read().then((value: any) => {
-      return Patient.from(value);
-    });
+      let patient: Patient = Patient.from(value)
+      let active_patient: Patient = patient.active == true ? patient : undefined;
+      return active_patient;
+});
   }
 
   async function getPractitioner(

src/components/ScheduleSetup.tsx

@@ -463,6 +463,12 @@ export default class ScheduleSetup extends React.Component<
       );
     }
 
+    if (patient.active != true) {
+      return new Promise((resolve, reject) =>
+        reject("The patient is not active.")
+      );
+    }
+
     let params = new URLSearchParams({
       telecom: `${patient.smsContactPoint}`,
       // FIXME
@@ -488,7 +494,7 @@ export default class ScheduleSetup extends React.Component<
                   }
                 }
               );
-              if (patients.find((o) => o.id !== patient.id)) {
+              if ((patients.find((o) => o.id !== patient.id && o.active == true))) {
                 // exclude current patient, workaround for above FIXME
                 reject(
                   `Phone number is already associated with: ${patients

src/model/CommunicationRequest.ts

@@ -61,14 +61,15 @@ export class CommunicationRequest implements ICommunicationRequest {
     sender: Patient | Practitioner = null,
     note: string = ""
   ) {
-    return this.createNewOutgoingMessage(
+    let c = this.createNewOutgoingMessage(
       messageContent,
       patient,
       carePlan,
       IsaccMessageCategory.isaccManuallySentMessage,
       sender,
       note
     );
+    return c
   }
 
   static createNewOutgoingMessage(