Adding Questions Done

main
Pedram Keshavarzi 3 years ago
parent 2f54137fa6
commit b36bc037d3
  1. 23
      src/redux/reducers/exam.js
  2. 38
      src/view/addExam/views/AddQuestionsFromBank.js

@ -175,16 +175,7 @@ export default function addExamReduser(state = initialState, { type, payload })
description: payload.description, description: payload.description,
type: payload.type 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': case 'ADD_EXAM_QUESTIONAIRES':
return { return {
...state, ...state,
@ -217,6 +208,18 @@ export default function addExamReduser(state = initialState, { type, payload })
courses: state.courses.filter(itm => itm.id !== payload.id) 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: default:
return state; return state;

@ -179,27 +179,28 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
<div className="w-full flex px-10"> <div className="w-full flex px-10">
<div className="w-1/2 border-l flex flex-col border-gray-300 py-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"> <h1 className="text-blue3A w-full font-bold text-lg text-right">
دفترچه {selectedQuestionare.name} {selectedCourse.title}
</h1> </h1>
<div className="flex flex-col items-center overflow-x-hidden overflow-scroll" style={{height: '500px'}}> <div className="flex flex-col items-center overflow-x-hidden overflow-scroll" style={{height: '500px'}}>
<div className="w-4/5 "> <div className="w-4/5 ">
{ {
addExamState.questionairesCourses.filter(itm => itm.questionnaireId == selectedQuestionare.id).map( addExamState.questions.filter(itm => itm.courseId == selectedCourse.id).map(
(item) => ( (item) => (
<SelectedCourse title={item.name} coefficient={item.coefficient} questionQuantity={item.questionsQuantity} <Question data={item} />
onClick={() => {setSelectedCourse(item); console.log(selectedCourse)}}/>
) )
) )
} }
</div> </div>
</div> </div>
</>) </>)
} }
{selectedQuestionare.id !== null && {/* {selectedQuestionare.id !== null &&
<div className="w-full flex justify-center mt-10"> <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)}> <button className=" bg-gray-300 text-xl text-gray-500 border-gray-500 w-1/3 h-12 rounded-xl border" onClick={() => setAddCoursePopup(true)}>
افزودن درس افزودن درس
@ -212,7 +213,28 @@ const AddQuestionsFromBank = ({ grades, addExamState, dispatch, stepClick, backS
passAnswers={data => {setAnswers(data); setFakeState(fakeState - 2)}}/> */} passAnswers={data => {setAnswers(data); setFakeState(fakeState - 2)}}/> */}
{selectedCourse.id !== null && {selectedCourse.id !== null &&
addExamState.questionBank.filter(itm => itm.courseId == selectedCourse.id).map( addExamState.questionBank.filter(itm => itm.courseId == selectedCourse.id).map(
(course) => (<Question data={course} />) (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 /> */} {/* <Question /> */}

Loading…
Cancel
Save