Advance the functionality of multiple modular policies in the legal m…

…odule Custom services menu to Mario and Julian for the risk events module Fix the issue with the payslips of everyone in the MyPayslips module with the users with Payslips permissions
CodeHive-Solutions · Apr 18, 2024 · a3e2b06 · a3e2b06
1 parent a4ec8e9
commit a3e2b06
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 37 deletions.
diff --git a/src/components/common/NavBar.jsx b/src/components/common/NavBar.jsx
@@ -386,7 +386,9 @@ const Navbar = () => {
                     <CustomNavLink to="/logged/blog">Blog</CustomNavLink>
                     <CustomNavLink to="/logged/sgc">Gestión Documental</CustomNavLink>
                     <CustomNavLink to="/logged/vacancies">Vacantes</CustomNavLink>
-                    {servicesPermission ? (
+                    {cedula === "19438555" || cedula === "1032495391" ? (
+                        <CustomNavLink to="/logged/risk-events">Eventos de Riesgo</CustomNavLink>
+                    ) : servicesPermission ? (
                         <Button
                             id="button-utils"
                             endIcon={anchorElUtils ? <KeyboardArrowUpIcon /> : <KeyboardArrowDownIcon />}
@@ -466,13 +468,13 @@ const Navbar = () => {
                 transformOrigin={{ horizontal: "right", vertical: "top" }}
                 anchorOrigin={{ horizontal: "right", vertical: "bottom" }}
             >
-                <MenuItem onClick={handleOpenAccountDialog}>
+                {/* <MenuItem onClick={handleOpenAccountDialog}>
                     <ListItemIcon>
                         <Avatar />
                     </ListItemIcon>
                     <ListItemText primary="Mi Cuenta" />
                 </MenuItem>
-                <Divider />
+                <Divider /> */}
                 {isAdvisor ? (
                     <MenuItem onClick={handleOpenDialog}>
                         <ListItemIcon>

diff --git a/src/components/pages/Home.jsx b/src/components/pages/Home.jsx
@@ -12,7 +12,6 @@ import SnackbarAlert from "../common/SnackBarAlert";
 import { Typography, Box, Container, useMediaQuery, Card } from "@mui/material";
 
 // Media
-import vacanciesCarousel from "../../images/home-carousel/vacancies-1280-720.png";
 import realBenefit2 from "../../images/benefits/benefit-1.png";
 import video from "../../videos/futbol.mp4";
 import cake from "../../images/birthdays/cake.png";
@@ -24,7 +23,7 @@ import water2 from "../../images/home-carousel/water-2.png";
 
 const benefits = [{ image: realBenefit2, title: "Beneficio 2" }];
 
-const homeImages = [{ image: water2 }, { image: water }, { image: prosecutor }, { image: ceroDiscrimination }, { image: vacanciesCarousel }];
+const homeImages = [{ image: water2 }, { image: water }, { image: prosecutor }, { image: ceroDiscrimination }];
 
 const Home = () => {
     const [openSnack, setOpenSnack] = useState(false);

diff --git a/src/components/pages/Legal.jsx b/src/components/pages/Legal.jsx
@@ -29,6 +29,7 @@ import ModeEditIcon from "@mui/icons-material/ModeEdit";
 import DeleteIcon from "@mui/icons-material/Delete";
 import SaveIcon from "@mui/icons-material/Save";
 import AddIcon from "@mui/icons-material/Add";
+import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 
 const validationSchema = Yup.object().shape({
     name: Yup.string().required("Campo requerido"),
@@ -337,7 +338,7 @@ export const Legal = () => {
             if (!response.ok) {
                 throw new Error(data.detail);
             } else if (response.status === 200) {
-                handleCloseDialogEdit();    
+                handleCloseDialogEdit();
                 getPolicies();
                 showSnack("success", "Se ha actualizado el registro correctamente.");
             }
@@ -347,7 +348,7 @@ export const Legal = () => {
         }
     };
 
-    const handleAddPolicies = (inputName, i, policyType, inputLabel) => {
+    const handleAddPolicies = (inputName, i, policyType, inputLabel, updateValidationSchema) => {
         inputName = inputName.split("end")[0]; // Remove the index from the input name
         inputLabel = inputLabel.split("Fin ")[1]; // Remove the index from the input label
 
@@ -379,35 +380,25 @@ export const Legal = () => {
         ];
 
         // Add the new inputs to the state inputs object in the correct position
-        if (policyType === "civilResponsibilityPolicy") {
-            setInputs({ ...inputs, civilResponsibilityPolicy: [...inputs.civilResponsibilityPolicy, ...newInputs] });
-        } else if (policyType === "compliancePolicy") {
-            setInputs({ ...inputs, compliancePolicy: [...inputs.compliancePolicy, ...newInputs] });
-        } else {
-            setInputs({ ...inputs, insurancePolicy: [...inputs.insurancePolicy, ...newInputs] });
-        }
+        setInputs({ ...inputs, [policyType]: [...inputs[policyType], ...newInputs] });
 
-        const updatedInitialValues = {
-            ...newInitialValues,
+        setNewInitialValues((currentValues) => ({
+            ...currentValues,
             [`${inputName}_${i}`]: "",
             [`${inputName}number_${i}`]: "",
             [`${inputName}start_date_${i}`]: "",
             [`${inputName}end_date_${i}`]: "",
-        };
-
-        console.log(updatedInitialValues);
-        setNewInitialValues(updatedInitialValues);
-        // Add the new inputs to the newInitialValues object
-
-        // Add the new inputs to the newValidationSchema object
-        const updatedValidationSchema = newValidationSchema.shape({
-            ...newValidationSchema.fields,
-            [`${inputName}_${i}`]: Yup.string().required("Campo requerido"),
-            [`${inputName}number_${i}`]: Yup.string().required("Campo requerido"),
-            [`${inputName}start_date_${i}`]: Yup.string().required("Campo requerido"),
-            [`${inputName}end_date_${i}`]: Yup.string().required("Campo requerido"),
-        });
-        setNewValidationSchema(updatedValidationSchema);
+        }));
+
+        updateValidationSchema((currentSchema) =>
+            currentSchema.shape({
+                ...currentSchema.fields,
+                [`${inputName}_${i}`]: Yup.string().required("Campo requerido"),
+                [`${inputName}number_${i}`]: Yup.string().required("Campo requerido"),
+                [`${inputName}start_date_${i}`]: Yup.string().required("Campo requerido"),
+                [`${inputName}end_date_${i}`]: Yup.string().required("Campo requerido"),
+            })
+        );
     };
 
     const FormikTextField = ({ label, type, options, multiline, rows, ...props }) => {
@@ -558,14 +549,35 @@ export const Legal = () => {
                                                     <FormikTextField type={input.type} name={input.name} label={input.label} autoComplete="off" spellCheck={false} />
 
                                                     <Button
-                                                        onClick={() => handleAddPolicies(input.name, (index + 5) / 4, "civilResponsibilityPolicy", input.label)}
+                                                        sx={{ width: "100%" }}
+                                                        onClick={() =>
+                                                            handleAddPolicies(input.name, (index + 5) / 4, "civilResponsibilityPolicy", input.label, (schema) =>
+                                                                setNewValidationSchema(schema)
+                                                            )
+                                                        }
                                                         startIcon={<AddIcon />}
                                                         variant="outlined"
                                                     >
                                                         Añadir
                                                     </Button>
                                                 </React.Fragment>
                                             );
+                                        } else if (input.name.includes("end")) {
+                                            return (
+                                                <>
+                                                    <FormikTextField
+                                                        key={index}
+                                                        type={input.type}
+                                                        name={input.name}
+                                                        label={input.label}
+                                                        autoComplete="off"
+                                                        spellCheck={false}
+                                                    />
+                                                    <Button startIcon={<KeyboardArrowDownIcon />} sx={{ width: "100%" }} variant="contained">
+                                                        Eliminar
+                                                    </Button>
+                                                </>
+                                            );
                                         }
                                         return (
                                             <FormikTextField key={index} type={input.type} name={input.name} label={input.label} autoComplete="off" spellCheck={false} />
@@ -641,7 +653,7 @@ export const Legal = () => {
                     </IconButton>
                 </DialogTitle>
                 <DialogContent>
-                    <Formik initialValues={details} onSubmit={handleSubmitEdit}>
+                    {/* <Formik initialValues={details} onSubmit={handleSubmitEdit}>
                         <Form>
                             <Box sx={{ display: "flex", gap: "1rem", pt: "0.5rem", flexWrap: "wrap" }}>
                                 <FormikTextField type="text" name="name" label="Clientes" autoComplete="off" spellCheck={false} />
@@ -689,7 +701,7 @@ export const Legal = () => {
                                 </Button>
                             </Box>
                         </Form>
-                    </Formik>
+                    </Formik> */}
                 </DialogContent>
             </Dialog>
         </>

diff --git a/src/components/pages/MyPayslips.jsx b/src/components/pages/MyPayslips.jsx
@@ -41,8 +41,11 @@ export const MyPayslips = () => {
             if (!response.ok) {
                 throw new Error(data.detail);
             } else if (response.status === 200) {
-                if (!permissions || !permissions.includes("payslip.add_payslip")) {
-                    setRows(filtered);
+                if (permissions && permissions.includes("payslip.view_payslip")) {
+                    const userPayslips = data.filter((payslip) => payslip.identification === cedula);
+                    setRows(userPayslips);
+                } else {
+                    setRows(data);
                 }
             }
         } catch (error) {

diff --git a/src/components/pages/Payslips.jsx b/src/components/pages/Payslips.jsx
@@ -49,7 +49,7 @@ export const Payslips = () => {
 
     useEffect(() => {
         window.scrollTo(0, 0);
-        if (!permissions || !permissions.includes("payslip.add_payslip")) {
+        if (!permissions || !permissions.includes("payslip.view_payslip")) {
             navigate("/logged/home");
         }
     }, []);