Updates

app.py

@@ -21,16 +21,8 @@ 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 '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 'submit_click_count' not in st.session_state:
-    st.session_state.submit_click_count = 0
-if 'show_next_button' not in st.session_state:
-    st.session_state.show_next_button = False
-if 'show_report' not in st.session_state:
-    st.session_state.show_report = False
+if 'next_disabled' not in st.session_state:
+    st.session_state.next_disabled = True
 
 def reset_pdf_cache():
     st.session_state.pdf_data = None
@@ -113,10 +105,12 @@ 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
-    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
+    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
 
 # Load all modules dynamically
 modules = load_modules()
@@ -137,11 +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.answered = False
-    st.session_state.submit_click_count = 0  # Reset the submit click count
-    st.session_state.show_next_button = False  # Reset the next button visibility
-    st.session_state.show_report = False  # Reset the report visibility
 
 # Load the current module's question
 current_question = st.session_state.questions[st.session_state.current_index]
@@ -156,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.current_index >= len(st.session_state.questions) - 1):
+    if st.button("➡️ Next", disabled=st.session_state.next_disabled):
         navigate_question("next")
 with col3:
     if len(st.session_state.questions) > 0:
@@ -169,84 +160,43 @@ with col3:
             mime="application/pdf"
         )
 
-# Show the question only if the "Next" button hasn't been clicked yet
-if not st.session_state.show_next_button:
-    st.write(current_question["question"])
-
-    # 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'], 
-            index=current_question['options'].index(current_question['selected']) if current_question['answered'] else None, 
-            key=f"question_{st.session_state.current_index}_options"
-        )
-        
-        submit_button = st.form_submit_button(label="Submit/Next")
-
-    # Handle button state and answer submission
-    if submit_button:
-        if selected_answer is None:
-            st.warning("Please select an option before submitting.")
+st.write(current_question["question"])
+
+# 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"
+    )
+    # Enable submit button when an answer is selected
+    submit_button = st.form_submit_button(label="Submit", disabled=selected_answer is None)
+
+# Handle button state and answer submission
+if submit_button and selected_answer:
+    # 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
+
+# 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)
+        elif option == current_question['selected']:
+            st.markdown(f"<span style='color:red;'>{option} ❌</span>", unsafe_allow_html=True)
         else:
-            st.session_state.submit_click_count += 1
-
-            if st.session_state.submit_click_count == 1:
-                # First click: show solution and remove question
-                if not current_question['answered']:
-                    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
-
-                        # 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 after submission
-                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)
-                    elif option == current_question['selected']:
-                        st.markdown(f"<span style='color:red;'>{option} ❌</span>", unsafe_allow_html=True)
-                    else:
-                        st.markdown(f"{option}")
-
-                # Show explanation and step-by-step solution with improved visuals
-                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)
-
-                for step in current_question['step_by_step_solution']:
-                    st.markdown(f"<li style='margin-bottom: 10px;'>{step}</li>", unsafe_allow_html=True)
-
-                st.markdown("</ol></div>", unsafe_allow_html=True)
-
-                # Replace question and Submit/Next with Next button
-                st.session_state.show_next_button = True
-
-# Show the Next button to generate a new question
-if st.session_state.show_next_button:
-    if st.button("Next"):
-        st.session_state.show_report = True
-        st.session_state.show_next_button = False  # Hide the Next button
-
-# Show the report after clicking Next
-if st.session_state.show_report:
-    st.write("### Report")
-    for module in modules:
-        total_questions = st.session_state.module_question_count.get(module, 0)
-        correct_answers = st.session_state.module_correct_count.get(module, 0)
-        if total_questions > 0:
-            percentage = (correct_answers / total_questions) * 100
-            st.write(f"**{modules[module]['title']}**: {correct_answers}/{total_questions} correct ({percentage:.2f}%)")
-        else:
-            st.write(f"**{modules[module]['title']}**: No questions answered yet.")
+            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)