Updates

app.py

@@ -36,19 +36,6 @@ if 'explanation' not in st.session_state:
 if 'selected_answer' not in st.session_state:
     st.session_state.selected_answer = None
 
-# Handle Next and Previous question navigation
-def navigate_question(direction):
-    if direction == "next":
-        st.session_state.question_count += 1
-    elif direction == "prev" and st.session_state.question_count > 1:
-        st.session_state.question_count -= 1
-        st.session_state.submitted = False
-        st.session_state.current_question = st.session_state.question_queue[st.session_state.question_count - 1][0]
-        st.session_state.options = st.session_state.question_queue[st.session_state.question_count - 1][1]
-        st.session_state.selected_answer = st.session_state.question_queue[st.session_state.question_count - 1][2]
-        st.session_state.correct_answer = st.session_state.question_queue[st.session_state.question_count - 1][3]
-        st.session_state.explanation = st.session_state.question_queue[st.session_state.question_count - 1][4]
-
 def generate_pdf_report():
     pdf = FPDF()
     pdf.add_page()
@@ -62,9 +49,9 @@ def generate_pdf_report():
         pdf.multi_cell(0, 10, f"Q{idx+1}: {question}")
         for option in options:
             if option == correct:
-                pdf.multi_cell(0, 10, f"{option} (Correct)")
+                pdf.multi_cell(0, 10, f"✅ {option} (Correct)")
             elif option == selected:
-                pdf.multi_cell(0, 10, f"{option} (Your Choice)")
+                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}")
@@ -77,6 +64,14 @@ st.sidebar.title("Quiz Modules")
 module_name = st.sidebar.radio("Choose a module:", list(module_names.keys()), index=0)
 
 if module_name:
+    if st.session_state.current_module != module_name:
+        st.session_state.current_module = module_name
+        st.session_state.question_count = 0
+        st.session_state.correct_count = 0
+        st.session_state.question_queue = []
+        st.session_state.current_question = None
+        st.session_state.submitted = False
+
     module_file = module_names[module_name]
     try:
         module = importlib.import_module(f'modules.{module_file}')
@@ -91,13 +86,20 @@ if module_name:
         # Navigation and PDF Download buttons
         col_nav_1, col_nav_2, col_pdf = st.columns([1, 1, 2])
         with col_nav_1:
-            if st.session_state.question_count > 0:
+            if st.session_state.question_count > 1:
                 if st.button("⬅️ Prev"):
-                    navigate_question("prev")
+                    st.session_state.question_count -= 1
+                    st.session_state.submitted = False
+                    question_data = st.session_state.question_queue[st.session_state.question_count - 1]
+                    st.session_state.current_question = question_data[0]
+                    st.session_state.options = question_data[1]
+                    st.session_state.selected_answer = question_data[2]
+                    st.session_state.correct_answer = question_data[3]
+                    st.session_state.explanation = question_data[4]
         with col_nav_2:
             if st.session_state.submitted:
                 if st.button("➡️ Next"):
-                    navigate_question("next")
+                    st.session_state.current_question = None
         with col_pdf:
             if st.session_state.question_count > 0:
                 pdf = generate_pdf_report()
@@ -122,7 +124,7 @@ if module_name:
             <div style='border: 2px solid #ccc; padding: 15px; background-color: #f9f9f9;'>
             <strong>Question {st.session_state.question_count + 1}:</strong> {st.session_state.current_question}
             <br>
-            {st.radio("Choose an answer:", st.session_state.options)}
+            {st.radio("Choose an answer:", st.session_state.options, key=st.session_state.question_count)}
             </div>
             """,
             unsafe_allow_html=True
@@ -130,6 +132,7 @@ if module_name:
 
         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, 
@@ -153,7 +156,6 @@ if module_name:
                 """,
                 unsafe_allow_html=True
             )
-            st.session_state.current_question = None
 
     except ModuleNotFoundError:
         st.error(f"The module '{module_name}' was not found. Please select another module.")