From 16a3e39f84f92b7f10f9866518bf26bc81af6f79 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 4 May 2021 21:04:17 -0400
Subject: [PATCH] Allow "ok" to force endweek.
---
src/endWeek/endWeek.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/endWeek/endWeek.js b/src/endWeek/endWeek.js
index 37d62b47df7..89bc0b634c6 100644
--- a/src/endWeek/endWeek.js
+++ b/src/endWeek/endWeek.js
@@ -305,9 +305,10 @@ globalThis.endWeek = (function() {
function confirmEndWeek() {
const expiredReminders = V.reminders.filter(r => r.week <= V.week);
- if (expiredReminders.length > 0) {
- confirm(`These reminders are due: ${toSentence(Array.from(expiredReminders, r => r.message))}`);
- } else if (!V.sideBarOptions.confirmWeekEnd || confirm("Are you sure you want to end the week?")) {
+ if (
+ (!V.sideBarOptions.confirmWeekEnd || confirm("Are you sure you want to end the week?")) &&
+ (expiredReminders.length === 0 || confirm(`These reminders are due: ${toSentence(Array.from(expiredReminders, r => r.message))}. End the week anyway?`))
+ ) {
App.UI.EndWeekAnim.start();
setTimeout(doEndWeek, 0); // execute immediately, but after the event loop runs, so the loading screen gets shown
}
--
GitLab