diff --git a/src/api/result.ts b/src/api/result.ts index a24c7f1a..77e61138 100644 --- a/src/api/result.ts +++ b/src/api/result.ts @@ -48,9 +48,9 @@ function getAnswerResultList(resultId: number) { }); } -function AnswerResultListEx(quizId: number, body:any) { +function AnswerResultListEx(quizId: number, body: any) { return makeRequest({ - responseType: 'blob', + responseType: "blob", url: process.env.REACT_APP_DOMAIN + `/squiz/results/${quizId}/export`, method: "POST", body: body, diff --git a/src/pages/Questions/OptionsAndPicture/SettingOptionsAndPict.tsx b/src/pages/Questions/OptionsAndPicture/SettingOptionsAndPict.tsx index 3c3c8269..2bb60ad7 100644 --- a/src/pages/Questions/OptionsAndPicture/SettingOptionsAndPict.tsx +++ b/src/pages/Questions/OptionsAndPicture/SettingOptionsAndPict.tsx @@ -98,6 +98,7 @@ export default function SettingOptionsAndPict({ width: "100%", mr: isMobile ? "0px" : "16px", }} + maxLength={60} placeholder={"Пример текста"} text={question.content.replText} onChange={({ target }) => setReplText(target.value)} @@ -182,6 +183,7 @@ export default function SettingOptionsAndPict({ sx={{ maxWidth: "360px", width: "100%" }} placeholder={"Пример текста"} text={question.content.replText} + maxLength={60} onChange={({ target }) => setReplText(target.value)} /> diff --git a/src/pages/Questions/Select.tsx b/src/pages/Questions/Select.tsx index aac337b0..fd8f7505 100644 --- a/src/pages/Questions/Select.tsx +++ b/src/pages/Questions/Select.tsx @@ -46,7 +46,7 @@ export const Select = ({ setActiveItem(activeItemIndex); }, [activeItemIndex]); useEffect(() => { - if (data) setActiveItem(items.indexOf(data)) + if (data) setActiveItem(items.indexOf(data)); }, [data]); const handleChange = (event: SelectChangeEvent) => { diff --git a/src/pages/QuizAnswersPage/CardAnswer.tsx b/src/pages/QuizAnswersPage/CardAnswer.tsx index f63e6d57..63085698 100644 --- a/src/pages/QuizAnswersPage/CardAnswer.tsx +++ b/src/pages/QuizAnswersPage/CardAnswer.tsx @@ -439,10 +439,16 @@ export const CardAnswer = ({ p: "20px", }} > - + {res.description || "нет заголовка"} - + {res.title || "нет текста"} { return Math.round(Number(moment().format("X")) / 86400 - 1) * 86400 - 0; @@ -57,16 +58,16 @@ export const QuizAnswersPage: FC = () => { const isMobile = useMediaQuery(theme.breakpoints.down(600)); const [filterModalOpen, setFilterModalOpen] = useState(false); - const [exportContactsModalOpen, setExportContactsModalOpen] = useState(false); + const [exportContactsModalOpen, setExportContactsModalOpen] = + useState(false); const [filterNew, setFilterNew] = useState("Все заявки"); const [filterDate, setFilterDate] = useState("За всё время"); const filterNewHC = (value: string) => { - setFilterNew(value) - - } + setFilterNew(value); + }; const filterDateHC = (value: string) => { - setFilterDate(value) - } + setFilterDate(value); + }; const quizList = useQuizStore(); const quiz = useCurrentQuiz(); @@ -75,7 +76,6 @@ export const QuizAnswersPage: FC = () => { const { total_count } = useResultStore(); // const {idResultArray, addIdResult, clearIdResultArray} = useObsolescenceIdResult() useEffect(() => { - getData(); }, [filterNew, filterDate]); @@ -101,31 +101,40 @@ export const QuizAnswersPage: FC = () => { return timeResult; }; const parseFilters = () => { - const filters: any = {} + const filters: any = {}; - if (filterNew === "Новые") filters.new = true + if (filterNew === "Новые") filters.new = true; if (filterDate.length !== 0 && filterDate !== "За всё время") { - console.log(filterDate) + console.log(filterDate); - filters.to = new Date + filters.to = new Date(); - let resetedCurrentTime = Number(resetTime()) - if (filterDate === "Сегодня") filters.from = moment.unix(resetedCurrentTime)._d - if (filterDate === "Вчера") filters.from = moment.unix(resetedCurrentTime - 86400)._d - if (filterDate === "Последние 7 дней") filters.from = moment.unix(resetedCurrentTime - 604800)._d - if (filterDate === "Последние 30 дней") filters.from = moment.unix(resetedCurrentTime - 2592000)._d + let resetedCurrentTime = Number(resetTime()); + if (filterDate === "Сегодня") + filters.from = moment.unix(resetedCurrentTime)._d; + if (filterDate === "Вчера") + filters.from = moment.unix(resetedCurrentTime - 86400)._d; + if (filterDate === "Последние 7 дней") + filters.from = moment.unix(resetedCurrentTime - 604800)._d; + if (filterDate === "Последние 30 дней") + filters.from = moment.unix(resetedCurrentTime - 2592000)._d; if (filterDate === "Этот месяц") { - let date = new Date(), y = date.getFullYear(), m = date.getMonth(); - filters.from = new Date(y, m, 1) + let date = new Date(), + y = date.getFullYear(), + m = date.getMonth(); + filters.from = new Date(y, m, 1); } } - return filters - } + return filters; + }; const getData = async () => { if (editQuizId !== null) { const quizes = await quizApi.getList(); setQuizes(quizes); + const questions = await questionApi.getList({ quiz_id: editQuizId }); + setQuestions(questions); + const result = await resultApi.getList(editQuizId, parseFilters()); setResults(result); } @@ -144,7 +153,13 @@ export const QuizAnswersPage: FC = () => { maxWidth="lg" > {quiz.name} @@ -180,15 +195,17 @@ export const QuizAnswersPage: FC = () => { { - const data = await resultApi.export(editQuizId, parseFilters()) - console.log(typeof data) + const data = await resultApi.export( + editQuizId, + parseFilters(), + ); + console.log(typeof data); -const blob = data; + const blob = data; const link = document.createElement("a"); link.href = window.URL.createObjectURL(blob); link.download = `report_${new Date().getTime()}.xlsx`; link.click(); - }} sx={{ width: "44px", @@ -207,7 +224,10 @@ const blob = data; border: "1px solid #7E2AEA", }} onClick={async () => { - const result = await resultApi.getList(editQuizId, parseFilters()); + const result = await resultApi.getList( + editQuizId, + parseFilters(), + ); console.log(result); setResults(result); }} diff --git a/src/pages/Tariffs/Tariffs.tsx b/src/pages/Tariffs/Tariffs.tsx index b5e8477c..9aab99d2 100644 --- a/src/pages/Tariffs/Tariffs.tsx +++ b/src/pages/Tariffs/Tariffs.tsx @@ -258,7 +258,7 @@ function TariffPage() { component="h2" mb="20px" > - Вы подтверждаете платёж в сумму {openModal.price} ₽ + Вы подтверждаете платёж в сумму {openModal.price}