task files
This commit is contained in:
parent
524e773cc4
commit
d92578c517
@ -11,11 +11,11 @@ import { getProfileInfo } from "@redux/outstaffingSlice";
|
||||
import { setProjectBoardFetch } from "@redux/projectsTrackerSlice";
|
||||
|
||||
import {
|
||||
backendImg,
|
||||
caseOfNum,
|
||||
getCorrectRequestDate,
|
||||
getToken,
|
||||
urlForLocal,
|
||||
backendImg
|
||||
} from "@utils/helper";
|
||||
|
||||
import { apiRequest } from "@api/request";
|
||||
@ -78,7 +78,7 @@ export const ModalTiсket = ({
|
||||
seconds: 0,
|
||||
});
|
||||
const [timerId, setTimerId] = useState(null);
|
||||
const [taskFiles, setTaskFiles] = useState([])
|
||||
const [taskFiles, setTaskFiles] = useState([]);
|
||||
const [correctProjectUsers, setCorrectProjectUsers] = useState(projectUsers);
|
||||
const [executorId, setExecutorId] = useState(task.executor_id);
|
||||
const profileInfo = useSelector(getProfileInfo);
|
||||
@ -289,11 +289,13 @@ export const ModalTiсket = ({
|
||||
}
|
||||
);
|
||||
|
||||
apiRequest(`/file/get-by-entity?entity_type=2&entity_id=${task.id}`).then((res) => {
|
||||
apiRequest(`/file/get-by-entity?entity_type=2&entity_id=${task.id}`).then(
|
||||
(res) => {
|
||||
if (Array.isArray(res)) {
|
||||
setTaskFiles(res)
|
||||
setTaskFiles(res);
|
||||
}
|
||||
})
|
||||
}
|
||||
);
|
||||
|
||||
if (
|
||||
localStorage.getItem("role_status") !== "18" &&
|
||||
@ -331,7 +333,7 @@ export const ModalTiсket = ({
|
||||
}
|
||||
|
||||
function deleteLoadedFile() {
|
||||
setUploadedFile(null)
|
||||
setUploadedFile(null);
|
||||
}
|
||||
|
||||
function attachFile() {
|
||||
@ -341,12 +343,12 @@ export const ModalTiсket = ({
|
||||
file_id: uploadedFile[0].id,
|
||||
entity_type: 2,
|
||||
entity_id: task.id,
|
||||
status: 1
|
||||
}
|
||||
status: 1,
|
||||
},
|
||||
}).then((res) => {
|
||||
setTaskFiles(prevValue => [...prevValue, res])
|
||||
setUploadedFile(null)
|
||||
})
|
||||
setTaskFiles((prevValue) => [...prevValue, res]);
|
||||
setUploadedFile(null);
|
||||
});
|
||||
}
|
||||
|
||||
function deleteFile(file) {
|
||||
@ -356,11 +358,13 @@ export const ModalTiсket = ({
|
||||
file_id: file.id,
|
||||
entity_type: 2,
|
||||
entity_id: task.id,
|
||||
status: 0
|
||||
}
|
||||
status: 0,
|
||||
},
|
||||
}).then(() => {
|
||||
setTaskFiles(prevValue => prevValue.filter((item) => item.id !== file.id))
|
||||
})
|
||||
setTaskFiles((prevValue) =>
|
||||
prevValue.filter((item) => item.id !== file.id)
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
function startTimer() {
|
||||
@ -496,27 +500,38 @@ export const ModalTiсket = ({
|
||||
)}
|
||||
{/*<img src={taskImg} className="image-task"></img>*/}
|
||||
</div>
|
||||
{Boolean(taskFiles.length) &&
|
||||
<div className='task__files'>
|
||||
{Boolean(taskFiles.length) && (
|
||||
<div className="task__files">
|
||||
{taskFiles.map((file) => {
|
||||
return <div className='taskFile' key={file.id}>
|
||||
<img className='imgFile' src={backendImg(file.file?.url)} alt='img' />
|
||||
<div className='deleteFile' onClick={() => deleteFile(file)}>
|
||||
<img src={close} alt='delete' />
|
||||
return (
|
||||
<div className="taskFile" key={file.id}>
|
||||
<img
|
||||
className="imgFile"
|
||||
src={backendImg(file.file?.url)}
|
||||
alt="img"
|
||||
/>
|
||||
<div
|
||||
className="deleteFile"
|
||||
onClick={() => deleteFile(file)}
|
||||
>
|
||||
<img src={close} alt="delete" />
|
||||
</div>
|
||||
</div>
|
||||
})
|
||||
}
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
}
|
||||
)}
|
||||
{uploadedFile && (
|
||||
<div className="fileLoaded">
|
||||
{uploadedFile.map((file) => {
|
||||
return (
|
||||
<div className='loadedFile' key={file.id}>
|
||||
<div className="loadedFile" key={file.id}>
|
||||
<img src={backendImg(file.url)} alt="img" key={file.id} />
|
||||
<div className='deleteFile' onClick={() => deleteLoadedFile(file)}>
|
||||
<img src={close} alt='delete' />
|
||||
<div
|
||||
className="deleteFile"
|
||||
onClick={() => deleteLoadedFile(file)}
|
||||
>
|
||||
<img src={close} alt="delete" />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@ -13,7 +13,13 @@ import {
|
||||
setToggleTab,
|
||||
} from "@redux/projectsTrackerSlice";
|
||||
|
||||
import {backendImg, caseOfNum, getCorrectRequestDate, getToken, urlForLocal} from "@utils/helper";
|
||||
import {
|
||||
backendImg,
|
||||
caseOfNum,
|
||||
getCorrectRequestDate,
|
||||
getToken,
|
||||
urlForLocal,
|
||||
} from "@utils/helper";
|
||||
|
||||
import { apiRequest } from "@api/request";
|
||||
|
||||
@ -75,7 +81,7 @@ export const TicketFullScreen = () => {
|
||||
const [datePickerOpen, setDatePickerOpen] = useState(false);
|
||||
const [startDate, setStartDate] = useState(null);
|
||||
const [uploadedFile, setUploadedFile] = useState(null);
|
||||
const [taskFiles, setTaskFiles] = useState([])
|
||||
const [taskFiles, setTaskFiles] = useState([]);
|
||||
|
||||
useEffect(() => {
|
||||
apiRequest(`/task/get-task?task_id=${ticketId.id}`).then((taskInfo) => {
|
||||
@ -104,11 +110,13 @@ export const TicketFullScreen = () => {
|
||||
}, []);
|
||||
setComments(comments);
|
||||
});
|
||||
apiRequest(`/file/get-by-entity?entity_type=2&entity_id=${taskInfo.id}`).then((res) => {
|
||||
apiRequest(
|
||||
`/file/get-by-entity?entity_type=2&entity_id=${taskInfo.id}`
|
||||
).then((res) => {
|
||||
if (Array.isArray(res)) {
|
||||
setTaskFiles(res)
|
||||
setTaskFiles(res);
|
||||
}
|
||||
})
|
||||
});
|
||||
apiRequest(
|
||||
`/timer/get-by-entity?entity_type=2&entity_id=${taskInfo.id}`
|
||||
).then((res) => {
|
||||
@ -414,16 +422,16 @@ export const TicketFullScreen = () => {
|
||||
file_id: uploadedFile[0].id,
|
||||
entity_type: 2,
|
||||
entity_id: taskInfo.id,
|
||||
status: 1
|
||||
}
|
||||
status: 1,
|
||||
},
|
||||
}).then((res) => {
|
||||
setTaskFiles(prevValue => [...prevValue, res])
|
||||
setUploadedFile(null)
|
||||
})
|
||||
setTaskFiles((prevValue) => [...prevValue, res]);
|
||||
setUploadedFile(null);
|
||||
});
|
||||
}
|
||||
|
||||
function deleteLoadedFile() {
|
||||
setUploadedFile(null)
|
||||
setUploadedFile(null);
|
||||
}
|
||||
|
||||
function deleteFile(file) {
|
||||
@ -433,11 +441,13 @@ export const TicketFullScreen = () => {
|
||||
file_id: file.id,
|
||||
entity_type: 2,
|
||||
entity_id: taskInfo.id,
|
||||
status: 0
|
||||
}
|
||||
status: 0,
|
||||
},
|
||||
}).then(() => {
|
||||
setTaskFiles(prevValue => prevValue.filter((item) => item.id !== file.id))
|
||||
})
|
||||
setTaskFiles((prevValue) =>
|
||||
prevValue.filter((item) => item.id !== file.id)
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
return (
|
||||
@ -643,27 +653,42 @@ export const TicketFullScreen = () => {
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
{Boolean(taskFiles.length) &&
|
||||
<div className='task__files'>
|
||||
{Boolean(taskFiles.length) && (
|
||||
<div className="task__files">
|
||||
{taskFiles.map((file) => {
|
||||
return <div className='taskFile' key={file.id}>
|
||||
<img className='imgFile' src={backendImg(file.file?.url)} alt='img' />
|
||||
<div className='deleteFile' onClick={() => deleteFile(file)}>
|
||||
<img src={fileDelete} alt='delete' />
|
||||
return (
|
||||
<div className="taskFile" key={file.id}>
|
||||
<img
|
||||
className="imgFile"
|
||||
src={backendImg(file.file?.url)}
|
||||
alt="img"
|
||||
/>
|
||||
<div
|
||||
className="deleteFile"
|
||||
onClick={() => deleteFile(file)}
|
||||
>
|
||||
<img src={fileDelete} alt="delete" />
|
||||
</div>
|
||||
</div>
|
||||
})
|
||||
}
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
}
|
||||
)}
|
||||
{uploadedFile && (
|
||||
<div className="fileLoaded">
|
||||
{uploadedFile.map((file) => {
|
||||
return (
|
||||
<div className='loadedFile' key={file.id}>
|
||||
<img src={backendImg(file.url)} alt="img" key={file.id} />
|
||||
<div className='deleteFile' onClick={() => deleteLoadedFile(file)}>
|
||||
<img src={fileDelete} alt='delete' />
|
||||
<div className="loadedFile" key={file.id}>
|
||||
<img
|
||||
src={backendImg(file.url)}
|
||||
alt="img"
|
||||
key={file.id}
|
||||
/>
|
||||
<div
|
||||
className="deleteFile"
|
||||
onClick={() => deleteLoadedFile(file)}
|
||||
>
|
||||
<img src={fileDelete} alt="delete" />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@ -694,7 +719,10 @@ export const TicketFullScreen = () => {
|
||||
className="input__file"
|
||||
onChange={handleUpload}
|
||||
/>
|
||||
<label htmlFor="input__file" className="button-add-file">
|
||||
<label
|
||||
htmlFor="input__file"
|
||||
className="button-add-file"
|
||||
>
|
||||
<img src={file}></img>
|
||||
Загрузить файл
|
||||
</label>
|
||||
|
||||
@ -46,7 +46,9 @@ export const urlForLocal = (url) =>
|
||||
process.env.NODE_ENV === "development" ? `https://itguild.info${url}` : url;
|
||||
|
||||
export const backendImg = (url) =>
|
||||
process.env.NODE_ENV === "development" ? `https://back.itguild.info${url}` : url;
|
||||
process.env.NODE_ENV === "development"
|
||||
? `https://back.itguild.info${url}`
|
||||
: url;
|
||||
|
||||
export function scrollToForm() {
|
||||
window.scrollTo({
|
||||
|
||||
Loading…
Reference in New Issue
Block a user