mirror of
https://gitlab.com/bmcgonag/get_my.git
synced 2026-03-27 08:18:50 +00:00
Compare commits
No commits in common. "main" and "1.1.2" have entirely different histories.
70 changed files with 1906 additions and 3030 deletions
|
|
@ -4,27 +4,29 @@
|
|||
# 'meteor add' and 'meteor remove' will edit this file for you,
|
||||
# but you can also edit it by hand.
|
||||
|
||||
meteor-base@1.5.2 # Packages every Meteor app needs to have
|
||||
mobile-experience@1.1.2 # Packages for a great mobile UX
|
||||
mongo@2.1.4 # The database Meteor supports right now
|
||||
meteor-base@1.5.1 # Packages every Meteor app needs to have
|
||||
mobile-experience@1.1.1 # Packages for a great mobile UX
|
||||
mongo@1.16.10 # The database Meteor supports right now
|
||||
blaze-html-templates # Compile .html files into Meteor Blaze views
|
||||
jquery # Wrapper package for npm-installed jquery
|
||||
reactive-var@1.0.13 # Reactive variable for tracker
|
||||
tracker@1.3.4 # Meteor's client-side reactive programming library
|
||||
reactive-var@1.0.12 # Reactive variable for tracker
|
||||
tracker@1.3.3 # Meteor's client-side reactive programming library
|
||||
|
||||
standard-minifier-css@1.9.3 # CSS minifier run for production mode
|
||||
standard-minifier-js@3.1.1 # JS minifier run for production mode
|
||||
es5-shim@4.8.1 # ECMAScript 5 compatibility for older browsers
|
||||
ecmascript@0.16.13 # Enable ECMAScript2015+ syntax in app code
|
||||
typescript@5.6.6 # Enable TypeScript syntax in .ts and .tsx modules
|
||||
shell-server@0.6.2 # Server-side component of the `meteor shell` command
|
||||
standard-minifier-css@1.9.2 # CSS minifier run for production mode
|
||||
standard-minifier-js@2.8.1 # JS minifier run for production mode
|
||||
es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers
|
||||
ecmascript@0.16.8 # Enable ECMAScript2015+ syntax in app code
|
||||
typescript@4.9.5 # Enable TypeScript syntax in .ts and .tsx modules
|
||||
shell-server@0.5.0 # Server-side component of the `meteor shell` command
|
||||
|
||||
hot-module-replacement@0.5.4 # Update code in development without reloading the page
|
||||
hot-module-replacement@0.5.3 # Update code in development without reloading the page
|
||||
blaze-hot # Update files using Blaze's API with HMR
|
||||
|
||||
roles@1.0.1
|
||||
session@1.2.2
|
||||
email@3.1.2
|
||||
arianjahiri:meteor-handlebars-helpers
|
||||
ostrio:flow-router-extra
|
||||
accounts-password@3.2.1
|
||||
alanning:roles@2.2.0
|
||||
email@2.2.6
|
||||
session@1.2.1
|
||||
|
||||
raix:handlebar-helpers
|
||||
kadira:flow-router
|
||||
kadira:blaze-layout
|
||||
accounts-password@2.4.0
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
METEOR@3.3.2
|
||||
METEOR@2.16
|
||||
|
|
|
|||
188
.meteor/versions
188
.meteor/versions
|
|
@ -1,94 +1,94 @@
|
|||
accounts-base@3.1.2
|
||||
accounts-password@3.2.1
|
||||
allow-deny@2.1.0
|
||||
arianjahiri:meteor-handlebars-helpers@0.0.1
|
||||
autoupdate@2.0.1
|
||||
babel-compiler@7.12.2
|
||||
babel-runtime@1.5.2
|
||||
base64@1.0.13
|
||||
binary-heap@1.0.12
|
||||
blaze@3.0.2
|
||||
blaze-hot@2.0.0
|
||||
blaze-html-templates@3.0.0
|
||||
blaze-tools@2.0.0
|
||||
boilerplate-generator@2.0.2
|
||||
caching-compiler@2.0.1
|
||||
caching-html-compiler@2.0.0
|
||||
callback-hook@1.6.1
|
||||
check@1.4.4
|
||||
core-runtime@1.0.0
|
||||
ddp@1.4.2
|
||||
ddp-client@3.1.1
|
||||
ddp-common@1.4.4
|
||||
ddp-rate-limiter@1.2.2
|
||||
ddp-server@3.1.2
|
||||
deps@1.0.5-pre.1
|
||||
diff-sequence@1.1.3
|
||||
dynamic-import@0.7.4
|
||||
ecmascript@0.16.13
|
||||
ecmascript-runtime@0.8.3
|
||||
ecmascript-runtime-client@0.12.3
|
||||
ecmascript-runtime-server@0.11.1
|
||||
ejson@1.1.5
|
||||
email@3.1.2
|
||||
es5-shim@4.8.1
|
||||
facts-base@1.0.2
|
||||
fetch@0.1.6
|
||||
geojson-utils@1.0.12
|
||||
hot-code-push@1.0.5
|
||||
hot-module-replacement@0.5.4
|
||||
html-tools@2.0.0
|
||||
htmljs@2.0.1
|
||||
id-map@1.2.0
|
||||
inter-process-messaging@0.1.2
|
||||
jquery@3.0.2
|
||||
launch-screen@2.0.1
|
||||
localstorage@1.2.1
|
||||
logging@1.3.6
|
||||
meteor@2.1.1
|
||||
meteor-base@1.5.2
|
||||
minifier-css@2.0.1
|
||||
minifier-js@3.0.4
|
||||
minimongo@2.0.4
|
||||
mobile-experience@1.1.2
|
||||
mobile-status-bar@1.1.1
|
||||
modern-browsers@0.2.3
|
||||
modules@0.20.3
|
||||
modules-runtime@0.13.2
|
||||
modules-runtime-hot@0.14.3
|
||||
mongo@2.1.4
|
||||
mongo-decimal@0.2.0
|
||||
mongo-dev-server@1.1.1
|
||||
mongo-id@1.0.9
|
||||
npm-mongo@6.16.1
|
||||
observe-sequence@2.0.0
|
||||
ordered-dict@1.2.0
|
||||
ostrio:flow-router-extra@3.12.0
|
||||
promise@1.0.0
|
||||
random@1.2.2
|
||||
rate-limit@1.1.2
|
||||
react-fast-refresh@0.2.9
|
||||
reactive-dict@1.3.2
|
||||
reactive-var@1.0.13
|
||||
reload@1.3.2
|
||||
retry@1.1.1
|
||||
roles@1.0.1
|
||||
routepolicy@1.1.2
|
||||
session@1.2.2
|
||||
sha@1.0.10
|
||||
shell-server@0.6.2
|
||||
socket-stream-client@0.6.1
|
||||
spacebars@2.0.0
|
||||
spacebars-compiler@2.0.0
|
||||
standard-minifier-css@1.9.3
|
||||
standard-minifier-js@3.1.1
|
||||
templating@1.4.4
|
||||
templating-compiler@2.0.0
|
||||
templating-runtime@2.0.1
|
||||
templating-tools@2.0.0
|
||||
tracker@1.3.4
|
||||
typescript@5.6.6
|
||||
underscore@1.6.4
|
||||
url@1.3.5
|
||||
webapp@2.0.7
|
||||
webapp-hashing@1.1.2
|
||||
accounts-base@2.2.11
|
||||
accounts-password@2.4.0
|
||||
alanning:roles@2.2.0
|
||||
allow-deny@1.1.1
|
||||
autoupdate@1.8.0
|
||||
babel-compiler@7.10.5
|
||||
babel-runtime@1.5.1
|
||||
base64@1.0.12
|
||||
binary-heap@1.0.11
|
||||
blaze@2.9.0
|
||||
blaze-hot@1.1.2
|
||||
blaze-html-templates@1.2.1
|
||||
blaze-tools@1.1.4
|
||||
boilerplate-generator@1.7.2
|
||||
caching-compiler@1.2.2
|
||||
caching-html-compiler@1.2.2
|
||||
callback-hook@1.5.1
|
||||
check@1.4.1
|
||||
ddp@1.4.1
|
||||
ddp-client@2.6.2
|
||||
ddp-common@1.4.1
|
||||
ddp-rate-limiter@1.2.1
|
||||
ddp-server@2.7.1
|
||||
deps@1.0.12
|
||||
diff-sequence@1.1.2
|
||||
dynamic-import@0.7.3
|
||||
ecmascript@0.16.8
|
||||
ecmascript-runtime@0.8.1
|
||||
ecmascript-runtime-client@0.12.1
|
||||
ecmascript-runtime-server@0.11.0
|
||||
ejson@1.1.3
|
||||
email@2.2.6
|
||||
es5-shim@4.8.0
|
||||
fetch@0.1.4
|
||||
geojson-utils@1.0.11
|
||||
hot-code-push@1.0.4
|
||||
hot-module-replacement@0.5.3
|
||||
html-tools@1.1.4
|
||||
htmljs@1.2.1
|
||||
id-map@1.1.1
|
||||
inter-process-messaging@0.1.1
|
||||
jquery@3.0.0
|
||||
kadira:blaze-layout@2.0.1
|
||||
kadira:flow-router@2.12.1
|
||||
launch-screen@2.0.0
|
||||
localstorage@1.2.0
|
||||
logging@1.3.4
|
||||
meteor@1.11.5
|
||||
meteor-base@1.5.1
|
||||
minifier-css@1.6.4
|
||||
minifier-js@2.8.0
|
||||
minimongo@1.9.4
|
||||
mobile-experience@1.1.1
|
||||
mobile-status-bar@1.1.0
|
||||
modern-browsers@0.1.10
|
||||
modules@0.20.0
|
||||
modules-runtime@0.13.1
|
||||
modules-runtime-hot@0.14.2
|
||||
mongo@1.16.10
|
||||
mongo-decimal@0.1.3
|
||||
mongo-dev-server@1.1.0
|
||||
mongo-id@1.0.8
|
||||
npm-mongo@4.17.2
|
||||
observe-sequence@1.0.22
|
||||
ordered-dict@1.1.0
|
||||
promise@0.12.2
|
||||
raix:handlebar-helpers@0.2.5
|
||||
random@1.2.1
|
||||
rate-limit@1.1.1
|
||||
react-fast-refresh@0.2.8
|
||||
reactive-dict@1.3.1
|
||||
reactive-var@1.0.12
|
||||
reload@1.3.1
|
||||
retry@1.1.0
|
||||
routepolicy@1.1.1
|
||||
session@1.2.1
|
||||
sha@1.0.9
|
||||
shell-server@0.5.0
|
||||
socket-stream-client@0.5.2
|
||||
spacebars@1.6.0
|
||||
spacebars-compiler@1.3.2
|
||||
standard-minifier-css@1.9.2
|
||||
standard-minifier-js@2.8.1
|
||||
templating@1.4.3
|
||||
templating-compiler@1.4.2
|
||||
templating-runtime@1.6.4
|
||||
templating-tools@1.2.3
|
||||
tracker@1.3.3
|
||||
typescript@4.9.5
|
||||
ui@1.0.13
|
||||
underscore@1.6.2
|
||||
url@1.3.2
|
||||
webapp@1.13.8
|
||||
webapp-hashing@1.1.1
|
||||
|
|
|
|||
15
Dockerfile
15
Dockerfile
|
|
@ -1,4 +1,8 @@
|
|||
FROM node:22.16.0-alpine
|
||||
FROM alpine:3.17
|
||||
|
||||
ENV NODE_VERSION=14.21.4
|
||||
ENV NODE_URL="https://static.meteor.com/dev-bundle-node-os/unofficial-builds/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz"
|
||||
ENV DIR_NODE=/usr/local
|
||||
|
||||
RUN apk add --no-cache \
|
||||
libstdc++ \
|
||||
|
|
@ -16,6 +20,13 @@ RUN apk add --no-cache \
|
|||
ccache \
|
||||
xz
|
||||
|
||||
RUN echo $NODE_URL
|
||||
RUN curl -sSL "$NODE_URL" | tar -xz -C /usr/local/ && mv $DIR_NODE/node-v${NODE_VERSION}-linux-x64 $DIR_NODE/v$NODE_VERSION
|
||||
|
||||
# add node and npm to path so the commands are available
|
||||
ENV NODE_PATH $DIR_NODE/v$NODE_VERSION/lib/node_modules
|
||||
ENV PATH $DIR_NODE/v$NODE_VERSION/bin:$PATH
|
||||
|
||||
# confirm installation
|
||||
RUN node -v
|
||||
RUN npm -v
|
||||
|
|
@ -27,7 +38,7 @@ ENV MONGO_URL=mongodb://mongo:27017/get_my\
|
|||
|
||||
RUN mkdir -p /usr/src/get_my
|
||||
WORKDIR /usr/src/get_my
|
||||
COPY ../bundle/ /usr/src/get_my/
|
||||
COPY bundle/ /usr/src/get_my/
|
||||
|
||||
RUN cd /usr/src/get_my/programs/server/ \
|
||||
&& npm install
|
||||
|
|
|
|||
|
|
@ -60,8 +60,6 @@ The documentation is being done in the amazing open source software [Bookstack](
|
|||
|
||||
If you'd like to contribute by writing some documentation, please contact me me with an, and I'll see about getting you access to contribute.
|
||||
|
||||
I have a video introduction on my YouTube channel here as well: https://youtu.be/hbGNTzU24hI?si=K5mcb8FuzSWNCueB
|
||||
|
||||
## Keeping it Simple
|
||||
- Registration / Login System built in
|
||||
- 1st user to register is the system admin by default.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import { SysConfig } from '../../../imports/api/systemConfig.js';
|
||||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
|
||||
Template.login.onCreated(function() {
|
||||
this.subscribe("SystemConfig");
|
||||
|
|
@ -26,7 +25,7 @@ Template.login.helpers({
|
|||
Template.login.events({
|
||||
'click #logmein' (event) {
|
||||
event.preventDefault();
|
||||
// console.log("clicked login");
|
||||
console.log("clicked login");
|
||||
let email = $("#email").val();
|
||||
let pass = $("#password").val();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import { SysConfig } from "../../../imports/api/systemConfig.js";
|
||||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
|
||||
Template.reg.onCreated(function() {
|
||||
this.subscribe("SystemConfig");
|
||||
|
|
@ -30,16 +29,12 @@ Template.reg.helpers({
|
|||
return Session.get("missingReq");
|
||||
},
|
||||
allowReg: function() {
|
||||
const sysConf = async() => {
|
||||
let conf = await SysConfig.findOneAsync();
|
||||
if (!conf) {
|
||||
return true;
|
||||
} else {
|
||||
return conf.allowReg;
|
||||
}
|
||||
let conf = SysConfig.findOne();
|
||||
if (typeof conf != 'undefined') {
|
||||
return conf.allowReg;
|
||||
} else {
|
||||
return true
|
||||
}
|
||||
let sysConfig = sysConf();
|
||||
return sysConfig;
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -88,17 +83,15 @@ Template.reg.events({
|
|||
});
|
||||
|
||||
let userId = Meteor.userId();
|
||||
// console.log("User ID: " + userId);
|
||||
const addRole = async() => {
|
||||
let result = await Meteor.callAsync("addToRole", "user");
|
||||
if (!result) {
|
||||
console.log(" ERROR: ROLES - Error adding user to role: ");
|
||||
console.log("User ID: " + userId);
|
||||
Meteor.call("addToRole", "user", function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR: ROLES - Error adding user to role: " + err);
|
||||
} else {
|
||||
// console.log("User should be added to role - teacher.");
|
||||
FlowRouter.go('/dashboard');
|
||||
}
|
||||
}
|
||||
addRole();
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<label for="newPassConf">Enter New Password</label>
|
||||
{{#if $eq passMatch false}}<p class="red-text">Passwords do not match!</p>{{/if}}
|
||||
</div>
|
||||
<div class="col s12 m6 l6 input-field">
|
||||
<div class="col s12 m6 l6 input-field outlined">
|
||||
<select name="userRole" id="userRole" class="userRole {{#if $eq roleEmpty true}}red lighten-2 white-text{{/if}}">
|
||||
<option value="{{userRole}}" selected>{{userRole}}</option>
|
||||
<option value="admin">Admin</option>
|
||||
|
|
|
|||
|
|
@ -16,10 +16,10 @@ Template.userInfoModal.onRendered(function() {
|
|||
var elemse = document.querySelectorAll('select');
|
||||
var instancese = M.FormSelect.init(elemse, {});
|
||||
|
||||
// Meteor.setTimeout(() => {
|
||||
// instances = M.Modal.init(elems, {});
|
||||
// instancese = M.FormSelect.init(elemse, {});
|
||||
// }, 500);
|
||||
Meteor.setTimeout(() => {
|
||||
instances = M.Modal.init(elems, {});
|
||||
instancese = M.FormSelect.init(elemse, {});
|
||||
}, 500);
|
||||
});
|
||||
|
||||
Template.userInfoModal.helpers({
|
||||
|
|
@ -35,34 +35,19 @@ Template.userInfoModal.helpers({
|
|||
userInfo: function() {
|
||||
let usersId = Session.get("usersId");
|
||||
if (usersId != "" && usersId != null) {
|
||||
const uIn = async() => {
|
||||
let usersInfo = await Meteor.users.findOneAsync({ _id: usersId });
|
||||
if (!usersInfo) {
|
||||
console.log("No information found for this user.");
|
||||
return;
|
||||
} else {
|
||||
Session.set("usersInfo", usersInfo);
|
||||
return usersInfo;
|
||||
}
|
||||
// console.dir(usersInfo);
|
||||
}
|
||||
uIn();
|
||||
let usersInfo = Meteor.users.findOne({ _id: usersId });
|
||||
// console.dir(usersInfo);
|
||||
Session.set("usersInfo", usersInfo);
|
||||
return usersInfo;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
},
|
||||
userRole: function() {
|
||||
const getRole = async() => {
|
||||
let userRole = Roles.getRolesForUserAsync( Session.get("usersId"));
|
||||
if (!userRole) {
|
||||
return;
|
||||
} else {
|
||||
Session.set("usersRole", userRole);
|
||||
console.log(userRole);
|
||||
return userRole;
|
||||
}
|
||||
}
|
||||
getRole();
|
||||
let userRole = Roles.getRolesForUser( Session.get("usersId"));
|
||||
Session.set("usersRole", userRole);
|
||||
console.log(userRole);
|
||||
return userRole;
|
||||
},
|
||||
rolesOptions: function() {
|
||||
return Roles.find();
|
||||
|
|
@ -136,33 +121,36 @@ Template.userInfoModal.events({
|
|||
}
|
||||
});
|
||||
|
||||
changePassword = async function(userId, passwd) {
|
||||
changePassword = function(userId, passwd) {
|
||||
console.log("would change password.");
|
||||
let result = await Meteor.callAsync('edit.userPass', userId, passwd);
|
||||
if (!result) {
|
||||
console.log(" ERROR changing user passwrod:");
|
||||
} else {
|
||||
showSnackbar("Successfully Saved Changes!", "green");
|
||||
console.log(" Password changed successfully!");
|
||||
}
|
||||
Meteor.call('edit.userPass', userId, passwd, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR changing user passwrod:" + err);
|
||||
} else {
|
||||
showSnackbar("Successfully Saved Changes!", "green");
|
||||
console.log(" Password changed successfully!");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
changeUserEmail = async function(usersId, usersEmail) {
|
||||
changeUserEmail = function(usersId, usersEmail) {
|
||||
console.log("Would change user email");
|
||||
let result = await Meteor.callAsync('update.userEmail', usersId, usersEmail);
|
||||
if (!result) {
|
||||
console.log(" ERROR updating user email: " + err);
|
||||
} else {
|
||||
showSnackbar("Email updated successfully!", "green");
|
||||
}
|
||||
Meteor.call('update.userEmail', usersId, usersEmail, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR updating user email: " + err);
|
||||
} else {
|
||||
showSnackbar("Email updated successfully!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
changeUserRole = async function(userId, role) {
|
||||
changeUserRole = function(userId, role) {
|
||||
console.log("Would change user Role.");
|
||||
let result = await Meteor.callAsync('edit.userRole', userId, role);
|
||||
if (!result) {
|
||||
console.log(" ERROR updating user role: " + err);
|
||||
} else {
|
||||
showSnackbar("Role Successfully Updated!", "green");
|
||||
}
|
||||
Meteor.call('edit.userRole', userId, role, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR updating user role: " + err);
|
||||
} else {
|
||||
showSnackbar("Role Successfully Updated!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -23,7 +23,7 @@ Template.userMgmt.helpers({
|
|||
return this.emails[0].address;
|
||||
},
|
||||
userRole: function() {
|
||||
return Roles.getRolesForUserAsync( this._id );
|
||||
return Roles.getRolesForUser( this._id );
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ Template.cleanUpModalConfirm.events({
|
|||
case "Menus":
|
||||
cleanUp("clean.Menus", whatItems);
|
||||
case "Products":
|
||||
cleanUp("clean.Products", whatItems);
|
||||
// cleanUp("clean.Products", whatItems);
|
||||
case "Stores":
|
||||
// cleanUp("clean.Stores", whatItems);
|
||||
case "Tasks":
|
||||
|
|
@ -40,34 +40,27 @@ Template.cleanUpModalConfirm.events({
|
|||
}
|
||||
});
|
||||
|
||||
cleanUp = async function(methodName, whatItems) {
|
||||
let result = Meteor.callAsync(methodName);
|
||||
if (!result) {
|
||||
console.log(" ERROR cleaning " + whatItems);
|
||||
} else {
|
||||
showSnackbar(whatItems + " have been cleaned up!", "green");
|
||||
let confirmModal = document.getElementById('cleanUpConfirm');
|
||||
M.Modal.getInstance(confirmModal).close();
|
||||
}
|
||||
cleanUp = function(methodName, whatItems) {
|
||||
Meteor.call(methodName, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR cleaning " + whatItems + ": " + err);
|
||||
} else {
|
||||
showSnackbar(whatItems + " have been cleaned up!", "green");
|
||||
let confirmModal = document.getElementById('cleanUpConfirm');
|
||||
M.Modal.getInstance(confirmModal).close();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
cleanProducts = async function(methodName, whatItems) {
|
||||
let result = await Meteor.call(methodName, whatItems);
|
||||
if (!result) {
|
||||
console.log(" ERROR cleaning " + whatItems);
|
||||
} else {
|
||||
showSnackbar(whatItems + " have been cleaned up.", "green");
|
||||
}
|
||||
}
|
||||
|
||||
cleanTasks = async function(methodName, whatItems) {
|
||||
cleanTasks = function(methodName, whatItems) {
|
||||
let timeFrame = Session.get("overdueVal");
|
||||
let result = await Meteor.call(methodName, timeFrame);
|
||||
if (!result) {
|
||||
console.log(" ERROR cleaning " + whatItems + ": " + err);
|
||||
} else {
|
||||
showSnackbar(whatItems + " have been cleaned up!", "green");
|
||||
let confirmModal = document.getElementById('cleanUpConfirm');
|
||||
M.Modal.getInstance(confirmModal).close();
|
||||
}
|
||||
Meteor.call(methodName, timeFrame, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR cleaning " + whatItems + ": " + err);
|
||||
} else {
|
||||
showSnackbar(whatItems + " have been cleaned up!", "green");
|
||||
let confirmModal = document.getElementById('cleanUpConfirm');
|
||||
M.Modal.getInstance(confirmModal).close();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
<h4>Lists</h4>
|
||||
<form action="submit" class="listAdd">
|
||||
<div class="row">
|
||||
<div class="col s12 m8 l8 input-field">
|
||||
<div class="col s8 m8 l10 input-field">
|
||||
<input type="text" class="listNameInp" style="{{#if $eq listNameErr true}}border: 2px solid red{{/if}}" id="listNameInp" />
|
||||
<label for="listNameInp">List Name</label>
|
||||
</div>
|
||||
<div class="col s12 m2 l2 input-field">
|
||||
<div class="col s4 m4 l2 input-field">
|
||||
<p>
|
||||
<label>
|
||||
<input type="checkbox" id="isShared"/>
|
||||
|
|
@ -14,14 +14,6 @@
|
|||
</label>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col s12 m2 l2 input-field">
|
||||
<p>
|
||||
<label>
|
||||
<input type="checkbox" id="isCompleted"/>
|
||||
<span>Show Completed</span>
|
||||
</label>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col s12 m12 l12">
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ Template.listMgmtForm.onCreated(function() {
|
|||
Template.listMgmtForm.onRendered(function() {
|
||||
Session.set("listNameMiss", false);
|
||||
Session.set("listNameEditMode", false);
|
||||
Session.set("showCompletedLists", false);
|
||||
});
|
||||
|
||||
Template.listMgmtForm.helpers({
|
||||
|
|
@ -29,7 +28,15 @@ Template.listMgmtForm.events({
|
|||
Session.set("listNameMiss", true);
|
||||
return;
|
||||
} else {
|
||||
addList(listName, shared);
|
||||
Meteor.call('add.list', listName, shared, function(err, result) {
|
||||
if (err) {
|
||||
// console.log(" ERROR adding list name: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS adding list name.");
|
||||
$("#listNameInp").val("");
|
||||
$("#isShared").prop("checked", false);
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
'click .renameListMgmt' (event) {
|
||||
|
|
@ -42,7 +49,16 @@ Template.listMgmtForm.events({
|
|||
Session.set("listNameMiss", true);
|
||||
return;
|
||||
} else {
|
||||
editList(listId, listName, shared);
|
||||
Meteor.call('edit.list', listId, listName, shared, function(err, result) {
|
||||
if (err) {
|
||||
// console.log(" ERROR editing list name: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS editing list name.");
|
||||
$("#listNameInp").val("");
|
||||
$("#isShared").prop("checked", false);
|
||||
Session.set("listNameEditMode", false);
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
'submit .listAdd' (event) {
|
||||
|
|
@ -57,34 +73,27 @@ Template.listMgmtForm.events({
|
|||
return;
|
||||
} else {
|
||||
if (editMode == false) {
|
||||
addList(listName, shared);
|
||||
Meteor.call('add.list', listName, shared, function(err, result) {
|
||||
if (err) {
|
||||
// console.log(" ERROR adding list name: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS adding list name.");
|
||||
$("#listNameInp").val("");
|
||||
$("#isShared").prop("checked", false);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
editList(listId, listName, shared);
|
||||
Meteor.call('edit.list', listId, listName, shared, function(err, result) {
|
||||
if (err) {
|
||||
// console.log(" ERROR editing list name: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS editing list name.");
|
||||
$("#listNameInp").val("");
|
||||
$("#isShared").prop("checked", false);
|
||||
Session.set("listNameEditMode", false);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
'change #isCompleted' (event) {
|
||||
Session.set("showCompletedLists", true);
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
const addList = async(listName, shared) => {
|
||||
let result = await Meteor.callAsync('add.list', listName, shared);
|
||||
if (!result) {
|
||||
console.log("Nothing returned from method call add.list");
|
||||
} else {
|
||||
$("#listNameInp").val("");
|
||||
$("#isShared").prop("checked", false);
|
||||
}
|
||||
}
|
||||
|
||||
const editList = async(listId, listName, shared) => {
|
||||
let result = await Meteor.callAsync('edit.list', listId, listName, shared);
|
||||
if (!result) {
|
||||
// console.log("Nothing returned from method call edit.list");
|
||||
} else {
|
||||
$("#listNameInp").val("");
|
||||
$("#isShared").prop("checked", false);
|
||||
Session.set("listNameEditMode", false);
|
||||
}
|
||||
}
|
||||
|
|
@ -8,7 +8,6 @@
|
|||
<i class="material-icons clickable deleteListName tooltipped right modal-trigger" data-position="top" data-tooltip-id="deleteListIcon" data-target="modalDelete">delete</i>
|
||||
<i class="material-icons clickable editListName tooltipped right" data-position="top" data-tooltip-id="editThisListIcon">edit</i>
|
||||
<i class="material-icons clickable markListComplete tooltipped right" data-position="top" data-tooltip-id="markCompleteIcon">check</i>
|
||||
<i class="material-icons clickable markListNotComplete tooltipped right" data-position="top" data-tooltip-id="markIncompleteIcon">refresh</i>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
|
|
@ -22,9 +21,6 @@
|
|||
<div id="markCompleteIcon" style="display: none;">
|
||||
Mark list complete
|
||||
</div>
|
||||
<div id="markIncompleteIcon" style="display: none;">
|
||||
Restore Completed List
|
||||
</div>
|
||||
</div>
|
||||
{{> deleteConfirmationModal}}
|
||||
</template>
|
||||
|
|
@ -2,7 +2,7 @@ import { Lists } from '../../../imports/api/lists.js';
|
|||
import { M } from '../../lib/assets/materialize.js';
|
||||
|
||||
Template.listMgmtTbl.onCreated(function() {
|
||||
this.subscribe("allLists");
|
||||
this.subscribe("myLists");
|
||||
});
|
||||
|
||||
Template.listMgmtTbl.onRendered(function() {
|
||||
|
|
@ -14,13 +14,7 @@ Template.listMgmtTbl.onRendered(function() {
|
|||
|
||||
Template.listMgmtTbl.helpers({
|
||||
lists: function() {
|
||||
let showComplete = Session.get("showCompletedLists");
|
||||
// console.log("Show Complete Lists: " + showComplete);
|
||||
if (showComplete) {
|
||||
return Lists.find({});
|
||||
} else {
|
||||
return Lists.find({ listComplete: false });
|
||||
}
|
||||
return Lists.find({});
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -35,14 +29,9 @@ Template.listMgmtTbl.events({
|
|||
},
|
||||
'click .editListName' (event) {
|
||||
event.preventDefault();
|
||||
const lInfo = async() => {
|
||||
let listInfo = await Lists.findOneAsync({ _id: this._id });
|
||||
return listInfo;
|
||||
}
|
||||
let listData = lInfo();
|
||||
|
||||
let listName = listData.listName;
|
||||
let listShared = listData.listShared;
|
||||
let listInfo = Lists.findOne({ _id: this._id });
|
||||
let listName = listInfo.listName;
|
||||
let listShared = listInfo.listShared;
|
||||
$("#listNameInp").val(listName);
|
||||
if (listShared == true) {
|
||||
$("#isShared").prop("checked", true);
|
||||
|
|
@ -55,27 +44,12 @@ Template.listMgmtTbl.events({
|
|||
'click .markListComplete' (event) {
|
||||
event.preventDefault();
|
||||
let listId = this._id;
|
||||
const markComp = async() => {
|
||||
let result = await Meteor.callAsync('mark.complete', listId);
|
||||
if (!result) {
|
||||
console.log(" ERROR marking complete.");
|
||||
Meteor.call('mark.complete', listId, function(err, result) {
|
||||
if (err) {
|
||||
// console.log(" ERROR marking complete: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS marking complete.");
|
||||
}
|
||||
}
|
||||
markComp();
|
||||
},
|
||||
'click .markListNotComplete' (event) {
|
||||
event.preventDefault();
|
||||
let listId = this._id;
|
||||
const markInc = async() => {
|
||||
let result = await Meteor.callAsync('mark.incomplete', listId);
|
||||
if (!result) {
|
||||
console.log("Issue marking list incomplete.");
|
||||
} else {
|
||||
// console.log("List marked incomplete.");
|
||||
}
|
||||
}
|
||||
markInc();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
|
||||
Template.mgmtPage.onCreated(function() {
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -2,22 +2,14 @@
|
|||
<h4>Product Management</h4>
|
||||
{{#if Template.subscriptionsReady}}
|
||||
<form action="submit" class="row prodInputForm" style="gap: 1em;">
|
||||
<div class="col l4 m6 s12">
|
||||
<p>
|
||||
<label>
|
||||
<input type="checkbox" id="showNoStoreSet" />
|
||||
<span>Show Products without Store Assigned</span>
|
||||
</label>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col l4 m6 s12">
|
||||
<p>
|
||||
<label>
|
||||
<input type="checkbox" id="showNoList" />
|
||||
<span>Show Products Never Used in a List</span>
|
||||
</label>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col s12">
|
||||
<p>
|
||||
<label>
|
||||
<input type="checkbox" id="showNoStoreSet" />
|
||||
<span>Show Products without Store Assigned</span>
|
||||
</label>
|
||||
</p>
|
||||
</div>
|
||||
<div class="col s12 m6 l6 input-field outlined">
|
||||
<input type="text" class="prodName" style="{{#if $eq prodNameErr true}}border: 2px solid red;{{/if}}" id="prodName" />
|
||||
<label for="prodName">Name*</label>
|
||||
|
|
|
|||
|
|
@ -35,65 +35,46 @@ Template.prodMgmtForm.events({
|
|||
'click .saveProdMgmt, click .editProdMgmt' (event) {
|
||||
let name = $("#prodName").val();
|
||||
let store = $("#prodStore").val();
|
||||
|
||||
let prodId = Session.get("prodEditId");
|
||||
let prodEditMode = Session.get("prodEditMode");
|
||||
|
||||
if (store == null) {
|
||||
store = "";
|
||||
}
|
||||
|
||||
if (name == "" || name == null) {
|
||||
Session.set("prodNameRed", true);
|
||||
return;
|
||||
} else {
|
||||
if (prodEditMode == true) {
|
||||
editProd(prodId, name, store);
|
||||
Meteor.call('edit.product', prodId, name, store, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR: can't add product: " + err);
|
||||
} else {
|
||||
$("#prodName").val("");
|
||||
showSnackbar("Successfully Edited Product!", "green");
|
||||
}
|
||||
});
|
||||
} else {
|
||||
newProd(name, store);
|
||||
Meteor.call('add.product', name, store, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR: can't add product: " + err);
|
||||
} else {
|
||||
$("#prodName").val("");
|
||||
showSnackbar("Product Added Succssfully!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
'click #showNoStoreSet' (event) {
|
||||
let noStoreSet = $("#showNoStoreSet").prop('checked');
|
||||
// console.log("Clicked: " + noStoreSet);
|
||||
console.log("Clicked: " + noStoreSet);
|
||||
if (noStoreSet == true) {
|
||||
Session.set("noStoreSet", true);
|
||||
} else {
|
||||
Session.set("noStoreSet", false);
|
||||
}
|
||||
},
|
||||
'click #showNoList' (event) {
|
||||
let notUsedInList = $("#showNoList").prop('checked');
|
||||
if (notUsedInList == true) {
|
||||
Session.set("noListUsed", true);
|
||||
} else {
|
||||
Session.set("noListUsed", false);
|
||||
}
|
||||
},
|
||||
'submit .prodInputForm' (event) {
|
||||
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
const newProd = async(name, store) => {
|
||||
let result = await Meteor.callAsync('add.product', name, store);
|
||||
try {
|
||||
if (!result) {
|
||||
// console.log("No result when trying to add a new product.");
|
||||
showSnackbar("Unable to add new product.");
|
||||
} else {
|
||||
$("#prodName").val("");
|
||||
showSnackbar("New Product Added!", "green");
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR - couldn't add product: " + error);
|
||||
}
|
||||
}
|
||||
|
||||
const editProd = async(prodId, name, store) => {
|
||||
let result = await Meteor.callAsync('edit.product', prodId, name, store);
|
||||
if (!result) {
|
||||
console.log(" ERROR: can't add product: " + err);
|
||||
} else {
|
||||
$("#prodName").val("");
|
||||
showSnackbar("Successfully Edited Product!", "green");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,17 +1,14 @@
|
|||
import { Products } from '../../../imports/api/products.js';
|
||||
import { ListItems } from '../../../imports/api/listItems.js';
|
||||
import { M } from '../../lib/assets/materialize.js';
|
||||
|
||||
Template.prodMgmtTbl.onCreated(function() {
|
||||
this.subscribe("myProducts");
|
||||
this.subscribe("allListItems");
|
||||
});
|
||||
|
||||
Template.prodMgmtTbl.onRendered(function() {
|
||||
Session.set("searchProds", false);
|
||||
Session.set("searchStore", false);
|
||||
Session.set("noStoreSet", false);
|
||||
Session.set("noListUsed", false);
|
||||
});
|
||||
|
||||
Template.prodMgmtTbl.helpers({
|
||||
|
|
@ -19,7 +16,6 @@ Template.prodMgmtTbl.helpers({
|
|||
let searchProd = Session.get("searchProds");
|
||||
let searchStore = Session.get("searchStore");
|
||||
let noStoreSet = Session.get("noStoreSet");
|
||||
let noListUsed = Session.get("noListUsed");
|
||||
|
||||
if (searchProd == true) {
|
||||
let searchVal = Session.get("searchVal");
|
||||
|
|
@ -37,17 +33,6 @@ Template.prodMgmtTbl.helpers({
|
|||
}
|
||||
} else if (noStoreSet == true) {
|
||||
return Products.find({ prodStore: '' }, { sort: { prodName: 1 }});
|
||||
} else if (noListUsed == true) {
|
||||
let i;
|
||||
let idList = [];
|
||||
let idsInLists = ListItems.find({}).fetch();
|
||||
for (i=0; i < idsInLists.length; i++) {
|
||||
idList.push(idsInLists[i].prodId);
|
||||
}
|
||||
if (i > idsInLists.length - 1) {
|
||||
let noProdsNot = Products.find({ _id: { $nin: idList }}).count();
|
||||
return Products.find({ _id: { $nin: idList }}, { sort: { prodName: 1 }});
|
||||
}
|
||||
} else {
|
||||
return Products.find({}, { sort: { prodName: 1 }});
|
||||
}
|
||||
|
|
@ -72,17 +57,10 @@ Template.prodMgmtTbl.events({
|
|||
event.preventDefault();
|
||||
Session.set("prodEditMode", true);
|
||||
Session.set("prodEditId", this._id);
|
||||
const getProds = async() => {
|
||||
let prodInfo = await Products.findOneAsync({ _id: this._id });
|
||||
if (!prodInfo) {
|
||||
// console.log("No Product Returned.");
|
||||
} else {
|
||||
$("#prodName").val(prodInfo.prodName);
|
||||
$("#prodStore").val(prodInfo.prodStore);
|
||||
}
|
||||
}
|
||||
getProds();
|
||||
|
||||
let prodInfo = Products.findOne({ _id: this._id });
|
||||
$("#prodName").val(prodInfo.prodName);
|
||||
$("#prodStore").val(prodInfo.prodStore);
|
||||
// $('select').formSelect();
|
||||
},
|
||||
'click #filterProds' (event) {
|
||||
event.preventDefault();
|
||||
|
|
|
|||
|
|
@ -23,7 +23,14 @@ Template.storeMgmtForm.events({
|
|||
Session.set("borderRed", true);
|
||||
return;
|
||||
} else {
|
||||
addStore(storeName);
|
||||
Meteor.call("add.store", storeName, function(err, result) {
|
||||
if (err) {
|
||||
console.log("ERROR: Store add failed: " + err);
|
||||
} else {
|
||||
$("#storeName").val("");
|
||||
showSnackbar("Store Added Successfully!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
'click .cancelStoreMgmt' (event) {
|
||||
|
|
@ -31,22 +38,35 @@ Template.storeMgmtForm.events({
|
|||
$("#storeName").val("");
|
||||
Session.set("editModeStore", false);
|
||||
},
|
||||
'submit #storeForm' (event) {
|
||||
event.preventDefault();
|
||||
let editMode = Session.get("editModeStore");
|
||||
let storeName = $("#storeName").val();
|
||||
if (storeName == "" || storeName == null) {
|
||||
Session.set("borderRed", true);
|
||||
return;
|
||||
} else {
|
||||
if (editMode == false) {
|
||||
addStore(storeName);
|
||||
} else {
|
||||
let storeId = Session.get("storeIdEdit");
|
||||
editStore(storeId, storeName);
|
||||
}
|
||||
}
|
||||
},
|
||||
// 'submit #storeForm' (event) {
|
||||
// event.preventDefault();
|
||||
// let editMode = Session.get("editModeStore");
|
||||
// let storeName = $("#storeName").val();
|
||||
// if (storeName == "" || storeName == null) {
|
||||
// Session.set("borderRed", true);
|
||||
// return;
|
||||
// } else {
|
||||
// if (editMode == false) {
|
||||
// Meteor.call("add.store", storeName, function(err, result) {
|
||||
// if (err) {
|
||||
// console.log("ERROR: Store add failed: " + err);
|
||||
// } else {
|
||||
// $("#storeName").val("");
|
||||
// }
|
||||
// });
|
||||
// } else {
|
||||
// let storeId = Session.get("storeIdEdit");
|
||||
// Meteor.call("edit.store", storeId, storeName, function(err, result) {
|
||||
// if (err) {
|
||||
// console.log("ERROR: Store add failed: " + err);
|
||||
// } else {
|
||||
// $("#storeName").val("");
|
||||
// Session.set("editModeStore", false);
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
'click .editStoreMgmt' (event) {
|
||||
let storeName = $("#storeName").val();
|
||||
let storeId = Session.get("storeIdEdit");
|
||||
|
|
@ -54,28 +74,15 @@ Template.storeMgmtForm.events({
|
|||
Session.set("borderRed", true);
|
||||
return;
|
||||
} else {
|
||||
editStore(storeId, storeName);
|
||||
Meteor.call("edit.store", storeId, storeName, function(err, result) {
|
||||
if (err) {
|
||||
console.log("ERROR: Store add failed: " + err);
|
||||
} else {
|
||||
$("#storeName").val("");
|
||||
Session.set("editModeStore", false);
|
||||
showSnackbar("Store Updated Successfully!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const addStore = async(storeName) => {
|
||||
let result = await Meteor.callAsync("add.store", storeName);
|
||||
if (!result) {
|
||||
// console.log("ERROR: Store add failed.");
|
||||
} else {
|
||||
$("#storeName").val("");
|
||||
showSnackbar("Store Added Successfully!", "green");
|
||||
}
|
||||
}
|
||||
|
||||
const editStore = async(storeId, storeName) => {
|
||||
let result = await Meteor.callAsync("edit.store", storeId, storeName);
|
||||
if (!result) {
|
||||
// console.log("ERROR: Store add failed: " + err);
|
||||
} else {
|
||||
$("#storeName").val("");
|
||||
Session.set("editModeStore", false);
|
||||
showSnackbar("Store Updated Successfully!", "green");
|
||||
}
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ Template.systemAdmin.onRendered(function() {
|
|||
$("#allAdmReg").prop('checked', curr.SysAdminReg);
|
||||
$("#recvUpdateMsgs").prop('checked', curr.allowUpdates);
|
||||
} else {
|
||||
// console.log(" ---- unable to find current system configuration.");
|
||||
console.log(" ---- unable to find current system configuration.");
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -27,34 +27,34 @@ Template.systemAdmin.onRendered(function() {
|
|||
});
|
||||
|
||||
Template.systemAdmin.helpers({
|
||||
currConfigs: function() {
|
||||
|
||||
},
|
||||
});
|
||||
|
||||
Template.systemAdmin.events({
|
||||
'change #allowGenReg, change #allowAdmReg' (evnnt) {
|
||||
let genReg = $("#allowGenReg").prop('checked');
|
||||
let admReg = $("#allowAdmReg").prop('checked');
|
||||
const addNoSysReg = async() => {
|
||||
let result = await Meteor.callAsync("add.noSysAdminReg", admReg, genReg);
|
||||
if (!result) {
|
||||
showSnackbar("Registration Permission Change Failed.", "red");
|
||||
// console.log("General Reg set to: " + genReg);
|
||||
Meteor.call("add.noSysAdminReg", admReg, genReg, function(err, result) {
|
||||
if (err) {
|
||||
// console.log(" ERROR updating permission to allow general registration: " + err);
|
||||
// showSnackbar("Registration Permission Change Failed.", "red");
|
||||
} else {
|
||||
// console.log(" Successfully updated permission to allow general registration.");
|
||||
showSnackbar("Registration Permission Successfully Changed.", "green")
|
||||
}
|
||||
}
|
||||
addNoSysReg();
|
||||
});
|
||||
},
|
||||
'change #recvUpdateMsgs' (event) {
|
||||
let updSet = $("#recvUpdateMsgs").prop('checked');
|
||||
const allowUpdateInfo = async() => {
|
||||
let result = await Meteor.callAsync('allow.updateInfo', updSet);
|
||||
if (!result) {
|
||||
// console.log(" ERROR changing update setting.");
|
||||
showSnackbar("Update Setting Change Failed.", "red");
|
||||
Meteor.call('allow.updateInfo', updSet, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR changing update setting: " + err);
|
||||
} else {
|
||||
showSnackbar("Update Setting Changed Successfully!", "green");
|
||||
}
|
||||
}
|
||||
allowUpdateInfo();
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<form class="row" style="gap: 1em;">
|
||||
<div class="col s12 m6 l4 chips chips-placeholder" id="taskName">
|
||||
</div>
|
||||
<div class="col s12 m6 l4 input-field">
|
||||
<div class="col s12 m6 l4 input-field outlined">
|
||||
<select name="taskUser" id="taskUser" class="taskUser">
|
||||
<option value="" disabled selected>Assign to user...</option>
|
||||
{{#each taskUsers}}
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
{{/each}}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col s12 m6 l4 input-field">
|
||||
<div class="col s12 m6 l4 input-field outlined">
|
||||
<input type="text" class="datepicker" id="taskDate" />
|
||||
<label for="taskDate">Task Date (multiple entries)</label>
|
||||
<div class="row">
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ Template.taskForm.events({
|
|||
event.preventDefault();
|
||||
let elemcc = document.getElementById('taskName');
|
||||
let taskName = M.Chips.getInstance(elemcc).chipsData;
|
||||
// console.log(taskName);
|
||||
console.log(taskName);
|
||||
},
|
||||
'change #taskDate' (event) {
|
||||
let taskDate = $("#taskDate").val();
|
||||
|
|
@ -69,6 +69,7 @@ Template.taskForm.events({
|
|||
let taskDateErr = false;
|
||||
let userInfo;
|
||||
let actDate = [];
|
||||
// console.dir(taskNameArr);
|
||||
|
||||
if (taskNameArr == null || taskNameArr == []) {
|
||||
taskNameErr = true;
|
||||
|
|
@ -91,19 +92,17 @@ Template.taskForm.events({
|
|||
}
|
||||
|
||||
if (taskUserErr == false && taskDateErr == false && taskNameErr == false) {
|
||||
const addTask = async() => {
|
||||
let result = await Meteor.callAsync("add.task", taskNameArr, userInfo[0], userInfo[1], taskDateArr, actDate);
|
||||
if (!result) {
|
||||
// console.log(" ERROR adding the new task.");
|
||||
Meteor.call("add.task", taskNameArr, userInfo[0], userInfo[1], taskDateArr, actDate, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding the new task: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS adding the new task.");
|
||||
console.log(" SUCCESS adding the new task.");
|
||||
Session.set("taskDateArr", []);
|
||||
$("#taskDate").val("");
|
||||
$("#taskUser").val("");
|
||||
$('select').formSelect();
|
||||
}
|
||||
}
|
||||
addTask();
|
||||
});
|
||||
} else {
|
||||
showSnackbar("ERROR: Missing Required Fields!", "red");
|
||||
}
|
||||
|
|
@ -115,5 +114,6 @@ Template.taskForm.events({
|
|||
} else {
|
||||
Session.set("hideCompletedTasks", false);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
|
@ -43,15 +43,13 @@ Template.taskTbl.events({
|
|||
'click .markTaskComplete' (event) {
|
||||
event.preventDefault();
|
||||
let taskId = this._id;
|
||||
const markComp = async() => {
|
||||
let result = await Meteor.callAsync("markTask.complete", taskId);
|
||||
if (!result) {
|
||||
// console.log(" ERROR marking task completeL " + err);
|
||||
Meteor.call("markTask.complete", taskId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR marking task completeL " + err);
|
||||
showSnackbar("ERROR Marking Task Complete!", "red");
|
||||
} else {
|
||||
showSnackbar("Successfully Marked Task Complete!", "green");
|
||||
}
|
||||
}
|
||||
markComp();
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
@ -2,13 +2,12 @@
|
|||
<h4>My Dashboard</h4>
|
||||
<div class="row">
|
||||
{{#if $eq currConfig.allowUpdates true}}
|
||||
{{#if $eq updatesExist true}}
|
||||
{{#if updatesExist}}
|
||||
<div class="col s12">
|
||||
<ul class="collapsible green darken-3 white-text">
|
||||
<li>
|
||||
<div class="collapsible-header"><strong>Update Available</strong></div>
|
||||
<div class="collapsible-body">
|
||||
<div class="row">
|
||||
<div class="card green darken-3" id="updateInfoCard">
|
||||
<div class="card-content white-text">
|
||||
<div class="card-title">Update Available</div>
|
||||
<div class="row">
|
||||
{{#each updates}}
|
||||
<div class="col s12">
|
||||
<div class="row">
|
||||
|
|
@ -17,7 +16,7 @@
|
|||
</div>
|
||||
<div class="col s12">
|
||||
Release Notes:
|
||||
<p class="flow-text">{{{descriptionSinHTML}}}</p>
|
||||
<p class="flow-text">{{descriptionSinHTML}}</p>
|
||||
</div>
|
||||
<div class="col s12">
|
||||
Release Date:
|
||||
|
|
@ -34,9 +33,8 @@
|
|||
<hr />
|
||||
{{/each}}
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -7,8 +7,6 @@ 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");
|
||||
|
|
@ -25,10 +23,7 @@ Template.dashboard.onCreated(function() {
|
|||
});
|
||||
|
||||
Template.dashboard.onRendered(function() {
|
||||
setTimeout(function() {
|
||||
var elems = document.querySelectorAll('.collapsible');
|
||||
var instances = M.Collapsible.init(elems, {});
|
||||
}, 200);
|
||||
|
||||
});
|
||||
|
||||
Template.dashboard.helpers({
|
||||
|
|
@ -65,53 +60,23 @@ Template.dashboard.helpers({
|
|||
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);
|
||||
}
|
||||
return UpdateInfo.find({});
|
||||
},
|
||||
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 updateExists = UpdateInfo.find({ viewed: false }).fetch();
|
||||
if (updateExists.length > 0) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
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;
|
||||
return SysConfig.findOne({});
|
||||
},
|
||||
descriptionSinHTML: function() {
|
||||
let desc = this.description;
|
||||
let sinH = $(desc).text();
|
||||
return desc;
|
||||
return sinH;
|
||||
},
|
||||
niceDate: function() {
|
||||
let rDateNorm = this.date;
|
||||
|
|
@ -175,19 +140,12 @@ Template.dashboard.events({
|
|||
'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);
|
||||
Meteor.call('markUpdate.read', eventId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR marking update as 'read': " + err);
|
||||
} else {
|
||||
console.log("marked read successfully!");
|
||||
}
|
||||
}
|
||||
markUpdate();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -22,16 +22,14 @@ Template.deleteConfirmationModal.events({
|
|||
let deleteId = Session.get("deleteId");
|
||||
let method = Session.get("method");
|
||||
|
||||
const delItem = async() => {
|
||||
let result = await Meteor.callAsync(method, deleteId);
|
||||
if (!result) {
|
||||
Meteor.call(method, deleteId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR deleting item from modal: " + err);
|
||||
} else {
|
||||
console.log(" SUCCESSFULLY deleted.");
|
||||
// put the new modal open / close here
|
||||
// $('#modalDelete').modal('close');
|
||||
}
|
||||
}
|
||||
delItem();
|
||||
});
|
||||
},
|
||||
});
|
||||
|
|
@ -11,8 +11,8 @@
|
|||
<li><a href="#" id="mylists" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}">My Lists</a></li>
|
||||
<li><a href="#" id="mymenus" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}">My Menus</a></li>
|
||||
<li><a href="#" id="myTasks" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}">My Tasks</a></li>
|
||||
<li><a href="#" id="mySettings" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}">My Settings</a></li>
|
||||
{{#if isInRole "systemadmin"}}
|
||||
<li><a href="#" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}" id="mySettings">My Settings</a></li>
|
||||
{{#if isInRole 'systemadmin'}}
|
||||
<li><a href="#" id="manage" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}">Manage</a></li>
|
||||
{{/if}}
|
||||
<li class="signOut {{#if $eq myTheme 'dark'}}white-text{{/if}}"><a href="#" class="signOut">Log Out</a></li>
|
||||
|
|
@ -30,12 +30,10 @@
|
|||
<li><a href="#!" id="mylists" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}">My Lists</a></li>
|
||||
<li><a href="#!" id="mymenus" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}">My Menus</a></li>
|
||||
<li><a href="#!" id="myTasks" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}">My Tasks</a></li>
|
||||
<li><a href="#!" id="mySettings" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}">My Settings</a></li>
|
||||
<li><a href="#!" class="navBtn" id="mySettings {{#if $eq myTheme 'dark'}}white-text{{/if}}">My Settings</a></li>
|
||||
{{#if isInRole 'systemadmin'}}
|
||||
<li><a href="#!" id="manage" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}">Manage</a></li>
|
||||
{{#if $eq updateExists true}}
|
||||
<li><a href="#!"><i class="material-icons navBtn" id="dashboard">notifications</i></a></li>
|
||||
{{/if}}
|
||||
<li><a href="#!"><i class="material-icons">notifications</i></a></li>
|
||||
{{/if}}
|
||||
<li><a href="#!" class="signOut {{#if $eq myTheme 'dark'}}white-text{{/if}}">Sign Out</a></li>
|
||||
{{else}}
|
||||
|
|
|
|||
|
|
@ -1,38 +1,15 @@
|
|||
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, {});
|
||||
|
||||
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);
|
||||
var instances = M.Dropdown.init(elemd, {});
|
||||
});
|
||||
|
||||
Template.headerBar.helpers({
|
||||
|
|
|
|||
|
|
@ -1,26 +1,9 @@
|
|||
<template name="listItemTblByStore">
|
||||
<div class="row">
|
||||
<div class="col s12">
|
||||
<span>Products with no assigned store, will not be displayed on this version of the list.</span>
|
||||
<ul class="collection with-header">
|
||||
{{#each stores}}
|
||||
{{#if $eq storeInList true}}
|
||||
<li class="collection-header"><h4>{{storeName}}</h4></li>
|
||||
{{#each thisListItems}}
|
||||
<li class="collection-item" id="{{_id}}-{{itemOrdered}}">
|
||||
<span>
|
||||
{{#if $eq itemOrdered true}}
|
||||
<strike>{{itemName}}</strike>
|
||||
{{else}}
|
||||
{{itemName}}
|
||||
{{/if}}
|
||||
</span>
|
||||
<i class="material-icons clickable deleteListItem right modal-trigger" href="#modalDelete">delete</i>
|
||||
<i class="material-icons clickable markListItemReceived right">check</i>
|
||||
</li>
|
||||
{{/each}}
|
||||
{{/if}}
|
||||
{{/each}}
|
||||
<li class="collection-header"><h4>First Names</h4></li>
|
||||
<li class="collection-item">Alvin</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -17,73 +17,14 @@ Template.listItemTblByStore.onRendered(function() {
|
|||
});
|
||||
|
||||
Template.listItemTblByStore.helpers({
|
||||
stores: function() {
|
||||
let storeList = Stores.find({});
|
||||
return storeList;
|
||||
},
|
||||
thisListItems: function() {
|
||||
let showReceived = Session.get("showReceivedItems");
|
||||
let showReceved = 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;
|
||||
}
|
||||
},
|
||||
let stores = Stores.find({}).fetch();
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
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");
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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,7 +48,6 @@ Template.listItemsForm.helpers({
|
|||
}
|
||||
},
|
||||
itemProdName: function() {
|
||||
|
||||
return Products.find({});
|
||||
},
|
||||
editMode: function() {
|
||||
|
|
@ -67,7 +66,14 @@ Template.listItemsForm.events({
|
|||
if (item == null || item == "") {
|
||||
Session.set("itemReqErr", true);
|
||||
} else {
|
||||
addItem(item, listId);
|
||||
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("");
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
'keydown #findListItems' (event) {
|
||||
|
|
@ -77,7 +83,14 @@ Template.listItemsForm.events({
|
|||
if (item == null || item == "") {
|
||||
Session.set("itemReqErr", true);
|
||||
} else {
|
||||
addItem(item, listId);
|
||||
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("");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -97,11 +110,8 @@ 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 (!listItemInfo) {
|
||||
// console.log("No data for key input.");
|
||||
} else {
|
||||
if (typeof listItemInfo != 'undefined' && listItemInfo != "" && listItemInfo != null) {
|
||||
getDataList(listItemInfo);
|
||||
}
|
||||
}
|
||||
|
|
@ -118,21 +128,7 @@ Template.listItemsForm.events({
|
|||
});
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,5 @@
|
|||
<template name="listItemsMain">
|
||||
{{> listItemsForm}}
|
||||
<hr>
|
||||
<div class="row">
|
||||
<div class="col s12">
|
||||
<ul class="tabs">
|
||||
<li class="tab col s6">
|
||||
<a href="#listOnly" class='active'>List</a>
|
||||
</li>
|
||||
<li class="tab col s6">
|
||||
<a href="#listByStore">List by Store</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="listOnly" class="col s12">
|
||||
{{> listItemsTbl}}
|
||||
</div>
|
||||
<div id="listByStore" class="col s12">
|
||||
{{> listItemTblByStore}}
|
||||
</div>
|
||||
</div>
|
||||
{{> listItemsTbl}}
|
||||
</template>
|
||||
|
|
@ -1,12 +1,9 @@
|
|||
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({
|
||||
|
|
|
|||
|
|
@ -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 (!searchVal) {
|
||||
if (typeof searchVal == 'undefined' || searchVal.length === 0) {
|
||||
return ListItems.find({ itemReceived: false });
|
||||
} else {
|
||||
return ListItems.find({ itemReceived: false, itemName: { $regex: searchVal + '.*', $options: 'i' } });
|
||||
}
|
||||
} else {
|
||||
if (!searchVal) {
|
||||
if (typeof searchVal == 'undefined' || searchVal.length == 0) {
|
||||
return ListItems.find({});
|
||||
} else {
|
||||
return ListItems.find({ itemName: { $regex: searchVal + '.*', $options: 'i' } });
|
||||
|
|
@ -40,37 +40,34 @@ Template.listItemsTbl.helpers({
|
|||
Template.listItemsTbl.events({
|
||||
'click li' (event) {
|
||||
event.preventDefault();
|
||||
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.");
|
||||
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);
|
||||
} else {
|
||||
// console.log(" SUCCESS setting item as ordered.");
|
||||
// console.log(" SUCCESS setting this item as NOT ordered.");
|
||||
}
|
||||
} else {
|
||||
let result = Meteor.callAsync('setOrdered.listItem', this._id);
|
||||
if (!result) {
|
||||
// console.log(" ERROR marking item ordered: " + err);
|
||||
});
|
||||
} else {
|
||||
Meteor.call('setOrdered.listItem', this._id, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR marking item ordered: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS marking this item ordered.");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
setOrd();
|
||||
},
|
||||
'click .markListItemReceived' (event) {
|
||||
event.preventDefault();
|
||||
const setRcvd = async() => {
|
||||
let result = await Meteor.callAsync('setReceived.listItem', this._id);
|
||||
if (!result) {
|
||||
// console.log("Item not marked properly - why?");
|
||||
Meteor.call('setReceived.listItem', this._id, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR setting item as received: " + err);
|
||||
} else {
|
||||
// console.log("Item Marked Received.");
|
||||
// console.log(" SUCCESS setting item received.");
|
||||
}
|
||||
}
|
||||
setRcvd();
|
||||
});
|
||||
},
|
||||
'click .deleteListItem' (event) {
|
||||
event.preventDefault();
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
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");
|
||||
|
|
@ -28,17 +27,15 @@ Template.listsTbl.events({
|
|||
} else {
|
||||
// console.log("listId is: " + listId);
|
||||
Session.set("listId", listId);
|
||||
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);
|
||||
Meteor.call('add.userLast', "List", listId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR setting user last list id in db: " + err);
|
||||
} else {
|
||||
setTimeout(function() {
|
||||
Meteor.setTimeout(function() {
|
||||
FlowRouter.go('/listitems');
|
||||
}, 100);
|
||||
}
|
||||
}
|
||||
addUserLast();
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -50,17 +47,15 @@ Template.listsTbl.events({
|
|||
let splitList = listFullId.split("_");
|
||||
let listId = splitList[1];
|
||||
// console.log("listId is " + listId);
|
||||
const markComp = async() => {
|
||||
let result = await Meteor.callAsync("mark.complete", listId);
|
||||
if (!result) {
|
||||
// console.log(" ERROR marking list complete!");
|
||||
Meteor.call("mark.complete", listId, function(err, result){
|
||||
if (err) {
|
||||
console.log(" ERROR marking list complete! " + err);
|
||||
showSnackbar("ERROR! List Not Makred Complete!", "red");
|
||||
} else {
|
||||
// console.log(" SUCCESS marking list complete.");
|
||||
showSnackbar("List Marked Complete!", "green");
|
||||
}
|
||||
}
|
||||
markComp();
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -7,27 +7,20 @@ Template.MainLayout.onCreated(function() {
|
|||
Template.MainLayout.onRendered(function() {
|
||||
this.autorun(() => {
|
||||
let myId = Meteor.userId();
|
||||
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);
|
||||
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.");
|
||||
}
|
||||
getConfig();
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -39,9 +39,10 @@
|
|||
<a class="left btn waves-effect waves-light orange white-text modal-close">Cancel</a>
|
||||
</div>
|
||||
<div class="col s6 m6 l6">
|
||||
<a class="right btn waves-effect waves-light green white-text saveProdsToList modal-close" id="saveProdsToList">Save to List</a>
|
||||
<a class="right btn waves-effect waves-light green white-text saveProdsToList" id="saveProdsToList">Save to List</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{{> snackbar}}
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@ Template.addProdToListModal.helpers({
|
|||
},
|
||||
productToChoose: function() {
|
||||
let menuItemId = Session.get("menuItemId");
|
||||
// console.log("Menu Item Id received is: " + menuItemId);
|
||||
console.log("Menu Item Id received is: " + menuItemId);
|
||||
let prodLinkLIst = MenuProdLinks.find({ menuItemId: menuItemId});
|
||||
// console.dir(prodLinkLIst);
|
||||
console.dir(prodLinkLIst);
|
||||
if (typeof prodLinkLIst != 'undefined' && prodLinkLIst != "" && prodLinkLIst != null) {
|
||||
return prodLinkLIst;
|
||||
}
|
||||
|
|
@ -44,23 +44,21 @@ Template.addProdToListModal.events({
|
|||
'click .productListing' (event) {
|
||||
let itemId = event.currentTarget.id;
|
||||
let selected = Session.get("itemsSelected");
|
||||
// console.log("Item clicked: " + itemId);
|
||||
console.log("Item clicked: " + itemId);
|
||||
selected.push(itemId);
|
||||
// console.dir(selected);
|
||||
console.dir(selected);
|
||||
Session.set("itemsSelected", selected);
|
||||
},
|
||||
'click #saveProdsToList' (event) {
|
||||
event.preventDefault();
|
||||
let selectedItems = Session.get("itemsSelected");
|
||||
let listId = $("#chooseList").val();
|
||||
const addItemsFromMenu = async() => {
|
||||
let result = await Meteor.callAsync('add.itemsFromMenuItem', selectedItems, listId);
|
||||
if (!result) {
|
||||
console.log(" ERROR adding menu components to list: ");
|
||||
Meteor.call('add.itemsFromMenuItem', selectedItems, listId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding menu components to list: " + err);
|
||||
} else {
|
||||
showSnackbar("Items Added to List!", "green");
|
||||
}
|
||||
}
|
||||
addItemsFromMenu();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -38,27 +38,13 @@ Template.menuItemsForm.helpers({
|
|||
if (Session.get("menuId")) {
|
||||
menuId = Session.get("menuId");
|
||||
} else {
|
||||
const menuInfor = async() => {
|
||||
let result = await UserLast.findOneAsync({ view: "Menu" }).viewId;
|
||||
if (!result) {
|
||||
|
||||
} else {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
let menuId = menuInfor();
|
||||
menuId = UserLast.findOne({ view: "Menu" }).viewId;
|
||||
}
|
||||
|
||||
const menuData = async() => {
|
||||
let menuInfo = await Menus.findOneAsync({ _id: menuId });
|
||||
if (!menuInfo) {
|
||||
return;
|
||||
} else {
|
||||
return menuInfo.menuName;
|
||||
}
|
||||
let menuInfo = Menus.findOne({ _id: menuId });
|
||||
if (menuInfo) {
|
||||
return menuInfo.menuName;
|
||||
}
|
||||
let menuInformation = menuData();
|
||||
return menuInformation;
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -69,77 +55,49 @@ Template.menuItemsForm.events({
|
|||
let dateSrv = $("#dateServed").val();
|
||||
let menuId = Session.get("menuId");
|
||||
|
||||
if (menuId == null || menuId == "") {
|
||||
console.log(" ---- NO MENU ID! ----");
|
||||
}
|
||||
|
||||
const mie = async() => {
|
||||
let menuItemExists = await MenuItems.findOneAsync({ itemName: menuItem });
|
||||
if (!menuItemExists) {
|
||||
// call to add it
|
||||
notExists();
|
||||
} else {
|
||||
// call to add it to the menu only
|
||||
console.dir(menuItemExists);
|
||||
itExists(menuItemExists);
|
||||
}
|
||||
}
|
||||
mie();
|
||||
let menuItemExists = MenuItems.findOne({ itemName: menuItem });
|
||||
|
||||
const notExists = async() => {
|
||||
// add the item as new and add to the menu
|
||||
if (menuItem == null || menuItem == "") {
|
||||
Session.set("menuItemErr", true);
|
||||
} else {
|
||||
const addMenuItem = async() => {
|
||||
let result = await Meteor.callAsync('add.menuItem', menuItem);
|
||||
if (!result) {
|
||||
// console.log(" ERROR adding menu item: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS adding menu item. Result is: " + result);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
let addedItem = await addMenuItem();
|
||||
|
||||
if (!addedItem) {
|
||||
// console.log("Item was not added.");
|
||||
} else {
|
||||
// now add this item to the menu
|
||||
// console.log("Added Item = " + addedItem);
|
||||
const addToMenu = async() => {
|
||||
let result2 = await Meteor.callAsync('addto.Menu', menuId, menuItem, addedItem, dateSrv, false);
|
||||
if (!result2) {
|
||||
// console.log(" ERROR adding menuitem to menu: " + error);
|
||||
} else {
|
||||
$("#menuItemInp").val("");
|
||||
$("#dateServed").val("");
|
||||
// console.log("Added item to menu - no problem.");
|
||||
}
|
||||
}
|
||||
addToMenu();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const itExists = async(menuItemExists) => {
|
||||
if (typeof menuItemExists != 'undefined' && menuItemExists != null && menuItemExists != "") {
|
||||
// use the existing item on the menu
|
||||
let menuItemId = menuItemExists._id;
|
||||
let isLinked = menuItemExists.isLinked;
|
||||
if (menuItem == null || menuItem == "") {
|
||||
Session.set("menuItemErr", true);
|
||||
} else {
|
||||
const addToMenu = async() => {
|
||||
let result = await Meteor.callAsync('addto.Menu', menuId, menuItem, menuItemId, dateSrv, isLinked);
|
||||
if (!result) {
|
||||
// console.log(" ERROR adding menuitem to menu: " + error);
|
||||
Meteor.call('addto.Menu', menuId, menuItem, menuItemId, dateSrv, isLinked, function(error, nresult) {
|
||||
if (error) {
|
||||
console.log(" ERROR adding menuitem to menu: " + error);
|
||||
} else {
|
||||
// console.log("Added item to menu - no problem.");
|
||||
$("#menuItemInp").val("");
|
||||
$("#dateServed").val("");
|
||||
}
|
||||
}
|
||||
addToMenu();
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// add the item as new and add to the menu
|
||||
if (menuItem == null || menuItem == "") {
|
||||
Session.set("menuItemErr", true);
|
||||
} else {
|
||||
Meteor.call('add.menuItem', menuItem, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding menu item: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS adding menu item.");
|
||||
$("#menuItemInp").val("");
|
||||
$("#dateServed").val("");
|
||||
|
||||
// now add this item to the menu
|
||||
Meteor.call('addto.Menu', menuId, menuItem, result, dateSrv, false, function(error, nresult) {
|
||||
if (error) {
|
||||
console.log(" ERROR adding menuitem to menu: " + error);
|
||||
} else {
|
||||
// console.log("Added item to menu - no problem.");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -152,25 +110,20 @@ Template.menuItemsForm.events({
|
|||
let menuItemId = menuInfo[i]._id;
|
||||
let momentAddDay = moment(menuInfo[i].serveDate).add(1, 'day').format("MMM DD, YYYY");
|
||||
// console.log(momentAddDay);
|
||||
const shiftDay = async() => {
|
||||
let result = await Meteor.callAsync('shiftDate', menuItemId, momentAddDay);
|
||||
if (!result) {
|
||||
// console.log(" ERROR shifting meal days: " + err);
|
||||
Meteor.call('shiftDate', menuItemId, momentAddDay, function(err,result) {
|
||||
if (err) {
|
||||
console.log(" ERROR shifting meal days: " + err);
|
||||
} else {
|
||||
showSnackbar("Items Shifted Out by 1 Calendar Day", "green");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
'keyup #menuItemInp' (event) {
|
||||
if (event.which != 13) {
|
||||
let findMenuItem = $("#menuItemInp").val();
|
||||
let menuItemInfo = MenuItems.find({ itemName: {$regex: findMenuItem + '.*', $options: 'i' }}).fetch();
|
||||
if (!menuItemInfo) {
|
||||
console.log("Nothing found in menu items:");
|
||||
console.dir(menuItemInfo);
|
||||
} else {
|
||||
console.dir(menuItemInfo)
|
||||
if (typeof menuItemInfo != 'undefined' && menuItemInfo != '' && menuItemInfo != null) {
|
||||
getMenuItemList(menuItemInfo);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,21 +30,11 @@ Template.menuItemsTbl.helpers({
|
|||
if (Session.get("menuId")) {
|
||||
menuId = Session.get("menuId");
|
||||
} else {
|
||||
const menu = async() => {
|
||||
let menId = await UserLast.findOneAsync({ view: "Menu" }).viewId;
|
||||
if (!menId) {
|
||||
|
||||
} else {
|
||||
return menId;
|
||||
}
|
||||
}
|
||||
menuId = menu();
|
||||
menuId = UserLast.findOne({ view: "Menu" }).viewId;
|
||||
}
|
||||
if (menuId) {
|
||||
let menuInfo = Menus.find({ _id: menuId }, { sort: { serveDateActual: 1 }});
|
||||
if (menuInfo) {
|
||||
return menuInfo;
|
||||
}
|
||||
let menuInfo = Menus.find({ _id: menuId }, { sort: { serveDateActual: 1 }});
|
||||
if (menuInfo) {
|
||||
return menuInfo
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -53,7 +43,7 @@ Template.menuItemsTbl.events({
|
|||
'click .deleteMenuItem' (event) {
|
||||
event.preventDefault();
|
||||
let theseIds = Session.get("menuId") + "_" + this.menuItemId;
|
||||
// console.log("These Ids: " + theseIds);
|
||||
console.log("These Ids: " + theseIds);
|
||||
Session.set("deleteId", theseIds);
|
||||
Session.set("method", "delete.itemFromMenu");
|
||||
Session.set("item", this.menuItemName);
|
||||
|
|
@ -63,7 +53,7 @@ Template.menuItemsTbl.events({
|
|||
event.preventDefault();
|
||||
Session.set("menuItemId", this.menuItemId);
|
||||
Session.set("menuItemName", this.menuItemName);
|
||||
// console.log("menu item name = " + this.menuItemName);
|
||||
console.log("menu item name = " + this.menuItemName);
|
||||
},
|
||||
'click .addProdsToList' (event) {
|
||||
event.preventDefault();
|
||||
|
|
|
|||
|
|
@ -18,29 +18,17 @@ Template.modalLinkProducts.onRendered(function() {
|
|||
dropdownOptions: 4,
|
||||
});
|
||||
|
||||
this.autorun(() => {
|
||||
if (this.subscriptionsReady()) {
|
||||
// setTimeout(function() {
|
||||
// var instances = M.Modal.init(elems, {});
|
||||
var elemse = document.querySelectorAll('select');
|
||||
var instancese = M.FormSelect.init(elemse, {
|
||||
dropdownOptions: 4,
|
||||
});
|
||||
// }, 250);
|
||||
}
|
||||
});
|
||||
setTimeout(function() {
|
||||
var instances = M.Modal.init(elems, {});
|
||||
var instancese = M.FormSelect.init(elemse, {
|
||||
dropdownOptions: 4,
|
||||
});
|
||||
}, 250);
|
||||
});
|
||||
|
||||
Template.modalLinkProducts.helpers({
|
||||
products: function() {
|
||||
let prodInfo = Products.find({}, { sort: { prodName:1 }});
|
||||
// return Products.find({}, {sort: { prodName:1 }});
|
||||
if (!prodInfo) {
|
||||
console.log("no product info yet.");
|
||||
} else {
|
||||
console.log("prod info found.");
|
||||
return prodInfo;
|
||||
}
|
||||
return Products.find({}, {sort: { prodName:1 }});
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -54,7 +42,7 @@ Template.modalLinkProducts.events({
|
|||
let links = M.FormSelect.getInstance(linkSelect).getSelectedValues();
|
||||
if (typeof links != undefined && links != [] && links != null) {
|
||||
// let's split these links into their parts, and make an array of objects
|
||||
for (let i=0; i<links.length; i++) {
|
||||
for (i=0; i<links.length; i++) {
|
||||
let linkArray = links[i].split('|');
|
||||
let key = linkArray[0];
|
||||
let value = linkArray[1];
|
||||
|
|
@ -62,33 +50,25 @@ Template.modalLinkProducts.events({
|
|||
linkObjArray.push(linkObj);
|
||||
}
|
||||
|
||||
const addMenuProdLinks = async() => {
|
||||
let result = await Meteor.callAsync("add.menuProdLinks", menuItemId, menuItemName, linkObjArray);
|
||||
if (!result) {
|
||||
// console.log(" ERROR adding product links to this menu item: " + err);
|
||||
Meteor.call("add.menuProdLinks", menuItemId, menuItemName, linkObjArray, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding product links to this menu item: " + err);
|
||||
} else {
|
||||
updMenuItemLinks();
|
||||
Meteor.call('update.menuItemLinked', menuItemId, true, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding link to menu item: " + err);
|
||||
} else {
|
||||
Meteor.call('link.inMenu', menuItemId, true, function(error, nresult) {
|
||||
if (error) {
|
||||
console.log(" ERROR adding link to menu sub-item: " + error);
|
||||
} else {
|
||||
showSnackbar("Products added to Menu Item successfully!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
addMenuProdLinks();
|
||||
|
||||
const updMenuItemLinks = async() => {
|
||||
let result = await Meteor.callAsync('update.menuItemLinked', menuItemId, true);
|
||||
if (!result) {
|
||||
// console.log(" ERROR adding link to menu item: " + err);
|
||||
} else {
|
||||
linkInMenu();
|
||||
}
|
||||
}
|
||||
|
||||
const linkInMenu = async() => {
|
||||
let result = await Meteor.callAsync('link.inMenu', menuItemId, true);
|
||||
if (!result) {
|
||||
console.log(" ERROR adding link to menu sub-item: " + error);
|
||||
} else {
|
||||
showSnackbar("Products added to Menu Item successfully!", "green");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -27,16 +27,14 @@ Template.addMenuModal.events({
|
|||
if (menuName == "" || menuName == null) {
|
||||
Session.set("menuNameErr", true);
|
||||
} else {
|
||||
const addMenu = async() => {
|
||||
let result = await Meteor.callAsync("add.menu", menuName);
|
||||
if (!result) {
|
||||
// console.log(" ERROR adding menu: " + err);
|
||||
Meteor.call("add.menu", menuName, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding menu: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS adding menu.");
|
||||
console.log(" SUCCESS adding menu.");
|
||||
$("#menuNameInp").val("");
|
||||
}
|
||||
}
|
||||
addMenu();
|
||||
});
|
||||
}
|
||||
},
|
||||
});
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
import { Menus } from '../../imports/api/menu.js';
|
||||
import { M } from '../lib/assets/materialize.js';
|
||||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
|
||||
Template.mainMenuTbl.onCreated(function() {
|
||||
this.subscribe("myMenus");
|
||||
|
|
@ -22,7 +21,7 @@ Template.mainMenuTbl.events({
|
|||
'click li.collection-item' (event) {
|
||||
event.preventDefault();
|
||||
let sender = event.target;
|
||||
// console.log("Sender originated from: ");
|
||||
// console.log("Sender origination from: ");
|
||||
// console.log(sender.localName);
|
||||
if (sender.localName == "li") {
|
||||
let menuId = event.currentTarget.id;
|
||||
|
|
@ -30,38 +29,33 @@ Template.mainMenuTbl.events({
|
|||
// console.log("add menu clicked");
|
||||
} else {
|
||||
// console.log("menuId is: " + menuId);
|
||||
const addUserLast = async() => {
|
||||
Session.set("menuId", menuId);
|
||||
let result = await Meteor.callAsync('add.userLast', "Menu", menuId);
|
||||
if (!result) {
|
||||
// console.log(" ERROR writing last menu viewed by user to db.");
|
||||
Meteor.call('add.userLast', "Menu", menuId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR writing last menu viewed by user to db: " + err);
|
||||
} else {
|
||||
FlowRouter.go('/menuitems');
|
||||
Session.set("menuId", menuId);
|
||||
Meteor.setTimeout(function() {
|
||||
FlowRouter.go('/menuitems');
|
||||
}, 100);
|
||||
}
|
||||
}
|
||||
addUserLast();
|
||||
});
|
||||
}
|
||||
} else if (sender.localName == "i") {
|
||||
let menuId = this._id;
|
||||
const makrMenuComp = async() => {
|
||||
let result = await Meteor.callAsync("markMenu.complete", menuId);
|
||||
if (!result) {
|
||||
// console.log(" ERROR: can't mark menu complete.");
|
||||
Meteor.call("markMenu.complete", menuId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR: can't mark menu complete: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS marking menu complete.");
|
||||
setAllMade();
|
||||
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.");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
makrMenuComp();
|
||||
|
||||
const setAllMade = async() => {
|
||||
let result = await Meteor.callAsync('setAllMade.menuItem', menuId);
|
||||
if (!result) {
|
||||
// console.log(" ERROR: cannot set all items as made.");
|
||||
} else {
|
||||
// console.log(" SUCCESS setting all items made.");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
});
|
||||
|
|
@ -33,26 +33,34 @@ Template.myTasksForm.events({
|
|||
let taskDateArray = Session.get("taskDateArr");
|
||||
let actDate = [];
|
||||
|
||||
console.dir(taskNameArray);
|
||||
console.dir(taskDateArray);
|
||||
|
||||
if (taskNameArray == null || taskNameArray == [] || taskNameArray == "") {
|
||||
taskNameErr = true;
|
||||
}
|
||||
|
||||
if (taskDateArray == null || taskDateArray == []|| taskDateArray == "") {
|
||||
taskDateErr = true;
|
||||
} else {
|
||||
for (i = 0; i < taskDateArray.length; i++) {
|
||||
// console.log(taskDateArray[i]);
|
||||
let actDateTask = new Date(taskDateArray[i]);
|
||||
actDate.push(actDateTask);
|
||||
}
|
||||
}
|
||||
|
||||
// console.log("Date Error: " + taskDateErr + " - Name Error: " + taskNameErr);
|
||||
console.log("Date Error: " + taskDateErr + " - Name Error: " + taskNameErr);
|
||||
if (taskDateErr == false && taskNameErr == false) {
|
||||
for (const task of taskNameArray) {
|
||||
for (const date of taskDateArray) {
|
||||
let actDate = new Date(date);
|
||||
|
||||
addTask(task.id, date, actDate);
|
||||
Meteor.call("add.task", taskNameArray, "self", "selfId", taskDateArray, actDate, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding task for self: " + err);
|
||||
showSnackbar("ERROR adding task for self!", "red");
|
||||
} else {
|
||||
console.log(" SUCCESS adding task for self.");
|
||||
Session.set("taskDateArr", []);
|
||||
$("#myTaskName").val("");
|
||||
$("#myTaskDate").val("");
|
||||
showSnackbar("Added Tasks Successfully!", "green");
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
showSnackbar("Error! Both Task & Date are Required!", "red");
|
||||
}
|
||||
|
|
@ -84,17 +92,3 @@ Template.myTasksForm.events({
|
|||
Session.set("taskDateArr", taskDateArr);
|
||||
},
|
||||
});
|
||||
|
||||
const addTask = async(task, date, actDate) => {
|
||||
let result = await Meteor.callAsync("add.myTask", task, date, actDate);
|
||||
if (!result) {
|
||||
// console.log(" ERROR adding task for self: ");
|
||||
showSnackbar("Error adding task for self!", "red");
|
||||
} else {
|
||||
// console.log(" SUCCESS adding task for self.");
|
||||
// Session.set("taskDateArr", []);
|
||||
// $("#myTaskName").val("");
|
||||
// $("#myTaskDate").val("");
|
||||
showSnackbar("Added Tasks Successfully!", "green");
|
||||
}
|
||||
}
|
||||
|
|
@ -55,19 +55,19 @@ Template.myTasksTbl.events({
|
|||
'click .markMyTaskComplete' (event) {
|
||||
event.preventDefault();
|
||||
let taskId = this._id;
|
||||
const makrTaskComp = async() => {
|
||||
let result = await Meteor.callAsync("markTask.complete", taskId);
|
||||
if (!result) {
|
||||
// console.log(" ERROR marking task completeL " + err);
|
||||
Meteor.call("markTask.complete", taskId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR marking task completeL " + err);
|
||||
showSnackbar("ERROR Marking Task Complete!", "red");
|
||||
} else {
|
||||
showSnackbar("Successfully Marked Task Complete!", "green");
|
||||
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
'click .deleteMyTask' (event) {
|
||||
event.preventDefault();
|
||||
// console.log("detected click");
|
||||
console.log("detected click");
|
||||
Session.set("deleteId", this._id);
|
||||
Session.set("method", "delete.task");
|
||||
Session.set("item", this.taskName);
|
||||
|
|
|
|||
|
|
@ -5,29 +5,15 @@ Template.userConfig.onCreated(function() {
|
|||
});
|
||||
|
||||
Template.userConfig.onRendered(function() {
|
||||
const getConfig = async() => {
|
||||
// console.log("tried to get switch config.")
|
||||
let myConfig = await UserConfig.findOneAsync({ user: Meteor.userId() });
|
||||
try {
|
||||
// console.dir(myConfig);
|
||||
if (!myConfig) {
|
||||
// console.log("config not found, setting to light mode.");
|
||||
$("#darkMode").prop('checked', false);
|
||||
} else {
|
||||
// console.log("My Pref: " + myConfig.darkMode);
|
||||
if (myConfig.darkMode == 'light') {
|
||||
$("#darkMode").prop('checked', false);
|
||||
} else {
|
||||
// console.log("should be checked.")
|
||||
$("#darkMode").prop('checked', true);
|
||||
}
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR getting dark theme for setting swtich: " + error);
|
||||
let myConfig = UserConfig.findOne({ user: Meteor.userId() });
|
||||
if (typeof myConfig != 'undefined') {
|
||||
console.log("My Pref: " + myConfig.darkPref);
|
||||
if (myConfig.darkMode == 'light') {
|
||||
$("#darkMode").prop('checked', false);
|
||||
} else {
|
||||
$("#darkMode").prop('checked', true);
|
||||
}
|
||||
|
||||
}
|
||||
getConfig();
|
||||
});
|
||||
|
||||
Template.userConfig.helpers({
|
||||
|
|
@ -36,22 +22,23 @@ Template.userConfig.helpers({
|
|||
|
||||
Template.userConfig.events({
|
||||
'click #darkMode' (event) {
|
||||
let darkModePref = $("#darkMode").prop('checked')
|
||||
let darkModePref = $("#darkMode").prop('checked');
|
||||
if (darkModePref == true) {
|
||||
let mode = 'dark';
|
||||
setDarkMode(mode);
|
||||
Meteor.call('update.darkModePref', 'dark', function(err, reuslt) {
|
||||
if (err) {
|
||||
console.log(" ERROR: could not set dark mode preference to dark: " + err);
|
||||
} else {
|
||||
showSnackbar("Dark Mode Preference Set to Dark", "green");
|
||||
}
|
||||
});
|
||||
} else {
|
||||
let mode = 'light';
|
||||
setDarkMode(mode);
|
||||
Meteor.call('update.darkModePref', 'light', function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR: could not set dark mode preference to light: " + err);
|
||||
} else {
|
||||
showSnackbar("Dark Mode Preference Set to Light", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
const setDarkMode = async(mode) => {
|
||||
let result = await Meteor.callAsync('update.darkModePref', mode);
|
||||
if (!result) {
|
||||
// console.log(" - Did not receive back a 'result' from the update.");
|
||||
} else {
|
||||
showSnackbar("Dark Mode Preference Set to " + mode, "green");
|
||||
}
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ ListItems.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.listItem' (itemName, listId) {
|
||||
'add.listItem' (itemName, listId) {
|
||||
check(itemName, String);
|
||||
check(listId, String);
|
||||
|
||||
|
|
@ -25,21 +25,18 @@ Meteor.methods({
|
|||
let iname = itemName.charAt(0).toUpperCase() + itemName.slice(1);
|
||||
|
||||
// look up the item from the Products collection
|
||||
|
||||
let prodInfo = await Products.findOneAsync({ prodName: iname });
|
||||
try {
|
||||
if (!prodInfo) {
|
||||
// add product info first
|
||||
let added = await Meteor.callAsync("add.product", itemName, [""]);
|
||||
if (!added) {
|
||||
// console.log(" ERROR adding item to products: " + err);
|
||||
let prodInfo = Products.findOne({ prodName: iname });
|
||||
if (!prodInfo) {
|
||||
Meteor.call("add.product", itemName, [""], function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding item to products: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS adding item to Products.");
|
||||
|
||||
return await ListItems.insertAsync({
|
||||
return ListItems.insert({
|
||||
itemName: iname,
|
||||
listId: listId,
|
||||
prodId: added,
|
||||
prodId: result,
|
||||
addedBy: this.userId,
|
||||
itemStore: "",
|
||||
itemOrdered: false,
|
||||
|
|
@ -47,23 +44,21 @@ Meteor.methods({
|
|||
dateAddedToList: new Date(),
|
||||
});
|
||||
}
|
||||
} else {
|
||||
return await ListItems.insertAsync({
|
||||
itemName: iname,
|
||||
listId: listId,
|
||||
prodId: prodInfo._id,
|
||||
addedBy: this.userId,
|
||||
itemStore: prodInfo.prodStore,
|
||||
itemOrdered: false,
|
||||
itemReceived: false,
|
||||
dateAddedToList: new Date(),
|
||||
});
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR adding new product and item: " + error);
|
||||
});
|
||||
} else {
|
||||
return ListItems.insert({
|
||||
itemName: iname,
|
||||
listId: listId,
|
||||
prodId: prodInfo._id,
|
||||
addedBy: this.userId,
|
||||
itemStore: prodInfo.prodStore,
|
||||
itemOrdered: false,
|
||||
itemReceived: false,
|
||||
dateAddedToList: new Date(),
|
||||
});
|
||||
}
|
||||
},
|
||||
async 'add.itemsFromMenuItem' (itemIds, listId) {
|
||||
'add.itemsFromMenuItem' (itemIds, listId) {
|
||||
check(itemIds, [String]);
|
||||
check(listId, String);
|
||||
|
||||
|
|
@ -72,81 +67,70 @@ Meteor.methods({
|
|||
}
|
||||
|
||||
console.dir(itemIds);
|
||||
let noitems = itemIds.length;
|
||||
let i;
|
||||
|
||||
for (i=0; i < noitems; i++) {
|
||||
for (i=0; i < itemIds.length; i++) {
|
||||
// let's check and make sure the product isn't already on the list
|
||||
let onList = await ListItems.find({ listId: listId, prodId: itemIds[i] }).countAsync();
|
||||
// console.log("Number On List: " + onList);
|
||||
let onList = ListItems.find({ listId: listId, prodId: itemIds[i] }).count();
|
||||
console.log("Number On List: " + onList);
|
||||
if (onList == 0) {
|
||||
// now pull the product
|
||||
let prodInfo = await Products.findOneAsync({ _id: itemIds[i] });
|
||||
if (!prodInfo) {
|
||||
console.log("Unable to load product info.");
|
||||
} else {
|
||||
console.log("Run " + i);
|
||||
ListItems.insertAsync({
|
||||
itemName: prodInfo.prodName,
|
||||
listId: listId,
|
||||
prodId: prodInfo._id,
|
||||
addedBy: this.userId,
|
||||
itemStore: prodInfo.prodStore,
|
||||
itemOrdered: false,
|
||||
itemReceived: false,
|
||||
dateAddedToList: new Date(),
|
||||
});
|
||||
}
|
||||
let prodInfo = Products.findOne({ _id: itemIds[i] });
|
||||
ListItems.insert({
|
||||
itemName: prodInfo.prodName,
|
||||
listId: listId,
|
||||
prodId: prodInfo._id,
|
||||
addedBy: this.userId,
|
||||
itemStore: prodInfo.prodStore,
|
||||
itemOrdered: false,
|
||||
itemReceived: false,
|
||||
dateAddedToList: new Date(),
|
||||
});
|
||||
} else {
|
||||
// product exists on list, move on to next
|
||||
console.log("Product Exists on Selected List.");
|
||||
}
|
||||
if (i == (noitems - 1)) {
|
||||
console.log("Returning now.");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
},
|
||||
async 'setOrdered.listItem' (itemId) {
|
||||
'setOrdered.listItem' (itemId) {
|
||||
check(itemId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to set items as ordered. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await ListItems.updateAsync({ _id: itemId }, {
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
$set: {
|
||||
itemOrdered: true,
|
||||
dateOrdered: new Date(),
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'setAllOrdered.listItem' (shopListId) {
|
||||
'setAllOrdered.listItem' (shopListId) {
|
||||
// set all items that are not already set as ordered, or set as received to ordered on this list
|
||||
|
||||
},
|
||||
async 'setNotOrdered.listItem' (itemId) {
|
||||
'setNotOrdered.listItem' (itemId) {
|
||||
check(itemId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to set items as not ordered. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await ListItems.updateAsync({ _id: itemId }, {
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
$set: {
|
||||
itemOrdered: false,
|
||||
dateUnOrdered: new Date(),
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'setReceived.listItem' (itemId) {
|
||||
'setReceived.listItem' (itemId) {
|
||||
check(itemId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to set items as received. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await ListItems.updateAsync({ _id: itemId }, {
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
$set: {
|
||||
itemReceived: true,
|
||||
dateReceived: new Date(),
|
||||
|
|
@ -154,25 +138,25 @@ Meteor.methods({
|
|||
});
|
||||
|
||||
},
|
||||
async 'setNotReceived.listItem' (shopListId) {
|
||||
'setNotReceived.listItem' (shopListId) {
|
||||
check(itemId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to set items as not received. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await ListItems.updateAsync({ _id: itemId }, {
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
$set: {
|
||||
itemReceived: false,
|
||||
dateNotReceived: new Date(),
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'setAllReceived.listItem' () {
|
||||
'setAllReceived.listItem' () {
|
||||
// set all items that are not already listed as received to received on this list
|
||||
|
||||
},
|
||||
async 'edit.listItem' (itemId, itemName) {
|
||||
'edit.listItem' (itemId, itemName) {
|
||||
check(itemId, String);
|
||||
check(itemName, String);
|
||||
|
||||
|
|
@ -180,19 +164,19 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await ListItems.updateAsync({ _id: itemId }, {
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
$set: {
|
||||
itemName: itemName,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'delete.listItem' (itemId) {
|
||||
'delete.listItem' (itemId) {
|
||||
check(itemId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete list items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await ListItems.removeAsync({ _id: itemId });
|
||||
return ListItems.remove({ _id: itemId });
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ Lists.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.list' (listName, isShared) {
|
||||
'add.list' (listName, isShared) {
|
||||
check(listName, String);
|
||||
check(isShared, Boolean);
|
||||
|
||||
|
|
@ -20,14 +20,14 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Lists.insertAsync({
|
||||
return Lists.insert({
|
||||
listName: listName,
|
||||
listShared: isShared,
|
||||
listOwner: this.userId,
|
||||
listComplete: false,
|
||||
});
|
||||
},
|
||||
async 'edit.list' (listId, listName, isShared) {
|
||||
'edit.list' (listId, listName, isShared) {
|
||||
check(listId, String);
|
||||
check(listName, String);
|
||||
check(isShared, Boolean);
|
||||
|
|
@ -36,55 +36,41 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to edit lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Lists.updateAsync({ _id: listId }, {
|
||||
return Lists.update({ _id: listId }, {
|
||||
$set: {
|
||||
listName: listName,
|
||||
listShared: isShared,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'delete.list' (listId) {
|
||||
'delete.list' (listId) {
|
||||
check(listId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Lists.removeAsync({ _id: listId });
|
||||
return Lists.remove({ _id: listId });
|
||||
},
|
||||
async 'mark.complete' (listId) {
|
||||
'mark.complete' (listId) {
|
||||
check(listId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to mark lists complete. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Lists.updateAsync({ _id: listId }, {
|
||||
return Lists.update({ _id: listId }, {
|
||||
$set: {
|
||||
listComplete: true,
|
||||
completedOn: new Date()
|
||||
}
|
||||
});
|
||||
});;
|
||||
},
|
||||
async 'mark.incomplete' (listId) {
|
||||
check(listId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to restore completed lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Lists.updateAsync({ _id: listId }, {
|
||||
$set: {
|
||||
listComplete: false,
|
||||
completedOn: new Date()
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'clean.Lists' () {
|
||||
'clean.Lists' () {
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to clean up old lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Lists.removeAsync({ listComplete: true });
|
||||
return Lists.remove({ listComplete: true });
|
||||
},
|
||||
});
|
||||
|
|
@ -12,10 +12,10 @@ MScripts.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'set.ScriptRun' (scriptName) {
|
||||
'set.ScriptRun' (scriptName) {
|
||||
check(scriptName, String);
|
||||
|
||||
return await MScripts.insertAsync({
|
||||
MScripts.insert({
|
||||
scriptName: scriptName,
|
||||
hasRun: true,
|
||||
runOn: new Date(),
|
||||
|
|
|
|||
|
|
@ -15,20 +15,20 @@ Menus.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.menu' (menuName) {
|
||||
'add.menu' (menuName) {
|
||||
check(menuName, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to add menus. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Menus.insertAsync({
|
||||
return Menus.insert({
|
||||
menuName: menuName,
|
||||
menuOwner: this.userId,
|
||||
menuComplete: false,
|
||||
});
|
||||
},
|
||||
async 'edit.menu' (menuId, menuName) {
|
||||
'edit.menu' (menuId, menuName) {
|
||||
check(menuId, String);
|
||||
check(menuName, String);
|
||||
|
||||
|
|
@ -36,55 +36,88 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to edit menus. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Menus.updateAsync({ _id: menuId }, {
|
||||
return Menus.update({ _id: menuId }, {
|
||||
$set: {
|
||||
menuName: menuName,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'delete.menu' (menuId) {
|
||||
'delete.menu' (menuId) {
|
||||
check(menuId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete menus. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Menus.removeAsync({ _id: menuId });
|
||||
return Menus.remove({ _id: menuId });
|
||||
},
|
||||
async 'markMenu.complete' (menuId) {
|
||||
'markMenu.complete' (menuId) {
|
||||
check(menuId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to mark menus complete. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Menus.updateAsync({ _id: menuId }, {
|
||||
return Menus.update({ _id: menuId }, {
|
||||
$set: {
|
||||
menuComplete: true,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'markMenu.notComplete' (menuId) {
|
||||
'markMenu.notComplete' (menuId) {
|
||||
check(menuId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to mark menus not complete. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Menus.updateAsync({ _id: menuId }, {
|
||||
return Menus.update({ _id: menuId }, {
|
||||
$set: {
|
||||
menuComplete: false,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'clean.Menus' () {
|
||||
'clean.Menus' () {
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to clean up old Menus. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Menus.removeAsync({ menuComplete: true });
|
||||
let removeMenuIds = [];
|
||||
|
||||
|
||||
// let's find all the menus with menu items that are past their date.
|
||||
let menuList = Menus.find({ menuComplete: false }).fetch();
|
||||
for (i=0; i < menuList.length; i++) {
|
||||
let removeMenu = true;
|
||||
let items = MenuItems.find({ menuId: menuList[i]._id }).fetch();
|
||||
for (j=0; j < items.length; j++) {
|
||||
let srvDate = moment(items[j].serveDateActual);
|
||||
let today = moment();
|
||||
let expired = moment(today).isAfter(srvDate);
|
||||
if (expired != true) {
|
||||
removeMenu = false;
|
||||
}
|
||||
if (j == items.length - 1) {
|
||||
if (removeMenu == true) {
|
||||
removeMenuIds.push(menuList[i]._id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// next let's add the ids of any menus that are marked complete
|
||||
let markedComplete = Menus.find({ menuComplete: true }).fetch();
|
||||
for (k = 0; k < markedComplete.length; k++) {
|
||||
let menuId = markedComplete[k]._id;
|
||||
removeMenuIds.push(menuId);
|
||||
}
|
||||
|
||||
// finally we'll cycle through the ids and remove the items we collected up.
|
||||
for (l = 0; l < removeMenuIds.length; l++) {
|
||||
Menus.remove({ _id: removeMenuIds[l] });
|
||||
}
|
||||
},
|
||||
async 'addto.Menu' (menuId, menuItem, menuItemId, dateSrv, isLinked) {
|
||||
'addto.Menu' (menuId, menuItem, menuItemId, dateSrv, isLinked) {
|
||||
check(menuId, String);
|
||||
check(menuItem, String);
|
||||
check(menuItemId, String);
|
||||
|
|
@ -95,9 +128,9 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add items to menus. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
let serveDateActual = new Date(dateSrv);
|
||||
serveDateActual = new Date(dateSrv);
|
||||
|
||||
return await Menus.updateAsync({ _id: menuId }, {
|
||||
return Menus.update({ _id: menuId }, {
|
||||
$addToSet: {
|
||||
menuItems:
|
||||
{
|
||||
|
|
@ -110,7 +143,7 @@ Meteor.methods({
|
|||
}
|
||||
});
|
||||
},
|
||||
async 'link.inMenu' (menuItemId, isLinked) {
|
||||
'link.inMenu' (menuItemId, isLinked) {
|
||||
check(menuItemId, String);
|
||||
check(isLinked, Boolean);
|
||||
|
||||
|
|
@ -118,13 +151,13 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to link menu items to products. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Menus.updateAsync({ 'menuItems.menuItemId': menuItemId }, {
|
||||
return Menus.update({ 'menuItems.menuItemId': menuItemId }, {
|
||||
$set: {
|
||||
"menuItems.$.isLinked": isLinked
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'delete.itemFromMenu' (itemIds) {
|
||||
'delete.itemFromMenu' (itemIds) {
|
||||
check(itemIds, String);
|
||||
|
||||
if (!this.userId) {
|
||||
|
|
@ -132,9 +165,9 @@ Meteor.methods({
|
|||
}
|
||||
|
||||
let ids = itemIds.split('_');
|
||||
// console.log("item ids: " + ids[0] + " and " + ids[1]);
|
||||
console.log("item ids: " + ids[0] + " and " + ids[1]);
|
||||
|
||||
return await Menus.updateAsync({ _id: ids[0] }, {
|
||||
return Menus.update({ _id: ids[0] }, {
|
||||
$pull: {
|
||||
menuItems: {
|
||||
menuItemId: ids[1],
|
||||
|
|
|
|||
|
|
@ -12,21 +12,21 @@ MenuItems.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.menuItem' (itemName) {
|
||||
'add.menuItem' (itemName) {
|
||||
check(itemName, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to add items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await MenuItems.insertAsync({
|
||||
return MenuItems.insert({
|
||||
itemName: itemName,
|
||||
addedBy: this.userId,
|
||||
dateAddedtoMenu: new Date(),
|
||||
isLinked: false,
|
||||
});
|
||||
},
|
||||
async 'update.menuItemLinked' (itemId, isLinked) {
|
||||
'update.menuItemLinked' (itemId, isLinked) {
|
||||
check(itemId, String);
|
||||
check(isLinked, Boolean);
|
||||
|
||||
|
|
@ -34,13 +34,13 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to set this menu item as linked to products. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await MenuItems.updateAsync({ _id: itemId }, {
|
||||
return MenuItems.update({ _id: itemId }, {
|
||||
$set: {
|
||||
isLinked: isLinked,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'edit.madeItem' (itemId, itemName) {
|
||||
'edit.madeItem' (itemId, itemName) {
|
||||
check(itemId, String);
|
||||
check(itemName, String);
|
||||
|
||||
|
|
@ -48,22 +48,22 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to edit menu items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await MenuItems.updateAsync({ _id: itemId }, {
|
||||
return MenuItems.update({ _id: itemId }, {
|
||||
$set: {
|
||||
itemName: itemName,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'delete.menuItem' (itemId) {
|
||||
'delete.menuItem' (itemId) {
|
||||
check(itemId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete menu items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await MenuItems.removeAsync({ _id: itemId });
|
||||
return MenuItems.remove({ _id: itemId });
|
||||
},
|
||||
async 'shiftDate' (itemId, momentAddDay) {
|
||||
'shiftDate' (itemId, momentAddDay) {
|
||||
check(itemId, String);
|
||||
check(momentAddDay, String);
|
||||
|
||||
|
|
@ -71,7 +71,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to shift menu item dates. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await MenuItems.updateAsync({ _id: itemId }, {
|
||||
return MenuItems.update({ _id: itemId }, {
|
||||
$set: {
|
||||
serveDate: momentAddDay,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ MenuProdLinks.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.menuProdLinks' (menuItemId, menuItemName, prodNameArray) {
|
||||
'add.menuProdLinks' (menuItemId, menuItemName, prodNameArray) {
|
||||
check(menuItemId, String);
|
||||
check(menuItemName, String);
|
||||
check(prodNameArray, [Object]);
|
||||
|
|
@ -22,19 +22,19 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add menu and product links. Make sure you are logged in with valid user credentials.');
|
||||
};
|
||||
|
||||
let linkExists = await MenuProdLinks.findOneAsync({ menuItemId: menuItemId });
|
||||
let linkExists = MenuProdLinks.findOne({ menuItemId: menuItemId });
|
||||
|
||||
if (linkExists) {
|
||||
// console.log("sending to update method instead.");
|
||||
await Meteor.callAsync('update.menuPordLInks', menuItemId, menuItemName, prodNameArray, function(err, result) {
|
||||
console.log("sending to update method instead.");
|
||||
Meteor.call('update.menuPordLInks', menuItemId, menuItemName, prodNameArray, function(err, result) {
|
||||
if (err) {
|
||||
// console.log(" ERROR moving to the update method: " + err);
|
||||
console.log(" ERROR moving to the update method: " + err);
|
||||
} else {
|
||||
// console.log("Successfully updated the menu prod links.")
|
||||
console.log("Successfully updated the menu prod links.")
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return await MenuProdLinks.insertAsync({
|
||||
return MenuProdLinks.insert({
|
||||
menuItemId: menuItemId,
|
||||
menuItemName: menuItemName,
|
||||
products: prodNameArray,
|
||||
|
|
@ -43,7 +43,7 @@ Meteor.methods({
|
|||
});
|
||||
}
|
||||
},
|
||||
async 'update.menuPordLInks' (menuItemId, menuItemName, prodNameArray) {
|
||||
'update.menuPordLInks' (menuItemId, menuItemName, prodNameArray) {
|
||||
check(menuItemId, String);
|
||||
check(menuItemName, String);
|
||||
check(prodNameArray, [Object]);
|
||||
|
|
@ -52,8 +52,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add menu and product links. Make sure you are logged in with valid user credentials.');
|
||||
};
|
||||
|
||||
console.log(" ---- Doing an Update instead! ---- ");
|
||||
return await MenuProdLinks.updateAsync({ menuItemId: menuItemId }, {
|
||||
return MenuProdLinks.update({ menuItemId: menuItemId }, {
|
||||
$set: {
|
||||
products: prodNameArray,
|
||||
dateUpdated: Date(),
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ Products.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.product' (prodName, prodStore) {
|
||||
'add.product' (prodName, prodStore) {
|
||||
check(prodName, String);
|
||||
check(prodStore, [String]);
|
||||
|
||||
|
|
@ -24,20 +24,17 @@ Meteor.methods({
|
|||
|
||||
// first does this product already exist?
|
||||
|
||||
let prodExists = await Products.findOneAsync({ prodName: pname });
|
||||
try {
|
||||
if (!prodExists) {
|
||||
return await Products.insertAsync({
|
||||
prodName: pname,
|
||||
prodOwner: this.userId,
|
||||
prodStore: prodStore,
|
||||
});
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR adding Pdocut: " + error);
|
||||
let prodExists = Products.findOne({ prodName: pname });
|
||||
|
||||
if (!prodExists) {
|
||||
return Products.insert({
|
||||
prodName: pname,
|
||||
prodOwner: this.userId,
|
||||
prodStore: prodStore,
|
||||
});
|
||||
}
|
||||
},
|
||||
async 'edit.product' (prodId, prodName, prodStore) {
|
||||
'edit.product' (prodId, prodName, prodStore) {
|
||||
check(prodId, String);
|
||||
check(prodName, String);
|
||||
check(prodStore, [String]);
|
||||
|
|
@ -48,30 +45,20 @@ Meteor.methods({
|
|||
|
||||
let pname = prodName.charAt(0).toUpperCase() + prodName.slice(1);
|
||||
|
||||
return await Products.updateAsync({ _id: prodId }, {
|
||||
return Products.update({ _id: prodId }, {
|
||||
$set: {
|
||||
prodName: pname,
|
||||
prodStore: prodStore,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'delete.product' (prodId) {
|
||||
'delete.product' (prodId) {
|
||||
check(prodId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete products. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Products.removeAsync({ _id: prodId });
|
||||
},
|
||||
async 'clean.Products' () {
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete products. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
// first we need to find potential duplicate products
|
||||
// next we need to see which of those are on incomplete lists
|
||||
// Then we'll update those to use the main products ID instead
|
||||
// finally we'll delete the duplicates
|
||||
return Products.remove({ _id: prodId });
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ RecipeItems.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.recipeItem' (recipeId, recipeItemType, recipeItem) {
|
||||
'add.recipeItem' (recipeId, recipeItemType, recipeItem) {
|
||||
check(recipeId, String);
|
||||
check(recipeItemType, String);
|
||||
check(recipeItem, String);
|
||||
|
|
@ -21,13 +21,13 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add recipe items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await RecipeItems.insertAsync({
|
||||
return RecipeItems.insert({
|
||||
recipeId: recipeId,
|
||||
recipeItemType: recipeItemType,
|
||||
recipeItem: recipeItem,
|
||||
});
|
||||
},
|
||||
async 'edit.recipeItem' (recipeItemId, recipeId, recipeItemType, recipeItem) {
|
||||
'edit.recipeItem' (recipeItemId, recipeId, recipeItemType, recipeItem) {
|
||||
check(recipeItemId, String);
|
||||
check(recipeId, String);
|
||||
check(recipeItemType, String);
|
||||
|
|
@ -37,7 +37,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to edit recipe items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await RecipeItems.updateAsync({ _id: recipeItemId }, {
|
||||
return RecipeItems.update({ _id: recipeItemId }, {
|
||||
$set: {
|
||||
recipeId: recipeId,
|
||||
recipeItemType: recipeItemType,
|
||||
|
|
@ -45,13 +45,13 @@ Meteor.methods({
|
|||
}
|
||||
});
|
||||
},
|
||||
async 'delete.recipeItem' (recipeItemId) {
|
||||
'delete.recipeItem' (recipeItemId) {
|
||||
check(recipeItemId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete recipe items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await RecipeItems.removeAsync({ _id: recipeItemId });
|
||||
return RecipeItems.remove({ _id: recipeItemId });
|
||||
}
|
||||
});
|
||||
|
|
@ -12,20 +12,20 @@ Recipes.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.recipe' (recipeName) {
|
||||
'add.recipe' (recipeName) {
|
||||
check(recipeName, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to add recipes. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Recipes.insertAsync({
|
||||
return Recipes.insert({
|
||||
recipeName: recipeName,
|
||||
addedBy: this.userId,
|
||||
addedOn: new Date(),
|
||||
});
|
||||
},
|
||||
async 'edit.recipe' (recipeId, recipeName) {
|
||||
'edit.recipe' (recipeId, recipeName) {
|
||||
check(recipeId, String);
|
||||
check(recipeName, String);
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add recipes. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Recipes.updateAsync({ _id: recipeId }, {
|
||||
return Recipes.update({ _id: recipeId }, {
|
||||
$set: {
|
||||
recipeName: recipeName,
|
||||
updatedOn: new Date(),
|
||||
|
|
@ -41,13 +41,13 @@ Meteor.methods({
|
|||
}
|
||||
});
|
||||
},
|
||||
async 'delete.recipe' (recipeId) {
|
||||
'delete.recipe' (recipeId) {
|
||||
check(recipeId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete recipes. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Recipes.removeAsync({ _id: recipeId });
|
||||
return Recipes.remove({ _id: recipeId });
|
||||
}
|
||||
});
|
||||
|
|
@ -12,19 +12,19 @@ ShopLists.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.shopList' (shopName) {
|
||||
'add.shopList' (shopName) {
|
||||
check(shopName, Sring);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to add shopping lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await ShopLists.insert({
|
||||
return ShopLists.insert({
|
||||
shopName: shopName,
|
||||
shopOwner: this.userId,
|
||||
});
|
||||
},
|
||||
async 'edit.shopList' (shopId, shopName) {
|
||||
'edit.shopList' (shopId, shopName) {
|
||||
check(shopId, String);
|
||||
check(shopName, String);
|
||||
|
||||
|
|
@ -32,19 +32,19 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to edit shopping lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await ShopLists.update({ _id: shopId }, {
|
||||
return ShopLists.update({ _id: shopId }, {
|
||||
$set: {
|
||||
shopName: shopName,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'delete.shopList' (shopId) {
|
||||
'delete.shopList' (shopId) {
|
||||
check(shopId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete shopping lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await ShopLists.remove({ _id: shopId });
|
||||
return ShopLists.remove({ _id: shopId });
|
||||
},
|
||||
});
|
||||
|
|
@ -12,19 +12,19 @@ Stores.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.store' (storeName) {
|
||||
'add.store' (storeName) {
|
||||
check(storeName, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to add stores. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Stores.insertAsync({
|
||||
return Stores.insert({
|
||||
storeName: storeName,
|
||||
owner: this.userId,
|
||||
});
|
||||
},
|
||||
async 'edit.store' (storeId, storeName) {
|
||||
'edit.store' (storeId, storeName) {
|
||||
check(storeId, String);
|
||||
check(storeName, String);
|
||||
|
||||
|
|
@ -32,19 +32,19 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to edit stores. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Stores.updateAsync({ _id: storeId }, {
|
||||
return Stores.update({ _id: storeId }, {
|
||||
$set: {
|
||||
storeName: storeName,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'delete.store' (storeId) {
|
||||
'delete.store' (storeId) {
|
||||
check(storeId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete stores. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await Stores.removeAsync({ _id: storeId });
|
||||
return Stores.remove({ _id: storeId });
|
||||
},
|
||||
});
|
||||
|
|
@ -12,7 +12,7 @@ SysConfig.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.noSysAdminReg' (admReg, genReg) {
|
||||
'add.noSysAdminReg' (admReg, genReg) {
|
||||
check(admReg, Boolean);
|
||||
check(genReg, Boolean);
|
||||
|
||||
|
|
@ -20,39 +20,25 @@ Meteor.methods({
|
|||
throw new Meteor.Error('Not able to change registration setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
}
|
||||
|
||||
const currConfig = async() => {
|
||||
let curr = await SysConfig.findOneAsync({});
|
||||
if (!curr) {
|
||||
try {
|
||||
return await SysConfig.insertAsync({
|
||||
SysAdminReg: admReg,
|
||||
dateAdded: new Date(),
|
||||
allowReg: genReg,
|
||||
});
|
||||
} catch(error) {
|
||||
console.log(" ERROR trying to insert system config:");
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
let configId = curr._id;
|
||||
const addNoSys = await Meteor.callAsync('edit.noSysAdminReg', configId, admReg, genReg);
|
||||
if (!addNoSys) {
|
||||
// console.log(" Couldn't edit the system config.");
|
||||
let curr = SysConfig.findOne({});
|
||||
if (typeof curr != 'undefined') {
|
||||
let configId = curr._id;
|
||||
Meteor.call('edit.noSysAdminReg', configId, admReg, genReg, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR updating sys admin reg: " + err);
|
||||
} else {
|
||||
// console.log("Success updating sys admin reg.");
|
||||
console.log("Success updating sys admin reg.");
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR trying to pull current system config:");
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return SysConfig.insert({
|
||||
SysAdminReg: admReg,
|
||||
dateAdded: new Date(),
|
||||
allowReg: genReg,
|
||||
});
|
||||
}
|
||||
}
|
||||
currConfig();
|
||||
},
|
||||
async 'edit.noSysAdminReg' (configId, canReg, genReg) {
|
||||
'edit.noSysAdminReg' (configId, canReg, genReg) {
|
||||
check(canReg, Boolean);
|
||||
check(configId, String);
|
||||
check(genReg, Boolean);
|
||||
|
|
@ -61,7 +47,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('Not able to change registration setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
}
|
||||
|
||||
return await SysConfig.updateAsync({ _id: configId }, {
|
||||
return SysConfig.update({ _id: configId }, {
|
||||
$set: {
|
||||
SysAdminReg: canReg,
|
||||
allowReg: genReg,
|
||||
|
|
@ -69,7 +55,7 @@ Meteor.methods({
|
|||
}
|
||||
});
|
||||
},
|
||||
async 'allow.updateInfo' (allowUpdate) {
|
||||
'allow.updateInfo' (allowUpdate) {
|
||||
check(allowUpdate, Boolean);
|
||||
|
||||
if (!this.userId) {
|
||||
|
|
@ -80,7 +66,7 @@ Meteor.methods({
|
|||
|
||||
let configId = curr._id;
|
||||
|
||||
return await SysConfig.updateAsync({ _id: configId }, {
|
||||
return SysConfig.update({ _id: configId }, {
|
||||
$set: {
|
||||
allowUpdates: allowUpdate,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ TaskItems.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.task' (taskNameArr, assignedTo, assignedToId, taskDateArr, actDate) {
|
||||
'add.task' (taskNameArr, assignedTo, assignedToId, taskDateArr, actDate) {
|
||||
check(taskNameArr, [Object]);
|
||||
check(assignedTo, String);
|
||||
check(taskDateArr, [String]);
|
||||
|
|
@ -24,13 +24,23 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add tasks. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
for (let i=0; i < taskDateArr.length; i++) {
|
||||
for (let j=0; j < taskNameArr.length; j++) {
|
||||
await TaskItems.insertAsync({
|
||||
let username;
|
||||
|
||||
if (assignedTo == "self") {
|
||||
let userInfo = Meteor.users.findOne({ _id: this.userId });
|
||||
username = userInfo.profile.fullname;
|
||||
assignedToId = this.userId;
|
||||
} else {
|
||||
username = assignedTo;
|
||||
}
|
||||
|
||||
for (i=0; i < taskDateArr.length; i++) {
|
||||
for (j=0; j < taskNameArr.length; j++) {
|
||||
TaskItems.insert({
|
||||
taskName: taskNameArr[j].id,
|
||||
taskDate: taskDateArr[i],
|
||||
actualDate: actDate[i],
|
||||
assignedTo: assignedTo,
|
||||
assignedTo: username,
|
||||
assignedToId: assignedToId,
|
||||
isComplete: false,
|
||||
completedOn: null,
|
||||
|
|
@ -40,7 +50,7 @@ Meteor.methods({
|
|||
}
|
||||
}
|
||||
},
|
||||
async 'add.myTask' (taskName, taskDate, actDate) {
|
||||
'add.mytask' (taskName, assignedTo, assignedToId, taskDate, actDate) {
|
||||
check(taskName, String);
|
||||
check(taskDate, String);
|
||||
check(actDate, Date);
|
||||
|
|
@ -49,28 +59,29 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add tasks. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
let userInfo = await Meteor.users.findOneAsync({ _id: this.userId });
|
||||
if (!userInfo) {
|
||||
// console.log("No matching user info found.")
|
||||
let username;
|
||||
|
||||
if (assignedTo == "self") {
|
||||
let userInfo = Meteor.users.findOne({ _id: this.userId });
|
||||
username = userInfo.profile.fullname;
|
||||
assignedToId = this.userId;
|
||||
} else {
|
||||
try {
|
||||
return await TaskItems.insertAsync({
|
||||
taskName: taskName,
|
||||
taskDate: taskDate,
|
||||
actualDate: actDate,
|
||||
assignedTo: userInfo.profile.fullname,
|
||||
assignedToId: this.userId,
|
||||
isComplete: false,
|
||||
completedOn: null,
|
||||
assignedOn: new Date(),
|
||||
assignedBy: this.userId,
|
||||
});
|
||||
} catch(error) {
|
||||
console.log(" ERROR adding tasksL " + error.message);
|
||||
}
|
||||
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,
|
||||
});
|
||||
},
|
||||
async 'edit.task' (taskId, taskName, assignedTo, taskDate) {
|
||||
'edit.task' (taskId, taskName, assignedTo, taskDate) {
|
||||
check(taskId, String);
|
||||
check(taskName, String);
|
||||
check(assignedTo, String);
|
||||
|
|
@ -80,7 +91,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to edit tasks. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await TaskItems.updateAsync({ _id: taskId }, {
|
||||
return TaskItems.update({ _id: taskId }, {
|
||||
$set: {
|
||||
taskName: taskName,
|
||||
taskDate: taskDate,
|
||||
|
|
@ -90,23 +101,23 @@ Meteor.methods({
|
|||
}
|
||||
});
|
||||
},
|
||||
async 'delete.task' (taskId) {
|
||||
'delete.task' (taskId) {
|
||||
check(taskId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to delete tasks. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await TaskItems.removeAsync({ _id: taskId });
|
||||
return TaskItems.remove({ _id: taskId });
|
||||
},
|
||||
async 'markTask.complete' (taskId) {
|
||||
'markTask.complete' (taskId) {
|
||||
check(taskId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to mark tasks complete. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await TaskItems.updateAsync({ _id: taskId }, {
|
||||
return TaskItems.update({ _id: taskId }, {
|
||||
$set: {
|
||||
isComplete: true,
|
||||
completedOn: new Date(),
|
||||
|
|
@ -114,14 +125,14 @@ Meteor.methods({
|
|||
}
|
||||
});
|
||||
},
|
||||
async 'markTask.notComplete' (taskId) {
|
||||
'markTask.notComplete' (taskId) {
|
||||
check(taskId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to mark tasks not complete. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await TaskItems.updateAsync({ _id: taskId }, {
|
||||
return TaskItems.update({ _id: taskId }, {
|
||||
$set: {
|
||||
isComplete: false,
|
||||
markedUncomplteOn: new Date(),
|
||||
|
|
@ -129,7 +140,7 @@ Meteor.methods({
|
|||
}
|
||||
});
|
||||
},
|
||||
async 'clean.Tasks' (timeFrame) {
|
||||
'clean.Tasks' (timeFrame) {
|
||||
check(timeFrame, String);
|
||||
|
||||
if (!this.userId) {
|
||||
|
|
@ -140,29 +151,29 @@ Meteor.methods({
|
|||
let upToDate = "";
|
||||
switch(timeFrame) {
|
||||
case "1-week":
|
||||
// console.log("1 Week");
|
||||
console.log("1 Week");
|
||||
upToDate = 7 * 24 * 60 * 60 * 1000;
|
||||
break;
|
||||
case "2-weeks":
|
||||
// console.log("2 Week");
|
||||
console.log("2 Week");
|
||||
upToDate = 14 * 24 * 60 * 60 * 1000;
|
||||
break;
|
||||
case '1-month':
|
||||
// console.log("1 month");
|
||||
console.log("1 month");
|
||||
upToDate = 30 * 24 * 60 * 60 * 1000;
|
||||
break;
|
||||
case '3-months':
|
||||
// console.log("3 months");
|
||||
console.log("3 months");
|
||||
upToDate = 90 * 24 * 60 * 60 * 1000;
|
||||
break;
|
||||
case 'all':
|
||||
// console.log("all");
|
||||
console.log("all");
|
||||
upToDate = 1 * 24 * 60 * 60 * 1000;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return await TaskItems.removeAsync({ actualDate: { $lt: new Date((new Date()) - upToDate )}});
|
||||
return TaskItems.remove({ actualDate: { $lt: new Date((new Date()) - upToDate )}});
|
||||
}
|
||||
});
|
||||
|
|
@ -12,24 +12,24 @@ UpdateInfo.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.updateInfo' (updateObject) {
|
||||
'add.updateInfo' (updateObject) {
|
||||
check(updateObject, Object);
|
||||
|
||||
return await UpdateInfo.insertAsync({
|
||||
UpdateInfo.insert({
|
||||
title: updateObject.title,
|
||||
description: updateObject.description,
|
||||
dateRelease: updateObject.date,
|
||||
releaseLink: updateObject.link
|
||||
});
|
||||
},
|
||||
async 'markUpdate.read' (updateId) {
|
||||
'markUpdate.read' (updateId) {
|
||||
check(updateId, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('You are not allowed to mark updates as read. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return await UpdateInfo.updateAsync({ _id: updateId }, {
|
||||
return UpdateInfo.update({ _id: updateId }, {
|
||||
$set: {
|
||||
viewed: true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,38 +9,43 @@ UserConfig.allow({
|
|||
// if use id exists, allow insert
|
||||
return !!userId;
|
||||
},
|
||||
update: function(userId, doc){
|
||||
// if use id exists, allow insert
|
||||
return !!userId;
|
||||
},
|
||||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.darkModePref' (pref) {
|
||||
'add.darkModePref' (pref) {
|
||||
check(pref, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('Not able to change theme setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
throw new Meteor.Error('Not able to change registration setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
}
|
||||
|
||||
return await UserConfig.insertAsync({
|
||||
return UserConfig.insert({
|
||||
user: this.userId,
|
||||
darkMode: pref,
|
||||
dateAdded: Date()
|
||||
});
|
||||
},
|
||||
async 'update.darkModePref' (pref) {
|
||||
'update.darkModePref' (pref) {
|
||||
check(pref, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('Not able to change theme setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
throw new Meteor.Error('Not able to change registration setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
}
|
||||
|
||||
return await UserConfig.updateAsync({ user: this.userId }, {
|
||||
$set: {
|
||||
darkMode: pref,
|
||||
dateUpdate: Date()
|
||||
}
|
||||
});
|
||||
let myConfig = UserConfig.findOne({ user: this.userId });
|
||||
if (typeof myConfig == 'undefined') {
|
||||
Meteor.call('add.darkModePref', pref, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR calling the add functioin for dark mode: " + err);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return UserConfig.update({ user: this.userId }, {
|
||||
$set: {
|
||||
darkMode: pref,
|
||||
dateUpdate: Date()
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -12,10 +12,10 @@ UserConfigOptions.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'change.userPass' (usersId, password) {
|
||||
'change.userPass' (usersId, password) {
|
||||
check(usersId, String);
|
||||
check(password, String);
|
||||
|
||||
return await Accounts.setPasswordAsync(usersId, password);
|
||||
return Accounts.setPassword(usersId, password);
|
||||
},
|
||||
});
|
||||
|
|
@ -12,7 +12,7 @@ UserLast.allow({
|
|||
});
|
||||
|
||||
Meteor.methods({
|
||||
async 'add.userLast' (view, viewId) {
|
||||
'add.userLast' (view, viewId) {
|
||||
check(view, String);
|
||||
check(viewId, String);
|
||||
|
||||
|
|
@ -22,33 +22,24 @@ Meteor.methods({
|
|||
|
||||
// first let's find out if there's an entry for this user and view, and if so
|
||||
// we'll just edit that entry with updated information
|
||||
let userListInfo = await UserLast.findOneAsync({ userId: this.userId, view: view });
|
||||
if (!userListInfo) {
|
||||
// console.log("Adding new user last item.");
|
||||
return await UserLast.insertAsync({
|
||||
let userListInfo = UserLast.findOne({ userId: this.userId, view: view });
|
||||
if (typeof userListInfo != 'undefined' && userListInfo != "" && userListInfo != null) {
|
||||
// entry exists, call the edit function instead
|
||||
Meteor.call('edit.userLast', view, viewId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR moving user to edit for last view: " + err);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return UserLast.insert({
|
||||
userId: this.userId,
|
||||
view: view,
|
||||
viewId: viewId,
|
||||
dateAdded: Date(),
|
||||
});
|
||||
} else {
|
||||
// console.log("Editing existing user last itme.");
|
||||
// entry exists, call the edit function instead
|
||||
let result = await Meteor.callAsync('edit.userLast', view, viewId);
|
||||
if (!result) {
|
||||
try {
|
||||
// console.log("Issue editing existing entry in userLast. Check the logs.");
|
||||
} catch(error) {
|
||||
console.log(" ERROR adding userLast item: " + error);
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
}
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
},
|
||||
async 'edit.userLast' (view, viewId) {
|
||||
'edit.userLast' (view, viewId) {
|
||||
check(view, String);
|
||||
check(viewId, String);
|
||||
|
||||
|
|
@ -56,8 +47,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('Not able to change user view last setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
}
|
||||
|
||||
// console.log("Edit in progress.");
|
||||
return await UserLast.updateAsync({ view: view, userId: this.userId }, {
|
||||
return UserLast.update({ view: view, userId: this.userId }, {
|
||||
$set: {
|
||||
viewId: viewId,
|
||||
dateLastUpdate: Date(),
|
||||
|
|
|
|||
|
|
@ -1,134 +1,132 @@
|
|||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
|
||||
FlowRouter.route('/dashboard', {
|
||||
name: 'home',
|
||||
action() {
|
||||
this.render('MainLayout', { main: "dashboard" });
|
||||
BlazeLayout.render('MainLayout', { main: "dashboard" });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/', {
|
||||
name: 'homeNoRoute',
|
||||
action() {
|
||||
this.render('MainLayout', { main: "dashboard" });
|
||||
BlazeLayout.render('MainLayout', { main: "dashboard" });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/', {
|
||||
name: 'homeNotLoggedIn',
|
||||
action() {
|
||||
this.render('MainLayout', { notLoggedIn: "login" });
|
||||
BlazeLayout.render('MainLayout', { notLoggedIn: "login" });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/login', {
|
||||
name: 'login',
|
||||
action() {
|
||||
this.render('MainLayout', { notLoggedIn: "login" });
|
||||
BlazeLayout.render('MainLayout', { notLoggedIn: "login" });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/reg', {
|
||||
name: 'reg',
|
||||
action() {
|
||||
this.render('MainLayout', { notLoggedIn: "reg" });
|
||||
BlazeLayout.render('MainLayout', { notLoggedIn: "reg" });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/userMgmt', {
|
||||
name: 'userMgmt',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'userMgmt' });
|
||||
BlazeLayout.render('MainLayout', { main: 'userMgmt' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/manageStore', {
|
||||
name: 'storeMgmt',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'storeMgmt' });
|
||||
BlazeLayout.render('MainLayout', { main: 'storeMgmt' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/manage', {
|
||||
name: 'mgmtPage',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'mgmtPage' });
|
||||
BlazeLayout.render('MainLayout', { main: 'mgmtPage' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/manageProduct', {
|
||||
name: 'manageProduct',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'prodMgmt' });
|
||||
BlazeLayout.render('MainLayout', { main: 'prodMgmt' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/manageLists', {
|
||||
name: 'manageLists',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'listMgmt' });
|
||||
BlazeLayout.render('MainLayout', { main: 'listMgmt' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/mylists', {
|
||||
name: 'mylists',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'listsMain' });
|
||||
BlazeLayout.render('MainLayout', { main: 'listsMain' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/listItems', {
|
||||
name: 'listItems',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'listItemsMain' });
|
||||
BlazeLayout.render('MainLayout', { main: 'listItemsMain' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/mymenus', {
|
||||
name: 'mymenus',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'mainMenu' });
|
||||
BlazeLayout.render('MainLayout', { main: 'mainMenu' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/menuItems', {
|
||||
name: 'menuItems',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'menuItems' });
|
||||
BlazeLayout.render('MainLayout', { main: 'menuItems' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/taskHome', {
|
||||
name: 'taskHome',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'taskHome' });
|
||||
BlazeLayout.render('MainLayout', { main: 'taskHome' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/myTasks', {
|
||||
name: 'myTasks',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'myTasks' });
|
||||
BlazeLayout.render('MainLayout', { main: 'myTasks' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/systemAdmin', {
|
||||
name: 'systemAdmin',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'systemAdmin' });
|
||||
BlazeLayout.render('MainLayout', { main: 'systemAdmin' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/cleanUp', {
|
||||
name: 'cleanUp',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'cleanUp'});
|
||||
BlazeLayout.render('MainLayout', { main: 'cleanUp'});
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/mySettings', {
|
||||
name: 'mySettings',
|
||||
action() {
|
||||
this.render('MainLayout', { main: 'userConfig'});
|
||||
BlazeLayout.render('MainLayout', { main: 'userConfig'});
|
||||
}
|
||||
});
|
||||
2308
package-lock.json
generated
2308
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"name": "get-my",
|
||||
"name": "pPickup",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"start": "meteor run",
|
||||
|
|
|
|||
291
server/main.js
291
server/main.js
|
|
@ -1,5 +1,3 @@
|
|||
// this file has been converted for meteor 3 and later
|
||||
|
||||
import { Meteor } from 'meteor/meteor';
|
||||
import { SysConfig } from '../imports/api/systemConfig';
|
||||
import { MenuItems } from '../imports/api/menuItems';
|
||||
|
|
@ -7,178 +5,142 @@ import { Products } from '../imports/api/products.js';
|
|||
import { Menus } from '../imports/api/menu.js';
|
||||
import { MScripts } from '../imports/api/mScripts.js';
|
||||
import { UpdateInfo } from '../imports/api/updateInfo.js';
|
||||
import { Roles } from 'meteor/roles';
|
||||
|
||||
Meteor.startup(async() => {
|
||||
Meteor.startup(() => {
|
||||
// code to run on server at startup
|
||||
Roles.createRoleAsync("user", {unlessExists: true});
|
||||
Roles.createRoleAsync("admin", {unlessExists: true});
|
||||
Roles.createRoleAsync("systemadmin", {unlessExists: true});
|
||||
Roles.createRole("user", {unlessExists: true});
|
||||
Roles.createRole("admin", {unlessExists: true});
|
||||
Roles.createRole("systemadmin", {unlessExists: true});
|
||||
|
||||
// set the systemconfig defaults for registration
|
||||
// check if this has already been run
|
||||
let regPolRun = await MScripts.findOneAsync({ scriptName: "DefaultRegPolicy", scriptRun: true });
|
||||
if (!regPolRun) {
|
||||
try {
|
||||
let regPolicy = await SysConfig.findOneAsync({});
|
||||
if (!regPolicy) {
|
||||
SysConfig.insertAsync({
|
||||
SysAdminReg: false,
|
||||
dateAdded: new Date(),
|
||||
allowReg: true,
|
||||
allowUpdates: true,
|
||||
});
|
||||
markScriptRun("DefaultRegPolicy");
|
||||
} else {
|
||||
// console.log("Registration policy already set.");
|
||||
markScriptRun("DefaultRegPolicy");
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR trying to check if registration policy was set.");
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
let regPolRun = MScripts.findOne({ scriptName: "DefaultRegPolicy", scriptRun: true });
|
||||
if (typeof regPolRun == "undefined" || regPolRun == null || regPolRun == "") {
|
||||
let regPolicy = SysConfig.findOne({});
|
||||
if (typeof regPolicy == 'undefined') {
|
||||
return SysConfig.insert({
|
||||
SysAdminReg: false,
|
||||
dateAdded: new Date(),
|
||||
allowReg: true,
|
||||
allowUpdates: true,
|
||||
});
|
||||
} else {
|
||||
// console.log("Registration policy already set.");
|
||||
markScriptRun("DefaultRegPolicy");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// check if the isLInked item exists on menuitems, and if not, add it (data cleanup task)
|
||||
// see if already updated
|
||||
let linkUpdateRun = await MScripts.findOneAsync({ scriptName: "updateMenuItemLinks", scriptRun: true });
|
||||
try {
|
||||
if (!linkUpdateRun) {
|
||||
let itemInfoNoLink = MenuItems.find({ isLinked: { $exists: false } }).fetch();
|
||||
// console.log("No Ites with isLinked not set: " + itemInfoNoLink.length);
|
||||
if (itemInfoNoLink.length > 0) {
|
||||
// console.log("Found items with isLinked not set. Updating...");
|
||||
// console.dir(itemInfoNoLink);
|
||||
let infoLength = itemInfoNoLink.length;
|
||||
for (i=0; i < infoLength; i++) {
|
||||
MenuItems.updateAsync({ _id: itemInfoNoLink[i]._id }, {
|
||||
$set: {
|
||||
isLinked: false,
|
||||
}
|
||||
});
|
||||
if (i == (infoLength -1)) {
|
||||
markScriptRun("updateMenuItemLinks");
|
||||
let linkUpdateRun = MScripts.findOne({ scriptName: "updateMenuItemLinks", scriptRun: true });
|
||||
if (typeof linkUpdateRun == 'undefined' || linkUpdateRun == null || linkUpdateRun == "") {
|
||||
let itemInfoNoLink = MenuItems.find({ isLinked: { $exists: false } }).fetch();
|
||||
// console.log("No Ites with isLinked not set: " + itemInfoNoLink.length);
|
||||
if (itemInfoNoLink.length > 0) {
|
||||
// console.log("found items with isLinked not set.");
|
||||
// console.dir(itemInfoNoLink);
|
||||
let infoLength = itemInfoNoLink.length;
|
||||
for (i=0; i < infoLength; i++) {
|
||||
MenuItems.update({ _id: itemInfoNoLink[i]._id }, {
|
||||
$set: {
|
||||
isLinked: false,
|
||||
}
|
||||
});
|
||||
if (i == (infoLength -1)) {
|
||||
markScriptRun("updateMenuItemLinks");
|
||||
}
|
||||
} else {
|
||||
// this will show if all items are found to have isLInked set.
|
||||
// console.log("No items with isLinked not set.");
|
||||
markScriptRun("updateMenuItemLinks");
|
||||
}
|
||||
} else {
|
||||
// this will show if all items are found to have isLInked set.
|
||||
// console.log("No items with isLinked not set.");
|
||||
markScriptRun("updateMenuItemLinks");
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR running check for isLinked items.");
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
}
|
||||
|
||||
|
||||
// update Products to be able to have multiple stores in the document
|
||||
// check if update already run
|
||||
let prodStoreArrayRun = await MScripts.findOneAsync({ scriptName: "changeProdStoreToArray", scriptRun: true });
|
||||
let prodStoreArrayRun = MScripts.findOne({ scriptName: "changeProdStoreToArray", scriptRun: true });
|
||||
if (!prodStoreArrayRun) {
|
||||
try {
|
||||
let prodInfo = Products.find({}).fetch();
|
||||
let prodCount = prodInfo.length;
|
||||
// console.log("Updating Products to allow multiple store assocation for " + prodCount + " products.");
|
||||
for (let j = 0; j < prodCount; j++) {
|
||||
if (typeof prodInfo[j].prodStore == 'object') {
|
||||
// console.log(typeof prodInfo[j].prodStore);
|
||||
// console.log("Is Array already");
|
||||
} else {
|
||||
let prodStoreArray = [];
|
||||
// console.log("---- ---- ----");
|
||||
// console.log(typeof prodInfo[j].prodStore);
|
||||
// console.log("---- Is Not Array.");
|
||||
let prodStore = prodInfo[j].prodStore;
|
||||
let prodInfo = Products.find({}).fetch();
|
||||
let prodCount = prodInfo.length;
|
||||
console.log("Updating Products to allow multiple store assocation for " + prodCount + " products.");
|
||||
for (j = 0; j < prodCount; j++) {
|
||||
if (typeof prodInfo[j].prodStore == 'object') {
|
||||
// console.log(typeof prodInfo[j].prodStore);
|
||||
// console.log("Is Array already");
|
||||
} else {
|
||||
let prodStoreArray = [];
|
||||
// console.log("---- ---- ----");
|
||||
// console.log(typeof prodInfo[j].prodStore);
|
||||
// console.log("---- Is Not Array.");
|
||||
let prodStore = prodInfo[j].prodStore;
|
||||
|
||||
prodStoreArray.push(prodStore);
|
||||
// console.dir(prodStoreArray);
|
||||
Products.update({ _id: prodInfo[j]._id }, {
|
||||
$set: {
|
||||
prodStore: prodStoreArray,
|
||||
}
|
||||
});
|
||||
}
|
||||
if (j == (prodCount -1)) {
|
||||
markScriptRun("changeProdStoreToArray");
|
||||
}
|
||||
prodStoreArray.push(prodStore);
|
||||
// console.dir(prodStoreArray);
|
||||
Products.update({ _id: prodInfo[j]._id }, {
|
||||
$set: {
|
||||
prodStore: prodStoreArray,
|
||||
}
|
||||
});
|
||||
}
|
||||
if (j == (prodCount -1)) {
|
||||
markScriptRun("changeProdStoreToArray");
|
||||
}
|
||||
} catch(error) {
|
||||
console.log("Script to update product stores couldn't run.");
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
}
|
||||
}
|
||||
|
||||
// update menu items to new format so they get the linked products
|
||||
// check if this update has run
|
||||
let menuItemUpdRun = await MScripts.findOneAsync({ scriptName: "updateMenuProdLinks", scriptRun: true });
|
||||
let menuItemUpdRun = MScripts.findOne({ scriptName: "updateMenuProdLinks", scriptRun: true });
|
||||
if (!menuItemUpdRun) {
|
||||
try {
|
||||
let openMenus = Menus.find({ menuComplete: false }).fetch();
|
||||
let openMenuCount = openMenus.length;
|
||||
// console.log("Open Menu count is: " + openMenuCount);
|
||||
for (let k = 0; k < openMenuCount; k++) {
|
||||
if (typeof openMenus.menuItems == 'object') {
|
||||
// console.log(openMenus.menuName + " appears to be converted.");
|
||||
markScriptRun("updateMenuProdLinks");
|
||||
} else {
|
||||
let menuId = openMenus[k]._id;
|
||||
let openMenus = Menus.find({ menuComplete: false }).fetch();
|
||||
let openMenuCount = openMenus.length;
|
||||
// console.log("Open Menu count is: " + openMenuCount);
|
||||
for (k = 0; k < openMenuCount; k++) {
|
||||
if (typeof openMenus.menuItems == 'object') {
|
||||
// console.log(openMenus.menuName + " appears to be converted.");
|
||||
markScriptRun("updateMenuProdLinks");
|
||||
} else {
|
||||
let menuId = openMenus[k]._id;
|
||||
|
||||
let thisMenuItems = MenuItems.find({ menuId: menuId }).fetch();
|
||||
let thisMenuItems = MenuItems.find({ menuId: menuId }).fetch();
|
||||
|
||||
let itemCount = thisMenuItems.length;
|
||||
let itemCount = thisMenuItems.length;
|
||||
|
||||
for (l = 0; l < itemCount; l++) {
|
||||
Menus.update({ _id: menuId }, {
|
||||
$addToSet: {
|
||||
menuItems:
|
||||
{
|
||||
menuItemId: thisMenuItems[l]._id,
|
||||
menuItemName: thisMenuItems[l].itemName,
|
||||
serveDate: thisMenuItems[l].serveDate,
|
||||
serveDateActual: thisMenuItems[l].serveDateActual,
|
||||
isLinked: thisMenuItems[l].isLinked
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
if (k == (openMenuCount - 1)) {
|
||||
markScriptRun("updateMenuProdLinks");
|
||||
for (l = 0; l < itemCount; l++) {
|
||||
Menus.update({ _id: menuId }, {
|
||||
$addToSet: {
|
||||
menuItems:
|
||||
{
|
||||
menuItemId: thisMenuItems[l]._id,
|
||||
menuItemName: thisMenuItems[l].itemName,
|
||||
serveDate: thisMenuItems[l].serveDate,
|
||||
serveDateActual: thisMenuItems[l].serveDateActual,
|
||||
isLinked: thisMenuItems[l].isLinked
|
||||
},
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR updating the menu product links: ");
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
if (k == (openMenuCount - 1)) {
|
||||
markScriptRun("updateMenuProdLinks");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// console.log("Menu Item updates have already been run.");
|
||||
}
|
||||
|
||||
// get update available information if enabled in system confiuration
|
||||
let currConfig = await SysConfig.findOneAsync({});
|
||||
if (!currConfig) {
|
||||
// console.log("No Current Config found.")
|
||||
} else {
|
||||
try {
|
||||
let feedurl = "https://gitlab.com/bmcgonag/get_my/-/releases.atom"
|
||||
if (currConfig.allowUpdates == true) {
|
||||
// console.log("Allow Updates is true");
|
||||
startCronForUpdates(feedurl);
|
||||
} else if (typeof currConfig.allowUpdates == 'undefined' || currConfig.allowUpdates == null) {
|
||||
SysConfig.update({ _id: currConfig._id }, { $set: {
|
||||
allowUpdates: true,
|
||||
}});
|
||||
startCronForUpdates(feedurl);
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR checking current config for updates: " + error);
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
}
|
||||
let currConfig = SysConfig.findOne({});
|
||||
let feedurl = "https://gitlab.com/bmcgonag/get_my/-/releases.atom"
|
||||
if (currConfig.allowUpdates == true) {
|
||||
// console.log("Allow Updates is true");
|
||||
startCronForUpdates(feedurl);
|
||||
} else if (typeof currConfig.allowUpdates == 'undefined' || currConfig.allowUpdates == null) {
|
||||
SysConfig.update({ _id: currConfig._id }, { $set: {
|
||||
allowUpdates: true,
|
||||
}});
|
||||
startCronForUpdates(feedurl);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -190,23 +152,18 @@ var startCronForUpdates = function(feedurl) {
|
|||
});
|
||||
}
|
||||
|
||||
var markScriptRun = async function(scriptName) {
|
||||
var markScriptRun = function(scriptName) {
|
||||
// check if this is already set
|
||||
let scriptRun = await MScripts.findOneAsync({ scriptName: scriptName });
|
||||
if (!scriptRun) {
|
||||
try {
|
||||
return MScripts.insertAsync({
|
||||
scriptName: scriptName,
|
||||
scriptRun: true,
|
||||
runOn: new Date()
|
||||
});
|
||||
} catch(error) {
|
||||
console.log(" ERROR inserting the script run log: " + error);
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
}
|
||||
let scriptRun = MScripts.findOne({ scriptName: scriptName });
|
||||
|
||||
if (scriptRun) {
|
||||
console.log(scriptName + " already set as run on " + scriptRun.runOn);
|
||||
} else {
|
||||
// console.log(scriptName + " already set as run on " + scriptRun.runOn);
|
||||
MScripts.insert({
|
||||
scriptName: scriptName,
|
||||
scriptRun: true,
|
||||
runOn: new Date()
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -218,22 +175,16 @@ var getUpdateInfoNow = async function(feedurl) {
|
|||
// console.dir(data[0].title);
|
||||
|
||||
// check if this title already exists in db
|
||||
let updatesExist = await UpdateInfo.findOneAsync({ title: data[0].title });
|
||||
try {
|
||||
if (!updatesExist) {
|
||||
UpdateInfo.insertAsync({
|
||||
title: data[0].title,
|
||||
description: data[0].description,
|
||||
dateRelease: data[0].date,
|
||||
releaseLink: data[0].link,
|
||||
viewed: false
|
||||
});
|
||||
} else {
|
||||
console.log("No new updates available at this time.");
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR checking for update: " + error);
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
let updatesExist = UpdateInfo.findOne({ title: data[0].title });
|
||||
if (!updatesExist) {
|
||||
UpdateInfo.insert({
|
||||
title: data[0].title,
|
||||
description: data[0].description,
|
||||
dateRelease: data[0].date,
|
||||
releaseLink: data[0].link,
|
||||
viewed: false
|
||||
});
|
||||
} else {
|
||||
console.log("No new updates available at this time.");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,66 +3,61 @@ import { Mongo } from 'meteor/mongo';
|
|||
import { check } from 'meteor/check';
|
||||
import { TaskItems } from '../imports/api/tasks';
|
||||
import { SysConfig } from '../imports/api/systemConfig';
|
||||
import { Roles } from 'meteor/roles';
|
||||
|
||||
Meteor.methods({
|
||||
async 'addToRole' (role) {
|
||||
try {
|
||||
let countOfUsers = await Meteor.users.find().countAsync();
|
||||
const user = await Meteor.userAsync();
|
||||
if (user) {
|
||||
let userId = user._id;
|
||||
if (countOfUsers > 1) {
|
||||
await Roles.addUsersToRolesAsync(userId, role);
|
||||
const result = await Meteor.callAsync('add.darkModePref', "light");
|
||||
if (!result) {
|
||||
console.log(" ERROR: can't set user dark mode preference: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESSFULLY set user dark mode preference.");
|
||||
}
|
||||
} else if (countOfUsers == 1) {
|
||||
await Roles.addUsersToRolesAsync(userId, "systemadmin");
|
||||
const result = await Meteor.callAsync('add.darkModePref', "light");
|
||||
if (!result) {
|
||||
console.log(" ERROR: can't set user dark mode preference: " + err);
|
||||
} else {
|
||||
console.log(" SUCCESSFULLY set user dark mode preference.");
|
||||
}
|
||||
'addToRole' (role) {
|
||||
let countOfUsers = Meteor.users.find().count();
|
||||
|
||||
// if users = 1 - set to role passed in function call
|
||||
if (countOfUsers > 1) {
|
||||
console.log("User id for role: " + Meteor.userId() );
|
||||
let userId = Meteor.userId();
|
||||
Roles.addUsersToRoles(userId, role);
|
||||
Meteor.call('add.darkModePref', "light", function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR: can't set user dark mode preference: " + err);
|
||||
} else {
|
||||
console.log("The count of users didn't seem to work when adding a new user.");
|
||||
// console.log(" SUCCESSFULLY set user dark mode preference.");
|
||||
}
|
||||
} else {
|
||||
console.log(" ---- No user info found.")
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR getting user info on server: " + error);
|
||||
});
|
||||
} else if (countOfUsers == 1) {
|
||||
console.log("Creating first system admin user: " + Meteor.userId() );
|
||||
let userId = Meteor.userId();
|
||||
Roles.addUsersToRoles(userId, "systemadmin");
|
||||
Meteor.call('add.darkModePref', "light", function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR: can't set user dark mode preference: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESSFULLY set user dark mode preference.");
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
async 'edit.userPass' (userId, newPassword) {
|
||||
'edit.userPass' (userId, newPassword) {
|
||||
check(userId, String);
|
||||
check(newPassword, String);
|
||||
|
||||
return await Accounts.setPasswordAsync(userId, newPassword);
|
||||
return Accounts.setPassword(userId, newPassword);
|
||||
},
|
||||
async 'delete.userFromSys' (userId) {
|
||||
'delete.userFromSys' (userId) {
|
||||
check(userId, String);
|
||||
|
||||
return await Meteor.users.removeAsync({ _id: userId });
|
||||
return Meteor.users.remove({ _id: userId });
|
||||
},
|
||||
async 'update.userEmail' (userId, email) {
|
||||
'update.userEmail' (userId, email) {
|
||||
check(userId, String);
|
||||
check(email, String);
|
||||
|
||||
return await Meteor.users.updateAsync({ _id: userId }, {
|
||||
return Meteor.users.update({ _id: userId }, {
|
||||
$set: {
|
||||
'emails.0.address': email,
|
||||
}
|
||||
});
|
||||
},
|
||||
async 'edit.userRole' (userId, role) {
|
||||
'edit.userRole' (userId, role) {
|
||||
check(userId, String);
|
||||
check(role, String);
|
||||
|
||||
return await Roles.setUserRolesAsync(userId, role);
|
||||
return Roles.setUserRoles(userId, role);
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -13,13 +13,6 @@ import { MenuProdLinks } from '../imports/api/menuProdLinks.js';
|
|||
import { UserLast } from '../imports/api/userLast.js';
|
||||
import { UpdateInfo } from '../imports/api/updateInfo.js';
|
||||
|
||||
Meteor.publish(null, function () {
|
||||
if (this.userId) {
|
||||
return Meteor.roleAssignment.find({ "user._id": this.userId });
|
||||
}
|
||||
this.ready();
|
||||
});
|
||||
|
||||
Meteor.publish("SystemConfig", function() {
|
||||
try {
|
||||
return SysConfig.find({});
|
||||
|
|
@ -30,7 +23,7 @@ Meteor.publish("SystemConfig", function() {
|
|||
|
||||
Meteor.publish("UserConfigPrefs", function() {
|
||||
try {
|
||||
return UserConfig.find({ user: this.userId });
|
||||
return UserConfig.find({});
|
||||
} catch (error) {
|
||||
console.log(" ERROR: Error accessing user config: " + error);
|
||||
}
|
||||
|
|
@ -96,14 +89,6 @@ Meteor.publish("myListItems", function(listId) {
|
|||
}
|
||||
});
|
||||
|
||||
Meteor.publish("allListItems", function() {
|
||||
try {
|
||||
return ListItems.find({});
|
||||
} catch (error) {
|
||||
console.log(" ERROR pulling all list items.");
|
||||
}
|
||||
});
|
||||
|
||||
Meteor.publish("myStoreListItems", function(listId) {
|
||||
try {
|
||||
let stores = Store.find({});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue