From 56f1a2f7ab428dec4422a6f835dd9a3ff5089f20 Mon Sep 17 00:00:00 2001 From: Tamara Date: Tue, 30 Apr 2024 03:25:46 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=82=D0=B8=D1=81=D1=82?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=20=D0=BF=D1=80=D0=BE=D0=BC=D0=BE=D0=BA=D0=BE?= =?UTF-8?q?=D0=B4=D0=B0(=D0=B1=D0=B5=D0=B7=20=D0=BA=D0=BE=D0=B4=D0=B2?= =?UTF-8?q?=D0=BE=D1=80=D0=B4=D0=BE=D0=B2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QuizStatistic/StstisticPromocode.tsx | 44 ++++++++++++++++--- src/utils/hooks/usePromocodeStatistic.ts | 2 +- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/src/pages/dashboard/Content/QuizStatistic/StstisticPromocode.tsx b/src/pages/dashboard/Content/QuizStatistic/StstisticPromocode.tsx index 7ab1072..14d6dfc 100644 --- a/src/pages/dashboard/Content/QuizStatistic/StstisticPromocode.tsx +++ b/src/pages/dashboard/Content/QuizStatistic/StstisticPromocode.tsx @@ -1,21 +1,34 @@ -import {Table, TableBody, TableCell, TableHead, TableRow, Typography, useTheme} from "@mui/material"; +import {Button, Table, TableBody, TableCell, TableHead, TableRow, Typography, useTheme} from "@mui/material"; import {AdapterMoment} from "@mui/x-date-pickers/AdapterMoment"; import { DatePicker, LocalizationProvider } from '@mui/x-date-pickers'; import DateFilter from "@pages/dashboard/Content/QuizStatistic/dateFilter"; -import {useState} from "react"; +import {useEffect, useState} from "react"; import moment, {Moment} from "moment"; import {usePromocodeStatistic} from "@root/utils/hooks/usePromocodeStatistic"; +import {promocodeApi} from "@root/api/promocode/requests"; +import {useAllPromocodes} from "@root/api/promocode/swr"; export default function StstisticPromocode() { const theme = useTheme() const [from, setFrom] = useState(moment("01.01.2023")); const [to, setTo] = useState(moment(Date.now())); + const promocodes = useAllPromocodes(); const statisticPromo = usePromocodeStatistic({to, from}) + for (statisticPromo.key in statisticPromo) { + const codewordSearch = promocodes.find(obj => obj.id === statisticPromo.key) + let codeword = codewordSearch?.codeword + console.log( "xnj 'nj", codeword) + } + + return( Статистика промокодов + Внесено - - {/*{Registrations}*/} - {/*{Quizes}*/} - {/*{Results}*/} - + + {Object.values(statisticPromo).map((sPromo:any)=> { + let codeword + let listPromo = promocodes + let statisticP = statisticPromo + console.log("in map", sPromo.key) + + for (statisticP.key in statisticP) { + const codewordSearch = listPromo.find(obj => obj.id === statisticP.key) + codeword = codewordSearch?.codeword + console.log(codeword) + } + + return( + + {codeword} + {sPromo.Regs} + {sPromo.Money} + + ) + }) + }
) diff --git a/src/utils/hooks/usePromocodeStatistic.ts b/src/utils/hooks/usePromocodeStatistic.ts index b876579..b881980 100644 --- a/src/utils/hooks/usePromocodeStatistic.ts +++ b/src/utils/hooks/usePromocodeStatistic.ts @@ -18,7 +18,7 @@ export function usePromocodeStatistic({ to, from }: useStatisticProps) { const requestStatistics = async () => { - const gottenData = await getStatisticPromocode(Number(formatTo), Number(formatFrom)); + const gottenData = await getStatisticPromocode(Number(formatFrom), Number(formatTo)); setStatisticPromo(gottenData) }