+
-
-
+
{{> snackbar}}
\ 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 @@