Merge branch 'develop' into rithviknishad/feat/print-preview-zoom

ohcnetwork · Sep 9, 2024 · e87e614 · e87e614
2 parents e1e53b4 + 760ef63
commit e87e614
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 45 deletions.
diff --git a/src/Components/Facility/DischargedPatientsList.tsx b/src/Components/Facility/DischargedPatientsList.tsx
@@ -402,10 +402,6 @@ const DischargedPatientsList = ({
             badge("Declared Status", "is_declared_positive"),
             ...dateRange("Result", "date_of_result"),
             ...dateRange("Declared positive", "date_declared_positive"),
-            ...dateRange(
-              "Symptoms onset",
-              "last_consultation_symptoms_onset_date",
-            ),
             ...dateRange("Last vaccinated", "last_vaccinated_date"),
             {
               name: "Telemedicine",

diff --git a/src/Components/Facility/LocationManagement.tsx b/src/Components/Facility/LocationManagement.tsx
@@ -87,7 +87,7 @@ export default function LocationManagement({ facilityId }: Props) {
               id="add-new-location"
               href={`/facility/${facilityId}/location/add`}
               authorizeFor={NonReadOnlyUsers}
-              className="mr-8 hidden lg:block"
+              className="mr-4 hidden lg:block"
             >
               <CareIcon icon="l-plus" className="text-lg" />
               Add New Location

diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
@@ -206,10 +206,6 @@ export const PatientManager = () => {
     covin_id: qParams.covin_id || undefined,
     is_kasp: qParams.is_kasp || undefined,
     is_declared_positive: qParams.is_declared_positive || undefined,
-    last_consultation_symptoms_onset_date_before:
-      qParams.last_consultation_symptoms_onset_date_before || undefined,
-    last_consultation_symptoms_onset_date_after:
-      qParams.last_consultation_symptoms_onset_date_after || undefined,
     last_vaccinated_date_before:
       qParams.last_vaccinated_date_before || undefined,
     last_vaccinated_date_after: qParams.last_vaccinated_date_after || undefined,
@@ -262,10 +258,6 @@ export const PatientManager = () => {
       params.last_consultation_discharge_date_before,
       params.last_consultation_discharge_date_after,
     ],
-    [
-      params.last_consultation_symptoms_onset_date_before,
-      params.last_consultation_symptoms_onset_date_after,
-    ],
   ];
 
   const durations = date_range_fields.map((field: string[]) => {
@@ -854,7 +846,7 @@ export const PatientManager = () => {
                 { text: t("discharged"), value: 1 },
               ]}
               onTabChange={(tab) => {
-                if (tab === "LIVE") {
+                if (tab === 0) {
                   updateQuery({ is_active: "True" });
                 } else {
                   const id = qParams.facility || onlyAccessibleFacility?.id;
@@ -1125,10 +1117,6 @@ export const PatientManager = () => {
             ),
             badge("Declared Status", "is_declared_positive"),
             ...dateRange("Declared positive", "date_declared_positive"),
-            ...dateRange(
-              "Symptoms onset",
-              "last_consultation_symptoms_onset_date",
-            ),
             ...dateRange("Last vaccinated", "last_vaccinated_date"),
             {
               name: "Telemedicine",

diff --git a/src/Components/Patient/PatientFilter.tsx b/src/Components/Patient/PatientFilter.tsx
@@ -87,10 +87,6 @@ export default function PatientFilter(props: any) {
     covin_id: filter.covin_id || null,
     is_kasp: filter.is_kasp || null,
     is_declared_positive: filter.is_declared_positive || null,
-    last_consultation_symptoms_onset_date_before:
-      filter.last_consultation_symptoms_onset_date_before || null,
-    last_consultation_symptoms_onset_date_after:
-      filter.last_consultation_symptoms_onset_date_after || null,
     last_vaccinated_date_before: filter.last_vaccinated_date_before || null,
     last_vaccinated_date_after: filter.last_vaccinated_date_after || null,
     last_consultation_is_telemedicine:
@@ -191,8 +187,6 @@ export default function PatientFilter(props: any) {
       covin_id,
       is_kasp,
       is_declared_positive,
-      last_consultation_symptoms_onset_date_before,
-      last_consultation_symptoms_onset_date_after,
       last_vaccinated_date_before,
       last_vaccinated_date_after,
       last_consultation_is_telemedicine,
@@ -250,12 +244,6 @@ export default function PatientFilter(props: any) {
       covin_id: covin_id || "",
       is_kasp: is_kasp || "",
       is_declared_positive: is_declared_positive || "",
-      last_consultation_symptoms_onset_date_before: dateQueryString(
-        last_consultation_symptoms_onset_date_before,
-      ),
-      last_consultation_symptoms_onset_date_after: dateQueryString(
-        last_consultation_symptoms_onset_date_after,
-      ),
       last_vaccinated_date_before: dateQueryString(last_vaccinated_date_before),
       last_vaccinated_date_after: dateQueryString(last_vaccinated_date_after),
       last_consultation_is_telemedicine:
@@ -590,21 +578,6 @@ export default function PatientFilter(props: any) {
             onChange={handleDateRangeChange}
             errorClassName="hidden"
           />
-          <DateRangeFormField
-            labelClassName="text-sm"
-            name="last_consultation_symptoms_onset_date"
-            label="Onset of Symptoms Date"
-            value={{
-              start: getDate(
-                filterState.last_consultation_symptoms_onset_date_after,
-              ),
-              end: getDate(
-                filterState.last_consultation_symptoms_onset_date_before,
-              ),
-            }}
-            onChange={handleDateRangeChange}
-            errorClassName="hidden"
-          />
         </div>
       </AccordionV2>
       <AccordionV2