diff --git a/client/AdminMgmt/ListMgmt/listMgmtTbl.html b/client/AdminMgmt/ListMgmt/listMgmtTbl.html index 038c94d..7011beb 100644 --- a/client/AdminMgmt/ListMgmt/listMgmtTbl.html +++ b/client/AdminMgmt/ListMgmt/listMgmtTbl.html @@ -5,13 +5,22 @@ {{#each lists}}
  • {{listName}} - delete - edit - check + delete + edit + check
  • {{/each}} + + + {{> deleteConfirmationModal}} \ No newline at end of file diff --git a/client/AdminMgmt/ListMgmt/listMgmtTbl.js b/client/AdminMgmt/ListMgmt/listMgmtTbl.js index 0f75528..d737894 100644 --- a/client/AdminMgmt/ListMgmt/listMgmtTbl.js +++ b/client/AdminMgmt/ListMgmt/listMgmtTbl.js @@ -1,13 +1,15 @@ import { Lists } from '../../../imports/api/lists.js'; +import { M } from '../../lib/assets/materialize.js'; Template.listMgmtTbl.onCreated(function() { this.subscribe("myLists"); }); Template.listMgmtTbl.onRendered(function() { - Meteor.setTimeout(function() { - $('.tooltipped').tooltip(); - }, 150); + var elems = document.querySelectorAll('.tooltipped'); + var instances = M.Tooltip.init(elems, {}); + var elemm = document.querySelectorAll('.modal'); + var instancem = M.Modal.init(elemm, {}); }); Template.listMgmtTbl.helpers({ @@ -23,7 +25,6 @@ Template.listMgmtTbl.events({ Session.set("method", "delete.list"); Session.set("item", this.listName); Session.set("view", "Lists"); - $('#modalDelete').modal('open'); let listId = this._id; }, 'click .editListName' (event) { diff --git a/client/AdminMgmt/Tasks/taskForm.html b/client/AdminMgmt/Tasks/taskForm.html index 31eb7e0..596451c 100644 --- a/client/AdminMgmt/Tasks/taskForm.html +++ b/client/AdminMgmt/Tasks/taskForm.html @@ -1,9 +1,9 @@ \ No newline at end of file diff --git a/client/AdminMgmt/Tasks/taskForm.js b/client/AdminMgmt/Tasks/taskForm.js index 8c31eee..28fad17 100644 --- a/client/AdminMgmt/Tasks/taskForm.js +++ b/client/AdminMgmt/Tasks/taskForm.js @@ -1,4 +1,5 @@ import { Tasks } from '../../../imports/api/tasks.js'; +import { M } from '../../lib/assets/materialize.js'; Template.taskForm.onCreated(function() { this.subscribe("userList"); @@ -6,16 +7,18 @@ Template.taskForm.onCreated(function() { }); Template.taskForm.onRendered(function() { - Meteor.setTimeout(function() { - $('select').formSelect(); - }, 100); - $('select').formSelect(); - $('.datepicker').datepicker(); - $('.chips').chips(); - $('.chips-placeholder').chips({ - placeholder: 'Task Name', - secondaryPlaceholder: '+Task Name', - }); + var elems = document.querySelectorAll('select'); + var instances = M.FormSelect.init(elems, {}); + + var elemd = document.querySelectorAll('.datepicker'); + var instanced = M.Datepicker.init(elemd, {}); + + var elemc = document.querySelectorAll('.chips'); + var instancec = M.Chips.init(elemc, { + placeholder: 'Task Name', + secondaryPlaceholder: '+Task Name', + }); + Session.set("taskNameErr", false); Session.set("taskUserErr", false); Session.set("taskDateErr", false); @@ -41,9 +44,9 @@ Template.taskForm.helpers({ Template.taskForm.events({ 'click #testChips' (event) { event.preventDefault(); - let taskName = M.Chips.getInstance($("#taskName")).chipsData; + let elemcc = document.getElementById('taskName'); + let taskName = M.Chips.getInstance(elemcc).chipsData; console.log(taskName); - console.log(Session.get("taskDateArr")); }, 'change #taskDate' (event) { let taskDate = $("#taskDate").val(); @@ -53,7 +56,8 @@ Template.taskForm.events({ }, 'click .saveTaskMgmt' (event) { event.preventDefault(); - let taskNameArr = M.Chips.getInstance($("#taskName")).chipsData; + let elemcc = document.getElementById('taskName'); + let taskNameArr = M.Chips.getInstance(elemcc).chipsData; let taskDateArr = Session.get("taskDateArr"); let taskUser = $("#taskUser").val(); let taskUserErr = false; @@ -61,10 +65,9 @@ Template.taskForm.events({ let taskDateErr = false; let userInfo; let actDate = []; + console.dir(taskNameArr); - // console.log("taskUser value: " + taskUser); - - if (taskNameArr == null || taskName == []) { + if (taskNameArr == null || taskNameArr == []) { taskNameErr = true; } diff --git a/client/AdminMgmt/Tasks/taskTbl.html b/client/AdminMgmt/Tasks/taskTbl.html index fa0961c..74ebeea 100644 --- a/client/AdminMgmt/Tasks/taskTbl.html +++ b/client/AdminMgmt/Tasks/taskTbl.html @@ -24,7 +24,7 @@ {{/if}} - delete + delete check diff --git a/client/AdminMgmt/Tasks/taskTbl.js b/client/AdminMgmt/Tasks/taskTbl.js index ecb79f2..f5a8973 100644 --- a/client/AdminMgmt/Tasks/taskTbl.js +++ b/client/AdminMgmt/Tasks/taskTbl.js @@ -1,11 +1,15 @@ import { TaskItems } from '../../../imports/api/tasks.js'; import moment from 'moment'; +import { M } from '../../lib/assets/materialize.js'; Template.taskTbl.onCreated(function() { this.subscribe("allTasks"); }); Template.taskTbl.onRendered(function() { + var elem = document.querySelectorAll('.modal'); + var instance = M.Modal.init(elem, {}); + Session.set("hideCompletedTasks", false); }); @@ -34,7 +38,7 @@ Template.taskTbl.events({ Session.set("method", "delete.task"); Session.set("item", this.taskName); Session.set("view", "Tasks"); - $('#modalDelete').modal('open'); + // $('#modalDelete').modal('open'); }, 'click .markTaskComplete' (event) { event.preventDefault(); diff --git a/client/Dashboard/dashboard.html b/client/Dashboard/dashboard.html index d1ee3f6..2f41a96 100644 --- a/client/Dashboard/dashboard.html +++ b/client/Dashboard/dashboard.html @@ -19,7 +19,7 @@
    - List Management + List Management
    @@ -33,7 +33,7 @@
    - List Management + List Management
    @@ -52,7 +52,7 @@ {{/each}}
    - My Menus + My Menus
    @@ -67,7 +67,7 @@
    - User Management + User Management
    diff --git a/client/General/DeleteConfModal/deleteConfirmationModal.html b/client/General/DeleteConfModal/deleteConfirmationModal.html index 46b2dc4..86f12d4 100644 --- a/client/General/DeleteConfModal/deleteConfirmationModal.html +++ b/client/General/DeleteConfModal/deleteConfirmationModal.html @@ -7,10 +7,10 @@ diff --git a/client/UserConfig/userConfig.html b/client/UserConfig/userConfig.html new file mode 100644 index 0000000..853b4f8 --- /dev/null +++ b/client/UserConfig/userConfig.html @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/client/UserConfig/userConfig.js b/client/UserConfig/userConfig.js new file mode 100644 index 0000000..8a77971 --- /dev/null +++ b/client/UserConfig/userConfig.js @@ -0,0 +1,17 @@ +import { UserConfig } from "../../imports/api/userConfig"; + +Template.userConfig.onCreated(function() { + +}); + +Template.userConfig.onRendered(function() { + +}); + +Template.userConfig.helpers({ + +}); + +Template.userConfig.events({ + +}); \ No newline at end of file diff --git a/imports/api/tasks.js b/imports/api/tasks.js index e5963f1..1989d8c 100644 --- a/imports/api/tasks.js +++ b/imports/api/tasks.js @@ -36,7 +36,7 @@ Meteor.methods({ for (i=0; i < taskDateArr.length; i++) { for (j=0; j < taskNameArr.length; j++) { TaskItems.insert({ - taskName: taskNameArr[j].tag, + taskName: taskNameArr[j].id, taskDate: taskDateArr[i], actualDate: actDate[i], assignedTo: username,