diff --git a/lib/api/quizRelase.ts b/lib/api/quizRelase.ts
index 5dbc126..e8ba0ca 100644
--- a/lib/api/quizRelase.ts
+++ b/lib/api/quizRelase.ts
@@ -252,3 +252,40 @@ export function sendFC({ questionId, body, qid, preview }: SendFCParams) {
method: "POST",
});
}
+
+//форма контактов
+export type SendResultParams = {
+ questionId: string;
+ pointsSum: number;
+ qid: string;
+ preview: boolean;
+};
+
+export function sendResult({ questionId, pointsSum, qid, preview }: SendResultParams) {
+ if (preview) return;
+ const formData = new FormData();
+
+ // const keysBody = Object.keys(body)
+ // const content:any = {}
+ // fields.forEach((key) => {
+ // if (keysBody.includes(key)) content[key] = body.key
+ // })
+
+ const answers = [
+ {
+ question_id: questionId,
+ content: pointsSum.toString(),
+ result: false,
+ qid,
+ },
+ ];
+
+ formData.append("answers", JSON.stringify(answers));
+ formData.append("qid", qid);
+
+ return publicationMakeRequest({
+ url: domain + `/answer/v1.0.0/answer`,
+ body: formData,
+ method: "POST",
+ });
+}
diff --git a/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx b/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx
index 6ce5068..c57d4c9 100644
--- a/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx
+++ b/lib/components/ViewPublicationPage/ContactForm/ContactForm.tsx
@@ -24,11 +24,14 @@ import { NameplateLogo } from "@icons/NameplateLogo";
import type { FormContactFieldData, FormContactFieldName } from "@model/settingsData";
import type { QuizQuestionResult } from "@model/questionTypes/result";
import type { AnyTypedQuizQuestion } from "@model/questionTypes/shared";
+import { isProduction } from "@/utils/defineDomain";
type Props = {
currentQuestion: AnyTypedQuizQuestion;
onShowResult: () => void;
};
+//Костыль для особого квиза. Для него не нужно показывать email адрес
+const isDisableEmail = window.location.pathname.includes("/377c7570-1bee-4320-ac1e-d731b6223ce8");
export const ContactForm = ({ currentQuestion, onShowResult }: Props) => {
const theme = useTheme();
@@ -114,7 +117,8 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => {
async function handleShowResultsClick() {
const FC = settings.cfg.formContact.fields;
- if (FC["email"].used !== EMAIL_REGEXP.test(email)) {
+
+ if (!isDisableEmail && FC["email"].used !== EMAIL_REGEXP.test(email)) {
return enqueueSnackbar("введена некорректная почта");
}
@@ -250,6 +254,9 @@ export const ContactForm = ({ currentQuestion, onShowResult }: Props) => {
setText={setText}
adress={adress}
setAdress={setAdress}
+ crutch={{
+ disableEmail: isDisableEmail,
+ }}
/>
{
>;
adress: string;
setAdress: Dispatch>;
+ crutch: {
+ disableEmail: boolean;
+ };
};
export const Inputs = ({
@@ -32,6 +35,7 @@ export const Inputs = ({
setText,
adress,
setAdress,
+ crutch,
}: InputsProps) => {
const { settings } = useQuizSettings();
const FC = settings.cfg.formContact.fields;
@@ -95,7 +99,7 @@ export const Inputs = ({
return (
<>
{FC["name"].used ? Name : <>}
- {FC["email"].used ? Email : <>}
+ {FC["email"].used && !crutch.disableEmail ? Email : <>}
{FC["phone"].used ? Phone : <>}
{FC["text"].used ? Text : <>}
{FC["address"].used ? Adress : <>}
diff --git a/lib/components/ViewPublicationPage/PointSystemResultList.tsx b/lib/components/ViewPublicationPage/PointSystemResultList.tsx
index d9b57b8..686c455 100644
--- a/lib/components/ViewPublicationPage/PointSystemResultList.tsx
+++ b/lib/components/ViewPublicationPage/PointSystemResultList.tsx
@@ -7,7 +7,6 @@ import { AnyTypedQuizQuestion, QuizQuestionVariant } from "@/index";
export const PointSystemResultList = () => {
const theme = useTheme();
-
const { questions } = useQuizSettings();
const answers = useQuizViewStore((state) => state.answers);
@@ -20,7 +19,6 @@ export const PointSystemResultList = () => {
let currentVariants = currentQuestion.content.variants;
const currentAnswer = answers.find((a) => a.questionId === currentQuestion.id);
-
const answeredVariant = currentVariants.find((v, i) => {
if (v.id === currentAnswer?.answer) {
answerIndex = i;
@@ -55,14 +53,20 @@ export const PointSystemResultList = () => {
>
{currentQuestion.page + 1}.
- {currentQuestion.title || "Вопрос без названия"}
+
+ {currentQuestion.title || "Вопрос без названия"}
+
- {answeredVariant?.points || "0"}/1
+ {answeredVariant?.points || "0"}
{questionSelect}
-
+
);
@@ -140,7 +145,12 @@ function QuestionByType({ question, stepNumber }: { question: RealTypedQuizQuest
case "emoji":
return ;
case "text":
- return ;
+ return (
+
+ );
case "select":
return ;
case "date":
diff --git a/lib/components/ViewPublicationPage/ResultForm.tsx b/lib/components/ViewPublicationPage/ResultForm.tsx
index b219d40..6d7da92 100644
--- a/lib/components/ViewPublicationPage/ResultForm.tsx
+++ b/lib/components/ViewPublicationPage/ResultForm.tsx
@@ -16,6 +16,9 @@ import type { QuizQuestionResult } from "@/model/questionTypes/result";
import QuizVideo from "@/ui_kit/VideoIframe/VideoIframe";
import { TextAccordion } from "./tools/TextAccordion";
import { PointSystemResultList } from "./PointSystemResultList";
+import { enqueueSnackbar } from "notistack";
+import { sendFC, sendResult } from "@/api/quizRelase";
+import { isProduction } from "@/utils/defineDomain";
type ResultFormProps = {
resultQuestion: QuizQuestionResult;
@@ -25,8 +28,10 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
const theme = useTheme();
const isMobile = useRootContainerSize() < 650;
const isTablet = useRootContainerSize() < 1000;
- const { settings, show_badge, quizId } = useQuizSettings();
+ const { settings, show_badge, quizId, questions, preview } = useQuizSettings();
const setCurrentQuizStep = useQuizViewStore((state) => state.setCurrentQuizStep);
+ //Список засчитанных баллов для балловых квизов
+ const pointsSum = useQuizViewStore((state) => state.pointsSum);
const spec = settings.cfg.spec;
const vkMetrics = useVkMetricsGoals(settings.cfg.vkMetricsNumber);
const yandexMetrics = useYandexMetricsGoals(settings.cfg.yandexMetricsNumber);
@@ -36,6 +41,41 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
yandexMetrics.resultIdShown(resultQuestion.id);
}, [resultQuestion.id, vkMetrics, yandexMetrics]);
+ useEffect(() => {
+ (async () => {
+ if (!settings.cfg.showfc) {
+ try {
+ await sendFC({
+ questionId: resultQuestion.id,
+ body: {},
+ qid: quizId,
+ preview,
+ });
+
+ const sessions = JSON.parse(localStorage.getItem("sessions") || "{}");
+ localStorage.setItem("sessions", JSON.stringify({ ...sessions, [quizId]: new Date().getTime() }));
+ } catch (e) {
+ enqueueSnackbar("Заявка не может быть отправлена");
+ }
+ }
+ if (Boolean(settings.cfg.score)) {
+ try {
+ await sendResult({
+ questionId: resultQuestion.id,
+ pointsSum,
+ qid: quizId,
+ preview,
+ });
+
+ const sessions = JSON.parse(localStorage.getItem("sessions") || "{}");
+ localStorage.setItem("sessions", JSON.stringify({ ...sessions, [quizId]: new Date().getTime() }));
+ } catch (e) {
+ enqueueSnackbar("Количество баллов не может быть отправлено");
+ }
+ }
+ })();
+ }, []);
+
return (
{
)}
{settings.cfg?.score && (
-
- Посмотреть ответы
-
- }
- sx={{
- mt: "60px",
- width: "100%",
- }}
- >
-
+
-
-
-
+ Ваши баллы
+
+
+ {pointsSum} из {questions.filter((e) => e.type != "result").length}
+
+
+ Посмотреть ответы
+
+ }
+ sx={{
+ mt: "60px",
+ width: "100%",
+ }}
+ >
+
+
+
+
+
)}
@@ -221,9 +282,7 @@ export const ResultForm = ({ resultQuestion }: ResultFormProps) => {
{
const theme = useTheme();
const { settings, show_badge, quizId, questions } = useQuizSettings();
@@ -135,8 +137,7 @@ export const StartPageViewPublication = () => {
{
//Отбираем из массива только тип резулт И результы с информацией о ожидаемых баллах И те результы, чьи суммы баллов меньше или равны насчитанным баллам юзера
+
const results = sortedQuestions.filter(
(e) => e.type === "result" && e.content.rule.minScore !== undefined && e.content.rule.minScore <= pointsSum
);
@@ -136,7 +137,6 @@ export function useQuestionFlowControl() {
);
//Извлекаем самое большое число
const indexOfNext = Math.max(...numbers);
-
//Отдаём индекс нужного нам результата
return results[numbers.indexOf(indexOfNext)];
}, [pointsSum, sortedQuestions]);