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

pramod_Bug-#203 -preserve selected employees when filtering by role in Daily Task Planning #91

Merged
vikas.nale merged 2 commits from pramod_Bug-#203 into Issue_May_2W 2025-05-10 10:41:25 +00:00
Conversation 0 Commits 2 Files Changed 1 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/Project/AssignRole.jsx
View File

@ -40,7 +40,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
const selectedProject = useSelector(
(store) => store.localVariables.projectId
);
const { employees } = useEmployeesAllOrByProjectId(selectedProject,false);
const { employees,loading:employeeLoading } = useEmployeesAllOrByProjectId(selectedProject,false);
const dispatch = useDispatch();
const { data, loading } = useMaster();
@ -67,7 +67,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
const handleRoleChange = (event) => {
reset();
setSelectedEmployees([]);
// setSelectedEmployees([]);
setSelectedRole(event.target.value);
};
@ -188,7 +188,8 @@ const AssignRoleModel = ({ assignData, onClose }) => {
<div className="divider text-start">
<div className="divider-text">Employee</div>
</div>
{filteredEmployees?.length === 0 && employees && (
{employeeLoading && <div>Loading...</div>}
{!employeeLoading && filteredEmployees?.length === 0 && employees && (
<div>No employees found</div>
)}