@@ -23,6 +46,10 @@
local_dining {{itemName}}
+ {{else}}
+
+
local_dining No Menu Today
+
{{/each}}
diff --git a/client/Dashboard/dashboard.js b/client/Dashboard/dashboard.js
index ec2c67c..e3467a8 100644
--- a/client/Dashboard/dashboard.js
+++ b/client/Dashboard/dashboard.js
@@ -6,6 +6,7 @@ import { Stores } from "../../imports/api/stores";
import { Menus } from '../../imports/api/menu.js';
import { MenuItems } from '../../imports/api/menuItems.js';
import moment from 'moment';
+import { TaskItems } from "../../imports/api/tasks";
Template.dashboard.onCreated(function() {
@@ -17,6 +18,7 @@ Template.dashboard.onCreated(function() {
this.subscribe("myLocations");
this.subscribe("myMenus");
this.subscribe("todayMenuItems");
+ this.subscribe("myTasks");
});
Template.dashboard.onRendered(function() {
@@ -42,6 +44,10 @@ Template.dashboard.helpers({
locCount: function() {
return Locations.find().count();
},
+ mytaskitems: function() {
+ let today = moment(new Date()).format("MMM DD, YYYY");
+ return TaskItems.find({ isComplete: false, taskDate: today });
+ },
todayMenuItem: function() {
return MenuItems.find({});
},
@@ -78,6 +84,9 @@ Template.dashboard.events({
case "myMenuLink":
FlowRouter.go('/mymenus');
break;
+ case "taskMgmtLink":
+ FlowRouter.go('/taskHome');
+ break;
default:
break;
}
@@ -107,6 +116,10 @@ Template.dashboard.events({
break;
case "menuInfoCard":
FlowRouter.go('/mymenus');
+ break;
+ case "taskInfoCard":
+ FlowRouter.go('/myTasks');
+ break;
default:
break;
}
diff --git a/client/MyTasks/myTasksForm.html b/client/MyTasks/myTasksForm.html
index 3ac47ab..fab1b11 100644
--- a/client/MyTasks/myTasksForm.html
+++ b/client/MyTasks/myTasksForm.html
@@ -14,16 +14,16 @@
diff --git a/client/MyTasks/myTasksFrom.js b/client/MyTasks/myTasksFrom.js
index 664d997..6d0bd00 100644
--- a/client/MyTasks/myTasksFrom.js
+++ b/client/MyTasks/myTasksFrom.js
@@ -6,8 +6,8 @@ Template.myTasksForm.onCreated(function() {
Template.myTasksForm.onRendered(function() {
$('.datepicker').datepicker();
- Session.set("hideComplete", false);
- Session.set("onlyToday", false);
+ Session.set("hideComplete", true);
+ Session.set("onlyToday", true);
});
Template.myTasksForm.helpers({
@@ -38,20 +38,20 @@ Template.myTasksForm.events({
});
}
},
- 'click #hideMyCompletedTasks' (event) {
- let hide = $("#hideMyCompletedTasks").prop('checked');
+ 'click #showMyCompletedTasks' (event) {
+ let hide = $("#showMyCompletedTasks").prop('checked');
if (hide == true) {
- Session.set("hideComplete", true);
- } else {
Session.set("hideComplete", false);
+ } else {
+ Session.set("hideComplete", true);
}
},
- 'click #onlyTodaysTasks' (event) {
- let onlyToday = $("#onlyTodaysTasks").prop('checked');
+ 'click #showAllTasks' (event) {
+ let onlyToday = $("#showAllTasks").prop('checked');
if (onlyToday == true) {
- Session.set("onlyToday", true);
- } else {
Session.set("onlyToday", false);
+ } else {
+ Session.set("onlyToday", true);
}
}
diff --git a/client/MyTasks/myTasksTbl.js b/client/MyTasks/myTasksTbl.js
index 82a0163..79db7e4 100644
--- a/client/MyTasks/myTasksTbl.js
+++ b/client/MyTasks/myTasksTbl.js
@@ -7,8 +7,8 @@ Template.myTasksTbl.onCreated(function() {
Template.myTasksTbl.onRendered(function() {
$('.collapsible').collapsible();
- Session.set("hideComplete", false);
- Session.set("onlyToday", false);
+ Session.set("hideComplete", true);
+ Session.set("onlyToday", true);
});
Template.myTasksTbl.helpers({