Updates

app.py

@@ -23,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 'state' not in st.session_state:
-    st.session_state.state = "NewQuestion"  # Initial state is NewQuestion
+if 'action' not in st.session_state:
+    st.session_state.action = None
 
 def reset_pdf_cache():
     st.session_state.pdf_data = None
@@ -99,7 +99,7 @@ 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.state = "NewQuestion"  # Set state to NewQuestion
+    st.session_state.action = None  # Reset action
     return question_data
 
 def navigate_question(direction):
@@ -111,7 +111,6 @@ def navigate_question(direction):
         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
-        # No need to call rerun, Streamlit will automatically update the UI
 
 # Load all modules dynamically
 modules = load_modules()
@@ -133,7 +132,6 @@ 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]
@@ -171,64 +169,46 @@ selected_answer = st.radio(
     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":
-        # 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)
+# Set the action based on the user's selection
+action_col1, action_col2, go_col = st.columns([1, 1, 1])
+with action_col1:
+    if st.button("Submit"):
+        st.session_state.action = "Submit"
+with action_col2:
+    if st.button("New"):
+        st.session_state.action = "New"
+with go_col:
+    if st.button("Go!"):
+        if st.session_state.action == "Submit":
+            if selected_answer is None:
+                st.warning("Please select an option before submitting.", icon="⚠️")
             else:
-                st.markdown(f"{option}")
+                # 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)
+                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
+                # Reset action after submission
+                st.session_state.action = None
 
-    elif action == "New":
-        navigate_question("new")
-        st.session_state.state = "NewQuestion"  # Transition to NewQuestion
+        elif st.session_state.action == "New":
+            navigate_question("new")
+            st.session_state.action = None  # Reset action after generating a new question