From 85a1bbae9265a7a8d40483389ed15e6acdbfe07e Mon Sep 17 00:00:00 2001
From: Francis-Ouellet <franc.ouelle93@gmail.com>
Date: Thu, 30 Mar 2017 13:03:26 -0400
Subject: [PATCH 1/2] Added label field to add task view, changed detailTask to
 show label

---
 tasklist/src/models/labelModel.ts             | 19 +++++++++++++
 tasklist/src/models/taskModel.ts              |  4 ++-
 tasklist/src/pages/detailTask/detailTask.html |  2 +-
 tasklist/src/pages/detailTask/detailTask.ts   | 28 +++++++++++++++++--
 .../src/pages/modalAddTask/modalAddTask.html  |  7 +++++
 .../src/pages/modalAddTask/modalAddTask.ts    | 20 +++++++++++--
 tasklist/src/services/projectService.ts       | 14 +++++++++-
 tasklist/src/services/taskService.ts          | 13 ++++++++-
 8 files changed, 99 insertions(+), 8 deletions(-)
 create mode 100644 tasklist/src/models/labelModel.ts

diff --git a/tasklist/src/models/labelModel.ts b/tasklist/src/models/labelModel.ts
new file mode 100644
index 0000000..7305722
--- /dev/null
+++ b/tasklist/src/models/labelModel.ts
@@ -0,0 +1,19 @@
+import { Project } from './projectModel';
+import BaseModel from "./baseModel";
+
+export class Label extends BaseModel {
+  id:number;
+  name:string;
+  color:string;
+  project:Project;
+
+  constructor(data:Object = {}) {
+    super({
+	  id: data['id']||null,
+      name: data['name']||'',
+	  color: data['color']||'',
+      project: new Project(data['project']||{})
+    });
+  }
+
+}
diff --git a/tasklist/src/models/taskModel.ts b/tasklist/src/models/taskModel.ts
index 3ed3312..bcb2415 100644
--- a/tasklist/src/models/taskModel.ts
+++ b/tasklist/src/models/taskModel.ts
@@ -1,10 +1,12 @@
 import { User } from './userModel';
 import { Project } from './projectModel';
+import { Label } from './labelModel';
 import BaseModel from "./baseModel";
 
 export class Task extends BaseModel {
   id:number;
   name:string;
+  labels:Array<Label>;
   description:string;
   priority:number;
   done:boolean;
@@ -18,6 +20,7 @@ export class Task extends BaseModel {
     super({
       id: data['id']||null,
       name: data['name']||'',
+	  labels: data['labels']||[],
       description: data['description']||'',
       priority: data['priority']||0,
       done: data['done']||false,
@@ -28,5 +31,4 @@ export class Task extends BaseModel {
       project: new Project(data['project']||{})
     });
   }
-
 }
diff --git a/tasklist/src/pages/detailTask/detailTask.html b/tasklist/src/pages/detailTask/detailTask.html
index 87457a6..9ef2064 100644
--- a/tasklist/src/pages/detailTask/detailTask.html
+++ b/tasklist/src/pages/detailTask/detailTask.html
@@ -43,7 +43,7 @@
         <ion-badge item-right>{{task.priority}}</ion-badge>
       </ion-item>
 
-      <ion-item *ngIf="task.labels?.length > 0">
+      <ion-item *ngIf="task.labels.length > 0">
         <ion-icon name="pricetag" color="main" item-left large ></ion-icon>
         <h2>Categories</h2>
         <p>
diff --git a/tasklist/src/pages/detailTask/detailTask.ts b/tasklist/src/pages/detailTask/detailTask.ts
index c821984..50135b3 100644
--- a/tasklist/src/pages/detailTask/detailTask.ts
+++ b/tasklist/src/pages/detailTask/detailTask.ts
@@ -3,8 +3,10 @@ import { Component } from '@angular/core';
 import { ModalController, NavController, NavParams, ToastController, PopoverController } from 'ionic-angular';
 
 import { TaskService } from '../../services/taskService';
+import { ProjectService } from '../../services/projectService';
 import { ModalAddTask } from '../modalAddTask/modalAddTask';
 import { Task } from '../../models/taskModel';
+import { Label } from '../../models/labelModel';
 import { Project } from '../../models/projectModel';
 
 @Component({
@@ -34,7 +36,10 @@ export class DetailTaskPopover {
 @Component({
   selector: 'detail-task',
   templateUrl: 'detailTask.html',
-  providers: [TaskService]
+  providers: [
+    TaskService,
+    ProjectService
+  ]
 })
 export class DetailTask {
   task: Task;
@@ -45,10 +50,20 @@ export class DetailTask {
     public modalCtrl: ModalController,
     public toastCtrl: ToastController,
     public popoverCtrl: PopoverController,
-    private taskService: TaskService
+    private taskService: TaskService,
+    private projectService: ProjectService
   )
   {
     this.task = new Task(navParams.get("task"));
+    let labels = this.task.labels;
+    this.task.labels = [];
+    for(let label of labels) {
+        this.projectService.getLabel(label).subscribe(
+            response => {
+                this.task.labels.push(response.json());
+            }
+        )
+    }
     console.log(this.task);
   }
 
@@ -115,6 +130,15 @@ export class DetailTask {
     this.taskService.getTask(this.task.id).subscribe(
       response => {
         this.task = new Task(response.json());
+        let labels = this.task.labels;
+        this.task.labels = [];
+        for(let label of labels) {
+            this.projectService.getLabel(label).subscribe(
+                response => {
+                    this.task.labels.push(response.json());
+                }
+            )
+        }
       }
     );
   }
diff --git a/tasklist/src/pages/modalAddTask/modalAddTask.html b/tasklist/src/pages/modalAddTask/modalAddTask.html
index d1b4a8e..498956d 100644
--- a/tasklist/src/pages/modalAddTask/modalAddTask.html
+++ b/tasklist/src/pages/modalAddTask/modalAddTask.html
@@ -28,6 +28,13 @@
       <ion-label stacked>Name</ion-label>
       <ion-input type="text" [(ngModel)]="task.name" name="name"></ion-input>
     </ion-item>
+	
+	<ion-item>
+      <ion-label stacked>Label</ion-label>
+      <ion-select [(ngModel)]="task.labels" name="labels" multiple="true">
+		<ion-option *ngFor="let label of labels" value="{{label.id}}">{{label.name}}</ion-option>
+	  </ion-select>
+    </ion-item>
 
     <ion-item>
       <ion-label stacked>Description</ion-label>
diff --git a/tasklist/src/pages/modalAddTask/modalAddTask.ts b/tasklist/src/pages/modalAddTask/modalAddTask.ts
index a672cb0..a897bc6 100644
--- a/tasklist/src/pages/modalAddTask/modalAddTask.ts
+++ b/tasklist/src/pages/modalAddTask/modalAddTask.ts
@@ -8,6 +8,7 @@ import {Access} from '../../models/accessModel';
 import {User} from '../../models/userModel';
 import {Project} from '../../models/projectModel';
 import {Task} from '../../models/taskModel';
+import {Label} from '../../models/labelModel';
 
 @Component({
   templateUrl: 'modalAddTask.html',
@@ -24,6 +25,7 @@ export class ModalAddTask {
   project: Project;
   users: Array<User>;
   projects: Array<Project>;
+  labels: Array<Label>;
 
   constructor(
     public platform: Platform,
@@ -38,8 +40,9 @@ export class ModalAddTask {
     this.project = params.get('project');
     if(this.project)
     {
-      // We populate the list of user
+      // We populate the list of available users and labels
       this.populateListUser();
+	  this.populateListLabel();
     }
 
     const task = params.get('task');
@@ -73,7 +76,7 @@ export class ModalAddTask {
     this.users = [];
     this.projectService.listProjectUsers(this.project.id).subscribe(
       response => {
-        this.accessList = response.json()
+        this.accessList = response.json();
         for(let access of this.accessList){
           this.userService.getUser(access.user).subscribe(
             response => {
@@ -91,6 +94,19 @@ export class ModalAddTask {
       }
     );
   }
+  
+  populateListLabel(){
+	// Get list of existing labels for this project
+	this.labels = [];
+	this.projectService.listProjectLabels(this.project.id).subscribe(
+		response => {
+			this.labels = response.json();
+		},
+		err => {
+			console.log(err);
+		}
+	)
+  }
 
   populateTask() {
     // Populate the interface with the task information
diff --git a/tasklist/src/services/projectService.ts b/tasklist/src/services/projectService.ts
index 5d26880..80a6f01 100644
--- a/tasklist/src/services/projectService.ts
+++ b/tasklist/src/services/projectService.ts
@@ -46,7 +46,13 @@ export class ProjectService {
         .fromPromise(this.buildOptions(null))
         .switchMap((options) => this.http.get(this.propertiesURL + "/" + id + "/access", options));
   }
-
+  
+  listProjectLabels(id) {
+	return Observable
+		.fromPromise(this.buildOptions(null))
+		.switchMap((options) => this.http.get(this.propertiesURL + "/" + id + "/labels", options));
+  }
+  
   createProject(project) {
     let data = new URLSearchParams();
     data.append('name', project.name);
@@ -60,4 +66,10 @@ export class ProjectService {
         .fromPromise(this.buildOptions(null))
         .switchMap((options) => this.http.delete(this.propertiesURL + "/" + id, options));
   }
+  
+  getLabel(id){
+    return Observable
+        .fromPromise(this.buildOptions(null))
+        .switchMap((options) => this.http.get(this.serverURL + "/labels/" + id, options));
+  }
 }
diff --git a/tasklist/src/services/taskService.ts b/tasklist/src/services/taskService.ts
index aefed9f..afec01e 100644
--- a/tasklist/src/services/taskService.ts
+++ b/tasklist/src/services/taskService.ts
@@ -60,7 +60,13 @@ export class TaskService {
     if(task.priority){
       data.append('priority', task.priority.toString());
     }
-
+	
+	if(task.labels.length > 0){
+        for(let label of task.labels) {
+            data.append('labels', label.toString());
+		}
+	}
+    
     return Observable
         .fromPromise(this.buildOptions(null))
         .switchMap((options) => this.http.post(this.propertiesURL, data, options));
@@ -75,6 +81,11 @@ export class TaskService {
     data.append('description', task.description);
     data.append('assigned_id', task.assigned.id ? task.assigned.id.toString() : null );
     data.append('priority', task.priority ? task.priority.toString() : '0' );
+	if(task.labels.length > 0){
+		for(let label of task.labels) {
+            data.append('labels', label.toString());
+		}
+	}
 
     return Observable
       .fromPromise(this.buildOptions(null))

From dd9c469b6c65b357c1dbb0a22e8f58e1725a35eb Mon Sep 17 00:00:00 2001
From: Francis-Ouellet <franc.ouelle93@gmail.com>
Date: Thu, 30 Mar 2017 13:07:53 -0400
Subject: [PATCH 2/2] Added UPDATE.md

---
 UPDATE.md | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 UPDATE.md

diff --git a/UPDATE.md b/UPDATE.md
new file mode 100644
index 0000000..45025cd
--- /dev/null
+++ b/UPDATE.md
@@ -0,0 +1,3 @@
+# Colabtask
+
+Les changements apport�s requi�rent la mise � jour de l'API pour int�grer les modifications de la branche "add_label_field_to_task_add" du projet api-tasklist
\ No newline at end of file