|
|
|
@ -4,8 +4,11 @@
|
|
|
|
(keyup.enter)="activityForm.valid && onSubmit()"
|
|
|
|
(keyup.enter)="activityForm.valid && onSubmit()"
|
|
|
|
(ngSubmit)="onSubmit()"
|
|
|
|
(ngSubmit)="onSubmit()"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<h1 *ngIf="data.activity.id" i18n mat-dialog-title>Update activity</h1>
|
|
|
|
@if (data.activity.id) {
|
|
|
|
<h1 *ngIf="!data.activity.id" i18n mat-dialog-title>Add activity</h1>
|
|
|
|
<h1 i18n mat-dialog-title>Update activity</h1>
|
|
|
|
|
|
|
|
} @else {
|
|
|
|
|
|
|
|
<h1 i18n mat-dialog-title>Add activity</h1>
|
|
|
|
|
|
|
|
}
|
|
|
|
<div class="flex-grow-1 py-3" mat-dialog-content>
|
|
|
|
<div class="flex-grow-1 py-3" mat-dialog-content>
|
|
|
|
<div class="mb-3">
|
|
|
|
<div class="mb-3">
|
|
|
|
<mat-form-field appearance="outline" class="w-100">
|
|
|
|
<mat-form-field appearance="outline" class="w-100">
|
|
|
|
@ -81,25 +84,25 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<mat-label i18n>Account</mat-label>
|
|
|
|
<mat-label i18n>Account</mat-label>
|
|
|
|
<mat-select formControlName="accountId">
|
|
|
|
<mat-select formControlName="accountId">
|
|
|
|
<mat-option
|
|
|
|
@if (
|
|
|
|
*ngIf="
|
|
|
|
|
|
|
|
!activityForm.get('accountId').hasValidator(Validators.required)
|
|
|
|
!activityForm.get('accountId').hasValidator(Validators.required)
|
|
|
|
"
|
|
|
|
) {
|
|
|
|
[value]="null"
|
|
|
|
<mat-option [value]="null" />
|
|
|
|
/>
|
|
|
|
}
|
|
|
|
<mat-option
|
|
|
|
@for (account of data.accounts; track account) {
|
|
|
|
*ngFor="let account of data.accounts"
|
|
|
|
<mat-option [value]="account.id">
|
|
|
|
[value]="account.id"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
<div class="d-flex">
|
|
|
|
<div class="d-flex">
|
|
|
|
|
|
|
|
@if (account.Platform?.url) {
|
|
|
|
<gf-asset-profile-icon
|
|
|
|
<gf-asset-profile-icon
|
|
|
|
*ngIf="account.Platform?.url"
|
|
|
|
|
|
|
|
class="mr-1"
|
|
|
|
class="mr-1"
|
|
|
|
[tooltip]="account.Platform?.name"
|
|
|
|
[tooltip]="account.Platform?.name"
|
|
|
|
[url]="account.Platform?.url"
|
|
|
|
[url]="account.Platform?.url"
|
|
|
|
/><span>{{ account.name }}</span>
|
|
|
|
/>
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
<span>{{ account.name }}</span>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</mat-option>
|
|
|
|
</mat-option>
|
|
|
|
|
|
|
|
}
|
|
|
|
</mat-select>
|
|
|
|
</mat-select>
|
|
|
|
</mat-form-field>
|
|
|
|
</mat-form-field>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
@ -139,9 +142,9 @@
|
|
|
|
<mat-form-field appearance="outline" class="w-100">
|
|
|
|
<mat-form-field appearance="outline" class="w-100">
|
|
|
|
<mat-label i18n>Currency</mat-label>
|
|
|
|
<mat-label i18n>Currency</mat-label>
|
|
|
|
<mat-select formControlName="currency">
|
|
|
|
<mat-select formControlName="currency">
|
|
|
|
<mat-option *ngFor="let currency of currencies" [value]="currency">{{
|
|
|
|
@for (currency of currencies; track currency) {
|
|
|
|
currency
|
|
|
|
<mat-option [value]="currency">{{ currency }}</mat-option>
|
|
|
|
}}</mat-option>
|
|
|
|
}
|
|
|
|
</mat-select>
|
|
|
|
</mat-select>
|
|
|
|
</mat-form-field>
|
|
|
|
</mat-form-field>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
@ -186,18 +189,24 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<div class="align-items-start d-flex">
|
|
|
|
<div class="align-items-start d-flex">
|
|
|
|
<mat-form-field appearance="outline" class="w-100">
|
|
|
|
<mat-form-field appearance="outline" class="w-100">
|
|
|
|
<mat-label
|
|
|
|
<mat-label>
|
|
|
|
><ng-container [ngSwitch]="activityForm.get('type')?.value">
|
|
|
|
@switch (activityForm.get('type')?.value) {
|
|
|
|
<ng-container *ngSwitchCase="'DIVIDEND'" i18n
|
|
|
|
@case ('DIVIDEND') {
|
|
|
|
>Dividend</ng-container
|
|
|
|
<ng-container i18n>Dividend</ng-container>
|
|
|
|
>
|
|
|
|
}
|
|
|
|
<ng-container *ngSwitchCase="'INTEREST'" i18n>Value</ng-container>
|
|
|
|
@case ('INTEREST') {
|
|
|
|
<ng-container *ngSwitchCase="'ITEM'" i18n>Value</ng-container>
|
|
|
|
<ng-container i18n>Value</ng-container>
|
|
|
|
<ng-container *ngSwitchCase="'LIABILITY'" i18n
|
|
|
|
}
|
|
|
|
>Value</ng-container
|
|
|
|
@case ('ITEM') {
|
|
|
|
>
|
|
|
|
<ng-container i18n>Value</ng-container>
|
|
|
|
<ng-container *ngSwitchDefault i18n>Unit Price</ng-container>
|
|
|
|
}
|
|
|
|
</ng-container>
|
|
|
|
@case ('LIABILITY') {
|
|
|
|
|
|
|
|
<ng-container i18n>Value</ng-container>
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
@default {
|
|
|
|
|
|
|
|
<ng-container i18n>Unit Price</ng-container>
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
</mat-label>
|
|
|
|
</mat-label>
|
|
|
|
<input
|
|
|
|
<input
|
|
|
|
formControlName="unitPriceInCustomCurrency"
|
|
|
|
formControlName="unitPriceInCustomCurrency"
|
|
|
|
@ -210,18 +219,17 @@
|
|
|
|
[ngClass]="{ 'd-none': !activityForm.get('currency')?.value }"
|
|
|
|
[ngClass]="{ 'd-none': !activityForm.get('currency')?.value }"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<mat-select formControlName="currencyOfUnitPrice">
|
|
|
|
<mat-select formControlName="currencyOfUnitPrice">
|
|
|
|
<mat-option
|
|
|
|
@for (currency of currencies; track currency) {
|
|
|
|
*ngFor="let currency of currencies"
|
|
|
|
<mat-option [value]="currency">
|
|
|
|
[value]="currency"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
{{ currency }}
|
|
|
|
{{ currency }}
|
|
|
|
</mat-option>
|
|
|
|
</mat-option>
|
|
|
|
|
|
|
|
}
|
|
|
|
</mat-select>
|
|
|
|
</mat-select>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<mat-error
|
|
|
|
@if (
|
|
|
|
*ngIf="
|
|
|
|
|
|
|
|
activityForm.get('unitPriceInCustomCurrency').hasError('invalid')
|
|
|
|
activityForm.get('unitPriceInCustomCurrency').hasError('invalid')
|
|
|
|
"
|
|
|
|
) {
|
|
|
|
|
|
|
|
<mat-error
|
|
|
|
><ng-container i18n
|
|
|
|
><ng-container i18n
|
|
|
|
>Oops! Could not get the historical exchange rate
|
|
|
|
>Oops! Could not get the historical exchange rate
|
|
|
|
from</ng-container
|
|
|
|
from</ng-container
|
|
|
|
@ -230,13 +238,14 @@
|
|
|
|
activityForm.get('date')?.value | date: defaultDateFormat
|
|
|
|
activityForm.get('date')?.value | date: defaultDateFormat
|
|
|
|
}}</mat-error
|
|
|
|
}}</mat-error
|
|
|
|
>
|
|
|
|
>
|
|
|
|
|
|
|
|
}
|
|
|
|
</mat-form-field>
|
|
|
|
</mat-form-field>
|
|
|
|
<button
|
|
|
|
@if (
|
|
|
|
*ngIf="
|
|
|
|
|
|
|
|
currentMarketPrice &&
|
|
|
|
currentMarketPrice &&
|
|
|
|
(data.activity.type === 'BUY' || data.activity.type === 'SELL') &&
|
|
|
|
(data.activity.type === 'BUY' || data.activity.type === 'SELL') &&
|
|
|
|
isToday(activityForm.get('date')?.value)
|
|
|
|
isToday(activityForm.get('date')?.value)
|
|
|
|
"
|
|
|
|
) {
|
|
|
|
|
|
|
|
<button
|
|
|
|
class="ml-2 mt-1 no-min-width"
|
|
|
|
class="ml-2 mt-1 no-min-width"
|
|
|
|
mat-button
|
|
|
|
mat-button
|
|
|
|
title="Apply current market price"
|
|
|
|
title="Apply current market price"
|
|
|
|
@ -245,21 +254,32 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<ion-icon class="text-muted" name="refresh-outline" />
|
|
|
|
<ion-icon class="text-muted" name="refresh-outline" />
|
|
|
|
</button>
|
|
|
|
</button>
|
|
|
|
|
|
|
|
}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="d-none">
|
|
|
|
<div class="d-none">
|
|
|
|
<mat-form-field appearance="outline" class="w-100">
|
|
|
|
<mat-form-field appearance="outline" class="w-100">
|
|
|
|
<mat-label
|
|
|
|
<mat-label>
|
|
|
|
><ng-container [ngSwitch]="activityForm.get('type')?.value">
|
|
|
|
@switch (activityForm.get('type')?.value) {
|
|
|
|
<ng-container *ngSwitchCase="'DIVIDEND'" i18n
|
|
|
|
@case ('DIVIDEND') {
|
|
|
|
>Dividend</ng-container
|
|
|
|
<ng-container i18n>Dividend</ng-container>
|
|
|
|
>
|
|
|
|
}
|
|
|
|
<ng-container *ngSwitchCase="'FEE'" i18n>Value</ng-container>
|
|
|
|
@case ('FEE') {
|
|
|
|
<ng-container *ngSwitchCase="'INTEREST'" i18n>Value</ng-container>
|
|
|
|
<ng-container i18n>Value</ng-container>
|
|
|
|
<ng-container *ngSwitchCase="'ITEM'" i18n>Value</ng-container>
|
|
|
|
}
|
|
|
|
<ng-container *ngSwitchCase="'LIABILITY'" i18n>Value</ng-container>
|
|
|
|
@case ('INTEREST') {
|
|
|
|
<ng-container *ngSwitchDefault i18n>Unit Price</ng-container>
|
|
|
|
<ng-container i18n>Value</ng-container>
|
|
|
|
</ng-container>
|
|
|
|
}
|
|
|
|
|
|
|
|
@case ('ITEM') {
|
|
|
|
|
|
|
|
<ng-container i18n>Value</ng-container>
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
@case ('LIABILITY') {
|
|
|
|
|
|
|
|
<ng-container i18n>Value</ng-container>
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
@default {
|
|
|
|
|
|
|
|
<ng-container i18n>Unit Price</ng-container>
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
</mat-label>
|
|
|
|
</mat-label>
|
|
|
|
<input formControlName="unitPrice" matInput type="number" />
|
|
|
|
<input formControlName="unitPrice" matInput type="number" />
|
|
|
|
<span class="ml-2" matTextSuffix>{{
|
|
|
|
<span class="ml-2" matTextSuffix>{{
|
|
|
|
@ -286,15 +306,17 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
{{ activityForm.get('currencyOfUnitPrice').value }}
|
|
|
|
{{ activityForm.get('currencyOfUnitPrice').value }}
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
@if (activityForm.get('feeInCustomCurrency').hasError('invalid')) {
|
|
|
|
<mat-error
|
|
|
|
<mat-error
|
|
|
|
*ngIf="activityForm.get('feeInCustomCurrency').hasError('invalid')"
|
|
|
|
|
|
|
|
><ng-container i18n
|
|
|
|
><ng-container i18n
|
|
|
|
>Oops! Could not get the historical exchange rate from</ng-container
|
|
|
|
>Oops! Could not get the historical exchange rate
|
|
|
|
|
|
|
|
from</ng-container
|
|
|
|
>
|
|
|
|
>
|
|
|
|
{{
|
|
|
|
{{
|
|
|
|
activityForm.get('date')?.value | date: defaultDateFormat
|
|
|
|
activityForm.get('date')?.value | date: defaultDateFormat
|
|
|
|
}}</mat-error
|
|
|
|
}}</mat-error
|
|
|
|
>
|
|
|
|
>
|
|
|
|
|
|
|
|
}
|
|
|
|
</mat-form-field>
|
|
|
|
</mat-form-field>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="d-none">
|
|
|
|
<div class="d-none">
|
|
|
|
@ -326,11 +348,11 @@
|
|
|
|
<mat-label i18n>Asset Class</mat-label>
|
|
|
|
<mat-label i18n>Asset Class</mat-label>
|
|
|
|
<mat-select formControlName="assetClass">
|
|
|
|
<mat-select formControlName="assetClass">
|
|
|
|
<mat-option [value]="null" />
|
|
|
|
<mat-option [value]="null" />
|
|
|
|
<mat-option
|
|
|
|
@for (assetClass of assetClasses; track assetClass) {
|
|
|
|
*ngFor="let assetClass of assetClasses"
|
|
|
|
<mat-option [value]="assetClass.id">{{
|
|
|
|
[value]="assetClass.id"
|
|
|
|
assetClass.label
|
|
|
|
>{{ assetClass.label }}</mat-option
|
|
|
|
}}</mat-option>
|
|
|
|
>
|
|
|
|
}
|
|
|
|
</mat-select>
|
|
|
|
</mat-select>
|
|
|
|
</mat-form-field>
|
|
|
|
</mat-form-field>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
@ -342,11 +364,11 @@
|
|
|
|
<mat-label i18n>Asset Sub Class</mat-label>
|
|
|
|
<mat-label i18n>Asset Sub Class</mat-label>
|
|
|
|
<mat-select formControlName="assetSubClass">
|
|
|
|
<mat-select formControlName="assetSubClass">
|
|
|
|
<mat-option [value]="null" />
|
|
|
|
<mat-option [value]="null" />
|
|
|
|
<mat-option
|
|
|
|
@for (assetSubClass of assetSubClasses; track assetSubClass) {
|
|
|
|
*ngFor="let assetSubClass of assetSubClasses"
|
|
|
|
<mat-option [value]="assetSubClass.id">{{
|
|
|
|
[value]="assetSubClass.id"
|
|
|
|
assetSubClass.label
|
|
|
|
>{{ assetSubClass.label }}</mat-option
|
|
|
|
}}</mat-option>
|
|
|
|
>
|
|
|
|
}
|
|
|
|
</mat-select>
|
|
|
|
</mat-select>
|
|
|
|
</mat-form-field>
|
|
|
|
</mat-form-field>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
@ -354,8 +376,8 @@
|
|
|
|
<mat-form-field appearance="outline" class="w-100">
|
|
|
|
<mat-form-field appearance="outline" class="w-100">
|
|
|
|
<mat-label i18n>Tags</mat-label>
|
|
|
|
<mat-label i18n>Tags</mat-label>
|
|
|
|
<mat-chip-grid #tagsChipList>
|
|
|
|
<mat-chip-grid #tagsChipList>
|
|
|
|
|
|
|
|
@for (tag of activityForm.get('tags')?.value; track tag) {
|
|
|
|
<mat-chip-row
|
|
|
|
<mat-chip-row
|
|
|
|
*ngFor="let tag of activityForm.get('tags')?.value"
|
|
|
|
|
|
|
|
matChipRemove
|
|
|
|
matChipRemove
|
|
|
|
[removable]="true"
|
|
|
|
[removable]="true"
|
|
|
|
(removed)="onRemoveTag(tag)"
|
|
|
|
(removed)="onRemoveTag(tag)"
|
|
|
|
@ -363,6 +385,7 @@
|
|
|
|
{{ tag.name }}
|
|
|
|
{{ tag.name }}
|
|
|
|
<ion-icon class="ml-2" matPrefix name="close-outline" />
|
|
|
|
<ion-icon class="ml-2" matPrefix name="close-outline" />
|
|
|
|
</mat-chip-row>
|
|
|
|
</mat-chip-row>
|
|
|
|
|
|
|
|
}
|
|
|
|
<input
|
|
|
|
<input
|
|
|
|
#tagInput
|
|
|
|
#tagInput
|
|
|
|
name="close-outline"
|
|
|
|
name="close-outline"
|
|
|
|
@ -375,12 +398,11 @@
|
|
|
|
#autocompleteTags="matAutocomplete"
|
|
|
|
#autocompleteTags="matAutocomplete"
|
|
|
|
(optionSelected)="onAddTag($event)"
|
|
|
|
(optionSelected)="onAddTag($event)"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<mat-option
|
|
|
|
@for (tag of filteredTagsObservable | async; track tag) {
|
|
|
|
*ngFor="let tag of filteredTagsObservable | async"
|
|
|
|
<mat-option [value]="tag.id">
|
|
|
|
[value]="tag.id"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
{{ tag.name }}
|
|
|
|
{{ tag.name }}
|
|
|
|
</mat-option>
|
|
|
|
</mat-option>
|
|
|
|
|
|
|
|
}
|
|
|
|
</mat-autocomplete>
|
|
|
|
</mat-autocomplete>
|
|
|
|
</mat-form-field>
|
|
|
|
</mat-form-field>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
Thomas Kaul
7 months ago
committed by
GitHub