From b8ffa6f894e6d5819115b251c80934b3cf1c7cb0 Mon Sep 17 00:00:00 2001 From: Huffle Date: Thu, 26 Jun 2025 09:03:29 +0200 Subject: [PATCH] Add recreate task button --- .../app/pages/edit-task/edit-task.page.html | 1 + .../app/pages/edit-task/edit-task.page.scss | 7 ++++++ .../src/app/pages/edit-task/edit-task.page.ts | 23 +++++++++++++++++-- .../src/app/services/allowance.service.ts | 2 +- .../src/app/services/history.service.ts | 2 +- .../src/app/services/task.service.ts | 2 +- .../src/app/services/user.service.ts | 2 +- 7 files changed, 33 insertions(+), 6 deletions(-) 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 d6f324e..4540fe4 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 @@ -6,6 +6,7 @@ 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 51e602e..097fa18 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 @@ -42,6 +42,13 @@ button { margin-top: 100px; } +.done-button { + width: 150px; + margin-top: unset; + margin-right: 20px; + border-radius: 10px; +} + button:disabled, button[disabled]{ opacity: 0.5; 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 933543b..e168161 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 @@ -57,13 +57,13 @@ export class EditTaskPage implements OnInit { let assigned: number | null = Number(formValue.assigned); if (assigned === 0) { assigned = null; - } + }; const task = { name: formValue.name, reward: formValue.reward, assigned - } + }; if (this.isAddMode) { this.taskService.createTask(task); @@ -79,6 +79,25 @@ export class EditTaskPage implements OnInit { this.router.navigate(['/tabs/tasks']); } + completeAndRecreateTask() { + const formValue = this.form.value; + let assigned: number | null = Number(formValue.assigned); + if (assigned === 0) { + assigned = null; + }; + + const task = { + name: formValue.name, + reward: formValue.reward, + assigned + }; + + this.taskService.createTask(task); + this.taskService.completeTask(this.id); + + this.router.navigate(['/tabs/tasks']); + } + navigateBack() { this.location.back(); } diff --git a/frontend/allowance-planner-v2/src/app/services/allowance.service.ts b/frontend/allowance-planner-v2/src/app/services/allowance.service.ts index 47d981a..5108aeb 100644 --- a/frontend/allowance-planner-v2/src/app/services/allowance.service.ts +++ b/frontend/allowance-planner-v2/src/app/services/allowance.service.ts @@ -7,7 +7,7 @@ import { Allowance } from '../models/allowance'; providedIn: 'root' }) export class AllowanceService { - private url = 'https://allowanceplanner.seeseepuff.be/api'; + private url = 'http://localhost:8080/api'; constructor(private http: HttpClient) {} diff --git a/frontend/allowance-planner-v2/src/app/services/history.service.ts b/frontend/allowance-planner-v2/src/app/services/history.service.ts index 92807ee..02a74a9 100644 --- a/frontend/allowance-planner-v2/src/app/services/history.service.ts +++ b/frontend/allowance-planner-v2/src/app/services/history.service.ts @@ -7,7 +7,7 @@ import { History } from '../models/history'; providedIn: 'root' }) export class HistoryService { - private url = 'https://allowanceplanner.seeseepuff.be/api'; + private url = 'http://localhost:8080/api'; constructor(private http: HttpClient) {} 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 77d2d30..18359c2 100644 --- a/frontend/allowance-planner-v2/src/app/services/task.service.ts +++ b/frontend/allowance-planner-v2/src/app/services/task.service.ts @@ -7,7 +7,7 @@ import { Task } from '../models/task'; providedIn: 'root' }) export class TaskService { - private url = 'https://allowanceplanner.seeseepuff.be/api'; + private url = 'http://localhost:8080/api'; constructor(private http: HttpClient) {} diff --git a/frontend/allowance-planner-v2/src/app/services/user.service.ts b/frontend/allowance-planner-v2/src/app/services/user.service.ts index 1e1ac11..86df03d 100644 --- a/frontend/allowance-planner-v2/src/app/services/user.service.ts +++ b/frontend/allowance-planner-v2/src/app/services/user.service.ts @@ -7,7 +7,7 @@ import { User } from '../models/user'; providedIn: 'root', }) export class UserService { - private url = 'https://allowanceplanner.seeseepuff.be/api'; + private url = 'http://localhost:8080/api'; constructor(private http: HttpClient) {} getUserList(): Observable> {