Fixed button in report

This commit is contained in:
MaxOvs19 2023-05-16 19:20:37 +03:00
parent 23ec3bbdad
commit 34be4eec32
4 changed files with 49 additions and 19 deletions

View File

@ -158,6 +158,10 @@
line-height: normal; line-height: normal;
text-align: center; text-align: center;
a {
color: black;
}
img { img {
width: 16px; width: 16px;
height: 16px; height: 16px;

View File

@ -65,6 +65,19 @@ export const ProfileCalendarComponent = React.memo(
return "pass"; return "pass";
} }
// function correctRoute(day) {
// for (const date of reports) {
// if (
// `${new Date(day).getFullYear()}-${correctDay(
// new Date(day).getMonth() + 1
// )}-${correctDay(new Date(day).getDate())}` === date.created_at
// ) {
// return `../view/${day}`;
// }
// }
// return "../../report";
// }
function correctRoute(day) { function correctRoute(day) {
for (const date of reports) { for (const date of reports) {
if ( if (
@ -72,7 +85,7 @@ export const ProfileCalendarComponent = React.memo(
new Date(day).getMonth() + 1 new Date(day).getMonth() + 1
)}-${correctDay(new Date(day).getDate())}` === date.created_at )}-${correctDay(new Date(day).getDate())}` === date.created_at
) { ) {
return `../view/${day}`; return;
} }
} }
return "../../report"; return "../../report";
@ -146,38 +159,33 @@ export const ProfileCalendarComponent = React.memo(
<button <button
onClick={() => { onClick={() => {
dispatch(setReportDate(day)); dispatch(setReportDate(day));
dispatch(setSendRequest(true));
setShortReport(true);
setDayReport(day);
}} }}
key={day} key={day}
className={dayStyles(day)} className={dayStyles(day)}
name={day.format("dddd")} name={day.format("dddd")}
id="btn" id="btn"
> >
{/* <Link to={correctRoute(day)}> <Link
to={correctRoute(day)}
onClick={() => {
setShortReport(true);
setDayReport(day);
dispatch(setSendRequest(true));
}}
>
<img <img
className={"calendar__icon"} className={"calendar__icon"}
src={calendarIcon} src={calendarIcon}
alt="" alt=""
/> />
{currentMonthAndDay(day)} {currentMonthAndDay(day)}
</Link> */} </Link>
<img className={"calendar__icon"} src={calendarIcon} alt="" />
{currentMonthAndDay(day)}
</button> </button>
)) ))
)} )}
</div> </div>
</div> </div>
{shortReport && (
<Link to={correctRoute(dayReport)}>
<button className="calendar__btn">Посмотреть подробнее</button>
</Link>
)}
{shortReport && <ShortReport />} {shortReport && <ShortReport />}
</div> </div>
); );

View File

@ -12,6 +12,7 @@ import {
setSendRequest, setSendRequest,
} from "../../redux/reportSlice"; } from "../../redux/reportSlice";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { Link } from "react-router-dom";
import "./shortReport.scss"; import "./shortReport.scss";
@ -32,7 +33,6 @@ export const ShortReport = ({}) => {
setTaskText([]); setTaskText([]);
setDifficulties([]); setDifficulties([]);
setTomorrowTask([]); setTomorrowTask([]);
apiRequest( apiRequest(
`reports/find-by-date?user_card_id=${localStorage.getItem( `reports/find-by-date?user_card_id=${localStorage.getItem(
"cardId" "cardId"
@ -72,9 +72,15 @@ export const ShortReport = ({}) => {
return ( return (
<div> <div>
<div className="viewReport__info short-report"> <div className="viewReport__info short-report">
<div className="viewReport__title-box">
<h2 className="viewReport__title"> <h2 className="viewReport__title">
Ваши отчеты - <span>просмотр отчета за день</span> Ваши отчеты - <span>просмотр отчета за день</span>
</h2> </h2>
<Link to={`profile/view/${reportDate}`}>
Посмотреть подробнее об отчете
</Link>
</div>
<div className="viewReport__bar"> <div className="viewReport__bar">
<h3 className="viewReport__bar__date"> <h3 className="viewReport__bar__date">
{getCorrectDate(reportDate)} {getCorrectDate(reportDate)}

View File

@ -1,3 +1,15 @@
.short-report { .short-report {
margin-bottom: 30px; margin-bottom: 30px;
} }
.viewReport {
&__title-box {
display: flex;
align-items: center;
justify-content: space-between;
a {
font-size: 16px;
}
}
}