feat: implement share account actions, view components, and pending checker tasks
This commit is contained in:
@@ -178,14 +178,16 @@
|
||||
{{ txn.amount | currency: currency?.code : 'symbol-narrow' : '1.2-2' }}
|
||||
</td>
|
||||
<td class="col-resolution text-left">
|
||||
@if (isRedeem(txn)) {
|
||||
{{ txn.resolutionNumber || '—' }}
|
||||
<!-- The transaction's own resolution wherever it has one: a redeem always carries
|
||||
one, and so does an additional-share purchase, authorised by its own board
|
||||
meeting rather than the one the account was opened under. Only the original
|
||||
application falls back to the account's resolution, having none of its own. -->
|
||||
@if (txn.resolutionNumber) {
|
||||
{{ txn.resolutionNumber }}
|
||||
@if (txn.meetingDate) {
|
||||
({{ txn.meetingDate | dateFormat }})
|
||||
}
|
||||
} @else {
|
||||
<!-- Purchases are authorised by the share account's own board resolution, which is
|
||||
held on the account rather than the transaction. -->
|
||||
{{ resolutionNumber || '—' }}
|
||||
@if (resolutionDate) {
|
||||
({{ resolutionDate | dateFormat }})
|
||||
|
||||
@@ -14,6 +14,7 @@ import { CurrencyPipe } from '@angular/common';
|
||||
import { MatIcon } from '@angular/material/icon';
|
||||
import { DateFormatPipe } from '../../../pipes/date-format.pipe';
|
||||
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
import { isSettledShareTransaction } from 'app/shares/share-transactions.util';
|
||||
|
||||
/**
|
||||
* Share Account Passbook — a printable, chronological (oldest-first) ledger of every
|
||||
@@ -81,9 +82,7 @@ export class SharesPassbookTabComponent implements OnInit {
|
||||
this.totalApprovedShares = account.summary?.totalApprovedShares || 0;
|
||||
this.currentMarketPrice = account.currentMarketPrice || 0;
|
||||
|
||||
const transactions = (account.purchasedShares || []).filter(
|
||||
(transaction: any) => transaction.type.value !== 'Charge Payment'
|
||||
);
|
||||
const transactions = (account.purchasedShares || []).filter(isSettledShareTransaction);
|
||||
this.allTransactions = this.recalculateRunningBalances(this.sortAscending(transactions));
|
||||
this.filteredTransactions = [...this.allTransactions];
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user