mirror of
https://gitlab.com/bmcgonag/get_my.git
synced 2026-03-26 15:58:50 +00:00
Updating framework to meteor 3 and later
This commit is contained in:
Brian McGonagill
parent
717994508a
commit
cca29bc591
58 changed files with 2332 additions and 1611 deletions
|
|
@ -4,29 +4,27 @@
|
|||
# 'meteor add' and 'meteor remove' will edit this file for you,
|
||||
# but you can also edit it by hand.
|
||||
|
||||
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
|
||||
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.2 # 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.12 # Reactive variable for tracker
|
||||
tracker@1.3.3 # Meteor's client-side reactive programming library
|
||||
reactive-var@1.0.13 # Reactive variable for tracker
|
||||
tracker@1.3.4 # Meteor's client-side reactive programming library
|
||||
|
||||
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
|
||||
standard-minifier-css@1.9.3 # CSS minifier run for production mode
|
||||
standard-minifier-js@3.1.0 # JS minifier run for production mode
|
||||
es5-shim@4.8.1 # ECMAScript 5 compatibility for older browsers
|
||||
ecmascript@0.16.11 # Enable ECMAScript2015+ syntax in app code
|
||||
typescript@5.6.4 # Enable TypeScript syntax in .ts and .tsx modules
|
||||
shell-server@0.6.1 # Server-side component of the `meteor shell` command
|
||||
|
||||
hot-module-replacement@0.5.3 # Update code in development without reloading the page
|
||||
hot-module-replacement@0.5.4 # Update code in development without reloading the page
|
||||
blaze-hot # Update files using Blaze's API with HMR
|
||||
|
||||
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
|
||||
roles@1.0.1
|
||||
session@1.2.2
|
||||
email@3.1.2
|
||||
arianjahiri:meteor-handlebars-helpers
|
||||
ostrio:flow-router-extra
|
||||
accounts-password@3.2.0
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
METEOR@2.16
|
||||
METEOR@3.3
|
||||
|
|
|
|||
188
.meteor/versions
188
.meteor/versions
|
|
@ -1,94 +1,94 @@
|
|||
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
|
||||
accounts-base@3.1.1
|
||||
accounts-password@3.2.0
|
||||
allow-deny@2.1.0
|
||||
arianjahiri:meteor-handlebars-helpers@0.0.1
|
||||
autoupdate@2.0.1
|
||||
babel-compiler@7.12.0
|
||||
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.1
|
||||
caching-compiler@2.0.1
|
||||
caching-html-compiler@2.0.0
|
||||
callback-hook@1.6.0
|
||||
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.11
|
||||
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.2
|
||||
minimongo@2.0.2
|
||||
mobile-experience@1.1.2
|
||||
mobile-status-bar@1.1.1
|
||||
modern-browsers@0.2.2
|
||||
modules@0.20.3
|
||||
modules-runtime@0.13.2
|
||||
modules-runtime-hot@0.14.3
|
||||
mongo@2.1.2
|
||||
mongo-decimal@0.2.0
|
||||
mongo-dev-server@1.1.1
|
||||
mongo-id@1.0.9
|
||||
npm-mongo@6.10.2
|
||||
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.1
|
||||
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.0
|
||||
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.4
|
||||
underscore@1.6.4
|
||||
url@1.3.5
|
||||
webapp@2.0.7
|
||||
webapp-hashing@1.1.2
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import { SysConfig } from '../../../imports/api/systemConfig.js';
|
||||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
|
||||
Template.login.onCreated(function() {
|
||||
this.subscribe("SystemConfig");
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import { SysConfig } from "../../../imports/api/systemConfig.js";
|
||||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
|
||||
Template.reg.onCreated(function() {
|
||||
this.subscribe("SystemConfig");
|
||||
|
|
@ -29,12 +30,15 @@ Template.reg.helpers({
|
|||
return Session.get("missingReq");
|
||||
},
|
||||
allowReg: function() {
|
||||
let conf = SysConfig.findOne();
|
||||
if (typeof conf != 'undefined') {
|
||||
return conf.allowReg;
|
||||
} else {
|
||||
return true
|
||||
const sysConf = async() => {
|
||||
let conf = await SysConfig.findOneAsync();
|
||||
if (!conf) {
|
||||
return true;
|
||||
} else {
|
||||
return conf.allowReg;
|
||||
}
|
||||
}
|
||||
sysConf();
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -84,14 +88,16 @@ Template.reg.events({
|
|||
|
||||
let userId = Meteor.userId();
|
||||
console.log("User ID: " + userId);
|
||||
Meteor.call("addToRole", "user", function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR: ROLES - Error adding user to role: " + err);
|
||||
const addRole = async() => {
|
||||
let result = await Meteor.callAsync("addToRole", "user");
|
||||
if (!result) {
|
||||
console.log(" ERROR: ROLES - Error adding user to role: ");
|
||||
} 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 outlined">
|
||||
<div class="col s12 m6 l6 input-field">
|
||||
<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,19 +35,34 @@ Template.userInfoModal.helpers({
|
|||
userInfo: function() {
|
||||
let usersId = Session.get("usersId");
|
||||
if (usersId != "" && usersId != null) {
|
||||
let usersInfo = Meteor.users.findOne({ _id: usersId });
|
||||
// console.dir(usersInfo);
|
||||
Session.set("usersInfo", usersInfo);
|
||||
return usersInfo;
|
||||
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();
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
},
|
||||
userRole: function() {
|
||||
let userRole = Roles.getRolesForUser( Session.get("usersId"));
|
||||
Session.set("usersRole", userRole);
|
||||
console.log(userRole);
|
||||
return userRole;
|
||||
const getRole = async() => {
|
||||
let userRole = Roles.getRolesForUserAsync( Session.get("usersId"));
|
||||
if (!userRole) {
|
||||
return;
|
||||
} else {
|
||||
Session.set("usersRole", userRole);
|
||||
console.log(userRole);
|
||||
return userRole;
|
||||
}
|
||||
}
|
||||
getRole();
|
||||
},
|
||||
rolesOptions: function() {
|
||||
return Roles.find();
|
||||
|
|
@ -121,36 +136,33 @@ Template.userInfoModal.events({
|
|||
}
|
||||
});
|
||||
|
||||
changePassword = function(userId, passwd) {
|
||||
changePassword = async function(userId, passwd) {
|
||||
console.log("would change password.");
|
||||
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!");
|
||||
}
|
||||
});
|
||||
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!");
|
||||
}
|
||||
}
|
||||
|
||||
changeUserEmail = function(usersId, usersEmail) {
|
||||
changeUserEmail = async function(usersId, usersEmail) {
|
||||
console.log("Would change user email");
|
||||
Meteor.call('update.userEmail', usersId, usersEmail, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR updating user email: " + err);
|
||||
} else {
|
||||
showSnackbar("Email updated successfully!", "green");
|
||||
}
|
||||
});
|
||||
let result = await Meteor.callAsync('update.userEmail', usersId, usersEmail);
|
||||
if (!result) {
|
||||
console.log(" ERROR updating user email: " + err);
|
||||
} else {
|
||||
showSnackbar("Email updated successfully!", "green");
|
||||
}
|
||||
}
|
||||
|
||||
changeUserRole = function(userId, role) {
|
||||
changeUserRole = async function(userId, role) {
|
||||
console.log("Would change user Role.");
|
||||
Meteor.call('edit.userRole', userId, role, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR updating user role: " + err);
|
||||
} else {
|
||||
showSnackbar("Role Successfully Updated!", "green");
|
||||
}
|
||||
});
|
||||
let result = await Meteor.callAsync('edit.userRole', userId, role);
|
||||
if (!result) {
|
||||
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.getRolesForUser( this._id );
|
||||
return Roles.getRolesForUserAsync( this._id );
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -40,27 +40,25 @@ Template.cleanUpModalConfirm.events({
|
|||
}
|
||||
});
|
||||
|
||||
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();
|
||||
}
|
||||
});
|
||||
cleanUp = async function(methodName, whatItems) {
|
||||
let result = Meteor.callAsync(methodName);
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
cleanTasks = function(methodName, whatItems) {
|
||||
cleanTasks = async function(methodName, whatItems) {
|
||||
let timeFrame = Session.get("overdueVal");
|
||||
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();
|
||||
}
|
||||
});
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
|
@ -29,15 +29,7 @@ Template.listMgmtForm.events({
|
|||
Session.set("listNameMiss", true);
|
||||
return;
|
||||
} else {
|
||||
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);
|
||||
}
|
||||
});
|
||||
addList(listName, shared);
|
||||
}
|
||||
},
|
||||
'click .renameListMgmt' (event) {
|
||||
|
|
@ -50,16 +42,7 @@ Template.listMgmtForm.events({
|
|||
Session.set("listNameMiss", true);
|
||||
return;
|
||||
} else {
|
||||
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);
|
||||
}
|
||||
});
|
||||
editList(listId, listName, shared);
|
||||
}
|
||||
},
|
||||
'submit .listAdd' (event) {
|
||||
|
|
@ -74,26 +57,9 @@ Template.listMgmtForm.events({
|
|||
return;
|
||||
} else {
|
||||
if (editMode == false) {
|
||||
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);
|
||||
}
|
||||
});
|
||||
addList(listName, shared);
|
||||
} else {
|
||||
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);
|
||||
}
|
||||
});
|
||||
editList(listId, listName, shared);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -101,3 +67,26 @@ Template.listMgmtForm.events({
|
|||
Session.set("showCompletedLists", true);
|
||||
},
|
||||
});
|
||||
|
||||
const addList = async(listName, shared) => {
|
||||
let result = await Meteor.callAsync('add.list', listName, shared);
|
||||
if (!result) {
|
||||
// console.log(" ERROR adding list name: ");
|
||||
} else {
|
||||
// console.log(" SUCCESS adding list name.");
|
||||
$("#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(" ERROR editing list name: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS editing list name.");
|
||||
$("#listNameInp").val("");
|
||||
$("#isShared").prop("checked", false);
|
||||
Session.set("listNameEditMode", false);
|
||||
}
|
||||
}
|
||||
|
|
@ -34,9 +34,14 @@ Template.listMgmtTbl.events({
|
|||
},
|
||||
'click .editListName' (event) {
|
||||
event.preventDefault();
|
||||
let listInfo = Lists.findOne({ _id: this._id });
|
||||
let listName = listInfo.listName;
|
||||
let listShared = listInfo.listShared;
|
||||
const lInfo = async() => {
|
||||
let listInfo = await Lists.findOneAsync({ _id: this._id });
|
||||
return listInfo;
|
||||
}
|
||||
let listData = lInfo();
|
||||
|
||||
let listName = listData.listName;
|
||||
let listShared = listData.listShared;
|
||||
$("#listNameInp").val(listName);
|
||||
if (listShared == true) {
|
||||
$("#isShared").prop("checked", true);
|
||||
|
|
@ -49,23 +54,27 @@ Template.listMgmtTbl.events({
|
|||
'click .markListComplete' (event) {
|
||||
event.preventDefault();
|
||||
let listId = this._id;
|
||||
Meteor.call('mark.complete', listId, function(err, result) {
|
||||
if (err) {
|
||||
// console.log(" ERROR marking complete: " + err);
|
||||
const markComp = async() => {
|
||||
let result = await Meteor.callAsync('mark.complete', listId);
|
||||
if (!result) {
|
||||
console.log(" ERROR marking complete.");
|
||||
} else {
|
||||
// console.log(" SUCCESS marking complete.");
|
||||
}
|
||||
});
|
||||
}
|
||||
markComp();
|
||||
},
|
||||
'click .markListNotComplete' (event) {
|
||||
event.preventDefault();
|
||||
let listId = this._id;
|
||||
Meteor.call('mark.incomplete', listId, function(err, result) {
|
||||
if (err) {
|
||||
|
||||
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,3 +1,5 @@
|
|||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
|
||||
Template.mgmtPage.onCreated(function() {
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -35,36 +35,19 @@ 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) {
|
||||
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");
|
||||
}
|
||||
});
|
||||
editProd(prodId, name, store);
|
||||
} else {
|
||||
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");
|
||||
}
|
||||
});
|
||||
newProd(name, store);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -76,5 +59,33 @@ Template.prodMgmtForm.events({
|
|||
} else {
|
||||
Session.set("noStoreSet", 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");
|
||||
}
|
||||
}
|
||||
|
|
@ -57,10 +57,17 @@ Template.prodMgmtTbl.events({
|
|||
event.preventDefault();
|
||||
Session.set("prodEditMode", true);
|
||||
Session.set("prodEditId", this._id);
|
||||
let prodInfo = Products.findOne({ _id: this._id });
|
||||
$("#prodName").val(prodInfo.prodName);
|
||||
$("#prodStore").val(prodInfo.prodStore);
|
||||
// $('select').formSelect();
|
||||
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();
|
||||
|
||||
},
|
||||
'click #filterProds' (event) {
|
||||
event.preventDefault();
|
||||
|
|
|
|||
|
|
@ -23,14 +23,7 @@ Template.storeMgmtForm.events({
|
|||
Session.set("borderRed", true);
|
||||
return;
|
||||
} else {
|
||||
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");
|
||||
}
|
||||
});
|
||||
addStore(storeName);
|
||||
}
|
||||
},
|
||||
'click .cancelStoreMgmt' (event) {
|
||||
|
|
@ -38,35 +31,22 @@ 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) {
|
||||
// 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);
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
'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);
|
||||
}
|
||||
}
|
||||
},
|
||||
'click .editStoreMgmt' (event) {
|
||||
let storeName = $("#storeName").val();
|
||||
let storeId = Session.get("storeIdEdit");
|
||||
|
|
@ -74,15 +54,28 @@ Template.storeMgmtForm.events({
|
|||
Session.set("borderRed", true);
|
||||
return;
|
||||
} else {
|
||||
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");
|
||||
}
|
||||
});
|
||||
editStore(storeId, storeName);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
|
@ -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');
|
||||
// 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");
|
||||
const addNoSysReg = async() => {
|
||||
let result = await Meteor.callAsync("add.noSysAdminReg", admReg, genReg);
|
||||
if (!result) {
|
||||
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');
|
||||
Meteor.call('allow.updateInfo', updSet, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR changing update setting: " + err);
|
||||
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");
|
||||
} else {
|
||||
showSnackbar("Update Setting Changed Successfully!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
allowUpdateInfo();
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -92,9 +92,10 @@ Template.taskForm.events({
|
|||
}
|
||||
|
||||
if (taskUserErr == false && taskDateErr == false && taskNameErr == false) {
|
||||
Meteor.call("add.task", taskNameArr, userInfo[0], userInfo[1], taskDateArr, actDate, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding the new task: " + err);
|
||||
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.");
|
||||
} else {
|
||||
console.log(" SUCCESS adding the new task.");
|
||||
Session.set("taskDateArr", []);
|
||||
|
|
@ -102,7 +103,8 @@ Template.taskForm.events({
|
|||
$("#taskUser").val("");
|
||||
$('select').formSelect();
|
||||
}
|
||||
});
|
||||
}
|
||||
addTask();
|
||||
} else {
|
||||
showSnackbar("ERROR: Missing Required Fields!", "red");
|
||||
}
|
||||
|
|
@ -114,6 +116,5 @@ Template.taskForm.events({
|
|||
} else {
|
||||
Session.set("hideCompletedTasks", false);
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
|
|
@ -43,13 +43,15 @@ Template.taskTbl.events({
|
|||
'click .markTaskComplete' (event) {
|
||||
event.preventDefault();
|
||||
let taskId = this._id;
|
||||
Meteor.call("markTask.complete", taskId, function(err, result) {
|
||||
if (err) {
|
||||
const markComp = async() => {
|
||||
let result = await Meteor.callAsync("markTask.complete", taskId);
|
||||
if (!result) {
|
||||
console.log(" ERROR marking task completeL " + err);
|
||||
showSnackbar("ERROR Marking Task Complete!", "red");
|
||||
} else {
|
||||
showSnackbar("Successfully Marked Task Complete!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
markComp();
|
||||
},
|
||||
});
|
||||
|
|
@ -2,12 +2,13 @@
|
|||
<h4>My Dashboard</h4>
|
||||
<div class="row">
|
||||
{{#if $eq currConfig.allowUpdates true}}
|
||||
{{#if updatesExist}}
|
||||
{{#if $eq updatesExist true}}
|
||||
<div class="col s12">
|
||||
<div class="card green darken-3" id="updateInfoCard">
|
||||
<div class="card-content white-text">
|
||||
<div class="card-title">Update Available</div>
|
||||
<div class="row">
|
||||
<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">
|
||||
{{#each updates}}
|
||||
<div class="col s12">
|
||||
<div class="row">
|
||||
|
|
@ -33,8 +34,9 @@
|
|||
<hr />
|
||||
{{/each}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ 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");
|
||||
|
|
@ -23,7 +25,10 @@ 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({
|
||||
|
|
@ -61,18 +66,47 @@ Template.dashboard.helpers({
|
|||
},
|
||||
updates: function() {
|
||||
let updateAvail = UpdateInfo.find({});
|
||||
return updateAvail;
|
||||
},
|
||||
updatesExist: function() {
|
||||
let updateExists = UpdateInfo.find({ viewed: false }).fetch();
|
||||
if (updateExists.length > 0) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
try {
|
||||
if (!updateAvail) {
|
||||
console.log("No update info found.");
|
||||
return false;
|
||||
} else {
|
||||
console.dir(updateAvail);
|
||||
return updateAvail;
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR trying to grab update info: " + error);
|
||||
}
|
||||
},
|
||||
updatesExist: function() {
|
||||
const ifUpdate = async() => {
|
||||
let updateExists = await UpdateInfo.findOneAsync({ viewed: false });
|
||||
if (!updateExists) {
|
||||
console.log("Update doesn't exist as false.");
|
||||
return false;
|
||||
} else {
|
||||
console.log("Update found with false.");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
let updateAvail = ifUpdate();
|
||||
return updateAvail;
|
||||
},
|
||||
currConfig: function() {
|
||||
return SysConfig.findOne({});
|
||||
const getSys = async() => {
|
||||
let currSys = SysConfig.findOneAsync({});
|
||||
try {
|
||||
if (!currSys) {
|
||||
// console.log("No System Config found.")
|
||||
} else {
|
||||
return currSys;
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR trying to fetch current system config: " + error);
|
||||
}
|
||||
}
|
||||
let currConf = getSys();
|
||||
return currConf;
|
||||
},
|
||||
descriptionSinHTML: function() {
|
||||
let desc = this.description;
|
||||
|
|
@ -141,12 +175,19 @@ Template.dashboard.events({
|
|||
'click .readLink' (event) {
|
||||
let eventId = event.currentTarget.id;
|
||||
|
||||
Meteor.call('markUpdate.read', eventId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR marking update as 'read': " + err);
|
||||
} else {
|
||||
console.log("marked read successfully!");
|
||||
const markUpdate = async() => {
|
||||
let result = await Meteor.callAsync('markUpdate.read', eventId);
|
||||
try {
|
||||
if (!result) {
|
||||
console.log(" Error marking this read.");
|
||||
showSnackbar("Error Marking Read!", "red");
|
||||
} else {
|
||||
showSnackbar("Successfully Marked as Read.", "green");
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR trying to mark this update as read: " + error);
|
||||
}
|
||||
});
|
||||
}
|
||||
markUpdate();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -22,14 +22,16 @@ Template.deleteConfirmationModal.events({
|
|||
let deleteId = Session.get("deleteId");
|
||||
let method = Session.get("method");
|
||||
|
||||
Meteor.call(method, deleteId, function(err, result) {
|
||||
if (err) {
|
||||
const delItem = async() => {
|
||||
let result = await Meteor.callAsync(method, deleteId);
|
||||
if (!result) {
|
||||
console.log(" ERROR deleting item from modal: " + err);
|
||||
} else {
|
||||
console.log(" SUCCESSFULLY deleted.");
|
||||
// put the new modal open / close here
|
||||
// $('#modalDelete').modal('close');
|
||||
}
|
||||
});
|
||||
}
|
||||
delItem();
|
||||
},
|
||||
});
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
<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="#" class="navBtn {{#if $eq myTheme 'dark'}}white-text{{/if}}" id="mySettings">My Settings</a></li>
|
||||
{{#if isInRole 'systemadmin'}}
|
||||
{{#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>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,38 @@
|
|||
import { Meteor } from 'meteor/meteor';
|
||||
import { M } from '../lib/assets/materialize';
|
||||
import { UpdateInfo } from '../../imports/api/updateInfo.js';
|
||||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
import { Roles } from 'meteor/roles';
|
||||
|
||||
Template.headerBar.onCreated(function() {
|
||||
this.subscribe("UpdateVersion");
|
||||
this.subscribe("assignment");
|
||||
});
|
||||
|
||||
Template.headerBar.onRendered(function() {
|
||||
var elems = document.querySelectorAll('.sidenav');
|
||||
var instances = M.Sidenav.init(elems, {});
|
||||
var elemd = document.querySelectorAll('.dropdown-trigger');
|
||||
var instances = M.Dropdown.init(elemd, {});
|
||||
var instances = M.Dropdown.init(elemd, {});
|
||||
|
||||
setTimeout(function() {
|
||||
const getRoles = async() => {
|
||||
let userId = Meteor.userId();
|
||||
// let isRole = await Roles.userIsInRoleAsync(userId, "systemadmin");
|
||||
let isRole = await Roles.getRolesForUserAsync(userId);
|
||||
try {
|
||||
if (!isRole) {
|
||||
console.log("SystemAdmin role for user not found: " + isRole);;
|
||||
} else {
|
||||
console.log("Found role for the user: ");
|
||||
console.dir(isRole);
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR getting role for user: " + error);
|
||||
}
|
||||
}
|
||||
getRoles();
|
||||
}, 1000);
|
||||
});
|
||||
|
||||
Template.headerBar.helpers({
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ Template.listItemsForm.helpers({
|
|||
}
|
||||
},
|
||||
itemProdName: function() {
|
||||
|
||||
return Products.find({});
|
||||
},
|
||||
editMode: function() {
|
||||
|
|
@ -66,14 +67,7 @@ Template.listItemsForm.events({
|
|||
if (item == null || item == "") {
|
||||
Session.set("itemReqErr", true);
|
||||
} else {
|
||||
Meteor.call("add.listItem", item, listId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding item to list: " + err);
|
||||
} else {
|
||||
console.log(" SUCCESS adding item to list.");
|
||||
$("#findListItems").val("");
|
||||
}
|
||||
});
|
||||
addItem(item, listId);
|
||||
}
|
||||
},
|
||||
'keydown #findListItems' (event) {
|
||||
|
|
@ -83,14 +77,7 @@ Template.listItemsForm.events({
|
|||
if (item == null || item == "") {
|
||||
Session.set("itemReqErr", true);
|
||||
} else {
|
||||
Meteor.call("add.listItem", item, listId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR adding item to list: " + err);
|
||||
} else {
|
||||
console.log(" SUCCESS adding item to list.");
|
||||
$("#findListItems").val("");
|
||||
}
|
||||
});
|
||||
addItem(item, listId);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -110,8 +97,11 @@ Template.listItemsForm.events({
|
|||
'keyup #findListItems' (event) {
|
||||
if (event.which !== 13) {
|
||||
let findItemVal = $("#findListItems").val();
|
||||
// console.log(findItemVal);
|
||||
let listItemInfo = Products.find({ prodName: {$regex: findItemVal + '.*', $options: 'i'}}).fetch();
|
||||
if (typeof listItemInfo != 'undefined' && listItemInfo != "" && listItemInfo != null) {
|
||||
if (!listItemInfo) {
|
||||
console.log("No data for key input.");
|
||||
} else {
|
||||
getDataList(listItemInfo);
|
||||
}
|
||||
}
|
||||
|
|
@ -128,7 +118,21 @@ 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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ Template.listItemsTbl.helpers({
|
|||
let showRecvd = Session.get("showReceivedItems");
|
||||
let searchVal = Session.get("searchVal");
|
||||
if (showRecvd == false) {
|
||||
if (typeof searchVal == 'undefined' || searchVal.length === 0) {
|
||||
if (!searchVal) {
|
||||
return ListItems.find({ itemReceived: false });
|
||||
} else {
|
||||
return ListItems.find({ itemReceived: false, itemName: { $regex: searchVal + '.*', $options: 'i' } });
|
||||
}
|
||||
} else {
|
||||
if (typeof searchVal == 'undefined' || searchVal.length == 0) {
|
||||
if (!searchVal) {
|
||||
return ListItems.find({});
|
||||
} else {
|
||||
return ListItems.find({ itemName: { $regex: searchVal + '.*', $options: 'i' } });
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import { Lists } from '../../imports/api/lists.js';
|
||||
import { M } from '../lib/assets/materialize.js';
|
||||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
|
||||
Template.listsTbl.onCreated(function() {
|
||||
this.subscribe("myLists");
|
||||
|
|
@ -25,17 +26,19 @@ Template.listsTbl.events({
|
|||
if (listId == "addList") {
|
||||
// opens the modal and allows you to add a new List
|
||||
} else {
|
||||
// console.log("listId is: " + listId);
|
||||
console.log("listId is: " + listId);
|
||||
Session.set("listId", listId);
|
||||
Meteor.call('add.userLast', "List", listId, function(err, result) {
|
||||
if (err) {
|
||||
const addUserLast = async() => {
|
||||
let result = await Meteor.callAsync('add.userLast', "List", listId);
|
||||
if (!result) {
|
||||
console.log(" ERROR setting user last list id in db: " + err);
|
||||
} else {
|
||||
Meteor.setTimeout(function() {
|
||||
setTimeout(function() {
|
||||
FlowRouter.go('/listitems');
|
||||
}, 100);
|
||||
}
|
||||
});
|
||||
}
|
||||
addUserLast();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -47,15 +50,17 @@ Template.listsTbl.events({
|
|||
let splitList = listFullId.split("_");
|
||||
let listId = splitList[1];
|
||||
// console.log("listId is " + listId);
|
||||
Meteor.call("mark.complete", listId, function(err, result){
|
||||
if (err) {
|
||||
console.log(" ERROR marking list complete! " + err);
|
||||
const markComp = async() => {
|
||||
let result = await Meteor.callAsync("mark.complete", listId);
|
||||
if (!result) {
|
||||
console.log(" ERROR marking list complete!");
|
||||
showSnackbar("ERROR! List Not Makred Complete!", "red");
|
||||
} else {
|
||||
// console.log(" SUCCESS marking list complete.");
|
||||
showSnackbar("List Marked Complete!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
markComp();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
@ -7,20 +7,27 @@ Template.MainLayout.onCreated(function() {
|
|||
Template.MainLayout.onRendered(function() {
|
||||
this.autorun(() => {
|
||||
let myId = Meteor.userId();
|
||||
let myprefs = UserConfig.findOne({ user: myId });
|
||||
if (typeof myprefs != 'undefined') {
|
||||
if (myprefs.darkMode == "light") {
|
||||
console.log("Found theme as light");
|
||||
Session.set("myTheme", "light");
|
||||
document.documentElement.setAttribute('theme', "light");
|
||||
} else {
|
||||
console.log("Found theme as dark");
|
||||
Session.set("myTheme", "dark");
|
||||
document.documentElement.setAttribute('theme', "dark");
|
||||
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);
|
||||
}
|
||||
} else {
|
||||
console.log("User Prefs appear undefined.");
|
||||
}
|
||||
getConfig();
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -53,12 +53,14 @@ Template.addProdToListModal.events({
|
|||
event.preventDefault();
|
||||
let selectedItems = Session.get("itemsSelected");
|
||||
let listId = $("#chooseList").val();
|
||||
Meteor.call('add.itemsFromMenuItem', selectedItems, listId, function(err, result) {
|
||||
if (err) {
|
||||
const addItemsFromMenu = async() => {
|
||||
let result = await Meteor.callAsync('add.itemsFromMenuItem', selectedItems, listId);
|
||||
if (!result) {
|
||||
console.log(" ERROR adding menu components to list: " + err);
|
||||
} else {
|
||||
showSnackbar("Items Added to List!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
addItemsFromMenu();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -38,13 +38,27 @@ Template.menuItemsForm.helpers({
|
|||
if (Session.get("menuId")) {
|
||||
menuId = Session.get("menuId");
|
||||
} else {
|
||||
menuId = UserLast.findOne({ view: "Menu" }).viewId;
|
||||
const menuInfor = async() => {
|
||||
let result = await UserLast.findOneAsync({ view: "Menu" }).viewId;
|
||||
if (!result) {
|
||||
|
||||
} else {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
let menuId = menuInfor();
|
||||
}
|
||||
|
||||
let menuInfo = Menus.findOne({ _id: menuId });
|
||||
if (menuInfo) {
|
||||
return menuInfo.menuName;
|
||||
const menuData = async() => {
|
||||
let menuInfo = await Menus.findOneAsync({ _id: menuId });
|
||||
if (!menuInfo) {
|
||||
return;
|
||||
} else {
|
||||
return menuInfo.menuName;
|
||||
}
|
||||
}
|
||||
let menuInformation = menuData();
|
||||
return menuInformation;
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -55,10 +69,54 @@ Template.menuItemsForm.events({
|
|||
let dateSrv = $("#dateServed").val();
|
||||
let menuId = Session.get("menuId");
|
||||
|
||||
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
|
||||
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.");
|
||||
return result;
|
||||
}
|
||||
}
|
||||
let addedItem = addMenuItem();
|
||||
|
||||
if (typeof menuItemExists != 'undefined' && menuItemExists != null && menuItemExists != "") {
|
||||
if (!addedItem) {
|
||||
console.log("Item was not added.");
|
||||
} else {
|
||||
// now add this item to the menu
|
||||
const addToMenu = async() => {
|
||||
let result2 = await Meteor.callAsync('addto.Menu', menuId, menuItem, result, dateSrv);
|
||||
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) => {
|
||||
// use the existing item on the menu
|
||||
let menuItemId = menuItemExists._id;
|
||||
let isLinked = menuItemExists.isLinked;
|
||||
|
|
@ -75,30 +133,6 @@ Template.menuItemsForm.events({
|
|||
}
|
||||
});
|
||||
}
|
||||
} 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.");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
'click .shiftOneDay' (event) {
|
||||
|
|
@ -110,13 +144,14 @@ Template.menuItemsForm.events({
|
|||
let menuItemId = menuInfo[i]._id;
|
||||
let momentAddDay = moment(menuInfo[i].serveDate).add(1, 'day').format("MMM DD, YYYY");
|
||||
// console.log(momentAddDay);
|
||||
Meteor.call('shiftDate', menuItemId, momentAddDay, function(err,result) {
|
||||
if (err) {
|
||||
const shiftDay = async() => {
|
||||
let result = await Meteor.callAsync('shiftDate', menuItemId, momentAddDay);
|
||||
if (!result) {
|
||||
console.log(" ERROR shifting meal days: " + err);
|
||||
} else {
|
||||
showSnackbar("Items Shifted Out by 1 Calendar Day", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
'keyup #menuItemInp' (event) {
|
||||
|
|
|
|||
|
|
@ -30,11 +30,21 @@ Template.menuItemsTbl.helpers({
|
|||
if (Session.get("menuId")) {
|
||||
menuId = Session.get("menuId");
|
||||
} else {
|
||||
menuId = UserLast.findOne({ view: "Menu" }).viewId;
|
||||
const menu = async() => {
|
||||
let menId = await UserLast.findOneAsync({ view: "Menu" }).viewId;
|
||||
if (!menId) {
|
||||
|
||||
} else {
|
||||
return menId;
|
||||
}
|
||||
}
|
||||
menuId = menu();
|
||||
}
|
||||
let menuInfo = Menus.find({ _id: menuId }, { sort: { serveDateActual: 1 }});
|
||||
if (menuInfo) {
|
||||
return menuInfo
|
||||
if (menuId) {
|
||||
let menuInfo = Menus.find({ _id: menuId }, { sort: { serveDateActual: 1 }});
|
||||
if (menuInfo) {
|
||||
return menuInfo;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -42,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 (i=0; i<links.length; i++) {
|
||||
for (let i=0; i<links.length; i++) {
|
||||
let linkArray = links[i].split('|');
|
||||
let key = linkArray[0];
|
||||
let value = linkArray[1];
|
||||
|
|
@ -50,25 +50,33 @@ Template.modalLinkProducts.events({
|
|||
linkObjArray.push(linkObj);
|
||||
}
|
||||
|
||||
Meteor.call("add.menuProdLinks", menuItemId, menuItemName, linkObjArray, function(err, result) {
|
||||
if (err) {
|
||||
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);
|
||||
} else {
|
||||
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");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
updMenuItemLinks();
|
||||
}
|
||||
});
|
||||
}
|
||||
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,14 +27,16 @@ Template.addMenuModal.events({
|
|||
if (menuName == "" || menuName == null) {
|
||||
Session.set("menuNameErr", true);
|
||||
} else {
|
||||
Meteor.call("add.menu", menuName, function(err, result) {
|
||||
if (err) {
|
||||
const addMenu = async() => {
|
||||
let result = await Meteor.callAsync("add.menu", menuName);
|
||||
if (!result) {
|
||||
console.log(" ERROR adding menu: " + err);
|
||||
} else {
|
||||
console.log(" SUCCESS adding menu.");
|
||||
$("#menuNameInp").val("");
|
||||
}
|
||||
});
|
||||
}
|
||||
addMenu();
|
||||
}
|
||||
},
|
||||
});
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
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");
|
||||
|
|
@ -21,41 +22,48 @@ Template.mainMenuTbl.events({
|
|||
'click li.collection-item' (event) {
|
||||
event.preventDefault();
|
||||
let sender = event.target;
|
||||
// console.log("Sender origination from: ");
|
||||
// console.log("Sender originated from: ");
|
||||
// console.log(sender.localName);
|
||||
if (sender.localName == "li") {
|
||||
let menuId = event.currentTarget.id;
|
||||
if (menuId == "addMenu") {
|
||||
// console.log("add menu clicked");
|
||||
console.log("add menu clicked");
|
||||
} else {
|
||||
// console.log("menuId is: " + menuId);
|
||||
Meteor.call('add.userLast', "Menu", menuId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR writing last menu viewed by user to db: " + err);
|
||||
console.log("menuId is: " + menuId);
|
||||
const addUserLast = async() => {
|
||||
let result = await Meteor.callAsync('add.userLast', "Menu", menuId);
|
||||
if (!result) {
|
||||
console.log(" ERROR writing last menu viewed by user to db.");
|
||||
} else {
|
||||
Session.set("menuId", menuId);
|
||||
Meteor.setTimeout(function() {
|
||||
FlowRouter.go('/menuitems');
|
||||
}, 100);
|
||||
}
|
||||
});
|
||||
}
|
||||
addUserLast();
|
||||
}
|
||||
} else if (sender.localName == "i") {
|
||||
let menuId = this._id;
|
||||
Meteor.call("markMenu.complete", menuId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR: can't mark menu complete: " + err);
|
||||
const makrMenuComp = async() => {
|
||||
let result = await Meteor.callAsync("markMenu.complete", menuId);
|
||||
if (!result) {
|
||||
console.log(" ERROR: can't mark menu complete.");
|
||||
} else {
|
||||
console.log(" SUCCESS marking menu complete.");
|
||||
Meteor.call('setAllMade.menuItem', menuId, function(err, result) {
|
||||
if (err) {
|
||||
console.log(" ERROR: cannot set all items as made: " + err);
|
||||
} else {
|
||||
console.log(" SUCCESS setting all items made.");
|
||||
}
|
||||
});
|
||||
setAllMade();
|
||||
}
|
||||
});
|
||||
}
|
||||
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.");
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
|
|
@ -40,7 +40,7 @@ Template.myTasksForm.events({
|
|||
if (taskDateArray == null || taskDateArray == []|| taskDateArray == "") {
|
||||
taskDateErr = true;
|
||||
} else {
|
||||
for (i = 0; i < taskDateArray.length; i++) {
|
||||
for (let i = 0; i < taskDateArray.length; i++) {
|
||||
// console.log(taskDateArray[i]);
|
||||
let actDateTask = new Date(taskDateArray[i]);
|
||||
actDate.push(actDateTask);
|
||||
|
|
@ -49,10 +49,11 @@ Template.myTasksForm.events({
|
|||
|
||||
console.log("Date Error: " + taskDateErr + " - Name Error: " + taskNameErr);
|
||||
if (taskDateErr == false && taskNameErr == false) {
|
||||
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");
|
||||
const addTask = async() => {
|
||||
let result = await Meteor.callAsync("add.task", taskNameArray, "self", "selfId", taskDateArray, 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", []);
|
||||
|
|
@ -60,7 +61,8 @@ Template.myTasksForm.events({
|
|||
$("#myTaskDate").val("");
|
||||
showSnackbar("Added Tasks Successfully!", "green");
|
||||
}
|
||||
});
|
||||
}
|
||||
addTask();
|
||||
} else {
|
||||
showSnackbar("Error! Both Task & Date are Required!", "red");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,15 +55,15 @@ Template.myTasksTbl.events({
|
|||
'click .markMyTaskComplete' (event) {
|
||||
event.preventDefault();
|
||||
let taskId = this._id;
|
||||
Meteor.call("markTask.complete", taskId, function(err, result) {
|
||||
if (err) {
|
||||
const makrTaskComp = async() => {
|
||||
let result = await Meteor.callAsync("markTask.complete", taskId);
|
||||
if (!result) {
|
||||
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();
|
||||
|
|
|
|||
|
|
@ -5,15 +5,29 @@ Template.userConfig.onCreated(function() {
|
|||
});
|
||||
|
||||
Template.userConfig.onRendered(function() {
|
||||
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);
|
||||
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);
|
||||
}
|
||||
|
||||
}
|
||||
getConfig();
|
||||
});
|
||||
|
||||
Template.userConfig.helpers({
|
||||
|
|
@ -22,23 +36,22 @@ Template.userConfig.helpers({
|
|||
|
||||
Template.userConfig.events({
|
||||
'click #darkMode' (event) {
|
||||
let darkModePref = $("#darkMode").prop('checked');
|
||||
let darkModePref = $("#darkMode").prop('checked')
|
||||
if (darkModePref == true) {
|
||||
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");
|
||||
}
|
||||
});
|
||||
let mode = 'dark';
|
||||
setDarkMode(mode);
|
||||
} else {
|
||||
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");
|
||||
}
|
||||
});
|
||||
let mode = 'light';
|
||||
setDarkMode(mode);
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
|
@ -25,38 +25,48 @@ Meteor.methods({
|
|||
let iname = itemName.charAt(0).toUpperCase() + itemName.slice(1);
|
||||
|
||||
// look up the item from the Products collection
|
||||
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.");
|
||||
const prodIsIn = async() => {
|
||||
let prodInfo = await Products.findOneAsync({ prodName: iname });
|
||||
try {
|
||||
if (!prodInfo) {
|
||||
// add product info first
|
||||
const addProd = async() => {
|
||||
let added = await Meteor.callAsync("add.product", itemName, [""]);
|
||||
if (!added) {
|
||||
console.log(" ERROR adding item to products: " + err);
|
||||
} else {
|
||||
// console.log(" SUCCESS adding item to Products.");
|
||||
|
||||
return ListItems.insert({
|
||||
return ListItems.insertAsync({
|
||||
itemName: iname,
|
||||
listId: listId,
|
||||
prodId: result,
|
||||
addedBy: this.userId,
|
||||
itemStore: "",
|
||||
itemOrdered: false,
|
||||
itemReceived: false,
|
||||
dateAddedToList: new Date(),
|
||||
});
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return ListItems.insertAsync({
|
||||
itemName: iname,
|
||||
listId: listId,
|
||||
prodId: result,
|
||||
prodId: prodInfo._id,
|
||||
addedBy: this.userId,
|
||||
itemStore: "",
|
||||
itemStore: prodInfo.prodStore,
|
||||
itemOrdered: false,
|
||||
itemReceived: false,
|
||||
dateAddedToList: new Date(),
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return ListItems.insert({
|
||||
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);
|
||||
}
|
||||
}
|
||||
let prodIn = prodIsIn();
|
||||
return prodIn;
|
||||
},
|
||||
'add.itemsFromMenuItem' (itemIds, listId) {
|
||||
check(itemIds, [String]);
|
||||
|
|
@ -75,7 +85,7 @@ Meteor.methods({
|
|||
if (onList == 0) {
|
||||
// now pull the product
|
||||
let prodInfo = Products.findOne({ _id: itemIds[i] });
|
||||
ListItems.insert({
|
||||
ListItems.insertAsync({
|
||||
itemName: prodInfo.prodName,
|
||||
listId: listId,
|
||||
prodId: prodInfo._id,
|
||||
|
|
@ -98,7 +108,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to set items as ordered. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
return ListItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemOrdered: true,
|
||||
dateOrdered: new Date(),
|
||||
|
|
@ -116,7 +126,7 @@ Meteor.methods({
|
|||
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 ListItems.update({ _id: itemId }, {
|
||||
return ListItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemOrdered: false,
|
||||
dateUnOrdered: new Date(),
|
||||
|
|
@ -130,7 +140,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to set items as received. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
return ListItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemReceived: true,
|
||||
dateReceived: new Date(),
|
||||
|
|
@ -145,7 +155,7 @@ Meteor.methods({
|
|||
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 ListItems.update({ _id: itemId }, {
|
||||
return ListItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemReceived: false,
|
||||
dateNotReceived: new Date(),
|
||||
|
|
@ -164,7 +174,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return ListItems.update({ _id: itemId }, {
|
||||
return ListItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemName: itemName,
|
||||
}
|
||||
|
|
@ -177,6 +187,6 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to delete list items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return ListItems.remove({ _id: itemId });
|
||||
return ListItems.removeAsync({ _id: itemId });
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Lists.insert({
|
||||
return Lists.insertAsync({
|
||||
listName: listName,
|
||||
listShared: isShared,
|
||||
listOwner: this.userId,
|
||||
|
|
@ -36,7 +36,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to edit lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Lists.update({ _id: listId }, {
|
||||
return Lists.updateAsync({ _id: listId }, {
|
||||
$set: {
|
||||
listName: listName,
|
||||
listShared: isShared,
|
||||
|
|
@ -50,7 +50,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to delete lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Lists.remove({ _id: listId });
|
||||
return Lists.removeAsync({ _id: listId });
|
||||
},
|
||||
'mark.complete' (listId) {
|
||||
check(listId, String);
|
||||
|
|
@ -59,7 +59,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to mark lists complete. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Lists.update({ _id: listId }, {
|
||||
return Lists.updateAsync({ _id: listId }, {
|
||||
$set: {
|
||||
listComplete: true,
|
||||
completedOn: new Date()
|
||||
|
|
@ -73,7 +73,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to restore completed lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Lists.update({ _id: listId }, {
|
||||
return Lists.updateAsync({ _id: listId }, {
|
||||
$set: {
|
||||
listComplete: false,
|
||||
completedOn: new Date()
|
||||
|
|
@ -85,6 +85,6 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to clean up old lists. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Lists.remove({ listComplete: true });
|
||||
return Lists.removeAsync({ listComplete: true });
|
||||
},
|
||||
});
|
||||
|
|
@ -15,7 +15,7 @@ Meteor.methods({
|
|||
'set.ScriptRun' (scriptName) {
|
||||
check(scriptName, String);
|
||||
|
||||
MScripts.insert({
|
||||
MScripts.insertAsync({
|
||||
scriptName: scriptName,
|
||||
hasRun: true,
|
||||
runOn: new Date(),
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add menus. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Menus.insert({
|
||||
return Menus.insertAsync({
|
||||
menuName: menuName,
|
||||
menuOwner: this.userId,
|
||||
menuComplete: false,
|
||||
|
|
@ -36,7 +36,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to edit menus. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Menus.update({ _id: menuId }, {
|
||||
return Menus.updateAsync({ _id: menuId }, {
|
||||
$set: {
|
||||
menuName: menuName,
|
||||
}
|
||||
|
|
@ -49,7 +49,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to delete menus. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Menus.remove({ _id: menuId });
|
||||
return Menus.removeAsync({ _id: menuId });
|
||||
},
|
||||
'markMenu.complete' (menuId) {
|
||||
check(menuId, String);
|
||||
|
|
@ -58,7 +58,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to mark menus complete. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Menus.update({ _id: menuId }, {
|
||||
return Menus.updateAsync({ _id: menuId }, {
|
||||
$set: {
|
||||
menuComplete: true,
|
||||
}
|
||||
|
|
@ -71,7 +71,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to mark menus not complete. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Menus.update({ _id: menuId }, {
|
||||
return Menus.updateAsync({ _id: menuId }, {
|
||||
$set: {
|
||||
menuComplete: false,
|
||||
}
|
||||
|
|
@ -90,7 +90,7 @@ Meteor.methods({
|
|||
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++) {
|
||||
for (let j=0; j < items.length; j++) {
|
||||
let srvDate = moment(items[j].serveDateActual);
|
||||
let today = moment();
|
||||
let expired = moment(today).isAfter(srvDate);
|
||||
|
|
@ -107,14 +107,14 @@ Meteor.methods({
|
|||
|
||||
// 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++) {
|
||||
for (let 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] });
|
||||
for (let l = 0; l < removeMenuIds.length; l++) {
|
||||
Menus.removeAsync({ _id: removeMenuIds[l] });
|
||||
}
|
||||
},
|
||||
'addto.Menu' (menuId, menuItem, menuItemId, dateSrv, isLinked) {
|
||||
|
|
@ -130,7 +130,7 @@ Meteor.methods({
|
|||
|
||||
serveDateActual = new Date(dateSrv);
|
||||
|
||||
return Menus.update({ _id: menuId }, {
|
||||
return Menus.updateAsync({ _id: menuId }, {
|
||||
$addToSet: {
|
||||
menuItems:
|
||||
{
|
||||
|
|
@ -151,7 +151,7 @@ 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 Menus.update({ 'menuItems.menuItemId': menuItemId }, {
|
||||
return Menus.updateAsync({ 'menuItems.menuItemId': menuItemId }, {
|
||||
$set: {
|
||||
"menuItems.$.isLinked": isLinked
|
||||
}
|
||||
|
|
@ -167,7 +167,7 @@ Meteor.methods({
|
|||
let ids = itemIds.split('_');
|
||||
console.log("item ids: " + ids[0] + " and " + ids[1]);
|
||||
|
||||
return Menus.update({ _id: ids[0] }, {
|
||||
return Menus.updateAsync({ _id: ids[0] }, {
|
||||
$pull: {
|
||||
menuItems: {
|
||||
menuItemId: ids[1],
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return MenuItems.insert({
|
||||
return MenuItems.insertAsync({
|
||||
itemName: itemName,
|
||||
addedBy: this.userId,
|
||||
dateAddedtoMenu: new Date(),
|
||||
|
|
@ -34,7 +34,7 @@ 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 MenuItems.update({ _id: itemId }, {
|
||||
return MenuItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
isLinked: isLinked,
|
||||
}
|
||||
|
|
@ -48,7 +48,7 @@ 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 MenuItems.update({ _id: itemId }, {
|
||||
return MenuItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
itemName: itemName,
|
||||
}
|
||||
|
|
@ -61,7 +61,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to delete menu items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return MenuItems.remove({ _id: itemId });
|
||||
return MenuItems.removeAsync({ _id: itemId });
|
||||
},
|
||||
'shiftDate' (itemId, momentAddDay) {
|
||||
check(itemId, 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 MenuItems.update({ _id: itemId }, {
|
||||
return MenuItems.updateAsync({ _id: itemId }, {
|
||||
$set: {
|
||||
serveDate: momentAddDay,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ Meteor.methods({
|
|||
}
|
||||
});
|
||||
} else {
|
||||
return MenuProdLinks.insert({
|
||||
return MenuProdLinks.insertAsync({
|
||||
menuItemId: menuItemId,
|
||||
menuItemName: menuItemName,
|
||||
products: prodNameArray,
|
||||
|
|
@ -52,7 +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.');
|
||||
};
|
||||
|
||||
return MenuProdLinks.update({ menuItemId: menuItemId }, {
|
||||
return MenuProdLinks.updateAsync({ menuItemId: menuItemId }, {
|
||||
$set: {
|
||||
products: prodNameArray,
|
||||
dateUpdated: Date(),
|
||||
|
|
|
|||
|
|
@ -24,15 +24,22 @@ Meteor.methods({
|
|||
|
||||
// first does this product already exist?
|
||||
|
||||
let prodExists = Products.findOne({ prodName: pname });
|
||||
|
||||
if (!prodExists) {
|
||||
return Products.insert({
|
||||
prodName: pname,
|
||||
prodOwner: this.userId,
|
||||
prodStore: prodStore,
|
||||
});
|
||||
const productIsIn = async() => {
|
||||
let prodExists = await Products.findOneAsync({ prodName: pname });
|
||||
try {
|
||||
if (!prodExists) {
|
||||
return Products.insertAsync({
|
||||
prodName: pname,
|
||||
prodOwner: this.userId,
|
||||
prodStore: prodStore,
|
||||
});
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR adding Pdocut: " + error);
|
||||
}
|
||||
}
|
||||
let prodIn = productIsIn();
|
||||
return prodIn;
|
||||
},
|
||||
'edit.product' (prodId, prodName, prodStore) {
|
||||
check(prodId, String);
|
||||
|
|
@ -45,7 +52,7 @@ Meteor.methods({
|
|||
|
||||
let pname = prodName.charAt(0).toUpperCase() + prodName.slice(1);
|
||||
|
||||
return Products.update({ _id: prodId }, {
|
||||
return Products.updateAsync({ _id: prodId }, {
|
||||
$set: {
|
||||
prodName: pname,
|
||||
prodStore: prodStore,
|
||||
|
|
@ -59,6 +66,6 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to delete products. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Products.remove({ _id: prodId });
|
||||
return Products.removeAsync({ _id: prodId });
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ 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 RecipeItems.insert({
|
||||
return RecipeItems.insertAsync({
|
||||
recipeId: recipeId,
|
||||
recipeItemType: recipeItemType,
|
||||
recipeItem: recipeItem,
|
||||
|
|
@ -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 RecipeItems.update({ _id: recipeItemId }, {
|
||||
return RecipeItems.updateAsync({ _id: recipeItemId }, {
|
||||
$set: {
|
||||
recipeId: recipeId,
|
||||
recipeItemType: recipeItemType,
|
||||
|
|
@ -52,6 +52,6 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to delete recipe items. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return RecipeItems.remove({ _id: recipeItemId });
|
||||
return RecipeItems.removeAsync({ _id: recipeItemId });
|
||||
}
|
||||
});
|
||||
|
|
@ -19,7 +19,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 Recipes.insert({
|
||||
return Recipes.insertAsync({
|
||||
recipeName: recipeName,
|
||||
addedBy: this.userId,
|
||||
addedOn: new Date(),
|
||||
|
|
@ -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 Recipes.update({ _id: recipeId }, {
|
||||
return Recipes.updateAsync({ _id: recipeId }, {
|
||||
$set: {
|
||||
recipeName: recipeName,
|
||||
updatedOn: new Date(),
|
||||
|
|
@ -48,6 +48,6 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to delete recipes. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Recipes.remove({ _id: recipeId });
|
||||
return Recipes.removeAsync({ _id: recipeId });
|
||||
}
|
||||
});
|
||||
|
|
@ -19,7 +19,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to add stores. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Stores.insert({
|
||||
return Stores.insertAsync({
|
||||
storeName: storeName,
|
||||
owner: this.userId,
|
||||
});
|
||||
|
|
@ -32,7 +32,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to edit stores. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Stores.update({ _id: storeId }, {
|
||||
return Stores.updateAsync({ _id: storeId }, {
|
||||
$set: {
|
||||
storeName: storeName,
|
||||
}
|
||||
|
|
@ -45,6 +45,6 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to delete stores. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return Stores.remove({ _id: storeId });
|
||||
return Stores.removeAsync({ _id: storeId });
|
||||
},
|
||||
});
|
||||
|
|
@ -20,23 +20,37 @@ Meteor.methods({
|
|||
throw new Meteor.Error('Not able to change registration setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
}
|
||||
|
||||
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);
|
||||
const currConfig = async() => {
|
||||
let curr = await SysConfig.findOneAsync({});
|
||||
if (!curr) {
|
||||
try {
|
||||
return 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.");
|
||||
} else {
|
||||
console.log("Success updating sys admin reg.");
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return SysConfig.insert({
|
||||
SysAdminReg: admReg,
|
||||
dateAdded: new Date(),
|
||||
allowReg: genReg,
|
||||
});
|
||||
} catch(error) {
|
||||
console.log(" ERROR trying to pull current system config:");
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
}
|
||||
}
|
||||
}
|
||||
currConfig();
|
||||
},
|
||||
'edit.noSysAdminReg' (configId, canReg, genReg) {
|
||||
check(canReg, Boolean);
|
||||
|
|
@ -47,7 +61,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 SysConfig.update({ _id: configId }, {
|
||||
return SysConfig.updateAsync({ _id: configId }, {
|
||||
$set: {
|
||||
SysAdminReg: canReg,
|
||||
allowReg: genReg,
|
||||
|
|
@ -66,7 +80,7 @@ Meteor.methods({
|
|||
|
||||
let configId = curr._id;
|
||||
|
||||
return SysConfig.update({ _id: configId }, {
|
||||
return SysConfig.updateAsync({ _id: configId }, {
|
||||
$set: {
|
||||
allowUpdates: allowUpdate,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,16 +27,23 @@ Meteor.methods({
|
|||
let username;
|
||||
|
||||
if (assignedTo == "self") {
|
||||
let userInfo = Meteor.users.findOne({ _id: this.userId });
|
||||
username = userInfo.profile.fullname;
|
||||
assignedToId = this.userId;
|
||||
const uInfo = async() => {
|
||||
let userInfo = await Meteor.users.findOneAsync({ _id: this.userId });
|
||||
if (!userInfo) {
|
||||
console.log("No matching user info found.")
|
||||
} else {
|
||||
username = userInfo.profile.fullname;
|
||||
assignedToId = this.userId;
|
||||
}
|
||||
}
|
||||
uInfo();
|
||||
} else {
|
||||
username = assignedTo;
|
||||
}
|
||||
|
||||
for (i=0; i < taskDateArr.length; i++) {
|
||||
for (j=0; j < taskNameArr.length; j++) {
|
||||
TaskItems.insert({
|
||||
TaskItems.insertAsync({
|
||||
taskName: taskNameArr[j].id,
|
||||
taskDate: taskDateArr[i],
|
||||
actualDate: actDate[i],
|
||||
|
|
@ -62,14 +69,21 @@ Meteor.methods({
|
|||
let username;
|
||||
|
||||
if (assignedTo == "self") {
|
||||
let userInfo = Meteor.users.findOne({ _id: this.userId });
|
||||
username = userInfo.profile.fullname;
|
||||
assignedToId = this.userId;
|
||||
const uInfo = async() => {
|
||||
let userInfo = await Meteor.users.findOneAsync({ _id: this.userId });
|
||||
if (!userInfo) {
|
||||
console.log("No matching user info found.")
|
||||
} else {
|
||||
username = userInfo.profile.fullname;
|
||||
assignedToId = this.userId;
|
||||
}
|
||||
}
|
||||
uInfo();
|
||||
} else {
|
||||
username = assignedTo;
|
||||
}
|
||||
|
||||
return TaskItems.insert({
|
||||
return TaskItems.insertAsync({
|
||||
taskName: taskName,
|
||||
taskDate: taskDate,
|
||||
actualDate: actDate,
|
||||
|
|
@ -91,7 +105,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 TaskItems.update({ _id: taskId }, {
|
||||
return TaskItems.updateAsync({ _id: taskId }, {
|
||||
$set: {
|
||||
taskName: taskName,
|
||||
taskDate: taskDate,
|
||||
|
|
@ -108,7 +122,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to delete tasks. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return TaskItems.remove({ _id: taskId });
|
||||
return TaskItems.removeAsync({ _id: taskId });
|
||||
},
|
||||
'markTask.complete' (taskId) {
|
||||
check(taskId, String);
|
||||
|
|
@ -117,7 +131,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to mark tasks complete. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return TaskItems.update({ _id: taskId }, {
|
||||
return TaskItems.updateAsync({ _id: taskId }, {
|
||||
$set: {
|
||||
isComplete: true,
|
||||
completedOn: new Date(),
|
||||
|
|
@ -132,7 +146,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to mark tasks not complete. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return TaskItems.update({ _id: taskId }, {
|
||||
return TaskItems.updateAsync({ _id: taskId }, {
|
||||
$set: {
|
||||
isComplete: false,
|
||||
markedUncomplteOn: new Date(),
|
||||
|
|
@ -174,6 +188,6 @@ Meteor.methods({
|
|||
break;
|
||||
}
|
||||
|
||||
return TaskItems.remove({ actualDate: { $lt: new Date((new Date()) - upToDate )}});
|
||||
return TaskItems.removeAsync({ actualDate: { $lt: new Date((new Date()) - upToDate )}});
|
||||
}
|
||||
});
|
||||
|
|
@ -15,7 +15,7 @@ Meteor.methods({
|
|||
'add.updateInfo' (updateObject) {
|
||||
check(updateObject, Object);
|
||||
|
||||
UpdateInfo.insert({
|
||||
return UpdateInfo.insertAsync({
|
||||
title: updateObject.title,
|
||||
description: updateObject.description,
|
||||
dateRelease: updateObject.date,
|
||||
|
|
@ -29,7 +29,7 @@ Meteor.methods({
|
|||
throw new Meteor.Error('You are not allowed to mark updates as read. Make sure you are logged in with valid user credentials.');
|
||||
}
|
||||
|
||||
return UpdateInfo.update({ _id: updateId }, {
|
||||
return UpdateInfo.updateAsync({ _id: updateId }, {
|
||||
$set: {
|
||||
viewed: true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@ UserConfig.allow({
|
|||
// if use id exists, allow insert
|
||||
return !!userId;
|
||||
},
|
||||
update: function(userId, doc){
|
||||
// if use id exists, allow insert
|
||||
return !!userId;
|
||||
},
|
||||
});
|
||||
|
||||
Meteor.methods({
|
||||
|
|
@ -16,10 +20,10 @@ Meteor.methods({
|
|||
check(pref, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('Not able to change registration setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
throw new Meteor.Error('Not able to change theme setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
}
|
||||
|
||||
return UserConfig.insert({
|
||||
return UserConfig.insertAsync({
|
||||
user: this.userId,
|
||||
darkMode: pref,
|
||||
dateAdded: Date()
|
||||
|
|
@ -29,23 +33,14 @@ Meteor.methods({
|
|||
check(pref, String);
|
||||
|
||||
if (!this.userId) {
|
||||
throw new Meteor.Error('Not able to change registration setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
throw new Meteor.Error('Not able to change theme setting. Make sure you are logged in with valid system administrator credentials.');
|
||||
}
|
||||
|
||||
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()
|
||||
}
|
||||
});
|
||||
}
|
||||
return UserConfig.updateAsync({ user: this.userId }, {
|
||||
$set: {
|
||||
darkMode: pref,
|
||||
dateUpdate: Date()
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -16,6 +16,6 @@ Meteor.methods({
|
|||
check(usersId, String);
|
||||
check(password, String);
|
||||
|
||||
return Accounts.setPassword(usersId, password);
|
||||
return Accounts.setPasswordAsync(usersId, password);
|
||||
},
|
||||
});
|
||||
|
|
@ -22,22 +22,34 @@ 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 = 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);
|
||||
const getUserLast = async() => {
|
||||
let userListInfo = await UserLast.findOneAsync({ userId: this.userId, view: view });
|
||||
if (!userListInfo) {
|
||||
console.log("Adding new user last item.");
|
||||
return UserLast.insertAsync({
|
||||
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;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
return UserLast.insert({
|
||||
userId: this.userId,
|
||||
view: view,
|
||||
viewId: viewId,
|
||||
dateAdded: Date(),
|
||||
});
|
||||
}
|
||||
}
|
||||
return getUserLast();
|
||||
},
|
||||
'edit.userLast' (view, viewId) {
|
||||
check(view, String);
|
||||
|
|
@ -47,7 +59,8 @@ 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.');
|
||||
}
|
||||
|
||||
return UserLast.update({ view: view, userId: this.userId }, {
|
||||
console.log("Edit in progress.");
|
||||
return UserLast.updateAsync({ view: view, userId: this.userId }, {
|
||||
$set: {
|
||||
viewId: viewId,
|
||||
dateLastUpdate: Date(),
|
||||
|
|
|
|||
|
|
@ -1,132 +1,134 @@
|
|||
import { FlowRouter } from 'meteor/ostrio:flow-router-extra';
|
||||
|
||||
FlowRouter.route('/dashboard', {
|
||||
name: 'home',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: "dashboard" });
|
||||
this.render('MainLayout', { main: "dashboard" });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/', {
|
||||
name: 'homeNoRoute',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: "dashboard" });
|
||||
this.render('MainLayout', { main: "dashboard" });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/', {
|
||||
name: 'homeNotLoggedIn',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { notLoggedIn: "login" });
|
||||
this.render('MainLayout', { notLoggedIn: "login" });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/login', {
|
||||
name: 'login',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { notLoggedIn: "login" });
|
||||
this.render('MainLayout', { notLoggedIn: "login" });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/reg', {
|
||||
name: 'reg',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { notLoggedIn: "reg" });
|
||||
this.render('MainLayout', { notLoggedIn: "reg" });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/userMgmt', {
|
||||
name: 'userMgmt',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'userMgmt' });
|
||||
this.render('MainLayout', { main: 'userMgmt' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/manageStore', {
|
||||
name: 'storeMgmt',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'storeMgmt' });
|
||||
this.render('MainLayout', { main: 'storeMgmt' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/manage', {
|
||||
name: 'mgmtPage',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'mgmtPage' });
|
||||
this.render('MainLayout', { main: 'mgmtPage' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/manageProduct', {
|
||||
name: 'manageProduct',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'prodMgmt' });
|
||||
this.render('MainLayout', { main: 'prodMgmt' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/manageLists', {
|
||||
name: 'manageLists',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'listMgmt' });
|
||||
this.render('MainLayout', { main: 'listMgmt' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/mylists', {
|
||||
name: 'mylists',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'listsMain' });
|
||||
this.render('MainLayout', { main: 'listsMain' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/listItems', {
|
||||
name: 'listItems',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'listItemsMain' });
|
||||
this.render('MainLayout', { main: 'listItemsMain' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/mymenus', {
|
||||
name: 'mymenus',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'mainMenu' });
|
||||
this.render('MainLayout', { main: 'mainMenu' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/menuItems', {
|
||||
name: 'menuItems',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'menuItems' });
|
||||
this.render('MainLayout', { main: 'menuItems' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/taskHome', {
|
||||
name: 'taskHome',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'taskHome' });
|
||||
this.render('MainLayout', { main: 'taskHome' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/myTasks', {
|
||||
name: 'myTasks',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'myTasks' });
|
||||
this.render('MainLayout', { main: 'myTasks' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/systemAdmin', {
|
||||
name: 'systemAdmin',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'systemAdmin' });
|
||||
this.render('MainLayout', { main: 'systemAdmin' });
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/cleanUp', {
|
||||
name: 'cleanUp',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'cleanUp'});
|
||||
this.render('MainLayout', { main: 'cleanUp'});
|
||||
}
|
||||
});
|
||||
|
||||
FlowRouter.route('/mySettings', {
|
||||
name: 'mySettings',
|
||||
action() {
|
||||
BlazeLayout.render('MainLayout', { main: 'userConfig'});
|
||||
this.render('MainLayout', { main: 'userConfig'});
|
||||
}
|
||||
});
|
||||
1993
package-lock.json
generated
1993
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"name": "pPickup",
|
||||
"name": "get-my",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"start": "meteor run",
|
||||
|
|
|
|||
291
server/main.js
291
server/main.js
|
|
@ -1,3 +1,5 @@
|
|||
// 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';
|
||||
|
|
@ -5,142 +7,178 @@ 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(() => {
|
||||
Meteor.startup(async() => {
|
||||
// code to run on server at startup
|
||||
Roles.createRole("user", {unlessExists: true});
|
||||
Roles.createRole("admin", {unlessExists: true});
|
||||
Roles.createRole("systemadmin", {unlessExists: true});
|
||||
Roles.createRoleAsync("user", {unlessExists: true});
|
||||
Roles.createRoleAsync("admin", {unlessExists: true});
|
||||
Roles.createRoleAsync("systemadmin", {unlessExists: true});
|
||||
|
||||
// set the systemconfig defaults for registration
|
||||
// check if this has already been run
|
||||
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");
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// check if the isLInked item exists on menuitems, and if not, add it (data cleanup task)
|
||||
// see if already updated
|
||||
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,
|
||||
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");
|
||||
}
|
||||
});
|
||||
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 = MScripts.findOne({ scriptName: "changeProdStoreToArray", scriptRun: true });
|
||||
let prodStoreArrayRun = await MScripts.findOneAsync({ scriptName: "changeProdStoreToArray", scriptRun: true });
|
||||
if (!prodStoreArrayRun) {
|
||||
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;
|
||||
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;
|
||||
|
||||
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 = MScripts.findOne({ scriptName: "updateMenuProdLinks", scriptRun: true });
|
||||
let menuItemUpdRun = await MScripts.findOneAsync({ scriptName: "updateMenuProdLinks", scriptRun: true });
|
||||
if (!menuItemUpdRun) {
|
||||
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;
|
||||
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 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
|
||||
},
|
||||
}
|
||||
});
|
||||
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");
|
||||
}
|
||||
}
|
||||
if (k == (openMenuCount - 1)) {
|
||||
markScriptRun("updateMenuProdLinks");
|
||||
}
|
||||
} catch(error) {
|
||||
console.log(" ERROR updating the menu product links: ");
|
||||
console.log(error.message);
|
||||
console.log(error.stack);
|
||||
}
|
||||
} else {
|
||||
// console.log("Menu Item updates have already been run.");
|
||||
}
|
||||
|
||||
// get update available information if enabled in system confiuration
|
||||
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);
|
||||
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);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -152,18 +190,23 @@ var startCronForUpdates = function(feedurl) {
|
|||
});
|
||||
}
|
||||
|
||||
var markScriptRun = function(scriptName) {
|
||||
var markScriptRun = async function(scriptName) {
|
||||
// check if this is already set
|
||||
let scriptRun = MScripts.findOne({ scriptName: scriptName });
|
||||
|
||||
if (scriptRun) {
|
||||
console.log(scriptName + " already set as run on " + scriptRun.runOn);
|
||||
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);
|
||||
}
|
||||
} else {
|
||||
MScripts.insert({
|
||||
scriptName: scriptName,
|
||||
scriptRun: true,
|
||||
runOn: new Date()
|
||||
});
|
||||
// console.log(scriptName + " already set as run on " + scriptRun.runOn);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -175,16 +218,22 @@ var getUpdateInfoNow = async function(feedurl) {
|
|||
// console.dir(data[0].title);
|
||||
|
||||
// check if this title already exists in db
|
||||
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.");
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,52 +3,60 @@ 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({
|
||||
'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);
|
||||
const getUserInfo = async() => {
|
||||
try {
|
||||
let countOfUsers = await Meteor.users.find().countAsync();
|
||||
const user = await Meteor.userAsync();
|
||||
if (user) {
|
||||
let userId = user._id;
|
||||
if (countOfUsers > 1) {
|
||||
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) {
|
||||
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.");
|
||||
}
|
||||
} else {
|
||||
console.log("The count of users didn't seem to work when adding a new user.");
|
||||
}
|
||||
} else {
|
||||
// console.log(" SUCCESSFULLY set user dark mode preference.");
|
||||
console.log(" ---- No user info found.")
|
||||
}
|
||||
});
|
||||
} 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.");
|
||||
}
|
||||
});
|
||||
} catch(error) {
|
||||
console.log(" ERROR getting user info on server: " + error);
|
||||
}
|
||||
}
|
||||
getUserInfo();
|
||||
},
|
||||
'edit.userPass' (userId, newPassword) {
|
||||
check(userId, String);
|
||||
check(newPassword, String);
|
||||
|
||||
return Accounts.setPassword(userId, newPassword);
|
||||
return Accounts.setPasswordAsync(userId, newPassword);
|
||||
},
|
||||
'delete.userFromSys' (userId) {
|
||||
check(userId, String);
|
||||
|
||||
return Meteor.users.remove({ _id: userId });
|
||||
return Meteor.users.removeAsync({ _id: userId });
|
||||
},
|
||||
'update.userEmail' (userId, email) {
|
||||
check(userId, String);
|
||||
check(email, String);
|
||||
|
||||
return Meteor.users.update({ _id: userId }, {
|
||||
return Meteor.users.updateAsync({ _id: userId }, {
|
||||
$set: {
|
||||
'emails.0.address': email,
|
||||
}
|
||||
|
|
@ -58,6 +66,6 @@ Meteor.methods({
|
|||
check(userId, String);
|
||||
check(role, String);
|
||||
|
||||
return Roles.setUserRoles(userId, role);
|
||||
return Roles.setUserRolesAsync(userId, role);
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -13,6 +13,13 @@ 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({});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue