From fc055d3b94f1615720458975fe867b90cc498b2f Mon Sep 17 00:00:00 2001
From: dsoloha <38593903+dsoloha@users.noreply.github.com>
Date: Thu, 16 Jan 2020 19:23:01 -0500
Subject: [PATCH] Reminder system bugfixes and formatting
---
src/Mods/Reminder/reminder.js | 15 ++++++++-------
src/pregmod/managePersonalAffairs.tw | 8 ++++----
src/uncategorized/main.tw | 6 +++---
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/Mods/Reminder/reminder.js b/src/Mods/Reminder/reminder.js
index b9f289ab090..2327a917aa9 100644
--- a/src/Mods/Reminder/reminder.js
+++ b/src/Mods/Reminder/reminder.js
@@ -1,11 +1,11 @@
App.Reminders.add = function(entry, week) {
if (entry.length > 0 && week.length > 0 && !isNaN(week)) {
- if (week <= 0) {
- V.reminders.overdue.push(`<br> ${entry} [[Clear|Manage Personal Affairs][App.Reminders.remove(${V.reminders.overdue.length}, $reminders.overdue)]]`);
- } else {
- V.reminders.entries.push(entry);
- V.reminders.weeks.push(week);
- V.reminders.text.push(`<br> ${entry} in ${numberWithPlural(week, 'week')} [[Clear|Manage Personal Affairs][App.Reminders.remove(${V.reminders.text.length}, $reminders.text)]]`);
+ if (week <= 0) {
+ V.reminders.overdue.push(`${V.reminders.overdue.length > 0 ? `` : `<br> `}${entry} [[Clear|Manage Personal Affairs][App.Reminders.remove(${V.reminders.overdue.length}, $reminders.overdue)]]`); // yes, I am aware this is hideous, but I haven't found a better way yet
+ } else {
+ V.reminders.entries.push(entry);
+ V.reminders.weeks.push(week);
+ V.reminders.text.push(`${V.reminders.text.length > 0 ? `` : `<br> `}${entry} in ${numberWithPlural(week, 'week')} [[Clear|Manage Personal Affairs][App.Reminders.remove(${V.reminders.text.length}, $reminders.text)]]`);
}
}
};
@@ -18,7 +18,7 @@ App.Reminders.update = function() {
text = [],
overdue = [];
- for (let i = 0; i < entries.length; i++) {
+ for (let i = 0; i < entries.length; i++) { // TODO: add index checking to ensure indexes always line up
weeks[i]--;
if (weeks[i] > 0) {
text.push(`${entries[i]} in ${numberWithPluralOne(weeks[i], 'week')}`);
@@ -29,4 +29,5 @@ App.Reminders.update = function() {
}
}
V.reminders.text = text;
+ V.reminders.overdue = overdue;
};
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index dc15a51bd18..293d8ddd28f 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -220,16 +220,16 @@ Sclera:
<<if $reminders.overdue.length > 0>>
<span class="yellow"> /* TODO: this would be a good place for an "attn" or "attention" class */
- You have <<= numberWithPluralOne($reminders.overdue.length, "overdue reminders")>>:
+ You have <<= numberWithPluralOne($reminders.overdue.length, "overdue reminder")>>:
</span>
- <<print $reminders.overdue.join('')>>
+ <<print $reminders.overdue.join('<br> ')>>
<br>
<</if>>
<<if $reminders.text.length == 0>>
You do not have any upcoming reminders set.
<<else>>
- You have <<=numberWithPluralOne($reminders.text.length, "reminder")>> set:
- <<print $reminders.text.join('')>>
+ You have <<=numberWithPluralOne($reminders.text.length, "upcoming reminder")>> set:
+ <<print $reminders.text.join('<br> ')>>
<</if>>
<br>
Remind me
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 267fc91c412..f659a3f7c6e 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -88,12 +88,12 @@
<span class="yellow"> /* TODO: this would be a good place for an "attn" or "attention" class */
You have <<= numberWithPluralOne($reminders.overdue.length, "overdue reminder")>>:
</span>
- <<print $reminders.overdue.join('')>>
+ <<print $reminders.overdue.join('<br> ')>>
<br>
<</if>>
<<if $reminders.text.length > 0>>
- You have <<=numberWithPluralOne($reminders.text.length, "reminder")>>:
- <<print $reminders.text.join('')>>
+ You have <<=numberWithPluralOne($reminders.text.length, "upcoming reminder")>>:
+ <<print $reminders.text.join('<br> ')>>
<br>
<</if>>
<<if $reminders.text.length > 0 || $reminders.overdue.length > 0>>
--
GitLab