Updates

app.py

@@ -23,12 +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 'submit_enabled' not in st.session_state:
-    st.session_state.submit_enabled = False
-if 'new_enabled' not in st.session_state:
-    st.session_state.new_enabled = False
-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
@@ -102,9 +98,8 @@ def generate_new_question(module_name, module):
     question_data['answered'] = False
     question_data['module'] = module_name
     question_data['selected'] = None
-    st.session_state.submit_enabled = False  # Disable submit initially
-    st.session_state.new_enabled = False  # Disable new initially
-    st.session_state.action = None  # Reset action
+    st.session_state.selected_answer = None
+    st.session_state.state = "NewQuestion"  # Set state to NewQuestion
     return question_data
 
 def navigate_question(direction):
@@ -137,6 +132,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.state = "NewQuestion"
 
 # Load the current module's question
 current_question = st.session_state.questions[st.session_state.current_index]
@@ -166,7 +162,7 @@ with col3:
 
 st.write(current_question["question"])
 
-# Create the form for the question
+# Display the question options
 selected_answer = st.radio(
     "Choose an answer:", 
     options=current_question['options'], 
@@ -174,52 +170,64 @@ selected_answer = st.radio(
     index=None  # Ensure no option is pre-selected
 )
 
-# Enable submit if an option is selected
+# Transition to State 2 if an option is selected
 if selected_answer:
-    st.session_state.submit_enabled = True
-
-# Show Submit/New actions as disabled if no option is selected
-action = st.radio(
-    "Choose an action:",
-    ("Submit", "New"),
-    index=None,
-    key="action_radio",
-    disabled=(not st.session_state.submit_enabled and not st.session_state.new_enabled),
-    horizontal=True
-)
-
-# Handle the selected action
-if action == "Submit" and st.session_state.submit_enabled:
-    # 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
-
-    # 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)
-
-    # Disable submit and enable new
-    st.session_state.submit_enabled = False
-    st.session_state.new_enabled = True
-    st.session_state.action = "New"
-
-elif action == "New" and st.session_state.new_enabled:
-    navigate_question("new")
-    st.session_state.submit_enabled = False
-    st.session_state.new_enabled = False
-    st.session_state.action = None
+    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":
+        # 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.state = "NewQuestion"  # Transition to NewQuestion