From a1b169a4bd39f5a371a1f6ae46ea4c0a3bb950f6 Mon Sep 17 00:00:00 2001 From: Jose Alberto Hernandez Date: Sat, 9 Mar 2024 08:12:00 -0600 Subject: [PATCH] Display Savings account transaction reversed --- .../transactions-tab.component.html | 5 ++ .../transactions-tab.component.ts | 2 +- .../transactions-tab.component.html | 5 ++ .../transactions-tab.component.ts | 2 +- .../transactions-tab.component.html | 5 ++ .../transactions-tab.component.ts | 2 +- .../savings-account-transaction.model.ts | 57 +++++++++++++++++++ .../transactions-tab.component.html | 7 +++ .../transactions-tab.component.scss | 5 ++ .../transactions-tab.component.ts | 22 ++++++- src/assets/styles/_colours.scss | 5 -- src/assets/translations/cs-CS.json | 1 + src/assets/translations/de-DE.json | 1 + src/assets/translations/en-US.json | 1 + src/assets/translations/es-MX.json | 1 + src/assets/translations/fr-FR.json | 1 + src/assets/translations/it-IT.json | 1 + src/assets/translations/ko-KO.json | 1 + src/assets/translations/lt-LT.json | 1 + src/assets/translations/lv-LV.json | 1 + src/assets/translations/ne-NE.json | 1 + src/assets/translations/pt-PT.json | 1 + src/assets/translations/sw-SW.json | 1 + src/theme/_dark_content.scss | 10 +++- 24 files changed, 128 insertions(+), 11 deletions(-) create mode 100644 src/app/savings/models/savings-account-transaction.model.ts diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html index 85454e55d..c823abfd3 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html @@ -13,6 +13,11 @@ + + + + + diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts index 8c8c5bc46..2356a44c5 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.ts @@ -22,7 +22,7 @@ export class TransactionsTabComponent implements OnInit { /** Form control to handle accural parameter */ hideAccrualsParam: UntypedFormControl; /** Columns to be displayed in transactions table. */ - displayedColumns: string[] = ['id', 'transactionDate', 'transactionType', 'debit', 'credit', 'balance', 'actions']; + displayedColumns: string[] = ['row', 'id', 'transactionDate', 'transactionType', 'debit', 'credit', 'balance', 'actions']; /** Data source for transactions table. */ dataSource: MatTableDataSource; diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.html index 549073159..214bb5d1c 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.html @@ -13,6 +13,11 @@
# {{(idx + 1)}} {{"labels.inputs.ID" | translate }} {{ transaction.id }}
+ + + + + diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.ts index e71508898..b8ffeb674 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/transactions-tab/transactions-tab.component.ts @@ -23,7 +23,7 @@ export class TransactionsTabComponent implements OnInit { /** Form control to handle accural parameter */ hideAccrualsParam: UntypedFormControl; /** Columns to be displayed in transactions table. */ - displayedColumns: string[] = ['id', 'transactionDate', 'transactionType', 'debit', 'credit', 'balance']; + displayedColumns: string[] = ['row', 'id', 'transactionDate', 'transactionType', 'debit', 'credit', 'balance']; /** Data source for transactions table. */ dataSource: MatTableDataSource; diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html index d0a26170c..bb36cedbe 100644 --- a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html +++ b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html @@ -13,6 +13,11 @@
# {{(idx + 1)}} {{"labels.inputs.ID" | translate }} {{ transaction.id }}
+ + + + +
# {{(idx + 1)}} {{"labels.inputs.Id" | translate}} {{ transaction.id }} diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts index 4af57be3b..c1ba48fae 100644 --- a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts +++ b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts @@ -27,7 +27,7 @@ export class TransactionsTabComponent implements OnInit { /** Stores the status of the loan account */ status: string; /** Columns to be displayed in original schedule table. */ - displayedColumns: string[] = ['id', 'office', 'externalId', 'date', 'transactionType', 'amount', 'principal', 'interest', 'fee', 'penalties', 'loanBalance', 'actions']; + displayedColumns: string[] = ['row', 'id', 'office', 'externalId', 'date', 'transactionType', 'amount', 'principal', 'interest', 'fee', 'penalties', 'loanBalance', 'actions']; dataSource: MatTableDataSource; @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; diff --git a/src/app/savings/models/savings-account-transaction.model.ts b/src/app/savings/models/savings-account-transaction.model.ts new file mode 100644 index 000000000..33f6d883a --- /dev/null +++ b/src/app/savings/models/savings-account-transaction.model.ts @@ -0,0 +1,57 @@ +import { Currency } from 'app/shared/models/general.model'; + +export interface SavingsAccountTransaction { + id: number; + transactionType: SavingsAccountTransactionType; + entryType: string; + accountId: number; + accountNo: string; + date: number[]; + currency: Currency; + amount: number; + runningBalance: number; + reversed: boolean; + transfer: Transfer; + submittedOnDate: number[]; + interestedPostedAsOn: boolean; + submittedByUsername: string; + isManualTransaction: boolean; + isReversal: boolean; + originalTransactionId: number; + lienTransaction: boolean; + releaseTransactionId: number; + chargesPaidByData: any[]; +} + + +export interface SavingsAccountTransactionType { + id: number; + code: string; + value: string; + deposit: boolean; + dividendPayout: boolean; + withdrawal: boolean; + interestPosting: boolean; + feeDeduction: boolean; + initiateTransfer: boolean; + approveTransfer: boolean; + withdrawTransfer: boolean; + rejectTransfer: boolean; + overdraftInterest: boolean; + writtenoff: boolean; + overdraftFee: boolean; + withholdTax: boolean; + escheat: boolean; + amountHold: boolean; + amountRelease: boolean; + accrual: boolean; +} + +export interface Transfer { + id: number; + reversed: boolean; + currency: Currency; + transferAmount: number; + transferDate: number[]; + transferDescription: string; +} diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html index 5c78c8fae..50b33cf43 100644 --- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html +++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html @@ -7,6 +7,8 @@

All Transactions

+ + {{"labels.inputs.Hide Reversed" | translate}} {{"labels.inputs.Hide Accruals" | translate}} @@ -16,6 +18,11 @@ + + + + + diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.scss b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.scss index 83f2418c0..72ec04a33 100644 --- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.scss +++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.scss @@ -23,3 +23,8 @@ } } } + +.strike { + text-decoration: line-through; + color: red; +} \ No newline at end of file diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts index 1ccdf8dd4..73426adc7 100644 --- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts +++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts @@ -5,6 +5,7 @@ import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; import { ActivatedRoute, Router } from '@angular/router'; +import { SavingsAccountTransaction } from 'app/savings/models/savings-account-transaction.model'; /** * Transactions Tab Component. @@ -19,13 +20,14 @@ export class TransactionsTabComponent implements OnInit { /** Savings Account Status */ status: any; /** Transactions Data */ - transactionsData: any; + transactionsData: SavingsAccountTransaction[] = []; /** Temporary Transaction Data */ tempTransaction: any; /** Form control to handle accural parameter */ hideAccrualsParam: UntypedFormControl; + hideReversedParam: UntypedFormControl; /** Columns to be displayed in transactions table. */ - displayedColumns: string[] = ['id', 'date', 'transactionType', 'debit', 'credit', 'balance', 'actions']; + displayedColumns: string[] = ['row', 'id', 'date', 'transactionType', 'debit', 'credit', 'balance', 'actions']; /** Data source for transactions table. */ dataSource: MatTableDataSource; @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; @@ -48,6 +50,7 @@ export class TransactionsTabComponent implements OnInit { ngOnInit() { this.hideAccrualsParam = new UntypedFormControl(false); + this.hideReversedParam = new UntypedFormControl(false); this.setTransactions(); } @@ -119,4 +122,19 @@ export class TransactionsTabComponent implements OnInit { } } + hideReversed() { + let transactions: SavingsAccountTransaction[] = this.transactionsData; + if (!this.hideReversedParam.value) { + transactions = []; + this.transactionsData.forEach((t: SavingsAccountTransaction) => { + if (!t.reversed) { + transactions.push(t); + } + }); + } + this.dataSource = new MatTableDataSource(transactions); + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + } + } diff --git a/src/assets/styles/_colours.scss b/src/assets/styles/_colours.scss index 6fa1f99a5..c085bfa23 100644 --- a/src/assets/styles/_colours.scss +++ b/src/assets/styles/_colours.scss @@ -94,8 +94,3 @@ $error-log: #ffa726; .cdk-drag-placeholder { background: $peter-river; } - -.strike { - text-decoration: line-through; - color: red; -} diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json index 82bec39af..ceb81ad9b 100644 --- a/src/assets/translations/cs-CS.json +++ b/src/assets/translations/cs-CS.json @@ -1348,6 +1348,7 @@ "Groups": "Skupiny", "Guarantor Type": "Typ ručitele", "Hide Accruals": "Skrýt časové rozlišení", + "Hide Reversed": "Skrýt obrácené", "Holiday Name": "Název dovolené", "Hook Name": "Jméno háčku", "Hook Template": "Šablona háčku", diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json index f545df979..065a81dea 100644 --- a/src/assets/translations/de-DE.json +++ b/src/assets/translations/de-DE.json @@ -1348,6 +1348,7 @@ "Groups": "Gruppen", "Guarantor Type": "Bürgentyp", "Hide Accruals": "Rückstellungen ausblenden", + "Hide Reversed": "Versteck umgekehrt", "Holiday Name": "Feiertagsname", "Hook Name": "Hook-Name", "Hook Template": "Hakenvorlage", diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json index dda69d777..b18dbce74 100644 --- a/src/assets/translations/en-US.json +++ b/src/assets/translations/en-US.json @@ -1347,6 +1347,7 @@ "Groups": "Groups", "Guarantor Type": "Guarantor Type", "Hide Accruals": "Hide Accruals", + "Hide Reversed": "Hide Reversed", "Holiday Name": "Holiday Name", "Hook Name": "Hook Name", "Hook Template": "Hook Template", diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json index db0143eec..c6093d441 100644 --- a/src/assets/translations/es-MX.json +++ b/src/assets/translations/es-MX.json @@ -1348,6 +1348,7 @@ "Groups": "Grupos", "Guarantor Type": "Tipo de garante", "Hide Accruals": "Ocultar Devengos", + "Hide Reversed": "Ocultar Reversos", "Holiday Name": "Nombre de festivo", "Hook Name": "Nombre del gancho", "Hook Template": "Plantilla de gancho", diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json index ded3ec42f..df3d61a03 100644 --- a/src/assets/translations/fr-FR.json +++ b/src/assets/translations/fr-FR.json @@ -1348,6 +1348,7 @@ "Groups": "Groupes", "Guarantor Type": "Type de garant", "Hide Accruals": "Masquer les provisions", + "Hide Reversed": "Cacher inversé", "Holiday Name": "Nom de la fête", "Hook Name": "Nom du crochet", "Hook Template": "Modèle de crochet", diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json index ea1764518..bb862caec 100644 --- a/src/assets/translations/it-IT.json +++ b/src/assets/translations/it-IT.json @@ -1348,6 +1348,7 @@ "Groups": "Gruppi", "Guarantor Type": "Tipo di garante", "Hide Accruals": "Nascondi ratei", + "Hide Reversed": "Nascondi invertiti", "Holiday Name": "Nome della festività", "Hook Name": "Nome del gancio", "Hook Template": "Modello di gancio", diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json index d7a1a6908..c2d5c916f 100644 --- a/src/assets/translations/ko-KO.json +++ b/src/assets/translations/ko-KO.json @@ -1349,6 +1349,7 @@ "Groups": "여러 떼", "Guarantor Type": "보증인 종류", "Hide Accruals": "발생액 숨기기", + "Hide Reversed": "반전 된 숨기십시오", "Holiday Name": "휴일 이름", "Hook Name": "후크 이름", "Hook Template": "후크 템플릿", diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json index 642824c5b..c100e8df3 100644 --- a/src/assets/translations/lt-LT.json +++ b/src/assets/translations/lt-LT.json @@ -1348,6 +1348,7 @@ "Groups": "Grupės", "Guarantor Type": "Garanto tipas", "Hide Accruals": "Slėpti sukaupimus", + "Hide Reversed": "Slėpti atvirkštinę", "Holiday Name": "Šventės pavadinimas", "Hook Name": "Kabliuko pavadinimas", "Hook Template": "Kabliuko šablonas", diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json index 07290b869..0e32e98b7 100644 --- a/src/assets/translations/lv-LV.json +++ b/src/assets/translations/lv-LV.json @@ -1348,6 +1348,7 @@ "Groups": "Grupas", "Guarantor Type": "Galvotāja veids", "Hide Accruals": "Slēpt uzkrājumus", + "Hide Reversed": "Paslēpt apgrieztu", "Holiday Name": "Svētku nosaukums", "Hook Name": "Āķa nosaukums", "Hook Template": "Āķa veidne", diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json index f8d521734..0526adc40 100644 --- a/src/assets/translations/ne-NE.json +++ b/src/assets/translations/ne-NE.json @@ -1348,6 +1348,7 @@ "Groups": "समूहहरू", "Guarantor Type": "ग्यारेन्टर प्रकार", "Hide Accruals": "आम्दानी लुकाउनुहोस्", + "Hide Reversed": "लुकाइएको लुकाउनुहोस्", "Holiday Name": "छुट्टीको नाम", "Hook Name": "हुक नाम", "Hook Template": "हुक टेम्प्लेट", diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json index fb4c67367..e04e44d9e 100644 --- a/src/assets/translations/pt-PT.json +++ b/src/assets/translations/pt-PT.json @@ -1348,6 +1348,7 @@ "Groups": "Grupos", "Guarantor Type": "Tipo de fiador", "Hide Accruals": "Ocultar acumulações", + "Hide Reversed": "Ocultar invertido", "Holiday Name": "Nome do feriado", "Hook Name": "Nome do Gancho", "Hook Template": "Modelo de gancho", diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json index 6ff1f1fb1..2f42bc8b7 100644 --- a/src/assets/translations/sw-SW.json +++ b/src/assets/translations/sw-SW.json @@ -1348,6 +1348,7 @@ "Groups": "Vikundi", "Guarantor Type": "Aina ya Mdhamini", "Hide Accruals": "Ficha Accruals", + "Hide Reversed": "Ficha kurudi nyuma", "Holiday Name": "Jina la Likizo", "Hook Name": "Jina la Hook", "Hook Template": "Kigezo cha ndoano", diff --git a/src/theme/_dark_content.scss b/src/theme/_dark_content.scss index b0aa38862..9c149c698 100644 --- a/src/theme/_dark_content.scss +++ b/src/theme/_dark_content.scss @@ -75,7 +75,7 @@ font-size: 14px; tr:nth-child(even) { - background-color: transparent; + background-color: transparent !important; } } } @@ -142,6 +142,14 @@ } +body.dark-theme { + table { + tr:nth-child(even) { + background-color: #303135 !important; + } + } +} + .dark-theme { .sticky { background-color: #303135 !important;
# {{(idx + 1)}} Id {{ transaction.id }}