diff --git a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.html b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.html index 8e046da..5670744 100644 --- a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.html +++ b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.html @@ -1,7 +1,14 @@ - Create Task - Edit Task +
+ Create Task + Edit Task + +
diff --git a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.scss b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.scss index e58999e..3029c8d 100644 --- a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.scss +++ b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.scss @@ -1,3 +1,14 @@ +.toolbar { + display: flex; +} + +.remove-button { + background-color: var(--ion-color-primary); + margin-right: 15px; + width: 85px; + margin-bottom: 0; +} + form { display: flex; flex-direction: column; diff --git a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.ts b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.ts index 9f9c5be..ce2f1b3 100644 --- a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.ts +++ b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.ts @@ -72,4 +72,9 @@ export class EditTaskPage implements OnInit { this.router.navigate(['/tabs/tasks']); } + + deleteTask() { + this.taskService.deleteTask(this.id); + this.router.navigate(['/tabs/tasks']); + } } diff --git a/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts b/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts index 0527d00..cabba3f 100644 --- a/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts +++ b/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts @@ -32,7 +32,7 @@ export class TasksPage implements ViewWillEnter { this.taskService.getTaskList().subscribe(tasks => { this.tasks$.next(tasks); }); - }, 1) + }, 10); } createTask() { diff --git a/frontend/allowance-planner-v2/src/app/services/task.service.ts b/frontend/allowance-planner-v2/src/app/services/task.service.ts index af38fa7..18359c2 100644 --- a/frontend/allowance-planner-v2/src/app/services/task.service.ts +++ b/frontend/allowance-planner-v2/src/app/services/task.service.ts @@ -30,4 +30,8 @@ export class TaskService { completeTask(id: number) { this.http.post(`${this.url}/task/${id}/complete`, {}).subscribe(); } + + deleteTask(id: number) { + this.http.delete(`${this.url}/task/${id}`).subscribe(); + } } \ No newline at end of file