Updates

app.py

@@ -24,7 +24,7 @@ if 'pdf_data' not in st.session_state:
 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"
+    st.session_state.button_label = "Submit"
 
 def reset_pdf_cache():
     st.session_state.pdf_data = None
@@ -95,9 +95,11 @@ def load_modules():
 
 def generate_new_question(module_name, module):
     question_data = module['generate_question']()
+    # Ensure 'answered' is initialized to False and add the 'module' and 'selected' keys
     question_data['answered'] = False
-    question_data['module'] = module_name
-    question_data['selected'] = None
+    question_data['module'] = module_name  # Add the module name to the question data
+    question_data['selected'] = None  # Initialize 'selected' to None
+    # Ensure there are exactly 4 options
     if len(question_data['options']) != 4:
         st.warning(f"Question in module '{module_name}' does not have 4 options. Found {len(question_data['options'])}.")
     return question_data
@@ -105,8 +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_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()
@@ -128,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_label = "Submit/New"
+    st.session_state.button_label = "Submit"
 
 # Load the current module's question
 current_question = st.session_state.questions[st.session_state.current_index]
@@ -170,7 +174,7 @@ 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/New":
+if submit_button and st.session_state.button_label == "Submit":
     if selected_answer is not None:
         # Process the answer
         current_question['selected'] = selected_answer
@@ -181,10 +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
 
+        # Show correct/incorrect feedback and explanation
         st.session_state.button_label = "Next Question"
-    else:
-        st.warning("Please select an option before submitting.", icon="⚠️")
-        st.stop()
 
 # Show correct/incorrect feedback after submission
 if current_question.get('answered', False):
@@ -196,19 +198,18 @@ if current_question.get('answered', False):
         else:
             st.markdown(f"{option}")
     
+    # Show explanation and step-by-step solution
     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:
+    
+    # Change the button label immediately after showing the solution
     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)
+# 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"