Update app.py

app.py

@@ -65,6 +65,7 @@ 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(index, answer, score, incorrect_questions):
     data = load_mocktest()
     correct_answer = data[index]["correct-answer"]
@@ -76,17 +77,12 @@ def handle_answer(index, answer, score, incorrect_questions):
     
     index += 1
     if index >= len(data):
-        # Join the incorrect questions list into a string
-        if incorrect_questions:
-            incorrect_str = "Questions to review:\n\n" + "\n\n".join(incorrect_questions)
-        else:
-            incorrect_str = "No questions to review."
-        
-        return gr.update(visible=False), f"Your score: {score}/{len(data)}\n\n{incorrect_str}", gr.update(visible=True)
+        incorrect_str = "Questions to review:\n\n" + "\n\n".join(incorrect_questions) if incorrect_questions else "No questions to review."
+        result = f"Your score: {score}/{len(data)}\n\n{incorrect_str}"
+        return gr.update(visible=False), result, gr.update(visible=True), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), score, incorrect_questions
     
     question, ans1, ans2, ans3, ans4, correct = display_mock_question(index, score, incorrect_questions)
-    return question, ans1, ans2, ans3, ans4, score, incorrect_questions, gr.update(visible=True)
-
+    return gr.update(value=question), ans1, ans2, ans3, ans4, gr.update(visible=False), gr.update(visible=False), score, incorrect_questions
 
 # Function to restart the test
 def restart_test():
@@ -129,10 +125,12 @@ with gr.Blocks() as demo:
             incorrect_questions = gr.State([])
 
             question_output = gr.Markdown(label="Question")
-            answer_1 = gr.Button("Answer 1")
-            answer_2 = gr.Button("Answer 2")
-            answer_3 = gr.Button("Answer 3")
-            answer_4 = gr.Button("Answer 4")
+            with gr.Row():
+                answer_1 = gr.Button("Answer 1")
+                answer_2 = gr.Button("Answer 2")
+            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)
@@ -141,13 +139,14 @@ with gr.Blocks() as demo:
             demo.load(display_mock_question, inputs=[mock_index, score, incorrect_questions], outputs=[question_output, answer_1, answer_2, answer_3, answer_4])
 
             # Handle answer selection
-            answer_1.click(handle_answer, inputs=[mock_index, answer_1, score, incorrect_questions], outputs=[question_output, answer_1, answer_2, answer_3, answer_4, score, incorrect_questions, result_output])
-            answer_2.click(handle_answer, inputs=[mock_index, answer_2, score, incorrect_questions], outputs=[question_output, answer_1, answer_2, answer_3, answer_4, score, incorrect_questions, result_output])
-            answer_3.click(handle_answer, inputs=[mock_index, answer_3, score, incorrect_questions], outputs=[question_output, answer_1, answer_2, answer_3, answer_4, score, incorrect_questions, result_output])
-            answer_4.click(handle_answer, inputs=[mock_index, answer_4, score, incorrect_questions], outputs=[question_output, answer_1, answer_2, answer_3, answer_4, score, incorrect_questions, result_output])
+            for answer_btn in [answer_1, answer_2, answer_3, answer_4]:
+                answer_btn.click(
+                    handle_answer, 
+                    inputs=[mock_index, answer_btn, score, incorrect_questions], 
+                    outputs=[question_output, answer_1, answer_2, answer_3, answer_4, result_output, restart_button, score, incorrect_questions]
+                )
 
             # Restart test button
             restart_button.click(restart_test, inputs=[], outputs=[mock_index, score, incorrect_questions, question_output, answer_1, answer_2, answer_3, answer_4, result_output, restart_button])
-
 # Launch the app
 demo.launch()