Updates

app.py

@@ -25,6 +25,14 @@ if 'question_queue' not in st.session_state:
     st.session_state.question_queue = []
 if 'submitted' not in st.session_state:
     st.session_state.submitted = False
+if 'current_question' not in st.session_state:
+    st.session_state.current_question = None
+if 'options' not in st.session_state:
+    st.session_state.options = []
+if 'correct_answer' not in st.session_state:
+    st.session_state.correct_answer = None
+if 'explanation' not in st.session_state:
+    st.session_state.explanation = None
 if 'selected_answer' not in st.session_state:
     st.session_state.selected_answer = None
 
@@ -37,10 +45,15 @@ def generate_pdf_report():
     pdf.ln(10)
 
     for idx, entry in enumerate(st.session_state.question_queue):
-        question, selected, correct, explanation = entry
+        question, options, selected, correct, explanation = entry
         pdf.multi_cell(0, 10, f"Q{idx+1}: {question}")
-        pdf.multi_cell(0, 10, f"Selected Answer: {selected}")
-        pdf.multi_cell(0, 10, f"Correct Answer: {correct}")
+        for option in options:
+            if option == correct:
+                pdf.multi_cell(0, 10, f"✅ {option} (Correct)")
+            elif option == selected:
+                pdf.multi_cell(0, 10, f"❌ {option} (Your Choice)")
+            else:
+                pdf.multi_cell(0, 10, f"   {option}")
         pdf.multi_cell(0, 10, f"Explanation: {explanation}")
         pdf.ln(10)
 
@@ -62,60 +75,54 @@ if module_name:
         st.title(title)
         st.write(description)
 
-        if st.session_state.submitted:
+        if st.session_state.current_question is None or st.session_state.submitted:
+            st.session_state.current_question, st.session_state.options, st.session_state.correct_answer, st.session_state.explanation = generate_question()
             st.session_state.submitted = False
-            st.session_state.question_count += 1
-            st.session_state.question_queue.append((
-                st.session_state.current_question, 
-                st.session_state.selected_answer, 
-                st.session_state.correct_answer, 
-                st.session_state.explanation
-            ))
-
-            if st.session_state.selected_answer == st.session_state.correct_answer:
-                st.session_state.correct_count += 1
-                st.success("✅ Correct!")
-            else:
-                st.error("❌ Incorrect.")
-            st.write(f"**Explanation:** {st.session_state.explanation}")
+            st.session_state.selected_answer = None
 
         if st.session_state.question_count > 0:
             correct_percentage = (st.session_state.correct_count / st.session_state.question_count) * 100
             st.write(f"**Correct Answers:** {st.session_state.correct_count}/{st.session_state.question_count} ({correct_percentage:.2f}%)")
 
-        if not st.session_state.submitted:
-            st.session_state.current_question, options, st.session_state.correct_answer, st.session_state.explanation = generate_question()
-            st.write(f"**Question {st.session_state.question_count + 1}:** {st.session_state.current_question}")
-            st.session_state.selected_answer = st.radio("Choose an answer:", options)
+        st.write(f"**Question {st.session_state.question_count + 1}:** {st.session_state.current_question}")
+        st.session_state.selected_answer = st.radio("Choose an answer:", st.session_state.options, index=0)
 
-            col1, col2 = st.columns([1, 5])
+        col1, col2, col3 = st.columns([1, 1, 3])
+        if st.session_state.question_count > 0:
             with col1:
                 if st.button("⬅️ Prev"):
                     # Logic for previous question (if applicable)
                     pass
-            with col2:
-                if st.button("Submit"):
-                    st.session_state.submitted = True
-                    st.experimental_rerun()
+        with col2:
+            if st.button("Submit"):
+                st.session_state.submitted = True
+                st.session_state.question_count += 1
+                st.session_state.question_queue.append((
+                    st.session_state.current_question, 
+                    st.session_state.options, 
+                    st.session_state.selected_answer, 
+                    st.session_state.correct_answer, 
+                    st.session_state.explanation
+                ))
 
-        if st.session_state.submitted:
-            col1, col2, col3 = st.columns([1, 1, 3])
-            with col1:
-                if st.button("⬅️ Prev"):
-                    # Logic for previous question (if applicable)
-                    pass
-            with col2:
-                if st.button("➡️ Next"):
-                    st.experimental_rerun()
+                if st.session_state.selected_answer == st.session_state.correct_answer:
+                    st.session_state.correct_count += 1
+                    st.success("✅ Correct!")
+                else:
+                    st.error("❌ Incorrect.")
+                st.write(f"**Explanation:** {st.session_state.explanation}")
+                st.session_state.current_question = None
+                st.experimental_rerun()
+
+        if st.session_state.submitted and st.session_state.question_count > 0:
             with col3:
-                if st.session_state.question_count > 0:
-                    pdf = generate_pdf_report()
-                    st.download_button(
-                        label="Download PDF Report 📄",
-                        data=pdf,
-                        file_name="quiz_report.pdf",
-                        mime="application/pdf"
-                    )
+                pdf = generate_pdf_report()
+                st.download_button(
+                    label="Download PDF Report 📄",
+                    data=pdf,
+                    file_name="quiz_report.pdf",
+                    mime="application/pdf"
+                )
 
     except ModuleNotFoundError:
         st.error(f"The module '{module_name}' was not found. Please select another module.")