fix update activity, hide update cash balance on edit (#1959)

* Fix update activity, hide update cash balance on edit

* Update changelog
This commit is contained in:
Francisco Silva
2023-05-11 09:11:44 +02:00
committed by GitHub
parent a2e1209196
commit 8e000baef2
5 changed files with 16 additions and 11 deletions

View File

@@ -415,13 +415,14 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
: this.activityForm.controls['searchSymbol'].value.symbol,
tags: this.activityForm.controls['tags'].value,
type: this.activityForm.controls['type'].value,
unitPrice: this.activityForm.controls['unitPrice'].value,
updateAccountBalance:
this.activityForm.controls['updateAccountBalance'].value
unitPrice: this.activityForm.controls['unitPrice'].value
};
if (this.data.activity.id) {
(activity as UpdateOrderDto).id = this.data.activity.id;
} else {
(activity as CreateOrderDto).updateAccountBalance =
this.activityForm.controls['updateAccountBalance'].value;
}
this.dialogRef.close({ activity });

View File

@@ -18,8 +18,12 @@
</mat-select>
</mat-form-field>
</div>
<div>
<mat-form-field appearance="outline" class="mb-1 without-hint w-100">
<div [ngClass]="{'mb-3': data.activity.id}">
<mat-form-field
appearance="outline"
class="w-100"
[ngClass]="{'mb-1 without-hint': !data.activity.id}"
>
<mat-label i18n>Account</mat-label>
<mat-select formControlName="accountId">
<mat-option
@@ -32,7 +36,7 @@
</mat-select>
</mat-form-field>
</div>
<div class="mb-3">
<div class="mb-3" [ngClass]="{'d-none': data.activity.id}">
<mat-checkbox color="primary" formControlName="updateAccountBalance" i18n
>Update Cash Balance</mat-checkbox
>