active links in nav, delete report, loaders in report, changes routes
This commit is contained in:
@ -27,11 +27,11 @@ export const ViewReport = () => {
|
||||
const [taskText, setTaskText] = useState([]);
|
||||
const [difficulties, setDifficulties] = useState([]);
|
||||
const [tomorrowTask, setTomorrowTask] = useState([]);
|
||||
const [taskId, setTaskId] = useState('')
|
||||
const [taskId, setTaskId] = useState("");
|
||||
const [totalHours, setTotalHours] = useState(0);
|
||||
const [currentDay] = useState(new Date());
|
||||
const [loader, setLoader] = useState(false);
|
||||
const [deleteLoader, setDeleteLoader] = useState(false)
|
||||
const [deleteLoader, setDeleteLoader] = useState(false);
|
||||
|
||||
function getReportFromDate(day) {
|
||||
setLoader(true);
|
||||
@ -41,7 +41,7 @@ export const ViewReport = () => {
|
||||
apiRequest(`reports/find-by-date?user_id=${params.id}&date=${day}`).then(
|
||||
(res) => {
|
||||
let spendTime = 0;
|
||||
setTaskId(res[0]?.id)
|
||||
setTaskId(res[0]?.id);
|
||||
for (const item of res) {
|
||||
if (item.difficulties) {
|
||||
setDifficulties((prevArray) => [...prevArray, item.difficulties]);
|
||||
@ -69,13 +69,13 @@ export const ViewReport = () => {
|
||||
}
|
||||
|
||||
function deleteReport() {
|
||||
setDeleteLoader(true)
|
||||
setDeleteLoader(true);
|
||||
apiRequest(`reports/delete?id=${taskId}`, {
|
||||
method: "DELETE"
|
||||
}).then((res) => {
|
||||
setDeleteLoader(false)
|
||||
setDeleteLoader(false);
|
||||
if (res) {
|
||||
window.location.replace("/profile/calendar")
|
||||
window.location.replace("/profile/calendar");
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -125,23 +125,32 @@ export const ViewReport = () => {
|
||||
<img src={arrow} alt="#" />
|
||||
<p>Вернуться</p>
|
||||
</Link>
|
||||
{localStorage.getItem("role_status") !== "18" &&
|
||||
{localStorage.getItem("role_status") !== "18" && (
|
||||
<div className="viewReport__bar">
|
||||
<button className="viewReport__bar__edit">
|
||||
Редактировать
|
||||
</button>
|
||||
{deleteLoader ? <Loader style={'green'} /> :
|
||||
<button onClick={deleteReport} className={taskText.length ? "viewReport__bar__delete" : "viewReport__bar__delete disable"}>
|
||||
<button className="viewReport__bar__edit">Редактировать</button>
|
||||
{deleteLoader ? (
|
||||
<Loader style={"green"} />
|
||||
) : (
|
||||
<button
|
||||
onClick={deleteReport}
|
||||
className={
|
||||
taskText.length
|
||||
? "viewReport__bar__delete"
|
||||
: "viewReport__bar__delete disable"
|
||||
}
|
||||
>
|
||||
Удалить отчет
|
||||
</button>
|
||||
}
|
||||
)}
|
||||
</div>
|
||||
}
|
||||
)}
|
||||
</div>
|
||||
<div className="viewReport__switch-date">
|
||||
<div onClick={() => previousDay()}>
|
||||
<Link
|
||||
to={`/profile/calendar/view/${getCreatedDate(previousReportDay)}/${params.id}`}
|
||||
to={`/profile/calendar/view/${getCreatedDate(
|
||||
previousReportDay
|
||||
)}/${params.id}`}
|
||||
>
|
||||
<div className="viewReport__switch-date__prev switch-date">
|
||||
<img src={arrowSwitchDate} alt="arrow" />
|
||||
@ -157,7 +166,11 @@ export const ViewReport = () => {
|
||||
getCreatedDate(currentDay) === params.date ? "disable" : ""
|
||||
}`}
|
||||
>
|
||||
<Link to={`/profile/calendar/view/${getCreatedDate(nextReportDay)}/${params.id}`}>
|
||||
<Link
|
||||
to={`/profile/calendar/view/${getCreatedDate(nextReportDay)}/${
|
||||
params.id
|
||||
}`}
|
||||
>
|
||||
<div className={`viewReport__switch-date__next switch-date`}>
|
||||
<img src={arrowSwitchDate} alt="arrow" />
|
||||
</div>
|
||||
|
Reference in New Issue
Block a user