diff --git a/client/Dashboard/dashboard.html b/client/Dashboard/dashboard.html index 6d3785d..d61e0f9 100644 --- a/client/Dashboard/dashboard.html +++ b/client/Dashboard/dashboard.html @@ -21,12 +21,7 @@

{{todayDate}}

{{#each todayMenuItem}}
-

local_dining{{itemName}}

-
- {{#each nextDays}} -

Tomorrow - {{itemName}}

- {{/each}} -
+

local_dining {{itemName}}

{{/each}} diff --git a/client/Dashboard/dashboard.js b/client/Dashboard/dashboard.js index a1c3ee0..ec2c67c 100644 --- a/client/Dashboard/dashboard.js +++ b/client/Dashboard/dashboard.js @@ -47,15 +47,9 @@ Template.dashboard.helpers({ }, todayDate: function() { let now = new Date(); - let todayDate = moment(now).format("MMM D, YYYY"); + let todayDate = moment(now).format("MMM DD, YYYY"); return todayDate; }, - nextDays: function() { - let now = new Date(); - let nowDate = moment(now).add(1, 'day').format("MM D, YYYY"); - console.log("nowDate = " + nowDate); - return MenuItems.find({ serveDate: nowDate }); - } }); Template.dashboard.events({ diff --git a/server/publish.js b/server/publish.js index 6dd5caa..9efef1f 100644 --- a/server/publish.js +++ b/server/publish.js @@ -90,8 +90,8 @@ Meteor.publish("myMenuItems", function(menuId) { Meteor.publish("todayMenuItems", function() { try { let todayDate = new Date(); - let todaysDate = moment(todayDate).format("MMM D, YYYY"); - return MenuItems.find({ serveDate: todaysDate }); + let todaysDate = moment(todayDate).format("MMM DD, YYYY"); + return MenuItems.find({ serveDate: todaysDate, itemMade: false }); } catch (error) { console.log(" ERROR pulling today's menu items: " + error); }