add app icon

closes #103

Reviewed-on: #111

backend/api_test.go

@@ -764,7 +764,6 @@ func TestAddAllowanceSimple(t *testing.T) {
 	createTestAllowance(e, "Test Allowance 1", 1000, 1)
 
 	request := map[string]interface{}{
-		"id":          1,
 		"amount":      10,
 		"description": "Added to allowance 1",
 	}
@@ -791,7 +790,6 @@ func TestAddAllowanceWithSpillage(t *testing.T) {
 	e.PUT("/user/1/allowance/0").WithJSON(UpdateAllowanceRequest{Weight: 1}).Expect().Status(200)
 
 	request := map[string]interface{}{
-		"id":          1,
 		"amount":      10,
 		"description": "Added to allowance 1",
 	}
@@ -816,6 +814,89 @@ func TestAddAllowanceWithSpillage(t *testing.T) {
 	history.Value(0).Object().Value("description").String().IsEqual("Added to allowance 1")
 }
 
+func TestAddAllowanceIdZero(t *testing.T) {
+	e := startServer(t)
+
+	createTestAllowance(e, "Test Allowance 1", 1000, 1)
+
+	request := map[string]interface{}{
+		"amount":      10,
+		"description": "Added to allowance 1",
+	}
+	e.POST("/user/1/allowance/0/add").WithJSON(request).Expect().Status(200)
+
+	// Verify the allowance is updated
+	allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
+	allowances.Value(0).Object().Value("id").Number().IsEqual(0)
+	allowances.Value(0).Object().Value("progress").Number().InDelta(10.0, 0.01)
+
+	// Verify the history is updated
+	history := e.GET("/user/1/history").Expect().Status(200).JSON().Array()
+	history.Length().IsEqual(1)
+	history.Value(0).Object().Value("allowance").Number().InDelta(10.0, 0.01)
+	history.Value(0).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
+	history.Value(0).Object().Value("description").String().IsEqual("Added to allowance 1")
+}
+
+func TestSubtractAllowanceSimple(t *testing.T) {
+	e := startServer(t)
+
+	createTestAllowance(e, "Test Allowance 1", 1000, 1)
+
+	request := map[string]interface{}{
+		"amount":      10,
+		"description": "Added to allowance 1",
+	}
+	e.POST("/user/1/allowance/1/add").WithJSON(request).Expect().Status(200)
+	request["amount"] = -2.5
+	e.POST("/user/1/allowance/1/add").WithJSON(request).Expect().Status(200)
+
+	// Verify the allowance is updated
+	allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
+	allowances.Value(1).Object().Value("id").Number().IsEqual(1)
+	allowances.Value(1).Object().Value("progress").Number().InDelta(7.5, 0.01)
+
+	// Verify the history is updated
+	history := e.GET("/user/1/history").Expect().Status(200).JSON().Array()
+	history.Length().IsEqual(2)
+	history.Value(0).Object().Value("allowance").Number().InDelta(10.0, 0.01)
+	history.Value(0).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
+	history.Value(0).Object().Value("description").String().IsEqual("Added to allowance 1")
+
+	history.Value(1).Object().Value("allowance").Number().InDelta(-2.5, 0.01)
+	history.Value(1).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
+	history.Value(1).Object().Value("description").String().IsEqual("Added to allowance 1")
+}
+
+func TestSubtractllowanceIdZero(t *testing.T) {
+	e := startServer(t)
+
+	createTestAllowance(e, "Test Allowance 1", 1000, 1)
+
+	request := map[string]interface{}{
+		"amount":      10,
+		"description": "Added to allowance 1",
+	}
+	e.POST("/user/1/allowance/0/add").WithJSON(request).Expect().Status(200)
+	request["amount"] = -2.5
+	e.POST("/user/1/allowance/0/add").WithJSON(request).Expect().Status(200)
+
+	// Verify the allowance is updated
+	allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
+	allowances.Value(0).Object().Value("id").Number().IsEqual(0)
+	allowances.Value(0).Object().Value("progress").Number().InDelta(7.5, 0.01)
+
+	// Verify the history is updated
+	history := e.GET("/user/1/history").Expect().Status(200).JSON().Array()
+	history.Length().IsEqual(2)
+	history.Value(0).Object().Value("allowance").Number().InDelta(10.0, 0.01)
+	history.Value(0).Object().Value("timestamp").String().AsDateTime().InRange(getDelta(time.Now(), 2.0))
+	history.Value(0).Object().Value("description").String().IsEqual("Added to allowance 1")
+
+	history.Value(1).Object().Value("allowance").Number().InDelta(-2.5, 0.01)
+	history.Value(1).Object().Value("description").String().IsEqual("Added to allowance 1")
+}
+
 func getDelta(base time.Time, delta float64) (time.Time, time.Time) {
 	start := base.Add(-time.Duration(delta) * time.Second)
 	end := base.Add(time.Duration(delta) * time.Second)

backend/db.go

@@ -561,36 +561,72 @@ func (db *Db) AddAllowanceAmount(userId int, allowanceId int, request AddAllowan
 		return err
 	}
 
-	// Fetch the target and progress of the specified allowance
+	if allowanceId == 0 {
-	var target, progress int
+		if remainingAmount < 0 {
-	err = tx.Query("select target, balance from allowances where id = ? and user_id = ?").
+			var userBalance int
-		Bind(allowanceId, userId).ScanSingle(&target, &progress)
+			err = tx.Query("select balance from users where id = ?").
-	if err != nil {
+				Bind(userId).ScanSingle(&userBalance)
-		return err
+			if err != nil {
-	}
+				return err
-
+			}
-	// Calculate the amount to add to the current allowance
+			if remainingAmount > userBalance {
-	toAdd := remainingAmount
+				return fmt.Errorf("cannot remove more than the current balance: %d", userBalance)
-	if progress+toAdd > target {
+			}
-		toAdd = target - progress
+		}
-	}
+		err = tx.Query("update users set balance = balance + ? where id = ?").
-	remainingAmount -= toAdd
+			Bind(remainingAmount, userId).Exec()
-
-	// Update the current allowance
-	if toAdd > 0 {
-		err = tx.Query("update allowances set balance = balance + ? where id = ? and user_id = ?").
-			Bind(toAdd, allowanceId, userId).Exec()
 		if err != nil {
 			return err
 		}
-	}
+	} else if remainingAmount < 0 {
-
+		var progress int
-	// If there's remaining amount, distribute it to the user's allowances
+		err = tx.Query("select balance from allowances where id = ? and user_id = ?").
-	if remainingAmount > 0 {
+			Bind(allowanceId, userId).ScanSingle(&progress)
-		err = db.addDistributedReward(tx, userId, remainingAmount)
 		if err != nil {
 			return err
 		}
+
+		if remainingAmount > progress {
+			return fmt.Errorf("cannot remove more than the current allowance balance: %d", progress)
+		}
+
+		err = tx.Query("update allowances set balance = balance + ? where id = ? and user_id = ?").
+			Bind(remainingAmount, allowanceId, userId).Exec()
+		if err != nil {
+			return err
+		}
+	} else {
+		// Fetch the target and progress of the specified allowance
+		var target, progress int
+		err = tx.Query("select target, balance from allowances where id = ? and user_id = ?").
+			Bind(allowanceId, userId).ScanSingle(&target, &progress)
+		if err != nil {
+			return err
+		}
+
+		// Calculate the amount to add to the current allowance
+		toAdd := remainingAmount
+		if progress+toAdd > target {
+			toAdd = target - progress
+		}
+		remainingAmount -= toAdd
+
+		// Update the current allowance
+		if toAdd > 0 {
+			err = tx.Query("update allowances set balance = balance + ? where id = ? and user_id = ?").
+				Bind(toAdd, allowanceId, userId).Exec()
+			if err != nil {
+				return err
+			}
+		}
+
+		// If there's remaining amount, distribute it to the user's allowances
+		if remainingAmount > 0 {
+			err = db.addDistributedReward(tx, userId, remainingAmount)
+			if err != nil {
+				return err
+			}
+		}
 	}
 
 	return tx.Commit()

frontend/allowance-planner-v2/package.json

@@ -47,6 +47,7 @@
     "@angular/cli": "^19.0.0",
     "@angular/compiler-cli": "^19.0.0",
     "@angular/language-service": "^19.0.0",
+    "@capacitor/assets": "^3.0.5",
     "@capacitor/cli": "7.2.0",
     "@ionic/angular-toolkit": "^12.0.0",
     "@types/jasmine": "~5.1.0",

frontend/allowance-planner-v2/src/app/pages/add-allowance/add-allowance-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { AddAllowancePage } from './add-allowance.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AddAllowancePage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class AddAllowancePageRoutingModule {}

frontend/allowance-planner-v2/src/app/pages/add-allowance/add-allowance.module.ts

@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { AddAllowancePageRoutingModule } from './add-allowance-routing.module';
+
+import { AddAllowancePage } from './add-allowance.page';
+import { MatIconModule } from '@angular/material/icon';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    AddAllowancePageRoutingModule,
+    ReactiveFormsModule,
+    MatIconModule
+  ],
+  declarations: [AddAllowancePage]
+})
+export class AddAllowancePageModule {}

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

@@ -0,0 +1,27 @@
+<ion-header [translucent]="true">
+  <ion-toolbar>
+    <div class="toolbar">
+      <div class="icon" (click)="navigateBack()">
+        <mat-icon>arrow_back</mat-icon>
+      </div>
+      <ion-title *ngIf="isAddMode && goalId == 0">Add to Allowance</ion-title>
+      <ion-title *ngIf="isAddMode && goalId != 0">Add to Goal</ion-title>
+      <ion-title *ngIf="!isAddMode">Spend Allowance</ion-title>
+    </div>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content [fullscreen]="true">
+  <form [formGroup]="form">
+    <label>Amount</label>
+    <input id="amount" type="number" placeholder="0.00" name="price" min="0" value="0" step="0.01" formControlName="amount"/>
+
+    <label>Description</label>
+    <input id="description" type="text" formControlName="description"/>
+
+    <button type="button" [disabled]="!form.valid" (click)="changeAllowance()">
+      <span *ngIf="isAddMode">Add</span>
+      <span *ngIf="!isAddMode">Spend</span>
+    </button>
+  </form>
+</ion-content>

frontend/allowance-planner-v2/src/app/pages/add-allowance/add-allowance.page.scss

@@ -0,0 +1,40 @@
+.toolbar {
+    display: flex;
+    align-items: center;
+}
+
+.icon {
+    margin-left: 5px;
+}
+
+form {
+    height: 100%;
+}
+
+form,
+.item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+label {
+    color: var(--ion-color-primary);
+    margin-top: 25px;
+    margin-bottom: 10px;
+}
+
+button {
+    background-color: var(--ion-color-primary);
+    border-radius: 5px;
+    color: white;
+    padding: 10px;
+    width: 250px;
+    margin-top: auto;
+    margin-bottom: 50px;
+}
+
+button:disabled,
+button[disabled]{
+    opacity: 0.5;
+}

frontend/allowance-planner-v2/src/app/pages/add-allowance/add-allowance.page.spec.ts

@@ -0,0 +1,17 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AddAllowancePage } from './add-allowance.page';
+
+describe('AddAllowancePage', () => {
+  let component: AddAllowancePage;
+  let fixture: ComponentFixture<AddAllowancePage>;
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AddAllowancePage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

frontend/allowance-planner-v2/src/app/pages/add-allowance/add-allowance.page.ts

@@ -0,0 +1,51 @@
+import { Location } from '@angular/common';
+import { Component } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AllowanceService } from 'src/app/services/allowance.service';
+
+@Component({
+  selector: 'app-add-allowance',
+  templateUrl: './add-allowance.page.html',
+  styleUrls: ['./add-allowance.page.scss'],
+  standalone: false,
+})
+export class AddAllowancePage {
+  public form: FormGroup;
+  public goalId: number;
+  public userId: number;
+  public isAddMode = true;
+// Marcus' first comment
+//            b    ........a`.OK  ø¶Ópppppppp--P09OP
+
+
+  constructor(
+    private allowanceService: AllowanceService,
+    private route: ActivatedRoute,
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private location: Location
+  ) {
+    this.userId = this.route.snapshot.params['id'];
+    this.goalId = this.route.snapshot.params['goalId'];
+
+    this.form = this.formBuilder.group({
+      amount: ['', Validators.required],
+      description: ['', Validators.required]
+    });
+  }
+
+  changeAllowance() {
+    this.allowanceService.addOrSpendAllowance(
+      this.goalId,
+      this.userId,
+      this.form.value.amount,
+      this.form.value.description
+    );
+    this.router.navigate(['/tabs/allowance', this.userId]);
+  }
+
+  navigateBack() {
+    this.location.back();
+  }
+}

frontend/allowance-planner-v2/src/app/pages/add-allowance/spend-allowance-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { SpendllowancePage } from './spend-allowance.page';
+
+const routes: Routes = [
+    {
+        path: '',
+        component: SpendllowancePage
+    }
+];
+
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule],
+})
+export class SpendAllowancePageRoutingModule {}

frontend/allowance-planner-v2/src/app/pages/add-allowance/spend-allowance.module.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { SpendAllowancePageRoutingModule } from './spend-allowance-routing.module';
+import { SpendllowancePage } from './spend-allowance.page';
+import { MatIconModule } from '@angular/material/icon';
+
+@NgModule({
+    imports: [
+        CommonModule,
+        FormsModule,
+        IonicModule,
+        SpendAllowancePageRoutingModule,
+        ReactiveFormsModule,
+        MatIconModule
+    ],
+    declarations: [SpendllowancePage]
+})
+export class SpendAllowancePageModule {}

frontend/allowance-planner-v2/src/app/pages/add-allowance/spend-allowance.page.ts

@@ -0,0 +1,52 @@
+import { Location } from '@angular/common';
+import { Component } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AllowanceService } from 'src/app/services/allowance.service';
+
+@Component({
+    selector: 'app-spend-allowance',
+    templateUrl: './add-allowance.page.html',
+    styleUrls: ['./add-allowance.page.scss'],
+    standalone: false,
+})
+export class SpendllowancePage {
+    public form: FormGroup;
+    public goalId: number;
+    public userId: number;
+    public isAddMode = false;
+
+    constructor(
+        private allowanceService: AllowanceService,
+        private route: ActivatedRoute,
+        private formBuilder: FormBuilder,
+        private router: Router,
+        private location: Location
+    ) {
+        this.userId = this.route.snapshot.params['id'];
+        this.goalId = this.route.snapshot.params['goalId'];
+
+        this.form = this.formBuilder.group({
+        amount: ['', Validators.required],
+        description: ['', Validators.required]
+        });
+
+        this.allowanceService.getAllowanceById(this.goalId, this.userId).subscribe(allowance => {
+            this.form.controls['amount'].addValidators([Validators.max(allowance.progress)]);
+        }); 
+    }
+
+    changeAllowance() {
+        this.allowanceService.addOrSpendAllowance(
+        this.goalId,
+        this.userId,
+        -this.form.value.amount,
+        this.form.value.description
+        );
+        this.router.navigate(['/tabs/allowance', this.userId]);
+    }
+
+    navigateBack() {
+        this.location.back();
+    }
+}

frontend/allowance-planner-v2/src/app/pages/allowance/allowance-routing.module.ts

@@ -14,6 +14,14 @@ const routes: Routes = [
   {
     path: ':id/edit/:goalId',
     loadChildren: () => import('../edit-allowance/edit-allowance.module').then(m => m.EditAllowancePageModule)
+  },
+  {
+    path: ':id/increase/:goalId',
+    loadChildren: () => import('../add-allowance/add-allowance.module').then(m => m.AddAllowancePageModule)
+  },
+  {
+    path: ':id/spend/:goalId',
+    loadChildren: () => import('../add-allowance/spend-allowance.module').then(m => m.SpendAllowancePageModule)
   }
 ];
 

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

@@ -43,9 +43,9 @@
         </div>
         <div class="progress">{{ goal.progress }} SP</div>
         <div class="buttons">
-          <button class="add-button">Add</button>
+          <button class="add-button" (click)="addAllowance(goal.id)">Add</button>
           <!-- <button class="move-button">Move</button> -->
-          <button class="spend-button">Spend</button>
+          <button class="spend-button" (click)="spendAllowance(goal.id)">Spend</button>
         </div>
       </div>
       <ng-template #other_goal>
@@ -59,7 +59,7 @@
             </div>
             <div class="progress">{{ goal.progress }} / {{ goal.target }} SP</div>
             <div class="buttons">
-              <button class="add-button">Add</button>
+              <button class="add-button" (click)="addAllowance(goal.id)">Add</button>
               <!-- <button class="move-button">Move</button> -->
               <button class="spend-button" [disabled]="!canFinishGoal(goal)" (click)="completeGoal(goal.id)">Finish goal</button>
             </div>

frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.ts

@@ -36,7 +36,7 @@ export class AllowancePage implements ViewWillEnter {
         allowance[0].name = 'Main Allowance';
         this.allowance$.next(allowance);
       })
-    }, 20);
+    }, 50);
   }
 
   canFinishGoal(allowance: Allowance): boolean {
@@ -57,6 +57,9 @@ export class AllowancePage implements ViewWillEnter {
     for (let allowance of allowanceList) {
       allowanceTotal += allowance.progress;
     }
+    if (allowanceTotal === 0) {
+      return 0;
+    }
     return goal.progress / allowanceTotal * 100;
   }
 
@@ -72,4 +75,12 @@ export class AllowancePage implements ViewWillEnter {
     this.allowanceService.completeGoal(goalId, this.id);
     this.getAllowance();
   }
+
+  addAllowance(id: number) {
+    this.router.navigate(['increase', id], { relativeTo: this.route });
+  }
+
+  spendAllowance(id: number) {
+    this.router.navigate(['spend', id], { relativeTo: this.route });
+  }
 }

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

@@ -19,6 +19,7 @@
         <button (click)="completeTask(task.id)">Done</button>
         <div (click)="updateTask(task.id)" class="item">
           <div class="name">{{ task.name }}</div>
+          <div class="assigned">{{ usernames[task.assigned ? task.assigned : 0] }}</div>
           <div
             class="reward"
             [ngClass]="{ 'negative': task.reward < 0 }"

frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.scss

@@ -67,4 +67,10 @@ button {
     background-color: var(--ion-color-primary);
     margin-right: 15px;
     width: 75px;
+}
+
+.assigned {
+    color: var(--line-color);
+    margin-left: 3px;
+    font-size: 12px;
 }

frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts

@@ -14,6 +14,7 @@ import { ViewWillEnter } from '@ionic/angular';
 })
 export class TasksPage implements ViewWillEnter {
   public tasks$: BehaviorSubject<Array<Task>> = new BehaviorSubject<Array<Task>>([]);
+  public usernames = ['', 'See', 'Huffle']
 
   constructor(
     private taskService: TaskService,
@@ -32,7 +33,7 @@ export class TasksPage implements ViewWillEnter {
       this.taskService.getTaskList().subscribe(tasks => {
         this.tasks$.next(tasks);
       });
-    }, 10);
+    }, 50);
   }
 
   createTask() {

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 = 'http://localhost:8080/api';
+    private url = 'https://allowanceplanner.seeseepuff.be/api';
 
     constructor(private http: HttpClient) {}
 
@@ -34,4 +34,8 @@ export class AllowanceService {
     completeGoal(goalId: number, userId: number) {
         this.http.post(`${this.url}/user/${userId}/allowance/${goalId}/complete`, {}).subscribe();
     }
+
+    addOrSpendAllowance(goalId: number, userId: number, amount: number, description: string) {
+        this.http.post(`${this.url}/user/${userId}/allowance/${goalId}/add`, { amount, description }).subscribe();
+    }
 }

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 = 'http://localhost:8080/api';
+    private url = 'https://allowanceplanner.seeseepuff.be/api';
 
     constructor(private http: HttpClient) {}
 

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 = 'http://localhost:8080/api';
+    private url = 'https://allowanceplanner.seeseepuff.be/api';
 
     constructor(private http: HttpClient) {}
 

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 = 'http://localhost:8080/api';
+    private url = 'https://allowanceplanner.seeseepuff.be/api';
     constructor(private http: HttpClient) {}
 
     getUserList(): Observable<Array<User>> {