Karimaldeen/school-dashboard-exercise
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

end_question

Browse Source
This commit is contained in:
karimalden 2024-06-26 17:08:57 +03:00
parent 6c82ce644e
commit 2df73211a1
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Pages/question/AddPage.tsx
View File

@ -19,7 +19,7 @@ const AddPage: React.FC = () => {
const { mutate, isSuccess, isLoading ,mutateAsync} = useAddQuestion(); const { mutate, isSuccess, isLoading ,mutateAsync} = useAddQuestion();
const {object_to_edit,set_Tags_search} = useObjectToEdit() const {object_to_edit,set_Tags_search,set_object_to_edit} = useObjectToEdit()
const {subject_id} = useParams<ParamsEnum>() const {subject_id} = useParams<ParamsEnum>()
const {isBseQuestion,set_isBseQuestion} = useObjectToEdit() const {isBseQuestion,set_isBseQuestion} = useObjectToEdit()
@ -68,7 +68,9 @@ const AddPage: React.FC = () => {
useEffect(() => { useEffect(() => {
if(isSuccess){ if(isSuccess){
toast.success(t("validation.the_possess_done_successful")) toast.success(t("validation.the_possess_done_successful"))
navigate(-1) // navigate(-1)
set_object_to_edit(null)
} }
}, [isSuccess]) }, [isSuccess])

1
src/Pages/question/EditPage.tsx
View File

@ -55,6 +55,7 @@ const EditPage: React.FC = () => {
if( typeof UpdateBseQuestion?.image === "string"){ if( typeof UpdateBseQuestion?.image === "string"){
delete UpdateBseQuestion["image"] delete UpdateBseQuestion["image"]
} }
console.log(UpdateBseQuestion);
mutate(UpdateBseQuestion) mutate(UpdateBseQuestion)

4
src/Pages/question/Model/Add.tsx
View File

@ -43,14 +43,14 @@ const Form = () => {
useKeyPress('q', 'ctrlKey', handleAddChoice); // useKeyPress('q', 'ctrlKey', handleAddChoice);
const handleFocusChoice = (index:number) => { const handleFocusChoice = (index:number) => {
const selectedInput = document.getElementById(`choice_${index}`); const selectedInput = document.getElementById(`choice_${index}`);
if (selectedInput) { if (selectedInput) {
selectedInput.focus(); selectedInput.focus();
} }
}; };
// useKeyPress('1', 'ctrlKey', handleFocusChoice(1)); // useKeyPress('1', 'ctrlKey', handleFocusChoice(1));

2
src/Pages/question/Model/Tags/DynamicTags.tsx
View File

@ -21,7 +21,7 @@ const DynamicTags = () => {
const handleAddChoice = () => { const handleAddChoice = () => {
const length = formik?.values?.tags.length; const length = formik?.values?.tags.length;
const lastElement = formik?.values?.tags[length - 1]?.name; const lastElement = formik?.values?.tags[length - 1]?.name;
set_Tags_search(null) set_Tags_search
if(lastElement !== ""){ if(lastElement !== ""){
formik.setFieldValue('tags', [...(formik?.values as any)?.tags as any[], formik.setFieldValue('tags', [...(formik?.values as any)?.tags as any[],

6
src/Pages/question/Model/formUtil.ts
View File

@ -64,8 +64,6 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
image: objectToEdit?.image ?? "", image: objectToEdit?.image ?? "",
subject_id: objectToEdit?.subject_id ?? '', subject_id: objectToEdit?.subject_id ?? '',
isBase: objectToEdit?.isBase, isBase: objectToEdit?.isBase,
max_mark: questions.length ?? 1,
min_mark_to_pass: 1,
parent_id: objectToEdit?.parent_id ?? '', parent_id: objectToEdit?.parent_id ?? '',
Questions: questions, Questions: questions,
}; };
@ -76,14 +74,10 @@ export const getValidationSchemaBase = () => {
return Yup.object().shape({ return Yup.object().shape({
image: Yup.string().nullable(), image: Yup.string().nullable(),
content: Yup.string().required("validation.required"), content: Yup.string().required("validation.required"),
max_mark: Yup.number().required("validation.required").min(Yup.ref("min_mark_to_pass"),"validation.max_mark_must_be_greater_than_min_mark_to_pass"),
min_mark_to_pass: Yup.number().required("validation.required"),
Questions: Yup.array().of( Questions: Yup.array().of(
Yup.object().shape({ Yup.object().shape({
image: Yup.string().nullable(), image: Yup.string().nullable(),
content: Yup.string().required("validation.required"), content: Yup.string().required("validation.required"),
max_mark: Yup.number().required("validation.required").min(Yup.ref("min_mark_to_pass"),"validation.max_mark_must_be_greater_than_min_mark_to_pass"),
min_mark_to_pass: Yup.number().required("validation.required"),
QuestionOptions: Yup.array().of( QuestionOptions: Yup.array().of(
Yup.object().shape({ Yup.object().shape({
answer: Yup.string().required("validation.required"), answer: Yup.string().required("validation.required"),

1
src/Styles/Pages/exercise.scss
View File

@ -92,6 +92,7 @@
display: flex; display: flex;
gap: 20px; gap: 20px;
margin-bottom: 29px; margin-bottom: 29px;
flex-wrap: wrap;
.suggested{ .suggested{
all: unset; all: unset;