Merge branch 'main' into AP-139

Add backend links

Reviewed-on: #140

README.md

@@ -14,3 +14,13 @@ In order to run the frontend, go to the `allowance-planner-v2` directory in the
 ```bash
 $ ionic serve
 ```
+
+## Backend links
+In order to run the frontend, go to the `allowance-planner-v2` directory in the `frontend` directory and run:
+
+```bash
+Main: https://allowanceplanner.seeseepuff.be/api
+```
+```bash
+Test: http://localhost:8080/api
+```

frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.html

@@ -6,6 +6,7 @@
       </div>
       <ion-title *ngIf="isAddMode">Create Task</ion-title>
       <ion-title *ngIf="!isAddMode">Edit Task</ion-title>
+      <button class="done-button" *ngIf="!isAddMode" (click)="completeAndRecreateTask()">Done & Re-create</button>
     </div>
   </ion-toolbar>
 </ion-header>

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;

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();
   }

frontend/allowance-planner-v2/src/app/pages/history/history.page.html

@@ -15,6 +15,6 @@
     <div
       class="amount"
       [ngClass]="{ 'negative': history.allowance < 0 }"
-    >{{ history.allowance }} SP</div>
+    >{{ history.allowance.toFixed(2) }} SP</div>
   </div>
 </ion-content>