topaLE
/
ghostfolio
mirror of https://github.com/ghostfolio/ghostfolio
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Clean up

pull/5145/head
Thomas Kaul 1 month ago
parent
d946b8336c
commit
98b563e0f9
6 changed files with 93 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
  2. 8
      apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
  3. 8
      apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
  4. 8
      apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
  5. 8
      apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
  6. 145
      apps/client/src/app/pages/i18n/i18n-page.html

10
apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
View File

@ -37,8 +37,8 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3), thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3), valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3)
}, }
}), }),
value: false value: false
}; };
@ -49,7 +49,7 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3), thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3), valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: false value: false
@ -63,7 +63,7 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
placeholders: { placeholders: {
thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3), thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3), thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3), valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: true value: true
@ -90,7 +90,7 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
public getName() { public getName() {
return this.i18nService.getTranslation({ return this.i18nService.getTranslation({
id: 'rule.regionalMarketClusterRiskAsiaPacific', id: 'rule.regionalMarketClusterRiskAsiaPacific',
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode()
}); });
} }

8
apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
View File

@ -39,7 +39,7 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3), thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3), valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3)
} }
}), }),
value: false value: false
@ -51,7 +51,7 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3), thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3), valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3)
} }
}), }),
value: false value: false
@ -65,7 +65,7 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
placeholders: { placeholders: {
thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3), thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3), thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3), valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3)
} }
}), }),
value: true value: true
@ -92,7 +92,7 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
public getName() { public getName() {
return this.i18nService.getTranslation({ return this.i18nService.getTranslation({
id: 'rule.regionalMarketClusterRiskEmergingMarkets', id: 'rule.regionalMarketClusterRiskEmergingMarkets',
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode()
}); });
} }

8
apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
View File

@ -37,7 +37,7 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3), thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
valueRatio: (europeMarketValueRatio * 100).toPrecision(3), valueRatio: (europeMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: false value: false
@ -49,7 +49,7 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3), thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
valueRatio: (europeMarketValueRatio * 100).toPrecision(3), valueRatio: (europeMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: false value: false
@ -63,7 +63,7 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
placeholders: { placeholders: {
thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3), thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3), thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
valueRatio: (europeMarketValueRatio * 100).toPrecision(3), valueRatio: (europeMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: true value: true
@ -90,7 +90,7 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
public getName() { public getName() {
return this.i18nService.getTranslation({ return this.i18nService.getTranslation({
id: 'rule.regionalMarketClusterRiskEurope', id: 'rule.regionalMarketClusterRiskEurope',
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode()
}); });
} }

8
apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
View File

@ -37,7 +37,7 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3), thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
valueRatio: (japanMarketValueRatio * 100).toPrecision(3), valueRatio: (japanMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: false value: false
@ -49,7 +49,7 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3), thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
valueRatio: (japanMarketValueRatio * 100).toPrecision(3), valueRatio: (japanMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: false value: false
@ -63,7 +63,7 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
placeholders: { placeholders: {
thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3), thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3), thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
valueRatio: (japanMarketValueRatio * 100).toPrecision(3), valueRatio: (japanMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: true value: true
@ -90,7 +90,7 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
public getName() { public getName() {
return this.i18nService.getTranslation({ return this.i18nService.getTranslation({
id: 'rule.regionalMarketClusterRiskJapan', id: 'rule.regionalMarketClusterRiskJapan',
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode()
}); });
} }

8
apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
View File

@ -37,7 +37,7 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3), thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3), valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: false value: false
@ -49,7 +49,7 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode(),
placeholders: { placeholders: {
thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3), thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3), valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: false value: false
@ -63,7 +63,7 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
placeholders: { placeholders: {
thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3), thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3), thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3), valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3)
} }
}), }),
value: true value: true
@ -90,7 +90,7 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
public getName() { public getName() {
return this.i18nService.getTranslation({ return this.i18nService.getTranslation({
id: 'rule.regionalMarketClusterRiskNorthAmerica', id: 'rule.regionalMarketClusterRiskNorthAmerica',
languageCode: this.getLanguageCode(), languageCode: this.getLanguageCode()
}); });
} }

145
apps/client/src/app/pages/i18n/i18n-page.html
View File

@ -12,79 +12,6 @@
</li> </li>
<li i18n="@@myAccount">My Account</li> <li i18n="@@myAccount">My Account</li>
<li i18n="@@rule.accountClusterRisk.category">Account Cluster Risks</li> <li i18n="@@rule.accountClusterRisk.category">Account Cluster Risks</li>
<li i18n="@@rule.regionalMarketClusterRiskAsiaPacific">Asia-Pacific</li>
<li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.max">
The Asia-Pacific market contribution of your current investment
($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.min">
The Asia-Pacific market contribution of your current investment
($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.true">
The Asia-Pacific market contribution of your current investment
($&#123;valueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets">
Emerging Markets
</li>
<li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.max">
The Emerging Markets contribution of your current investment
($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.min">
The Emerging Markets contribution of your current investment
($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.true">
The Emerging Markets contribution of your current investment
($&#123;valueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEurope">Europe</li>
<li i18n="@@rule.regionalMarketClusterRiskEurope.false.max">
The Europe market contribution of your current investment
($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEurope.false.min">
The Europe market contribution of your current investment
($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEurope.true">
The Europe market contribution of your current investment
($&#123;valueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskJapan">Japan</li>
<li i18n="@@rule.regionalMarketClusterRiskJapan.false.max">
The Japan market contribution of your current investment
($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskJapan.false.min">
The Japan market contribution of your current investment
($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskJapan.true">
The Japan market contribution of your current investment
($&#123;valueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskNorthAmerica">North America</li>
<li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.max">
The North America market contribution of your current investment
($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.min">
The North America market contribution of your current investment
($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.true">
The North America market contribution of your current investment
($&#123;valueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.accountClusterRiskCurrentInvestment">Investment</li> <li i18n="@@rule.accountClusterRiskCurrentInvestment">Investment</li>
<li i18n="@@rule.accountClusterRiskCurrentInvestment.false"> <li i18n="@@rule.accountClusterRiskCurrentInvestment.false">
Over $&#123;thresholdMax&#125;% of your current investment is at Over $&#123;thresholdMax&#125;% of your current investment is at
@ -222,6 +149,78 @@
<li i18n="@@rule.regionalMarketClusterRisk.category"> <li i18n="@@rule.regionalMarketClusterRisk.category">
Regional Market Cluster Risks Regional Market Cluster Risks
</li> </li>
<li i18n="@@rule.regionalMarketClusterRiskAsiaPacific">Asia-Pacific</li>
<li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.max">
The Asia-Pacific market contribution of your current investment
($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.min">
The Asia-Pacific market contribution of your current investment
($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.true">
The Asia-Pacific market contribution of your current investment
($&#123;valueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets">
Emerging Markets
</li>
<li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.max">
The Emerging Markets contribution of your current investment
($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.min">
The Emerging Markets contribution of your current investment
($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.true">
The Emerging Markets contribution of your current investment
($&#123;valueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEurope">Europe</li>
<li i18n="@@rule.regionalMarketClusterRiskEurope.false.max">
The Europe market contribution of your current investment
($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEurope.false.min">
The Europe market contribution of your current investment
($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskEurope.true">
The Europe market contribution of your current investment
($&#123;valueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskJapan">Japan</li>
<li i18n="@@rule.regionalMarketClusterRiskJapan.false.max">
The Japan market contribution of your current investment
($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskJapan.false.min">
The Japan market contribution of your current investment
($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskJapan.true">
The Japan market contribution of your current investment
($&#123;valueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskNorthAmerica">North America</li>
<li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.max">
The North America market contribution of your current investment
($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.min">
The North America market contribution of your current investment
($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
</li>
<li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.true">
The North America market contribution of your current investment
($&#123;valueRatio&#125;%) is within the range of
$&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
</li>
<li i18n="@@slogan">Open Source Wealth Management Software</li> <li i18n="@@slogan">Open Source Wealth Management Software</li>
</ul> </ul>
</div> </div>

Write Preview
Loading…
Cancel
Save