From d8c487d358bbeeaa69c9b815caaee86ec4640a0f Mon Sep 17 00:00:00 2001 From: Ochieng Paul Date: Thu, 18 Jan 2024 19:52:31 +0300 Subject: [PATCH] worked on issues raised in the feedback --- .../budget-summary/budget-summary.component.scss | 15 ++++++++------- .../budget-summary/budget-summary.component.ts | 13 +++++++------ .../src/app/components/budget-tool.components.ts | 2 ++ .../components/list-item/budget-list-item.html | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/apps/picsa-tools/budget-tool/src/app/components/budget-summary/budget-summary.component.scss b/apps/picsa-tools/budget-tool/src/app/components/budget-summary/budget-summary.component.scss index 98d175b4f..9e30539ce 100644 --- a/apps/picsa-tools/budget-tool/src/app/components/budget-summary/budget-summary.component.scss +++ b/apps/picsa-tools/budget-tool/src/app/components/budget-summary/budget-summary.component.scss @@ -2,13 +2,9 @@ display: flex; flex-direction: column; justify-content: flex-start; - margin-bottom: 1.2rem; - h2 { + h3 { margin: 0 0 0.5rem 0; - padding: 0; - font-size: 1rem; - color: #000; } .summary-list { @@ -19,11 +15,16 @@ align-items: flex-start; p { + display: flex; + flex-direction: row; + align-items: center; margin: 0; padding: 0; - font-size: 1rem; font-weight: 400; - color: #000; + + .mat-icon { + font-size: 1.2rem; + } } } } diff --git a/apps/picsa-tools/budget-tool/src/app/components/budget-summary/budget-summary.component.ts b/apps/picsa-tools/budget-tool/src/app/components/budget-summary/budget-summary.component.ts index cea1a9e40..0e486bdeb 100644 --- a/apps/picsa-tools/budget-tool/src/app/components/budget-summary/budget-summary.component.ts +++ b/apps/picsa-tools/budget-tool/src/app/components/budget-summary/budget-summary.component.ts @@ -4,22 +4,23 @@ import { Component, Input, OnInit } from '@angular/core'; selector: 'budget-summary', template: `
-

Details

+

Details

- TFLH: {{ totalFamilyLabourHours }} + groups: {{ totalFamilyLabourHours }}

- TIV: {{ totalInputsValue }} + receipt : {{ totalInputsValue }}

- TOV: {{ totalOutputsValue }} + monetization_on: {{ totalOutputsValue }}

- TPC: {{ totalProduceConsumed }} + restaurant_menu + : {{ totalProduceConsumed }}

- FCB: {{ finalCashBalance }} + account_balance_wallet: {{ finalCashBalance }}

diff --git a/apps/picsa-tools/budget-tool/src/app/components/budget-tool.components.ts b/apps/picsa-tools/budget-tool/src/app/components/budget-tool.components.ts index cac04eb18..97df18330 100644 --- a/apps/picsa-tools/budget-tool/src/app/components/budget-tool.components.ts +++ b/apps/picsa-tools/budget-tool/src/app/components/budget-tool.components.ts @@ -31,6 +31,7 @@ import { BudgetShareDialogComponent } from './share-dialog/share-dialog.componen import { BudgetPeriodSummaryComponent } from './summary/period-summary'; import { BudgetTableComponent } from './table/budget-table'; import { BudgetSummaryComponent } from './budget-summary/budget-summary.component'; +import { MatIconModule } from '@angular/material/icon'; const components = [ BudgetBalanceLegendComponent, @@ -69,6 +70,7 @@ const components = [ PicsaDbModule, RouterModule, MatTooltipModule, + MatIconModule, ], exports: components, }) diff --git a/apps/picsa-tools/budget-tool/src/app/components/list-item/budget-list-item.html b/apps/picsa-tools/budget-tool/src/app/components/list-item/budget-list-item.html index 8a3c925f4..b74304f91 100644 --- a/apps/picsa-tools/budget-tool/src/app/components/list-item/budget-list-item.html +++ b/apps/picsa-tools/budget-tool/src/app/components/list-item/budget-list-item.html @@ -4,7 +4,7 @@
{{ budget.meta.title }} {{ budget.meta.description }} - + {{ budget._created | date }}