Updates

app.py

@@ -2,7 +2,6 @@ import streamlit as st
 import os
 from fpdf import FPDF
 import uuid
-import importlib
 
 # Initialize session state variables
 if 'session_id' not in st.session_state:
@@ -39,10 +38,12 @@ def generate_pdf_report():
     pdf.ln(10)
 
     for module, data in st.session_state.module_question_count.items():
-        pdf.set_text_color(0, 0, 0)  # Reset to default color
-        pdf.set_font("Arial", size=12, style='B')
+        correct_count = st.session_state.module_correct_count.get(module, 0)
+        total_count = data
         pdf.cell(200, 10, txt=f"Module: {module}", ln=True, align="L")
         pdf.ln(5)
+        pdf.cell(200, 10, txt=f"Correct Answers: {correct_count}/{total_count}", ln=True, align="L")
+        pdf.ln(5)
 
         for entry in st.session_state.questions:
             if entry['module'] == module:
@@ -54,43 +55,23 @@ def generate_pdf_report():
                     entry['explanation'],
                     entry['step_by_step_solution']
                 )
-                
-                # Draw a border around the question and options with a light background
-                pdf.set_draw_color(0, 0, 0)  # Black border
-                pdf.set_fill_color(240, 240, 240)  # Light gray background for question
-                pdf.set_line_width(0.3)
-                
-                # Question
-                pdf.multi_cell(0, 10, f"Q: {question}", border=1, align='L', fill=True)
-                pdf.ln(5)
-
-                # Options with distinct background
+                pdf.multi_cell(0, 10, f"Q: {question}")
                 for option in options:
                     if option == correct:
                         pdf.set_text_color(0, 128, 0)  # Green for correct
-                        pdf.set_fill_color(200, 255, 200)  # Light green background
-                        pdf.multi_cell(0, 10, f"{option}", border=1, align='L', fill=True)
+                        pdf.multi_cell(0, 10, f"{option}")
                     elif option == selected:
                         pdf.set_text_color(255, 0, 0)  # Red for incorrect
-                        pdf.set_fill_color(255, 200, 200)  # Light red background
-                        pdf.multi_cell(0, 10, f"{option}", border=1, align='L', fill=True)
+                        pdf.multi_cell(0, 10, f"{option}")
                     else:
                         pdf.set_text_color(0, 0, 0)  # Default color for others
-                        pdf.set_fill_color(240, 240, 240)  # Light gray background
-                        pdf.multi_cell(0, 10, f"   {option}", border=1, align='L', fill=True)
+                        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)
-
-                # Explanation with background
-                pdf.set_text_color(0, 0, 0)  # Reset to black
-                pdf.set_fill_color(230, 230, 250)  # Light blue background
-                pdf.multi_cell(0, 10, f"Explanation: {explanation}", border=1, align='L', fill=True)
-                pdf.ln(5)
-
-                # Step-by-step solution with background
-                pdf.set_fill_color(250, 235, 215)  # Light tan background
-                pdf.multi_cell(0, 10, "Step-by-Step Solution:", border=1, align='L', fill=True)
+                pdf.multi_cell(0, 10, "Step-by-Step Solution:")
                 for step in step_by_step_solution:
-                    pdf.multi_cell(0, 10, step, border=1, align='L', fill=True)
+                    pdf.multi_cell(0, 10, step)
                 pdf.ln(10)
 
         pdf.ln(10)  # Add space after each module
@@ -104,7 +85,7 @@ def load_modules():
         if filename.endswith(".py") and filename != "__init__.py":
             module_name = filename[:-3]
             # Dynamically import the module only when needed
-            module = importlib.import_module(f"modules.{module_name}")
+            module = __import__(f"{module_dir}.{module_name}", fromlist=[''])
             modules[module_name] = {
                 "title": getattr(module, "title", module_name),
                 "description": getattr(module, "description", "No description available."),
@@ -123,6 +104,14 @@ 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()
 
@@ -156,10 +145,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):
-        st.session_state.current_index -= 1
+        navigate_question("prev")
 with col2:
     if st.button("➡️ Next", disabled=st.session_state.current_index >= len(st.session_state.questions) - 1):
-        st.session_state.current_index += 1
+        navigate_question("next")
 with col3:
     if len(st.session_state.questions) > 0:
         pdf = generate_pdf_report()
@@ -171,69 +160,7 @@ with col3:
             mime="application/pdf"
         )
 
-# Web Page Presentation Styling
-def display_question_with_styles(question_data):
-    st.markdown(f"""
-    <style>
-    .question-box {{
-        border: 2px solid #000;
-        padding: 10px;
-        margin-bottom: 20px;
-        background-color: #f0f0f0;
-    }}
-    .option {{
-        border: 1px solid #000;
-        padding: 5px;
-        margin-bottom: 5px;
-    }}
-    .correct {{
-        background-color: #c8e6c9;
-        color: green;
-    }}
-    .incorrect {{
-        background-color: #ffcdd2;
-        color: red;
-    }}
-    .explanation-box {{
-        border: 2px solid #000;
-        padding: 10px;
-        background-color: #e3f2fd;
-        margin-top: 20px;
-    }}
-    .step-box {{
-        border: 1px solid #000;
-        padding: 5px;
-        background-color: #fff3e0;
-        margin-top: 10px;
-    }}
-    </style>
-    """, unsafe_allow_html=True)
-
-    st.markdown(f"""
-    <div class="question-box">
-        <strong>Q:</strong> {question_data['question']}
-    </div>
-    """, unsafe_allow_html=True)
-
-    # Display options with correct/incorrect marking if answered
-    for option in question_data['options']:
-        option_class = ''
-        if question_data['answered']:
-            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}">
-            {option}
-        </div>
-        """, unsafe_allow_html=True)
-
-# Display the current question with styles
-display_question_with_styles(current_question)
-
-# Disable the radio buttons if the question is already answered
-disabled_options = current_question['answered']
+st.write(current_question["question"])
 
 # Create the form for the question
 with st.form(key=f'question_form_{st.session_state.current_index}'):
@@ -241,49 +168,48 @@ with st.form(key=f'question_form_{st.session_state.current_index}'):
         "Choose an answer:", 
         options=current_question['options'], 
         index=current_question['options'].index(current_question['selected']) if current_question['answered'] else None, 
-        disabled=disabled_options,  # Disable if the question has been answered
+        disabled=current_question['answered'],  # Disable if the question has been answered
         key=f"question_{st.session_state.current_index}_options"
     )
     
-    submit_button = st.form_submit_button(label="Submit")
-    generate_button = st.form_submit_button(label="Generate")
+    submit_button = st.form_submit_button(label="Submit/Next")
 
 # Handle button state and answer submission
-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
-
-        # 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
+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):
+    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
+    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)