Updates

app.py

@@ -9,8 +9,6 @@ if 'session_id' not in st.session_state:
 
 if 'questions' not in st.session_state:
     st.session_state.questions = []
-if 'answered_questions' not in st.session_state:
-    st.session_state.answered_questions = []
 if 'current_index' not in st.session_state:
     st.session_state.current_index = 0
 if 'current_module' not in st.session_state:
@@ -25,8 +23,8 @@ if 'pdf_data' not in st.session_state:
     st.session_state.pdf_data = None
 if 'selected_answer' not in st.session_state:
     st.session_state.selected_answer = None
-if 'action' not in st.session_state:
-    st.session_state.action = None
+if 'state' not in st.session_state:
+    st.session_state.state = "NewQuestion"  # Initial state is NewQuestion
 
 def reset_pdf_cache():
     st.session_state.pdf_data = None
@@ -47,7 +45,7 @@ def generate_pdf_report():
         pdf.cell(200, 10, txt=f"Correct Answers: {correct_count}/{total_count}", ln=True, align="L")
         pdf.ln(5)
 
-        for entry in st.session_state.answered_questions:
+        for entry in st.session_state.questions:
             if entry['module'] == module:
                 question, options, selected, correct, explanation, step_by_step_solution = (
                     entry['question'], 
@@ -101,20 +99,19 @@ def generate_new_question(module_name, module):
     question_data['module'] = module_name
     question_data['selected'] = None
     st.session_state.selected_answer = None
-    st.session_state.action = None  # Reset action
+    st.session_state.state = "NewQuestion"  # Set state to NewQuestion
     return question_data
 
 def navigate_question(direction):
     if direction == "prev" and st.session_state.current_index > 0:
         st.session_state.current_index -= 1
-    elif direction == "next" and st.session_state.current_index < len(st.session_state.answered_questions) - 1:
+    elif direction == "next" and st.session_state.current_index < len(st.session_state.questions) - 1:
         st.session_state.current_index += 1
     elif direction == "new":
         new_question = generate_new_question(st.session_state.current_module, modules[st.session_state.current_module])
         st.session_state.questions.append(new_question)
         st.session_state.current_index = len(st.session_state.questions) - 1
-        # Triggering UI update naturally through session state change
-        st.session_state.refresh = not st.session_state.get('refresh', False)
+        # No need to call rerun, Streamlit will automatically update the UI
 
 # Load all modules dynamically
 modules = load_modules()
@@ -136,7 +133,7 @@ if selected_module != st.session_state.current_module:
     st.session_state.module_question_count[selected_module] = 0
     st.session_state.module_correct_count[selected_module] = 0
     st.session_state.selected_answer = None
-    st.session_state.answered_questions = []
+    st.session_state.state = "NewQuestion"
 
 # Load the current module's question
 current_question = st.session_state.questions[st.session_state.current_index]
@@ -145,38 +142,16 @@ current_question = st.session_state.questions[st.session_state.current_index]
 st.title(modules[selected_module]["title"])
 st.write(modules[selected_module]["description"])
 
-# Disable options and submit if the question is answered
-option_disabled = current_question['answered']
-
-# Display the question options
-selected_answer = st.radio(
-    "Choose an answer:", 
-    options=current_question['options'], 
-    index=current_question['options'].index(current_question['selected']) if current_question['answered'] else None, 
-    disabled=option_disabled,
-    key=f"question_{st.session_state.current_index}_options"
-)
-
-# Radio buttons for selecting the action
-action = st.radio(
-    "Choose an action:",
-    ("Submit", "New"),
-    index=None,  # Do not pre-select any action
-    key="action_radio",
-    horizontal=True,
-    disabled=option_disabled and (st.session_state.action != "New")  # Disable submit when the question is already answered, but not "New"
-)
-
 # Navigation and PDF report buttons
 col1, col2, col3 = st.columns([1, 1, 2])
 with col1:
     if st.button("⬅️ Prev", disabled=st.session_state.current_index == 0):
         navigate_question("prev")
 with col2:
-    if st.button("➡️ Next", disabled=st.session_state.current_index >= len(st.session_state.answered_questions) - 1):
+    if st.button("➡️ Next", disabled=st.session_state.current_index >= len(st.session_state.questions) - 1):
         navigate_question("next")
 with col3:
-    if len(st.session_state.answered_questions) > 0:
+    if len(st.session_state.questions) > 0:
         pdf = generate_pdf_report()
         st.session_state.pdf_data = pdf  # Reset PDF cache
         st.download_button(
@@ -188,38 +163,72 @@ with col3:
 
 st.write(current_question["question"])
 
-# Go! button to execute the selected action
-if st.button("Go!"):
+# Display the question options
+selected_answer = st.radio(
+    "Choose an answer:", 
+    options=current_question['options'], 
+    key=f"question_{st.session_state.current_index}_options",
+    index=None  # Ensure no option is pre-selected
+)
+
+# Transition to State 2 if an option is selected
+if selected_answer:
+    st.session_state.selected_answer = selected_answer
+    st.session_state.state = "OptionSelected"
+
+# Display Submit/New actions based on state
+if st.session_state.state == "NewQuestion":
+    action = st.radio(
+        "Choose an action:",
+        ("Submit", "New"),
+        index=None,  # Do not pre-select any action
+        key="action_radio_new",
+        horizontal=True
+    )
+
+    # Handle Submit/New actions
+    if action == "Submit":
+        st.warning("Please select an option before submitting.", icon="⚠️")
+        st.session_state.action = None  # Reset action
+    elif action == "New":
+        navigate_question("new")
+
+elif st.session_state.state == "OptionSelected":
+    action = st.radio(
+        "Choose an action:",
+        ("Submit", "New"),
+        index=None,  # Do not pre-select any action
+        key="action_radio_submit",
+        horizontal=True
+    )
+
+    # Handle Submit/New actions
     if action == "Submit":
-        if selected_answer is None:
-            st.warning("Please select an option before submitting.", icon="⚠️")
-        else:
-            # Process the answer
-            current_question['selected'] = selected_answer
-            current_question['answered'] = True
-            st.session_state.module_question_count[selected_module] += 1
-
-            if selected_answer == current_question['correct_answer']:
-                st.session_state.correct_count += 1
-                st.session_state.module_correct_count[selected_module] += 1
-
-            # Add to answered questions list and disable further submission
-            st.session_state.answered_questions.append(current_question)
-
-            # Display correct/incorrect feedback
-            for option in current_question['options']:
-                if option == current_question['correct_answer']:
-                    st.markdown(f"<span style='color:green;'>{option} ✅</span>", unsafe_allow_html=True)
-                elif option == current_question['selected']:
-                    st.markdown(f"<span style='color:red;'>{option} ❌</span>", unsafe_allow_html=True)
-                else:
-                    st.markdown(f"{option}")
-
-            st.write(f"**Explanation:** {current_question['explanation']}")
-            st.write("**Step-by-Step Solution:**")
-            for step in current_question['step_by_step_solution']:
-                st.write(step)
+        # Process the answer
+        current_question['selected'] = st.session_state.selected_answer
+        current_question['answered'] = True
+        st.session_state.module_question_count[selected_module] += 1
+
+        if st.session_state.selected_answer == current_question['correct_answer']:
+            st.session_state.correct_count += 1
+            st.session_state.module_correct_count[selected_module] += 1
+
+        # Display correct/incorrect feedback
+        for option in current_question['options']:
+            if option == current_question['correct_answer']:
+                st.markdown(f"<span style='color:green;'>{option} ✅</span>", unsafe_allow_html=True)
+            elif option == current_question['selected']:
+                st.markdown(f"<span style='color:red;'>{option} ❌</span>", unsafe_allow_html=True)
+            else:
+                st.markdown(f"{option}")
+
+        st.write(f"**Explanation:** {current_question['explanation']}")
+        st.write("**Step-by-Step Solution:**")
+        for step in current_question['step_by_step_solution']:
+            st.write(step)
+
+        st.session_state.state = "NewQuestion"  # Transition back to NewQuestion after submission
 
     elif action == "New":
         navigate_question("new")
-        st.session_state.dummy = not st.session_state.get('dummy', False)  # Force a UI refresh
+        st.session_state.state = "NewQuestion"  # Transition to NewQuestion