Updates

app.py

@@ -179,19 +179,26 @@ with st.form(key=f'question_form_{st.session_state.current_index}'):
     submit_button = st.form_submit_button(label=st.session_state.button_label)
 
 # Handle button state and answer submission
-if submit_button and st.session_state.button_label == "Submit":
-    if selected_answer is not None:
-        # 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
-
-        # Show correct/incorrect feedback and explanation
-        st.session_state.button_label = "Next Question"
+if submit_button:
+    if st.session_state.button_label == "Submit":
+        if selected_answer is not None:
+            # 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
+
+            # Show correct/incorrect feedback and explanation
+            st.session_state.button_label = "Next"
+
+    elif st.session_state.button_label == "Next":
+        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"
 
 # Show correct/incorrect feedback after submission
 if current_question.get('answered', False):
@@ -208,13 +215,3 @@ if current_question.get('answered', False):
     st.write("**Step-by-Step Solution:**")
     for step in current_question['step_by_step_solution']:
         st.write(step)
-    
-    # Change the button label immediately after showing the solution
-    st.session_state.button_label = "Next Question"
-
-# Handle 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"