apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/apuc/outstaffing-react into fix-tracker-and-statistics

Browse Source
This commit is contained in:
MaxOvs19 2023-10-13 17:49:45 +03:00
commit cc38b06bdf
2 changed files with 65 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
View File

@ -91,7 +91,8 @@ export const TicketFullScreen = () => {
const { showNotification } = useNotification(); const { showNotification } = useNotification();
useEffect(() => { useEffect(() => {
apiRequest(`/task/get-task?task_id=${ticketId.id}`).then((taskInfo) => { apiRequest(`/task/get-task?task_id=${ticketId.id}&expand=mark`).then(
(taskInfo) => {
setTaskInfo(taskInfo); setTaskInfo(taskInfo);
setDeadLine(taskInfo.dead_line); setDeadLine(taskInfo.dead_line);
setStartDate( setStartDate(
@ -153,7 +154,8 @@ export const TicketFullScreen = () => {
setCorrectProjectUsers(res.projectUsers); setCorrectProjectUsers(res.projectUsers);
}); });
setLoader(boardLoader); setLoader(boardLoader);
}); }
);
}, []); }, []);
function deleteTask() { function deleteTask() {

2
src/redux/projectsTrackerSlice.js
View File

@ -14,7 +14,7 @@ const initialState = {
}; };
export const setProjectBoardFetch = createAsyncThunk("userInfo", (id) => export const setProjectBoardFetch = createAsyncThunk("userInfo", (id) =>
apiRequest(`/project/get-project?project_id=${id}&expand=columns`) apiRequest(`/project/get-project?project_id=${id}&expand=columns,mark`)
); );
export const projectsTrackerSlice = createSlice({ export const projectsTrackerSlice = createSlice({