Updates

app.py

@@ -23,10 +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 = True
-if 'new_enabled' not in st.session_state:
-    st.session_state.new_enabled = False
+if 'button_label' not in st.session_state:
+    st.session_state.button_label = "Submit/New"
 
 def reset_pdf_cache():
     st.session_state.pdf_data = None
@@ -109,12 +107,6 @@ def navigate_question(direction):
         st.session_state.current_index -= 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
-        st.session_state.submit_enabled = True
-        st.session_state.new_enabled = False
 
 # Load all modules dynamically
 modules = load_modules()
@@ -136,8 +128,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.submit_enabled = True
-    st.session_state.new_enabled = False
+    st.session_state.button_label = "Submit/New"
 
 # Load the current module's question
 current_question = st.session_state.questions[st.session_state.current_index]
@@ -168,21 +159,18 @@ with col3:
 st.write(current_question["question"])
 
 # Create the form for the question
-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
-)
-
-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)
+with st.form(key=f'question_form_{st.session_state.current_index}'):
+    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
+    )
+    
+    submit_button = st.form_submit_button(label=st.session_state.button_label)
 
 # Handle button state and answer submission
-if submit_button:
+if submit_button and st.session_state.button_label == "Submit/New":
     if selected_answer is not None:
         # Process the answer
         current_question['selected'] = selected_answer
@@ -193,27 +181,34 @@ if submit_button:
             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']:
-                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.button_label = "Next Question"
     else:
         st.warning("Please select an option before submitting.", icon="⚠️")
-
-# Handle new question generation
-if new_button:
-    navigate_question("new")
+        st.stop()
+
+# Show correct/incorrect feedback after submission
+if current_question.get('answered', False):
+    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 options and button when navigating through previous questions
+if st.session_state.current_index < len(st.session_state.questions) - 1:
+    st.session_state.button_label = "Next Question"
+else:
+    st.session_state.button_label = "Submit/New"
+
+if st.session_state.current_index > 0:
+    st.session_state.button_label = "Next Question"
+    st.session_state.selected_answer = None
+    st.form_submit_button(label=st.session_state.button_label, disabled=True)
+    st.radio("Choose an answer:", options=current_question['options'], index=None, disabled=True)