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 'answered' not in st.session_state:
-    st.session_state.answered = 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,10 +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.answered = True
+        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.answered = True
+        st.session_state.button_label = "Next Question"
 
 # Load all modules dynamically
 modules = load_modules()
@@ -132,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.answered = False
+    st.session_state.button_label = "Submit"
 
 # Load the current module's question
 current_question = st.session_state.questions[st.session_state.current_index]
@@ -162,29 +162,35 @@ with col3:
 
 st.write(current_question["question"])
 
-# Handle the selection of an option and check the answer immediately
-selected_answer = st.radio(
-    "Choose an answer:", 
-    options=current_question['options'], 
-    index=current_question['options'].index(current_question['selected']) if current_question['answered'] else None, 
-    key=f"question_{st.session_state.current_index}_options"
-)
-
-if selected_answer is not None and not current_question['answered']:
-    # 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
-
-    # Set answered to true to disable options
-    st.session_state.questions[st.session_state.current_index]['answered'] = True
-    st.session_state.selected_answer = selected_answer
-
-    # Show correct/incorrect feedback immediately
+# Create the form for the question
+with st.form(key=f'question_form_{st.session_state.current_index}'):
+    selected_answer = st.radio(
+        "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
+    )
+    
+    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"
+
+# Show correct/incorrect feedback after submission
+if current_question.get('answered', False):
     for option in current_question['options']:
         if option == current_question['correct_answer']:
             st.markdown(f"<span style='color:green;'>{option} ✅</span>", unsafe_allow_html=True)
@@ -193,15 +199,18 @@ if selected_answer is not None and not current_question['answered']:
         else:
             st.markdown(f"{option}")
     
-    # Show explanation and step-by-step solution with improved visuals
+    # Show explanation and step-by-step solution
     st.write(f"**Explanation:** {current_question['explanation']}")
-    st.markdown("""
-    <div style='border: 2px solid #4CAF50; padding: 10px; margin-top: 20px; background-color: #f9f9f9;'>
-    <h4 style='color: #4CAF50;'>Step-by-Step Solution:</h4>
-    <ol>
-    """, unsafe_allow_html=True)
-    
+    st.write("**Step-by-Step Solution:**")
     for step in current_question['step_by_step_solution']:
-        st.markdown(f"<li style='margin-bottom: 10px;'>{step}</li>", unsafe_allow_html=True)
+        st.write(step)
     
-    st.markdown("</ol></div>", unsafe_allow_html=True)
+    # 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"