Updates

app.py

@@ -23,6 +23,10 @@ if 'correct_count' not in st.session_state:
     st.session_state.correct_count = 0
 if 'question_count' not in st.session_state:
     st.session_state.question_count = 0
+if 'module_correct_count' not in st.session_state:
+    st.session_state.module_correct_count = {name: 0 for name in module_names}
+if 'module_question_count' not in st.session_state:
+    st.session_state.module_question_count = {name: 0 for name in module_names}
 if 'current_module' not in st.session_state:
     st.session_state.current_module = None
 if 'question_queue' not in st.session_state:
@@ -44,22 +48,39 @@ def generate_pdf_report():
     pdf = FPDF()
     pdf.add_page()
     pdf.set_font("Arial", size=12)
-
+    
     pdf.cell(200, 10, txt="Quiz Report", ln=True, align="C")
     pdf.ln(10)
 
-    for idx, entry in enumerate(st.session_state.question_queue):
-        question, options, selected, correct, explanation = entry
-        pdf.multi_cell(0, 10, f"Q{idx+1}: {question}")
-        for option in options:
-            if option == correct:
-                pdf.multi_cell(0, 10, f"Correct: {option}")
-            elif option == selected:
-                pdf.multi_cell(0, 10, f"Your Choice: {option}")
-            else:
-                pdf.multi_cell(0, 10, f"   {option}")
-        pdf.multi_cell(0, 10, f"Explanation: {explanation}")
-        pdf.ln(10)
+    for module in module_names.keys():
+        pdf.cell(200, 10, txt=f"Module: {module}", ln=True, align="L")
+        pdf.ln(5)
+        correct_count = st.session_state.module_correct_count[module]
+        total_count = st.session_state.module_question_count[module]
+        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.question_queue:
+            if entry['module'] == module:
+                question, options, selected, correct, explanation = (
+                    entry['question'], 
+                    entry['options'], 
+                    entry['selected'], 
+                    entry['correct'], 
+                    entry['explanation']
+                )
+                pdf.multi_cell(0, 10, f"Q: {question}")
+                for option in options:
+                    if option == correct:
+                        pdf.multi_cell(0, 10, f"Correct: {option}")
+                    elif option == selected:
+                        pdf.multi_cell(0, 10, f"Your Choice: {option}")
+                    else:
+                        pdf.multi_cell(0, 10, f"   {option}")
+                pdf.multi_cell(0, 10, f"Explanation: {explanation}")
+                pdf.ln(10)
+
+        pdf.ln(10)  # Add space after each module
 
     return pdf.output(dest='S').encode('latin1', 'replace')
 
@@ -110,26 +131,59 @@ if module_name:
             correct_percentage = (st.session_state.correct_count / st.session_state.question_count) * 100
             st.write(f"**Correct Answers:** {st.session_state.correct_count}/{st.session_state.question_count} ({correct_percentage:.2f}%)")
 
+        # Button Row: Prev, Next, and PDF Download
+        col1, col2, col3 = st.columns([1, 1, 2])
+        with col1:
+            if st.session_state.question_count > 1:
+                if st.button("⬅️ Prev"):
+                    st.session_state.question_count -= 1
+                    st.session_state.submitted = False
+                    question_data = st.session_state.question_queue[st.session_state.question_count - 1]
+                    st.session_state.current_question = question_data['question']
+                    st.session_state.options = question_data['options']
+                    st.session_state.selected_answer = question_data['selected']
+                    st.session_state.correct_answer = question_data['correct']
+                    st.session_state.explanation = question_data['explanation']
+                    logging.info("Navigated to previous question.")
+        with col2:
+            if st.session_state.submitted:
+                if st.button("➡️ Next"):
+                    st.session_state.current_question = None
+                    logging.info("Navigated to next question.")
+        with col3:
+            if st.session_state.question_count > 0:
+                pdf = generate_pdf_report()
+                st.download_button(
+                    label="Download PDF Report 📄",
+                    data=pdf,
+                    file_name="quiz_report.pdf",
+                    mime="application/pdf"
+                )
+                logging.info("PDF report generated.")
+
         st.write(f"**Question {st.session_state.question_count + 1}:** {st.session_state.current_question}")
         st.session_state.selected_answer = st.radio("Choose an answer:", st.session_state.options, key=st.session_state.question_count)
 
         if st.button("Submit"):
             st.session_state.submitted = True
             st.session_state.question_count += 1
-            st.session_state.question_queue.append((
-                st.session_state.current_question, 
-                st.session_state.options, 
-                st.session_state.selected_answer, 
-                st.session_state.correct_answer, 
-                st.session_state.explanation
-            ))
-
+            st.session_state.module_question_count[module_name] += 1
             if st.session_state.selected_answer == st.session_state.correct_answer:
                 st.session_state.correct_count += 1
+                st.session_state.module_correct_count[module_name] += 1
                 st.success("Correct!")
             else:
                 st.error("Incorrect.")
 
+            st.session_state.question_queue.append({
+                'module': module_name,
+                'question': st.session_state.current_question,
+                'options': st.session_state.options,
+                'selected': st.session_state.selected_answer,
+                'correct': st.session_state.correct_answer,
+                'explanation': st.session_state.explanation
+            })
+
             logging.info("Answer submitted.")
             logging.info(f"Selected Answer: {st.session_state.selected_answer}")
             logging.info(f"Correct Answer: {st.session_state.correct_answer}")
@@ -144,36 +198,6 @@ if module_name:
                 unsafe_allow_html=True
             )
 
-        # Display the "Next", "Prev", and "Download PDF Report" buttons above the question
-        col1, col2, col3 = st.columns([1, 1, 2])
-        with col1:
-            if st.session_state.submitted:
-                if st.button("➡️ Next"):
-                    st.session_state.current_question = None
-                    logging.info("Navigated to next question.")
-        with col2:
-            if st.session_state.question_count > 1:
-                if st.button("⬅️ Prev"):
-                    st.session_state.question_count -= 1
-                    st.session_state.submitted = False
-                    question_data = st.session_state.question_queue[st.session_state.question_count - 1]
-                    st.session_state.current_question = question_data[0]
-                    st.session_state.options = question_data[1]
-                    st.session_state.selected_answer = question_data[2]
-                    st.session_state.correct_answer = question_data[3]
-                    st.session_state.explanation = question_data[4]
-                    logging.info("Navigated to previous question.")
-        with col3:
-            if st.session_state.question_count > 0:
-                pdf = generate_pdf_report()
-                st.download_button(
-                    label="Download PDF Report 📄",
-                    data=pdf,
-                    file_name="quiz_report.pdf",
-                    mime="application/pdf"
-                )
-                logging.info("PDF report generated.")
-
     except ModuleNotFoundError as e:
         st.error(f"The module '{module_name}' was not found. Please select another module.")
         logging.error(f"Error: {e}")

modules/valid_invalid_numbers.py

@@ -12,7 +12,7 @@ def generate_question():
 
     def generate_invalid_number():
         valid_digits = ''.join([str(random.randint(0, base - 1)) for _ in range(length - 1)])
-        invalid_digit = str(random.randint(base, 9))
+        invalid_digit = str(random.randint(base, base + 1)) if base < 10 else chr(random.randint(ord('A'), ord('F')))
         return valid_digits + invalid_digit
 
     correct_answer = generate_invalid_number()