From 0ec3376e69ffdf21ef8554ff8604a9b551c1d65c Mon Sep 17 00:00:00 2001
From: SteveGT96 <steve.tsala@intesys.it>
Date: Thu, 1 Feb 2024 09:38:18 +0100
Subject: [PATCH] update: Update data fields display order and fix some lint
 warnings

---
 .../currentAdmission/CurrentAdmission.tsx            |  5 ++---
 .../currentAdmissionData/CurrentAdmissionData.tsx    | 12 ++++++------
 src/components/accessories/opds/table/OpdTable.tsx   |  6 +-----
 .../patientSummary/useSummaryMetaData.tsx            |  8 ++++----
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/components/accessories/currentAdmission/CurrentAdmission.tsx b/src/components/accessories/currentAdmission/CurrentAdmission.tsx
index e165ca913..9c41e7be9 100644
--- a/src/components/accessories/currentAdmission/CurrentAdmission.tsx
+++ b/src/components/accessories/currentAdmission/CurrentAdmission.tsx
@@ -1,7 +1,6 @@
 import React, { FunctionComponent, useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
-import { AdmissionDTO, OpdDTO, PatientDTO } from "../../../generated";
+import { AdmissionDTO, OpdDTO } from "../../../generated";
 import { updateAdmission } from "../../../state/admissions/actions";
 import { IState } from "../../../types";
 import { useFields } from "../admission/useFields";
@@ -52,7 +51,7 @@ export const CurrentAdmission: FunctionComponent<IOwnProps> = ({
     if (onEditChange) {
       onEditChange(editionMode);
     }
-  }, [editionMode]);
+  }, [editionMode, onEditChange]);
 
   return (
     <div className="currentAdmission">
diff --git a/src/components/accessories/currentAdmission/currentAdmissionData/CurrentAdmissionData.tsx b/src/components/accessories/currentAdmission/currentAdmissionData/CurrentAdmissionData.tsx
index d23b83818..efacb5e1d 100644
--- a/src/components/accessories/currentAdmission/currentAdmissionData/CurrentAdmissionData.tsx
+++ b/src/components/accessories/currentAdmission/currentAdmissionData/CurrentAdmissionData.tsx
@@ -28,6 +28,12 @@ export const CurrentAdmissionData: FunctionComponent<IOwnProps> = ({
         )}
       </div>
       <div className="currentAdmissionData__content">
+        {!isEmpty(admission?.admDate) && (
+          <div className="currentAdmissionData__item">
+            <span className="item_label">{t("admission.admDate")}</span>
+            <p className="item_content">{renderDate(admission?.admDate)}</p>
+          </div>
+        )}
         {!isEmpty(admission?.ward?.description) && (
           <div className="currentAdmissionData__item">
             <span className="item_label">{t("admission.ward")}</span>
@@ -40,12 +46,6 @@ export const CurrentAdmissionData: FunctionComponent<IOwnProps> = ({
             <p className="item_content">{admission?.fhu}</p>
           </div>
         )}
-        {!isEmpty(admission?.admDate) && (
-          <div className="currentAdmissionData__item">
-            <span className="item_label">{t("admission.admDate")}</span>
-            <p className="item_content">{renderDate(admission?.admDate)}</p>
-          </div>
-        )}
         {!isEmpty(admission?.admType?.description) && (
           <div className="currentAdmissionData__item">
             <span className="item_label">{t("admission.admType")}</span>
diff --git a/src/components/accessories/opds/table/OpdTable.tsx b/src/components/accessories/opds/table/OpdTable.tsx
index bbd25609e..550495357 100644
--- a/src/components/accessories/opds/table/OpdTable.tsx
+++ b/src/components/accessories/opds/table/OpdTable.tsx
@@ -25,6 +25,7 @@ export const OpdTable: FC<IOpdTableProps> = ({ data }) => {
   const label = {
     id: t("opd.code"),
     date: t("opd.date"),
+    nextVisitDate: t("opd.nextvisitdate"),
     patientCode: t("opd.patientcode"),
     patientName: t("opd.patient"),
     sex: t("opd.sex"),
@@ -36,7 +37,6 @@ export const OpdTable: FC<IOpdTableProps> = ({ data }) => {
     note: t("opd.note"),
     referralFrom: t("opd.referralfrom"),
     referralTo: t("opd.referralto"),
-    nextVisitDate: t("opd.nextvisitdate"),
     age: t("opd.age"),
     ward: t("opd.ward"),
   };
@@ -49,7 +49,6 @@ export const OpdTable: FC<IOpdTableProps> = ({ data }) => {
     "age",
     "disease",
   ];
-  const [opd, setOpd] = useState({} as OpdDTO);
 
   const formatDataToDisplay = (data: OpdDTO[]) => {
     let results: any = [];
@@ -82,9 +81,6 @@ export const OpdTable: FC<IOpdTableProps> = ({ data }) => {
   const formattedData: any[] = formatDataToDisplay(data);
 
   const [open, setOpen] = useState(false);
-  const handleOpen = () => {
-    setOpen(true);
-  };
 
   const handleClose = () => {
     setOpen(false);
diff --git a/src/components/accessories/patientSummary/useSummaryMetaData.tsx b/src/components/accessories/patientSummary/useSummaryMetaData.tsx
index 24f5902c3..c5fbe14a1 100644
--- a/src/components/accessories/patientSummary/useSummaryMetaData.tsx
+++ b/src/components/accessories/patientSummary/useSummaryMetaData.tsx
@@ -5,6 +5,10 @@ const useSummaryMetaData = () => {
   const labels = {
     date: t("common.date"),
     visitDate: t("opd.date"),
+    labDate: t("lab.date"),
+    opdDate: t("opd.date"),
+    startDate: t("therapy.startDate"),
+    endDate: t("therapy.endDate"),
     type: t("common.type"),
     opDate: t("operation.opDate"),
     ward: t("admission.ward"),
@@ -40,10 +44,6 @@ const useSummaryMetaData = () => {
     pex_note: t("examination.note"),
     exam: t("lab.exam"),
     //material: t("lab.material"),
-    labDate: t("lab.date"),
-    opdDate: t("opd.date"),
-    startDate: t("therapy.startDate"),
-    endDate: t("therapy.endDate"),
     qty: t("therapy.quantity"),
     freqInDay: t("therapy.frequencyInDay"),
     freqInPeriod: t("therapy.frequencyInPeriod"),