Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/improve allocations page (#1813)

Thomas Kaul7b39b3229367
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00e3ef9cb7..f18162ea1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Improved the loading state of the value component on the allocations page
- Improved the value component by always showing the label (also while loading)
- Improved the language localization for German (`de`)
diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
index b7a6316255..6ffe53cc03 100644
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts
@@ -198,6 +198,8 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
this.changeDetectorRef.markForCheck();
}
});
+
+ this.initialize();
}
public initialize() {
@@ -217,15 +219,15 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
this.markets = {
developedMarkets: {
name: 'developedMarkets',
- value: 0
+ value: undefined
},
emergingMarkets: {
name: 'emergingMarkets',
- value: 0
+ value: undefined
},
otherMarkets: {
name: 'otherMarkets',
- value: 0
+ value: undefined
}
};
this.positions = {};
@@ -281,6 +283,16 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {
// Prepare analysis data by continents, countries and sectors except for cash
if (position.countries.length > 0) {
+ if (!this.markets.developedMarkets.value) {
+ this.markets.developedMarkets.value = 0;
+ }
+ if (!this.markets.emergingMarkets.value) {
+ this.markets.emergingMarkets.value = 0;
+ }
+ if (!this.markets.otherMarkets.value) {
+ this.markets.otherMarkets.value = 0;
+ }
+
this.markets.developedMarkets.value +=
position.markets.developedMarkets * position.value;
this.markets.emergingMarkets.value +=