From cf715c9dbfb34e01ff4ca64c332dc20462abe482 Mon Sep 17 00:00:00 2001
From: Brian McGonagill <bmcgonag@gmail.com>
Date: Fri, 16 Sep 2022 16:19:53 -0500
Subject: [PATCH] Updating tasks to show incomplete, overdue items

---
 .../{myTasksFrom.js => myTasksForm.js}        |  2 +-
 client/MyTasks/myTasksTbl.html                |  2 +-
 client/MyTasks/myTasksTbl.js                  |  6 ++--
 imports/api/tasks.js                          | 31 +++++++++++++++++++
 4 files changed, 37 insertions(+), 4 deletions(-)
 rename client/MyTasks/{myTasksFrom.js => myTasksForm.js} (93%)

diff --git a/client/MyTasks/myTasksFrom.js b/client/MyTasks/myTasksForm.js
similarity index 93%
rename from client/MyTasks/myTasksFrom.js
rename to client/MyTasks/myTasksForm.js
index 6d0bd00..ada0dcc 100644
--- a/client/MyTasks/myTasksFrom.js
+++ b/client/MyTasks/myTasksForm.js
@@ -26,7 +26,7 @@ Template.myTasksForm.events({
             showSnackbar("Task Name and Date are Required!", "red");
             return;
         } else {
-            Meteor.call("add.task", taskName, "self", "selfId", taskDate, actDate, function(err, result) {
+            Meteor.call("add.mytask", taskName, "self", "selfId", taskDate, actDate, function(err, result) {
                 if (err) {
                     console.log("    ERROR adding task for self: " + err);
                     showSnackbar("ERROR adding task for self!", "red");
diff --git a/client/MyTasks/myTasksTbl.html b/client/MyTasks/myTasksTbl.html
index 7d29b0e..e9142ca 100644
--- a/client/MyTasks/myTasksTbl.html
+++ b/client/MyTasks/myTasksTbl.html
@@ -2,7 +2,7 @@
     <ul class="collapsible">
         {{#each tasks}}
         <li>
-            <div class="collapsible-header {{#if $eq passedDate false}}yellow{{/if}}{{#if $eq isComplete true}}green lighten-2{{/if}}"><h5>{{taskName}}</h5></div>
+            <div class="collapsible-header {{#if $eq passedDate false}}yellow{{/if}}{{#if $eq isComplete true}}green lighten-2{{/if}}"><h5>{{taskName}} </h5></div>
             <div class="collapsible-body">
                 <span>
                     <ul class="collection">
diff --git a/client/MyTasks/myTasksTbl.js b/client/MyTasks/myTasksTbl.js
index 79db7e4..e54635f 100644
--- a/client/MyTasks/myTasksTbl.js
+++ b/client/MyTasks/myTasksTbl.js
@@ -19,7 +19,8 @@ Template.myTasksTbl.helpers({
         if (hide == true && onlyToday == false) {
             return TaskItems.find({ isComplete: false }, { sort: { actualDate: 1 }});
         } else if (hide == true && onlyToday == true) {
-            return TaskItems.find({ isComplete: false, taskDate: todayIs }, { sort: { actualDate: 1 }});
+            // return TaskItems.find({ isComplete: false, taskDate: todayIs }, { sort: { actualDate: 1 }});
+            return TaskItems.find({ isComplete: false, actualDate: { $lte: new Date()}}, { sort:{ actualDate: 1 }});
         } else if (hide == false && onlyToday == true) {
             return TaskItems.find({ taskDate: todayIs }, { sort: { actualDate: 1 }});
         } else {
@@ -29,7 +30,8 @@ Template.myTasksTbl.helpers({
     passedDate: function() {
         let taskDate = new Date(this.taskDate);
         let now = new Date()
-        let diff = now < taskDate;
+        now.setHours(0,0,0,0);
+        let diff = now <= taskDate;
         let comp = this.isComplete;
         if (diff == false && comp == false) {
             return false;
diff --git a/imports/api/tasks.js b/imports/api/tasks.js
index 987c9a6..e5963f1 100644
--- a/imports/api/tasks.js
+++ b/imports/api/tasks.js
@@ -49,6 +49,37 @@ Meteor.methods({
             }
         }
     },
+    'add.mytask' (taskName, assignedTo, assignedToId, taskDate, actDate) {
+        check(taskName, String);
+        check(taskDate, String);
+        check(actDate, Date);
+
+        if (!this.userId) {
+            throw new Meteor.Error('You are not allowed to add tasks. Make sure you are logged in with valid user credentials.');
+        }
+
+        let username;
+
+        if (assignedTo == "self") {
+            let userInfo = Meteor.users.findOne({ _id: this.userId });
+            username = userInfo.profile.fullname;
+            assignedToId = this.userId;
+        } else {
+            username = assignedTo;
+        }
+
+        return TaskItems.insert({
+            taskName: taskName,
+            taskDate: taskDate,
+            actualDate: actDate,
+            assignedTo: username,
+            assignedToId: assignedToId,
+            isComplete: false,
+            completedOn: null,
+            assignedOn: new Date(),
+            assignedBy: this.userId,
+        });
+    },
     'edit.task' (taskId, taskName, assignedTo, taskDate) {
         check(taskId, String);
         check(taskName, String);