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

Merge pull request 'pramod_Bug-#203 -preserve selected employees when filtering by role in Daily Task Planning' (#91) from pramod_Bug-#203 into Issue_May_2W

Browse Source 
Reviewed-on: #91
This commit is contained in:
Vikas Nale 2025-05-10 10:41:25 +00:00
commit 68475f4742
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( const selectedProject = useSelector(
(store) => store.localVariables.projectId (store) => store.localVariables.projectId
); );
const { employees } = useEmployeesAllOrByProjectId(selectedProject,false); const { employees,loading:employeeLoading } = useEmployeesAllOrByProjectId(selectedProject,false);
const dispatch = useDispatch(); const dispatch = useDispatch();
const { data, loading } = useMaster(); const { data, loading } = useMaster();
@ -67,7 +67,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
const handleRoleChange = (event) => { const handleRoleChange = (event) => {
reset(); reset();
setSelectedEmployees([]); // setSelectedEmployees([]);
setSelectedRole(event.target.value); setSelectedRole(event.target.value);
}; };
@ -188,7 +188,8 @@ const AssignRoleModel = ({ assignData, onClose }) => {
<div className="divider text-start"> <div className="divider text-start">
<div className="divider-text">Employee</div> <div className="divider-text">Employee</div>
</div> </div>
{filteredEmployees?.length === 0 && employees && ( {employeeLoading && <div>Loading...</div>}
{!employeeLoading && filteredEmployees?.length === 0 && employees && (
<div>No employees found</div> <div>No employees found</div>
)} )}