Update app.py

app.py

@@ -51,7 +51,6 @@ def load_mocktest():
     except FileNotFoundError:
         return None
 
-# Function to display the mock test question and answers
 def display_mock_question(index, score, incorrect_questions):
     data = load_mocktest()
     if not data:
@@ -65,44 +64,46 @@ def display_mock_question(index, score, incorrect_questions):
     
     return question, all_answers[0], all_answers[1], all_answers[2], all_answers[3], correct_answer
 
-
-def handle_answer(answer, mock_index, score, question_answers):
+def handle_answer(answer, mock_index, score, incorrect_questions):
     data = load_mocktest()
     correct_answer = data[mock_index]["correct-answer"]
     current_question = data[mock_index]["question"]
     
     if answer == correct_answer:
         score += 1
-    
-    question_answers.append((current_question, correct_answer))
+    else:
+        incorrect_questions.append((current_question, correct_answer))
     
     mock_index += 1
     if mock_index >= len(data):
-        result = generate_test_result(score, len(data), question_answers)
-        return gr.update(value=result), gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), mock_index, score, question_answers
+        result = generate_test_result(score, len(data), incorrect_questions)
+        return gr.update(value=result), gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), mock_index, score, incorrect_questions
     
-    return gr.update(), gr.update(visible=False), gr.update(), gr.update(), gr.update(), gr.update(), mock_index, score, question_answers
-
-def generate_test_result(score, total_questions, question_answers):
-    result = f"Your score: {score}/{total_questions}\n\n"
-    result += "Questions and Correct Answers:\n\n"
-    for i, (question, answer) in enumerate(question_answers, 1):
-        result += f"{i}. Question: {question}\n   Correct Answer: {answer}\n\n"
+    return gr.update(), gr.update(visible=False), gr.update(), gr.update(), gr.update(), gr.update(), mock_index, score, incorrect_questions
+
+def generate_test_result(score, total_questions, incorrect_questions):
+    percentage = (score / total_questions) * 100
+    result = f"Your score: {score}/{total_questions} ({percentage:.2f}%)\n\n"
+    if incorrect_questions:
+        result += "Incorrect Questions and Correct Answers:\n\n"
+        for i, (question, answer) in enumerate(incorrect_questions, 1):
+            result += f"{i}. Question: {question}\n   Correct Answer: {answer}\n\n"
+    else:
+        result += "Congratulations! You answered all questions correctly."
     return result
 
 def restart_test():
     return 0, 0, [], gr.update(value=""), gr.update(value="", visible=True), gr.update(value="", visible=True), gr.update(value="", visible=True), gr.update(value="", visible=True), gr.update(value="", visible=False), gr.update(visible=False)
 
-def update_question(mock_index, score, question_answers):
+def update_question(mock_index, score, incorrect_questions):
     data = load_mocktest()
     if mock_index >= len(data):
-        result = generate_test_result(score, len(data), question_answers)
+        result = generate_test_result(score, len(data), incorrect_questions)
         return gr.update(value=result), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
     
-    question, ans1, ans2, ans3, ans4, correct = display_mock_question(mock_index, score, question_answers)
+    question, ans1, ans2, ans3, ans4, correct = display_mock_question(mock_index, score, incorrect_questions)
     return gr.update(value=question), gr.update(value=ans1, visible=True), gr.update(value=ans2, visible=True), gr.update(value=ans3, visible=True), gr.update(value=ans4, visible=True)
 
-
 # Gradio interface
 with gr.Blocks() as demo:
     available_weeks = get_available_weeks()
@@ -136,8 +137,8 @@ with gr.Blocks() as demo:
         with gr.TabItem("Mock Test"):
             mock_index = gr.State(0)
             score = gr.State(0)
-            question_answers = gr.State([])
-
+            incorrect_questions = gr.State([])
+    
             question_output = gr.Markdown(label="Question")
             with gr.Row():
                 answer_1 = gr.Button("Answer 1")
@@ -145,33 +146,33 @@ with gr.Blocks() as demo:
             with gr.Row():
                 answer_3 = gr.Button("Answer 3")
                 answer_4 = gr.Button("Answer 4")
-
+    
             result_output = gr.Markdown(visible=False)
             restart_button = gr.Button("Restart Test", visible=False)
             
             # Initialize the first question
-            demo.load(update_question, inputs=[mock_index, score, question_answers], outputs=[question_output, answer_1, answer_2, answer_3, answer_4])
-
+            demo.load(update_question, inputs=[mock_index, score, incorrect_questions], outputs=[question_output, answer_1, answer_2, answer_3, answer_4])
+    
             # Handle answer selection
             for answer_btn in [answer_1, answer_2, answer_3, answer_4]:
                 answer_btn.click(
                     handle_answer, 
-                    inputs=[answer_btn, mock_index, score, question_answers],
-                    outputs=[question_output, restart_button, answer_1, answer_2, answer_3, answer_4, mock_index, score, question_answers]
+                    inputs=[answer_btn, mock_index, score, incorrect_questions],
+                    outputs=[question_output, restart_button, answer_1, answer_2, answer_3, answer_4, mock_index, score, incorrect_questions]
                 ).then(
                     update_question,
-                    inputs=[mock_index, score, question_answers],
+                    inputs=[mock_index, score, incorrect_questions],
                     outputs=[question_output, answer_1, answer_2, answer_3, answer_4]
                 )
-
+    
             # Restart test button
             restart_button.click(
                 restart_test, 
                 inputs=[], 
-                outputs=[mock_index, score, question_answers, question_output, answer_1, answer_2, answer_3, answer_4, result_output, restart_button]
+                outputs=[mock_index, score, incorrect_questions, question_output, answer_1, answer_2, answer_3, answer_4, result_output, restart_button]
             ).then(
                 update_question,
-                inputs=[mock_index, score, question_answers],
+                inputs=[mock_index, score, incorrect_questions],
                 outputs=[question_output, answer_1, answer_2, answer_3, answer_4]
             )