From a7a745e04f2c0dd779a177fa483fa023aaa7b0b0 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Mon, 10 Feb 2020 12:00:16 +0100
Subject: [PATCH] cleaning task manager

---
 pages/add/_edit.vue   |  1 -
 plugins/filters.js    |  2 +-
 server/taskManager.js | 10 +++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index 672d1fe2..5ad5a4d8 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -139,7 +139,6 @@ export default {
 
       data.time.start = moment.unix(event.start_datetime).format('HH:mm')
       data.time.end = moment.unix(event.end_datetime).format('HH:mm')
-      data.date = [moment.unix(event.start_datetime).toDate()]
       data.event.title = event.title
       data.event.description = event.description
       data.event.id = event.id
diff --git a/plugins/filters.js b/plugins/filters.js
index 8b4b9681..c7c7a3b9 100644
--- a/plugins/filters.js
+++ b/plugins/filters.js
@@ -28,7 +28,7 @@ export default ({ app, store }) => {
     if (event.parent && where !== 'home') {
       const { frequency, days, type } = event.parent.recurrent
       if (frequency === '1w' || frequency === '2w') {
-        const recurrent = app.i18n.tc(`event.recurrent_${frequency}_days`, days.length, { days: days.map(d => moment().day(d).format('dddd')) })
+        const recurrent = app.i18n.tc(`event.recurrent_${frequency}_days`, days.length, { days: days.map(d => moment().day(d - 1).format('dddd')) })
         return `${normal} - ${recurrent}`
       } else if (frequency === '1m' || frequency === '2m') {
         const d = type === 'ordinal' ? days : days.map(d => moment().day(d - 1).format('dddd'))
diff --git a/server/taskManager.js b/server/taskManager.js
index a9eeda8c..30ec7d2a 100644
--- a/server/taskManager.js
+++ b/server/taskManager.js
@@ -67,10 +67,14 @@ class TaskManager {
     if (!this.tasks.length) {
       return
     }
-    const removableTasks = this.tasks.filter(t => t.removable).map(t => t.process())
-    this.tasks = this.tasks.filter(t => !t.removable)
+
+    // process all tasks
     const tasks = this.tasks.map(t => t.process())
-    return Promise.all(tasks.concat(removableTasks))
+
+    // remove removable tasks
+    this.tasks = this.tasks.filter(t => !t.removable)
+
+    return Promise.all(tasks)
   }
 
   async tick () {