From 2ce249934730e3d9ce909bbfbccbb93e8df9f4c2 Mon Sep 17 00:00:00 2001
From: Brian McGonagill <bmcgonag@gmail.com>
Date: Tue, 30 Aug 2022 16:17:53 -0500
Subject: [PATCH] Updating dashboard view, and fixing an issue with menu
 completion.

---
 client/Dashboard/dashboard.html | 37 ++++++++++++++++++---------------
 client/Dashboard/dashboard.js   |  6 ++++++
 client/Menus/mainMenuTbl.js     |  7 +++++++
 imports/api/menuItems.js        | 15 +++++++++++++
 4 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/client/Dashboard/dashboard.html b/client/Dashboard/dashboard.html
index f9408dc..6d3785d 100644
--- a/client/Dashboard/dashboard.html
+++ b/client/Dashboard/dashboard.html
@@ -1,22 +1,6 @@
 <template name="dashboard">
     <h4>My Dashboard</h4>
     <div class="row">
-        {{#if isInRole 'systemadmin'}}
-        <div class="col s12 m6 l4">
-            <div class="card blue-grey darken-1" id="userInfoCard">
-                <div class="card-content white-text">
-                <span class="card-title"><h4>Users</h4></span>
-                    <div class="row">
-                        <div class="col s8"><i class="medium material-icons">person</i></div>
-                        <div class="col s4"><h2>{{userCount}}</h2></div>
-                    </div>
-                </div>
-                <div class="card-action">
-                    <a href="#" class="cardLink" id="userMgmtLink">User Management</a>
-                </div>
-            </div>
-        </div>
-        {{/if}}
         <div class="col s12 m6 l4">
             <div class="card blue-grey darken-1" id="listInfoCard">
                 <div class="card-content white-text">
@@ -37,7 +21,12 @@
                 <span class="card-title"><h4>{{todayDate}}</h4></span>
                 {{#each todayMenuItem}}
                     <div class="row">
-                        <div class="col s12"><h3><i class="medium material-icons">local_dining</i>{{itemName}}</h3></div>
+                        <div class="col s6"><h3><i class="medium material-icons">local_dining</i>{{itemName}}</h3></div>
+                        <div class="col s6">
+                            {{#each nextDays}}
+                                <p class="flow-text">Tomorrow - {{itemName}}</p>
+                            {{/each}}
+                        </div>
                     </div>
                 {{/each}}
                 </div>
@@ -47,6 +36,20 @@
             </div>
         </div>
         {{#if isInRole 'systemadmin'}}
+        <div class="col s12 m6 l4">
+            <div class="card blue-grey darken-1" id="userInfoCard">
+                <div class="card-content white-text">
+                <span class="card-title"><h4>Users</h4></span>
+                    <div class="row">
+                        <div class="col s8"><i class="medium material-icons">person</i></div>
+                        <div class="col s4"><h2>{{userCount}}</h2></div>
+                    </div>
+                </div>
+                <div class="card-action">
+                    <a href="#" class="cardLink" id="userMgmtLink">User Management</a>
+                </div>
+            </div>
+        </div>
         <div class="col s12 m6 l4">
             <div class="card blue-grey darken-1" id="prodInfoCard">
                 <div class="card-content white-text">
diff --git a/client/Dashboard/dashboard.js b/client/Dashboard/dashboard.js
index bf899f0..a1c3ee0 100644
--- a/client/Dashboard/dashboard.js
+++ b/client/Dashboard/dashboard.js
@@ -49,6 +49,12 @@ Template.dashboard.helpers({
         let now = new Date();
         let todayDate = moment(now).format("MMM D, 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 });
     }
 });
 
diff --git a/client/Menus/mainMenuTbl.js b/client/Menus/mainMenuTbl.js
index f12e846..9499591 100644
--- a/client/Menus/mainMenuTbl.js
+++ b/client/Menus/mainMenuTbl.js
@@ -38,6 +38,13 @@ Template.mainMenuTbl.events({
                     console.log("    ERROR: can't mark menu complete: " + err);
                 } else {
                     console.log("    SUCCESS marking menu complete.");
+                    Meteor.call('setAllMade.menuItem', menuId, function(err, result) {
+                        if (err) {
+                            console.log("    ERROR: cannot set all items as made: " + err);
+                        } else {
+                            console.log("    SUCCESS setting all items made.");
+                        }
+                    });
                 }
             });
         }
diff --git a/imports/api/menuItems.js b/imports/api/menuItems.js
index 2f33efb..339eaf9 100644
--- a/imports/api/menuItems.js
+++ b/imports/api/menuItems.js
@@ -45,6 +45,21 @@ Meteor.methods({
             }
         });
     },
+    'setAllMade.menuItem' (menuId) {
+        check(menuId, String);
+
+        if (!this.userId) {
+            throw new Meteor.Error('You are not allowed to set all items as made. Make sure you are logged in with valid user credentials.');
+        }
+
+        return MenuItems.update({ menuId: menuId }, {
+            $set: {
+                itemMade: true,
+            }
+        }, {
+            multi: true
+        });
+    },
     'setNotMade.menuItem' (itemId) {
         check(itemId, String);