From 2dd00e1b2017c867ff1add5e427609db50629a6c Mon Sep 17 00:00:00 2001
From: Nitin Singh <nitinpsingh46@gmail.com>
Date: Sun, 28 Jul 2024 13:05:49 +0530
Subject: [PATCH 1/2] fix #8220 made date component responsive

---
 src/Components/Common/DateInputV2.tsx  | 2 +-
 src/Components/Patient/DailyRounds.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Components/Common/DateInputV2.tsx b/src/Components/Common/DateInputV2.tsx
index 2e9f99de9bc..55fb5b50b06 100644
--- a/src/Components/Common/DateInputV2.tsx
+++ b/src/Components/Common/DateInputV2.tsx
@@ -256,7 +256,7 @@ const DateInputV2: React.FC<Props> = ({
                   type="text"
                   readOnly
                   disabled={disabled}
-                  className={`cui-input-base cursor-pointer disabled:cursor-not-allowed ${className}`}
+                  className={`cui-input-base cursor-pointer disabled:cursor-not-allowed max-sm:!px-2 ${className}`}
                   placeholder={placeholder ?? t("select_date")}
                   value={value && dayjs(value).format("DD/MM/YYYY")}
                 />
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index 89367c6eb37..7c7b24c1581 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -487,7 +487,7 @@ export const DailyRounds = (props: any) => {
           }}
         />
       </div>
-      <form className="w-full max-w-4xl rounded-lg bg-white px-8 py-5 shadow md:m-4 md:px-16 md:py-11">
+      <form className="w-full max-w-4xl rounded-lg bg-white px-3 py-5 shadow sm:px-8 md:m-4 md:px-16 md:py-11">
         <DraftSection
           handleDraftSelect={(newState) => {
             dispatch({ type: "set_state", state: newState });

From 7f255ae3f2c2693ad1a7651962704b539065049c Mon Sep 17 00:00:00 2001
From: Nitin Singh <nitinpsingh46@gmail.com>
Date: Tue, 30 Jul 2024 13:29:19 +0530
Subject: [PATCH 2/2] fixes #8228 changes done as per feedback

---
 src/Components/Common/DateInputV2.tsx        | 2 +-
 src/Components/Facility/ConsultationForm.tsx | 4 ++--
 src/Components/Patient/DailyRounds.tsx       | 2 +-
 src/Components/Symptoms/SymptomsBuilder.tsx  | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Components/Common/DateInputV2.tsx b/src/Components/Common/DateInputV2.tsx
index 55fb5b50b06..9bb10b1951b 100644
--- a/src/Components/Common/DateInputV2.tsx
+++ b/src/Components/Common/DateInputV2.tsx
@@ -256,7 +256,7 @@ const DateInputV2: React.FC<Props> = ({
                   type="text"
                   readOnly
                   disabled={disabled}
-                  className={`cui-input-base cursor-pointer disabled:cursor-not-allowed max-sm:!px-2 ${className}`}
+                  className={`cui-input-base cursor-pointer !px-2 disabled:cursor-not-allowed ${className}`}
                   placeholder={placeholder ?? t("select_date")}
                   value={value && dayjs(value).format("DD/MM/YYYY")}
                 />
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index a94f496cfca..bfcc80d88fd 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -932,11 +932,11 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
             );
           })}
         </div>
-        <div className="flex h-full w-full overflow-auto xl:ml-72">
+        <div className="flex h-full w-full overflow-auto xl:ml-64 2xl:ml-72 ">
           <div className="w-full max-w-4xl">
             <form
               onSubmit={handleSubmit}
-              className="rounded bg-white p-6 transition-all sm:rounded-xl sm:p-12"
+              className="rounded bg-white p-6 transition-all sm:rounded-xl sm:p-8 "
             >
               <DraftSection
                 handleDraftSelect={(newState: any) => {
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index 7c7b24c1581..321536e80f5 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -487,7 +487,7 @@ export const DailyRounds = (props: any) => {
           }}
         />
       </div>
-      <form className="w-full max-w-4xl rounded-lg bg-white px-3 py-5 shadow sm:px-8 md:m-4 md:px-16 md:py-11">
+      <form className="w-full max-w-4xl rounded-lg bg-white px-3 py-5 shadow sm:px-6 md:py-11">
         <DraftSection
           handleDraftSelect={(newState) => {
             dispatch({ type: "set_state", state: newState });
diff --git a/src/Components/Symptoms/SymptomsBuilder.tsx b/src/Components/Symptoms/SymptomsBuilder.tsx
index 8a904f6b441..f9c966d47bd 100644
--- a/src/Components/Symptoms/SymptomsBuilder.tsx
+++ b/src/Components/Symptoms/SymptomsBuilder.tsx
@@ -176,9 +176,9 @@ const SymptomEntry = (props: {
   const disabled =
     props.disabled || symptom.clinical_impression_status === "entered-in-error";
   return (
-    <div className="grid grid-cols-6 items-center gap-2 md:grid-cols-5">
+    <div className="grid grid-cols-6 items-center gap-2 lg:grid-cols-8 xl:grid-cols-5">
       <DateFormField
-        className="col-span-3 w-full md:col-span-1"
+        className="col-span-3 w-full lg:col-span-2 xl:col-span-1 "
         name="onset_date"
         value={new Date(symptom.onset_date)}
         disableFuture
@@ -187,7 +187,7 @@ const SymptomEntry = (props: {
         errorClassName="hidden"
       />
       <DateFormField
-        className="col-span-3 w-full md:col-span-1"
+        className="col-span-3 w-full lg:col-span-2 xl:col-span-1"
         name="cure_date"
         value={symptom.cure_date ? new Date(symptom.cure_date) : undefined}
         disableFuture
@@ -198,7 +198,7 @@ const SymptomEntry = (props: {
         onChange={props.onChange}
         errorClassName="hidden"
       />
-      <div className="col-span-6 flex items-center gap-2 md:col-span-3">
+      <div className="col-span-6 flex items-center gap-2 lg:col-span-4 xl:col-span-3">
         <div
           className={classNames(
             "cui-input-base w-full font-medium",