From 75dd35438014be8990153c2a9f3a04eb2359a47e Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Mon, 11 Mar 2024 15:28:05 -0400 Subject: [PATCH 1/3] Add getter for Report Label to report class and update the contact transactions to use the appropriate data for the columns --- .../report-list/report-list.component.html | 187 ++--- .../report-list/report-list.component.ts | 26 +- .../submit-report-step1.component.ts | 16 +- .../contact-dialog.component.html | 753 +++++++++--------- .../contact-dialog.component.spec.ts | 4 +- .../contact-dialog.component.ts | 31 +- .../src/app/shared/models/form-1m.model.ts | 7 +- .../app/shared/models/form-24.model.spec.ts | 21 +- .../src/app/shared/models/form-24.model.ts | 12 +- .../src/app/shared/models/form-3x.model.ts | 11 +- .../src/app/shared/models/form-99.model.ts | 11 +- .../src/app/shared/models/report.model.ts | 2 + .../INDIVIDUAL_RECEIPT.model.ts | 6 +- 13 files changed, 577 insertions(+), 510 deletions(-) diff --git a/front-end/src/app/reports/report-list/report-list.component.html b/front-end/src/app/reports/report-list/report-list.component.html index 6bda65f3fd..42b5a03adc 100644 --- a/front-end/src/app/reports/report-list/report-list.component.html +++ b/front-end/src/app/reports/report-list/report-list.component.html @@ -1,100 +1,101 @@
- - Manage reports + + Manage reports - - - - + + + + - - -
-
Recent reports
-
- - - - - - - - Form type - - - - Type of report - - - - Coverage dates - - - - Status - - - - Version - - - - Date filed - - - Actions - - - - - {{ item.formLabel }} - {{ item.report_code_label }} - - {{ item.coverage_from_date | fecDate }} - {{ item.coverage_through_date | fecDate }} - - {{ item.report_status }} - {{ item.versionLabel }} - {{ item.upload_submission?.created | fecDate }} - - - - - - + + +
+
Recent reports
+
+ + + + + + + + Form type + + + + Type of report + + + + Coverage dates + + + + Status + + + + Version + + + + Date filed + + + Actions + + + + + {{ item.formLabel }} + {{ item.reportLabel }} + + {{ item.coverage_from_date | fecDate }} - {{ item.coverage_through_date | fecDate }} + + + {{ item.report_status }} + {{ item.versionLabel }} + {{ item.upload_submission?.created | fecDate }} + + + + + +
diff --git a/front-end/src/app/reports/report-list/report-list.component.ts b/front-end/src/app/reports/report-list/report-list.component.ts index 2b7d2e88c0..4bde3c5354 100644 --- a/front-end/src/app/reports/report-list/report-list.component.ts +++ b/front-end/src/app/reports/report-list/report-list.component.ts @@ -2,7 +2,7 @@ import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core'; import { take, takeUntil } from 'rxjs'; import { ConfirmationService, MessageService } from 'primeng/api'; import { TableAction, TableListBaseComponent } from '../../shared/components/table-list-base/table-list-base.component'; -import { Report, ReportTypes, ReportStatus } from '../../shared/models/report.model'; +import { Report, ReportStatus, ReportTypes } from '../../shared/models/report.model'; import { ReportService } from '../../shared/services/report.service'; import { Form3X } from 'app/shared/models/form-3x.model'; import { Router } from '@angular/router'; @@ -17,13 +17,13 @@ export class ReportListComponent extends TableListBaseComponent implemen new TableAction( 'Edit report', this.editItem.bind(this), - (report: Report) => report.report_status === ReportStatus.IN_PROGRESS + (report: Report) => report.report_status === ReportStatus.IN_PROGRESS, ), new TableAction('Amend', this.amendReport.bind(this), (report: Report) => report.canAmend), new TableAction( 'Review report', this.editItem.bind(this), - (report: Report) => report.report_status !== ReportStatus.IN_PROGRESS + (report: Report) => report.report_status !== ReportStatus.IN_PROGRESS, ), new TableAction('Download as .fec', this.goToTest.bind(this)), ]; @@ -33,7 +33,7 @@ export class ReportListComponent extends TableListBaseComponent implemen protected override confirmationService: ConfirmationService, protected override elementRef: ElementRef, protected override itemService: ReportService, - public router: Router + public router: Router, ) { super(messageService, confirmationService, elementRef); this.caption = @@ -49,28 +49,28 @@ export class ReportListComponent extends TableListBaseComponent implemen return new Form3X(); } - public override editItem(item: Report): void { + public override async editItem(item: Report): Promise { if (!this.itemService.isEditable(item)) { - this.router.navigateByUrl(`/reports/${item.report_type.toLocaleLowerCase()}/submit/status/${item.id}`); + await this.router.navigateByUrl(`/reports/${item.report_type.toLocaleLowerCase()}/submit/status/${item.id}`); return; } switch (item.report_type) { case ReportTypes.F3X: if (item.is_first) { - this.router.navigateByUrl(`/reports/f3x/create/cash-on-hand/${item.id}`); + await this.router.navigateByUrl(`/reports/f3x/create/cash-on-hand/${item.id}`); } else { - this.router.navigateByUrl(`/reports/transactions/report/${item.id}/list`); + await this.router.navigateByUrl(`/reports/transactions/report/${item.id}/list`); } break; case ReportTypes.F99: - this.router.navigateByUrl(`/reports/f99/edit/${item.id}`); + await this.router.navigateByUrl(`/reports/f99/edit/${item.id}`); break; case ReportTypes.F24: - this.router.navigateByUrl(`/reports/transactions/report/${item.id}/list`); + await this.router.navigateByUrl(`/reports/transactions/report/${item.id}/list`); break; case ReportTypes.F1M: - this.router.navigateByUrl(`/reports/f1m/edit/${item.id}`); + await this.router.navigateByUrl(`/reports/f1m/edit/${item.id}`); break; } } @@ -84,8 +84,8 @@ export class ReportListComponent extends TableListBaseComponent implemen }); } - public goToTest(item: Report): void { - this.router.navigateByUrl(`/reports/f3x/test-dot-fec/${item.id}`); + public async goToTest(item: Report): Promise { + await this.router.navigateByUrl(`/reports/f3x/test-dot-fec/${item.id}`); } /** diff --git a/front-end/src/app/reports/submission-workflow/submit-report-step1.component.ts b/front-end/src/app/reports/submission-workflow/submit-report-step1.component.ts index 096d4fb755..f930bc5af8 100644 --- a/front-end/src/app/reports/submission-workflow/submit-report-step1.component.ts +++ b/front-end/src/app/reports/submission-workflow/submit-report-step1.component.ts @@ -5,7 +5,7 @@ import { Store } from '@ngrx/store'; import { DestroyerComponent } from 'app/shared/components/app-destroyer.component'; import { CommitteeAccount } from 'app/shared/models/committee-account.model'; import { Report } from 'app/shared/models/report.model'; -import { ReportService, getReportFromJSON } from 'app/shared/services/report.service'; +import { getReportFromJSON, ReportService } from 'app/shared/services/report.service'; import { CountryCodeLabels, LabelUtils, PrimeOptions, StatesCodeLabels } from 'app/shared/utils/label.utils'; import { SchemaUtils } from 'app/shared/utils/schema.utils'; import { buildGuaranteeUniqueValuesValidator, emailValidator } from 'app/shared/utils/validators.utils'; @@ -90,7 +90,7 @@ export class SubmitReportStep1Component extends DestroyerComponent implements On } } - public continue(): void { + public async continue(): Promise { this.formSubmitted = true; if (this.form.invalid || this.report == undefined) { this.store.dispatch(singleClickEnableAction()); @@ -104,11 +104,13 @@ export class SubmitReportStep1Component extends DestroyerComponent implements On } const payload: Report = getReportFromJSON({ - ...this.report, - ...addressFields, - change_of_address: this.form.value.change_of_address, - confirmation_email_1: this.form.value.confirmation_email_1, - confirmation_email_2: this.form.value.confirmation_email_2, + json: { + ...this.report, + ...addressFields, + change_of_address: this.form.value.change_of_address, + confirmation_email_1: this.form.value.confirmation_email_1, + confirmation_email_2: this.form.value.confirmation_email_2, + }, }); this.reportService.update(payload, this.formProperties).subscribe(() => { diff --git a/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html b/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html index d6a52a5e99..ab28a465a2 100644 --- a/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html +++ b/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html @@ -1,386 +1,391 @@
- - -
-
-
-

Contact

-
-
-
-
-
- - - -
-
-
-
- -
-
-
- - - -
-
-
-
- - -
- -
-
- - - + + + +
+
+

Contact

+
-
- -
-
- - - -
-
- -
- -
- - -
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- -
-
-
-
-
-
-
-

Address

-
-
-
-
-
- - -
-
-
-
-
-
-
- - - -
-
-
-
- - - -
-
-
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
-
-
- - - - -
-
-
-
- -
-
-
-
-
-
-
-

Employer

-
-
-
-
-
- - - -
-
-
-
- - - -
-
-
- - -
-
-
+
+
+
+ + + +
+
+
+
+ +
+
+
+ + + +
+
+
+
+ + +
+ +
+
+ + + +
+
+ +
+
+ + + +
+
+ +
+ +
+ + +
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ +
+
+
+
+
+
+
+

Address

+
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+ + + + +
+
+
+
+ +
+
+
+
+
+
+
+

Employer

+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+ + +
+
+
+
+
+
+
+

Office

+
+
+ + + + + +
+ + +

Transaction history

+ + + + Transaction type + Form type + Report type + Date + Amount + + + + + + + {{ transaction.transaction_type_identifier | label: scheduleTransactionTypeLabels }} + + + {{ transaction.formType }} + {{ transaction.reportType }} + {{ transaction.date | date:'MM/dd/yyyy' }} + {{ transaction.amount | currency }} + + +
-
-
-
-

Office

+ + +
+
+ +
+
+ + + + +
-
- - - - + + +
-
- - -

Transaction history

- - - - Transaction type - Form type - Report type - Date - Amount - - - - - - - {{ transaction.transaction_type_identifier | label: scheduleTransactionTypeLabels }} - - - {{ transaction.form_type }} - {{ transaction.report?.report_type }} - {{ transaction.date }} - {{ transaction.amount | currency }} - - - -
- - -
-
- -
-
- - - - -
-
- - -
- - - + label="Save & continue" + icon="pi pi-check" + class="p-button-info" + (click)="saveContact()" + > diff --git a/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.spec.ts b/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.spec.ts index 02fceade04..17743ea85b 100644 --- a/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.spec.ts +++ b/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.spec.ts @@ -6,7 +6,7 @@ import { getTestTransactionByType, testContact, testMockStore } from 'app/shared import { DropdownModule } from 'primeng/dropdown'; import { ErrorMessagesComponent } from '../error-messages/error-messages.component'; import { FecInternationalPhoneInputComponent } from '../fec-international-phone-input/fec-international-phone-input.component'; -import { ContactDialogComponent } from './contact-dialog.component'; +import { ContactDialogComponent, TransactionData } from './contact-dialog.component'; import { ContactLookupComponent } from '../contact-lookup/contact-lookup.component'; import { AutoCompleteModule } from 'primeng/autocomplete'; import { LabelPipe } from 'app/shared/pipes/label.pipe'; @@ -119,7 +119,7 @@ describe('ContactDialogComponent', () => { it('should route to transaction', () => { const spy = spyOn(component.router, 'navigate'); - component.openTransaction(transaction); + component.openTransaction(new TransactionData(transaction)); expect(spy).toHaveBeenCalledWith([`reports/transactions/report/${transaction.report_id}/list/${transaction.id}`]); }); diff --git a/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.ts b/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.ts index 5e597514ae..475e4c6ad0 100644 --- a/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.ts +++ b/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.ts @@ -19,7 +19,6 @@ import { DestroyerComponent } from '../app-destroyer.component'; import { ContactLookupComponent } from '../contact-lookup/contact-lookup.component'; import { TransactionContactUtils } from '../transaction-type-base/transaction-contact.utils'; import { ConfirmationService } from 'primeng/api'; -import { Transaction } from '../../models/transaction.model'; import { ScheduleATransactionTypeLabels } from '../../models/scha-transaction.model'; import { ScheduleBTransactionTypeLabels } from '../../models/schb-transaction.model'; import { ScheduleC1TransactionTypeLabels } from '../../models/schc1-transaction.model'; @@ -30,6 +29,30 @@ import { ScheduleETransactionTypeLabels } from '../../models/sche-transaction.mo import { Router } from '@angular/router'; import { TransactionService } from '../../services/transaction.service'; import { TableLazyLoadEvent } from 'primeng/table'; +import { getReportFromJSON } from '../../services/report.service'; + +export class TransactionData { + id: string; + report_id: string; + formType: string; + reportType: string; + transaction_type_identifier: string; + date: string; + amount: string; + + // eslint-disable-next-line @typescript-eslint/no-explicit-any + constructor(transaction: any) { + this.id = transaction.id; + this.report_id = transaction.report_id; + this.date = transaction.date; + this.amount = transaction.amount; + this.transaction_type_identifier = transaction.transaction_type_identifier; + + const report = getReportFromJSON(transaction.report); + this.formType = report.formLabel; + this.reportType = report.reportLabel; + } +} @Component({ selector: 'app-contact-dialog', @@ -46,7 +69,7 @@ export class ContactDialogComponent extends DestroyerComponent implements OnInit @Output() detailVisibleChange: EventEmitter = new EventEmitter(); @Output() savedContact: EventEmitter = new EventEmitter(); - transactions: Transaction[] = []; + transactions: TransactionData[] = []; tableLoading = true; totalTransactions = 0; rowsPerPage = 5; @@ -110,7 +133,7 @@ export class ContactDialogComponent extends DestroyerComponent implements OnInit ordering = `${ordering}`; } lastValueFrom(this.transactionService.getTableData(pageNumber, ordering, params)).then((transactionsPage) => { - this.transactions = transactionsPage.results; + this.transactions = transactionsPage.results.map((t) => new TransactionData(t)); this.totalTransactions = transactionsPage.count; this.tableLoading = false; }); @@ -312,7 +335,7 @@ export class ContactDialogComponent extends DestroyerComponent implements OnInit this.resetForm(); } - async openTransaction(transaction: Transaction) { + async openTransaction(transaction: TransactionData) { await this.router.navigate([`reports/transactions/report/${transaction.report_id}/list/${transaction.id}`]); } } diff --git a/front-end/src/app/shared/models/form-1m.model.ts b/front-end/src/app/shared/models/form-1m.model.ts index 6add7e60a6..2379e67479 100644 --- a/front-end/src/app/shared/models/form-1m.model.ts +++ b/front-end/src/app/shared/models/form-1m.model.ts @@ -36,6 +36,10 @@ export class Form1M extends Report { return 'NOTIFICATION OF MULTICANDIDATE STATUS'; } + get reportLabel(): string { + return ''; + } + get versionLabel() { return `${F1MFormVersionLabels[this.form_type]} ${this.report_version ?? ''}`.trim(); } @@ -130,8 +134,7 @@ export class Form1M extends Report { @Type(() => Contact) contact_candidate_V?: Contact; contact_candidate_V_id?: string | null; - // prettier-ignore - static fromJSON(json: any): Form1M { // eslint-disable-line @typescript-eslint/no-explicit-any + static fromJSON(json: unknown): Form1M { return plainToInstance(Form1M, json); } } diff --git a/front-end/src/app/shared/models/form-24.model.spec.ts b/front-end/src/app/shared/models/form-24.model.spec.ts index 1afec2e355..13094f1b63 100644 --- a/front-end/src/app/shared/models/form-24.model.spec.ts +++ b/front-end/src/app/shared/models/form-24.model.spec.ts @@ -44,7 +44,7 @@ describe('Form24', () => { id: '999', form_type: F24FormTypes.F24N, committee_name: 'foo', - report_version: undefined + report_version: undefined, }; const form = Form24.fromJSON(data); expect(form.versionLabel).toEqual('Original'); @@ -55,10 +55,27 @@ describe('Form24', () => { id: '999', form_type: F24FormTypes.F24N, committee_name: 'foo', - report_version: '1' + report_version: '1', }; const form = Form24.fromJSON(data); expect(form.versionLabel).toEqual('Original 1'); }); }); + + describe('getReportLabel', () => { + it('should return 24 or 48 depending upon 24_48 prop', () => { + const data = { + id: '999', + form_type: F24FormTypes.F24N, + committee_name: 'foo', + report_version: undefined, + report_type_24_48: '24', + }; + const form = Form24.fromJSON(data); + expect(form.reportLabel).toBe('24 HOUR'); + + form.report_type_24_48 = '48'; + expect(form.reportLabel).toBe('48 HOUR'); + }); + }); }); diff --git a/front-end/src/app/shared/models/form-24.model.ts b/front-end/src/app/shared/models/form-24.model.ts index c186d24f7c..eb93dbf546 100644 --- a/front-end/src/app/shared/models/form-24.model.ts +++ b/front-end/src/app/shared/models/form-24.model.ts @@ -1,4 +1,4 @@ -import { plainToClass, Transform } from 'class-transformer'; +import { plainToInstance, Transform } from 'class-transformer'; import { Report, ReportStatus, ReportTypes } from './report.model'; import { BaseModel } from './base.model'; import { schema as f24Schema } from 'fecfile-validate/fecfile_validate_js/dist/F24'; @@ -19,6 +19,7 @@ export class Form24 extends Report { schema = f24Schema; report_type = ReportTypes.F24; form_type = F24FormTypes.F24N; + get formLabel() { return 'FORM 24'; } @@ -27,6 +28,10 @@ export class Form24 extends Report { return ''; } + get reportLabel(): string { + return `${this.report_type_24_48} HOUR`; + } + get versionLabel() { return `${F24FormVersionLabels[this.form_type]} ${this.report_version ?? ''}`.trim(); } @@ -50,8 +55,7 @@ export class Form24 extends Report { treasurer_suffix: string | undefined; @Transform(BaseModel.dateTransform) date_signed: Date | undefined; - // prettier-ignore - static fromJSON(json: any): Form24 { // eslint-disable-line @typescript-eslint/no-explicit-any - return plainToClass(Form24, json); + static fromJSON(json: unknown): Form24 { + return plainToInstance(Form24, json); } } diff --git a/front-end/src/app/shared/models/form-3x.model.ts b/front-end/src/app/shared/models/form-3x.model.ts index 45787f24b4..b1c99a7fa3 100644 --- a/front-end/src/app/shared/models/form-3x.model.ts +++ b/front-end/src/app/shared/models/form-3x.model.ts @@ -25,8 +25,8 @@ export class F3xCoverageDates { // prettier-ignore static fromJSON(json: any): F3xCoverageDates { // eslint-disable-line @typescript-eslint/no-explicit-any - return plainToClass(F3xCoverageDates, json); - } + return plainToClass(F3xCoverageDates, json); + } } export const F3xQualifiedCommitteeTypeCodes = ['Q', 'W', 'Y']; @@ -180,12 +180,15 @@ export class Form3X extends Report { return getReportCodeLabel(this.report_code) ?? ''; } + get reportLabel(): string { + return getReportCodeLabel(this.reportCode) ?? ''; + } + get versionLabel() { return `${F3xFormVersionLabels[this.form_type]} ${this.report_version ?? ''}`.trim(); } - // prettier-ignore - static fromJSON(json: any): Form3X { // eslint-disable-line @typescript-eslint/no-explicit-any + static fromJSON(json: unknown): Form3X { // json['form_type'] = F3xFormTypes.F3XT; return plainToInstance(Form3X, json); } diff --git a/front-end/src/app/shared/models/form-99.model.ts b/front-end/src/app/shared/models/form-99.model.ts index 8b81a64f3d..97acd30438 100644 --- a/front-end/src/app/shared/models/form-99.model.ts +++ b/front-end/src/app/shared/models/form-99.model.ts @@ -1,4 +1,4 @@ -import { plainToClass, Transform } from 'class-transformer'; +import { plainToInstance, Transform } from 'class-transformer'; import { Report, ReportTypes } from './report.model'; import { BaseModel } from './base.model'; import { schema as f99Schema } from 'fecfile-validate/fecfile_validate_js/dist/F99'; @@ -28,6 +28,10 @@ export class Form99 extends Report { return textCodes.find(({ value }) => value === this.text_code)?.label ?? ''; } + get reportLabel(): string { + return ''; + } + get versionLabel() { return `${F99FormVersionLabels[this.form_type]} ${this.report_version ?? ''}`.trim(); } @@ -47,9 +51,8 @@ export class Form99 extends Report { text_code: string | undefined; message_text: string | undefined; - // prettier-ignore - static fromJSON(json: any): Form99 { // eslint-disable-line @typescript-eslint/no-explicit-any - return plainToClass(Form99, json); + static fromJSON(json: unknown): Form99 { + return plainToInstance(Form99, json); } } diff --git a/front-end/src/app/shared/models/report.model.ts b/front-end/src/app/shared/models/report.model.ts index 241d5e5ef3..cf33ae7e72 100644 --- a/front-end/src/app/shared/models/report.model.ts +++ b/front-end/src/app/shared/models/report.model.ts @@ -39,6 +39,8 @@ export abstract class Report extends BaseModel { abstract get versionLabel(): string; + abstract get reportLabel(): string; + get reportCode(): F3xReportCodes | undefined { return; } diff --git a/front-end/src/app/shared/models/transaction-types/INDIVIDUAL_RECEIPT.model.ts b/front-end/src/app/shared/models/transaction-types/INDIVIDUAL_RECEIPT.model.ts index a7807136c7..b1d408e449 100644 --- a/front-end/src/app/shared/models/transaction-types/INDIVIDUAL_RECEIPT.model.ts +++ b/front-end/src/app/shared/models/transaction-types/INDIVIDUAL_RECEIPT.model.ts @@ -4,7 +4,8 @@ import { SchATransactionType } from '../scha-transaction-type.model'; import { SchATransaction, ScheduleATransactionTypeLabels, ScheduleATransactionTypes } from '../scha-transaction.model'; import { STANDARD_CONTROLS, TransactionNavigationControls } from '../transaction-navigation-controls.model'; import { AggregationGroups } from '../transaction.model'; -import { INDIVIDUAL_FORM_FIELDS, INDIVIDUAL } from 'app/shared/utils/transaction-type-properties'; +import { INDIVIDUAL, INDIVIDUAL_FORM_FIELDS } from 'app/shared/utils/transaction-type-properties'; +import { ReportTypes } from '../report.model'; export class INDIVIDUAL_RECEIPT extends SchATransactionType { formFields = INDIVIDUAL_FORM_FIELDS; @@ -18,6 +19,9 @@ export class INDIVIDUAL_RECEIPT extends SchATransactionType { form_type: 'SA11AI', transaction_type_identifier: ScheduleATransactionTypes.INDIVIDUAL_RECEIPT, aggregation_group: AggregationGroups.GENERAL, + report: { + report_type: ReportTypes.F3X, + }, }); } } From e80dc872f7dd4ba9fc13f5e82b87377cb8360c26 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Mon, 11 Mar 2024 17:14:28 -0400 Subject: [PATCH 2/3] Fixing some linting errors --- .../report-list/report-list.component.html | 188 ++--- .../submit-report-step1.component.ts | 12 +- .../double-transaction-detail.component.html | 2 +- .../transaction-detail.component.html | 2 +- .../triple-transaction-detail.component.html | 2 +- .../contact-dialog.component.html | 758 +++++++++--------- .../amount-input/amount-input.component.html | 2 +- 7 files changed, 482 insertions(+), 484 deletions(-) diff --git a/front-end/src/app/reports/report-list/report-list.component.html b/front-end/src/app/reports/report-list/report-list.component.html index 42b5a03adc..2c0267f808 100644 --- a/front-end/src/app/reports/report-list/report-list.component.html +++ b/front-end/src/app/reports/report-list/report-list.component.html @@ -1,101 +1,101 @@
- - Manage reports + + Manage reports - - - - + + + + - - -
-
Recent reports
-
- - - - - - - - Form type - - - - Type of report - - - - Coverage dates - - - - Status - - - - Version - - - - Date filed - - - Actions - - - - - {{ item.formLabel }} - {{ item.reportLabel }} - - {{ item.coverage_from_date | fecDate }} - {{ item.coverage_through_date | fecDate }} - - - {{ item.report_status }} - {{ item.versionLabel }} - {{ item.upload_submission?.created | fecDate }} - - - - - - + + +
+
Recent reports
+
+ + + + + + + + Form type + + + + Type of report + + + + Coverage dates + + + + Status + + + + Version + + + + Date filed + + + Actions + + + + + {{ item.formLabel }} + {{ item.reportLabel }} + + {{ item.coverage_from_date | fecDate }} - {{ item.coverage_through_date | fecDate }} + + + {{ item.report_status }} + {{ item.versionLabel }} + {{ item.upload_submission?.created | fecDate }} + + + + + +
diff --git a/front-end/src/app/reports/submission-workflow/submit-report-step1.component.ts b/front-end/src/app/reports/submission-workflow/submit-report-step1.component.ts index f930bc5af8..e1c3f21175 100644 --- a/front-end/src/app/reports/submission-workflow/submit-report-step1.component.ts +++ b/front-end/src/app/reports/submission-workflow/submit-report-step1.component.ts @@ -104,13 +104,11 @@ export class SubmitReportStep1Component extends DestroyerComponent implements On } const payload: Report = getReportFromJSON({ - json: { - ...this.report, - ...addressFields, - change_of_address: this.form.value.change_of_address, - confirmation_email_1: this.form.value.confirmation_email_1, - confirmation_email_2: this.form.value.confirmation_email_2, - }, + ...this.report, + ...addressFields, + change_of_address: this.form.value.change_of_address, + confirmation_email_1: this.form.value.confirmation_email_1, + confirmation_email_2: this.form.value.confirmation_email_2, }); this.reportService.update(payload, this.formProperties).subscribe(() => { diff --git a/front-end/src/app/reports/transactions/double-transaction-detail/double-transaction-detail.component.html b/front-end/src/app/reports/transactions/double-transaction-detail/double-transaction-detail.component.html index 9001287fb0..78425c0332 100644 --- a/front-end/src/app/reports/transactions/double-transaction-detail/double-transaction-detail.component.html +++ b/front-end/src/app/reports/transactions/double-transaction-detail/double-transaction-detail.component.html @@ -1,7 +1,7 @@

{{ transaction?.transactionType?.title }}

{{ transactionType?.subTitle }}

READ ONLY

{{ transactionType?.description }}

diff --git a/front-end/src/app/reports/transactions/transaction-detail/transaction-detail.component.html b/front-end/src/app/reports/transactions/transaction-detail/transaction-detail.component.html index a69d345b81..b4c63d24e4 100644 --- a/front-end/src/app/reports/transactions/transaction-detail/transaction-detail.component.html +++ b/front-end/src/app/reports/transactions/transaction-detail/transaction-detail.component.html @@ -7,7 +7,7 @@

{{ transactionType?.subTitle }}

READ ONLY

DEBT REPAYMENT

diff --git a/front-end/src/app/reports/transactions/triple-transaction-detail/triple-transaction-detail.component.html b/front-end/src/app/reports/transactions/triple-transaction-detail/triple-transaction-detail.component.html index 54c51a3d34..baeb7e7300 100644 --- a/front-end/src/app/reports/transactions/triple-transaction-detail/triple-transaction-detail.component.html +++ b/front-end/src/app/reports/transactions/triple-transaction-detail/triple-transaction-detail.component.html @@ -1,7 +1,7 @@

{{ transaction?.transactionType?.title }}

{{ transactionType?.subTitle }}

READ ONLY

{{ transactionType?.description }}

diff --git a/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html b/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html index ab28a465a2..02b456eee8 100644 --- a/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html +++ b/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html @@ -1,391 +1,391 @@
- - -
-
-
-

Contact

-
-
-
-
-
- - - -
-
-
-
- -
-
-
- - - -
-
-
-
- - -
- -
-
- - - -
-
- -
-
- - - -
-
- -
- -
- - -
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- -
-
-
-
-
-
-
-

Address

-
-
-
-
-
- - -
-
-
-
-
-
-
- - - -
-
-
-
- - - -
-
-
-
-
-
- - - -
-
-
-
- - - -
-
-
-
- - - -
-
-
-
-
-
- - - - -
-
-
-
- -
-
-
-
-
-
-
-

Employer

-
-
-
-
-
- - - -
-
-
-
- - - -
-
-
- - -
-
-
-
-
-
-
-

Office

-
-
- - - -
- -
- - -

Transaction history

- - - - Transaction type - Form type - Report type - Date - Amount - - - - - - - {{ transaction.transaction_type_identifier | label: scheduleTransactionTypeLabels }} - - - {{ transaction.formType }} - {{ transaction.reportType }} - {{ transaction.date | date:'MM/dd/yyyy' }} - {{ transaction.amount | currency }} - - - + + +
+
+
+

Contact

+
+
+
+
+
+ + +
- - -
-
- -
-
- - - - +
+
+
+ +
+
+
+ + + +
+
+
+
+ + +
+ +
+
+ + +
+
+ +
+
+ + + +
- - -
+ +
+ +
+ + +
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ +
+
+
+
+
+
+
+

Address

+
+
+
+
+
+ + +
+
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+ + + + +
+
+
+
+ +
+
+
+
+
+
+
+

Employer

+
+
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+ + +
+
+
+
+
+
+
+

Office

+
+
+ + + + - -
+ + +
+
+ + label="Cancel" + icon="pi pi-times" + class="p-button-secondary" + (click)="closeDialog()" + > +
+
+ + + + +
+
+ + +
+ + + diff --git a/front-end/src/app/shared/components/inputs/amount-input/amount-input.component.html b/front-end/src/app/shared/components/inputs/amount-input/amount-input.component.html index d8792f3609..137c565f36 100644 --- a/front-end/src/app/shared/components/inputs/amount-input/amount-input.component.html +++ b/front-end/src/app/shared/components/inputs/amount-input/amount-input.component.html @@ -30,7 +30,7 @@ >
-
+
From 282c51325980e179349fbd1932499b288e1b96c3 Mon Sep 17 00:00:00 2001 From: Sasha Dresden Date: Tue, 12 Mar 2024 12:40:51 -0400 Subject: [PATCH 3/3] Fix 500 error due to creating a contact from the Contact Manager page --- .../components/contact-dialog/contact-dialog.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html b/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html index 02b456eee8..3a98535ccf 100644 --- a/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html +++ b/front-end/src/app/shared/components/contact-dialog/contact-dialog.component.html @@ -293,7 +293,7 @@

Office

-
+