fix practice quiz

gen_mcqs.py

@@ -337,6 +337,7 @@ def save_quiz(course_id, session_id, title, questions, user_id):
             "session_id": session_id,
             "title": title,
             "questions": questions,
+            "duration_minutes": 15,
             "created_at": datetime.utcnow(),
             "status": "active",
             "submissions": []

session_page.py

@@ -568,7 +568,6 @@ def display_preclass_content(session, student_id, course_id):
             st.session_state.messages = []
     
     if st.session_state.user_type == 'student':
-        display_pre_class_quiz_tab(student_id, course_id, session["session_id"])
         display_pre_subjective_test_tab(student_id, course_id, session["session_id"]) 
 
         st.subheader("Create a Practice Quiz")
@@ -601,128 +600,222 @@ def display_preclass_content(session, student_id, course_id):
                 else:
                     st.error("Error generating questions.")
 
-        # if st.button("Attempt Practice Quizzes "):
-            # quizzes = list(quizzes_collection.find({"course_id": course_id, "session_id": session['session_id'], "user_id": student_id}))
+        # # if st.button("Attempt Practice Quizzes "):
+        #     # quizzes = list(quizzes_collection.find({"course_id": course_id, "session_id": session['session_id'], "user_id": student_id}))
             
             
+        # if getattr(st.session_state, 'show_quizzes', False):
+        #     # quiz = quizzes_collection.find_one({"course_id": course_id, "session_id": session['session_id'], "user_id": student_id})
+        #     quiz = quizzes_collection.find_one(
+        #         {"course_id": course_id, "session_id": session['session_id'], "user_id": student_id},
+        #         sort=[("created_at", -1)]
+        #     )
+        #     if not quiz:
+        #         st.info("No practice quizzes created.")
+        #     else:
+        #             with st.expander(f"📝 Practice Quiz", expanded=False):
+        #                 # Check if student has already taken this quiz
+        #                 existing_score = get_student_quiz_score(quiz['_id'], student_id)
+                        
+        #                 if existing_score is not None:
+        #                     st.success(f"Quiz completed! Your score: {existing_score:.1f}%")
+                            
+        #                     # Display correct answers after submission
+        #                     st.subheader("Quiz Review")
+        #                     for i, question in enumerate(quiz['questions']):
+        #                         st.markdown(f"**Question {i+1}:** {question['question']}")
+        #                         for opt in question['options']:
+        #                             if opt.startswith(question['correct_option']):
+        #                                 st.markdown(f"✅ {opt}")
+        #                             else:
+        #                                 st.markdown(f"- {opt}")
+                            
+        #                 else:
+        #                      # Initialize quiz state for this specific quiz
+        #                     quiz_key = f"quiz_{quiz['_id']}_student_{student_id}"
+        #                     if quiz_key not in st.session_state:
+        #                         st.session_state[quiz_key] = {
+        #                             'submitted': False,
+        #                             'score': None,
+        #                             'answers': {}
+        #                         }
+
+        #                     # If quiz was just submitted, show the results
+        #                     if st.session_state[quiz_key]['submitted']:
+        #                         st.success(f"Quiz submitted successfully! Your score: {st.session_state[quiz_key]['score']:.1f}%")
+        #                         # Reset the quiz state
+        #                         st.session_state[quiz_key]['submitted'] = False
+
+
+        #                     # Display quiz questions
+        #                     st.write("Please select your answers:")
+                            
+        #                     # Create a form for quiz submission
+        #                     form_key = f"quiz_form_{quiz['_id']}_student_{student_id}"
+        #                     with st.form(key=form_key):
+        #                         student_answers = {}
+                                
+        #                         for i, question in enumerate(quiz['questions']):
+        #                             st.markdown(f"**Question {i+1}:** {question['question']}")
+        #                             options = [opt for opt in question['options']]
+        #                             # student_answers[str(i)] = st.radio(
+        #                             #     f"Select answer for question {i+1}:",
+        #                             #     options=options,
+        #                             #     key=f"q_{i}",
+        #                             #     index=None
+        #                             # ) 
+        #                             answer = st.radio(
+        #                                 f"Select answer for question {i+1}:",
+        #                                 options=options,
+        #                                 key=f"{quiz['_id']}_{i}",  # Simplify the radio button key
+        #                                 index=None
+        #                             )
+        #                             if answer:  # Only add to answers if a selection was made
+        #                                 student_answers[str(i)] = answer                               
+
+        #                         # Submit button
+        #                         # submitted =  st.form_submit_button("Submit Quiz")
+        #                         print("Before the submit button")
+        #                         submit_button = st.form_submit_button("Submit Quiz")
+        #                         print("After the submit button")
+        #                     if submit_button and student_answers:
+        #                         print("Clicked the button")
+        #                         print(student_answers)
+        #                         correct_answers = 0
+        #                         for i, question in enumerate(quiz['questions']):
+        #                             if student_answers[str(i)] == question['correct_option']:
+        #                                 correct_answers += 1
+        #                         score = (correct_answers / len(quiz['questions'])) * 100
+                                
+        #                         if score is not None:
+        #                             st.success(f"Quiz submitted successfully! Your score: {score:.1f}%")
+        #                             st.session_state[quiz_key]['submitted'] = True
+        #                             st.session_state[quiz_key]['score'] = score
+        #                             st.session_state[quiz_key]['answers'] = student_answers
+        #                             # This will trigger a rerun, but now we'll handle it properly
+        #                             st.rerun()
+                        
+        #                         else:
+        #                             st.error("Error submitting quiz. Please try again.")
+        #                         # correct_answers = 0
+        #                         # for i, question in enumerate(quiz['questions']):
+        #                         #     if student_answers[str(i)] == question['correct_option']:
+        #                         #         correct_answers += 1
+        #                         # score = (correct_answers / len(quiz['questions'])) * 100
+        #                         # print(score)
+        #                         # try:
+        #                         #     quizzes_collection.update_one(
+        #                         #         {"_id": quiz['_id']},
+        #                         #         {"$push": {"submissions": {"student_id": student_id, "score": score}}}
+        #                         #     )
+        #                         #     st.success(f"Quiz submitted successfully! Your score: {score:.1f}%")
+        #                         # except Exception as db_error:
+        #                         #     st.error(f"Error saving submission: {str(db_error)}")
+
         if getattr(st.session_state, 'show_quizzes', False):
-            # quiz = quizzes_collection.find_one({"course_id": course_id, "session_id": session['session_id'], "user_id": student_id})
             quiz = quizzes_collection.find_one(
-                {"course_id": course_id, "session_id": session['session_id'], "user_id": student_id},
+                {
+                    "course_id": course_id, 
+                    "session_id": session['session_id'], 
+                    "user_id": student_id
+                },
                 sort=[("created_at", -1)]
             )
             if not quiz:
                 st.info("No practice quizzes created.")
             else:
-                    with st.expander(f"📝 Practice Quiz", expanded=False):
-                        # Check if student has already taken this quiz
-                        existing_score = get_student_quiz_score(quiz['_id'], student_id)
+                with st.expander(f"📝 Practice Quiz", expanded=True):
+                    existing_score = get_student_quiz_score(quiz['_id'], student_id)
+                    
+                    if existing_score is not None:
+                        st.success(f"Quiz completed! Your score: {existing_score:.1f}%")
                         
-                        if existing_score is not None:
-                            st.success(f"Quiz completed! Your score: {existing_score:.1f}%")
+                        # Show review
+                        st.subheader("Quiz Review")
+                        for i, question in enumerate(quiz['questions']):
+                            st.markdown(f"**Q{i+1}:** {question['question']}")
+                            for opt in question['options']:
+                                if opt == question['correct_option']:
+                                    st.markdown(f"✅ {opt}")
+                                else:
+                                    st.markdown(f"- {opt}")
+                    else:
+                        with st.form(key=f"quiz_form_{quiz['_id']}"):
+                            student_answers = {}
                             
-                            # Display correct answers after submission
-                            st.subheader("Quiz Review")
                             for i, question in enumerate(quiz['questions']):
-                                st.markdown(f"**Question {i+1}:** {question['question']}")
-                                for opt in question['options']:
-                                    if opt.startswith(question['correct_option']):
-                                        st.markdown(f"✅ {opt}")
-                                    else:
-                                        st.markdown(f"- {opt}")
-                            
-                        else:
-                             # Initialize quiz state for this specific quiz
-                            quiz_key = f"quiz_{quiz['_id']}_student_{student_id}"
-                            if quiz_key not in st.session_state:
-                                st.session_state[quiz_key] = {
-                                    'submitted': False,
-                                    'score': None,
-                                    'answers': {}
-                                }
-
-                            # If quiz was just submitted, show the results
-                            if st.session_state[quiz_key]['submitted']:
-                                st.success(f"Quiz submitted successfully! Your score: {st.session_state[quiz_key]['score']:.1f}%")
-                                # Reset the quiz state
-                                st.session_state[quiz_key]['submitted'] = False
+                                st.markdown(f"**Q{i+1}:** {question['question']}")
+                                options = question['options']
+                                answer = st.radio(
+                                    f"Select answer:",
+                                    options=options,
+                                    key=f"q_{quiz['_id']}_{i}",
+                                    index=None
+                                )
+                                if answer:
+                                    student_answers[str(i)] = answer
 
+                            submit_button = st.form_submit_button("Submit Quiz")
 
-                            # Display quiz questions
-                            st.write("Please select your answers:")
-                            
-                            # Create a form for quiz submission
-                            form_key = f"quiz_form_{quiz['_id']}_student_{student_id}"
-                            with st.form(key=form_key):
-                                student_answers = {}
-                                
-                                for i, question in enumerate(quiz['questions']):
-                                    st.markdown(f"**Question {i+1}:** {question['question']}")
-                                    options = [opt for opt in question['options']]
-                                    # student_answers[str(i)] = st.radio(
-                                    #     f"Select answer for question {i+1}:",
-                                    #     options=options,
-                                    #     key=f"q_{i}",
-                                    #     index=None
-                                    # ) 
-                                    answer = st.radio(
-                                        f"Select answer for question {i+1}:",
-                                        options=options,
-                                        key=f"{quiz['_id']}_{i}",  # Simplify the radio button key
-                                        index=None
-                                    )
-                                    if answer:  # Only add to answers if a selection was made
-                                        student_answers[str(i)] = answer                               
-
-                                # Submit button
-                                # submitted =  st.form_submit_button("Submit Quiz")
-                                print("Before the submit button")
-                                submit_button = st.form_submit_button("Submit Quiz")
-                                print("After the submit button")
-                            if submit_button and student_answers:
-                                print("Clicked the button")
-                                print(student_answers)
-                                correct_answers = 0
-                                for i, question in enumerate(quiz['questions']):
-                                    if student_answers[str(i)] == question['correct_option']:
-                                        correct_answers += 1
-                                score = (correct_answers / len(quiz['questions'])) * 100
-                                
-                                if score is not None:
-                                    st.success(f"Quiz submitted successfully! Your score: {score:.1f}%")
-                                    st.session_state[quiz_key]['submitted'] = True
-                                    st.session_state[quiz_key]['score'] = score
-                                    st.session_state[quiz_key]['answers'] = student_answers
-                                    # This will trigger a rerun, but now we'll handle it properly
-                                    st.rerun()
-                        
+                            if submit_button:
+                                if len(student_answers) != len(quiz['questions']):
+                                    st.error("Please answer all questions before submitting.")
                                 else:
-                                    st.error("Error submitting quiz. Please try again.")
-                                # correct_answers = 0
-                                # for i, question in enumerate(quiz['questions']):
-                                #     if student_answers[str(i)] == question['correct_option']:
-                                #         correct_answers += 1
-                                # score = (correct_answers / len(quiz['questions'])) * 100
-                                # print(score)
-                                # try:
-                                #     quizzes_collection.update_one(
-                                #         {"_id": quiz['_id']},
-                                #         {"$push": {"submissions": {"student_id": student_id, "score": score}}}
-                                #     )
-                                #     st.success(f"Quiz submitted successfully! Your score: {score:.1f}%")
-                                # except Exception as db_error:
-                                #     st.error(f"Error saving submission: {str(db_error)}")
+                                    # Calculate score
+                                    correct_answers = 0
+                                    total_questions = len(quiz['questions'])
+                                    
+                                    for q_idx, question in enumerate(quiz['questions']):
+                                        student_answer = student_answers.get(str(q_idx))
+                                        correct_option = question['correct_option']
+                                        
+                                        if student_answer == correct_option:
+                                            correct_answers += 1
+                                    
+                                    score = (correct_answers / total_questions) * 100
+                                    
+                                    # Save submission to database
+                                    try:
+                                        result = quizzes_collection.update_one(
+                                            {"_id": quiz['_id']},
+                                            {
+                                                "$push": {
+                                                    "submissions": {
+                                                        "student_id": student_id,
+                                                        "answers": student_answers,
+                                                        "score": score,
+                                                        "submitted_at": datetime.utcnow()
+                                                    }
+                                                }
+                                            }
+                                        )
+                                        
+                                        if result.modified_count > 0:
+                                            st.success(f"Quiz submitted successfully! Score: {score:.1f}%")
+                                            st.rerun()
+                                        else:
+                                            st.error("Error saving submission. Please try again.")
+                                            
+                                    except Exception as e:
+                                        st.error(f"Database error: {str(e)}")
+
 
+        display_pre_class_quiz_tab(student_id, course_id, session["session_id"])
 def display_pre_class_quiz_tab(student_id, course_id, session_id):
     """Display pre-class quizzes for students"""
     st.markdown("### Pre-class Quizzes")
-
-    # Get available quizzes
     quizzes = quizzes_collection.find({
         "course_id": course_id,
         "session_id": session_id,
-        "status": "active"
+        "status": "active",
+        "quiz_type": "pre_class"
     })
+    # Get available quizzes
+    # quizzes = quizzes_collection.find({
+    #     "course_id": course_id,
+    #     "session_id": session_id,
+    #     "status": "active"
+    # })
 
     quizzes = list(quizzes)
     if not quizzes: