From 818d106c19a61cfad337e7f6d9da536d2423531d Mon Sep 17 00:00:00 2001
From: dsoloha <38593903+dsoloha@users.noreply.github.com>
Date: Mon, 13 Jan 2020 19:19:32 -0500
Subject: [PATCH] Replaced reminder loop with JS version
---
src/Mods/Reminder/reminder.js | 8 ++++----
src/uncategorized/endWeek.tw | 12 +-----------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/src/Mods/Reminder/reminder.js b/src/Mods/Reminder/reminder.js
index 5e30748fdf1..a7fbd857072 100644
--- a/src/Mods/Reminder/reminder.js
+++ b/src/Mods/Reminder/reminder.js
@@ -9,9 +9,8 @@ App.Reminders.add = function(entry, week) {
App.Reminders.update = function() {
let entries = V.reminders.entries,
weeks = V.reminders.weeks,
- text = V.reminders.text;
+ text = [];
- text = [];
for (let i = 0; i < entries.length; i++) {
weeks[i]--;
if (weeks[i] > 0) {
@@ -21,9 +20,10 @@ App.Reminders.update = function() {
weeks.splice(i, 1);
}
}
+ V.reminders.text = text;
- // reminders.entries.forEach((weeks, index) => { // 2 sec
+ // entries.forEach((week, index) => {
// weeks[index]--;
- // weeks[index] > 0 ? text.push(`${entries[i]} in ${weeks[i]} ${numberWithPlural(weeks[i], 'week')}`) : entries.splice(i, 1); weeks.splice(i, 1);
+ // week[index] > 0 ? text.push(`${entries[i]} in ${week[i]} ${numberWithPlural(week[i], 'week')}`) : entries.splice(i, 1); week.splice(i, 1);
// });
};
diff --git a/src/uncategorized/endWeek.tw b/src/uncategorized/endWeek.tw
index 67477d682fb..bb42d234b12 100644
--- a/src/uncategorized/endWeek.tw
+++ b/src/uncategorized/endWeek.tw
@@ -44,17 +44,7 @@
})>>
<<if $reminders.text.length > 0>>
- <<set $reminders.text = []>>
- <<for _i = 0; _i < $reminders.entries.length; _i++>>
- <<set $reminders.weeks[_i]-->>
- <<if $reminders.weeks[_i] > 0>>
- <<set $reminders.text.push(`${$reminders.entries[_i]} in ${$reminders.weeks[_i]} ${numberWithPlural($reminders.weeks[_i], 'week')}`)>>
- <<else>>
- <<set $reminders.entries.deleteAt($reminders.entries[_i])>>
- <<set $reminders.weeks.deleteAt($reminders.weeks[_i])>>
- <</if>>
- <</for>>
- /*<<run App.Reminders.update()>>*/
+ <<run App.Reminders.update()>>
<</if>>
<<if $organs.length > 0>>
--
GitLab