admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Issues_Jun_3W #226

Merged
ashutosh.nehete merged 82 commits from Issues_Jun_3W into main 2025-07-01 10:24:38 +00:00
Conversation 0 Commits 82 Files Changed 38 +31 -15
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41af98e340 - Show all commits

42
src/pages/employee/EmployeeList.jsx
View File

@ -27,14 +27,24 @@ import eventBus from "../../services/eventBus";
import { newlineChars } from "pdf-lib"; import { newlineChars } from "pdf-lib";
const EmployeeList = () => { const EmployeeList = () => {
const selectedProjectId = useSelector((store) => store.localVariables.projectId); // const selectedProjectId = useSelector((store) => store.localVariables.projectId);
const [selectedProject, setSelectedProject] = useState(() => selectedProjectId || ""); // const [selectedProject, setSelectedProject] = useState(() => selectedProjectId || "");
const { projects, loading: projectLoading } = useProjects(); // const { projects, loading: projectLoading } = useProjects();
const selectedProjectId = useSelector(
(store) => store.localVariables.projectId
);
const [showInactive, setShowInactive] = useState(false); const [showInactive, setShowInactive] = useState(false);
const [showAllEmployees, setShowAllEmployees] = useState(false); const [showAllEmployees, setShowAllEmployees] = useState(false);
const Manage_Employee = useHasUserPermission(MANAGE_EMPLOYEES); const Manage_Employee = useHasUserPermission(MANAGE_EMPLOYEES);
const { employees, loading, setLoading, error, recallEmployeeData } = const { employees, loading, setLoading, error, recallEmployeeData } =
useEmployeesAllOrByProjectId(showAllEmployees ? null : selectedProject, showInactive); // useEmployeesAllOrByProjectId(showAllEmployees ? null : selectedProject, showInactive);
useEmployeesAllOrByProjectId(
showAllEmployees ? null : selectedProjectId,
showInactive
);
const [employeeList, setEmployeeList] = useState([]); const [employeeList, setEmployeeList] = useState([]);
const [modelConfig, setModelConfig] = useState(); const [modelConfig, setModelConfig] = useState();
@ -100,7 +110,8 @@ const EmployeeList = () => {
setEmployeeList([]); setEmployeeList([]);
setFilteredData([]); setFilteredData([]);
} }
}, [loading, employees, showAllEmployees, searchText, selectedProject]); }, [loading, employees, showAllEmployees, searchText, selectedProjectId]);
const displayData = filteredData; const displayData = filteredData;
const indexOfLastItem = currentPage * itemsPerPage; const indexOfLastItem = currentPage * itemsPerPage;
const indexOfFirstItem = indexOfLastItem - itemsPerPage; const indexOfFirstItem = indexOfLastItem - itemsPerPage;
@ -200,8 +211,13 @@ const EmployeeList = () => {
const isChecked = e.target.checked; const isChecked = e.target.checked;
setShowInactive(false); setShowInactive(false);
setShowAllEmployees(isChecked); setShowAllEmployees(isChecked);
if (isChecked) {
recallEmployeeData(false, null);
} else {
recallEmployeeData(false, selectedProjectId);
}
recallEmployeeData(false, isChecked ? null : selectedProject); // recallEmployeeData(false, isChecked ? null : selectedProject);
}; };
const handleEmployeeModel = (id) => { const handleEmployeeModel = (id) => {
@ -214,15 +230,15 @@ const EmployeeList = () => {
setIsDeleteModalOpen(true); setIsDeleteModalOpen(true);
}; };
const handleProjectSelection = (e) => { // useEffect(() => {
const newProjectId = e.target.value; // setSelectedProject(selectedProjectId || "");
setSelectedProject(newProjectId); // }, [selectedProjectId]);
setShowAllEmployees(false);
};
useEffect(() => { useEffect(() => {
setSelectedProject(selectedProjectId || ""); if (!showAllEmployees) {
}, [selectedProjectId]); recallEmployeeData(showInactive, selectedProjectId);
}
}, [selectedProjectId, showInactive, showAllEmployees, recallEmployeeData]);
const handler = useCallback( const handler = useCallback(
(msg) => { (msg) => {