mirror of
https://gitlab.com/bmcgonag/get_my.git
synced 2026-03-27 00:08:49 +00:00
Updating framework to meteor 3 and later
This commit is contained in:
parent
717994508a
commit
cca29bc591
58 changed files with 2332 additions and 1611 deletions
|
|
@ -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,30 +57,36 @@ 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);
|
||||
}
|
||||
}
|
||||
},
|
||||
'change #isCompleted' (event) {
|
||||
Session.set("showCompletedLists", true);
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
const addList = async(listName, shared) => {
|
||||
let result = await Meteor.callAsync('add.list', listName, shared);
|
||||
if (!result) {
|
||||
// console.log(" 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,51 +31,51 @@ 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");
|
||||
if (storeName == "" || storeName == null) {
|
||||
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");
|
||||
}
|
||||
});
|
||||
} else {
|
||||
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");
|
||||
}
|
||||
|
|
@ -113,7 +115,6 @@ Template.taskForm.events({
|
|||
Session.set("hideCompletedTasks", true);
|
||||
} 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();
|
||||
},
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue