Add post allowance complete

Add complete task test with sum of weights == 0
Add complete allowance endpoint
2025-05-18 09:21:28 +02:00 · 2025-05-18 09:01:48 +02:00 · 2025-05-18 08:45:15 +02:00 · 2025-05-18 08:44:46 +02:00 · 2025-05-18 08:32:33 +02:00
23 changed files with 49 additions and 713 deletions
--- a/README.md
+++ b/README.md
@@ -2,15 +2,8 @@
 An improved Allowance Planner app.

 ## Running backend
-In order to run the backend, go to the `backend` directory and run:
+In order to run the backend, go to the `backend directory and run:

 ```bash
 $ go run .
 ```
-
-## Running frontend
-In order to run the frontend, go to the `allowance-planner-v2` directory in the `frontend` directory and run:
-
-```bash
-$ ionic serve
-```
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -1,3 +1,2 @@
 *.db3
 *.db3-*
-/allowance_planner
--- a/backend/api_test.go
+++ b/backend/api_test.go
@@ -549,12 +549,12 @@ func TestCompleteTask(t *testing.T) {
 	// Create two allowance goals
 	e.POST("/user/1/allowance").WithJSON(CreateAllowanceRequest{
 		Name:   "Test Allowance 1",
-		Target: 100,
+		Target: 1000,
 		Weight: 50,
 	}).Expect().Status(201)
 	e.POST("/user/1/allowance").WithJSON(CreateAllowanceRequest{
 		Name:   "Test Allowance 1",
-		Target: 10,
+		Target: 1000,
 		Weight: 25,
 	}).Expect().Status(201)

@@ -568,11 +568,11 @@ func TestCompleteTask(t *testing.T) {
 	allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
 	allowances.Length().IsEqual(3)
 	allowances.Value(0).Object().Value("id").Number().IsEqual(0)
-	allowances.Value(0).Object().Value("progress").Number().IsEqual(31)
+	allowances.Value(0).Object().Value("progress").Number().IsEqual(26)
 	allowances.Value(1).Object().Value("id").Number().IsEqual(1)
-	allowances.Value(1).Object().Value("progress").Number().IsEqual(60)
+	allowances.Value(1).Object().Value("progress").Number().IsEqual(50)
 	allowances.Value(2).Object().Value("id").Number().IsEqual(2)
-	allowances.Value(2).Object().Value("progress").Number().IsEqual(10)
+	allowances.Value(2).Object().Value("progress").Number().IsEqual(25)

 	// And also for user 2
 	allowances = e.GET("/user/2/allowance").Expect().Status(200).JSON().Array()
--- a/backend/db.go
+++ b/backend/db.go
@@ -416,20 +416,16 @@ func (db *Db) CompleteTask(taskId int) error {

 		if sumOfWeights > 0 {
 			// Distribute the reward to the allowances
-			for allowanceRow := range tx.Query("select id, weight, target, balance from allowances where user_id = ? and weight > 0 order by (target - balance) asc").Bind(userId).Range(&err) {
-				var allowanceId, allowanceTarget, allowanceBalance int
+			for allowanceRow := range tx.Query("select id, weight from allowances where user_id = ? and weight > 0").Bind(userId).Range(&err) {
+				var allowanceId int
 				var allowanceWeight float64
-				err = allowanceRow.Scan(&allowanceId, &allowanceWeight, &allowanceTarget, &allowanceBalance)
+				err = allowanceRow.Scan(&allowanceId, &allowanceWeight)
 				if err != nil {
 					return err
 				}

 				// Calculate the amount to add to the allowance
 				amount := int((allowanceWeight / sumOfWeights) * float64(remainingReward))
-				if allowanceBalance+amount > allowanceTarget {
-					// If the amount reaches past the target, set it to the target
-					amount = allowanceTarget - allowanceBalance
-				}
 				sumOfWeights -= allowanceWeight
 				err = tx.Query("update allowances set balance = balance + ? where id = ? and user_id = ?").
 					Bind(amount, allowanceId, userId).Exec()
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -1,3 +1,7 @@
+gitea.seeseepuff.be/seeseemelk/mysqlite v0.12.0 h1:kl0VFgvm52UKxJhZpf1hvucxZdOoXY50g/VmzsWH+/8=
+gitea.seeseepuff.be/seeseemelk/mysqlite v0.12.0/go.mod h1:cgswydOxJjMlNwfcBIXnKjr47LwXnMT9BInkiHb0tXE=
+gitea.seeseepuff.be/seeseemelk/mysqlite v0.13.0 h1:nqSXu5i5fHB1rrx/kfi8Phn/J6eFa2yh02FiGc9U1yg=
+gitea.seeseepuff.be/seeseemelk/mysqlite v0.13.0/go.mod h1:cgswydOxJjMlNwfcBIXnKjr47LwXnMT9BInkiHb0tXE=
 gitea.seeseepuff.be/seeseemelk/mysqlite v0.14.0 h1:aRItVfUj48fBmuec7rm/jY9KCfvHW2VzJfItVk4t8sw=
 gitea.seeseepuff.be/seeseemelk/mysqlite v0.14.0/go.mod h1:cgswydOxJjMlNwfcBIXnKjr47LwXnMT9BInkiHb0tXE=
 github.com/TylerBrock/colorjson v0.0.0-20200706003622-8a50f05110d2 h1:ZBbLwSJqkHBuFDA6DUhhse0IGJ7T5bemHyNILUjvOq4=
@@ -214,10 +218,14 @@ modernc.org/fileutil v1.3.1 h1:8vq5fe7jdtEvoCf3Zf9Nm0Q05sH6kGx0Op2CPx1wTC8=
 modernc.org/fileutil v1.3.1/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
 modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
 modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
+modernc.org/libc v1.65.6 h1:OhJUhmuJ6MVZdqL5qmnd0/my46DKGFhSX4WOR7ijfyE=
+modernc.org/libc v1.65.6/go.mod h1:MOiGAM9lrMBT9L8xT1nO41qYl5eg9gCp9/kWhz5L7WA=
 modernc.org/libc v1.65.7 h1:Ia9Z4yzZtWNtUIuiPuQ7Qf7kxYrxP1/jeHZzG8bFu00=
 modernc.org/libc v1.65.7/go.mod h1:011EQibzzio/VX3ygj1qGFt5kMjP0lHb0qCW5/D/pQU=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
+modernc.org/memory v1.10.0 h1:fzumd51yQ1DxcOxSO+S6X7+QTuVU+n8/Aj7swYjFfC4=
+modernc.org/memory v1.10.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
 modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
 modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
--- a/backend/main.go
+++ b/backend/main.go
@@ -587,14 +587,9 @@ func start(ctx context.Context, config *ServerConfig) {
 	defer db.db.MustClose()

 	router := gin.Default()
-
-	corsConfig := cors.DefaultConfig()
-	corsConfig.AllowAllOrigins = true
-	router.Use(cors.New(corsConfig))
-
-	// Web endpoints
-	loadWebEndpoints(router)
-	// API endpoints
+	router.Use(cors.New(cors.Config{
+		AllowOrigins: []string{"*"},
+	}))
 	router.GET("/api/users", getUsers)
 	router.GET("/api/user/:userId", getUser)
 	router.POST("/api/user/:userId/history", postHistory)
--- a/backend/web.go
+++ b/backend/web.go
@@ -1,228 +0,0 @@
-package main
-
-import (
-	"errors"
-	"github.com/gin-gonic/gin"
-	"net/http"
-	"strconv"
-)
-
-type ViewModel struct {
-	Users       []User
-	CurrentUser int
-	Allowances  []Allowance
-	Tasks       []Task
-	History     []History
-	Error       string
-}
-
-func loadWebEndpoints(router *gin.Engine) {
-	router.LoadHTMLFiles("web.gohtml")
-	router.GET("/", renderIndex)
-	router.GET("/login", renderLogin)
-	router.POST("/createTask", renderCreateTask)
-	router.GET("/completeTask", renderCompleteTask)
-	router.POST("/createAllowance", renderCreateAllowance)
-	router.GET("/completeAllowance", renderCompleteAllowance)
-}
-
-func renderLogin(c *gin.Context) {
-	if c.Query("user") != "" {
-		c.SetCookie("user", c.Query("user"), 3600, "/", "localhost", false, true)
-	}
-	c.Redirect(http.StatusFound, "/")
-}
-
-func renderIndex(c *gin.Context) {
-	currentUser := getCurrentUser(c)
-	if currentUser == nil {
-		return
-	}
-	renderWithUser(c, *currentUser)
-}
-
-func renderCreateTask(c *gin.Context) {
-	currentUser := getCurrentUser(c)
-	if currentUser == nil {
-		return
-	}
-
-	name := c.PostForm("name")
-	rewardStr := c.PostForm("reward")
-	reward, err := strconv.Atoi(rewardStr)
-	if err != nil {
-		renderError(c, http.StatusBadRequest, err)
-		return
-	}
-	if name == "" || reward <= 0 {
-		renderError(c, http.StatusBadRequest, err)
-		return
-	}
-
-	_, err = db.CreateTask(&CreateTaskRequest{
-		Name:   name,
-		Reward: reward,
-	})
-	if err != nil {
-		renderError(c, http.StatusInternalServerError, err)
-		return
-	}
-
-	c.Redirect(http.StatusFound, "/")
-}
-
-func renderCompleteTask(c *gin.Context) {
-	taskIDStr := c.Query("task")
-	taskID, err := strconv.Atoi(taskIDStr)
-	if err != nil {
-		renderError(c, http.StatusBadRequest, err)
-		return
-	}
-
-	err = db.CompleteTask(taskID)
-	if err != nil {
-		renderError(c, http.StatusInternalServerError, err)
-		return
-	}
-
-	c.Redirect(http.StatusFound, "/")
-}
-
-func renderCreateAllowance(c *gin.Context) {
-	currentUser := getCurrentUser(c)
-	if currentUser == nil {
-		return
-	}
-
-	name := c.PostForm("name")
-	targetStr := c.PostForm("target")
-	target, err := strconv.Atoi(targetStr)
-	if err != nil {
-		renderError(c, http.StatusBadRequest, err)
-		return
-	}
-	weightStr := c.PostForm("weight")
-	weight, err := strconv.ParseFloat(weightStr, 64)
-	if err != nil {
-		renderError(c, http.StatusBadRequest, err)
-		return
-	}
-	if name == "" || target <= 0 || weight <= 0 {
-		renderError(c, http.StatusBadRequest, err)
-		return
-	}
-
-	_, err = db.CreateAllowance(*currentUser, &CreateAllowanceRequest{
-		Name:   name,
-		Target: target,
-		Weight: weight,
-	})
-	if err != nil {
-		renderError(c, http.StatusInternalServerError, err)
-		return
-	}
-
-	c.Redirect(http.StatusFound, "/")
-}
-
-func renderCompleteAllowance(c *gin.Context) {
-	currentUser := getCurrentUser(c)
-	if currentUser == nil {
-		return
-	}
-
-	allowanceIDStr := c.Query("allowance")
-	allowanceID, err := strconv.Atoi(allowanceIDStr)
-	if err != nil {
-		renderError(c, http.StatusBadRequest, err)
-		return
-	}
-
-	err = db.CompleteAllowance(*currentUser, allowanceID)
-	if err != nil {
-		renderError(c, http.StatusInternalServerError, err)
-		return
-	}
-
-	c.Redirect(http.StatusFound, "/")
-}
-
-func getCurrentUser(c *gin.Context) *int {
-	currentUserStr, err := c.Cookie("user")
-	if errors.Is(err, http.ErrNoCookie) {
-		renderNoUser(c)
-		return nil
-	}
-	if err != nil {
-		unsetUserCookie(c)
-		return nil
-	}
-	currentUser, err := strconv.Atoi(currentUserStr)
-	if err != nil {
-		unsetUserCookie(c)
-		return nil
-	}
-	userExists, err := db.UserExists(currentUser)
-	if !userExists || err != nil {
-		unsetUserCookie(c)
-		return nil
-	}
-	return &currentUser
-}
-
-func unsetUserCookie(c *gin.Context) {
-	c.SetCookie("user", "", -1, "/", "localhost", false, true)
-	c.Redirect(http.StatusFound, "/")
-}
-
-func renderNoUser(c *gin.Context) {
-	users, err := db.GetUsers()
-	if err != nil {
-		renderError(c, http.StatusInternalServerError, err)
-		return
-	}
-
-	c.HTML(http.StatusOK, "web.gohtml", ViewModel{
-		Users: users,
-	})
-}
-
-func renderWithUser(c *gin.Context, currentUser int) {
-	users, err := db.GetUsers()
-	if err != nil {
-		renderError(c, http.StatusInternalServerError, err)
-		return
-	}
-
-	allowances, err := db.GetUserAllowances(currentUser)
-	if err != nil {
-		renderError(c, http.StatusInternalServerError, err)
-		return
-	}
-
-	tasks, err := db.GetTasks()
-	if err != nil {
-		renderError(c, http.StatusInternalServerError, err)
-		return
-	}
-
-	history, err := db.GetHistory(currentUser)
-	if err != nil {
-		renderError(c, http.StatusInternalServerError, err)
-		return
-	}
-
-	c.HTML(http.StatusOK, "web.gohtml", ViewModel{
-		Users:       users,
-		CurrentUser: currentUser,
-		Allowances:  allowances,
-		Tasks:       tasks,
-		History:     history,
-	})
-}
-
-func renderError(c *gin.Context, statusCode int, err error) {
-	c.HTML(statusCode, "web.gohtml", ViewModel{
-		Error: err.Error(),
-	})
-}
--- a/backend/web.gohtml
+++ b/backend/web.gohtml
@@ -1,132 +0,0 @@
-{{- /*gotype: allowance_planner.ViewModel*/}}
-<html lang="en">
-<head>
-	<title>Allowance Planner 2000</title>
-	<style>
-		tr:hover {
-			background-color: #f0f0f0;
-		}
-	</style>
-</head>
-<body>
-<h1>Allowance Planner 2000</h1>
-
-{{if ne .Error ""}}
-	<h2>Error</h2>
-	<p>{{.Error}}</p>
-{{else}}
-	<h2>Users</h2>
-	{{range .Users}}
-		{{if eq $.CurrentUser .ID}}
-			<strong>{{.Name}}</strong>
-		{{else}}
-			<a href="/login?user={{.ID}}">{{.Name}}</a>
-		{{end}}
-	{{end}}
-
-	{{if ne .CurrentUser 0}}
-		<h2>Allowances</h2>
-		<form action="/createAllowance" method="post">
-			<table border="1">
-				<thead>
-				<tr>
-					<th>Name</th>
-					<th>Progress</th>
-					<th>Target</th>
-					<th>Weight</th>
-					<th>Actions</th>
-				</tr>
-				</thead>
-				<tbody>
-					<tr>
-						<td><label><input type="text" name="name" placeholder="Name"></label></td>
-						<td></td>
-						<td><label><input type="number" name="target" placeholder="Target"></label></td>
-						<td><label><input type="number" name="weight" placeholder="Weight"></label></td>
-						<td><button>Create</button></td>
-					</tr>
-				{{range .Allowances}}
-					{{if eq .ID 0}}
-						<tr>
-							<td>Total</td>
-							<td>{{.Progress}}</td>
-							<td></td>
-							<td>{{.Weight}}</td>
-						</tr>
-					{{else}}
-						<tr>
-							<td>{{.Name}}</td>
-							<td><progress max="{{.Target}}" value="{{.Progress}}"></progress> ({{.Progress}})</td>
-							<td>{{.Target}}</td>
-							<td>{{.Weight}}</td>
-                            {{if ge .Progress .Target}}
-								<td>
-									<a href="/completeAllowance?allowance={{.ID}}">Mark as completed</a>
-								</td>
-                            {{end}}
-						</tr>
-					{{end}}
-				{{end}}
-				</tbody>
-			</table>
-		</form>
-
-		<h2>Tasks</h2>
-		<form method="post" action="/createTask">
-			<table border="1">
-				<thead>
-				<tr>
-					<th>Name</th>
-					<th>Assigned</th>
-					<th>Reward</th>
-					<th>Actions</th>
-				</tr>
-				</thead>
-				<tbody>
-				{{range .Tasks}}
-					<tr>
-						<td>{{.Name}}</td>
-						<td>
-							{{if eq .Assigned nil}}
-								None
-							{{else}}
-								{{.Assigned}}
-							{{end}}
-						</td>
-						<td>{{.Reward}}</td>
-						<td>
-							<a href="/completeTask?task={{.ID}}">Mark as completed</a>
-						</td>
-					</tr>
-				{{end}}
-						<tr>
-							<td><label><input type="text" name="name" placeholder="Name"></label></td>
-							<td></td>
-							<td><label><input type="number" name="reward" placeholder="Reward"></label></td>
-							<td><button>Create</button></td>
-						</tr>
-				</tbody>
-			</table>
-		</form>
-
-		<h2>History</h2>
-		<table border="1">
-			<thead>
-			<tr>
-				<th>Timestamp</th>
-				<th>Allowance</th>
-			</tr>
-			</thead>
-			<tbody>
-			{{range .History}}
-				<tr>
-					<td>{{.Timestamp}}</td>
-					<td>{{.Allowance}}</td>
-				</tr>
-			{{end}}
-			</tbody>
-		</table>
-	{{end}}
-{{end}}
-</body>
-</html>
--- a/frontend/allowance-planner-v2/src/app/app-routing.module.ts
+++ b/frontend/allowance-planner-v2/src/app/app-routing.module.ts
@@ -11,7 +11,6 @@ const routes: Routes = [
    path: '',
    loadChildren: () => import('./pages/tabs/tabs.module').then(m => m.TabsPageModule)
  },
-
 ];
@NgModule({
  imports: [
--- a/frontend/allowance-planner-v2/src/app/app.module.ts
+++ b/frontend/allowance-planner-v2/src/app/app.module.ts
@@ -3,12 +3,11 @@ import { BrowserModule } from '@angular/platform-browser';
 import { RouteReuseStrategy } from '@angular/router';

 import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
-import { Drivers } from '@ionic/storage';
+import { Drivers, Storage } from '@ionic/storage';
 import { IonicStorageModule } from '@ionic/storage-angular';

 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
-import { ReactiveFormsModule } from '@angular/forms';

@NgModule({
  declarations: [AppComponent],
@@ -16,7 +15,6 @@ import { ReactiveFormsModule } from '@angular/forms';
    BrowserModule,
    IonicModule.forRoot(),
    AppRoutingModule,
-    ReactiveFormsModule,
    IonicStorageModule.forRoot({
      name: '__mydb',
      driverOrder: [Drivers.IndexedDB, Drivers.LocalStorage]
--- a/frontend/allowance-planner-v2/src/app/models/task.ts
+++ b/frontend/allowance-planner-v2/src/app/models/task.ts
@@ -2,5 +2,5 @@ export interface Task {
    id: number;
    name: string;
    reward: number;
-    assigned: number | null;
+    assigned: number;
 }
--- a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task-routing.module.ts
+++ b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task-routing.module.ts
@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { EditTaskPage } from './edit-task.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: EditTaskPage,
-  }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class EditTaskPageRoutingModule {}
--- a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.module.ts
+++ b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.module.ts
@@ -1,21 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { IonicModule } from '@ionic/angular';
-
-import { EditTaskPageRoutingModule } from './edit-task-routing.module';
-
-import { EditTaskPage } from './edit-task.page';
-
-@NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    EditTaskPageRoutingModule,
-    ReactiveFormsModule
-  ],
-  declarations: [EditTaskPage]
-})
-export class EditTaskPageModule {}
--- 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,33 +0,0 @@
-<ion-header [translucent]="true">
-  <ion-toolbar>
-    <div class="toolbar">
-      <ion-title *ngIf="isAddMode">Create Task</ion-title>
-      <ion-title *ngIf="!isAddMode">Edit Task</ion-title>
-      <button
-        *ngIf="!isAddMode"
-        class="remove-button"
-        (click)="deleteTask()"
-      >Delete task</button>
-    </div>
-  </ion-toolbar>
-</ion-header>
-
-<ion-content [fullscreen]="true">
-  <form [formGroup]="form">
-    <label>Task Name</label>
-    <input id="name" type="text" formControlName="name"/>
-
-    <label>Reward</label>
-    <input id="name" type="number" formControlName="reward"/>
-
-    <label>Assigned</label>
-    <select formControlName="assigned">
-      <option *ngFor="let user of users" [value]="user.id">{{ user.name }}</option>
-    </select>
-
-    <button type="button" [disabled]="!form.valid" (click)="submit()">
-      <span *ngIf="isAddMode">Add Task</span>
-      <span *ngIf="!isAddMode">Update Task</span>
-    </button>
-  </form>
-</ion-content>
--- 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,45 +0,0 @@
-.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;
-    align-items: center;
-    height: 100%;
-}
-
-label {
-    color: var(--ion-color-primary);
-    margin-top: 25px;
-    margin-bottom: 10px;
-}
-
-input,
-select {
-    border: 1px solid var(--ion-color-primary);
-    border-radius: 5px;
-    width: 250px;
-}
-
-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;
-}
--- a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.spec.ts
+++ b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.spec.ts
@@ -1,17 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { EditTaskPage } from './edit-task.page';
-
-describe('EditTaskPage', () => {
-  let component: EditTaskPage;
-  let fixture: ComponentFixture<EditTaskPage>;
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EditTaskPage);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
--- 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
@@ -1,80 +0,0 @@
-import { Location } from '@angular/common';
-import { Component, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import { User } from 'src/app/models/user';
-import { TaskService } from 'src/app/services/task.service';
-import { UserService } from 'src/app/services/user.service';
-
-@Component({
-  selector: 'app-edit-task',
-  templateUrl: './edit-task.page.html',
-  styleUrls: ['./edit-task.page.scss'],
-  standalone: false,
-})
-export class EditTaskPage implements OnInit {
-  form: FormGroup;
-  id: number;
-  isAddMode: boolean;
-  users: Array<User> = [{id: 0, name: 'unassigned'}];
-
-  constructor(
-    private route: ActivatedRoute,
-    private formBuilder: FormBuilder,
-    private taskService: TaskService,
-    private userService: UserService,
-    private router: Router
-  ) {
-    this.id = this.route.snapshot.params['id'];
-    this.isAddMode = !this.id;
-
-    this.form = this.formBuilder.group({
-      name: ['', Validators.required],
-      reward: ['', [Validators.required, Validators.pattern("^[0-9]*$")]],
-      assigned: [0, Validators.required]
-    });
-  }
-
-  ngOnInit() {
-    this.userService.getUserList().subscribe(users => {
-      this.users.push(...users);
-    });
-
-    if (!this.isAddMode) {
-      this.taskService.getTaskById(this.id).subscribe(task => {
-        this.form.setValue({
-          name: task.name,
-          reward: task.reward,
-          assigned: task.assigned !== null ? task.assigned : 0
-        });
-      });
-    }
-  }
-
-  submit() {
-    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
-    }
-
-    if (this.isAddMode) {
-      this.taskService.createTask(task);
-    } else {
-      this.taskService.updateTask(this.id, task);
-    }
-
-    this.router.navigate(['/tabs/tasks']);
-  }
-
-  deleteTask() {
-    this.taskService.deleteTask(this.id);
-    this.router.navigate(['/tabs/tasks']);
-  }
-}
--- a/frontend/allowance-planner-v2/src/app/pages/tabs/tabs-routing.module.ts
+++ b/frontend/allowance-planner-v2/src/app/pages/tabs/tabs-routing.module.ts
@@ -17,7 +17,7 @@ const routes: Routes = [
      },
      {
        path: 'tasks',
-        loadChildren: () => import('../tasks/tasks.module').then(m => m.TasksPageModule),
+        loadChildren: () => import('../tasks/tasks.module').then(m => m.TasksPageModule)
      },
      {
        path: '',
--- a/frontend/allowance-planner-v2/src/app/pages/tasks/tasks-routing.module.ts
+++ b/frontend/allowance-planner-v2/src/app/pages/tasks/tasks-routing.module.ts
@@ -6,9 +6,7 @@ const routes: Routes = [
  {
    path: '',
    component: TasksPage,
-  },
-  { path: 'add', loadChildren: () => import('../edit-task/edit-task.module').then(m => m.EditTaskPageModule) },
-  { path: 'edit/:id', loadChildren: () => import('../edit-task/edit-task.module').then(m => m.EditTaskPageModule) }
+  }
 ];

@NgModule({
--- a/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.html
+++ b/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.html
@@ -1,30 +1,23 @@
 <ion-header [translucent]="true" class="ion-no-border">
  <ion-toolbar>
-    <div class="toolbar">
-      <ion-title>
-        Tasks
-      </ion-title>
-      <button class="add-button" (click)="createTask()">Add task</button>
-    </div>
+    <ion-title>
+      Tasks
+    </ion-title>
  </ion-toolbar>
 </ion-header>

 <ion-content>
-  <div class="content">
-    <div class="icon">
-      <mat-icon>filter_alt</mat-icon>
-    </div>
-    <div class="list">
-      <div class="task" *ngFor="let task of tasks$ | async">
-        <button (click)="completeTask(task.id)">Done</button>
-        <div (click)="updateTask(task.id)" class="item">
-          <div class="name">{{ task.name }}</div>
-          <div
-            class="reward"
-            [ngClass]="{ 'negative': task.reward < 0 }"
-          >{{ task.reward.toFixed(2) }} SP</div>
-        </div>
-      </div>
+  <div class="icon">
+    <mat-icon>filter_alt</mat-icon>
+  </div>
+  <div class="list">
+    <div class="task" *ngFor="let task of tasks">
+      <button>Done</button>
+      <div class="name">{{ task.name }}</div>
+      <div
+        class="reward"
+        [ngClass]="{ 'negative': task.reward < 0 }"
+      >{{ task.reward.toFixed(2) }} SP</div>
    </div>
  </div>
 </ion-content>
--- a/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.scss
+++ b/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.scss
@@ -1,13 +1,3 @@
-.toolbar {
-    display: flex;
-}
-
-.content {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-}
-
 .icon {
    padding: 5px;
    display: flex;
@@ -33,13 +23,6 @@ mat-icon {
    padding: 5px;
 }

-.item {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    width: 100%;
-}
-
 .name {
    margin-left: 10px;
    color: var(--font-color);
@@ -61,10 +44,4 @@ button {
    border-radius: 10px;
    color: white;
    background: var(--confirm-button-color);
-}
-
-.add-button {
-    background-color: var(--ion-color-primary);
-    margin-right: 15px;
-    width: 75px;
 }
--- a/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts
+++ b/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.ts
@@ -1,50 +1,24 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { TaskService } from 'src/app/services/task.service';
 import { Task } from 'src/app/models/task';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BehaviorSubject } from 'rxjs';
-import { ViewWillEnter } from '@ionic/angular';

@Component({
  selector: 'app-tasks',
  templateUrl: 'tasks.page.html',
  styleUrls: ['tasks.page.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
  standalone: false,
 })
-export class TasksPage implements ViewWillEnter {
-  public tasks$: BehaviorSubject<Array<Task>> = new BehaviorSubject<Array<Task>>([]);
+export class TasksPage implements OnInit {
+  public tasks: Array<Task> = [];

  constructor(
-    private taskService: TaskService,
-    private router: Router,
-    private route: ActivatedRoute
-  ) {
-    this.getTasks();
+    private taskService: TaskService
+  ) {}
+
+  ngOnInit(): void {
+    this.taskService.getTaskList().subscribe(tasks => {
+      this.tasks = tasks;
+    });
  }

-  ionViewWillEnter(): void {
-    this.getTasks();
-  }
-
-  getTasks() {
-    setTimeout(() => {
-      this.taskService.getTaskList().subscribe(tasks => {
-        this.tasks$.next(tasks);
-      });
-    }, 10);
-  }
-
-  createTask() {
-    this.router.navigate(['add'], { relativeTo: this.route });
-  }
-
-  updateTask(id: number) {
-    this.router.navigate(['edit', id], { relativeTo: this.route });
-  }
-
-  completeTask(id: number) {
-    this.taskService.completeTask(id);
-    this.getTasks();
-  }
 }
--- a/frontend/allowance-planner-v2/src/app/services/task.service.ts
+++ b/frontend/allowance-planner-v2/src/app/services/task.service.ts
@@ -7,31 +7,10 @@ import { Task } from '../models/task';
    providedIn: 'root'
 })
 export class TaskService {
-    private url = 'http://localhost:8080/api';
-
+    private url = 'http://localhost:8080/api'
    constructor(private http: HttpClient) {}

    getTaskList(): Observable<Array<Task>> {
        return this.http.get<Task[]>(`${this.url}/tasks`);
    }
-
-    getTaskById(taskId: number): Observable<Task> {
-        return this.http.get<Task>(`${this.url}/task/${taskId}`);
-    }
-
-    createTask(task: Partial<Task>) {
-        this.http.post(`${this.url}/tasks`, task).subscribe();
-    }
-
-    updateTask(id: number, task: Partial<Task>) {
-        this.http.put(`${this.url}/task/${id}`, task).subscribe();
-    }
-
-    completeTask(id: number) {
-        this.http.post(`${this.url}/task/${id}/complete`, {}).subscribe();
-    }
-
-    deleteTask(id: number) {
-        this.http.delete(`${this.url}/task/${id}`).subscribe();
-    }
 }
Author	SHA1	Message	Date
Sebastiaan de Schaetzen	b2f532fa22	Add post allowance complete	2025-05-18 09:21:28 +02:00
Sebastiaan de Schaetzen	b56738653d	Add complete task test with sum of weights == 0	2025-05-18 09:01:48 +02:00
Sebastiaan de Schaetzen	5d803bb01c	Add complete allowance endpoint	2025-05-18 08:45:15 +02:00
Sebastiaan de Schaetzen	2620d6ee47	Use default database file if none is specified	2025-05-18 08:44:46 +02:00
Sebastiaan de Schaetzen	74536bd49d	Add invalid id test	2025-05-18 08:32:33 +02:00