exclude expired tasks from date filters

HectorVilas · Jan 14, 2023 · 9a431ae · 9a431ae
1 parent 8027199
commit 9a431ae
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/modules/todoHandler.js b/src/modules/todoHandler.js
@@ -147,7 +147,8 @@ export const todoHandler = (() => {
       const filtered = { title: "Tasks for this week", todos: []};
       local.forEach((thisProject, projectIdx) => thisProject.todos.forEach((thisTodo, todoIdx) => {
         const formatDate = thisTodo.dateDue.split("-").join(",");
-        if(isThisWeek(new Date(formatDate))){
+        if(isFuture(new Date(formatDate))
+        &&isThisWeek(new Date(formatDate))){
           thisTodo.projectIdx = projectIdx;
           thisTodo.todoIdx = todoIdx;
           filtered.todos.push(thisTodo);
@@ -160,7 +161,8 @@ export const todoHandler = (() => {
       const filtered = { title: "Tasks for this month", todos: []};
       local.forEach((thisProject, projectIdx) => thisProject.todos.forEach((thisTodo, todoIdx) => {
         const formatDate = thisTodo.dateDue.split("-").join(",");
-        if(isThisMonth(new Date(formatDate))){
+        if(isFuture(new Date(formatDate))
+        &&isThisMonth(new Date(formatDate))){
           thisTodo.projectIdx = projectIdx;
           thisTodo.todoIdx = todoIdx;
           filtered.todos.push(thisTodo);
@@ -174,7 +176,8 @@ export const todoHandler = (() => {
 
       local.forEach((thisProject, projectIdx) => thisProject.todos.forEach((thisTodo, todoIdx) => {
         const formatDate = thisTodo.dateDue.split("-").join(",");
-        if(isThisYear(new Date(formatDate))){
+        if(isFuture(new Date(formatDate))
+        &&isThisYear(new Date(formatDate))){
           thisTodo.projectIdx = projectIdx;
           thisTodo.todoIdx = todoIdx;
           filtered.todos.push(thisTodo);