fix analytics

session_page.py

@@ -3730,12 +3730,18 @@ def display_quiz_tab(student_id, course_id, session_id):
     """Display quizzes for students"""
     st.header("Course Quizzes")
     # Get available quizzes for this session, excluding pre-class quizzes
-    quizzes = quizzes_collection.find({
+    # quizzes = quizzes_collection.find({
+    #     "course_id": course_id,
+    #     "session_id": session_id,
+    #     "status": "active",
+    #     "quiz_type": {"$ne": "pre_class"}
+    # })
+    quizzes = list(quizzes_collection.find({
         "course_id": course_id,
         "session_id": session_id,
         "status": "active",
         "quiz_type": {"$ne": "pre_class"}
-    })
+    }))
     # Get available quizzes for this session
     # quizzes = quizzes_collection.find({
     #     "course_id": course_id,
@@ -3743,13 +3749,57 @@ def display_quiz_tab(student_id, course_id, session_id):
     #     "status": "active"
     # })
     
-    quizzes = list(quizzes)
+    # quizzes = list(quizzes)
     if not quizzes:
         st.info("No quizzes available for this session.")
         return
     
-    for quiz in quizzes:
-        with st.expander(f"📝 {quiz['title']}", expanded=True):
+    # for quiz in quizzes:
+    #     with st.expander(f"📝 {quiz['title']}", expanded=True):
+    #         # 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:
+    #             # Display quiz questions
+    #             st.write("Please select your answers:")
+                
+    #             # Create a form for quiz submission
+    #             with st.form(f"quiz_form_{quiz['_id']}"):
+    #                 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_{quiz['_id']}_{i}"
+    #                     )
+                    
+    #                 # Submit button
+    #                 if st.form_submit_button("Submit Quiz"):
+    #                     print(student_answers)
+    #                     score = submit_quiz_answers(quiz['_id'], student_id, student_answers)
+    #                     if score is not None:
+    #                         st.success(f"Quiz submitted successfully! Your score: {score:.1f}%")
+    #                         st.rerun()  # Refresh to show results
+    #                     else:
+    #                         st.error("Error submitting quiz. Please try again.")
+    for idx, quiz in enumerate(quizzes):
+        with st.expander(f"📝 {quiz.get('title', 'Quiz')}", expanded=True):
             # Check if student has already taken this quiz
             existing_score = get_student_quiz_score(quiz['_id'], student_id)
             
@@ -3761,37 +3811,42 @@ def display_quiz_tab(student_id, course_id, session_id):
                 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']):
+                        if opt == question['correct_option']:
                             st.markdown(f"✅ {opt}")
                         else:
                             st.markdown(f"- {opt}")
-                
             else:
                 # Display quiz questions
                 st.write("Please select your answers:")
                 
-                # Create a form for quiz submission
-                with st.form(f"quiz_form_{quiz['_id']}"):
+                # Create a form with unique key using both quiz ID and index
+                form_key = f"quiz_form_{quiz['_id']}_{idx}"
+                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 = question['options']
+                        answer = st.radio(
+                            f"Select answer:",
                             options=options,
-                            key=f"q_{quiz['_id']}_{i}"
+                            key=f"q_{quiz['_id']}_{idx}_{i}",  # Make radio button key unique too
+                            index=None
                         )
+                        if answer:
+                            student_answers[str(i)] = answer
                     
                     # Submit button
                     if st.form_submit_button("Submit Quiz"):
-                        print(student_answers)
-                        score = submit_quiz_answers(quiz['_id'], student_id, student_answers)
-                        if score is not None:
-                            st.success(f"Quiz submitted successfully! Your score: {score:.1f}%")
-                            st.rerun()  # Refresh to show results
+                        if len(student_answers) != len(quiz['questions']):
+                            st.error("Please answer all questions before submitting.")
                         else:
-                            st.error("Error submitting quiz. Please try again.")
+                            score = submit_quiz_answers(quiz['_id'], student_id, student_answers)
+                            if score is not None:
+                                st.success(f"Quiz submitted successfully! Your score: {score:.1f}%")
+                                st.rerun()
+                            else:
+                                st.error("Error submitting quiz. Please try again.")
 
 def display_session_content(student_id, course_id, session, username, user_type):
     st.title(f"{session['title']}")
@@ -3865,8 +3920,7 @@ def display_session_content(student_id, course_id, session, username, user_type)
         with tabs[2]:
             display_post_class_content(session, student_id, course_id)
         with tabs[3]:
-            if st.button("Generate Pre-class Analytics") and not st.session_state.analytics_data:
-                display_preclass_analytics2(session, course_id)
+            display_preclass_analytics2(session, course_id)
         with tabs[4]:
             display_inclass_analytics(session, course_id)
         with tabs[5]: