Browse Source

Refactoring

pull/4630/head
Thomas Kaul 4 months ago
parent
commit
85580cd171
  1. 16
      apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts

16
apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts

@ -220,7 +220,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
.get('type') .get('type')
.valueChanges.pipe(takeUntil(this.unsubscribeSubject)) .valueChanges.pipe(takeUntil(this.unsubscribeSubject))
.subscribe((type: Type) => { .subscribe((type: Type) => {
if (type === 'ITEM') { if (['ITEM'].includes(type)) {
this.activityForm this.activityForm
.get('accountId') .get('accountId')
.removeValidators(Validators.required); .removeValidators(Validators.required);
@ -248,11 +248,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
this.activityForm.get('searchSymbol').updateValueAndValidity(); this.activityForm.get('searchSymbol').updateValueAndValidity();
this.activityForm.get('updateAccountBalance').disable(); this.activityForm.get('updateAccountBalance').disable();
this.activityForm.get('updateAccountBalance').setValue(false); this.activityForm.get('updateAccountBalance').setValue(false);
} else if ( } else if (['FEE', 'INTEREST', 'LIABILITY'].includes(type)) {
type === 'FEE' ||
type === 'INTEREST' ||
type === 'LIABILITY'
) {
this.activityForm this.activityForm
.get('accountId') .get('accountId')
.removeValidators(Validators.required); .removeValidators(Validators.required);
@ -271,16 +267,16 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
.removeValidators(Validators.required); .removeValidators(Validators.required);
this.activityForm.get('dataSource').updateValueAndValidity(); this.activityForm.get('dataSource').updateValueAndValidity();
if (type === 'INTEREST' || type === 'LIABILITY') { if (['INTEREST', 'LIABILITY'].includes(type)) {
this.activityForm.get('fee').setValue(0); this.activityForm.get('fee').setValue(0);
} }
this.activityForm.get('name').setValidators(Validators.required); this.activityForm.get('name').setValidators(Validators.required);
this.activityForm.get('name').updateValueAndValidity(); this.activityForm.get('name').updateValueAndValidity();
if (type === 'FEE') { if (['FEE'].includes(type)) {
this.activityForm.get('quantity').setValue(0); this.activityForm.get('quantity').setValue(0);
} else if (type === 'INTEREST' || type === 'LIABILITY') { } else if (['INTEREST', 'LIABILITY'].includes(type)) {
this.activityForm.get('quantity').setValue(1); this.activityForm.get('quantity').setValue(1);
} }
@ -289,7 +285,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
.removeValidators(Validators.required); .removeValidators(Validators.required);
this.activityForm.get('searchSymbol').updateValueAndValidity(); this.activityForm.get('searchSymbol').updateValueAndValidity();
if (type === 'FEE') { if (['FEE'].includes(type)) {
this.activityForm.get('unitPrice').setValue(0); this.activityForm.get('unitPrice').setValue(0);
} }

Loading…
Cancel
Save