From defaf469b2b0be59c9a58122136c22c499822660 Mon Sep 17 00:00:00 2001
From: abertnamanya <abertnamanya@gmail.com>
Date: Wed, 20 Sep 2023 12:50:46 +0300
Subject: [PATCH] Order changes

---
 frontend/src/components/addOrder/AddOrder.js  |  2 +-
 .../components/patient/CreatePatientForm.js   | 57 ++++++++++---------
 frontend/src/languages/en.json                |  4 +-
 frontend/src/languages/fr.json                |  4 +-
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/frontend/src/components/addOrder/AddOrder.js b/frontend/src/components/addOrder/AddOrder.js
index 0ba2c7516c..eb34cb297f 100644
--- a/frontend/src/components/addOrder/AddOrder.js
+++ b/frontend/src/components/addOrder/AddOrder.js
@@ -468,7 +468,7 @@ const AddOrder = (props) => {
               className="inputDate"
               labelText={<FormattedMessage id="sample.entry.nextVisit.date" />}
               value={orderFormValues.sampleOrderItems.nextVisitDate}
-              autofillDate={true}
+              autofillDate={false}
               onChange={(date) => handleDatePickerChange("nextVisitDate", date)}
             />
           </div>
diff --git a/frontend/src/components/patient/CreatePatientForm.js b/frontend/src/components/patient/CreatePatientForm.js
index 6e350dddc5..feaab2c1ef 100644
--- a/frontend/src/components/patient/CreatePatientForm.js
+++ b/frontend/src/components/patient/CreatePatientForm.js
@@ -359,6 +359,8 @@ function CreatePatientForm(props) {
                 )}
               </Field>
             </div>
+            <Accordion>
+              <AccordionItem title="Emergency Contact Information">
             <div className="inlineDiv">
               <Field name="patientContact.person.lastName">
                 {({ field }) => (
@@ -427,18 +429,10 @@ function CreatePatientForm(props) {
               </div>
               <div className="error"></div>
             </div>
+              </AccordionItem>
+            </Accordion>
+
             <div className="inlineDiv">
-              <Field name="city">
-                {({ field }) => (
-                  <TextInput
-                    value={values.city}
-                    name={field.name}
-                    labelText="Town"
-                    id={field.name}
-                    className="inputText"
-                  />
-                )}
-              </Field>
               <Field name="primaryPhone">
                 {({ field }) => (
                   <TextInput
@@ -450,6 +444,20 @@ function CreatePatientForm(props) {
                   />
                 )}
               </Field>
+              <Field name="gender">
+                {({ field }) => (
+                    <RadioButtonGroup
+                        valueSelected={values.gender}
+                        legendText="Gender"
+                        name={field.name}
+                        className="inputText"
+                        id="create_patient_gender"
+                    >
+                      <RadioButton id="radio-1" labelText="Male" value="M" />
+                      <RadioButton id="radio-2" labelText="Female" value="F" />
+                    </RadioButtonGroup>
+                )}
+              </Field>
             </div>
             <div className="inlineDiv">
               <Field name="birthDateForDisplay">
@@ -507,25 +515,20 @@ function CreatePatientForm(props) {
                 <ErrorMessage name="gender"></ErrorMessage>
               </div>
             </div>
-            <div className="inlineDiv">
-              <Field name="gender">
-                {({ field }) => (
-                    <RadioButtonGroup
-                        valueSelected={values.gender}
-                        legendText="Gender"
-                        name={field.name}
-                        className="inputText"
-                        id="create_patient_gender"
-                    >
-                      <RadioButton id="radio-1" labelText="Male" value="M" />
-                      <RadioButton id="radio-2" labelText="Female" value="F" />
-                    </RadioButtonGroup>
-                )}
-              </Field>
-            </div>
             <Accordion>
               <AccordionItem title="Additional Information">
                 <div className="inlineDiv">
+                  <Field name="city">
+                    {({ field }) => (
+                        <TextInput
+                            value={values.city}
+                            name={field.name}
+                            labelText="Town"
+                            id={field.name}
+                            className="inputText"
+                        />
+                    )}
+                  </Field>
                   <Field name="streetAddress">
                     {({ field }) => (
                       <TextInput
diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
index 64fccd3855..323ee82724 100644
--- a/frontend/src/languages/en.json
+++ b/frontend/src/languages/en.json
@@ -129,8 +129,8 @@
     "header.label.logout" :"Logout" ,
     "header.label.selectlocale" : "Select Locale" ,
     "sidenav.label.order" : "Order",
-    "sidenav.label.addorder" : "Add Oder" ,
-    "sidenav.label.editorder" : "Edit Oder" ,
+    "sidenav.label.addorder" : "Add Order" ,
+    "sidenav.label.editorder" : "Edit Order" ,
     "sidenav.label.incomingorder" : "Incoming Orders",
     "sidenav.label.batchorder" : "Batch Order Entry" ,
     "sidenav.label.barcode" : "Barcode" ,
diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
index bbd87c96a5..043574e9c2 100644
--- a/frontend/src/languages/fr.json
+++ b/frontend/src/languages/fr.json
@@ -129,8 +129,8 @@
     "header.label.logout" :"Déconnexion",
     "header.label.selectlocale" : "Sélectionner la Langue",
     "sidenav.label.order" : "Commande",
-    "sidenav.label.addorder" : "Ajouter une Commande",
-    "sidenav.label.editorder" : "Modifier une Commande",
+    "sidenav.label.addorder" : "Ajouter une commande",
+    "sidenav.label.editorder" : "Modifier la commande",
     "sidenav.label.incomingorder" : "Commandes Entrantes",
     "sidenav.label.batchorder" : "Saisie de Commande en Lot",
     "sidenav.label.barcode" : "Code-barres",