Merge pull request #264 from coronasafe/develop

fix: countries_travelled can be array or string
ohcnetwork · Apr 24, 2020 · 38d8d4c · 38d8d4c
2 parents 80a5065 + b7a0a33
commit 38d8d4c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
@@ -135,7 +135,7 @@ export const PatientManager = (props: any) => {
                     <span className="font-semibold leading-relaxed">
                       Travel History:{" "}
                     </span>
-                    {patient.countries_travelled.join(", ")}
+                    {Array.isArray(patient.countries_travelled) ? patient.countries_travelled.join(", ") : patient.countries_travelled.split(',').join(', ')}
                   </>)}
                 </div>
               </div>

diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
@@ -363,7 +363,7 @@ export const PatientHome = (props: any) => {
           </div>
           {patientData.countries_travelled && !!patientData.countries_travelled.length && (<div className="md:col-span-2">
             <span className="font-semibold leading-relaxed">Countries travelled: </span>
-            {patientData.countries_travelled.join(', ')}
+            {Array.isArray(patientData.countries_travelled) ? patientData.countries_travelled.join(", ") : patientData.countries_travelled.split(',').join(', ')}
           </div>)}
           {patientData.ongoing_medication && (<div className="md:col-span-2">
             <span className="font-semibold leading-relaxed">Ongoing Medications </span>

diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx
@@ -32,7 +32,7 @@ export interface PatientModel {
     estimated_contact_date?: string;
     past_travel?: boolean;
     ongoing_medication?: string;
-    countries_travelled?: Array<string>;
+    countries_travelled?: Array<string> | string;
     present_health?: string;
     has_SARI?: boolean;
     local_body?: number;