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

Fixed button in report

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

38
src/components/ProfileCalendar/ProfileCalendarComponent.js
View File

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