Provided proper parameter to employee list api for ont to include inactive employees
This commit is contained in:
parent
0fc43bb55b
commit
a90aa77cf6
@ -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);
|
const { employees } = useEmployeesAllOrByProjectId(selectedProject,false);
|
||||||
|
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
const { data, loading } = useMaster();
|
const { data, loading } = useMaster();
|
||||||
|
@ -14,7 +14,7 @@ const MapUsers = ({
|
|||||||
assignedLoading,
|
assignedLoading,
|
||||||
setAssignedLoading,
|
setAssignedLoading,
|
||||||
}) => {
|
}) => {
|
||||||
const { employeesList, loading: employeeLoading, error } = useAllEmployees();
|
const { employeesList, loading: employeeLoading, error } = useAllEmployees(false);
|
||||||
const [selectedEmployees, setSelectedEmployees] = useState([]);
|
const [selectedEmployees, setSelectedEmployees] = useState([]);
|
||||||
const [ searchText, setSearchText ] = useState( "" );
|
const [ searchText, setSearchText ] = useState( "" );
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import { RolesRepository } from "../repositories/MastersRepository";
|
|||||||
import EmployeeRepository from "../repositories/EmployeeRepository";
|
import EmployeeRepository from "../repositories/EmployeeRepository";
|
||||||
import ProjectRepository from "../repositories/ProjectRepository";
|
import ProjectRepository from "../repositories/ProjectRepository";
|
||||||
|
|
||||||
export const useAllEmployees = () => {
|
export const useAllEmployees = (showInactive) => {
|
||||||
const [employeesList, setEmployeeList] = useState([]);
|
const [employeesList, setEmployeeList] = useState([]);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const [error, setError] = useState();
|
const [error, setError] = useState();
|
||||||
@ -14,7 +14,7 @@ export const useAllEmployees = () => {
|
|||||||
let EmployeeList_cached = getCachedData("AllEmployees");
|
let EmployeeList_cached = getCachedData("AllEmployees");
|
||||||
if (!EmployeeList_cached) {
|
if (!EmployeeList_cached) {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
const response = await EmployeeRepository.getAllEmployeeList();
|
const response = await EmployeeRepository.getAllEmployeeList(showInactive);
|
||||||
cacheData("AllEmployees", response.data);
|
cacheData("AllEmployees", response.data);
|
||||||
setEmployeeList(response.data);
|
setEmployeeList(response.data);
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user