Update app.js

Adding posibility to chose between TODO or Task list.
evrenvarol · Sep 12, 2017 · 011f814 · 011f814
1 parent 66167f4
commit 011f814
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/js/app.js b/js/app.js
@@ -62,6 +62,7 @@ tbApp.controller('taskboardController', function ($scope, GENERAL_CONFIG) {
                                             case 'backlogList':
                                                     //var tasksfolder = outlookNS.GetDefaultFolder(13);
                                                     var tasksfolder = getOutlookFolder(GENERAL_CONFIG.BACKLOG_FOLDER.Name, GENERAL_CONFIG.BACKLOG_FOLDER.Owner);
+                                                    var tasksfolder = outlookNS.GetDefaultFolder(13);// when move task back into backlog
                                                     break;
                                             case 'inprogressList':
                                                     var tasksfolder = getOutlookFolder(GENERAL_CONFIG.INPROGRESS_FOLDER.Name, GENERAL_CONFIG.INPROGRESS_FOLDER.Owner);
@@ -102,7 +103,7 @@ tbApp.controller('taskboardController', function ($scope, GENERAL_CONFIG) {
     var getOutlookFolder = function (folderpath, owner) {
         if ( folderpath === undefined || folderpath === '' ) {
             // if folder path is not defined, return main Tasks folder
-            var folder = outlookNS.GetDefaultFolder(13);
+	    var folder = outlookNS.GetDefaultFolder(GENERAL_CONFIG.TASK_DEFAULT);
         } else {
             // if folder path is defined
             if ( owner === undefined || owner === '' ) {
@@ -161,19 +162,28 @@ tbApp.controller('taskboardController', function ($scope, GENERAL_CONFIG) {
 
             var count = tasks.Count;
             for (i = 1; i <= count; i++) {
-                array.push({
-                    entryID: tasks(i).EntryID,
-                    subject: tasks(i).Subject,
-                    priority: tasks(i).Importance,
-                    startdate: tasks(i).StartDate,
-                    duedate: new Date(tasks(i).DueDate),
-                    sensitivity: tasks(i).Sensitivity,
-                    categories: tasks(i).Categories,
-                    notes: taskExcerpt(tasks(i).Body, GENERAL_CONFIG.TASKNOTE_EXCERPT),
-                    status: taskStatus(tasks(i).Body),
-                    oneNoteTaskID: getUserProp(tasks(i), "OneNoteTaskID"),
-                    oneNoteURL: getUserProp(tasks(i), "OneNoteURL")
-                });
+                //do not add to backlog task from other folders
+		if (!( path == "" && (
+		        tasks(i).parent.name == GENERAL_CONFIG.INPROGRESS_FOLDER.Name || 
+			tasks(i).parent.name == GENERAL_CONFIG.NEXT_FOLDER.Name ||
+			tasks(i).parent.name == GENERAL_CONFIG.FOCUS_FOLDER.Name ||
+			tasks(i).parent.name == GENERAL_CONFIG.WAITING_FOLDER.Name ||
+			tasks(i).parent.name == GENERAL_CONFIG.COMPLETED_FOLDER.Name
+			))){
+                        array.push({
+                            entryID: tasks(i).EntryID,
+                            subject: tasks(i).Subject,
+                            priority: tasks(i).Importance,
+                            startdate: tasks(i).StartDate,
+                            duedate: new Date(tasks(i).DueDate),
+                            sensitivity: tasks(i).Sensitivity,
+                            categories: tasks(i).Categories,
+                            notes: taskExcerpt(tasks(i).Body, GENERAL_CONFIG.TASKNOTE_EXCERPT),
+                            status: taskStatus(tasks(i).Body),
+                            oneNoteTaskID: getUserProp(tasks(i), "OneNoteTaskID"),
+                            oneNoteURL: getUserProp(tasks(i), "OneNoteURL")
+                        });
+                }
             };
 
             // sort tasks