Updates

app.py

@@ -123,14 +123,6 @@ def generate_new_question(module_name, module):
         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):
-    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
-
 # Load all modules dynamically
 modules = load_modules()
 
@@ -164,10 +156,10 @@ st.write(modules[selected_module]["description"])
 col1, col2, col3 = st.columns([1, 1, 2])
 with col1:
     if st.button("⬅️ Prev", disabled=st.session_state.current_index == 0):
-        navigate_question("prev")
+        st.session_state.current_index -= 1
 with col2:
     if st.button("➡️ Next", disabled=st.session_state.current_index >= len(st.session_state.questions) - 1):
-        navigate_question("next")
+        st.session_state.current_index += 1
 with col3:
     if len(st.session_state.questions) > 0:
         pdf = generate_pdf_report()
@@ -223,37 +215,15 @@ def display_question_with_styles(question_data):
     </div>
     """, unsafe_allow_html=True)
 
-    if question_data.get('answered', False):
+    # Display options without correct/incorrect marking initially
+    if not question_data.get('answered', False):
         for option in question_data['options']:
-            option_class = ''
-            if option == question_data['correct_answer']:
-                option_class = 'correct'
-            elif option == question_data['selected']:
-                option_class = 'incorrect'
-
             st.markdown(f"""
-            <div class="option {option_class}">
+            <div class="option">
                 {option}
             </div>
             """, unsafe_allow_html=True)
 
-        st.markdown(f"""
-        <div class="explanation-box">
-            <strong>Explanation:</strong> {question_data['explanation']}
-        </div>
-        """, unsafe_allow_html=True)
-
-        st.markdown(f"""
-        <div class="step-box">
-            <strong>Step-by-Step Solution:</strong>
-            <ul>
-        """, unsafe_allow_html=True)
-
-        for step in question_data['step_by_step_solution']:
-            st.markdown(f"<li>{step}</li>", unsafe_allow_html=True)
-
-        st.markdown("</ul></div>", unsafe_allow_html=True)
-
 # Display the current question with styles
 display_question_with_styles(current_question)
 
@@ -270,32 +240,49 @@ with st.form(key=f'question_form_{st.session_state.current_index}'):
         key=f"question_{st.session_state.current_index}_options"
     )
     
-    submit_button = st.form_submit_button(label="Submit/Next")
+    submit_button = st.form_submit_button(label="Submit")
+    generate_button = st.form_submit_button(label="Generate")
 
 # Handle button state and answer submission
-if submit_button:
-    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):
-    display_question_with_styles(current_question)
+if submit_button and 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
+        display_question_with_styles(current_question)
+        
+        # Display the explanation and step-by-step solution only after the question is answered
+        st.markdown(f"""
+        <div class="explanation-box">
+            <strong>Explanation:</strong> {current_question['explanation']}
+        </div>
+        """, unsafe_allow_html=True)
+
+        st.markdown(f"""
+        <div class="step-box">
+            <strong>Step-by-Step Solution:</strong>
+            <ul>
+        """, unsafe_allow_html=True)
+
+        for step in current_question['step_by_step_solution']:
+            st.markdown(f"<li>{step}</li>", unsafe_allow_html=True)
+
+        st.markdown("</ul></div>", unsafe_allow_html=True)
+
+if generate_button:
+    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
+    st.experimental_rerun()  # Rerun to load the new question