diff --git a/backend/allowance_planner.db3.backup.3 b/backend/allowance_planner.db3.backup.3 new file mode 100644 index 0000000..b7a3e07 Binary files /dev/null and b/backend/allowance_planner.db3.backup.3 differ diff --git a/frontend/allowance-planner-v2/src/app/models/history.ts b/frontend/allowance-planner-v2/src/app/models/history.ts index 51cb06a..f58f955 100644 --- a/frontend/allowance-planner-v2/src/app/models/history.ts +++ b/frontend/allowance-planner-v2/src/app/models/history.ts @@ -1,4 +1,5 @@ export interface History { timestamp: string; allowance: number; + description: string; } \ No newline at end of file diff --git a/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.ts b/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.ts index c0b0971..dc85c17 100644 --- a/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.ts +++ b/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.ts @@ -32,6 +32,7 @@ export class AllowancePage implements ViewWillEnter { getAllowance() { setTimeout(() => { this.allowanceService.getAllowanceList(this.id).subscribe(allowance => { + console.log(allowance) allowance[0].colour = '#9C4BE4'; allowance[0].name = 'Main Allowance'; this.allowance$.next(allowance); 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 27d6fa5..8004129 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 @@ -10,11 +10,11 @@