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 75bc06a98..b95fbc1e5 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 @@ -40,9 +40,10 @@

Manage reports

{{ item.formLabel }} {{ item.report_code_label }} - {{ item.coverage_from_date | fecDate }} - {{ item.coverage_through_date | fecDate }} + N/A {{ item.report_status }} {{ item.version_label }} diff --git a/front-end/src/app/shared/models/form-1m.model.spec.ts b/front-end/src/app/shared/models/form-1m.model.spec.ts index 8fc531338..9706ad1b3 100644 --- a/front-end/src/app/shared/models/form-1m.model.spec.ts +++ b/front-end/src/app/shared/models/form-1m.model.spec.ts @@ -15,13 +15,25 @@ describe('Form-1M', () => { expect(form.formLabel).toEqual('FORM 1M'); }); - it('should display empty string for sub label', () => { + it('should display "NOTIFICATION OF MULTICANDIDATE STATUS" for sub label', () => { const data = { id: '999', form_type: F1MFormTypes.F1MN, committee_name: 'foo', + report_code_label: 'NOTIFICATION OF MULTICANDIDATE STATUS', }; const form = Form1M.fromJSON(data); expect(form.formSubLabel).toEqual('NOTIFICATION OF MULTICANDIDATE STATUS'); }); + + it('should display empty string for sub label', () => { + const data = { + id: '999', + form_type: F1MFormTypes.F1MN, + committee_name: 'foo', + report_code_label: undefined, + }; + const form = Form1M.fromJSON(data); + expect(form.formSubLabel).toEqual(''); + }); }); 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 be8e5c214..663c2a0be 100644 --- a/front-end/src/app/shared/models/form-1m.model.ts +++ b/front-end/src/app/shared/models/form-1m.model.ts @@ -28,7 +28,7 @@ export class Form1M extends Report { } get formSubLabel() { - return 'NOTIFICATION OF MULTICANDIDATE STATUS'; + return this.report_code_label ?? ''; } committee_type?: CommitteeType;