From e228b4925c94e69805784523fbf72cb5e107e991 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Thu, 25 Jul 2024 19:38:52 +0200 Subject: [PATCH 1/2] Feature/update notes of personal finance tools (#3611) * Update notes --- libs/common/src/lib/personal-finance-tools.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/common/src/lib/personal-finance-tools.ts b/libs/common/src/lib/personal-finance-tools.ts index aaa9d8e69..760629c8f 100644 --- a/libs/common/src/lib/personal-finance-tools.ts +++ b/libs/common/src/lib/personal-finance-tools.ts @@ -76,7 +76,7 @@ export const personalFinanceTools: Product[] = [ key: 'capmon', name: 'CapMon.org', origin: `Germany`, - note: 'CapMon.org has discontinued in 2023', + note: 'CapMon.org was discontinued in 2023', slogan: 'Next Generation Assets Tracking' }, { @@ -223,7 +223,7 @@ export const personalFinanceTools: Product[] = [ hasSelfHostingAbility: false, key: 'intuit-mint', name: 'Intuit Mint', - note: 'Intuit Mint has discontinued in 2023', + note: 'Intuit Mint was discontinued in 2023', origin: `United States`, pricingPerYear: '$60', slogan: 'Managing money, made simple' @@ -286,7 +286,7 @@ export const personalFinanceTools: Product[] = [ key: 'maybe-finance', languages: ['English'], name: 'Maybe Finance', - note: 'Maybe Finance has discontinued in 2023', + note: 'Maybe Finance was discontinued in 2023', origin: `United States`, pricingPerYear: '$145', regions: [`United States`], @@ -386,7 +386,7 @@ export const personalFinanceTools: Product[] = [ hasFreePlan: true, key: 'portfoloo', name: 'Portfoloo', - note: 'Portfoloo has discontinued', + note: 'Portfoloo was discontinued', slogan: 'Free Stock Portfolio Tracker with unlimited portfolio and stocks for DIY investors' }, @@ -451,7 +451,7 @@ export const personalFinanceTools: Product[] = [ hasFreePlan: true, key: 'sharesmaster', name: 'SharesMaster', - note: 'SharesMaster has discontinued', + note: 'SharesMaster was discontinued', slogan: 'Free Stock Portfolio Tracker' }, { @@ -492,7 +492,7 @@ export const personalFinanceTools: Product[] = [ key: 'stockmarketeye', name: 'StockMarketEye', origin: `France`, - note: 'StockMarketEye has discontinued in 2023', + note: 'StockMarketEye was discontinued in 2023', slogan: 'A Powerful Portfolio & Investment Tracking App' }, { @@ -593,6 +593,7 @@ export const personalFinanceTools: Product[] = [ key: 'yeekatee', languages: ['Deutsch', 'English', 'Español', 'Français', 'Italiano'], name: 'yeekatee', + note: 'yeekatee was discontinued in 2024', origin: `Switzerland`, regions: [`Global`], slogan: 'Connect. Share. Invest.' From 601e6f41476b6bd1ce5ab4e75153d8d52c14c77e Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Thu, 25 Jul 2024 19:39:07 +0200 Subject: [PATCH 2/2] Feature/improve account selector of create or update activity dialog (#3607) * Improve empty value of account selector * Update changelog --- CHANGELOG.md | 1 + ...ate-or-update-activity-dialog.component.ts | 26 +++++++++++-------- .../create-or-update-activity-dialog.html | 15 ++++++----- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fdd38c18..153d40a2e 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 handling of the numerical precision in the value component +- Improved the account selector of the create or update activity dialog - Improved the language localization for Spanish (`es`) - Upgraded `angular` from version `18.0.4` to `18.1.1` - Upgraded `Nx` from version `19.4.3` to `19.5.1` 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 8ebf936a2..dedcdd4a9 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 @@ -51,6 +51,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy { public filteredTagsObservable: Observable = of([]); public isLoading = false; public isToday = isToday; + public mode: 'create' | 'update'; public platforms: { id: string; name: string }[]; public separatorKeysCodes: number[] = [ENTER, COMMA]; public tags: Tag[] = []; @@ -71,6 +72,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy { ) {} public ngOnInit() { + this.mode = this.data.activity.id ? 'update' : 'create'; this.locale = this.data.user?.settings?.locale; this.dateAdapter.setLocale(this.locale); @@ -92,7 +94,9 @@ export class CreateOrUpdateActivityDialog implements OnDestroy { this.activityForm = this.formBuilder.group({ accountId: [ - this.data.accounts.length === 1 && !this.data.activity?.accountId + this.data.accounts.length === 1 && + !this.data.activity?.accountId && + this.mode === 'create' ? this.data.accounts[0].id : this.data.activity?.accountId, Validators.required @@ -479,29 +483,29 @@ export class CreateOrUpdateActivityDialog implements OnDestroy { }; try { - if (this.data.activity.id) { - (activity as UpdateOrderDto).id = this.data.activity.id; + if (this.mode === 'create') { + (activity as CreateOrderDto).updateAccountBalance = + this.activityForm.get('updateAccountBalance').value; await validateObjectForForm({ - classDto: UpdateOrderDto, + classDto: CreateOrderDto, form: this.activityForm, ignoreFields: ['dataSource', 'date'], - object: activity as UpdateOrderDto + object: activity }); - this.dialogRef.close(activity as UpdateOrderDto); + this.dialogRef.close(activity as CreateOrderDto); } else { - (activity as CreateOrderDto).updateAccountBalance = - this.activityForm.get('updateAccountBalance').value; + (activity as UpdateOrderDto).id = this.data.activity.id; await validateObjectForForm({ - classDto: CreateOrderDto, + classDto: UpdateOrderDto, form: this.activityForm, ignoreFields: ['dataSource', 'date'], - object: activity + object: activity as UpdateOrderDto }); - this.dialogRef.close(activity as CreateOrderDto); + this.dialogRef.close(activity as UpdateOrderDto); } } catch (error) { console.error(error); 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 a3b960d82..56cb66fcd 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 @@ -4,10 +4,10 @@ (keyup.enter)="activityForm.valid && onSubmit()" (ngSubmit)="onSubmit()" > - @if (data.activity.id) { -

Update activity

- } @else { + @if (mode === 'create') {

Add activity

+ } @else { +

Update activity

}
@@ -76,16 +76,17 @@
-
+
Account @if ( - !activityForm.get('accountId').hasValidator(Validators.required) + !activityForm.get('accountId').hasValidator(Validators.required) || + (!activityForm.get('accountId').value && mode === 'update') ) { } @@ -106,7 +107,7 @@
-
+
Update Cash Balance