@@ -58,7 +85,7 @@ const SelectTag: React.FC = () => {
placeholder=""
fieldNames={{ label: "name", value: "id" }}
onChange={handleChange}
- options={AllOptions}
+ options={uniqueOptions}
filterOption={false}
loading={isLoading}
notFoundContent={isLoading ?
: t("practical.not_found")}
diff --git a/src/Components/ValidationField/utils/ValidationField.scss b/src/Components/ValidationField/utils/ValidationField.scss
index 909abd9..049c303 100644
--- a/src/Components/ValidationField/utils/ValidationField.scss
+++ b/src/Components/ValidationField/utils/ValidationField.scss
@@ -7,7 +7,6 @@
margin-bottom: 10px;
position: relative;
min-height: 80px;
- // padding-inline: 20px;
> * {
width: 100% !important;
min-width: 150px;
diff --git a/src/Components/exercise/Header.tsx b/src/Components/exercise/Header.tsx
index a524b5f..325ee98 100644
--- a/src/Components/exercise/Header.tsx
+++ b/src/Components/exercise/Header.tsx
@@ -1,37 +1,59 @@
import { useFormikContext } from "formik";
-import React from "react";
+import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import { GoArrowSwitch } from "react-icons/go";
import { useObjectToEdit } from "../../zustand/ObjectToEditState";
-import { QUESTION_OBJECT_KEY } from "../../config/AppKey";
-import { Popconfirm, Popover } from "antd";
+import { Checkbox, CheckboxProps, Popconfirm, Popover } from "antd";
import { CombinationKeyEnum } from "../../enums/CombinationKeyEnum";
import { PopconfirmProps } from "antd/lib";
+import { SettingFilled } from "@ant-design/icons";
const Header = () => {
const [t] = useTranslation();
- const { values, setFieldValue, setValues } = useFormikContext
();
- const { isBseQuestion, setIsBseQuestion } = useObjectToEdit();
- const { setSavedQuestionData } = useObjectToEdit();
+ const { values, setValues } = useFormikContext();
+ const { isBseQuestion, setIsBseQuestion,ShowHint,setShowHint } = useObjectToEdit();
+ // const [Setting, setSetting] = useState(false)
+ const isEdited = ()=>{
+ if(isBseQuestion || values?.isBase === 1){
+
+ const content = !values?.content ;
+ const content_image = !values?.content_image ;
+
+ const Questions = values?.Questions?.length <= 1 && values?.Questions?.[0]?.answers?.length === 0 ;
+ const defaultQuestionHint = Object.keys(values?.Questions?.[0] ?? {})?.length <= 1
+
+
+
+ if(content && content_image && Questions && defaultQuestionHint) {
+ return false
+ }
+ }else{
+ const content = !values?.content ;
+ const content_image = !values?.content_image ;
+ const hint = !values?.hint ;
+ const answers = !(values?.answers?.length > 0) ;
+ const tags = !(values?.tags?.length > 0) ;
+ if(content && content_image && hint && answers && tags) {
+ return false
+ }
+ }
+ return true
+ }
+
const handleChange = () => {
- setSavedQuestionData(null);
- localStorage.removeItem(QUESTION_OBJECT_KEY);
if (isBseQuestion) {
setIsBseQuestion(false);
setValues(null);
- setFieldValue("isBase", 0);
} else {
setIsBseQuestion(true);
setValues(null);
- setFieldValue("isBase", 1);
}
};
const confirm: PopconfirmProps['onConfirm'] = (e) => {
- console.log(e);
setTimeout(() => {
- handleChange()
+ handleChange() ;
}, 500);
};
@@ -50,6 +72,25 @@ const Header = () => {
);
+
+ const handleOpenChange = (newOpen: boolean) => {
+ // setSetting(newOpen);
+ };
+ const onChange: CheckboxProps['onChange'] = (e) => {
+ setShowHint(e.target.checked);
+ };
+
+
+ const contentSetting = (
+