adaptive-candidate #6

Merged
nikita.gubar merged 2 commits from adaptive-candidate into main 2023-12-21 18:08:02 +03:00
Showing only changes of commit 2996b78e6e - Show all commits

View File

@ -17,11 +17,11 @@ import { apiRequest } from "@api/request";
import "@components/Calendar/calendarComponent.scss";
import {
calendarHelper,
correctDay,
currentMonthAndDay,
getCorrectDate,
getReports,
hourOfNum,
correctDay
hourOfNum
} from "@components/Calendar/calendarHelper";
import BaseButton from "@components/Common/BaseButton/BaseButton";
import ShortReport from "@components/ShortReport/ShortReport";
@ -295,15 +295,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