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

Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W

Browse Source
This commit is contained in:
Pramod Mahajan 2025-05-09 10:52:40 +05:30
commit 6e600e899c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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);
const { employees } = useEmployeesAllOrByProjectId(selectedProject,false);
const dispatch = useDispatch();
const { data, loading } = useMaster();

2
src/components/Project/MapUsers.jsx
View File

@ -14,7 +14,7 @@ const MapUsers = ({
assignedLoading,
setAssignedLoading,
}) => {
const { employeesList, loading: employeeLoading, error } = useAllEmployees();
const { employeesList, loading: employeeLoading, error } = useAllEmployees(false);
const [selectedEmployees, setSelectedEmployees] = useState([]);
const [ searchText, setSearchText ] = useState( "" );

4
src/hooks/useEmployees.js
View File

@ -4,7 +4,7 @@ import { RolesRepository } from "../repositories/MastersRepository";
import EmployeeRepository from "../repositories/EmployeeRepository";
import ProjectRepository from "../repositories/ProjectRepository";
export const useAllEmployees = () => {
export const useAllEmployees = (showInactive) => {
const [employeesList, setEmployeeList] = useState([]);
const [loading, setLoading] = useState(false);
const [error, setError] = useState();
@ -14,7 +14,7 @@ export const useAllEmployees = () => {
let EmployeeList_cached = getCachedData("AllEmployees");
if (!EmployeeList_cached) {
setLoading(true);
const response = await EmployeeRepository.getAllEmployeeList();
const response = await EmployeeRepository.getAllEmployeeList(showInactive);
cacheData("AllEmployees", response.data);
setEmployeeList(response.data);
setLoading(false);