From 5c492fc932c480ea7fbf352bb8f1dd13186a97f0 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Mon, 23 Jun 2025 17:40:30 +0530 Subject: [PATCH] changed modal , added global model --- src/components/Employee/ManageEmployee.jsx | 25 ++++++---------------- src/pages/employee/EmployeeList.jsx | 14 ++++++++++-- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/src/components/Employee/ManageEmployee.jsx b/src/components/Employee/ManageEmployee.jsx index 00357d16..7cb4b0f1 100644 --- a/src/components/Employee/ManageEmployee.jsx +++ b/src/components/Employee/ManageEmployee.jsx @@ -233,24 +233,14 @@ const ManageEmployee = ({ employeeId, onClosed }) => { return ( <> -
-
-
-
-
- {employee ? "Update Employee" : "Create Employee"} -
- - onClosed()}> - - -
-
+ + {/*
{!currentEmployee && empLoading && employeeId && (

Loading Employee Data...

- )} + )} */} -
+ +

{employee ? "Update Employee" : "Create Employee"}

{" "} @@ -646,10 +636,7 @@ const ManageEmployee = ({ employeeId, onClosed }) => {
-
-
-
-
+ ); }; diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx index 930f183d..253003ab 100644 --- a/src/pages/employee/EmployeeList.jsx +++ b/src/pages/employee/EmployeeList.jsx @@ -25,6 +25,7 @@ import ConfirmModal from "../../components/common/ConfirmModal"; import { useSelector } from "react-redux"; import eventBus from "../../services/eventBus"; import { newlineChars } from "pdf-lib"; +import GlobalModel from "../../components/common/GlobalModel"; const EmployeeList = () => { const selectedProjectId = useSelector((store) => store.localVariables.projectId); @@ -239,7 +240,7 @@ const EmployeeList = () => { {isCreateModalOpen && ( )} - {showModal && (
{ />
- )} + )} */} + + {showModal && ( + setShowModal(false)}> + setShowModal(false)} + /> + + )} {IsDeleteModalOpen && (