diff --git a/client/AdminMgmt/ProductMgmt/prodMgmtForm.html b/client/AdminMgmt/ProductMgmt/prodMgmtForm.html index 234a878..42b686e 100644 --- a/client/AdminMgmt/ProductMgmt/prodMgmtForm.html +++ b/client/AdminMgmt/ProductMgmt/prodMgmtForm.html @@ -1,35 +1,30 @@ \ No newline at end of file diff --git a/client/AdminMgmt/ProductMgmt/prodMgmtForm.js b/client/AdminMgmt/ProductMgmt/prodMgmtForm.js index 7a355a6..0d826b4 100644 --- a/client/AdminMgmt/ProductMgmt/prodMgmtForm.js +++ b/client/AdminMgmt/ProductMgmt/prodMgmtForm.js @@ -1,5 +1,6 @@ import { Products } from '../../../imports/api/products.js'; import { Stores } from '../../../imports/api/stores.js'; +import { M } from '../../lib/assets/materialize.js'; Template.prodMgmtForm.onCreated(function() { this.subscribe("myProducts"); @@ -7,11 +8,14 @@ Template.prodMgmtForm.onCreated(function() { }); Template.prodMgmtForm.onRendered(function() { - Meteor.setTimeout(function() { - $('select').formSelect(); + setTimeout(function() { + var elems = document.querySelectorAll('select'); + var instances = M.FormSelect.init(elems, {}); }, 200); - $('select').formSelect(); - $('.modal').modal(); + + var elemm = document.querySelectorAll('.modal'); + var instancem = M.Modal.init(elemm, {}); + Session.set("prodEditMode", false); }); @@ -43,12 +47,12 @@ Template.prodMgmtForm.events({ } else { Meteor.call('add.product', name, store, function(err, result) { if (err) { - // console.log(" ERROR: can't add product: " + err); + console.log(" ERROR: can't add product: " + err); } else { - // console.log(" SUCCESS adding product."); $("#prodName").val(""); - $("#prodStore").val(""); - $('select').formSelect(); + let elemse = document.querySelectorAll('select'); + let instancese = M.FormSelect.init(elemse, {}); + showSnackbar("Succesffuly Added Product!", "green"); } }); } @@ -71,11 +75,9 @@ Template.prodMgmtForm.events({ if (err) { // console.log(" ERROR: can't add product: " + err); } else { - // console.log(" SUCCESS adding product."); $("#prodName").val(""); - $("#prodStore").val(""); - $('select').formSelect(); Session.set("prodEditMode", false); + showSnackbar("Product Edited Successfully!", "green"); } }); } @@ -87,7 +89,7 @@ Template.prodMgmtForm.events({ let store = $("#prodStore").val(); let prodId = Session.get("prodEditId"); let prodEditMode = Session.get("prodEditMode"); - console.log(" ---- got the submit event for products."); + // console.log(" ---- got the submit event for products."); if (store == null) { store = ""; @@ -100,46 +102,38 @@ Template.prodMgmtForm.events({ if (prodEditMode == true) { Meteor.call('edit.product', prodId, name, store, function(err, result) { if (err) { - // console.log(" ERROR: can't add product: " + err); + console.log(" ERROR: can't add product: " + err); } else { - // console.log(" SUCCESS adding product."); $("#prodName").val(""); - $("#prodStore").val(""); - $('select').formSelect(); + showSnackbar("Successfully Edited Product!", "green"); } }); } else { Meteor.call('add.product', name, store, function(err, result) { if (err) { - // console.log(" ERROR: can't add product: " + err); + console.log(" ERROR: can't add product: " + err); } else { - // console.log(" SUCCESS adding product."); $("#prodName").val(""); - $("#prodStore").val(""); - $('select').formSelect(); + showSnackbar("Product Added Succssfully!", "green"); } }); } } } }, - 'click .cancelProdMgmt' (event) { - event.preventDefault(); - $("#prodName").val(""); - $("#prodStore").val(""); - $('select').formSelect(); - }, 'change #prodStore' (event) { - event.preventDefault(); + // event.preventDefault(); + console.log("detected event"); let val = $("#prodStore").val(); + console.log("Value detected: " + val); if (val == "addNewStore") { + console.log("got the request for modal."); $("#prodStore").val(""); - // open a modal to enter store information. - $('#modalStore').modal('open'); + // open modal to add a new store + let elemmm = document.getElementById('modalStore'); + let storeModal = M.Modal.getInstance(elemmm); + storeModal.open(); } }, - 'click .modal-close' (event) { - $('select').formSelect(); - } }); \ No newline at end of file diff --git a/client/AdminMgmt/ProductMgmt/prodMgmtTbl.html b/client/AdminMgmt/ProductMgmt/prodMgmtTbl.html index ad58b7e..e5db47c 100644 --- a/client/AdminMgmt/ProductMgmt/prodMgmtTbl.html +++ b/client/AdminMgmt/ProductMgmt/prodMgmtTbl.html @@ -23,7 +23,7 @@ {{prodName}} {{prodStore}} - delete + delete edit diff --git a/client/AdminMgmt/ProductMgmt/prodMgmtTbl.js b/client/AdminMgmt/ProductMgmt/prodMgmtTbl.js index 04c7cf0..d5cfcf1 100644 --- a/client/AdminMgmt/ProductMgmt/prodMgmtTbl.js +++ b/client/AdminMgmt/ProductMgmt/prodMgmtTbl.js @@ -1,13 +1,11 @@ import { Products } from '../../../imports/api/products.js'; +import { M } from '../../lib/assets/materialize.js'; Template.prodMgmtTbl.onCreated(function() { this.subscribe("myProducts"); }); Template.prodMgmtTbl.onRendered(function() { - Meteor.setTimeout(function() { - $('.tooltipped').tooltip(); - }, 150); Session.set("searchProds", false); }); @@ -32,7 +30,6 @@ Template.prodMgmtTbl.events({ Session.set("method", "delete.product"); Session.set("item", this.prodName); Session.set("view", "Products");; - $('#modalDelete').modal('open'); }, 'click .editProduct' (event) { event.preventDefault(); @@ -41,7 +38,7 @@ Template.prodMgmtTbl.events({ let prodInfo = Products.findOne({ _id: this._id }); $("#prodName").val(prodInfo.prodName); $("#prodStore").val(prodInfo.prodStore); - $('select').formSelect(); + // $('select').formSelect(); }, 'click #filterProds' (event) { event.preventDefault(); diff --git a/client/AdminMgmt/StoreMgmt/storeMgmtForm.html b/client/AdminMgmt/StoreMgmt/storeMgmtForm.html index e8368c6..98e4f19 100644 --- a/client/AdminMgmt/StoreMgmt/storeMgmtForm.html +++ b/client/AdminMgmt/StoreMgmt/storeMgmtForm.html @@ -1,17 +1,15 @@ \ No newline at end of file diff --git a/client/General/DeleteConfModal/deleteConfirmationModal.js b/client/General/DeleteConfModal/deleteConfirmationModal.js index f4cb155..dde7bfb 100644 --- a/client/General/DeleteConfModal/deleteConfirmationModal.js +++ b/client/General/DeleteConfModal/deleteConfirmationModal.js @@ -26,7 +26,7 @@ Template.deleteConfirmationModal.events({ if (err) { console.log(" ERROR deleting item from modal: " + err); } else { - // console.log(" SUCCESSFULLY deleted."); + console.log(" SUCCESSFULLY deleted."); // put the new modal open / close here // $('#modalDelete').modal('close'); } diff --git a/client/ListItems/listItemsTbl.js b/client/ListItems/listItemsTbl.js index 177e03e..ee70b7c 100644 --- a/client/ListItems/listItemsTbl.js +++ b/client/ListItems/listItemsTbl.js @@ -71,8 +71,5 @@ Template.listItemsTbl.events({ Session.set("method", "delete.listItem"); Session.set("item", this.itemName); Session.set("view", "List Items"); - - // put the new modal js here - // $('#modalDelete').modal('open'); }, }); \ No newline at end of file