Merge branch 'main' into stop-stopwatch-run

src/components/questions/buzzer/BuzzerScoreboardButtons.vue

@@ -35,6 +35,10 @@ const props = defineProps<{
   controller: IController;
 }>();
 
+const emit = defineEmits<{
+  (e: 'update', correct: boolean | undefined, points: number | undefined): void;
+}>();
+
 const audioCorrect = new Audio('sounds/answer-correct.mp3');
 const audioWrong = new Audio('sounds/answer-wrong.mp3');
 
@@ -54,6 +58,7 @@ const onAnswerChange = (answer: boolean) => {
   if (answerCorrect.value === answer) {
     answerCorrect.value = undefined;
     updateScoreboard(points * -1);
+    emit('update', undefined, undefined);
     return;
   }
 
@@ -67,6 +72,7 @@ const onAnswerChange = (answer: boolean) => {
 
   answerCorrect.value = answer;
   updateScoreboard(points);
+  emit('update', answer, points);
 
   playAudio(answer);
 };

src/pages/questions/BuzzerQuestionPage.vue

@@ -24,6 +24,7 @@
               <count-down
                 v-if="buzzerSettings.answerTime > 0"
                 v-model="gameState.time"
+                :paused="gameState.correct !== undefined"
                 :beep="soundsEnabled"
                 :beep-start-time="buzzerSettings.countDownBeepStartAt"
                 :style="countDownStyle"
@@ -80,6 +81,7 @@
           <buzzer-scoreboard-buttons
             v-if="showScoreboardActions"
             :controller="gameState.controller"
+            @update="onScored"
           />
 
           <div class="q-pt-md">
@@ -299,6 +301,22 @@ const listener = (event: ButtonEvent) => {
   event.controller.setLight(true);
 };
 
+const onScored = (correct: boolean | undefined, points: number | undefined) => {
+  if (gameState.value.name !== 'answering') {
+    return;
+  }
+
+  gameState.value = {
+    game: 'buzzer',
+    name: 'answering',
+    time: gameState.value.time,
+    controller: gameState.value.controller,
+    disabledControllerIds: gameState.value.disabledControllerIds,
+    correct,
+    points,
+  };
+};
+
 const continueQuestion = () => {
   if (gameState.value.name !== 'answering') {
     return;