From b36bc037d311d7e3420de9610a2e9730d5175c41 Mon Sep 17 00:00:00 2001
From: Pkpedram <pkpedram80@gmail.com>
Date: Tue, 1 Mar 2022 19:54:00 +0330
Subject: [PATCH] Adding Questions Done

---
 src/redux/reducers/exam.js                    |  25 +--
 .../addExam/views/AddQuestionsFromBank.js     | 142 ++++++++++--------
 2 files changed, 96 insertions(+), 71 deletions(-)

diff --git a/src/redux/reducers/exam.js b/src/redux/reducers/exam.js
index 179464f..d190a25 100644
--- a/src/redux/reducers/exam.js
+++ b/src/redux/reducers/exam.js
@@ -149,7 +149,7 @@ const initialState = {
 
     ],
     questions: [
-
+       
     ]
 
 }
@@ -175,16 +175,7 @@ export default function addExamReduser(state = initialState, { type, payload })
                 description: payload.description,
                 type: payload.type
             }
-        case 'ADD_EXAM_QUESTIONS':
-            return {
-                ...state,
-                name: payload.name,
-                startDate: new Date(),
-                endDate: new Date(),
-                startTime: '19:0',
-                endTime: '',
-                description: payload.description,
-            }
+        
         case 'ADD_EXAM_QUESTIONAIRES':
             return {
                 ...state,
@@ -216,6 +207,18 @@ export default function addExamReduser(state = initialState, { type, payload })
                 ...state,
                 courses: state.courses.filter(itm => itm.id !== payload.id)
             }
+        
+        case 'ADD_EXAM_QUESTIONS':
+            return {
+                ...state,
+                questions : [...state.questions, payload]
+            }
+            
+            case 'REMOVE_EXAM_QUESTIONS': 
+            return {
+                ...state,
+                questions: state.questions.filter(itm => itm.questionId !== payload.questionId)
+            }
 
         default:
             return state;
diff --git a/src/view/addExam/views/AddQuestionsFromBank.js b/src/view/addExam/views/AddQuestionsFromBank.js
index dfb8917..f484fa6 100644
--- a/src/view/addExam/views/AddQuestionsFromBank.js
+++ b/src/view/addExam/views/AddQuestionsFromBank.js
@@ -24,14 +24,14 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
     const [showCoursesInList, setShowCoursesInList] = useState([]);
     const [choosedQuestionaries, seChoosedQuestionaries] = useState([]);
     const [selectedCourse, setSelectedCourse] = useState({
-        id: null, 
+        id: null,
         title: ''
     });
     const [answers, setAnswers] = useState(null);
     const [newCourse, setNewCourse] = useState({
         id: addExamState.questionairesCourses.length + 1,
         questionnaireId: selectedCourse.id,
-        questionsQuantity:20,
+        questionsQuantity: 20,
         name: '',
         coefficient: 4
     })
@@ -42,21 +42,21 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
     console.log(addExamState.questionairesCourses)
     console.log(selectedCourse)
     console.log(answers)
- 
+
     const [fakeState, setFakeState] = useState(2);
 
 
     useEffect(() => {
         // questoinaresLists.map(item => showCoursesInList.push(false));
-        if(answers !== null && answers !== []) {
-        answers.map(item => dispatch({type: 'ADD_ANSWERS', payload : item}))
+        if (answers !== null && answers !== []) {
+            answers.map(item => dispatch({ type: 'ADD_ANSWERS', payload: item }))
         }
-        
+
     }, [answers])
 
     const payload = { name: name, description: description, type: type };
 
-    
+
 
     return (
         <>
@@ -78,31 +78,31 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
                         <h1 className="w-full text-right text-lg text-red52 font-bold pt-4">
                             افزودن دفترچه
                         </h1>
-                        
-                            
 
-                            {
-                                addExamState.courseBank.map(
-                                    (item, index) => (
-                                        <>
-                                            <div className="w-full flex items-center py-2 justify-between border-b pl-8 border-gray-300">
-                                                <Checkbox name={`PICK_QUESTIONARE_${index}`}
-                                                    onChange={(e) => 
-                                                         e.target.checked ? 
-                                                          dispatch({type: 'ADD_EXAM_COURSE', payload: item})
-                                                        : 
-                                                        
 
-                                                        dispatch({type: 'REMOVE_EXAM_COURSE', payload: item})
 
+                        {
+                            addExamState.courseBank.map(
+                                (item, index) => (
+                                    <>
+                                        <div className="w-full flex items-center py-2 justify-between border-b pl-8 border-gray-300">
+                                            <Checkbox name={`PICK_QUESTIONARE_${index}`}
+                                                onChange={(e) =>
+                                                    e.target.checked ?
+                                                        dispatch({ type: 'ADD_EXAM_COURSE', payload: item })
+                                                        :
 
-                                                    }
 
-                                                />
-                                                <h2 className="text-red26 font-bold">{item.title}</h2>
-                                                {/* <h4>تعداد سوالات: {item.numberOfQuestions}</h4>
+                                                        dispatch({ type: 'REMOVE_EXAM_COURSE', payload: item })
+
+
+                                                }
+
+                                            />
+                                            <h2 className="text-red26 font-bold">{item.title}</h2>
+                                            {/* <h4>تعداد سوالات: {item.numberOfQuestions}</h4>
                                                 <p>تعداد دروس: {item.courses.length}</p> */}
-                                                {/* <p className="cursor-pointer" onClick={() => {
+                                            {/* <p className="cursor-pointer" onClick={() => {
                                                     let newArray = [...showCoursesInList];
                                                     
                                                     newArray[index] = !newArray[index];
@@ -112,15 +112,15 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
 
                                                 }}>نمایش دروس</p> */}
 
-                                            </div>
-                                            
-                                        </>
-                                    )
+                                        </div>
+
+                                    </>
                                 )
-                            }
-</div>
-                       
-                    
+                            )
+                        }
+                    </div>
+
+
                 </div>
             }
             {
@@ -133,7 +133,7 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
                 //   submitOnClick={() => {dispatch({type: 'ADD_QUESTIONNAIRE_COURSES', payload : newCourse}); setAddCoursePopup(false); setFakeState(fakeState + 356)} }
                 //   />
 
-               
+
             }
             <div className="flex py-10 items-start px-10 border-b border-gray-300">
                 <div className="flex flex-col w-1/6">
@@ -149,16 +149,16 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
                         addExamState.courses.map(
                             (item => (
                                 <div className={`flex flex-col ${selectedCourse.id === item.id ? 'bg-pinkF5 border border-red52 text-red52' : 'bg-white border border-gray-300 text-blue3A'}  items-center justify-between pb-12 pt-2 w-36 h-32 mx-2 font-bold  rounded-xl cursor-pointer`}
-                                 onClick={() => setSelectedCourse(item)}
-                                 >
-                                     <p className="w-full text-left px-4" onClick={() => dispatch({type: 'REMOVE_EXAM_COURSE', payload: item})}>
+                                    onClick={() => setSelectedCourse(item)}
+                                >
+                                    <p className="w-full text-left px-4" onClick={() => dispatch({ type: 'REMOVE_EXAM_COURSE', payload: item })}>
                                         x
-                                     </p>
-                        
-                        <p className="text-red52">
-                            {item.title}
-                        </p>
-                    </div>
+                                    </p>
+
+                                    <p className="text-red52">
+                                        {item.title}
+                                    </p>
+                                </div>
                             ))
                         )
                     }
@@ -168,7 +168,7 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
                             +
                         </p>
                         <p className="">
-                           افزودن درس
+                            افزودن درس
                         </p>
                     </div>
 
@@ -179,27 +179,28 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
             <div className="w-full flex  px-10">
 
                 <div className="w-1/2 border-l flex flex-col border-gray-300 py-10">
-                    {/* {
-                        selectedQuestionare.id !== null && (<>
+                    {
+                        selectedCourse.id !== null && (<>
                         <h1 className="text-blue3A  w-full font-bold text-lg text-right">
-                           دفترچه {selectedQuestionare.name}
+                            {selectedCourse.title}
                         </h1>
                         <div className="flex flex-col items-center overflow-x-hidden overflow-scroll" style={{height: '500px'}}>
                             <div className="w-4/5 ">
 
                             {
-                                addExamState.questionairesCourses.filter(itm => itm.questionnaireId == selectedQuestionare.id).map(
+                                addExamState.questions.filter(itm => itm.courseId == selectedCourse.id).map(
                                     (item) => (
-                                        <SelectedCourse title={item.name} coefficient={item.coefficient} questionQuantity={item.questionsQuantity} 
-                                        onClick={() => {setSelectedCourse(item); console.log(selectedCourse)}}/>
+                                        <Question data={item} />
+
                                     )
                                 )
                             }
                         </div>
+
                         </div>
                         </>)
                     }
-                    {selectedQuestionare.id !== null &&
+                    {/* {selectedQuestionare.id !== null &&
                         <div className="w-full flex justify-center mt-10">
                         <button className=" bg-gray-300 text-xl text-gray-500 border-gray-500 w-1/3 h-12 rounded-xl border" onClick={() => setAddCoursePopup(true)}>
                                 افزودن درس
@@ -208,17 +209,38 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
                 </div>
                 <div className="w-1/2 flex justify-center">
                     <div className="w-4/5 py-8">
-                    {/* <AnswerSheet questionsQuantity={selectedCourse.questionsQuantity} optionsQuantity={4} selectedCourseId={selectedCourse.id}
+                        {/* <AnswerSheet questionsQuantity={selectedCourse.questionsQuantity} optionsQuantity={4} selectedCourseId={selectedCourse.id}
                     passAnswers={data => {setAnswers(data); setFakeState(fakeState - 2)}}/> */}
-{selectedCourse.id !== null &&
-    addExamState.questionBank.filter(itm => itm.courseId == selectedCourse.id).map(
-        (course) => (<Question data={course} />)
-    )
-}
-                    {/* <Question /> */}
+                        {selectedCourse.id !== null &&
+                            addExamState.questionBank.filter(itm => itm.courseId == selectedCourse.id).map(
+                                (course , index) => (
+
+                                    <div className="flex items-start justify-between w-full">
+                                        <Checkbox name={`PICK_QUESTIONS_${index}_${course.courseId}`}
+                                            onChange={(e) =>
+                                                e.target.checked ?
+                                                    dispatch({ type: 'ADD_EXAM_QUESTIONS', payload: course })
+                                                    // console.log('asodjasd')
+                                                    :
+
+
+                                                    dispatch({ type: 'REMOVE_EXAM_QUESTIONS', payload: course })
+
+
+                                            }
+
+                                        />
+                                        {/* <button onClick={() => dispatch({ type: 'ADD_EXAM_QUESTIONS', payload: course })}>ادد کردن</button> */}
+
+                                        <Question data={course} />
+                                    </div>
+                                )
+                            )
+                        }
+                        {/* <Question /> */}
                     </div>
                 </div>
-                
+
             </div>