Updates

app.py

@@ -19,30 +19,18 @@ module_names = {
 }
 
 # Initialize session state variables
+if 'questions' not in st.session_state:
+    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:
+    st.session_state.current_module = None
 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:
-    st.session_state.question_queue = []
-if 'submitted' not in st.session_state:
-    st.session_state.submitted = False
-if 'current_question' not in st.session_state:
-    st.session_state.current_question = None
-if 'options' not in st.session_state:
-    st.session_state.options = []
-if 'correct_answer' not in st.session_state:
-    st.session_state.correct_answer = None
-if 'explanation' not in st.session_state:
-    st.session_state.explanation = None
-if 'selected_answer' not in st.session_state:
-    st.session_state.selected_answer = None
 
 def generate_pdf_report():
     pdf = FPDF()
@@ -60,7 +48,7 @@ def generate_pdf_report():
         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:
+        for entry in st.session_state.questions:
             if entry['module'] == module:
                 question, options, selected, correct, explanation = (
                     entry['question'], 
@@ -84,107 +72,93 @@ def generate_pdf_report():
 
     return pdf.output(dest='S').encode('latin1', 'replace')
 
-# Streamlit interface
-st.sidebar.title("Quiz Modules")
-module_name = st.sidebar.radio("Choose a module:", list(module_names.keys()), index=0)
-
-if module_name:
-    if st.session_state.current_module != module_name:
-        st.session_state.current_module = module_name
-        st.session_state.question_count = 0
-        st.session_state.correct_count = 0
-        st.session_state.question_queue = []
-        st.session_state.current_question = None
-        st.session_state.submitted = False
-
+def load_module(module_name):
     module_file = module_names[module_name]
-    try:
-        module = importlib.import_module(f'modules.{module_file}')
-        generate_question = module.generate_question
-        title = getattr(module, 'title', f"{module_name} Module")
-        description = getattr(module, 'description', "Description is not available")
-
-        # Show module title and description
-        st.title(title)
-        st.write(description)
-
-        # Button Row: Prev, Next, and PDF Download
-        col1, col2, col3 = st.columns([1, 1, 2])
-        with col1:
-            prev_disabled = st.session_state.question_count <= 1
-            st.button("⬅️ Prev", disabled=prev_disabled, key='prev_button', on_click=lambda: navigate_question("prev"))
-        with col2:
-            next_disabled = not st.session_state.submitted
-            st.button("➡️ Next", disabled=next_disabled, key='next_button', on_click=lambda: navigate_question("next"))
-        with col3:
-            pdf_disabled = st.session_state.question_count == 0
-            if not pdf_disabled:
-                pdf = generate_pdf_report()
-                st.download_button(
-                    label="Download PDF Report 📄",
-                    data=pdf,
-                    file_name="quiz_report.pdf",
-                    mime="application/pdf",
-                    disabled=pdf_disabled
-                )
-
-        # Handle question generation and submission
-        if st.session_state.current_question is None or st.session_state.submitted:
-            st.session_state.current_question, st.session_state.options, st.session_state.correct_answer, st.session_state.explanation = generate_question()
-            st.session_state.submitted = False
-            st.session_state.selected_answer = None
+    module = importlib.import_module(f'modules.{module_file}')
+    return module
+
+def generate_new_question(module_name):
+    module = load_module(module_name)
+    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
+    }
 
-        if st.session_state.question_count > 0:
-            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}%)")
+def navigate_question(direction):
+    if direction == "prev" and st.session_state.current_index > 0:
+        st.session_state.current_index -= 1
+    elif direction == "next":
+        if st.session_state.current_index < len(st.session_state.questions) - 1:
+            st.session_state.current_index += 1
+        else:
+            # Generate a new question if at the end of the list
+            new_question = generate_new_question(st.session_state.current_module)
+            st.session_state.questions.append(new_question)
+            st.session_state.current_index += 1
 
-        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)
+# Streamlit interface
+st.sidebar.title("Quiz Modules")
+module_name = st.sidebar.radio("Choose a module:", list(module_names.keys()), index=0)
 
-        if st.button("Submit"):
-            st.session_state.submitted = True
-            st.session_state.question_count += 1
+if module_name != st.session_state.current_module:
+    st.session_state.current_module = module_name
+    st.session_state.questions = []
+    st.session_state.current_index = 0
+
+    # Generate the first question for the new module
+    st.session_state.questions.append(generate_new_question(module_name))
+
+current_question = st.session_state.questions[st.session_state.current_index]
+
+# Button Row: Prev, Next, and PDF Download
+col1, col2, col3 = st.columns([1, 1, 2])
+with col1:
+    st.button("⬅️ Prev", disabled=st.session_state.current_index == 0, on_click=lambda: navigate_question("prev"))
+with col2:
+    st.button("➡️ Next", on_click=lambda: navigate_question("next"))
+with col3:
+    if st.session_state.current_index > 0:
+        pdf = generate_pdf_report()
+        st.download_button(
+            label="Download PDF Report 📄",
+            data=pdf,
+            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']}")
+
+if current_question['answered']:
+    st.radio("Choose an answer:", current_question['options'], index=current_question['options'].index(current_question['selected']))
+    if current_question['selected'] == current_question['correct']:
+        st.success(f"Correct! Your answer: {current_question['selected']}")
+    else:
+        st.error(f"Incorrect. Your answer: {current_question['selected']}")
+    st.markdown(
+        f"""
+        <div style='border: 2px solid #ccc; padding: 15px;'>
+        <strong>Explanation:</strong> {current_question['explanation']}
+        </div>
+        """,
+        unsafe_allow_html=True
+    )
+else:
+    selected_answer = st.radio("Choose an answer:", current_question['options'], key=st.session_state.current_index)
+    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 st.session_state.selected_answer == st.session_state.correct_answer:
+
+            if selected_answer == current_question['correct']:
                 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
-            })
-
-            # Explanation with proper width
-            st.markdown(
-                f"""
-                <div style='border: 2px solid #ccc; padding: 15px;'>
-                <strong>Explanation:</strong> {st.session_state.explanation}
-                </div>
-                """,
-                unsafe_allow_html=True
-            )
-
-    except ModuleNotFoundError as e:
-        st.error(f"The module '{module_name}' was not found. Please select another module.")
-    except Exception as e:
-        st.error(f"An unexpected error occurred: {str(e)}")
 
-def navigate_question(direction):
-    if direction == "prev" and st.session_state.question_count > 1:
-        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']
-    elif direction == "next" and st.session_state.submitted:
-        st.session_state.current_question = None
+            st.experimental_rerun()