Updates

app.py

@@ -23,8 +23,10 @@ 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 'submit_enabled' not in st.session_state:
+    st.session_state.submit_enabled = True
+if 'new_enabled' not in st.session_state:
+    st.session_state.new_enabled = False
 
 def reset_pdf_cache():
     st.session_state.pdf_data = None
@@ -98,8 +100,8 @@ def generate_new_question(module_name, module):
     question_data['answered'] = False
     question_data['module'] = module_name
     question_data['selected'] = None
-    st.session_state.selected_answer = None
-    st.session_state.state = "NewQuestion"  # Set state to NewQuestion
+    if len(question_data['options']) != 4:
+        st.warning(f"Question in module '{module_name}' does not have 4 options. Found {len(question_data['options'])}.")
     return question_data
 
 def navigate_question(direction):
@@ -111,7 +113,8 @@ 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
+        st.session_state.submit_enabled = True
+        st.session_state.new_enabled = False
 
 # Load all modules dynamically
 modules = load_modules()
@@ -133,7 +136,8 @@ 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"
+    st.session_state.submit_enabled = True
+    st.session_state.new_enabled = False
 
 # Load the current module's question
 current_question = st.session_state.questions[st.session_state.current_index]
@@ -163,7 +167,7 @@ with col3:
 
 st.write(current_question["question"])
 
-# Display the question options
+# Create the form for the question
 selected_answer = st.radio(
     "Choose an answer:", 
     options=current_question['options'], 
@@ -171,48 +175,28 @@ 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":
+col1, col2 = st.columns(2)
+with col1:
+    submit_button = st.button(label="Submit", disabled=not st.session_state.submit_enabled)
+with col2:
+    new_button = st.button(label="New", disabled=not st.session_state.new_enabled)
+
+# Handle button state and answer submission
+if submit_button:
+    if selected_answer is not None:
         # Process the answer
-        current_question['selected'] = st.session_state.selected_answer
+        current_question['selected'] = 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']:
+        if selected_answer == current_question['correct_answer']:
             st.session_state.correct_count += 1
             st.session_state.module_correct_count[selected_module] += 1
 
+        # Immediately disable Submit and enable New
+        st.session_state.submit_enabled = False
+        st.session_state.new_enabled = True
+
         # Display correct/incorrect feedback
         for option in current_question['options']:
             if option == current_question['correct_answer']:
@@ -221,14 +205,15 @@ elif st.session_state.state == "OptionSelected":
                 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
+    else:
+        st.warning("Please select an option before submitting.", icon="⚠️")
 
-    elif action == "New":
-        navigate_question("new")
-        st.session_state.state = "NewQuestion"  # Transition to NewQuestion
+# Handle new question generation
+if new_button:
+    navigate_question("new")