Updates

app.py

@@ -21,10 +21,10 @@ if 'module_question_count' not in st.session_state:
     st.session_state.module_question_count = {}
 if 'pdf_data' not in st.session_state:
     st.session_state.pdf_data = None
-if 'next_disabled' not in st.session_state:
-    st.session_state.next_disabled = True
 if 'selected_answer' not in st.session_state:
     st.session_state.selected_answer = None
+if 'show_next_button' not in st.session_state:
+    st.session_state.show_next_button = False
 
 def reset_pdf_cache():
     st.session_state.pdf_data = None
@@ -107,12 +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
-    elif direction == "next":
-        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.next_disabled = True
-        st.session_state.selected_answer = None
+        st.session_state.show_next_button = True
+    elif direction == "next" and st.session_state.current_index < len(st.session_state.questions) - 1:
+        st.session_state.current_index += 1
+        st.session_state.show_next_button = True
 
 # Load all modules dynamically
 modules = load_modules()
@@ -133,8 +131,8 @@ if selected_module != st.session_state.current_module:
     st.session_state.questions = [generate_new_question(selected_module, modules[selected_module])]
     st.session_state.module_question_count[selected_module] = 0
     st.session_state.module_correct_count[selected_module] = 0
-    st.session_state.next_disabled = True
     st.session_state.selected_answer = None
+    st.session_state.show_next_button = False
 
 # Load the current module's question
 current_question = st.session_state.questions[st.session_state.current_index]
@@ -149,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", disabled=st.session_state.next_disabled):
+    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,21 +170,32 @@ with st.form(key=f'question_form_{st.session_state.current_index}'):
         key=f"question_{st.session_state.current_index}_options",
         index=None  # Ensure no option is pre-selected
     )
-    submit_button = st.form_submit_button(label="Submit")
+    
+    # Determine button label
+    button_label = "Submit" if not st.session_state.show_next_button else "Next Question"
+    
+    submit_button = st.form_submit_button(label=button_label)
 
 # Handle button state and answer submission
 if submit_button:
-    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
-
-        st.session_state.next_disabled = False
+    if st.session_state.show_next_button:
+        # Move to the 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.show_next_button = False
+    else:
+        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
+
+            st.session_state.show_next_button = True
 
 # Show correct/incorrect feedback after submission
 if current_question.get('answered', False):