Updates

app.py

@@ -171,14 +171,13 @@ st.sidebar.title("Quiz Categories")
 selected_category = st.sidebar.selectbox("Choose a category:", list(modules.keys()))
 
 # Get category description for tooltip
-category_description = modules[selected_category]["description"] if selected_category else ""
+category_description = modules[selected_category]["description"] if selected_category and selected_category in modules else "No description available."
 
 if selected_category:
     module_options = [modules[selected_category][module]["title"] for module in modules[selected_category]]
     selected_module = st.sidebar.radio(
         "Choose a module:", 
-        module_options, 
-        help=modules[selected_category]["modules"][list(modules[selected_category]["modules"].keys())[module_options.index(selected_module)]]["description"]
+        module_options
     )
 
     for module_name, module_data in modules[selected_category].items():
@@ -191,109 +190,89 @@ if selected_category:
     with col1:
         st.markdown(
             f"""
-            <div style="background-color: #333; padding: 10px; border-radius: 5px; margin-top: 20px;" title="{category_description} > {selected_module_data['description']}">
-            <span style='font-size: 18px; color: white;'>{selected_category} > {selected_module_data['title']}</span>
+            <div style="background-color: #333; color: white; padding: 10px; border-radius: 10px;">
+                <h2 style="margin: 0;">{selected_category} > {selected_module}</h2>
+                <p>{selected_module_data['description']}</p>
             </div>
-            """, 
-            unsafe_allow_html=True
+            """, unsafe_allow_html=True
         )
-    
     with col2:
-        # Add some spacing above the button by placing it inside an empty container
-        st.markdown("<div style='margin-top: 25px;'></div>", unsafe_allow_html=True)  # Increased margin by 5px
-        # Show PDF report button, initially disabled until a question is answered
-        pdf_disabled = len(st.session_state.questions) == 0
-        if st.session_state.pdf_data:
+        if st.button("Download PDF Report", key="download_pdf"):
+            st.session_state.pdf_data = generate_pdf_report()
             st.download_button(
-                label="Quiz Report",
+                label="Download PDF Report",
                 data=st.session_state.pdf_data,
-                file_name="quiz_report.pdf",
-                mime="application/pdf",
-                disabled=False,
-                key="pdf_download_button"
+                file_name=f"quiz_report_{st.session_state.session_id}.pdf",
+                mime="application/pdf"
             )
 
-    if selected_module != st.session_state.current_module:
-        st.session_state.current_module = selected_module
-        st.session_state.current_index = len(st.session_state.questions)  # Continue numbering from previous questions
-        st.session_state.selected_answer = None
-        st.session_state.button_label = "Submit/New"
-        st.session_state.start_time = time.time()  # Start the timer for the new question
-        # Initialize question count and correct count if not already done
-        if selected_module not in st.session_state.module_question_count:
-            st.session_state.module_question_count[selected_module] = 0
-        if selected_module not in st.session_state.module_correct_count:
-            st.session_state.module_correct_count[selected_module] = 0
-        # Generate a new question without adding it to the answered list yet
-        st.session_state.current_question = generate_new_question(selected_category, selected_module, selected_module_data)
-
-current_question = st.session_state.current_question
-
-# Display the current question inside the options box
-with st.form(key=f'question_form_{st.session_state.current_index}'):
-    options = ['a', 'b', 'c', 'd']
-    st.markdown(f"<b>Q{st.session_state.current_index + 1}: {current_question['question']}</b>", unsafe_allow_html=True)
-    selected_answer = st.radio(
-        "",  # Empty label to put the question inside the options box
-        options=[f"{options[i]}. {opt}" for i, opt in enumerate(current_question['options'])], 
-        key=f"question_{st.session_state.current_index}_options",
-        index=None,
-    )
-    
-    submit_button = st.form_submit_button(label="Submit/New")
-
-# Handle button state and answer submission
-if submit_button:
-    if selected_answer is None:
-        st.warning("Please select an option before submitting.", icon="⚠️")
-    else:
-        # Calculate time taken to answer the question
-        current_question['time_taken'] = int(time.time() - st.session_state.start_time)
-
-        # Process the answer
-        selected_answer_text = selected_answer.split(". ", 1)[1]  # Extract the text part
-        current_question['selected'] = selected_answer_text
-        current_question['answered'] = True
-        st.session_state.module_question_count[selected_module] += 1
-
-        if selected_answer_text == current_question['correct_answer']:
-            st.session_state.correct_count += 1
-            st.session_state.module_correct_count[selected_module] += 1
+    if selected_module_data:
+        if st.button(st.session_state.button_label):
+            if st.session_state.button_label == "Submit":
+                if st.session_state.selected_answer is not None:
+                    question = st.session_state.questions[st.session_state.current_index]
+                    question['answered'] = True
+                    if st.session_state.selected_answer == question['correct_answer']:
+                        st.session_state.correct_count += 1
+                        st.session_state.module_correct_count[selected_module] = st.session_state.module_correct_count.get(selected_module, 0) + 1
+                    else:
+                        st.session_state.module_correct_count[selected_module] = st.session_state.module_correct_count.get(selected_module, 0)
+                    
+                    st.session_state.questions[st.session_state.current_index] = question
+                    st.session_state.current_index += 1
+                    st.session_state.selected_answer = None
+                    st.session_state.button_label = "Next Question"
+                    st.session_state.pdf_data = None  # Reset PDF cache when moving to the next question
+                else:
+                    st.warning("Please select an answer before submitting.")
+            elif st.session_state.button_label == "Next Question":
+                if st.session_state.current_index < len(st.session_state.questions):
+                    question = st.session_state.questions[st.session_state.current_index]
+                    st.session_state.selected_answer = None
+                    st.session_state.button_label = "Submit"
+                else:
+                    st.session_state.button_label = "Submit/New"
+                    st.session_state.current_index = 0
+                    st.session_state.questions = []
+                    st.session_state.correct_count = 0
+                    st.session_state.module_correct_count = {}
+                    st.session_state.pdf_data = generate_pdf_report()
+                    
+            st.experimental_rerun()
 
-        # Show correct/incorrect feedback, explanation, and step-by-step solution
-        col1, col2 = st.columns(2)
-        with col1:
-            for i, option in enumerate(current_question['options']):
+        if st.session_state.questions:
+            question = st.session_state.questions[st.session_state.current_index]
+            st.write(f"**Q{st.session_state.current_index + 1}:** {question['question']}")
+            options = ['a', 'b', 'c', 'd']
+            for i, option in enumerate(question['options']):
+                is_selected = st.session_state.selected_answer == options[i]
                 option_text = f"{options[i]}. {option}"
-                if option == current_question['correct_answer']:
-                    st.markdown(f"<span style='color:green;'>{option_text} ✅</span>", unsafe_allow_html=True)
-                elif option == selected_answer_text:
-                    st.markdown(f"<span style='color:red;'>{option_text} ❌</span>", unsafe_allow_html=True)
+                if question['answered']:
+                    if options[i] == question['correct_answer']:
+                        st.markdown(f"<p style='color: green;'>{option_text}</p>", unsafe_allow_html=True)
+                    elif is_selected:
+                        st.markdown(f"<p style='color: red;'>{option_text}</p>", unsafe_allow_html=True)
+                    else:
+                        st.markdown(f"<p>{option_text}</p>", unsafe_allow_html=True)
                 else:
-                    st.markdown(f"{option_text}", unsafe_allow_html=True)
-        
-        with col2:
-            st.markdown(f"<span style='font-size: 14px;'><b>Explanation:</b> {current_question['explanation']}</span>", unsafe_allow_html=True)
-            st.markdown(f"<span style='font-size: 14px;'><b>Step-by-Step Solution:</b></span>", unsafe_allow_html=True)
-            for step in current_question['step_by_step_solution']:
-                st.markdown(f"<span style='font-size: 14px;'>{step}</span>", unsafe_allow_html=True)
-
-        # Add the question to the answered list only after submission
-        st.session_state.questions.append(current_question)
-        st.session_state.current_index = len(st.session_state.questions)
-
-        # Generate the PDF report data after each submission
-        st.session_state.pdf_data = generate_pdf_report()
+                    if is_selected:
+                        st.markdown(f"<p style='color: blue;'>{option_text}</p>", unsafe_allow_html=True)
+                    else:
+                        st.markdown(f"<p>{option_text}</p>", unsafe_allow_html=True)
+                
+                if not question['answered']:
+                    if st.radio("Options", options, key=question['question'], index=options.index(st.session_state.selected_answer) if st.session_state.selected_answer else -1) == options[i]:
+                        st.session_state.selected_answer = options[i]
+        else:
+            st.write("No questions available.")
+else:
+    st.write("Please select a category and module.")
 
-        # Refresh the PDF button state
-        st.download_button(
-            label="Quiz Report",
-            data=st.session_state.pdf_data,
-            file_name="quiz_report.pdf",
-            mime="application/pdf",
-            disabled=False,
-            key="pdf_download_button_updated"
-        )
-
-        # Generate a new question for the next round
-        st.session_state.current_question = generate_new_question(selected_category, selected_module, selected_module_data)
+# Footer
+st.markdown(
+    """
+    <div style='text-align: center; color: grey; font-size: 12px;'>
+        <p>By Ghassem Tofighi</p>
+    </div>
+    """, unsafe_allow_html=True
+)