From b155666d219a37309b7d417af6b5264fd1f22f34 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 25 Dec 2022 12:41:48 +0100
Subject: [PATCH] Feature/improve label based on type in create or edit
activity dialog (#1535)
* Improve label
* Update changelog
---
CHANGELOG.md | 1 +
.../create-or-update-activity-dialog.html | 18 +++--
apps/client/src/locales/messages.de.xlf | 68 +++++++++----------
apps/client/src/locales/messages.es.xlf | 68 +++++++++----------
apps/client/src/locales/messages.it.xlf | 68 +++++++++----------
apps/client/src/locales/messages.nl.xlf | 68 +++++++++----------
apps/client/src/locales/messages.xlf | 63 +++++++++--------
7 files changed, 173 insertions(+), 181 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a845c22d..9f0fb0be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
+- Improved the labels based on the type in the create or edit activity dialog
- Removed the data source type `RAKUTEN`
### Fixed
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 5891969f..6262a65d 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
@@ -11,10 +11,10 @@
Type
- BUY
- DIVIDEND
- ITEM
- SELL
+ Buy
+ Dividend
+ Item
+ Sell
@@ -109,7 +109,15 @@
- Unit Price
+
+ Dividend
+ Value
+ Unit Price
+
+
{{ activityForm.controls['currency'].value }}apps/client/src/app/components/accounts-table/accounts-table.component.html
182
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 117,118
+
libs/ui/src/lib/activities-table/activities-table.component.html
235
@@ -374,7 +378,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 218,222
+ 226,230
apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
@@ -402,7 +406,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 225,230
+ 233,238
@@ -944,6 +948,10 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
12
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 14,15
+
Sell
@@ -952,6 +960,10 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
23
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 17,21
+
Investment
@@ -1068,6 +1080,14 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
214
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 15,17
+
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 115,117
+
Please enter the amount of your emergency fund:
@@ -1118,7 +1138,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 201,203
+ 209,211
@@ -1829,38 +1849,14 @@
8,11
-
- BUY
- Kauf
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 14,15
-
-
-
- DIVIDEND
- Dividende
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 15,17
-
-
-
- ITEM
- Wertsache
+
+ Item
+ Wertsache
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
16,18
-
- SELL
- Verkauf
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 17,21
-
-
Name, symbol or ISIN
Name, Symbol oder ISIN
@@ -1890,7 +1886,7 @@
Stückpreis
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 112,113
+ 118,121
libs/ui/src/lib/activities-table/activities-table.component.html
@@ -1902,11 +1898,11 @@
Gebühr
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 131,132
+ 139,140
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 148,149
+ 156,157
libs/ui/src/lib/activities-table/activities-table.component.html
@@ -1922,7 +1918,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 157,160
+ 165,168
@@ -1942,7 +1938,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 171,173
+ 179,181
@@ -2326,7 +2322,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 186,188
+ 194,196
diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlf
index 9325630a..3e86ff92 100644
--- a/apps/client/src/locales/messages.es.xlf
+++ b/apps/client/src/locales/messages.es.xlf
@@ -157,6 +157,10 @@
apps/client/src/app/components/accounts-table/accounts-table.component.html
182
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 117,118
+
libs/ui/src/lib/activities-table/activities-table.component.html
235
@@ -375,7 +379,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 218,222
+ 226,230
apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
@@ -403,7 +407,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 225,230
+ 233,238
@@ -945,6 +949,10 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
12
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 14,15
+
Sell
@@ -953,6 +961,10 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
23
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 17,21
+
Investment
@@ -1069,6 +1081,14 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
214
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 15,17
+
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 115,117
+
Please enter the amount of your emergency fund:
@@ -1119,7 +1139,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 201,203
+ 209,211
@@ -1830,38 +1850,14 @@
8,11
-
- BUY
- COMPRA
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 14,15
-
-
-
- DIVIDEND
- DIVIDENDO
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 15,17
-
-
-
- ITEM
- ARTÍCULO
+
+ Item
+ ARTÍCULO
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
16,18
-
- SELL
- VENTA
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 17,21
-
-
Name, symbol or ISIN
Nombre, símbolo o ISIN
@@ -1891,7 +1887,7 @@
Precio unitario
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 112,113
+ 118,121
libs/ui/src/lib/activities-table/activities-table.component.html
@@ -1903,11 +1899,11 @@
Comisión
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 131,132
+ 139,140
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 148,149
+ 156,157
libs/ui/src/lib/activities-table/activities-table.component.html
@@ -1923,7 +1919,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 157,160
+ 165,168
@@ -1943,7 +1939,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 171,173
+ 179,181
@@ -2307,7 +2303,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 186,188
+ 194,196
diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlf
index 2c81993f..2c2d166c 100644
--- a/apps/client/src/locales/messages.it.xlf
+++ b/apps/client/src/locales/messages.it.xlf
@@ -157,6 +157,10 @@
apps/client/src/app/components/accounts-table/accounts-table.component.html
182
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 117,118
+
libs/ui/src/lib/activities-table/activities-table.component.html
235
@@ -375,7 +379,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 218,222
+ 226,230
apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
@@ -403,7 +407,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 225,230
+ 233,238
@@ -945,6 +949,10 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
12
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 14,15
+
Sell
@@ -953,6 +961,10 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
23
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 17,21
+
Investment
@@ -1069,6 +1081,14 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
214
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 15,17
+
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 115,117
+
Please enter the amount of your emergency fund:
@@ -1119,7 +1139,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 201,203
+ 209,211
@@ -1830,38 +1850,14 @@
8,11
-
- BUY
- ACQUISTO
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 14,15
-
-
-
- DIVIDEND
- DIVIDENDO
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 15,17
-
-
-
- ITEM
- ARTICOLO
+
+ Item
+ ARTICOLO
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
16,18
-
- SELL
- VENDITA
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 17,21
-
-
Name, symbol or ISIN
Nome, simbolo o ISIN
@@ -1891,7 +1887,7 @@
Prezzo unitario
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 112,113
+ 118,121
libs/ui/src/lib/activities-table/activities-table.component.html
@@ -1903,11 +1899,11 @@
Commissione
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 131,132
+ 139,140
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 148,149
+ 156,157
libs/ui/src/lib/activities-table/activities-table.component.html
@@ -1923,7 +1919,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 157,160
+ 165,168
@@ -1943,7 +1939,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 171,173
+ 179,181
@@ -2307,7 +2303,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 186,188
+ 194,196
diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlf
index e4d379b9..4d1ca446 100644
--- a/apps/client/src/locales/messages.nl.xlf
+++ b/apps/client/src/locales/messages.nl.xlf
@@ -156,6 +156,10 @@
apps/client/src/app/components/accounts-table/accounts-table.component.html
182
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 117,118
+
libs/ui/src/lib/activities-table/activities-table.component.html
235
@@ -374,7 +378,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 218,222
+ 226,230
apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
@@ -402,7 +406,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 225,230
+ 233,238
@@ -944,6 +948,10 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
12
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 14,15
+
Sell
@@ -952,6 +960,10 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
23
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 17,21
+
Investment
@@ -1068,6 +1080,14 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
214
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 15,17
+
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 115,117
+
Please enter the amount of your emergency fund:
@@ -1118,7 +1138,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 201,203
+ 209,211
@@ -1829,38 +1849,14 @@
8,11
-
- BUY
- KOPEN
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 14,15
-
-
-
- DIVIDEND
- DIVIDEND
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 15,17
-
-
-
- ITEM
- ITEM
+
+ Item
+ ITEM
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
16,18
-
- SELL
- VERKOPEN
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 17,21
-
-
Name, symbol or ISIN
Naam, symbool of ISIN
@@ -1890,7 +1886,7 @@
Prijs per eenheid
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 112,113
+ 118,121
libs/ui/src/lib/activities-table/activities-table.component.html
@@ -1902,11 +1898,11 @@
Transactiekosten
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 131,132
+ 139,140
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 148,149
+ 156,157
libs/ui/src/lib/activities-table/activities-table.component.html
@@ -1922,7 +1918,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 157,160
+ 165,168
@@ -1942,7 +1938,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 171,173
+ 179,181
@@ -2306,7 +2302,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 186,188
+ 194,196
diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlf
index 4fcc96da..9f506ae1 100644
--- a/apps/client/src/locales/messages.xlf
+++ b/apps/client/src/locales/messages.xlf
@@ -146,6 +146,10 @@
apps/client/src/app/components/accounts-table/accounts-table.component.html
182
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 117,118
+
libs/ui/src/lib/activities-table/activities-table.component.html
235
@@ -345,7 +349,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 218,222
+ 226,230
apps/client/src/app/pages/register/show-access-token-dialog/show-access-token-dialog.html
@@ -372,7 +376,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 225,230
+ 233,238
@@ -859,6 +863,10 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
12
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 14,15
+
Sell
@@ -866,6 +874,10 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
23
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 17,21
+
Investment
@@ -968,6 +980,14 @@
apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
214
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 15,17
+
+
+ apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
+ 115,117
+
Please enter the amount of your emergency fund:
@@ -1014,7 +1034,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 201,203
+ 209,211
@@ -1644,34 +1664,13 @@
8,11
-
- BUY
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 14,15
-
-
-
- DIVIDEND
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 15,17
-
-
-
- ITEM
+
+ Item
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
16,18
-
- SELL
-
- apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 17,21
-
-
Name, symbol or ISIN
@@ -1698,7 +1697,7 @@
Unit Price
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 112,113
+ 118,121
libs/ui/src/lib/activities-table/activities-table.component.html
@@ -1709,11 +1708,11 @@
Fee
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 131,132
+ 139,140
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 148,149
+ 156,157
libs/ui/src/lib/activities-table/activities-table.component.html
@@ -1728,7 +1727,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 157,160
+ 165,168
@@ -1747,7 +1746,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 171,173
+ 179,181
@@ -2069,7 +2068,7 @@
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.html
- 186,188
+ 194,196