From b12349a1484ce5ee4a6a1bf8581d91c8fce9b37a Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:37:04 +0200 Subject: [PATCH] Feature/add support for interest on account level (#2354) * Add support for interest * Update changelog --- CHANGELOG.md | 4 + apps/api/src/app/export/export.service.ts | 5 +- apps/api/src/app/order/order.service.ts | 8 +- .../src/app/portfolio/portfolio.service.ts | 209 ++++++++---------- .../portfolio-summary.component.html | 12 + ...ate-or-update-activity-dialog.component.ts | 16 +- .../create-or-update-activity-dialog.html | 15 +- apps/client/src/locales/messages.de.xlf | 175 +++++++++------ apps/client/src/locales/messages.es.xlf | 170 ++++++++------ apps/client/src/locales/messages.fr.xlf | 170 ++++++++------ apps/client/src/locales/messages.it.xlf | 170 ++++++++------ apps/client/src/locales/messages.nl.xlf | 170 ++++++++------ apps/client/src/locales/messages.pt.xlf | 170 ++++++++------ apps/client/src/locales/messages.xlf | 168 ++++++++------ .../interfaces/portfolio-summary.interface.ts | 1 + .../activities-table.component.html | 8 +- .../activities-table.component.scss | 4 + .../activities-table.component.ts | 9 +- libs/ui/src/lib/i18n.ts | 1 + .../migration.sql | 2 + prisma/schema.prisma | 1 + 21 files changed, 859 insertions(+), 629 deletions(-) create mode 100644 prisma/migrations/20230918204124_added_interest_to_order_type/migration.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e52fd354..13b448d53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Added + +- Added support for interest on account level (experimental) + ### Changed - Improved the preselected currency based on the account's currency in the create or edit activity dialog diff --git a/apps/api/src/app/export/export.service.ts b/apps/api/src/app/export/export.service.ts index f717a3ead..2134a6520 100644 --- a/apps/api/src/app/export/export.service.ts +++ b/apps/api/src/app/export/export.service.ts @@ -78,7 +78,10 @@ export class ExportService { dataSource: SymbolProfile.dataSource, date: date.toISOString(), symbol: - type === 'FEE' || type === 'ITEM' || type === 'LIABILITY' + type === 'FEE' || + type === 'INTEREST' || + type === 'ITEM' || + type === 'LIABILITY' ? SymbolProfile.name : SymbolProfile.symbol }; diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index 13709fad1..3c20f9ba0 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -99,6 +99,7 @@ export class OrderService { if ( data.type === 'FEE' || + data.type === 'INTEREST' || data.type === 'ITEM' || data.type === 'LIABILITY' ) { @@ -155,7 +156,10 @@ export class OrderService { const orderData: Prisma.OrderCreateInput = data; const isDraft = - data.type === 'FEE' || data.type === 'ITEM' || data.type === 'LIABILITY' + data.type === 'FEE' || + data.type === 'INTEREST' || + data.type === 'ITEM' || + data.type === 'LIABILITY' ? false : isAfter(data.date as Date, endOfToday()); @@ -203,6 +207,7 @@ export class OrderService { if ( order.type === 'FEE' || + order.type === 'INTEREST' || order.type === 'ITEM' || order.type === 'LIABILITY' ) { @@ -378,6 +383,7 @@ export class OrderService { if ( data.type === 'FEE' || + data.type === 'INTEREST' || data.type === 'ITEM' || data.type === 'LIABILITY' ) { diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 6deda49b7..228ab18f6 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -56,12 +56,11 @@ import { Platform, Prisma, Tag, - Type as TypeOfOrder + Type as ActivityType } from '@prisma/client'; import Big from 'big.js'; import { differenceInDays, - endOfToday, format, isAfter, isBefore, @@ -1342,36 +1341,6 @@ export class PortfolioService { return cashPositions; } - private getDividend({ - activities, - date = new Date(0), - userCurrency - }: { - activities: OrderWithAccount[]; - date?: Date; - userCurrency: string; - }) { - return activities - .filter((activity) => { - // Filter out all activities before given date (drafts) and type dividend - return ( - isBefore(date, new Date(activity.date)) && - activity.type === TypeOfOrder.DIVIDEND - ); - }) - .map(({ quantity, SymbolProfile, unitPrice }) => { - return this.exchangeRateDataService.toCurrency( - new Big(quantity).mul(unitPrice).toNumber(), - SymbolProfile.currency, - userCurrency - ); - }) - .reduce( - (previous, current) => new Big(previous).plus(current), - new Big(0) - ); - } - private getDividendsByGroup({ dividends, groupBy @@ -1516,52 +1485,6 @@ export class PortfolioService { }; } - private getItems(activities: OrderWithAccount[], date = new Date(0)) { - return activities - .filter((activity) => { - // Filter out all activities before given date (drafts) and type item - return ( - isBefore(date, new Date(activity.date)) && - activity.type === TypeOfOrder.ITEM - ); - }) - .map(({ quantity, SymbolProfile, unitPrice }) => { - return this.exchangeRateDataService.toCurrency( - new Big(quantity).mul(unitPrice).toNumber(), - SymbolProfile.currency, - this.request.user.Settings.settings.baseCurrency - ); - }) - .reduce( - (previous, current) => new Big(previous).plus(current), - new Big(0) - ); - } - - private getLiabilities({ - activities, - userCurrency - }: { - activities: OrderWithAccount[]; - userCurrency: string; - }) { - return activities - .filter(({ type }) => { - return type === TypeOfOrder.LIABILITY; - }) - .map(({ quantity, SymbolProfile, unitPrice }) => { - return this.exchangeRateDataService.toCurrency( - new Big(quantity).mul(unitPrice).toNumber(), - SymbolProfile.currency, - userCurrency - ); - }) - .reduce( - (previous, current) => new Big(previous).plus(current), - new Big(0) - ); - } - private getStartDate(aDateRange: DateRange, portfolioStart: Date) { switch (aDateRange) { case '1d': @@ -1650,9 +1573,10 @@ export class PortfolioService { return account?.isExcluded ?? false; }); - const dividend = this.getDividend({ + const dividend = this.getSumOfActivityType({ activities, - userCurrency + userCurrency, + activityType: 'DIVIDEND' }).toNumber(); const emergencyFund = new Big( Math.max( @@ -1662,23 +1586,49 @@ export class PortfolioService { ); const fees = this.getFees({ activities, userCurrency }).toNumber(); const firstOrderDate = activities[0]?.date; - const items = this.getItems(activities).toNumber(); - const liabilities = this.getLiabilities({ + const interest = this.getSumOfActivityType({ + activities, + userCurrency, + activityType: 'INTEREST' + }).toNumber(); + const items = this.getSumOfActivityType({ activities, - userCurrency + userCurrency, + activityType: 'ITEM' + }).toNumber(); + const liabilities = this.getSumOfActivityType({ + activities, + userCurrency, + activityType: 'LIABILITY' }).toNumber(); - const totalBuy = this.getTotalByType(activities, userCurrency, 'BUY'); - const totalSell = this.getTotalByType(activities, userCurrency, 'SELL'); + const totalBuy = this.getSumOfActivityType({ + activities, + userCurrency, + activityType: 'BUY' + }).toNumber(); + const totalSell = this.getSumOfActivityType({ + activities, + userCurrency, + activityType: 'SELL' + }).toNumber(); const cash = new Big(balanceInBaseCurrency) .minus(emergencyFund) .plus(emergencyFundPositionsValueInBaseCurrency) .toNumber(); const committedFunds = new Big(totalBuy).minus(totalSell); - const totalOfExcludedActivities = new Big( - this.getTotalByType(excludedActivities, userCurrency, 'BUY') - ).minus(this.getTotalByType(excludedActivities, userCurrency, 'SELL')); + const totalOfExcludedActivities = this.getSumOfActivityType({ + userCurrency, + activities: excludedActivities, + activityType: 'BUY' + }).minus( + this.getSumOfActivityType({ + userCurrency, + activities: excludedActivities, + activityType: 'SELL' + }) + ); const cashDetailsWithExcludedAccounts = await this.accountService.getCashDetails({ @@ -1725,6 +1675,7 @@ export class PortfolioService { excludedAccountsAndActivities, fees, firstOrderDate, + interest, items, liabilities, netWorth, @@ -1747,6 +1698,39 @@ export class PortfolioService { }; } + private getSumOfActivityType({ + activities, + activityType, + date = new Date(0), + userCurrency + }: { + activities: OrderWithAccount[]; + activityType: ActivityType; + date?: Date; + userCurrency: string; + }) { + return activities + .filter((activity) => { + // Filter out all activities before given date (drafts) and + // activity type + return ( + isBefore(date, new Date(activity.date)) && + activity.type === activityType + ); + }) + .map(({ quantity, SymbolProfile, unitPrice }) => { + return this.exchangeRateDataService.toCurrency( + new Big(quantity).mul(unitPrice).toNumber(), + SymbolProfile.currency, + userCurrency + ); + }) + .reduce( + (previous, current) => new Big(previous).plus(current), + new Big(0) + ); + } + private async getTransactionPoints({ filters, includeDrafts = false, @@ -1818,6 +1802,21 @@ export class PortfolioService { }; } + private getUserCurrency(aUser: UserWithSettings) { + return ( + aUser.Settings?.settings.baseCurrency ?? + this.request.user?.Settings?.settings.baseCurrency ?? + DEFAULT_CURRENCY + ); + } + + private async getUserId(aImpersonationId: string, aUserId: string) { + const impersonationUserId = + await this.impersonationService.validateImpersonationId(aImpersonationId); + + return impersonationUserId || aUserId; + } + private async getValueOfAccountsAndPlatforms({ filters = [], orders, @@ -1961,38 +1960,4 @@ export class PortfolioService { return { accounts, platforms }; } - - private getTotalByType( - orders: OrderWithAccount[], - currency: string, - type: TypeOfOrder - ) { - return orders - .filter( - (order) => !isAfter(order.date, endOfToday()) && order.type === type - ) - .map((order) => { - return this.exchangeRateDataService.toCurrency( - order.quantity * order.unitPrice, - order.SymbolProfile.currency, - currency - ); - }) - .reduce((previous, current) => previous + current, 0); - } - - private getUserCurrency(aUser: UserWithSettings) { - return ( - aUser.Settings?.settings.baseCurrency ?? - this.request.user?.Settings?.settings.baseCurrency ?? - DEFAULT_CURRENCY - ); - } - - private async getUserId(aImpersonationId: string, aUserId: string) { - const impersonationUserId = - await this.impersonationService.validateImpersonationId(aImpersonationId); - - return impersonationUserId || aUserId; - } } diff --git a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html index a84fbebaf..aaf9bfb73 100644 --- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html +++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html @@ -276,6 +276,18 @@

+
+
Interest
+
+ +
+
Dividend
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts index 72f308315..0a67ce60e 100644 --- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts @@ -243,7 +243,12 @@ export class CreateOrUpdateActivityDialog implements OnDestroy { (accountId) => { const type = this.activityForm.controls['type'].value; - if (type === 'FEE' || type === 'ITEM' || type === 'LIABILITY') { + if ( + type === 'FEE' || + type === 'INTEREST' || + type === 'ITEM' || + type === 'LIABILITY' + ) { const currency = this.data.accounts.find(({ id }) => { return id === accountId; @@ -315,7 +320,11 @@ export class CreateOrUpdateActivityDialog implements OnDestroy { this.activityForm.controls['searchSymbol'].updateValueAndValidity(); this.activityForm.controls['updateAccountBalance'].disable(); this.activityForm.controls['updateAccountBalance'].setValue(false); - } else if (type === 'FEE' || type === 'LIABILITY') { + } else if ( + type === 'FEE' || + type === 'INTEREST' || + type === 'LIABILITY' + ) { this.activityForm.controls['accountId'].removeValidators( Validators.required ); @@ -338,6 +347,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy { if ( (type === 'FEE' && this.activityForm.controls['feeInCustomCurrency'].value === 0) || + type === 'INTEREST' || type === 'LIABILITY' ) { this.activityForm.controls['feeInCustomCurrency'].reset(); @@ -348,7 +358,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy { if (type === 'FEE') { this.activityForm.controls['quantity'].setValue(0); - } else if (type === 'LIABILITY') { + } else if (type === 'INTEREST' || type === 'LIABILITY') { this.activityForm.controls['quantity'].setValue(1); } diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html index 692f6bb1a..4e600b110 100644 --- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html +++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html @@ -36,6 +36,15 @@ >Distribution of corporate earnings + + {{ typesTranslationMap['INTEREST'] }} + Revenue for lending out money + {{ typesTranslationMap['LIABILITY'] }}
Quantity @@ -151,6 +160,7 @@ Dividend + Value Value ValueDividend Value + Value Value Value Unit Price @@ -220,7 +231,7 @@
Fee diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlf index a305e6760..624273d90 100644 --- a/apps/client/src/locales/messages.de.xlf +++ b/apps/client/src/locales/messages.de.xlf @@ -134,11 +134,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 100 + 109 libs/ui/src/lib/activities-table/activities-table.component.html - 203 + 208 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -170,31 +170,39 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 154 + 163 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 156 + 164 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 209 + 166 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 219 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 220 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 210 + 221 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 211 + 222 libs/ui/src/lib/activities-table/activities-table.component.html - 345 + 350 libs/ui/src/lib/activities-table/activities-table.component.html - 380 + 385 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -214,7 +222,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 522 + 527 @@ -234,7 +242,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 538 + 543 @@ -282,7 +290,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 116 + 125 @@ -374,7 +382,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 122 + 131 libs/ui/src/lib/activities-table/activities-table.component.html @@ -418,7 +426,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 346 + 357 apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html @@ -454,7 +462,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 353 + 364 apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.html @@ -1170,7 +1178,10 @@ - Gebühren für + + + + apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html 12,15 @@ -1257,7 +1268,7 @@ Dividenden apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html - 280 + 292 apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html @@ -1269,11 +1280,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 152 + 161 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 207 + 217 @@ -1325,7 +1336,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 304 + 315 @@ -1637,7 +1648,7 @@ Konto apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 66 + 75 apps/client/src/app/pages/user-account/user-account-page.html @@ -1645,7 +1656,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 411 + 416 @@ -1825,11 +1836,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 106 + 115 libs/ui/src/lib/activities-table/activities-table.component.html - 233 + 238 @@ -2173,7 +2184,7 @@ Verkauf libs/ui/src/lib/i18n.ts - 35 + 36 @@ -2185,7 +2196,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 88 + 97 @@ -2197,11 +2208,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 139 + 148 libs/ui/src/lib/activities-table/activities-table.component.html - 254 + 259 @@ -2209,15 +2220,15 @@ Stückpreis apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 158 + 168 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 212 + 223 libs/ui/src/lib/activities-table/activities-table.component.html - 283 + 288 @@ -2225,15 +2236,15 @@ Gebühr apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 226 + 237 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 251 + 262 libs/ui/src/lib/activities-table/activities-table.component.html - 312 + 317 @@ -2249,7 +2260,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 260 + 271 @@ -2269,7 +2280,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 275 + 286 @@ -2429,7 +2440,7 @@ Geplant libs/ui/src/lib/activities-table/activities-table.component.html - 213 + 218 @@ -2449,7 +2460,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 495 + 500 @@ -2461,7 +2472,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 505 + 510 @@ -2469,7 +2480,7 @@ Kopieren libs/ui/src/lib/activities-table/activities-table.component.html - 526 + 531 @@ -2477,7 +2488,7 @@ Geplante Aktivität als ICS exportieren libs/ui/src/lib/activities-table/activities-table.component.html - 534 + 539 @@ -2485,7 +2496,7 @@ Möchtest du diese Aktivität wirklich löschen? libs/ui/src/lib/activities-table/activities-table.component.ts - 226 + 227 @@ -2637,7 +2648,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 291 + 302 @@ -2751,6 +2762,10 @@ libs/ui/src/lib/fire-calculator/fire-calculator.component.ts 341 + + libs/ui/src/lib/i18n.ts + 33 + Savings @@ -2821,7 +2836,7 @@ Filtern nach Konto, Währung, Symbol oder Typ... libs/ui/src/lib/activities-table/activities-table.component.ts - 420 + 427 @@ -2985,7 +3000,7 @@ Bargeld libs/ui/src/lib/i18n.ts - 38 + 39 @@ -2993,7 +3008,7 @@ Rohstoff libs/ui/src/lib/i18n.ts - 39 + 40 @@ -3001,7 +3016,7 @@ Beteiligungskapital libs/ui/src/lib/i18n.ts - 40 + 41 @@ -3009,7 +3024,7 @@ Feste Einkünfte libs/ui/src/lib/i18n.ts - 41 + 42 @@ -3017,7 +3032,7 @@ Immobilien libs/ui/src/lib/i18n.ts - 42 + 43 @@ -3025,7 +3040,7 @@ Anleihe libs/ui/src/lib/i18n.ts - 45 + 46 @@ -3033,7 +3048,7 @@ Kryptowährung libs/ui/src/lib/i18n.ts - 46 + 47 @@ -3041,7 +3056,7 @@ ETF libs/ui/src/lib/i18n.ts - 47 + 48 @@ -3049,7 +3064,7 @@ Investmentfonds libs/ui/src/lib/i18n.ts - 48 + 49 @@ -3057,7 +3072,7 @@ Edelmetall libs/ui/src/lib/i18n.ts - 49 + 50 @@ -3065,7 +3080,7 @@ Privates Beteiligungskapital libs/ui/src/lib/i18n.ts - 50 + 51 @@ -3073,7 +3088,7 @@ Aktie libs/ui/src/lib/i18n.ts - 51 + 52 @@ -3113,7 +3128,7 @@ Nordamerika libs/ui/src/lib/i18n.ts - 57 + 58 @@ -3121,7 +3136,7 @@ Afrika libs/ui/src/lib/i18n.ts - 54 + 55 @@ -3129,7 +3144,7 @@ Asien libs/ui/src/lib/i18n.ts - 55 + 56 @@ -3137,7 +3152,7 @@ Europa libs/ui/src/lib/i18n.ts - 56 + 57 @@ -3145,7 +3160,7 @@ Ozeanien libs/ui/src/lib/i18n.ts - 58 + 59 @@ -3153,7 +3168,7 @@ Südamerika libs/ui/src/lib/i18n.ts - 59 + 60 @@ -3777,7 +3792,7 @@ Ups! Der historische Wechselkurs konnte nicht abgerufen werden vom apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 242 + 253 @@ -3929,7 +3944,7 @@ Cash-Bestand aktualisieren apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 80 + 89 @@ -4049,7 +4064,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 476 + 481 @@ -4061,7 +4076,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 485 + 490 @@ -4281,7 +4296,7 @@ Verbindlichkeit libs/ui/src/lib/i18n.ts - 34 + 35 @@ -6993,7 +7008,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 48 + 57 @@ -7001,7 +7016,7 @@ Hypotheken, Darlehen, Kreditkarten apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 42 + 51 @@ -7009,7 +7024,7 @@ Luxusartikel, Immobilien, private Unternehmen apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 54 + 63 @@ -7025,7 +7040,7 @@ Wertsache libs/ui/src/lib/i18n.ts - 33 + 34 @@ -9493,7 +9508,7 @@ Ups! Der historische Wechselkurs konnte nicht abgerufen werden vom apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 183,184 + 193,194 @@ -9504,6 +9519,22 @@ 32 + + Interest + Zins + + apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html + 280 + + + + Revenue for lending out money + Ertrag für das Ausleihen von Geld + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 45 + + diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf index 4a5c869a1..bfd6de5b5 100644 --- a/apps/client/src/locales/messages.es.xlf +++ b/apps/client/src/locales/messages.es.xlf @@ -135,11 +135,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 100 + 109 libs/ui/src/lib/activities-table/activities-table.component.html - 203 + 208 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -171,31 +171,39 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 154 + 163 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 156 + 164 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 209 + 166 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 219 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 220 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 210 + 221 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 211 + 222 libs/ui/src/lib/activities-table/activities-table.component.html - 345 + 350 libs/ui/src/lib/activities-table/activities-table.component.html - 380 + 385 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -215,7 +223,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 522 + 527 @@ -235,7 +243,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 538 + 543 @@ -283,7 +291,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 116 + 125 @@ -375,7 +383,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 122 + 131 libs/ui/src/lib/activities-table/activities-table.component.html @@ -419,7 +427,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 346 + 357 apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html @@ -455,7 +463,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 353 + 364 apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.html @@ -1258,7 +1266,7 @@ Dividendo apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html - 280 + 292 apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html @@ -1270,11 +1278,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 152 + 161 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 207 + 217 @@ -1326,7 +1334,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 304 + 315 @@ -1638,7 +1646,7 @@ Cuenta apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 66 + 75 apps/client/src/app/pages/user-account/user-account-page.html @@ -1646,7 +1654,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 411 + 416 @@ -1826,11 +1834,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 106 + 115 libs/ui/src/lib/activities-table/activities-table.component.html - 233 + 238 @@ -2174,7 +2182,7 @@ Venta libs/ui/src/lib/i18n.ts - 35 + 36 @@ -2186,7 +2194,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 88 + 97 @@ -2198,11 +2206,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 139 + 148 libs/ui/src/lib/activities-table/activities-table.component.html - 254 + 259 @@ -2210,15 +2218,15 @@ Precio unitario apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 158 + 168 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 212 + 223 libs/ui/src/lib/activities-table/activities-table.component.html - 283 + 288 @@ -2226,15 +2234,15 @@ Comisión apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 226 + 237 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 251 + 262 libs/ui/src/lib/activities-table/activities-table.component.html - 312 + 317 @@ -2250,7 +2258,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 260 + 271 @@ -2270,7 +2278,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 275 + 286 @@ -2430,7 +2438,7 @@ Borrador libs/ui/src/lib/activities-table/activities-table.component.html - 213 + 218 @@ -2450,7 +2458,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 495 + 500 @@ -2462,7 +2470,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 505 + 510 @@ -2470,7 +2478,7 @@ Clonar libs/ui/src/lib/activities-table/activities-table.component.html - 526 + 531 @@ -2478,7 +2486,7 @@ Exportar borrador como ICS libs/ui/src/lib/activities-table/activities-table.component.html - 534 + 539 @@ -2486,7 +2494,7 @@ ¿Estás seguro de eliminar esta operación? libs/ui/src/lib/activities-table/activities-table.component.ts - 226 + 227 @@ -2618,7 +2626,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 291 + 302 @@ -2736,6 +2744,10 @@ libs/ui/src/lib/fire-calculator/fire-calculator.component.ts 341 + + libs/ui/src/lib/i18n.ts + 33 + Deposit @@ -2822,7 +2834,7 @@ Filtrar por cuenta, divisa, símbolo o tipo... libs/ui/src/lib/activities-table/activities-table.component.ts - 420 + 427 @@ -2986,7 +2998,7 @@ Efectivo libs/ui/src/lib/i18n.ts - 38 + 39 @@ -2994,7 +3006,7 @@ Bien libs/ui/src/lib/i18n.ts - 39 + 40 @@ -3002,7 +3014,7 @@ Capital libs/ui/src/lib/i18n.ts - 40 + 41 @@ -3010,7 +3022,7 @@ Renta fija libs/ui/src/lib/i18n.ts - 41 + 42 @@ -3018,7 +3030,7 @@ Propiedad inmobiliaria libs/ui/src/lib/i18n.ts - 42 + 43 @@ -3026,7 +3038,7 @@ Bono libs/ui/src/lib/i18n.ts - 45 + 46 @@ -3034,7 +3046,7 @@ Criptomoneda libs/ui/src/lib/i18n.ts - 46 + 47 @@ -3042,7 +3054,7 @@ ETF libs/ui/src/lib/i18n.ts - 47 + 48 @@ -3050,7 +3062,7 @@ Fondo de inversión libs/ui/src/lib/i18n.ts - 48 + 49 @@ -3058,7 +3070,7 @@ Metal precioso libs/ui/src/lib/i18n.ts - 49 + 50 @@ -3066,7 +3078,7 @@ Capital riesgo libs/ui/src/lib/i18n.ts - 50 + 51 @@ -3074,7 +3086,7 @@ Acción libs/ui/src/lib/i18n.ts - 51 + 52 @@ -3114,7 +3126,7 @@ América del Norte libs/ui/src/lib/i18n.ts - 57 + 58 @@ -3122,7 +3134,7 @@ África libs/ui/src/lib/i18n.ts - 54 + 55 @@ -3130,7 +3142,7 @@ Asia libs/ui/src/lib/i18n.ts - 55 + 56 @@ -3138,7 +3150,7 @@ Europa libs/ui/src/lib/i18n.ts - 56 + 57 @@ -3146,7 +3158,7 @@ Oceanía libs/ui/src/lib/i18n.ts - 58 + 59 @@ -3154,7 +3166,7 @@ América del Sur libs/ui/src/lib/i18n.ts - 59 + 60 @@ -3778,7 +3790,7 @@ Oops! Could not get the historical exchange rate from apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 242 + 253 @@ -3930,7 +3942,7 @@ Update Cash Balance apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 80 + 89 @@ -4050,7 +4062,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 476 + 481 @@ -4062,7 +4074,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 485 + 490 @@ -4282,7 +4294,7 @@ Liability libs/ui/src/lib/i18n.ts - 34 + 35 @@ -6994,7 +7006,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 48 + 57 @@ -7002,7 +7014,7 @@ Mortgages, personal loans, credit cards apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 42 + 51 @@ -7010,7 +7022,7 @@ Luxury items, real estate, private companies apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 54 + 63 @@ -7026,7 +7038,7 @@ Valuable libs/ui/src/lib/i18n.ts - 33 + 34 @@ -9494,7 +9506,7 @@ Oops! Could not get the historical exchange rate from apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 183,184 + 193,194 @@ -9505,6 +9517,22 @@ 32 + + Interest + Interest + + apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html + 280 + + + + Revenue for lending out money + Revenue for lending out money + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 45 + + diff --git a/apps/client/src/locales/messages.fr.xlf b/apps/client/src/locales/messages.fr.xlf index e5f0c5370..fd78f38c4 100644 --- a/apps/client/src/locales/messages.fr.xlf +++ b/apps/client/src/locales/messages.fr.xlf @@ -146,11 +146,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 100 + 109 libs/ui/src/lib/activities-table/activities-table.component.html - 203 + 208 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -186,11 +186,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 106 + 115 libs/ui/src/lib/activities-table/activities-table.component.html - 233 + 238 @@ -222,31 +222,39 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 154 + 163 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 156 + 164 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 209 + 166 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 210 + 219 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 211 + 220 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 221 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 222 libs/ui/src/lib/activities-table/activities-table.component.html - 345 + 350 libs/ui/src/lib/activities-table/activities-table.component.html - 380 + 385 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -266,7 +274,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 522 + 527 @@ -286,7 +294,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 538 + 543 @@ -326,7 +334,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 116 + 125 @@ -426,7 +434,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 122 + 131 libs/ui/src/lib/activities-table/activities-table.component.html @@ -470,7 +478,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 346 + 357 apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html @@ -506,7 +514,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 353 + 364 apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.html @@ -538,7 +546,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 275 + 286 @@ -558,7 +566,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 291 + 302 @@ -722,7 +730,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 260 + 271 @@ -818,7 +826,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 304 + 315 @@ -1597,7 +1605,7 @@ Dividende apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html - 280 + 292 apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html @@ -1609,11 +1617,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 152 + 161 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 207 + 217 @@ -1665,11 +1673,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 139 + 148 libs/ui/src/lib/activities-table/activities-table.component.html - 254 + 259 @@ -1909,7 +1917,7 @@ Compte apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 66 + 75 apps/client/src/app/pages/user-account/user-account-page.html @@ -1917,7 +1925,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 411 + 416 @@ -2409,7 +2417,7 @@ Vente libs/ui/src/lib/i18n.ts - 35 + 36 @@ -2421,7 +2429,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 88 + 97 @@ -2429,15 +2437,15 @@ Prix Unitaire apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 158 + 168 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 212 + 223 libs/ui/src/lib/activities-table/activities-table.component.html - 283 + 288 @@ -2445,15 +2453,15 @@ Frais apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 226 + 237 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 251 + 262 libs/ui/src/lib/activities-table/activities-table.component.html - 312 + 317 @@ -2973,7 +2981,7 @@ Brouillon libs/ui/src/lib/activities-table/activities-table.component.html - 213 + 218 @@ -2993,7 +3001,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 495 + 500 @@ -3005,7 +3013,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 505 + 510 @@ -3013,7 +3021,7 @@ Dupliquer libs/ui/src/lib/activities-table/activities-table.component.html - 526 + 531 @@ -3021,7 +3029,7 @@ Exporter Brouillon sous ICS libs/ui/src/lib/activities-table/activities-table.component.html - 534 + 539 @@ -3029,7 +3037,7 @@ Voulez-vous vraiment supprimer cette activité ? libs/ui/src/lib/activities-table/activities-table.component.ts - 226 + 227 @@ -3037,7 +3045,7 @@ Filtrer par compte, devise, symbole, ou type... libs/ui/src/lib/activities-table/activities-table.component.ts - 420 + 427 @@ -3087,6 +3095,10 @@ libs/ui/src/lib/fire-calculator/fire-calculator.component.ts 341 + + libs/ui/src/lib/i18n.ts + 33 + Savings @@ -3177,7 +3189,7 @@ Cash libs/ui/src/lib/i18n.ts - 38 + 39 @@ -3185,7 +3197,7 @@ Marchandise libs/ui/src/lib/i18n.ts - 39 + 40 @@ -3193,7 +3205,7 @@ Capital libs/ui/src/lib/i18n.ts - 40 + 41 @@ -3201,7 +3213,7 @@ Revenu Fixe libs/ui/src/lib/i18n.ts - 41 + 42 @@ -3209,7 +3221,7 @@ Immobilier libs/ui/src/lib/i18n.ts - 42 + 43 @@ -3217,7 +3229,7 @@ Obligation libs/ui/src/lib/i18n.ts - 45 + 46 @@ -3225,7 +3237,7 @@ Cryptomonnaie libs/ui/src/lib/i18n.ts - 46 + 47 @@ -3233,7 +3245,7 @@ ETF libs/ui/src/lib/i18n.ts - 47 + 48 @@ -3241,7 +3253,7 @@ SICAV libs/ui/src/lib/i18n.ts - 48 + 49 @@ -3249,7 +3261,7 @@ Métal Précieux libs/ui/src/lib/i18n.ts - 49 + 50 @@ -3257,7 +3269,7 @@ Capital Propre libs/ui/src/lib/i18n.ts - 50 + 51 @@ -3265,7 +3277,7 @@ Action libs/ui/src/lib/i18n.ts - 51 + 52 @@ -3273,7 +3285,7 @@ Afrique libs/ui/src/lib/i18n.ts - 54 + 55 @@ -3281,7 +3293,7 @@ Asie libs/ui/src/lib/i18n.ts - 55 + 56 @@ -3289,7 +3301,7 @@ Europe libs/ui/src/lib/i18n.ts - 56 + 57 @@ -3297,7 +3309,7 @@ Amérique du Nord libs/ui/src/lib/i18n.ts - 57 + 58 @@ -3305,7 +3317,7 @@ Océanie libs/ui/src/lib/i18n.ts - 58 + 59 @@ -3313,7 +3325,7 @@ Amérique du Sud libs/ui/src/lib/i18n.ts - 59 + 60 @@ -3777,7 +3789,7 @@ Oups ! Nous n'avons pas pu obtenir le taux de change historique à partir de apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 242 + 253 @@ -3929,7 +3941,7 @@ Mettre à jour le Solde apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 80 + 89 @@ -4049,7 +4061,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 476 + 481 @@ -4061,7 +4073,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 485 + 490 @@ -4281,7 +4293,7 @@ Dette libs/ui/src/lib/i18n.ts - 34 + 35 @@ -6993,7 +7005,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 48 + 57 @@ -7001,7 +7013,7 @@ Mortgages, personal loans, credit cards apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 42 + 51 @@ -7009,7 +7021,7 @@ Luxury items, real estate, private companies apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 54 + 63 @@ -7025,7 +7037,7 @@ Valuable libs/ui/src/lib/i18n.ts - 33 + 34 @@ -9493,7 +9505,7 @@ Oops! Could not get the historical exchange rate from apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 183,184 + 193,194 @@ -9504,6 +9516,22 @@ 32 + + Interest + Interest + + apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html + 280 + + + + Revenue for lending out money + Revenue for lending out money + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 45 + + diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf index ad7658398..c539336dd 100644 --- a/apps/client/src/locales/messages.it.xlf +++ b/apps/client/src/locales/messages.it.xlf @@ -135,11 +135,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 100 + 109 libs/ui/src/lib/activities-table/activities-table.component.html - 203 + 208 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -171,31 +171,39 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 154 + 163 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 156 + 164 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 209 + 166 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 219 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 220 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 210 + 221 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 211 + 222 libs/ui/src/lib/activities-table/activities-table.component.html - 345 + 350 libs/ui/src/lib/activities-table/activities-table.component.html - 380 + 385 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -215,7 +223,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 522 + 527 @@ -235,7 +243,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 538 + 543 @@ -283,7 +291,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 116 + 125 @@ -375,7 +383,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 122 + 131 libs/ui/src/lib/activities-table/activities-table.component.html @@ -419,7 +427,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 346 + 357 apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html @@ -455,7 +463,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 353 + 364 apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.html @@ -1258,7 +1266,7 @@ Dividendo apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html - 280 + 292 apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html @@ -1270,11 +1278,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 152 + 161 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 207 + 217 @@ -1326,7 +1334,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 304 + 315 @@ -1638,7 +1646,7 @@ Account apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 66 + 75 apps/client/src/app/pages/user-account/user-account-page.html @@ -1646,7 +1654,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 411 + 416 @@ -1826,11 +1834,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 106 + 115 libs/ui/src/lib/activities-table/activities-table.component.html - 233 + 238 @@ -2174,7 +2182,7 @@ Vendi libs/ui/src/lib/i18n.ts - 35 + 36 @@ -2186,7 +2194,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 88 + 97 @@ -2198,11 +2206,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 139 + 148 libs/ui/src/lib/activities-table/activities-table.component.html - 254 + 259 @@ -2210,15 +2218,15 @@ Prezzo unitario apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 158 + 168 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 212 + 223 libs/ui/src/lib/activities-table/activities-table.component.html - 283 + 288 @@ -2226,15 +2234,15 @@ Commissione apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 226 + 237 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 251 + 262 libs/ui/src/lib/activities-table/activities-table.component.html - 312 + 317 @@ -2250,7 +2258,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 260 + 271 @@ -2270,7 +2278,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 275 + 286 @@ -2430,7 +2438,7 @@ Bozza libs/ui/src/lib/activities-table/activities-table.component.html - 213 + 218 @@ -2450,7 +2458,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 495 + 500 @@ -2462,7 +2470,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 505 + 510 @@ -2470,7 +2478,7 @@ Clona libs/ui/src/lib/activities-table/activities-table.component.html - 526 + 531 @@ -2478,7 +2486,7 @@ Esporta la bozza come ICS libs/ui/src/lib/activities-table/activities-table.component.html - 534 + 539 @@ -2486,7 +2494,7 @@ Vuoi davvero eliminare questa attività? libs/ui/src/lib/activities-table/activities-table.component.ts - 226 + 227 @@ -2618,7 +2626,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 291 + 302 @@ -2736,6 +2744,10 @@ libs/ui/src/lib/fire-calculator/fire-calculator.component.ts 341 + + libs/ui/src/lib/i18n.ts + 33 + Deposit @@ -2822,7 +2834,7 @@ Filtra per account, valuta, simbolo o tipo... libs/ui/src/lib/activities-table/activities-table.component.ts - 420 + 427 @@ -2986,7 +2998,7 @@ Contanti libs/ui/src/lib/i18n.ts - 38 + 39 @@ -2994,7 +3006,7 @@ Materia prima libs/ui/src/lib/i18n.ts - 39 + 40 @@ -3002,7 +3014,7 @@ Azione ordinaria libs/ui/src/lib/i18n.ts - 40 + 41 @@ -3010,7 +3022,7 @@ Reddito fisso libs/ui/src/lib/i18n.ts - 41 + 42 @@ -3018,7 +3030,7 @@ Immobiliare libs/ui/src/lib/i18n.ts - 42 + 43 @@ -3026,7 +3038,7 @@ Obbligazioni libs/ui/src/lib/i18n.ts - 45 + 46 @@ -3034,7 +3046,7 @@ Criptovaluta libs/ui/src/lib/i18n.ts - 46 + 47 @@ -3042,7 +3054,7 @@ ETF libs/ui/src/lib/i18n.ts - 47 + 48 @@ -3050,7 +3062,7 @@ Fondo comune di investimento libs/ui/src/lib/i18n.ts - 48 + 49 @@ -3058,7 +3070,7 @@ Metalli preziosi libs/ui/src/lib/i18n.ts - 49 + 50 @@ -3066,7 +3078,7 @@ Azione ordinaria privata libs/ui/src/lib/i18n.ts - 50 + 51 @@ -3074,7 +3086,7 @@ Azione libs/ui/src/lib/i18n.ts - 51 + 52 @@ -3114,7 +3126,7 @@ Nord America libs/ui/src/lib/i18n.ts - 57 + 58 @@ -3122,7 +3134,7 @@ Africa libs/ui/src/lib/i18n.ts - 54 + 55 @@ -3130,7 +3142,7 @@ Asia libs/ui/src/lib/i18n.ts - 55 + 56 @@ -3138,7 +3150,7 @@ Europa libs/ui/src/lib/i18n.ts - 56 + 57 @@ -3146,7 +3158,7 @@ Oceania libs/ui/src/lib/i18n.ts - 58 + 59 @@ -3154,7 +3166,7 @@ Sud America libs/ui/src/lib/i18n.ts - 59 + 60 @@ -3778,7 +3790,7 @@ Ops! Impossibile ottenere il tasso di cambio storico da apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 242 + 253 @@ -3930,7 +3942,7 @@ Aggiornamento del saldo di cassa apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 80 + 89 @@ -4050,7 +4062,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 476 + 481 @@ -4062,7 +4074,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 485 + 490 @@ -4282,7 +4294,7 @@ Passività libs/ui/src/lib/i18n.ts - 34 + 35 @@ -6994,7 +7006,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 48 + 57 @@ -7002,7 +7014,7 @@ Mutui, prestiti personali, carte di credito apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 42 + 51 @@ -7010,7 +7022,7 @@ Articoli di lusso, immobili, aziende private apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 54 + 63 @@ -7026,7 +7038,7 @@ Prezioso libs/ui/src/lib/i18n.ts - 33 + 34 @@ -9494,7 +9506,7 @@ Oops! Could not get the historical exchange rate from apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 183,184 + 193,194 @@ -9505,6 +9517,22 @@ 32 + + Interest + Interest + + apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html + 280 + + + + Revenue for lending out money + Revenue for lending out money + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 45 + + diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf index 3df16e1ed..295184644 100644 --- a/apps/client/src/locales/messages.nl.xlf +++ b/apps/client/src/locales/messages.nl.xlf @@ -134,11 +134,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 100 + 109 libs/ui/src/lib/activities-table/activities-table.component.html - 203 + 208 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -170,31 +170,39 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 154 + 163 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 156 + 164 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 209 + 166 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 219 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 220 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 210 + 221 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 211 + 222 libs/ui/src/lib/activities-table/activities-table.component.html - 345 + 350 libs/ui/src/lib/activities-table/activities-table.component.html - 380 + 385 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -214,7 +222,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 522 + 527 @@ -234,7 +242,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 538 + 543 @@ -282,7 +290,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 116 + 125 @@ -374,7 +382,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 122 + 131 libs/ui/src/lib/activities-table/activities-table.component.html @@ -418,7 +426,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 346 + 357 apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html @@ -454,7 +462,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 353 + 364 apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.html @@ -1257,7 +1265,7 @@ Dividend apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html - 280 + 292 apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html @@ -1269,11 +1277,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 152 + 161 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 207 + 217 @@ -1325,7 +1333,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 304 + 315 @@ -1637,7 +1645,7 @@ Rekening apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 66 + 75 apps/client/src/app/pages/user-account/user-account-page.html @@ -1645,7 +1653,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 411 + 416 @@ -1825,11 +1833,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 106 + 115 libs/ui/src/lib/activities-table/activities-table.component.html - 233 + 238 @@ -2173,7 +2181,7 @@ Verkopen libs/ui/src/lib/i18n.ts - 35 + 36 @@ -2185,7 +2193,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 88 + 97 @@ -2197,11 +2205,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 139 + 148 libs/ui/src/lib/activities-table/activities-table.component.html - 254 + 259 @@ -2209,15 +2217,15 @@ Prijs per eenheid apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 158 + 168 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 212 + 223 libs/ui/src/lib/activities-table/activities-table.component.html - 283 + 288 @@ -2225,15 +2233,15 @@ Transactiekosten apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 226 + 237 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 251 + 262 libs/ui/src/lib/activities-table/activities-table.component.html - 312 + 317 @@ -2249,7 +2257,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 260 + 271 @@ -2269,7 +2277,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 275 + 286 @@ -2429,7 +2437,7 @@ Concept libs/ui/src/lib/activities-table/activities-table.component.html - 213 + 218 @@ -2449,7 +2457,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 495 + 500 @@ -2461,7 +2469,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 505 + 510 @@ -2469,7 +2477,7 @@ Kloon libs/ui/src/lib/activities-table/activities-table.component.html - 526 + 531 @@ -2477,7 +2485,7 @@ Concept exporteren als ICS libs/ui/src/lib/activities-table/activities-table.component.html - 534 + 539 @@ -2485,7 +2493,7 @@ Wil je deze activiteit echt verwijderen? libs/ui/src/lib/activities-table/activities-table.component.ts - 226 + 227 @@ -2617,7 +2625,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 291 + 302 @@ -2735,6 +2743,10 @@ libs/ui/src/lib/fire-calculator/fire-calculator.component.ts 341 + + libs/ui/src/lib/i18n.ts + 33 + Deposit @@ -2821,7 +2833,7 @@ Filter op rekening, valuta, symbool of type... libs/ui/src/lib/activities-table/activities-table.component.ts - 420 + 427 @@ -2985,7 +2997,7 @@ Contant geld libs/ui/src/lib/i18n.ts - 38 + 39 @@ -2993,7 +3005,7 @@ Grondstof libs/ui/src/lib/i18n.ts - 39 + 40 @@ -3001,7 +3013,7 @@ Equity libs/ui/src/lib/i18n.ts - 40 + 41 @@ -3009,7 +3021,7 @@ Vast inkomen libs/ui/src/lib/i18n.ts - 41 + 42 @@ -3017,7 +3029,7 @@ Vastgoed libs/ui/src/lib/i18n.ts - 42 + 43 @@ -3025,7 +3037,7 @@ Obligatie libs/ui/src/lib/i18n.ts - 45 + 46 @@ -3033,7 +3045,7 @@ Cryptovaluta libs/ui/src/lib/i18n.ts - 46 + 47 @@ -3041,7 +3053,7 @@ ETF libs/ui/src/lib/i18n.ts - 47 + 48 @@ -3049,7 +3061,7 @@ Beleggingsfonds libs/ui/src/lib/i18n.ts - 48 + 49 @@ -3057,7 +3069,7 @@ Edelmetaal libs/ui/src/lib/i18n.ts - 49 + 50 @@ -3065,7 +3077,7 @@ Private equity libs/ui/src/lib/i18n.ts - 50 + 51 @@ -3073,7 +3085,7 @@ Aandeel libs/ui/src/lib/i18n.ts - 51 + 52 @@ -3113,7 +3125,7 @@ Noord-Amerika libs/ui/src/lib/i18n.ts - 57 + 58 @@ -3121,7 +3133,7 @@ Afrika libs/ui/src/lib/i18n.ts - 54 + 55 @@ -3129,7 +3141,7 @@ Azië libs/ui/src/lib/i18n.ts - 55 + 56 @@ -3137,7 +3149,7 @@ Europa libs/ui/src/lib/i18n.ts - 56 + 57 @@ -3145,7 +3157,7 @@ Oceanië libs/ui/src/lib/i18n.ts - 58 + 59 @@ -3153,7 +3165,7 @@ Zuid-Amerika libs/ui/src/lib/i18n.ts - 59 + 60 @@ -3777,7 +3789,7 @@ Oeps! Kon de historische wisselkoers niet krijgen van apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 242 + 253 @@ -3929,7 +3941,7 @@ Saldo bijwerken apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 80 + 89 @@ -4049,7 +4061,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 476 + 481 @@ -4061,7 +4073,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 485 + 490 @@ -4281,7 +4293,7 @@ Verplichtingen libs/ui/src/lib/i18n.ts - 34 + 35 @@ -6993,7 +7005,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 48 + 57 @@ -7001,7 +7013,7 @@ Hypotheken, persoonlijke leningen, creditcards apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 42 + 51 @@ -7009,7 +7021,7 @@ Luxe artikelen, onroerend goed, particuliere bedrijven apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 54 + 63 @@ -7025,7 +7037,7 @@ Waardevol libs/ui/src/lib/i18n.ts - 33 + 34 @@ -9493,7 +9505,7 @@ Oops! Could not get the historical exchange rate from apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 183,184 + 193,194 @@ -9504,6 +9516,22 @@ 32 + + Interest + Interest + + apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html + 280 + + + + Revenue for lending out money + Revenue for lending out money + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 45 + + diff --git a/apps/client/src/locales/messages.pt.xlf b/apps/client/src/locales/messages.pt.xlf index 2d5fcc409..689f2b292 100644 --- a/apps/client/src/locales/messages.pt.xlf +++ b/apps/client/src/locales/messages.pt.xlf @@ -146,11 +146,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 100 + 109 libs/ui/src/lib/activities-table/activities-table.component.html - 203 + 208 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -186,11 +186,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 106 + 115 libs/ui/src/lib/activities-table/activities-table.component.html - 233 + 238 @@ -222,31 +222,39 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 154 + 163 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 156 + 164 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 209 + 166 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 210 + 219 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 211 + 220 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 221 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 222 libs/ui/src/lib/activities-table/activities-table.component.html - 345 + 350 libs/ui/src/lib/activities-table/activities-table.component.html - 380 + 385 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -266,7 +274,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 522 + 527 @@ -286,7 +294,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 538 + 543 @@ -326,7 +334,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 116 + 125 @@ -426,7 +434,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 122 + 131 libs/ui/src/lib/activities-table/activities-table.component.html @@ -470,7 +478,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 346 + 357 apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html @@ -506,7 +514,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 353 + 364 apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.html @@ -538,7 +546,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 275 + 286 @@ -558,7 +566,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 291 + 302 @@ -1493,7 +1501,7 @@ Dividendo apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html - 280 + 292 apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html @@ -1505,11 +1513,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 152 + 161 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 207 + 217 @@ -1561,11 +1569,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 139 + 148 libs/ui/src/lib/activities-table/activities-table.component.html - 254 + 259 @@ -1653,7 +1661,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 304 + 315 @@ -1893,7 +1901,7 @@ Conta apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 66 + 75 apps/client/src/app/pages/user-account/user-account-page.html @@ -1901,7 +1909,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 411 + 416 @@ -2333,7 +2341,7 @@ Venda libs/ui/src/lib/i18n.ts - 35 + 36 @@ -2345,7 +2353,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 88 + 97 @@ -2353,15 +2361,15 @@ Preço por Unidade apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 158 + 168 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 212 + 223 libs/ui/src/lib/activities-table/activities-table.component.html - 283 + 288 @@ -2369,15 +2377,15 @@ Comissão apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 226 + 237 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 251 + 262 libs/ui/src/lib/activities-table/activities-table.component.html - 312 + 317 @@ -2393,7 +2401,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 260 + 271 @@ -2861,7 +2869,7 @@ Rascunho libs/ui/src/lib/activities-table/activities-table.component.html - 213 + 218 @@ -2881,7 +2889,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 495 + 500 @@ -2893,7 +2901,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 505 + 510 @@ -2901,7 +2909,7 @@ Clonar libs/ui/src/lib/activities-table/activities-table.component.html - 526 + 531 @@ -2909,7 +2917,7 @@ Exportar Rascunho como ICS libs/ui/src/lib/activities-table/activities-table.component.html - 534 + 539 @@ -2917,7 +2925,7 @@ Deseja realmente eliminar esta atividade? libs/ui/src/lib/activities-table/activities-table.component.ts - 226 + 227 @@ -2925,7 +2933,7 @@ Filtrar por conta, moeda, símbolo ou tipo... libs/ui/src/lib/activities-table/activities-table.component.ts - 420 + 427 @@ -2975,6 +2983,10 @@ libs/ui/src/lib/fire-calculator/fire-calculator.component.ts 341 + + libs/ui/src/lib/i18n.ts + 33 + Savings @@ -3041,7 +3053,7 @@ Dinheiro libs/ui/src/lib/i18n.ts - 38 + 39 @@ -3049,7 +3061,7 @@ Matéria-prima libs/ui/src/lib/i18n.ts - 39 + 40 @@ -3057,7 +3069,7 @@ Ações libs/ui/src/lib/i18n.ts - 40 + 41 @@ -3065,7 +3077,7 @@ Rendimento Fixo libs/ui/src/lib/i18n.ts - 41 + 42 @@ -3073,7 +3085,7 @@ Imobiliário libs/ui/src/lib/i18n.ts - 42 + 43 @@ -3081,7 +3093,7 @@ Obrigação libs/ui/src/lib/i18n.ts - 45 + 46 @@ -3089,7 +3101,7 @@ Criptomoedas libs/ui/src/lib/i18n.ts - 46 + 47 @@ -3097,7 +3109,7 @@ ETF libs/ui/src/lib/i18n.ts - 47 + 48 @@ -3105,7 +3117,7 @@ Fundo de Investimento libs/ui/src/lib/i18n.ts - 48 + 49 @@ -3113,7 +3125,7 @@ Metal Precioso libs/ui/src/lib/i18n.ts - 49 + 50 @@ -3121,7 +3133,7 @@ Private Equity libs/ui/src/lib/i18n.ts - 50 + 51 @@ -3129,7 +3141,7 @@ Ação libs/ui/src/lib/i18n.ts - 51 + 52 @@ -3137,7 +3149,7 @@ África libs/ui/src/lib/i18n.ts - 54 + 55 @@ -3145,7 +3157,7 @@ Ásia libs/ui/src/lib/i18n.ts - 55 + 56 @@ -3153,7 +3165,7 @@ Europa libs/ui/src/lib/i18n.ts - 56 + 57 @@ -3161,7 +3173,7 @@ América do Norte libs/ui/src/lib/i18n.ts - 57 + 58 @@ -3169,7 +3181,7 @@ Oceânia libs/ui/src/lib/i18n.ts - 58 + 59 @@ -3177,7 +3189,7 @@ América do Sul libs/ui/src/lib/i18n.ts - 59 + 60 @@ -3777,7 +3789,7 @@ Oops! Não foi possível obter a taxa de câmbio histórica de apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 242 + 253 @@ -3929,7 +3941,7 @@ Atualizar saldo em Dinheiro apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 80 + 89 @@ -4049,7 +4061,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 476 + 481 @@ -4061,7 +4073,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 485 + 490 @@ -4281,7 +4293,7 @@ Liability libs/ui/src/lib/i18n.ts - 34 + 35 @@ -6993,7 +7005,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 48 + 57 @@ -7001,7 +7013,7 @@ Mortgages, personal loans, credit cards apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 42 + 51 @@ -7009,7 +7021,7 @@ Luxury items, real estate, private companies apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 54 + 63 @@ -7025,7 +7037,7 @@ Valuable libs/ui/src/lib/i18n.ts - 33 + 34 @@ -9493,7 +9505,7 @@ Oops! Could not get the historical exchange rate from apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 183,184 + 193,194 @@ -9504,6 +9516,22 @@ 32 + + Interest + Interest + + apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html + 280 + + + + Revenue for lending out money + Revenue for lending out money + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 45 + + diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf index 4df260730..737e671f2 100644 --- a/apps/client/src/locales/messages.xlf +++ b/apps/client/src/locales/messages.xlf @@ -1134,11 +1134,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 100 + 109 libs/ui/src/lib/activities-table/activities-table.component.html - 203 + 208 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -1172,11 +1172,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 106 + 115 libs/ui/src/lib/activities-table/activities-table.component.html - 233 + 238 @@ -1191,31 +1191,39 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 154 + 163 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 156 + 164 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 209 + 166 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 210 + 219 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 211 + 220 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 221 + + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 222 libs/ui/src/lib/activities-table/activities-table.component.html - 345 + 350 libs/ui/src/lib/activities-table/activities-table.component.html - 380 + 385 libs/ui/src/lib/holdings-table/holdings-table.component.html @@ -1234,7 +1242,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 522 + 527 @@ -1253,7 +1261,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 538 + 543 @@ -1290,7 +1298,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 116 + 125 @@ -1378,7 +1386,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 122 + 131 libs/ui/src/lib/activities-table/activities-table.component.html @@ -1420,7 +1428,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 346 + 357 apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html @@ -1455,7 +1463,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 353 + 364 apps/client/src/app/pages/user-account/create-or-update-access-dialog/create-or-update-access-dialog.html @@ -1506,7 +1514,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 275 + 286 @@ -1525,7 +1533,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 291 + 302 @@ -1695,7 +1703,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 260 + 271 @@ -1713,7 +1721,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 88 + 97 @@ -1798,7 +1806,7 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 304 + 315 @@ -2490,7 +2498,7 @@ Dividend apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html - 280 + 292 apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html @@ -2502,11 +2510,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 152 + 161 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 207 + 217 @@ -2552,11 +2560,11 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 139 + 148 libs/ui/src/lib/activities-table/activities-table.component.html - 254 + 259 @@ -3577,28 +3585,28 @@ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 48 + 57 Mortgages, personal loans, credit cards apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 42 + 51 Luxury items, real estate, private companies apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 54 + 63 Account apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 66 + 75 apps/client/src/app/pages/user-account/user-account-page.html @@ -3606,51 +3614,51 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 411 + 416 Update Cash Balance apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 80 + 89 Unit Price apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 158 + 168 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 212 + 223 libs/ui/src/lib/activities-table/activities-table.component.html - 283 + 288 Oops! Could not get the historical exchange rate from apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 242 + 253 Fee apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 226 + 237 apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 251 + 262 libs/ui/src/lib/activities-table/activities-table.component.html - 312 + 317 @@ -8402,7 +8410,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 476 + 481 @@ -8413,7 +8421,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 485 + 490 @@ -8424,7 +8432,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 495 + 500 @@ -8435,7 +8443,7 @@ libs/ui/src/lib/activities-table/activities-table.component.html - 505 + 510 @@ -8449,35 +8457,35 @@ Draft libs/ui/src/lib/activities-table/activities-table.component.html - 213 + 218 Clone libs/ui/src/lib/activities-table/activities-table.component.html - 526 + 531 Export Draft as ICS libs/ui/src/lib/activities-table/activities-table.component.html - 534 + 539 Do you really want to delete this activity? libs/ui/src/lib/activities-table/activities-table.component.ts - 226 + 227 Filter by account, currency, symbol or type... libs/ui/src/lib/activities-table/activities-table.component.ts - 420 + 427 @@ -8542,6 +8550,10 @@ libs/ui/src/lib/fire-calculator/fire-calculator.component.ts 341 + + libs/ui/src/lib/i18n.ts + 33 + Savings @@ -8747,147 +8759,147 @@ Valuable libs/ui/src/lib/i18n.ts - 33 + 34 Liability libs/ui/src/lib/i18n.ts - 34 + 35 Sell libs/ui/src/lib/i18n.ts - 35 + 36 Cash libs/ui/src/lib/i18n.ts - 38 + 39 Commodity libs/ui/src/lib/i18n.ts - 39 + 40 Equity libs/ui/src/lib/i18n.ts - 40 + 41 Fixed Income libs/ui/src/lib/i18n.ts - 41 + 42 Real Estate libs/ui/src/lib/i18n.ts - 42 + 43 Bond libs/ui/src/lib/i18n.ts - 45 + 46 Cryptocurrency libs/ui/src/lib/i18n.ts - 46 + 47 ETF libs/ui/src/lib/i18n.ts - 47 + 48 Mutual Fund libs/ui/src/lib/i18n.ts - 48 + 49 Precious Metal libs/ui/src/lib/i18n.ts - 49 + 50 Private Equity libs/ui/src/lib/i18n.ts - 50 + 51 Stock libs/ui/src/lib/i18n.ts - 51 + 52 Africa libs/ui/src/lib/i18n.ts - 54 + 55 Asia libs/ui/src/lib/i18n.ts - 55 + 56 Europe libs/ui/src/lib/i18n.ts - 56 + 57 North America libs/ui/src/lib/i18n.ts - 57 + 58 Oceania libs/ui/src/lib/i18n.ts - 58 + 59 South America libs/ui/src/lib/i18n.ts - 59 + 60 @@ -8947,7 +8959,7 @@ Oops! Could not get the historical exchange rate from apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html - 183,184 + 193,194 @@ -8957,6 +8969,20 @@ 30 + + Revenue for lending out money + + apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html + 45 + + + + Interest + + apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html + 280 + + diff --git a/libs/common/src/lib/interfaces/portfolio-summary.interface.ts b/libs/common/src/lib/interfaces/portfolio-summary.interface.ts index 95ce2958a..4ebe9afa4 100644 --- a/libs/common/src/lib/interfaces/portfolio-summary.interface.ts +++ b/libs/common/src/lib/interfaces/portfolio-summary.interface.ts @@ -14,6 +14,7 @@ export interface PortfolioSummary extends PortfolioPerformance { fees: number; fireWealth: number; firstOrderDate: Date; + interest: number; items: number; liabilities: number; netWorth: number; diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html index fa9c81512..b22b17638 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.html +++ b/libs/ui/src/lib/activities-table/activities-table.component.html @@ -162,15 +162,20 @@ buy: element.type === 'BUY', dividend: element.type === 'DIVIDEND', fee: element.type === 'FEE', + interest: element.type === 'INTEREST', item: element.type === 'ITEM', liability: element.type === 'LIABILITY', sell: element.type === 'SELL' }" > +