From 68dec18f51079696c75f669215449b4f456a96e5 Mon Sep 17 00:00:00 2001
From: dsoloha <38593903+dsoloha@users.noreply.github.com>
Date: Thu, 16 Jan 2020 13:38:43 -0500
Subject: [PATCH] Formatting and bugfixes
---
src/Mods/Reminder/reminder.js | 12 ++++++------
src/uncategorized/main.tw | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/Mods/Reminder/reminder.js b/src/Mods/Reminder/reminder.js
index a057c135039..e31488f6883 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(`<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)]]`);
}
}
};
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index b3c05a591a5..267fc91c412 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -85,20 +85,20 @@
<br>
<</if>>
<<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")>>:
- <<print $reminders.overdue>>
+ You have <<= numberWithPluralOne($reminders.overdue.length, "overdue reminder")>>:
</span>
- [[View reminders|Manage Personal Affairs]]
+ <<print $reminders.overdue.join('')>>
<br>
<</if>>
<<if $reminders.text.length > 0>>
-
You have <<=numberWithPluralOne($reminders.text.length, "reminder")>>:
- <<print $reminders.text>>
+ <<print $reminders.text.join('')>>
<br>
<</if>>
+<<if $reminders.text.length > 0 || $reminders.overdue.length > 0>>
+ [[Manage reminders|Manage Personal Affairs]]
+<</if>>
<<if $seeFCNN == 1>>
<<if $FCNNstation != 1 && $week >= 90>>
--
GitLab