diff --git a/frontend/allowance-planner-v2/src/app/models/allowance.ts b/frontend/allowance-planner-v2/src/app/models/allowance.ts index 689e9f5..3a79190 100644 --- a/frontend/allowance-planner-v2/src/app/models/allowance.ts +++ b/frontend/allowance-planner-v2/src/app/models/allowance.ts @@ -6,4 +6,5 @@ export interface Allowance { progress: number; // Can be any positive number (backend checks for number relative to each other) weight: number; + colour: string; } \ No newline at end of file diff --git a/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.html b/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.html index 1c0e4a3..6d7d458 100644 --- a/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.html +++ b/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.html @@ -11,7 +11,7 @@
@@ -19,13 +19,19 @@
{{ goal.progress }} SP
- +
-
Other goal: {{ goal.name }}
+
{{ goal.name }}
+
{{ goal.progress }} / {{ goal.target }} SP
+
+ + + +
diff --git a/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.scss b/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.scss index 77fd9c6..19579a0 100644 --- a/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.scss +++ b/frontend/allowance-planner-v2/src/app/pages/allowance/allowance.page.scss @@ -46,6 +46,11 @@ button { font-size: 16px; } +button:disabled, +button[disabled]{ + opacity: 0.5; +} + .add-button { background-color: var(--confirm-button-color); } 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 186e867..d9ce1ef 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 @@ -43,4 +43,8 @@ export class AllowancePage { }) }, 10); } + + canFinishGoal(allowance: Allowance): boolean { + return allowance.progress >= allowance.target; + } }