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 'button_label' not in st.session_state:
-    st.session_state.button_label = "Submit/New"
+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
@@ -128,7 +130,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.button_label = "Submit/New"
+    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]
@@ -167,10 +170,11 @@ with st.form(key=f'question_form_{st.session_state.current_index}'):
         index=None  # Ensure no option is pre-selected
     )
     
-    submit_button = st.form_submit_button(label=st.session_state.button_label)
+    submit_button = st.form_submit_button(label="Submit", disabled=not st.session_state.submit_enabled)
+    new_button = st.form_submit_button(label="New", disabled=not st.session_state.new_enabled)
 
 # Handle button state and answer submission
-if submit_button and st.session_state.button_label == "Submit/New":
+if submit_button:
     if selected_answer is not None:
         # Process the answer
         current_question['selected'] = selected_answer
@@ -181,7 +185,8 @@ if submit_button and st.session_state.button_label == "Submit/New":
             st.session_state.correct_count += 1
             st.session_state.module_correct_count[selected_module] += 1
 
-        st.session_state.button_label = "Next Question"
+        st.session_state.submit_enabled = False
+        st.session_state.new_enabled = True
     else:
         st.warning("Please select an option before submitting.", icon="⚠️")
         st.stop()
@@ -201,14 +206,10 @@ if current_question.get('answered', False):
     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)
+# Handle new question generation
+if new_button:
+    new_question = generate_new_question(selected_module, modules[selected_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