Skip to content
Snippets Groups Projects
Commit 818d106c authored by dsoloha's avatar dsoloha
Browse files

Replaced reminder loop with JS version

parent 413d73e2
No related branches found
No related tags found
1 merge request!5801Reminder system
......@@ -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);
// });
};
......@@ -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>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment