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 'button_disabled' not in st.session_state:
-    st.session_state.button_disabled = False
+if 'button_label' not in st.session_state:
+    st.session_state.button_label = "Submit"
 
 def reset_pdf_cache():
     st.session_state.pdf_data = None
@@ -107,14 +107,10 @@ def generate_new_question(module_name, module):
 def navigate_question(direction):
     if direction == "prev" and st.session_state.current_index > 0:
         st.session_state.current_index -= 1
-        st.session_state.button_disabled = True  # Disable the button when navigating to previous questions
-    elif direction == "next":
-        if st.session_state.current_index < len(st.session_state.questions) - 1:
-            st.session_state.current_index += 1
-        else:
-            st.session_state.questions.append(generate_new_question(st.session_state.current_module, modules[st.session_state.current_module]))
-            st.session_state.current_index = len(st.session_state.questions) - 1
-        st.session_state.button_disabled = False  # Enable the button for new questions
+        st.session_state.button_label = "Next Question"
+    elif direction == "next" and st.session_state.current_index < len(st.session_state.questions) - 1:
+        st.session_state.current_index += 1
+        st.session_state.button_label = "Next Question"
 
 # Load all modules dynamically
 modules = load_modules()
@@ -136,7 +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.button_disabled = False
+    st.session_state.button_label = "Submit"
 
 # Load the current module's question
 current_question = st.session_state.questions[st.session_state.current_index]
@@ -151,7 +147,7 @@ with col1:
     if st.button("⬅️ Prev", disabled=st.session_state.current_index == 0):
         navigate_question("prev")
 with col2:
-    if st.button("➡️ Next"):
+    if st.button("➡️ Next", disabled=st.session_state.current_index >= len(st.session_state.questions) - 1):
         navigate_question("next")
 with col3:
     if len(st.session_state.questions) > 0:
@@ -172,14 +168,13 @@ with st.form(key=f'question_form_{st.session_state.current_index}'):
         "Choose an answer:", 
         options=current_question['options'], 
         key=f"question_{st.session_state.current_index}_options",
-        index=current_question['options'].index(current_question['selected']) if current_question['answered'] else None, 
-        disabled=current_question['answered']  # Disable if the question has been answered
+        index=None  # Ensure no option is pre-selected
     )
     
-    submit_button = st.form_submit_button(label="Submit/Next", disabled=st.session_state.button_disabled)
+    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":
     if selected_answer is not None:
         # Process the answer
         current_question['selected'] = selected_answer
@@ -191,7 +186,7 @@ if submit_button:
             st.session_state.module_correct_count[selected_module] += 1
 
         # Show correct/incorrect feedback and explanation
-        st.session_state.button_disabled = True  # Disable the button after submission
+        st.session_state.button_label = "Next Question"
 
 # Show correct/incorrect feedback after submission
 if current_question.get('answered', False):
@@ -207,4 +202,14 @@ if current_question.get('answered', False):
     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(step)
+    
+    # Change the button label immediately after showing the solution
+    st.session_state.button_label = "Next Question"
+
+# This part handles switching to the next question on button click
+if submit_button and st.session_state.button_label == "Next Question":
+    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.button_label = "Submit"