OH2-251 | Fix visit filter not working correctly (#532)

* fix(OH2-251): Fix visit newPatient not being set correctly * update(OH2-251): Rename 'new admittance' to 'new attendance' * style: Remove unused imports
informatici · Nov 10, 2023 · 6f076ca · 6f076ca
1 parent cc4a7d7
commit 6f076ca
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 16 deletions.
diff --git a/src/components/accessories/opds/filter/OpdFilterForm.tsx b/src/components/accessories/opds/filter/OpdFilterForm.tsx
@@ -9,10 +9,10 @@ import { differenceInSeconds } from "date-fns";
 import { useFormik } from "formik";
 import get from "lodash.get";
 import has from "lodash.has";
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useCallback, useState } from "react";
 import { FC, useMemo } from "react";
 import { useTranslation } from "react-i18next";
-import { date, number, object, string } from "yup";
+import { number, object, string } from "yup";
 import {
   DiseaseDTO,
   DiseaseTypeDTO,
@@ -311,11 +311,11 @@ export const OpdFilterForm: FC<IOpdFilterProps> = ({
   const newPatientOptions = [
     {
       label: t("opd.all"),
-      value: "",
+      value: "A",
     },
     {
-      label: t("opd.newadmittance"),
-      value: "A",
+      label: t("opd.newattendance"),
+      value: "N",
     },
     {
       label: t("opd.reattendance"),

diff --git a/src/components/accessories/opds/table/OpdTable.tsx b/src/components/accessories/opds/table/OpdTable.tsx
@@ -72,7 +72,7 @@ export const OpdTable: FC<IOpdTableProps> = ({ data }) => {
           newPatient:
             e.newPatient === "R"
               ? t("opd.reattendance")
-              : t("opd.newadmittance"),
+              : t("opd.newattendance"),
           note: e.note ?? "",
         };
       });

diff --git a/src/components/accessories/patientOPD/patientOPDForm/PatientOPDForm.tsx b/src/components/accessories/patientOPD/patientOPDForm/PatientOPDForm.tsx
@@ -412,7 +412,7 @@ const PatientOPDForm: FunctionComponent<TProps> = ({
                       <FormControlLabel
                         value="N"
                         control={<Radio />}
-                        label={t("opd.newadmittance")}
+                        label={t("opd.newattendance")}
                         checked={formik.values["newPatient"] === "N"}
                       />
                     </RadioGroup>

diff --git a/src/resources/i18n/ar.json b/src/resources/i18n/ar.json
@@ -86,7 +86,7 @@
     "referralfrom": "Referral From",
     "referralto": "Referral To",
     "newpatient": "Attendance Type",
-    "newadmittance": "New Admittance",
+    "newattendance": "New Attendance",
     "reattendance": "Re-attendance",
     "addoperation": "Add operation",
     "addoperationdesc": "Add operation for the visit",

diff --git a/src/resources/i18n/de.json b/src/resources/i18n/de.json
@@ -178,7 +178,7 @@
     "referralfrom": "Empfehlung von",
     "referralto": "Empfehlung an",
     "newpatient": "Anwesenheitstyp",
-    "newadmittance": "Neue Aufnahme",
+    "newattendance": "Neue Aufnahme",
     "reattendance": "Wiederantritt",
     "addoperation": "Operation hinzufügen",
     "addoperationdesc": "Vorgang für den Besuch hinzufügen",

diff --git a/src/resources/i18n/en.json b/src/resources/i18n/en.json
@@ -178,7 +178,7 @@
     "referralfrom": "Referral From",
     "referralto": "Referral To",
     "newpatient": "Attendance Type",
-    "newadmittance": "New Admittance",
+    "newattendance": "New Attendance",
     "reattendance": "Re-attendance",
     "addoperation": "Add operation",
     "addoperationdesc": "Add operation for the visit",

diff --git a/src/resources/i18n/es.json b/src/resources/i18n/es.json
@@ -86,7 +86,7 @@
     "referralfrom": "Referral From",
     "referralto": "Referral To",
     "newpatient": "Attendance Type",
-    "newadmittance": "New Admittance",
+    "newattendance": "New Attendance",
     "reattendance": "Re-attendance",
     "addoperation": "Add operation",
     "addoperationdesc": "Add operation for the visit",

diff --git a/src/resources/i18n/fr.json b/src/resources/i18n/fr.json
@@ -142,7 +142,7 @@
     "referralfrom": "Visite prescrite par une autre unité hospitalière",
     "referralto": "Visite prescrite de l'extérieur",
     "newpatient": "Type de visite",
-    "newadmittance": "Nouvelle hospitalisation",
+    "newattendance": "Nouvelle hospitalisation",
     "reattendance": "Suite de visite ou cycle de visites",
     "addoperation": "Ajouter une opération",
     "addoperationdesc": "Ajouter une opération pour la visite",

diff --git a/src/resources/i18n/it.json b/src/resources/i18n/it.json
@@ -178,7 +178,7 @@
     "referralfrom": "Riferito",
     "referralto": "Rinvio ad altra struttura",
     "newpatient": "TIpo visita",
-    "newadmittance": "Nuova visita",
+    "newattendance": "Nuova visita",
     "reattendance": "Visita di controllo",
     "addoperation": "Aggiungi intervento",
     "addoperationdesc": "Aggiungi intervento per la visita",

diff --git a/src/resources/i18n/pt.json b/src/resources/i18n/pt.json
@@ -86,7 +86,7 @@
     "referralfrom": "Referral From",
     "referralto": "Referral To",
     "newpatient": "Attendance Type",
-    "newadmittance": "New Admittance",
+    "newattendance": "New Attendance",
     "reattendance": "Re-attendance",
     "addoperation": "Add operation",
     "addoperationdesc": "Add operation for the visit",

diff --git a/src/resources/i18n/sq.json b/src/resources/i18n/sq.json
@@ -178,7 +178,7 @@
     "referralfrom": "Referuar nga",
     "referralto": "Referohet tek",
     "newpatient": "Lloji i frekuentimit",
-    "newadmittance": "Pranim i ri",
+    "newattendance": "Pranim i ri",
     "reattendance": "Ri-pranim",
     "addoperation": "Shto operacion",
     "addoperationdesc": "Shto operacion për vizitën",

diff --git a/src/resources/i18n/sw.json b/src/resources/i18n/sw.json
@@ -86,7 +86,7 @@
     "referralfrom": "Referral From",
     "referralto": "Referral To",
     "newpatient": "Attendance Type",
-    "newadmittance": "New Admittance",
+    "newattendance": "New Attendance",
     "reattendance": "Re-attendance",
     "addoperation": "Add operation",
     "addoperationdesc": "Add operation for the visit",