Merge branch 'develop' into

OH2-255-revise-permissions-among-core-api-and-ui
informatici · Dec 21, 2023 · dd18332 · dd18332
2 parents ce824f3 + f3e61a1
commit dd18332
Show file tree

Hide file tree

Showing 8 changed files with 269 additions and 312 deletions.
diff --git a/src/components/accessories/laboratory/ChangeLabStatus.tsx b/src/components/accessories/laboratory/ChangeLabStatus.tsx
@@ -1,91 +1,91 @@
-import { useState } from "react";
-import { ChangeLabStatusProps } from "./types";
-import {
-  AppBar,
-  Button,
-  Dialog,
-  DialogActions,
-  DialogContent,
-  IconButton,
-  Toolbar,
-  Typography,
-} from "@material-ui/core";
-import React from "react";
-import { GridCloseIcon } from "@material-ui/data-grid";
-import { useTranslation } from "react-i18next";
-import { Check, Close } from "@material-ui/icons";
-
-export const ChangeLabStatus: React.FC<ChangeLabStatusProps> = ({
-  status,
-  labCode,
-  onClick,
-  onClose,
-  isOpen = false,
-}) => {
-  const [open, setOpen] = useState(isOpen);
-
-  const { t } = useTranslation();
-  const handleClose = () => {
-    if (onClose) {
-      onClose();
-    }
-    setOpen(false);
-  };
-
-  const handleClick = () => {
-    onClick();
-    handleClose();
-  };
-
-  return (
-    <Dialog
-      id="lab_change_status-dialog"
-      title="Lab Exam Status Chnage Dialog"
-      open={open}
-      onClose={handleClose}
-    >
-      <AppBar style={{ position: "relative" }}>
-        <Toolbar>
-          <Typography style={{ flex: 1 }} variant="h6" component="div">
-            {t("lab.changestatus")}
-          </Typography>
-          <IconButton
-            edge="end"
-            color="inherit"
-            onClick={(event: any) => {
-              handleClose();
-            }}
-            aria-label="close"
-          >
-            <GridCloseIcon />
-          </IconButton>
-        </Toolbar>
-      </AppBar>
-      <DialogContent>
-        <div>
-          <p>
-            {t("lab.changelabstatusto", {
-              code: labCode,
-              status: t("lab.statuses." + status),
-            })}
-            . {t("common.continue")}
-          </p>
-        </div>
-      </DialogContent>
-      <DialogActions>
-        <Button color="primary" onClick={handleClose}>
-          <Close /> {t("common.cancel")}
-        </Button>
-        <Button
-          color="primary"
-          variant="contained"
-          autoFocus
-          onClick={handleClick}
-          style={{ marginLeft: "15px" }}
-        >
-          <Check /> {t("common.ok")}
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
-};
+import { useState } from "react";
+import { ChangeLabStatusProps } from "./types";
+import {
+  AppBar,
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  IconButton,
+  Toolbar,
+  Typography,
+} from "@material-ui/core";
+import React from "react";
+import { GridCloseIcon } from "@material-ui/data-grid";
+import { useTranslation } from "react-i18next";
+import { Check, Close } from "@material-ui/icons";
+
+export const ChangeLabStatus: React.FC<ChangeLabStatusProps> = ({
+  status,
+  labCode,
+  onClick,
+  onClose,
+  isOpen = false,
+}) => {
+  const [open, setOpen] = useState(isOpen);
+
+  const { t } = useTranslation();
+  const handleClose = () => {
+    if (onClose) {
+      onClose();
+    }
+    setOpen(false);
+  };
+
+  const handleClick = () => {
+    onClick();
+    handleClose();
+  };
+
+  return (
+    <Dialog
+      id="lab_change_status-dialog"
+      title="Lab Exam Status Chnage Dialog"
+      open={open}
+      onClose={handleClose}
+    >
+      <AppBar style={{ position: "relative" }}>
+        <Toolbar>
+          <Typography style={{ flex: 1 }} variant="h6" component="div">
+            {t("lab.changestatus")}
+          </Typography>
+          <IconButton
+            edge="end"
+            color="inherit"
+            onClick={(event: any) => {
+              handleClose();
+            }}
+            aria-label="close"
+          >
+            <GridCloseIcon />
+          </IconButton>
+        </Toolbar>
+      </AppBar>
+      <DialogContent>
+        <div>
+          <p>
+            {t("lab.changelabstatusto", {
+              code: labCode,
+              status: t("lab.statuses." + status.toLowerCase()),
+            })}
+            . {t("common.continue")}
+          </p>
+        </div>
+      </DialogContent>
+      <DialogActions>
+        <Button color="primary" onClick={handleClose}>
+          <Close /> {t("common.cancel")}
+        </Button>
+        <Button
+          color="primary"
+          variant="contained"
+          autoFocus
+          onClick={handleClick}
+          style={{ marginLeft: "15px" }}
+        >
+          <Check /> {t("common.ok")}
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
diff --git a/src/components/accessories/laboratory/EditLaboratoryContent.tsx b/src/components/accessories/laboratory/EditLaboratoryContent.tsx
@@ -10,8 +10,10 @@ import "./styles.scss";
 import { useEffect } from "react";
 import { updateLabFields } from "../../../libraries/formDataHandling/functions";
 import {
+  createLabReset,
   getLabWithRowsByCode,
   getLabWithRowsByCodeReset,
+  updateLabReset,
 } from "../../../state/laboratories/actions";
 import { getExams } from "../../../state/exams/actions";
 import ExamForm from "./examForm/ExamForm";
@@ -36,18 +38,18 @@ export const EditLaboratoryContent: FC = () => {
     if (id) {
       dispatch(getLabWithRowsByCode(parseInt(id)));
     }
-  }, [id]);
+  }, [id, dispatch]);
 
   useEffect(() => {
     if (labToEdit?.patientCode) {
       dispatch(getPatientThunk(labToEdit.patientCode.toString()));
     }
-  }, [labWithRows]);
+  }, [labWithRows, dispatch, labToEdit?.patientCode]);
 
   const handleReset = useCallback(() => {
     dispatch(getLabWithRowsByCodeReset());
     navigate(0);
-  }, [dispatch]);
+  }, [dispatch, navigate]);
 
   const patient = useSelector(
     (state: IState) => state.patients.selectedPatient.data
@@ -68,17 +70,24 @@ export const EditLaboratoryContent: FC = () => {
 
   useEffect(() => {
     dispatch(getExams());
-  }, []);
+  }, [dispatch]);
+
+  const handleBack = useCallback(() => {
+    if (creationMode) {
+      dispatch(createLabReset());
+    } else {
+      dispatch(updateLabReset());
+    }
+    navigate(-1);
+  }, [navigate, dispatch, creationMode]);
 
   return (
     <>
       <div className="lab__header">
         <div className="lab__title">{t("nav.laboratory")}</div>
         <div className="lab__actions">
           <Button
-            onClick={() => {
-              navigate(-1);
-            }}
+            onClick={handleBack}
             type="button"
             variant="contained"
             color="primary"
@@ -100,4 +109,4 @@ export const EditLaboratoryContent: FC = () => {
       </Permission>
     </>
   );
-};
+};