diff --git a/client/Dashboard/dashboard.js b/client/Dashboard/dashboard.js
index 2ea3cb1..6489fc0 100644
--- a/client/Dashboard/dashboard.js
+++ b/client/Dashboard/dashboard.js
@@ -5,7 +5,10 @@ import { Menus } from '../../imports/api/menu.js';
import { MenuItems } from '../../imports/api/menuItems.js';
import moment from 'moment';
import { TaskItems } from "../../imports/api/tasks";
-
+import { UpdateInfo } from '../../imports/api/updateInfo.js';
+import { SysConfig } from '../../imports/api/systemConfig.js';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
+import { M } from '../lib/assets/materialize.js';
Template.dashboard.onCreated(function() {
this.subscribe("userList");
@@ -17,10 +20,15 @@ Template.dashboard.onCreated(function() {
// this.subscribe("myMenus");
this.subscribe("todayMenuItems");
this.subscribe("myTasks");
+ this.subscribe("UpdateVersion");
+ this.subscribe("SystemConfig");
});
Template.dashboard.onRendered(function() {
-
+ setTimeout(function() {
+ var elems = document.querySelectorAll('.collapsible');
+ var instances = M.Collapsible.init(elems, {});
+ }, 200);
});
Template.dashboard.helpers({
@@ -56,11 +64,64 @@ Template.dashboard.helpers({
let todayDate = moment(now).format("MMM DD, YYYY");
return todayDate;
},
+ updates: function() {
+ let updateAvail = UpdateInfo.find({});
+ try {
+ if (!updateAvail) {
+ // console.log("No update info found.");
+ return false;
+ } else {
+ // console.dir(updateAvail);
+ return updateAvail;
+ }
+ } catch(error) {
+ console.log(" ERROR trying to grab update info: " + error);
+ }
+ },
+ updatesExist: function() {
+ const ifUpdate = async() => {
+ let updateExists = await UpdateInfo.findOneAsync({ viewed: false });
+ if (!updateExists) {
+ // console.log("Update doesn't exist as false.");
+ return false;
+ } else {
+ // console.log("Update found with false.");
+ return true;
+ }
+ }
+ let updateAvail = ifUpdate();
+ return updateAvail;
+ },
+ currConfig: function() {
+ const getSys = async() => {
+ let currSys = SysConfig.findOneAsync({});
+ try {
+ if (!currSys) {
+ // console.log("No System Config found.")
+ } else {
+ return currSys;
+ }
+ } catch(error) {
+ console.log(" ERROR trying to fetch current system config: " + error);
+ }
+ }
+ let currConf = getSys();
+ return currConf;
+ },
+ descriptionSinHTML: function() {
+ let desc = this.description;
+ let sinH = $(desc).text();
+ return desc;
+ },
+ niceDate: function() {
+ let rDateNorm = this.date;
+ let rDate = moment(rDateNorm).format('LL');
+ return rDate;
+ }
});
Template.dashboard.events({
"click .cardLink" (event) {
- event.preventDefault();
let link = event.currentTarget.id;
switch(link) {
case "userMgmtLink":
@@ -86,7 +147,6 @@ Template.dashboard.events({
}
},
'click .card' (event) {
- event.preventDefault();
let cardId = event.currentTarget.id;
switch(cardId) {
@@ -111,5 +171,23 @@ Template.dashboard.events({
default:
break;
}
+ },
+ 'click .readLink' (event) {
+ let eventId = event.currentTarget.id;
+
+ const markUpdate = async() => {
+ let result = await Meteor.callAsync('markUpdate.read', eventId);
+ try {
+ if (!result) {
+ // console.log(" Error marking this read.");
+ showSnackbar("Error Marking Read!", "red");
+ } else {
+ showSnackbar("Successfully Marked as Read.", "green");
+ }
+ } catch(error) {
+ console.log(" ERROR trying to mark this update as read: " + error);
+ }
+ }
+ markUpdate();
}
});
diff --git a/client/General/DeleteConfModal/deleteConfirmationModal.js b/client/General/DeleteConfModal/deleteConfirmationModal.js
index dde7bfb..f153ae7 100644
--- a/client/General/DeleteConfModal/deleteConfirmationModal.js
+++ b/client/General/DeleteConfModal/deleteConfirmationModal.js
@@ -22,14 +22,16 @@ Template.deleteConfirmationModal.events({
let deleteId = Session.get("deleteId");
let method = Session.get("method");
- Meteor.call(method, deleteId, function(err, result) {
- if (err) {
+ const delItem = async() => {
+ let result = await Meteor.callAsync(method, deleteId);
+ if (!result) {
console.log(" ERROR deleting item from modal: " + err);
} else {
console.log(" SUCCESSFULLY deleted.");
// put the new modal open / close here
// $('#modalDelete').modal('close');
}
- });
+ }
+ delItem();
},
});
\ No newline at end of file
diff --git a/client/General/headerBar.html b/client/General/headerBar.html
index 00e9d71..97737ca 100644
--- a/client/General/headerBar.html
+++ b/client/General/headerBar.html
@@ -11,11 +11,14 @@
My Lists
My Tasks
-
My Settings
- {{#if isInRole 'systemadmin'}}
+
My Settings
+ {{#if isInRole "systemadmin"}}
Manage
{{/if}}
Log Out
+ {{#if $eq updateExists true}}
+
notifications
+ {{/if}}
{{else}}
Login
{{/if}}
@@ -27,9 +30,12 @@
My Lists
My Tasks
-
My Settings
+
My Settings
{{#if isInRole 'systemadmin'}}
Manage
+ {{#if $eq updateExists true}}
+
notifications
+ {{/if}}
{{/if}}
Sign Out
{{else}}
diff --git a/client/General/headerBar.js b/client/General/headerBar.js
index cd5963c..3e246f0 100644
--- a/client/General/headerBar.js
+++ b/client/General/headerBar.js
@@ -1,14 +1,38 @@
+import { Meteor } from 'meteor/meteor';
import { M } from '../lib/assets/materialize';
+import { UpdateInfo } from '../../imports/api/updateInfo.js';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
+import { Roles } from 'meteor/roles';
Template.headerBar.onCreated(function() {
-
+ this.subscribe("UpdateVersion");
+ this.subscribe("assignment");
});
Template.headerBar.onRendered(function() {
var elems = document.querySelectorAll('.sidenav');
var instances = M.Sidenav.init(elems, {});
var elemd = document.querySelectorAll('.dropdown-trigger');
- var instances = M.Dropdown.init(elemd, {});
+ var instances = M.Dropdown.init(elemd, {});
+
+ setTimeout(function() {
+ const getRoles = async() => {
+ let userId = Meteor.userId();
+ // let isRole = await Roles.userIsInRoleAsync(userId, "systemadmin");
+ let isRole = await Roles.getRolesForUserAsync(userId);
+ try {
+ if (!isRole) {
+ // console.log("SystemAdmin role for user not found: " + isRole);;
+ } else {
+ // console.log("Found role for the user: ");
+ // console.dir(isRole);
+ }
+ } catch(error) {
+ console.log(" ERROR getting role for user: " + error);
+ }
+ }
+ getRoles();
+ }, 1000);
});
Template.headerBar.helpers({
@@ -17,7 +41,15 @@ Template.headerBar.helpers({
},
myTheme: function() {
return Session.get("myTheme");
- }
+ },
+ updateExists: function() {
+ let update = UpdateInfo.find({ viewed: false }).fetch();
+ if (update.length > 0) {
+ return true;
+ } else {
+ return false;
+ }
+ },
});
Template.headerBar.events({
diff --git a/client/ListItems/listItemTblByStore.html b/client/ListItems/listItemTblByStore.html
new file mode 100644
index 0000000..45a431f
--- /dev/null
+++ b/client/ListItems/listItemTblByStore.html
@@ -0,0 +1,27 @@
+
+
+
+ Products with no assigned store, will not be displayed on this version of the list.
+
+
+
diff --git a/client/ListItems/listItemTblByStore.js b/client/ListItems/listItemTblByStore.js
new file mode 100644
index 0000000..a914cd0
--- /dev/null
+++ b/client/ListItems/listItemTblByStore.js
@@ -0,0 +1,89 @@
+import { ListItems } from '../../imports/api/listItems.js';
+import { M } from '../lib/assets/materialize.js';
+import { UserLast } from '../../imports/api/userLast.js';
+import { Stores } from '../../imports/api/stores.js';
+
+Template.listItemTblByStore.onCreated(function() {
+ this.autorun( () => {
+ this.subscribe("myListItems", Session.get("listId"));
+ });
+ this.subscribe("storeInfo");
+ this.subscribe("userLastView");
+});
+
+Template.listItemTblByStore.onRendered(function() {
+ Session.set("showReceivedItems", false);
+ Session.set("searchVal", "");
+});
+
+Template.listItemTblByStore.helpers({
+ stores: function() {
+ let storeList = Stores.find({});
+ return storeList;
+ },
+ thisListItems: function() {
+ let showReceived = Session.get("showReceivedItems");
+ let searchVal = Session.get("searchVal");
+ let store = this.storeName;
+ if (showReceived == false) {
+ if (typeof searchVal == 'undefined' || searchVal.length === 0) {
+ return ListItems.find({ itemStore: store, itemReceived: false });
+ } else {
+ return ListItems.find({ itemStore: store, itemReceived: false, itemName: { $regex: searchVal + '.*', $options: 'i' }})
+ }
+ } else {
+ if (typeof searchVal == 'undefined' || searchVal.length == 0) {
+ return ListItems.find({ itemStore: store });
+ } else {
+ return ListItems.find({ itemStore: store, itemName: { $regex: searchVal + '.*', $options: 'i' } });
+ }
+ }
+ },
+ storeInList: function() {
+ let noStoresInList = ListItems.find({ itemStore: this.storeName }).count();
+ if (noStoresInList > 0) {
+ return true;
+ } else {
+ return false;
+ }
+ },
+});
+
+Template.listItemTblByStore.events({
+ 'click li' (event) {
+ let itemSel = (event.currentTarget.id).split('-');
+ let itemId = itemSel[0];
+ let itemOrder = itemSel[1];
+
+ if (typeof itemOrder == 'undefined' || itemOrder == "" || itemOrder == false) {
+ Meteor.call("setOrdered.listItem", itemId, function(err, result) {
+ if (err) {
+ // console.log(" ERROR updating order status to ordered: " + err);
+ }
+ });
+ } else {
+ Meteor.call("setNotOrdered.listItem", itemId, function(err, result) {
+ if (err) {
+ // console.log(" ERROR updating order status to unordered: " + err);
+ }
+ });
+ }
+ },
+ 'click .markListItemReceived' (event) {
+ event.preventDefault();
+ Meteor.call('setReceived.listItem', this._id, function(err, result) {
+ if (err) {
+ // console.log(" ERROR setting item as received: " + err);
+ } else {
+ // console.log(" SUCCESS setting item received.");
+ }
+ });
+ },
+ 'click .deleteListItem' (event) {
+ event.preventDefault();
+ Session.set("deleteId", this._id);
+ Session.set("method", "delete.listItem");
+ Session.set("item", this.itemName);
+ Session.set("view", "List Items");
+ },
+});
diff --git a/client/ListItems/listItemsForm.html b/client/ListItems/listItemsForm.html
index 1e71cb4..05e8f33 100644
--- a/client/ListItems/listItemsForm.html
+++ b/client/ListItems/listItemsForm.html
@@ -37,7 +37,7 @@
{{else}}
{{/if}}
-
\ No newline at end of file
+
diff --git a/client/ListItems/listItemsForm.js b/client/ListItems/listItemsForm.js
index 678fe85..20959a3 100644
--- a/client/ListItems/listItemsForm.js
+++ b/client/ListItems/listItemsForm.js
@@ -39,7 +39,7 @@ Template.listItemsForm.helpers({
selListId = selListInfo.viewId;
Session.set("listId", selListId);
} else {
- console.log("not finding any value for viewId.");
+ // console.log("not finding any value for viewId.");
}
}
let listInfo = Lists.findOne({ _id: selListId });
@@ -48,6 +48,7 @@ Template.listItemsForm.helpers({
}
},
itemProdName: function() {
+
return Products.find({});
},
editMode: function() {
@@ -66,14 +67,7 @@ Template.listItemsForm.events({
if (item == null || item == "") {
Session.set("itemReqErr", true);
} else {
- Meteor.call("add.listItem", item, listId, function(err, result) {
- if (err) {
- console.log(" ERROR adding item to list: " + err);
- } else {
- console.log(" SUCCESS adding item to list.");
- $("#findListItems").val("");
- }
- });
+ addItem(item, listId);
}
},
'keydown #findListItems' (event) {
@@ -83,14 +77,7 @@ Template.listItemsForm.events({
if (item == null || item == "") {
Session.set("itemReqErr", true);
} else {
- Meteor.call("add.listItem", item, listId, function(err, result) {
- if (err) {
- console.log(" ERROR adding item to list: " + err);
- } else {
- console.log(" SUCCESS adding item to list.");
- $("#findListItems").val("");
- }
- });
+ addItem(item, listId);
}
}
},
@@ -110,24 +97,42 @@ Template.listItemsForm.events({
'keyup #findListItems' (event) {
if (event.which !== 13) {
let findItemVal = $("#findListItems").val();
+ // console.log(findItemVal);
let listItemInfo = Products.find({ prodName: {$regex: findItemVal + '.*', $options: 'i'}}).fetch();
- if (typeof listItemInfo != 'undefined' && listItemInfo != "" && listItemInfo != null) {
+ if (!listItemInfo) {
+ // console.log("No data for key input.");
+ } else {
getDataList(listItemInfo);
}
}
},
'click #filterOn' (event) {
- event.preventDefault();
Session.set("filtering", true);
},
'click #filterOff' (event) {
- event.preventDefault();
+ // clear filter field
+ Session.set("searchVal", "");
+ $("#searchListItems").val("");
Session.set("filtering", false);
}
});
getDataList = function(listItemInfo) {
+ // console.log(listItemInfo);
let listItemObjArray = [];
listItemObjArray = listItemInfo.map(info => ({ id: info._id, text: info.prodName, store: info.prodStore }))
Session.set("findListItems", listItemObjArray);
-}
\ No newline at end of file
+}
+
+const addItem = async(item, listId) => {
+ let result = await Meteor.callAsync("add.listItem", item, listId);
+ try {
+ if (!result) {
+ // console.log(" ISSUE adding list item. See logs.");
+ } else {
+ $("#findListItems").val("");
+ }
+ } catch(error) {
+ console.log(" ERROR adding list item: " + error);
+ }
+}
diff --git a/client/ListItems/listItemsMain.html b/client/ListItems/listItemsMain.html
index 198c755..9bfca4a 100644
--- a/client/ListItems/listItemsMain.html
+++ b/client/ListItems/listItemsMain.html
@@ -1,5 +1,22 @@
{{> listItemsForm}}
- {{> listItemsTbl}}
-
\ No newline at end of file
+
+
+
+ {{> listItemsTbl}}
+
+
+ {{> listItemTblByStore}}
+
+
+
diff --git a/client/ListItems/listItemsMain.js b/client/ListItems/listItemsMain.js
index fe9e509..a81812f 100644
--- a/client/ListItems/listItemsMain.js
+++ b/client/ListItems/listItemsMain.js
@@ -1,9 +1,12 @@
+import { M } from '../lib/assets/materialize.js';
+
Template.listItemsMain.onCreated(function() {
});
Template.listItemsMain.onRendered(function() {
-
+ var elems = document.querySelectorAll('.tabs');
+ var instance = M.Tabs.init(elems, {});
});
Template.listItemsMain.helpers({
@@ -12,4 +15,4 @@ Template.listItemsMain.helpers({
Template.listItemsMain.events({
-});
\ No newline at end of file
+});
diff --git a/client/ListItems/listItemsTbl.js b/client/ListItems/listItemsTbl.js
index 314ae0f..4d04e18 100644
--- a/client/ListItems/listItemsTbl.js
+++ b/client/ListItems/listItemsTbl.js
@@ -20,15 +20,15 @@ Template.listItemsTbl.onRendered(function() {
Template.listItemsTbl.helpers({
'thisListItems': function() {
let showRecvd = Session.get("showReceivedItems");
- let searchVal = Session.get("searchVal");;
+ let searchVal = Session.get("searchVal");
if (showRecvd == false) {
- if (typeof searchVal == 'undefined' || searchVal.length === 0) {
+ if (!searchVal) {
return ListItems.find({ itemReceived: false });
} else {
return ListItems.find({ itemReceived: false, itemName: { $regex: searchVal + '.*', $options: 'i' } });
}
} else {
- if (typeof searchVal == 'undefined' || searchVal.length == 0) {
+ if (!searchVal) {
return ListItems.find({});
} else {
return ListItems.find({ itemName: { $regex: searchVal + '.*', $options: 'i' } });
@@ -40,34 +40,37 @@ Template.listItemsTbl.helpers({
Template.listItemsTbl.events({
'click li' (event) {
event.preventDefault();
- let itemInfo = ListItems.findOne({ _id: this._id });
- if (itemInfo.itemOrdered == true) {
- Meteor.call('setNotOrdered.listItem', this._id, function(err, result) {
- if (err) {
- console.log(" ERROR setting this item as NOT ordered: " + err);
+ const setOrd = async() => {
+ let itemInfo = await ListItems.findOneAsync({ _id: this._id });
+ if (itemInfo.itemOrdered == true) {
+ let result = await Meteor.callAsync('setNotOrdered.listItem', this._id);
+ if (!result) {
+ // console.log(" ERROR seeting item as not ordered.");
} else {
- // console.log(" SUCCESS setting this item as NOT ordered.");
- }
- });
- } else {
- Meteor.call('setOrdered.listItem', this._id, function(err, result) {
- if (err) {
- console.log(" ERROR marking item ordered: " + err);
+ // console.log(" SUCCESS setting item as ordered.");
+ }
+ } else {
+ let result = Meteor.callAsync('setOrdered.listItem', this._id);
+ if (!result) {
+ // console.log(" ERROR marking item ordered: " + err);
} else {
// console.log(" SUCCESS marking this item ordered.");
}
- });
+ }
}
+ setOrd();
},
'click .markListItemReceived' (event) {
event.preventDefault();
- Meteor.call('setReceived.listItem', this._id, function(err, result) {
- if (err) {
- console.log(" ERROR setting item as received: " + err);
+ const setRcvd = async() => {
+ let result = await Meteor.callAsync('setReceived.listItem', this._id);
+ if (!result) {
+ // console.log("Item not marked properly - why?");
} else {
- // console.log(" SUCCESS setting item received.");
+ // console.log("Item Marked Received.");
}
- });
+ }
+ setRcvd();
},
'click .deleteListItem' (event) {
event.preventDefault();
@@ -76,4 +79,4 @@ Template.listItemsTbl.events({
Session.set("item", this.itemName);
Session.set("view", "List Items");
},
-});
\ No newline at end of file
+});
diff --git a/client/Lists/listsTbl.js b/client/Lists/listsTbl.js
index 1d7a8f0..05a065e 100644
--- a/client/Lists/listsTbl.js
+++ b/client/Lists/listsTbl.js
@@ -1,5 +1,6 @@
import { Lists } from '../../imports/api/lists.js';
import { M } from '../lib/assets/materialize.js';
+import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
Template.listsTbl.onCreated(function() {
this.subscribe("myLists");
@@ -27,15 +28,17 @@ Template.listsTbl.events({
} else {
// console.log("listId is: " + listId);
Session.set("listId", listId);
- Meteor.call('add.userLast', "List", listId, function(err, result) {
- if (err) {
- console.log(" ERROR setting user last list id in db: " + err);
+ const addUserLast = async() => {
+ let result = await Meteor.callAsync('add.userLast', "List", listId);
+ if (!result) {
+ // console.log(" ERROR setting user last list id in db: " + err);
} else {
- Meteor.setTimeout(function() {
+ setTimeout(function() {
FlowRouter.go('/listitems');
}, 100);
}
- });
+ }
+ addUserLast();
}
}
},
@@ -47,15 +50,17 @@ Template.listsTbl.events({
let splitList = listFullId.split("_");
let listId = splitList[1];
// console.log("listId is " + listId);
- Meteor.call("mark.complete", listId, function(err, result){
- if (err) {
- console.log(" ERROR marking list complete! " + err);
+ const markComp = async() => {
+ let result = await Meteor.callAsync("mark.complete", listId);
+ if (!result) {
+ // console.log(" ERROR marking list complete!");
showSnackbar("ERROR! List Not Makred Complete!", "red");
} else {
// console.log(" SUCCESS marking list complete.");
showSnackbar("List Marked Complete!", "green");
}
- });
+ }
+ markComp();
}
}
});
\ No newline at end of file
diff --git a/client/MainLayout.js b/client/MainLayout.js
index 2a37018..010b72f 100644
--- a/client/MainLayout.js
+++ b/client/MainLayout.js
@@ -7,20 +7,27 @@ Template.MainLayout.onCreated(function() {
Template.MainLayout.onRendered(function() {
this.autorun(() => {
let myId = Meteor.userId();
- let myprefs = UserConfig.findOne({ user: myId });
- if (typeof myprefs != 'undefined') {
- if (myprefs.darkMode == "light") {
- console.log("Found theme as light");
- Session.set("myTheme", "light");
- document.documentElement.setAttribute('theme', "light");
- } else {
- console.log("Found theme as dark");
- Session.set("myTheme", "dark");
- document.documentElement.setAttribute('theme', "dark");
- }
- } else {
- console.log("User Prefs appear undefined.");
+ const getConfig = async() => {
+ let myprefs = await UserConfig.findOneAsync({ user: myId });
+ try {
+ if (!myprefs) {
+ // console.log("User Prefs appear undefined.");
+ } else {
+ if (myprefs.darkMode == "light") {
+ // console.log("Found theme as light");
+ Session.set("myTheme", "light");
+ document.documentElement.setAttribute('theme', "light");
+ } else {
+ // console.log("Found theme as dark");
+ Session.set("myTheme", "dark");
+ document.documentElement.setAttribute('theme', "dark");
+ }
+ }
+ } catch(error) {
+ console.log(" ERROR getting user preferences: " + error);
+ }
}
+ getConfig();
});
});
diff --git a/client/MenuItems/addProdToListModal.html b/client/MenuItems/addProdToListModal.html
index 191eaeb..4ac3f34 100644
--- a/client/MenuItems/addProdToListModal.html
+++ b/client/MenuItems/addProdToListModal.html
@@ -39,10 +39,9 @@
Cancel