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/pages/history/history.page.html b/frontend/allowance-planner-v2/src/app/pages/history/history.page.html
index 8004129..cffad29 100644
--- a/frontend/allowance-planner-v2/src/app/pages/history/history.page.html
+++ b/frontend/allowance-planner-v2/src/app/pages/history/history.page.html
@@ -15,6 +15,6 @@
{{ history.allowance }} SP
+ >{{ history.allowance.toFixed(2) }} SP