Updates

app.py

@@ -63,13 +63,12 @@ def generate_pdf_report():
 
         for entry in st.session_state.questions:
             if entry['module'] == module:
-                question, options, selected, correct, explanation, step_by_step_solution = (
+                question, options, selected, correct, explanation = (
                     entry['question'], 
                     entry['options'], 
                     entry['selected'], 
-                    entry['correct_answer'], 
-                    entry['explanation'],
-                    entry['step_by_step_solution']
+                    entry['correct'], 
+                    entry['explanation']
                 )
                 pdf.multi_cell(0, 10, f"Q: {question}")
                 for option in options:
@@ -84,10 +83,6 @@ def generate_pdf_report():
                         pdf.multi_cell(0, 10, f"   {option}")
                 pdf.set_text_color(0, 0, 0)  # Reset color
                 pdf.multi_cell(0, 10, f"Explanation: {explanation}")
-                pdf.ln(5)
-                pdf.multi_cell(0, 10, "Step-by-Step Solution:")
-                for step in step_by_step_solution:
-                    pdf.multi_cell(0, 10, step)
                 pdf.ln(10)
 
         pdf.ln(10)  # Add space after each module
@@ -101,10 +96,16 @@ def load_module(module_name):
 
 def generate_new_question(module_name):
     module = load_module(module_name)
-    question_data = module.generate_question()
-    # Ensure 'answered' is initialized to False
-    question_data['answered'] = False
-    return question_data
+    question, options, correct_answer, explanation = module.generate_question()
+    return {
+        'module': module_name,
+        'question': question,
+        'options': options,
+        'correct': correct_answer,
+        'explanation': explanation,
+        'selected': None,
+        'answered': False
+    }
 
 def navigate_question(direction):
     if direction == "prev" and st.session_state.current_index > 0:
@@ -127,53 +128,20 @@ if module_name != st.session_state.current_module:
     st.session_state.current_index = 0
     st.session_state.questions = [generate_new_question(module_name)]
 
-# Load the current module's question
+# Load the current module for title and description
+current_module = load_module(st.session_state.current_module)
 current_question = st.session_state.questions[st.session_state.current_index]
 
 # Display module title and description
-st.title(module_name)
-st.write(current_question["question"])
+st.title(current_module.title)
+st.write(current_module.description)
 
-# Option highlighting logic
-def get_option_style(option):
-    if current_question.get('answered', False):
-        if option == current_question['correct_answer']:
-            return "background-color:#d4edda;padding:10px;border-radius:5px;"  # Green background for correct
-        elif option == current_question['selected']:
-            return "background-color:#f8d7da;padding:10px;border-radius:5px;"  # Red background for incorrect
-    return "background-color:#f0f0f0;padding:10px;border-radius:5px;"  # Gray background by default
-
-# Display each option with custom styles
-selected_answer = None
-for i, option in enumerate(current_question['options']):
-    option_html = f"<div style='{get_option_style(option)}'>{option}</div>"
-    if st.button(option_html, key=f"option_{i}"):
-        selected_answer = option
-
-if selected_answer:
-    current_question['selected'] = selected_answer
-    current_question['answered'] = True
-    st.session_state.module_question_count[module_name] += 1
-
-    if selected_answer == current_question['correct_answer']:
-        st.session_state.correct_count += 1
-        st.session_state.module_correct_count[module_name] += 1
-
-    # Refresh the display after submission to show the correct/incorrect styles
-    st.experimental_rerun()
-
-# Navigation buttons
+# Button Row: Prev, Next, and PDF Download
 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.experimental_rerun()
-
+    st.button("⬅️ Prev", disabled=st.session_state.current_index == 0, on_click=lambda: navigate_question("prev"))
 with col2:
-    if st.button("➡️ Next"):
-        navigate_question("next")
-        st.experimental_rerun()
-
+    st.button("➡️ Next", on_click=lambda: navigate_question("next"))
 with col3:
     if len(st.session_state.questions) > 0:
         pdf = generate_pdf_report()
@@ -184,3 +152,37 @@ with col3:
             file_name="quiz_report.pdf",
             mime="application/pdf"
         )
+
+# Display the current question
+st.write(f"**Question {st.session_state.current_index + 1}:** {current_question['question']}")
+
+# Option highlighting logic
+def get_option_style(option):
+    if current_question['answered']:
+        if option == current_question['correct']:
+            return "background-color:#d4edda;padding:10px;border-radius:5px;"  # Green background for correct
+        elif option == current_question['selected']:
+            return "background-color:#f8d7da;padding:10px;border-radius:5px;"  # Red background for incorrect
+    return "background-color:#f0f0f0;padding:10px;border-radius:5px;"  # Gray background by default
+
+selected_answer = st.radio(
+    "Choose an answer:", 
+    current_question['options'], 
+    index=current_question['options'].index(current_question['selected']) if current_question['selected'] else None, 
+    key=st.session_state.current_index,
+    format_func=lambda x: f"{x}"
+)
+
+if st.button("Submit"):
+    if not current_question['answered']:
+        current_question['selected'] = selected_answer
+        current_question['answered'] = True
+        st.session_state.module_question_count[module_name] += 1
+
+        if selected_answer == current_question['correct']:
+            st.session_state.correct_count += 1
+            st.session_state.module_correct_count[module_name] += 1
+
+# Retain and highlight the options after submission
+for option in current_question['options']:
+    st.markdown(f"<div style='{get_option_style(option)}'>{option}</div>", unsafe_allow_html=True)