From 0dede488db11feaf7fbd6e83c85e04f6b0281f4b Mon Sep 17 00:00:00 2001
From: kaushikpallavi7 <kaushik.pallavi7@gmail.com>
Date: Fri, 1 Oct 2021 12:48:09 +0530
Subject: [PATCH 1/2] Fix: Align cancel buttons on left for new requests

---
 src/imagings/requests/NewImagingRequest.tsx        | 8 ++++----
 src/incidents/report/ReportIncident.tsx            | 8 ++++----
 src/labs/requests/NewLabRequest.tsx                | 9 ++++-----
 src/medications/requests/NewMedicationRequest.tsx  | 8 ++++----
 src/patients/new/NewPatient.tsx                    | 8 ++++----
 src/scheduling/appointments/new/NewAppointment.tsx | 8 ++++----
 6 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/imagings/requests/NewImagingRequest.tsx b/src/imagings/requests/NewImagingRequest.tsx
index f6afe5eeb5..b5d2dbe342 100644
--- a/src/imagings/requests/NewImagingRequest.tsx
+++ b/src/imagings/requests/NewImagingRequest.tsx
@@ -200,12 +200,12 @@ const NewImagingRequest = () => {
         </div>
         <div className="row float-right">
           <div className="btn-group btn-group-lg mt-3 mr-3">
-            <Button className="mr-2" color="success" onClick={onSave}>
-              {t('imagings.requests.create')}
-            </Button>
-            <Button color="danger" onClick={onCancel}>
+            <Button className="mr-2" color="danger" onClick={onCancel}>
               {t('actions.cancel')}
             </Button>
+            <Button color="success" onClick={onSave}>
+              {t('imagings.requests.create')}
+            </Button>
           </div>
         </div>
       </form>
diff --git a/src/incidents/report/ReportIncident.tsx b/src/incidents/report/ReportIncident.tsx
index 62bee68cf8..6a43c9956b 100644
--- a/src/incidents/report/ReportIncident.tsx
+++ b/src/incidents/report/ReportIncident.tsx
@@ -167,12 +167,12 @@ const ReportIncident = () => {
 
       <div className="row float-right">
         <div className="btn-group btn-group-lg mt-3 mr-3">
-          <Button className="mr-2" color="success" onClick={onSave}>
-            {t('incidents.reports.new')}
-          </Button>
-          <Button color="danger" onClick={onCancel}>
+          <Button className="mr-2" color="danger" onClick={onCancel}>
             {t('actions.cancel')}
           </Button>
+          <Button color="success" onClick={onSave}>
+            {t('incidents.reports.new')}
+          </Button>
         </div>
       </div>
     </form>
diff --git a/src/labs/requests/NewLabRequest.tsx b/src/labs/requests/NewLabRequest.tsx
index 20cf09be72..fd1e78e319 100644
--- a/src/labs/requests/NewLabRequest.tsx
+++ b/src/labs/requests/NewLabRequest.tsx
@@ -187,13 +187,12 @@ const NewLabRequest = () => {
         </div>
         <div className="row float-right">
           <div className="btn-group btn-group-lg mt-3 mr-3">
-            <Button className="mr-2" color="success" onClick={onSave}>
-              {t('labs.requests.new')}
-            </Button>
-
-            <Button color="danger" onClick={onCancel}>
+            <Button className="mr-2" color="danger" onClick={onCancel}>
               {t('actions.cancel')}
             </Button>
+            <Button color="success" onClick={onSave}>
+              {t('labs.requests.new')}
+            </Button>
           </div>
         </div>
       </form>
diff --git a/src/medications/requests/NewMedicationRequest.tsx b/src/medications/requests/NewMedicationRequest.tsx
index d638dab748..836d6191d2 100644
--- a/src/medications/requests/NewMedicationRequest.tsx
+++ b/src/medications/requests/NewMedicationRequest.tsx
@@ -222,12 +222,12 @@ const NewMedicationRequest = () => {
         </div>
         <div className="row float-right">
           <div className="btn-group btn-group-lg mt-3 mr-3">
-            <Button className="mr-2" color="success" onClick={onSave}>
-              {t('medications.requests.new')}
-            </Button>
-            <Button color="danger" onClick={onCancel}>
+            <Button className="mr-2" color="danger" onClick={onCancel}>
               {t('actions.cancel')}
             </Button>
+            <Button color="success" onClick={onSave}>
+              {t('medications.requests.new')}
+            </Button>
           </div>
         </div>
       </form>
diff --git a/src/patients/new/NewPatient.tsx b/src/patients/new/NewPatient.tsx
index 5fb7e223f7..1ab6fbf0af 100644
--- a/src/patients/new/NewPatient.tsx
+++ b/src/patients/new/NewPatient.tsx
@@ -99,12 +99,12 @@ const NewPatient = () => {
       />
       <div className="row float-right">
         <div className="btn-group btn-group-lg mt-3 mr-3">
-          <Button className="btn-save mr-2" color="success" onClick={onSave}>
-            {t('patients.createPatient')}
-          </Button>
-          <Button className="btn-cancel" color="danger" onClick={onCancel}>
+          <Button className="btn-cancel mr-2" color="danger" onClick={onCancel}>
             {t('actions.cancel')}
           </Button>
+          <Button className="btn-save" color="success" onClick={onSave}>
+            {t('patients.createPatient')}
+          </Button>
         </div>
       </div>
 
diff --git a/src/scheduling/appointments/new/NewAppointment.tsx b/src/scheduling/appointments/new/NewAppointment.tsx
index ddd5e056c4..7f3a3324a2 100644
--- a/src/scheduling/appointments/new/NewAppointment.tsx
+++ b/src/scheduling/appointments/new/NewAppointment.tsx
@@ -111,12 +111,12 @@ const NewAppointment = () => {
         />
         <div className="row float-right">
           <div className="btn-group btn-group-lg mr-3">
-            <Button className="mr-2" color="success" onClick={onSave}>
-              {t('scheduling.appointments.createAppointment')}
-            </Button>
-            <Button color="danger" onClick={onCancelClick}>
+            <Button className="mr-2" color="danger" onClick={onCancelClick}>
               {t('actions.cancel')}
             </Button>
+            <Button color="success" onClick={onSave}>
+              {t('scheduling.appointments.createAppointment')}
+            </Button>
           </div>
         </div>
       </form>

From a4ffc329462207022961136d3a3fd96fb707ce37 Mon Sep 17 00:00:00 2001
From: kaushikpallavi7 <kaushik.pallavi7@gmail.com>
Date: Fri, 1 Oct 2021 12:54:23 +0530
Subject: [PATCH 2/2] Fix: Align cancel buttons on left for editing appointmnet
 and patients

---
 src/patients/edit/EditPatient.tsx                    | 8 ++++----
 src/scheduling/appointments/edit/EditAppointment.tsx | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/patients/edit/EditPatient.tsx b/src/patients/edit/EditPatient.tsx
index b0f9ad53fc..74af7ece1a 100644
--- a/src/patients/edit/EditPatient.tsx
+++ b/src/patients/edit/EditPatient.tsx
@@ -80,12 +80,12 @@ const EditPatient = () => {
       />
       <div className="row float-right">
         <div className="btn-group btn-group-lg mt-3 mr-3">
-          <Button className="btn-save mr-2" color="success" onClick={onSave}>
-            {t('patients.updatePatient')}
-          </Button>
-          <Button className="btn-cancel" color="danger" onClick={onCancel}>
+          <Button className="btn-cancel mr-2" color="danger" onClick={onCancel}>
             {t('actions.cancel')}
           </Button>
+          <Button className="btn-save" color="success" onClick={onSave}>
+            {t('patients.updatePatient')}
+          </Button>
         </div>
       </div>
     </div>
diff --git a/src/scheduling/appointments/edit/EditAppointment.tsx b/src/scheduling/appointments/edit/EditAppointment.tsx
index 5a0b7e8fe3..66167196d3 100644
--- a/src/scheduling/appointments/edit/EditAppointment.tsx
+++ b/src/scheduling/appointments/edit/EditAppointment.tsx
@@ -88,12 +88,12 @@ const EditAppointment = () => {
       />
       <div className="row float-right">
         <div className="btn-group btn-group-lg mr-3">
-          <Button className="mr-2" color="success" onClick={onSave}>
-            {t('scheduling.appointments.updateAppointment')}
-          </Button>
-          <Button color="danger" onClick={onCancel}>
+          <Button className="mr-2" color="danger" onClick={onCancel}>
             {t('actions.cancel')}
           </Button>
+          <Button color="success" onClick={onSave}>
+            {t('scheduling.appointments.updateAppointment')}
+          </Button>
         </div>
       </div>
     </div>