diff --git a/front-end/src/app/reports/transactions/transaction-list/transaction-disbursements/transaction-disbursements.component.html b/front-end/src/app/reports/transactions/transaction-list/transaction-disbursements/transaction-disbursements.component.html index 4d9721056a..1357baba96 100644 --- a/front-end/src/app/reports/transactions/transaction-list/transaction-disbursements/transaction-disbursements.component.html +++ b/front-end/src/app/reports/transactions/transaction-list/transaction-disbursements/transaction-disbursements.component.html @@ -1,18 +1,18 @@
@@ -42,10 +42,12 @@
Disbursements
Type - Name + + Name - Date + + Date @@ -67,11 +69,9 @@
Disbursements
{{ item.line_label }} - {{ - item.transaction_type_identifier | label : scheduleTransactionTypeLabels - }} + {{ item.transaction_type_identifier | label: scheduleTransactionTypeLabels }}
Unaggregated
-
Unitemized
+
Unitemized
{{ item.name }} diff --git a/front-end/src/app/reports/transactions/transaction-list/transaction-disbursements/transaction-disbursements.component.ts b/front-end/src/app/reports/transactions/transaction-list/transaction-disbursements/transaction-disbursements.component.ts index 98086f4b90..2f15ea9641 100644 --- a/front-end/src/app/reports/transactions/transaction-list/transaction-disbursements/transaction-disbursements.component.ts +++ b/front-end/src/app/reports/transactions/transaction-list/transaction-disbursements/transaction-disbursements.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, OnInit } from '@angular/core'; +import { Component, ElementRef, Input, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ConfirmationService, MessageService } from 'primeng/api'; import { TransactionSchBService } from 'app/shared/services/transaction-schB.service'; @@ -9,6 +9,7 @@ import { TransactionListTableBaseComponent } from '../transaction-list-table-bas import { Store } from '@ngrx/store'; import { ReportService } from 'app/shared/services/report.service'; import { DateUtils } from 'app/shared/utils/date.utils'; +import { Report, ReportTypes } from 'app/shared/models/report.model'; @Component({ selector: 'app-transaction-disbursements', @@ -16,6 +17,9 @@ import { DateUtils } from 'app/shared/utils/date.utils'; styleUrls: ['../../transaction.scss'], }) export class TransactionDisbursementsComponent extends TransactionListTableBaseComponent implements OnInit { + @Input() report?: Report; + form24ReportType = ReportTypes.F24; + scheduleTransactionTypeLabels: LabelList = [...ScheduleBTransactionTypeLabels, ...ScheduleETransactionTypeLabels]; constructor( @@ -26,7 +30,7 @@ export class TransactionDisbursementsComponent extends TransactionListTableBaseC protected override router: Router, protected override itemService: TransactionSchBService, protected override store: Store, - protected override reportService: ReportService + protected override reportService: ReportService, ) { super(messageService, confirmationService, elementRef, activatedRoute, router, store, reportService); this.caption = diff --git a/front-end/src/app/reports/transactions/transaction-list/transaction-list-table-base.component.ts b/front-end/src/app/reports/transactions/transaction-list/transaction-list-table-base.component.ts index a4da83f7d9..b5d80c9d12 100644 --- a/front-end/src/app/reports/transactions/transaction-list/transaction-list-table-base.component.ts +++ b/front-end/src/app/reports/transactions/transaction-list/transaction-list-table-base.component.ts @@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { TableAction, TableListBaseComponent } from 'app/shared/components/table-list-base/table-list-base.component'; import { Form3X } from 'app/shared/models/form-3x.model'; +import { ReportTypes } from 'app/shared/models/report.model'; import { ScheduleATransactionTypes } from 'app/shared/models/scha-transaction.model'; import { ScheduleBTransactionTypes } from 'app/shared/models/schb-transaction.model'; import { ScheduleCTransactionTypes } from 'app/shared/models/schc-transaction.model'; @@ -44,6 +45,7 @@ export abstract class TransactionListTableBaseComponent extends TableListBaseCom (transaction: Transaction) => !!transaction.force_unaggregated && this.reportIsEditable && + transaction.report?.report_type !== ReportTypes.F24 && !transaction.parent_transaction && !transaction.parent_transaction_id && [ScheduleIds.A, ScheduleIds.E].includes(transaction.transactionType.scheduleId), @@ -55,6 +57,7 @@ export abstract class TransactionListTableBaseComponent extends TableListBaseCom (transaction: Transaction) => !transaction.force_unaggregated && this.reportIsEditable && + transaction.report?.report_type !== ReportTypes.F24 && !transaction.parent_transaction && !transaction.parent_transaction_id && [ScheduleIds.A, ScheduleIds.E].includes(transaction.transactionType.scheduleId), @@ -66,6 +69,7 @@ export abstract class TransactionListTableBaseComponent extends TableListBaseCom (transaction: Transaction) => transaction.itemized === false && this.reportIsEditable && + transaction.report?.report_type !== ReportTypes.F24 && !transaction.parent_transaction && !transaction.parent_transaction_id && ![ScheduleIds.C, ScheduleIds.D].includes(transaction.transactionType.scheduleId), @@ -77,6 +81,7 @@ export abstract class TransactionListTableBaseComponent extends TableListBaseCom (transaction: Transaction) => transaction.itemized === true && this.reportIsEditable && + transaction.report?.report_type !== ReportTypes.F24 && !transaction.parent_transaction && !transaction.parent_transaction_id && ![ScheduleIds.C, ScheduleIds.D].includes(transaction.transactionType.scheduleId), diff --git a/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html b/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html index 6c55d7d5ef..04258bc9aa 100644 --- a/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html +++ b/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html @@ -28,7 +28,7 @@

Transactions in this report

- +
@@ -41,4 +41,4 @@

Transactions in this report

- \ No newline at end of file + diff --git a/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.spec.ts b/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.spec.ts index 5bdec68654..db68c61052 100644 --- a/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.spec.ts +++ b/front-end/src/app/reports/transactions/transaction-list/transaction-list.component.spec.ts @@ -46,7 +46,7 @@ describe('TransactionListComponent', () => { SchATransaction.fromJSON({ id: transactionId, transaction_type_identifier: 'OFFSET_TO_OPERATING_EXPENDITURES', - }) + }), ), getTableData: () => of([]), update: () => of([]),