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 'answered' not in st.session_state:
+    st.session_state.answered = 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.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
 
 # 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.answered = 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:
@@ -169,24 +167,35 @@ 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=None  # Ensure no option is pre-selected
+        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")
+    
+    submit_button = st.form_submit_button(label="Submit/Next")
 
 # 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 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
+
+    else:
+        # If already answered, 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.answered = False
 
 # Show correct/incorrect feedback after submission
 if current_question.get('answered', False):
@@ -198,8 +207,15 @@ if current_question.get('answered', False):
         else:
             st.markdown(f"{option}")
     
-    # Show explanation and step-by-step solution
+    # Show explanation and step-by-step solution with improved visuals
     st.write(f"**Explanation:** {current_question['explanation']}")
-    st.write("**Step-by-Step Solution:**")
+    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.write(step)
+        st.markdown(f"<li style='margin-bottom: 10px;'>{step}</li>", unsafe_allow_html=True)
+    
+    st.markdown("</ol></div>", unsafe_allow_html=True)