Skip to content

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

Feature/improve portfolio evolution chart (#1362)

Thomas Kaul9ff8cd547139
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 747a7c2432..90d9d443df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Persisted the language on url change
+- Improved the portfolio evolution chart
- Removed the data source type `RAKUTEN`
## 1.204.1 - 15.10.2022
diff --git a/apps/client/src/app/components/investment-chart/investment-chart.component.ts b/apps/client/src/app/components/investment-chart/investment-chart.component.ts
index cebc0f1460..032db911a6 100644
--- a/apps/client/src/app/components/investment-chart/investment-chart.component.ts
+++ b/apps/client/src/app/components/investment-chart/investment-chart.component.ts
@@ -46,11 +46,11 @@ import { addDays, format, isAfter, parseISO, subDays } from 'date-fns';
styleUrls: ['./investment-chart.component.scss']
})
export class InvestmentChartComponent implements OnChanges, OnDestroy {
- @Input() benchmarkDataItems: LineChartItem[] = [];
+ @Input() benchmarkDataItems: InvestmentItem[] = [];
@Input() currency: string;
@Input() daysInMarket: number;
@Input() groupBy: GroupBy;
- @Input() investments: InvestmentItem[];
+ @Input() historicalDataItems: LineChartItem[] = [];
@Input() isInPercent = false;
@Input() locale: string;
@Input() range: DateRange = 'max';
@@ -81,7 +81,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
}
public ngOnChanges() {
- if (this.benchmarkDataItems && this.investments) {
+ if (this.benchmarkDataItems && this.historicalDataItems) {
this.initialize();
}
}
@@ -94,7 +94,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
this.isLoading = true;
// Create a clone
- this.data = this.investments.map((a) => Object.assign({}, a));
+ this.data = this.benchmarkDataItems.map((item) => Object.assign({}, item));
if (!this.groupBy && this.data?.length > 0) {
if (this.range === 'max') {
@@ -122,14 +122,14 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
}
const data = {
- labels: this.benchmarkDataItems.map(({ date }) => {
+ labels: this.historicalDataItems.map(({ date }) => {
return parseDate(date);
}),
datasets: [
{
- backgroundColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
- borderColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
- borderWidth: this.groupBy ? 0 : 2,
+ backgroundColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
+ borderColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
+ borderWidth: this.groupBy ? 0 : 1,
data: this.data.map(({ date, investment }) => {
return {
x: parseDate(date),
@@ -141,16 +141,16 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
borderColor: (context: unknown) =>
this.isInFuture(
context,
- `rgba(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b}, 0.67)`
+ `rgba(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b}, 0.67)`
),
borderDash: (context: unknown) => this.isInFuture(context, [2, 2])
},
stepped: true
},
{
- borderColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
- borderWidth: 1,
- data: this.benchmarkDataItems.map(({ date, value }) => {
+ borderColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
+ borderWidth: 2,
+ data: this.historicalDataItems.map(({ date, value }) => {
return {
x: parseDate(date),
y: this.isInPercent ? value * 100 : value
@@ -192,13 +192,13 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
annotations: {
savingsRate: this.savingsRate
? {
- borderColor: `rgba(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b}, 0.75)`,
+ borderColor: `rgba(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b}, 0.75)`,
borderWidth: 1,
label: {
- backgroundColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
+ backgroundColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
borderRadius: 2,
color: 'white',
- content: 'Savings Rate',
+ content: $localize`Savings Rate`,
display: true,
font: { size: '10px', weight: 'normal' },
padding: {
diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
index f4624414fe..8161c7a37d 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html
@@ -119,10 +119,10 @@
<div class="chart-container">
<gf-investment-chart
class="h-100"
- [benchmarkDataItems]="performanceDataItems"
+ [benchmarkDataItems]="investments"
[currency]="user?.settings?.baseCurrency"
[daysInMarket]="daysInMarket"
- [investments]="investments"
+ [historicalDataItems]="performanceDataItems"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[locale]="user?.settings?.locale"
[range]="user?.settings?.dateRange"
@@ -155,9 +155,9 @@
<gf-investment-chart
class="h-100"
groupBy="month"
+ [benchmarkDataItems]="investmentsByMonth"
[currency]="user?.settings?.baseCurrency"
[daysInMarket]="daysInMarket"
- [investments]="investmentsByMonth"
[isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
[locale]="user?.settings?.locale"
[range]="user?.settings?.dateRange"
diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf
index 0de31b1cd4..a06eed8a44 100644
--- a/apps/client/src/locales/messages.de.xlf
+++ b/apps/client/src/locales/messages.de.xlf
@@ -2729,6 +2729,14 @@
<context context-type="linenumber">112</context>
</context-group>
</trans-unit>
+ <trans-unit id="8192718423057883427" datatype="html">
+ <source>Savings Rate</source>
+ <target state="translated">Sparrate</target>
+ <context-group purpose="location">
+ <context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>
+ <context context-type="linenumber">201</context>
+ </context-group>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf
index 4936311057..709a11a1da 100644
--- a/apps/client/src/locales/messages.es.xlf
+++ b/apps/client/src/locales/messages.es.xlf
@@ -2730,6 +2730,14 @@
<context context-type="linenumber">112</context>
</context-group>
</trans-unit>
+ <trans-unit id="8192718423057883427" datatype="html">
+ <source>Savings Rate</source>
+ <target state="translated">Tasa de ahorro</target>
+ <context-group purpose="location">
+ <context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>
+ <context context-type="linenumber">201</context>
+ </context-group>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf
index 3170073ac4..bb7d895aa4 100644
--- a/apps/client/src/locales/messages.it.xlf
+++ b/apps/client/src/locales/messages.it.xlf
@@ -2730,6 +2730,14 @@
<context context-type="linenumber">112</context>
</context-group>
</trans-unit>
+ <trans-unit id="8192718423057883427" datatype="html">
+ <source>Savings Rate</source>
+ <target state="translated">Tasso di risparmio</target>
+ <context-group purpose="location">
+ <context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>
+ <context context-type="linenumber">201</context>
+ </context-group>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf
index bb45a5fd96..55e89278e3 100644
--- a/apps/client/src/locales/messages.nl.xlf
+++ b/apps/client/src/locales/messages.nl.xlf
@@ -2729,6 +2729,14 @@
<context context-type="linenumber">112</context>
</context-group>
</trans-unit>
+ <trans-unit id="8192718423057883427" datatype="html">
+ <source>Savings Rate</source>
+ <target state="translated">Spaarquote</target>
+ <context-group purpose="location">
+ <context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>
+ <context context-type="linenumber">201</context>
+ </context-group>
+ </trans-unit>
</body>
</file>
</xliff>
diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf
index a9003dc114..2424ad009a 100644
--- a/apps/client/src/locales/messages.xlf
+++ b/apps/client/src/locales/messages.xlf
@@ -2438,6 +2438,13 @@
<context context-type="linenumber">112</context>
</context-group>
</trans-unit>
+ <trans-unit id="8192718423057883427" datatype="html">
+ <source>Savings Rate</source>
+ <context-group purpose="location">
+ <context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>
+ <context context-type="linenumber">201</context>
+ </context-group>
+ </trans-unit>
</body>
</file>
</xliff>