-
{{> snackbar}}
diff --git a/client/AdminMgmt/Tasks/taskForm.js b/client/AdminMgmt/Tasks/taskForm.js
index 1e220de..4ef0ffe 100644
--- a/client/AdminMgmt/Tasks/taskForm.js
+++ b/client/AdminMgmt/Tasks/taskForm.js
@@ -11,10 +11,12 @@ Template.taskForm.onRendered(function() {
}, 100);
$('select').formSelect();
$('.datepicker').datepicker();
+ $('.chips').chips();
Session.set("taskNameErr", false);
Session.set("taskUserErr", false);
Session.set("taskDateErr", false);
Session.set("hideCompletedTasks", true);
+ Session.set("taskDateArr", []);
});
Template.taskForm.helpers({
@@ -27,30 +29,49 @@ Template.taskForm.helpers({
usersId: function() {
return this._id;
},
+ taskDates: function() {
+ return Session.get("taskDateArr");
+ },
});
Template.taskForm.events({
+ 'click #testChips' (event) {
+ event.preventDefault();
+ let taskName = M.Chips.getInstance($("#taskName")).chipsData;
+ console.log(taskName);
+ console.log(Session.get("taskDateArr"));
+ },
+ 'change #taskDate' (event) {
+ let taskDate = $("#taskDate").val();
+ let taskDateArr = Session.get("taskDateArr");
+ taskDateArr.push(taskDate);
+ Session.set("taskDateArr", taskDateArr);
+ },
'click .saveTaskMgmt' (event) {
event.preventDefault();
- let taskName = $("#taskName").val();
+ let taskNameArr = M.Chips.getInstance($("#taskName")).chipsData;
+ let taskDateArr = Session.get("taskDateArr");
let taskUser = $("#taskUser").val();
- let taskDate = $("#taskDate").val();
let taskUserErr = false;
let taskNameErr = false;
let taskDateErr = false;
let userInfo;
- let actDate;
+ let actDate = [];
- console.log("taskUser value: " + taskUser);
+ // console.log("taskUser value: " + taskUser);
- if (taskName == null || taskName == "") {
+ if (taskNameArr == null || taskName == []) {
taskNameErr = true;
}
- if (taskDate == null || taskDate == "") {
+ if (taskDate == null || taskDate == []) {
taskDateErr = true;
} else {
- actDate = new Date(taskDate);
+ for (i = 0; i < taskDateArr.length; i++) {
+ // console.log(taskDateArr[i]);
+ let actDateTask = new Date(taskDateArr[i]);
+ actDate.push(actDateTask);
+ }
}
if (taskUser == null || taskUser == "") {;
@@ -60,12 +81,13 @@ Template.taskForm.events({
}
if (taskUserErr == false && taskDateErr == false && taskNameErr == false) {
- Meteor.call("add.task", taskName, userInfo[0], userInfo[1], taskDate, actDate, function(err, result) {
+ Meteor.call("add.task", taskNameArr, userInfo[0], userInfo[1], taskDateArr, actDate, function(err, result) {
if (err) {
console.log(" ERROR adding the new task: " + err);
} else {
console.log(" SUCCESS adding the new task.");
- $("#taskName").val("");
+ M.Chips.getInstance($("#taskName")).deleteChip();
+ Session.set("taskDateArr", []);
$("#taskDate").val("");
$("#taskUser").val("");
$('select').formSelect();
diff --git a/imports/api/tasks.js b/imports/api/tasks.js
index d8eca2a..987c9a6 100644
--- a/imports/api/tasks.js
+++ b/imports/api/tasks.js
@@ -12,12 +12,12 @@ TaskItems.allow({
});
Meteor.methods({
- 'add.task' (taskName, assignedTo, assignedToId, taskDate, actDate) {
- check(taskName, String);
+ 'add.task' (taskNameArr, assignedTo, assignedToId, taskDateArr, actDate) {
+ check(taskNameArr, [Object]);
check(assignedTo, String);
- check(taskDate, String);
+ check(taskDateArr, [String]);
check(assignedToId, String);
- check(actDate, Date);
+ check(actDate, [Date]);
if (!this.userId) {
throw new Meteor.Error('You are not allowed to add tasks. Make sure you are logged in with valid user credentials.');
@@ -33,17 +33,21 @@ Meteor.methods({
username = assignedTo;
}
- return TaskItems.insert({
- taskName: taskName,
- taskDate: taskDate,
- actualDate: actDate,
- assignedTo: username,
- assignedToId: assignedToId,
- isComplete: false,
- completedOn: null,
- assignedOn: new Date(),
- assignedBy: this.userId,
- });
+ for (i=0; i < taskDateArr.length; i++) {
+ for (j=0; j < taskNameArr.length; j++) {
+ TaskItems.insert({
+ taskName: taskNameArr[j].tag,
+ taskDate: taskDateArr[i],
+ actualDate: actDate[i],
+ assignedTo: username,
+ assignedToId: assignedToId,
+ isComplete: false,
+ completedOn: null,
+ assignedOn: new Date(),
+ assignedBy: this.userId,
+ });
+ }
+ }
},
'edit.task' (taskId, taskName, assignedTo, taskDate) {
check(taskId, String);