Karimaldeen/Quiz_dashboard
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix validation

Browse Source
This commit is contained in:
karimaldeen 2024-09-14 15:17:40 +03:00
parent fc861e768f
commit b1c5405ff7
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Layout/Dashboard/DeleteModels.tsx
View File

@ -73,7 +73,7 @@ const DeleteModels: React.FC<ModalFormProps> = ({
<Modal <Modal
className="ModalForm" className="ModalForm"
centered centered
width={"40vw"} width={"500px"}
footer={null} footer={null}
open={isOpen === ModelEnum} open={isOpen === ModelEnum}
onCancel={handleCancel} onCancel={handleCancel}

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

@ -112,12 +112,8 @@ const AddPage: React.FC = () => {
const handleValidateSingleQuestion = (values:any)=>{ const handleValidateSingleQuestion = (values:any)=>{
const haveAnswers = values?.answers?.length > 0 ; const haveMoreThanOneAnswer = values?.answers?.length > 1;
const haveMoreThanOneAnswer = haveAnswers && values?.answers?.length > 1;
const haveOneAnswerRight = haveMoreThanOneAnswer && values?.answers?.some((item:any)=> item?.isCorrect === 1 || item.isCorrect === true ) const haveOneAnswerRight = haveMoreThanOneAnswer && values?.answers?.some((item:any)=> item?.isCorrect === 1 || item.isCorrect === true )
if(!haveAnswers){
return false ;
}
if(!haveMoreThanOneAnswer){ if(!haveMoreThanOneAnswer){
toast.error(t("validation.it_should_have_more_than_one_answers")) ; toast.error(t("validation.it_should_have_more_than_one_answers")) ;
return false ; return false ;

7
src/Pages/Admin/question/EditPage.tsx
View File

@ -190,12 +190,9 @@ const EditPage: React.FC = () => {
const handleValidateSingleQuestion = (values:any)=>{ const handleValidateSingleQuestion = (values:any)=>{
const haveAnswers = values?.answers?.length > 0 ; const haveMoreThanOneAnswer = values?.answers?.length > 1;
const haveMoreThanOneAnswer = haveAnswers && values?.answers?.length > 1;
const haveOneAnswerRight = haveMoreThanOneAnswer && values?.answers?.some((item:any)=> item?.isCorrect === 1 || item.isCorrect === true ) const haveOneAnswerRight = haveMoreThanOneAnswer && values?.answers?.some((item:any)=> item?.isCorrect === 1 || item.isCorrect === true )
if(!haveAnswers){
return false ;
}
if(!haveMoreThanOneAnswer){ if(!haveMoreThanOneAnswer){
toast.error(t("validation.it_should_have_more_than_one_answers")) ; toast.error(t("validation.it_should_have_more_than_one_answers")) ;
return false ; return false ;

7
src/Pages/Admin/question/Model/formUtil.ts
View File

@ -37,9 +37,6 @@ export const getValidationSchema = () => {
"At least one answer must be correct", "At least one answer must be correct",
(answers: any) => { (answers: any) => {
console.log(answers, "answers"); console.log(answers, "answers");
if(answers === null){
return true
}
return answers?.some( return answers?.some(
(answer: any) => (answer: any) =>
answer?.isCorrect === true || answer?.isCorrect === 1, answer?.isCorrect === true || answer?.isCorrect === 1,
@ -110,10 +107,6 @@ export const getValidationSchemaBase = () => {
"at-least-one-correct", "at-least-one-correct",
"At least one answer must be correct", "At least one answer must be correct",
(answers: any) => { (answers: any) => {
if(answers === null){
return true
}
return answers.some( return answers.some(
(answer: any) => (answer: any) =>