Cancel break when closing break alert

jouni-kantola · Mar 31, 2024 · c271f96 · c271f96
1 parent 6cb881d
commit c271f96
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/resources/scripts/App.vue b/resources/scripts/App.vue
@@ -1,9 +1,5 @@
 <template>
-    <Alert
-        v-if="information"
-        :message="information"
-        @alertClosed="information = ''"
-    />
+    <Alert v-if="information" :message="information" @alertClosed="endBreak" />
     <Timer
         :minutes="timeRemaining[0]"
         :seconds="timeRemaining[1]"
@@ -134,19 +130,27 @@ async function onEnd() {
 
         await showWindow();
     } else {
-        onBreak.value = false;
-        timer.value = null;
-        resetTimeDisplay();
-
-        const { index } = whosNextAfter(getActiveMember(team).index, team);
-
-        switchActiveMember(index, team);
-        prepareForNextMember();
+        endBreak();
 
         await showWindow();
     }
 }
 
+function endBreak() {
+    information.value = "";
+    onBreak.value = false;
+
+    timer?.value?.reset();
+    timer.value = null;
+
+    resetTimeDisplay();
+
+    const { index } = whosNextAfter(getActiveMember(team).index, team);
+
+    switchActiveMember(index, team);
+    prepareForNextMember();
+}
+
 function onIntervalUpdated(seconds: number) {
     intervalLength.value = seconds;
     timer.value?.change(intervalLength.value);