diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d2650d1b..9bb4642c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Extended the import functionality by tags +- Improved the dynamic numerical precision for various values in the holding detail dialog +- Shortened the date in the activities table on mobile - Introduced the fuzzy search for the accounts endpoint - Refactored the fuzzy search for the holdings of the assistant - Eliminated the warnings of the database seeding process diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts index 8f0e6ae68..eb32b5f8b 100644 --- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts +++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts @@ -3,7 +3,11 @@ import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-foote import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module'; import { DataService } from '@ghostfolio/client/services/data.service'; import { UserService } from '@ghostfolio/client/services/user/user.service'; -import { NUMERICAL_PRECISION_THRESHOLD } from '@ghostfolio/common/config'; +import { + NUMERICAL_PRECISION_THRESHOLD_3_FIGURES, + NUMERICAL_PRECISION_THRESHOLD_5_FIGURES, + NUMERICAL_PRECISION_THRESHOLD_6_FIGURES +} from '@ghostfolio/common/config'; import { DATE_FORMAT, downloadAsFile } from '@ghostfolio/common/helper'; import { DataProviderInfo, @@ -101,6 +105,7 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { public assetClass: string; public assetSubClass: string; public averagePrice: number; + public averagePricePrecision = 2; public benchmarkDataItems: LineChartItem[]; public benchmarkLabel = $localize`Average Unit Price`; public countries: { @@ -122,11 +127,15 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { public marketDataItems: MarketData[] = []; public marketPrice: number; public marketPriceMax: number; + public marketPriceMaxPrecision = 2; public marketPriceMin: number; + public marketPriceMinPrecision = 2; + public marketPricePrecision = 2; public netPerformance: number; public netPerformancePrecision = 2; public netPerformancePercent: number; public netPerformancePercentWithCurrencyEffect: number; + public netPerformancePercentWithCurrencyEffectPrecision = 2; public netPerformanceWithCurrencyEffect: number; public netPerformanceWithCurrencyEffectPrecision = 2; public quantity: number; @@ -274,6 +283,14 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { value }) => { this.averagePrice = averagePrice; + + if ( + this.data.deviceType === 'mobile' && + this.averagePrice >= NUMERICAL_PRECISION_THRESHOLD_6_FIGURES + ) { + this.averagePricePrecision = 0; + } + this.benchmarkDataItems = []; this.countries = {}; this.dataProviderInfo = dataProviderInfo; @@ -281,7 +298,8 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { if ( this.data.deviceType === 'mobile' && - this.dividendInBaseCurrency >= NUMERICAL_PRECISION_THRESHOLD + this.dividendInBaseCurrency >= + NUMERICAL_PRECISION_THRESHOLD_6_FIGURES ) { this.dividendInBaseCurrencyPrecision = 0; } @@ -320,19 +338,42 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { if ( this.data.deviceType === 'mobile' && this.investmentInBaseCurrencyWithCurrencyEffect >= - NUMERICAL_PRECISION_THRESHOLD + NUMERICAL_PRECISION_THRESHOLD_6_FIGURES ) { this.investmentInBaseCurrencyWithCurrencyEffectPrecision = 0; } this.marketPrice = marketPrice; this.marketPriceMax = marketPriceMax; + + if ( + this.data.deviceType === 'mobile' && + this.marketPriceMax >= NUMERICAL_PRECISION_THRESHOLD_6_FIGURES + ) { + this.marketPriceMaxPrecision = 0; + } + this.marketPriceMin = marketPriceMin; + + if ( + this.data.deviceType === 'mobile' && + this.marketPriceMin >= NUMERICAL_PRECISION_THRESHOLD_6_FIGURES + ) { + this.marketPriceMinPrecision = 0; + } + + if ( + this.data.deviceType === 'mobile' && + this.marketPrice >= NUMERICAL_PRECISION_THRESHOLD_6_FIGURES + ) { + this.marketPricePrecision = 0; + } + this.netPerformance = netPerformance; if ( this.data.deviceType === 'mobile' && - this.netPerformance >= NUMERICAL_PRECISION_THRESHOLD + this.netPerformance >= NUMERICAL_PRECISION_THRESHOLD_6_FIGURES ) { this.netPerformancePrecision = 0; } @@ -342,13 +383,21 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit { this.netPerformancePercentWithCurrencyEffect = netPerformancePercentWithCurrencyEffect; + if ( + this.data.deviceType === 'mobile' && + this.netPerformancePercentWithCurrencyEffect >= + NUMERICAL_PRECISION_THRESHOLD_3_FIGURES + ) { + this.netPerformancePercentWithCurrencyEffectPrecision = 0; + } + this.netPerformanceWithCurrencyEffect = netPerformanceWithCurrencyEffect; if ( this.data.deviceType === 'mobile' && this.netPerformanceWithCurrencyEffect >= - NUMERICAL_PRECISION_THRESHOLD + NUMERICAL_PRECISION_THRESHOLD_5_FIGURES ) { this.netPerformanceWithCurrencyEffectPrecision = 0; } diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html index e0673a1f5..30ce98634 100644 --- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html +++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html @@ -77,6 +77,7 @@ [colorizeSign]="true" [isPercent]="true" [locale]="data.locale" + [precision]="netPerformancePercentWithCurrencyEffectPrecision" [value]="netPerformancePercentWithCurrencyEffect" > @if ( @@ -95,6 +96,7 @@ size="medium" [isCurrency]="true" [locale]="data.locale" + [precision]="averagePricePrecision" [unit]="SymbolProfile?.currency" [value]="averagePrice" >Average Unit PriceMarket PriceMinimum PriceMaximum Price= - NUMERICAL_PRECISION_THRESHOLD + NUMERICAL_PRECISION_THRESHOLD_6_FIGURES ) { this.precision = 0; } diff --git a/apps/client/src/locales/messages.pl.xlf b/apps/client/src/locales/messages.pl.xlf index 4f7454649..5a47e46a4 100644 --- a/apps/client/src/locales/messages.pl.xlf +++ b/apps/client/src/locales/messages.pl.xlf @@ -7660,7 +7660,7 @@ Investment - Investment + Inwestycja apps/client/src/app/pages/i18n/i18n-page.html 82 @@ -7668,7 +7668,7 @@ Over ${thresholdMax}% of your current investment is in ${currency} (${maxValueRatio}%) - Over ${thresholdMax}% of your current investment is in ${currency} (${maxValueRatio}%) + Ponad ${thresholdMax}% Twojej obecnej inwestycji znajduje się w ${currency} (${maxValueRatio}%) apps/client/src/app/pages/i18n/i18n-page.html 84 @@ -7676,7 +7676,7 @@ The major part of your current investment is in ${currency} (${maxValueRatio}%) and does not exceed ${thresholdMax}% - The major part of your current investment is in ${currency} (${maxValueRatio}%) and does not exceed ${thresholdMax}% + Główna część Twojej obecnej inwestycji znajduje się w ${currency} (${maxValueRatio}%) i nie przekracza ${thresholdMax}% apps/client/src/app/pages/i18n/i18n-page.html 88 @@ -7684,7 +7684,7 @@ start - start + rozpocznij kebab-case libs/common/src/lib/routes/routes.ts @@ -7697,7 +7697,7 @@ Do you really want to generate a new security token? - Do you really want to generate a new security token? + Czy na pewno chcesz wygenerować nowy token bezpieczeństwa? apps/client/src/app/components/user-account-access/user-account-access.component.ts 174 @@ -7705,7 +7705,7 @@ Generate - Generate + Generuj apps/client/src/app/components/user-account-access/user-account-access.html 43 @@ -7713,7 +7713,7 @@ Stocks - Stocks + Akcje apps/client/src/app/components/markets/markets.component.ts 52 @@ -7725,7 +7725,7 @@ Cryptocurrencies - Cryptocurrencies + Kryptowaluty apps/client/src/app/components/markets/markets.component.ts 53 @@ -7745,7 +7745,7 @@ Manage Asset Profile - Manage Asset Profile + Zarządzaj profilem aktywów apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html 437 @@ -7753,7 +7753,7 @@ Alternative Investment - Alternative Investment + Inwestycja alternatywna libs/ui/src/lib/i18n.ts 45 @@ -7761,7 +7761,7 @@ Collectible - Collectible + Kolekcjonerskie libs/ui/src/lib/i18n.ts 55 @@ -7769,7 +7769,7 @@ Average Unit Price - Average Unit Price + Średnia cena jednostkowa apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts 105 diff --git a/libs/common/src/lib/config.ts b/libs/common/src/lib/config.ts index 35934085f..532eb87f4 100644 --- a/libs/common/src/lib/config.ts +++ b/libs/common/src/lib/config.ts @@ -136,7 +136,9 @@ export const HEADER_KEY_SKIP_INTERCEPTOR = 'X-Skip-Interceptor'; export const MAX_TOP_HOLDINGS = 50; -export const NUMERICAL_PRECISION_THRESHOLD = 100000; +export const NUMERICAL_PRECISION_THRESHOLD_3_FIGURES = 100; +export const NUMERICAL_PRECISION_THRESHOLD_5_FIGURES = 10000; +export const NUMERICAL_PRECISION_THRESHOLD_6_FIGURES = 100000; export const PROPERTY_API_KEY_GHOSTFOLIO = 'API_KEY_GHOSTFOLIO'; export const PROPERTY_API_KEY_OPENROUTER = 'API_KEY_OPENROUTER'; 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 4ee7c689a..326440774 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.html +++ b/libs/ui/src/lib/activities-table/activities-table.component.html @@ -171,7 +171,12 @@
- {{ element.date | date: defaultDateFormat }} +
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts index 7b10eba52..7899ec47b 100644 --- a/libs/ui/src/lib/activities-table/activities-table.component.ts +++ b/libs/ui/src/lib/activities-table/activities-table.component.ts @@ -3,7 +3,7 @@ import { ConfirmationDialogType } from '@ghostfolio/client/core/notification/con import { NotificationService } from '@ghostfolio/client/core/notification/notification.service'; import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module'; import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config'; -import { getDateFormatString, getLocale } from '@ghostfolio/common/helper'; +import { getLocale } from '@ghostfolio/common/helper'; import { AssetProfileIdentifier } from '@ghostfolio/common/interfaces'; import { TAG_ID_EXCLUDE_FROM_ANALYSIS } from '@ghostfolio/common/tag-ids.mjs'; import { OrderWithAccount } from '@ghostfolio/common/types'; @@ -126,7 +126,6 @@ export class GfActivitiesTableComponent @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; - public defaultDateFormat: string; public displayedColumns = []; public endOfToday = endOfToday(); public hasDrafts = false; @@ -173,8 +172,6 @@ export class GfActivitiesTableComponent } public ngOnChanges() { - this.defaultDateFormat = getDateFormatString(this.locale); - this.displayedColumns = [ 'select', 'importStatus', diff --git a/libs/ui/src/lib/value/value.component.stories.ts b/libs/ui/src/lib/value/value.component.stories.ts index ff9f5a259..a1f9d06a0 100644 --- a/libs/ui/src/lib/value/value.component.stories.ts +++ b/libs/ui/src/lib/value/value.component.stories.ts @@ -11,7 +11,13 @@ export default { moduleMetadata({ imports: [NgxSkeletonLoaderModule] }) - ] + ], + argTypes: { + deviceType: { + control: 'select', + options: ['desktop', 'mobile'] + } + } } as Meta; type Story = StoryObj; @@ -31,6 +37,16 @@ export const Currency: Story = { } }; +export const DateValue: Story = { + args: { + deviceType: 'desktop', + isDate: true, + locale: 'en-US', + value: new Date().toISOString() + }, + name: 'Date' +}; + export const Label: Story = { args: { locale: 'en-US', diff --git a/libs/ui/src/lib/value/value.component.ts b/libs/ui/src/lib/value/value.component.ts index 55672bacf..e24c00322 100644 --- a/libs/ui/src/lib/value/value.component.ts +++ b/libs/ui/src/lib/value/value.component.ts @@ -22,6 +22,7 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; }) export class GfValueComponent implements OnChanges { @Input() colorizeSign = false; + @Input() deviceType: string; @Input() icon = ''; @Input() isAbsolute = false; @Input() isCurrency = false; @@ -118,7 +119,7 @@ export class GfValueComponent implements OnChanges { { day: '2-digit', month: '2-digit', - year: 'numeric' + year: this.deviceType === 'mobile' ? '2-digit' : 'numeric' } ); } else {