From 8187e1d0da721fcb2609d183c9d1561c88c191c4 Mon Sep 17 00:00:00 2001
From: Srayash Singh <146334722+Srayash@users.noreply.github.com>
Date: Tue, 12 Nov 2024 20:08:11 +0530
Subject: [PATCH 1/5] "Remove "Add Consultation" if patient is inactive" #9055

---
 src/components/Patient/PatientHome.tsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index 3b5924009bb..6bda169cdc7 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -243,11 +243,7 @@ export const PatientHome = (props: any) => {
   };
 
   const isPatientEligibleForNewConsultation = (patientData: PatientModel) => {
-    return patientData.is_active &&
-      (!patientData?.last_consultation ||
-        patientData?.last_consultation?.discharge_date)
-      ? true
-      : false;
+    return patientData.is_active ? true : false;
   };
 
   return (
@@ -1066,7 +1062,7 @@ export const PatientHome = (props: any) => {
                   "w-full rounded-lg border",
                   isPatientEligibleForNewConsultation(patientData)
                     ? "cursor-pointer border-green-700 hover:bg-primary-400"
-                    : "border-secondary-700 text-secondary-700 hover:cursor-not-allowed",
+                    : "hidden border-secondary-700 text-secondary-700 hover:cursor-not-allowed",
                 )}
                 onClick={() =>
                   isPatientEligibleForNewConsultation(patientData) &&

From 5fcb793c12997f6be38932e92aaad72e144b5cea Mon Sep 17 00:00:00 2001
From: Srayash Singh <146334722+Srayash@users.noreply.github.com>
Date: Wed, 13 Nov 2024 20:47:07 +0530
Subject: [PATCH 2/5] Remove Add Consultation from patient details

---
 src/components/Patient/PatientHome.tsx | 55 ++++----------------------
 1 file changed, 8 insertions(+), 47 deletions(-)

diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index 6bda169cdc7..18f87c010ab 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -241,10 +241,15 @@ export const PatientHome = (props: any) => {
       !(patientData?.last_consultation?.facility === facilityId)
     );
   };
+  // Commented out as this is no longer used should I completely remove this?
 
-  const isPatientEligibleForNewConsultation = (patientData: PatientModel) => {
-    return patientData.is_active ? true : false;
-  };
+  // const isPatientEligibleForNewConsultation = (patientData: PatientModel) => {
+  //   return patientData.is_active &&
+  //     (!patientData?.last_consultation ||
+  //       patientData?.last_consultation?.discharge_date)
+  //     ? true
+  //     : false;
+  // };
 
   return (
     <Page
@@ -674,7 +679,6 @@ export const PatientHome = (props: any) => {
                 )}
                 <div>
                   <ButtonV2
-                    id="update-patient-details"
                     className="mt-4 w-full"
                     disabled={!patientData.is_active}
                     authorizeFor={NonReadOnlyUsers}
@@ -1057,49 +1061,6 @@ export const PatientHome = (props: any) => {
         <section className="mt-4 space-y-2 md:flex">
           <div className="hidden lg:block">
             <div className="mt-4 grid grid-cols-6 gap-5 xl:grid-cols-7">
-              <div
-                className={classNames(
-                  "w-full rounded-lg border",
-                  isPatientEligibleForNewConsultation(patientData)
-                    ? "cursor-pointer border-green-700 hover:bg-primary-400"
-                    : "hidden border-secondary-700 text-secondary-700 hover:cursor-not-allowed",
-                )}
-                onClick={() =>
-                  isPatientEligibleForNewConsultation(patientData) &&
-                  navigate(
-                    `/facility/${patientData?.facility}/patient/${id}/consultation`,
-                  )
-                }
-              >
-                <div
-                  className={classNames(
-                    "h-full space-y-2 rounded-lg bg-white p-4 shadow",
-                    isPatientEligibleForNewConsultation(patientData) &&
-                      "hover:bg-secondary-200",
-                  )}
-                >
-                  <div
-                    className={classNames(
-                      "text-center",
-                      isPatientEligibleForNewConsultation(patientData) &&
-                        "text-green-700",
-                    )}
-                  >
-                    <span>
-                      <CareIcon
-                        icon="l-chat-bubble-user"
-                        className="text-5xl"
-                      />
-                    </span>
-                  </div>
-
-                  <div>
-                    <p className="text-center text-sm font-medium">
-                      Add Consultation
-                    </p>
-                  </div>
-                </div>
-              </div>
               <div
                 className="w-full"
                 onClick={() => navigate(`/patient/${id}/investigation_reports`)}

From 255e55b87226aa3a47458a16e545dbb0b4aa9a48 Mon Sep 17 00:00:00 2001
From: Srayash Singh <146334722+Srayash@users.noreply.github.com>
Date: Wed, 13 Nov 2024 20:50:00 +0530
Subject: [PATCH 3/5] Update PatientHome.tsx

---
 src/components/Patient/PatientHome.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index 18f87c010ab..9f8ed049b5a 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -679,6 +679,7 @@ export const PatientHome = (props: any) => {
                 )}
                 <div>
                   <ButtonV2
+                    id="update-patient-details"
                     className="mt-4 w-full"
                     disabled={!patientData.is_active}
                     authorizeFor={NonReadOnlyUsers}

From 0ec478547266418037b2b68e1e94c494a7271538 Mon Sep 17 00:00:00 2001
From: Srayash Singh <146334722+Srayash@users.noreply.github.com>
Date: Thu, 14 Nov 2024 07:59:53 +0530
Subject: [PATCH 4/5] Remove comments.

---
 src/components/Patient/PatientHome.tsx | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index 9f8ed049b5a..3c7e29379a3 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -241,15 +241,6 @@ export const PatientHome = (props: any) => {
       !(patientData?.last_consultation?.facility === facilityId)
     );
   };
-  // Commented out as this is no longer used should I completely remove this?
-
-  // const isPatientEligibleForNewConsultation = (patientData: PatientModel) => {
-  //   return patientData.is_active &&
-  //     (!patientData?.last_consultation ||
-  //       patientData?.last_consultation?.discharge_date)
-  //     ? true
-  //     : false;
-  // };
 
   return (
     <Page

From 33a8602121c3744d87d04930839bd997bb5c4d8b Mon Sep 17 00:00:00 2001
From: Srayash Singh <146334722+Srayash@users.noreply.github.com>
Date: Thu, 14 Nov 2024 08:15:08 +0530
Subject: [PATCH 5/5] Remove redundant "Add Consultation" Button from mobile
 view.

---
 src/components/Patient/PatientHome.tsx | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/components/Patient/PatientHome.tsx b/src/components/Patient/PatientHome.tsx
index 3c7e29379a3..9d3ab238e5b 100644
--- a/src/components/Patient/PatientHome.tsx
+++ b/src/components/Patient/PatientHome.tsx
@@ -1239,28 +1239,6 @@ export const PatientHome = (props: any) => {
           <div className="mx-2 w-full lg:hidden">
             <div className="h-full space-y-2 rounded-lg bg-white p-4 shadow">
               <div className="space-y-2 border-b border-dashed text-left text-lg font-semibold text-secondary-900">
-                <div>
-                  <ButtonV2
-                    className="w-full"
-                    disabled={
-                      !(
-                        patientData.is_active &&
-                        (!patientData?.last_consultation ||
-                          patientData?.last_consultation?.discharge_date)
-                      )
-                    }
-                    onClick={() =>
-                      navigate(
-                        `/facility/${patientData?.facility}/patient/${id}/consultation`,
-                      )
-                    }
-                  >
-                    <span className="flex w-full items-center justify-start gap-2">
-                      <CareIcon icon="l-chat-bubble-user" className="text-xl" />
-                      Add Consultation
-                    </span>
-                  </ButtonV2>
-                </div>
                 <div>
                   <ButtonV2
                     className="w-full"