diff --git a/src/pages/Analytics/General.tsx b/src/pages/Analytics/General.tsx index 1ba30350..9389760c 100644 --- a/src/pages/Analytics/General.tsx +++ b/src/pages/Analytics/General.tsx @@ -116,33 +116,32 @@ const GeneralItemTimeConv = ({ const theme = useTheme(); const isMobile = useMediaQuery(theme.breakpoints.down(700)); - const data = Object.entries(general) - .sort((a, b) => a[0] - b[0]); + const data = Object.entries(general).sort((a, b) => a[0] - b[0]); - const days = [...data].map(e => e[0]) + const days = [...data].map((e) => e[0]); - let buffer = 0 + let buffer = 0; - const time = [...data].map(e => { + const time = [...data].map((e) => { if (e[1] > 0) { - buffer = e[1] + buffer = e[1]; } - return buffer - }) - + return buffer; + }); - console.log("data", data) - console.log("time", time.reduce((a, b) => (Number(a) + Number(b)), 0)) - console.log("time", getCalculatedTime(time.reduce((a, b) => (Number(a) + Number(b)), 0))) - console.log("days", days.length) - const numberValue = calculateTime ? - ( - (time.reduce((a, b) => (Number(a) + Number(b)), 0)) - / - (days.length) - ) || 0 - : - conversionValue + console.log("data", data); + console.log( + "time", + time.reduce((a, b) => Number(a) + Number(b), 0), + ); + console.log( + "time", + getCalculatedTime(time.reduce((a, b) => Number(a) + Number(b), 0)), + ); + console.log("days", days.length); + const numberValue = calculateTime + ? time.reduce((a, b) => Number(a) + Number(b), 0) / days.length || 0 + : conversionValue; if ( Object.keys(general).length === 0 || @@ -153,7 +152,6 @@ const GeneralItemTimeConv = ({ ); } - return ( {title} - {calculateTime ? `${getCalculatedTime(numberValue)} с` : `${numberValue.toFixed(2)}%`} + {calculateTime + ? `${getCalculatedTime(numberValue)} с` + : `${numberValue.toFixed(2)}%`} { - console.log("log", value) - return calculateTime ? getCalculatedTime(value) : String((value*100).toFixed(2)) + "%" - } - , + console.log("log", value); + return calculateTime + ? getCalculatedTime(value) + : String((value * 100).toFixed(2)) + "%"; + }, }, ]} // dataset={Object.entries(general).map(([, v]) => moment.unix(v).format("ss:mm:HH")).reduce((acc, [k, v]) => ({ ...acc, [k]: v }), {})} @@ -196,7 +197,6 @@ const GeneralItemTimeConv = ({ ); }; - export const General: FC = ({ data, day }) => { const theme = useTheme(); const isTablet = useMediaQuery(theme.breakpoints.down(1000)); diff --git a/src/pages/IntegrationsPage/IntegrationYandex/YandexModal.tsx b/src/pages/IntegrationsPage/IntegrationYandex/YandexModal.tsx index 5bf66888..02070e6a 100644 --- a/src/pages/IntegrationsPage/IntegrationYandex/YandexModal.tsx +++ b/src/pages/IntegrationsPage/IntegrationYandex/YandexModal.tsx @@ -34,6 +34,7 @@ export default function YandexModal({ isModalOpen, handleCloseModal }: Props) { handleCloseModal(); if (!yandexNumber) { setIsSave(false); + setCurrentValue(""); return; } setIsSave(true);