Browse Source

Add support for translated labels

pull/1178/head
Thomas 3 years ago
parent
commit
8422d9798f
  1. 12
      apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
  2. 71
      apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
  3. 15
      apps/client/src/app/pages/portfolio/allocations/allocations-page.html
  4. 15
      apps/client/src/app/pages/public/public-page.html
  5. 6
      libs/ui/src/lib/value/value.component.html
  6. 1
      libs/ui/src/lib/value/value.component.stories.ts
  7. 1
      libs/ui/src/lib/value/value.component.ts

12
apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html

@ -21,18 +21,10 @@
<div class="row"> <div class="row">
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value size="medium" [value]="accountType">Account Type</gf-value>
label="Account Type"
size="medium"
[value]="accountType"
></gf-value>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value size="medium" [value]="platformName">Platform</gf-value>
label="Platform"
size="medium"
[value]="platformName"
></gf-value>
</div> </div>
</div> </div>

71
apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html

@ -35,112 +35,125 @@
<div class="row"> <div class="row">
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="Change" i18n
size="medium" size="medium"
[colorizeSign]="true" [colorizeSign]="true"
[currency]="data.baseCurrency" [currency]="data.baseCurrency"
[locale]="data.locale" [locale]="data.locale"
[value]="netPerformance" [value]="netPerformance"
></gf-value> >Change</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="Performance" i18n
size="medium" size="medium"
[colorizeSign]="true" [colorizeSign]="true"
[isPercent]="true" [isPercent]="true"
[locale]="data.locale" [locale]="data.locale"
[value]="netPerformancePercent" [value]="netPerformancePercent"
></gf-value> >Performance</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="Average Unit Price" i18n
size="medium" size="medium"
[currency]="SymbolProfile?.currency" [currency]="SymbolProfile?.currency"
[locale]="data.locale" [locale]="data.locale"
[value]="averagePrice" [value]="averagePrice"
></gf-value> >Average Unit Price</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="Market Price" i18n
size="medium" size="medium"
[currency]="SymbolProfile?.currency" [currency]="SymbolProfile?.currency"
[locale]="data.locale" [locale]="data.locale"
[value]="marketPrice" [value]="marketPrice"
></gf-value> >Market Price</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="Minimum Price" i18n
size="medium" size="medium"
[currency]="SymbolProfile?.currency" [currency]="SymbolProfile?.currency"
[locale]="data.locale" [locale]="data.locale"
[ngClass]="{ 'text-danger': minPrice?.toFixed(2) === marketPrice?.toFixed(2) && maxPrice?.toFixed(2) !== minPrice?.toFixed(2) }" [ngClass]="{ 'text-danger': minPrice?.toFixed(2) === marketPrice?.toFixed(2) && maxPrice?.toFixed(2) !== minPrice?.toFixed(2) }"
[value]="minPrice" [value]="minPrice"
></gf-value> >Minimum Price</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="Maximum Price" i18n
size="medium" size="medium"
[currency]="SymbolProfile?.currency" [currency]="SymbolProfile?.currency"
[locale]="data.locale" [locale]="data.locale"
[ngClass]="{ 'text-success': maxPrice?.toFixed(2) === marketPrice?.toFixed(2) && maxPrice?.toFixed(2) !== minPrice?.toFixed(2) }" [ngClass]="{ 'text-success': maxPrice?.toFixed(2) === marketPrice?.toFixed(2) && maxPrice?.toFixed(2) !== minPrice?.toFixed(2) }"
[value]="maxPrice" [value]="maxPrice"
></gf-value> >Maximum Price</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="Quantity" i18n
size="medium" size="medium"
[locale]="data.locale" [locale]="data.locale"
[precision]="quantityPrecision" [precision]="quantityPrecision"
[value]="quantity" [value]="quantity"
></gf-value> >Quantity</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="Investment" i18n
size="medium" size="medium"
[currency]="data.baseCurrency" [currency]="data.baseCurrency"
[locale]="data.locale" [locale]="data.locale"
[value]="investment" [value]="investment"
></gf-value> >Investment</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="First Buy Date" i18n
size="medium" size="medium"
[isDate]="true" [isDate]="true"
[locale]="data.locale" [locale]="data.locale"
[value]="firstBuyDate" [value]="firstBuyDate"
></gf-value> >First Buy Date</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
i18n
size="medium" size="medium"
[label]="transactionCount === 1 ? 'Transaction' : 'Transactions'"
[locale]="data.locale" [locale]="data.locale"
[value]="transactionCount" [value]="transactionCount"
></gf-value> >{transactionCount === 1, plural, =1 {Transaction} other
{Transactions}}</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="Asset Class" i18n
size="medium" size="medium"
[hidden]="!SymbolProfile?.assetClass" [hidden]="!SymbolProfile?.assetClass"
[value]="SymbolProfile?.assetClass" [value]="SymbolProfile?.assetClass"
></gf-value> >Asset Class</gf-value
>
</div> </div>
<div class="col-6 mb-3"> <div class="col-6 mb-3">
<gf-value <gf-value
label="Asset Sub Class" i18n
size="medium" size="medium"
[hidden]="!SymbolProfile?.assetSubClass" [hidden]="!SymbolProfile?.assetSubClass"
[value]="SymbolProfile?.assetSubClass" [value]="SymbolProfile?.assetSubClass"
></gf-value> >Asset Sub Class</gf-value
>
</div> </div>
<ng-container <ng-container
*ngIf="SymbolProfile?.countries?.length > 0 || SymbolProfile?.sectors?.length > 0" *ngIf="SymbolProfile?.countries?.length > 0 || SymbolProfile?.sectors?.length > 0"
@ -150,22 +163,24 @@
> >
<div *ngIf="SymbolProfile?.sectors?.length === 1" class="col-6 mb-3"> <div *ngIf="SymbolProfile?.sectors?.length === 1" class="col-6 mb-3">
<gf-value <gf-value
label="Sector" i18n
size="medium" size="medium"
[locale]="data.locale" [locale]="data.locale"
[value]="SymbolProfile.sectors[0].name" [value]="SymbolProfile.sectors[0].name"
></gf-value> >Sector</gf-value
>
</div> </div>
<div <div
*ngIf="SymbolProfile?.countries?.length === 1" *ngIf="SymbolProfile?.countries?.length === 1"
class="col-6 mb-3" class="col-6 mb-3"
> >
<gf-value <gf-value
label="Country" i18n
size="medium" size="medium"
[locale]="data.locale" [locale]="data.locale"
[value]="SymbolProfile.countries[0].name" [value]="SymbolProfile.countries[0].name"
></gf-value> >Country</gf-value
>
</div> </div>
</ng-container> </ng-container>
<ng-template #charts> <ng-template #charts>

15
apps/client/src/app/pages/portfolio/allocations/allocations-page.html

@ -233,27 +233,30 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-4 my-2"> <div class="col-xs-12 col-md-4 my-2">
<gf-value <gf-value
label="Developed Markets" i18n
size="large" size="large"
[isPercent]="true" [isPercent]="true"
[value]="markets?.developedMarkets?.value" [value]="markets?.developedMarkets?.value"
></gf-value> >Developed Markets</gf-value
>
</div> </div>
<div class="col-xs-12 col-md-4 my-2"> <div class="col-xs-12 col-md-4 my-2">
<gf-value <gf-value
label="Emerging Markets" i18n
size="large" size="large"
[isPercent]="true" [isPercent]="true"
[value]="markets?.emergingMarkets?.value" [value]="markets?.emergingMarkets?.value"
></gf-value> >Emerging Markets</gf-value
>
</div> </div>
<div class="col-xs-12 col-md-4 my-2"> <div class="col-xs-12 col-md-4 my-2">
<gf-value <gf-value
label="Other Markets" i18n
size="large" size="large"
[isPercent]="true" [isPercent]="true"
[value]="markets?.otherMarkets?.value" [value]="markets?.otherMarkets?.value"
></gf-value> >Other Markets</gf-value
>
</div> </div>
</div> </div>
</mat-card-content> </mat-card-content>

15
apps/client/src/app/pages/public/public-page.html

@ -82,27 +82,30 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-4 my-2"> <div class="col-xs-12 col-md-4 my-2">
<gf-value <gf-value
label="Developed Markets" i18n
size="large" size="large"
[isPercent]="true" [isPercent]="true"
[value]="markets?.developedMarkets?.value" [value]="markets?.developedMarkets?.value"
></gf-value> >Developed Markets</gf-value
>
</div> </div>
<div class="col-xs-12 col-md-4 my-2"> <div class="col-xs-12 col-md-4 my-2">
<gf-value <gf-value
label="Emerging Markets" i18n
size="large" size="large"
[isPercent]="true" [isPercent]="true"
[value]="markets?.emergingMarkets?.value" [value]="markets?.emergingMarkets?.value"
></gf-value> >Emerging Markets</gf-value
>
</div> </div>
<div class="col-xs-12 col-md-4 my-2"> <div class="col-xs-12 col-md-4 my-2">
<gf-value <gf-value
label="Other Markets" i18n
size="large" size="large"
[isPercent]="true" [isPercent]="true"
[value]="markets?.otherMarkets?.value" [value]="markets?.otherMarkets?.value"
></gf-value> >Other Markets</gf-value
>
</div> </div>
</div> </div>
</mat-card-content> </mat-card-content>

6
libs/ui/src/lib/value/value.component.html

@ -43,13 +43,13 @@
</div> </div>
</ng-container> </ng-container>
</div> </div>
<ng-container *ngIf="label"> <ng-container>
<div *ngIf="size === 'large'"> <div *ngIf="size === 'large'">
<span class="h6">{{ label }}</span> <span class="h6"><ng-content></ng-content></span>
<span *ngIf="subLabel" class="text-muted"> {{ subLabel }}</span> <span *ngIf="subLabel" class="text-muted"> {{ subLabel }}</span>
</div> </div>
<small *ngIf="size !== 'large'"> <small *ngIf="size !== 'large'">
{{ label }} <ng-content></ng-content>
</small> </small>
</ng-container> </ng-container>
</ng-container> </ng-container>

1
libs/ui/src/lib/value/value.component.stories.ts

@ -31,7 +31,6 @@ Currency.args = {
export const Label = Template.bind({}); export const Label = Template.bind({});
Label.args = { Label.args = {
label: 'Label',
locale: 'en-US', locale: 'en-US',
value: 7.25 value: 7.25
}; };

1
libs/ui/src/lib/value/value.component.ts

@ -20,7 +20,6 @@ export class ValueComponent implements OnChanges {
@Input() isCurrency = false; @Input() isCurrency = false;
@Input() isDate = false; @Input() isDate = false;
@Input() isPercent = false; @Input() isPercent = false;
@Input() label = '';
@Input() locale = getLocale(); @Input() locale = getLocale();
@Input() position = ''; @Input() position = '';
@Input() precision: number | undefined; @Input() precision: number | undefined;

Loading…
Cancel
Save