diff --git a/src/pages/Analytics/Analytics.tsx b/src/pages/Analytics/Analytics.tsx index 6f6096ec..74c92a1c 100644 --- a/src/pages/Analytics/Analytics.tsx +++ b/src/pages/Analytics/Analytics.tsx @@ -113,6 +113,7 @@ export default function Analytics() { } }; + console.log(general); const now = moment(); return ( diff --git a/src/pages/Analytics/Answers/Answers.tsx b/src/pages/Analytics/Answers/Answers.tsx index 4e3cc199..ad03fab9 100644 --- a/src/pages/Analytics/Answers/Answers.tsx +++ b/src/pages/Analytics/Answers/Answers.tsx @@ -270,7 +270,8 @@ export const Answers: FC = ({ data }) => { color: theme.palette.brightPurple.main, }, }} - >Заголовок вопроса. + > + Заголовок вопроса. {currentAnswer?.[0].split("(")[0].trim() ? ` ${currentAnswer?.[0]}` : "Без заголовка"} diff --git a/src/pages/Analytics/General.tsx b/src/pages/Analytics/General.tsx index 616230fd..24fa18df 100644 --- a/src/pages/Analytics/General.tsx +++ b/src/pages/Analytics/General.tsx @@ -11,6 +11,7 @@ type GeneralItemsProps = { color: string; numberType: "sum" | "percent" | "time"; calculateTime?: boolean; + conversionValue?: number; }; type GeneralProps = { @@ -39,6 +40,7 @@ const GeneralItem = ({ color, numberType, calculateTime = false, + conversionValue, }: GeneralItemsProps) => { const theme = useTheme(); const isMobile = useMediaQuery(theme.breakpoints.down(700)); @@ -46,13 +48,14 @@ const GeneralItem = ({ const numberValue = numberType === "sum" ? Object.values(general).reduce((total, item) => total + item, 0) - : 0; - Object.entries(general).reduce( - (total, [key, value]) => total + (value / Number(key)) * 100, - 0, - ) / Object.keys(general).length || Number(0); + : title === "Конверсия" + ? conversionValue + : 0; - if (Object.keys(general).length === 0) { + if ( + Object.keys(general).length === 0 || + Object.values(general).every((x) => x === 0) + ) { return ( {`${title} - нет данных`} ); @@ -76,7 +79,7 @@ const GeneralItem = ({ > {title} - {numberType === "percent" ? `${numberValue.toFixed()}%` : numberValue} + {numberType === "percent" ? `${numberValue.toFixed(2)}%` : numberValue} = ({ data }) => { ); } + const conversionValue = + (Object.values(data.Result).reduce((total, item) => total + item, 0) / + Object.values(data.Open).reduce((total, item) => total + item, 0)) * + 100; + console.log(conversionValue); + // console.log(data.Result) return ( = ({ data }) => { v > 0) - .reduce((acc, [k, v]) => ({ ...acc, [k]: v }), {}) || { 0: 0 } - } + general={data.Open} color={COLORS[0]} /> v > 0) - .reduce((acc, [k, v]) => ({ ...acc, [k]: v }), {}) || { 0: 0 } - } + general={data.Result} color={COLORS[1]} /> v > 0) diff --git a/src/pages/Questions/PageOptions/PageOptions.tsx b/src/pages/Questions/PageOptions/PageOptions.tsx index f591f745..39645770 100644 --- a/src/pages/Questions/PageOptions/PageOptions.tsx +++ b/src/pages/Questions/PageOptions/PageOptions.tsx @@ -66,7 +66,7 @@ export default function PageOptions({ disableInput, question }: Props) { placeholder={"Можно добавить текст"} value={question.content.text} onChange={({ target }) => setText(target.value)} - maxLength={50} + maxLength={700} /> diff --git a/src/pages/createQuize/MyQuizzesFull.tsx b/src/pages/createQuize/MyQuizzesFull.tsx index 212a5c58..a41366bf 100644 --- a/src/pages/createQuize/MyQuizzesFull.tsx +++ b/src/pages/createQuize/MyQuizzesFull.tsx @@ -108,7 +108,7 @@ export default function MyQuizzesFull({ ( (quiz.passed_count / quiz.session_count) * 100 - ).toFixed(1), + ).toFixed(2), ) : 0 }