active links in nav, delete report, loaders in report, changes routes
This commit is contained in:
@ -98,7 +98,9 @@ export const ProfileCalendarComponent = React.memo(
|
||||
if (userId) {
|
||||
return `/profile/calendar/view/${date.created_at}/${userId}`;
|
||||
}
|
||||
return `/profile/calendar/view/${date.created_at}/${localStorage.getItem("id")}`;
|
||||
return `/profile/calendar/view/${
|
||||
date.created_at
|
||||
}/${localStorage.getItem("id")}`;
|
||||
}
|
||||
}
|
||||
|
||||
@ -282,15 +284,15 @@ export const ProfileCalendarComponent = React.memo(
|
||||
? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
|
||||
: `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
|
||||
: activePeriod
|
||||
? "Выберите диапазон на календаре"
|
||||
: "Выбрать диапазон"}
|
||||
? "Выберите диапазон на календаре"
|
||||
: "Выбрать диапазон"}
|
||||
</span>
|
||||
<span>
|
||||
{totalRangeHours
|
||||
? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
|
||||
: endDate
|
||||
? "0 часов"
|
||||
: ""}
|
||||
? "0 часов"
|
||||
: ""}
|
||||
</span>
|
||||
{endDate && (
|
||||
<BaseButton
|
||||
|
Reference in New Issue
Block a user