Updates

app.py

@@ -8,7 +8,7 @@ if 'session_id' not in st.session_state:
     st.session_state.session_id = str(uuid.uuid4())
 
 if 'questions' not in st.session_state:
-    st.session_state.questions = []  # To store generated questions
+    st.session_state.questions = []
 if 'current_index' not in st.session_state:
     st.session_state.current_index = 0
 if 'current_module' not in st.session_state:
@@ -25,8 +25,6 @@ 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 'question_list' not in st.session_state:
-    st.session_state.question_list = [None] * 100  # Placeholder for 100 questions
 
 def reset_pdf_cache():
     st.session_state.pdf_data = None
@@ -104,7 +102,6 @@ def generate_new_question(module_name, module):
     # 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
 
 def navigate_question(direction):
@@ -128,20 +125,17 @@ for module in modules:
         selected_module = module
         break
 
-# Ensure the current module is tracked correctly
 if selected_module != st.session_state.current_module:
     st.session_state.current_module = selected_module
     st.session_state.current_index = 0
+    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.selected_answer = None
     st.session_state.answered = False
 
 # Load the current module's question
-if st.session_state.question_list[st.session_state.current_index] is None:
-    st.session_state.question_list[st.session_state.current_index] = generate_new_question(selected_module, modules[selected_module])
-
-current_question = st.session_state.question_list[st.session_state.current_index]
+current_question = st.session_state.questions[st.session_state.current_index]
 
 # Display module title and description
 st.title(modules[selected_module]["title"])
@@ -153,12 +147,8 @@ with col1:
     if st.button("⬅️ Prev", disabled=st.session_state.current_index == 0):
         navigate_question("prev")
 with col2:
-    if st.button("➡️ Next"):
-        if st.session_state.current_index < len(st.session_state.question_list) - 1:
-            st.session_state.current_index += 1
-            if st.session_state.question_list[st.session_state.current_index] is None:
-                st.session_state.question_list[st.session_state.current_index] = generate_new_question(selected_module, modules[selected_module])
-            st.session_state.answered = False
+    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:
         pdf = generate_pdf_report()
@@ -172,29 +162,45 @@ 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'], 
+        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.")
+    else:
+        if 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
+
+        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):
     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)