From 2a66fad858fefff472407280a5e3061e21fbdf0d Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 31 Oct 2023 11:47:15 -0700 Subject: [PATCH 1/2] Rename Turp Dec Component -> Expiry Date Component * Use for both Turp and Covenant * Add Covenant to Decision Component Types --- .../expiry-date.component.html} | 0 .../expiry-date.component.scss} | 0 .../expiry-date.component.spec.ts} | 10 +++---- .../expiry-date.component.ts} | 8 +++--- .../decision-component.component.html | 16 +++++++---- .../decision-component.component.ts | 28 ++++++++++--------- .../expiry-date-input.component.html} | 0 .../expiry-date-input.component.scss} | 0 .../expiry-date-input.component.spec.ts} | 10 +++---- .../expiry-date-input.component.ts | 11 ++++++++ .../turp-input/turp-input.component.ts | 11 -------- .../decision-components.component.ts | 10 +++++-- .../decision-v2/decision-v2.component.html | 9 ++++-- .../application/decision/decision.module.ts | 8 +++--- .../application-decision-v2.dto.ts | 1 + ...98776304748-add_cove_decision_component.ts | 19 +++++++++++++ 16 files changed, 87 insertions(+), 54 deletions(-) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/{turp/turp.component.html => expiry-date/expiry-date.component.html} (100%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/{turp/turp.component.scss => expiry-date/expiry-date.component.scss} (100%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/{turp/turp.component.spec.ts => expiry-date/expiry-date.component.spec.ts} (71%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/{turp/turp.component.ts => expiry-date/expiry-date.component.ts} (65%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/{turp-input/turp-input.component.html => expiry-date-input/expiry-date-input.component.html} (100%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/{turp-input/turp-input.component.scss => expiry-date-input/expiry-date-input.component.scss} (100%) rename alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/{turp-input/turp-input.component.spec.ts => expiry-date-input/expiry-date-input.component.spec.ts} (60%) create mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.ts delete mode 100644 alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.ts create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1698776304748-add_cove_decision_component.ts diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.html similarity index 100% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.html diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.scss similarity index 100% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.scss rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.scss diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts similarity index 71% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts index 12425f4802..208b3e5d41 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts @@ -2,19 +2,19 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; -import { TurpComponent } from './turp.component'; +import { ExpiryDateComponent } from './expiry-date.component'; describe('TurpComponent', () => { - let component: TurpComponent; - let fixture: ComponentFixture; + let component: ExpiryDateComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [TurpComponent], + declarations: [ExpiryDateComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(TurpComponent); + fixture = TestBed.createComponent(ExpiryDateComponent); component = fixture.componentInstance; component.component = {} as ApplicationDecisionComponentDto; fixture.detectChanges(); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.ts similarity index 65% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.ts index c9030c3662..ad71090b7a 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.ts @@ -2,10 +2,10 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; @Component({ - selector: 'app-turp', - templateUrl: './turp.component.html', - styleUrls: ['./turp.component.scss'], + selector: 'app-expiry-date', + templateUrl: './expiry-date.component.html', + styleUrls: ['./expiry-date.component.scss'], }) -export class TurpComponent { +export class ExpiryDateComponent { @Input() component!: ApplicationDecisionComponentDto; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html index 80bc71f308..b7101b2b8b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html @@ -1,8 +1,6 @@ -
+
{{ data.applicationDecisionComponentType?.label }}
- +
@@ -10,8 +8,14 @@
{{ data.applicationDecisionComponentType?.label }}
-
- +
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 8446e128e5..86d658fd85 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -41,7 +41,7 @@ export class DecisionComponentComponent implements OnInit { nfuSubType = new FormControl(null, [Validators.required]); endDate = new FormControl(null, [Validators.required]); - // turp + // expiry-date & cove expiryDate = new FormControl(null); // pofo, pfrs @@ -98,7 +98,8 @@ export class DecisionComponentComponent implements OnInit { this.patchNfuFields(); break; case APPLICATION_DECISION_COMPONENT_TYPE.TURP: - this.patchTurpFields(); + case APPLICATION_DECISION_COMPONENT_TYPE.COVE: + this.addExpiryDateField(); break; case APPLICATION_DECISION_COMPONENT_TYPE.POFO: this.patchPofoFields(); @@ -129,6 +130,14 @@ export class DecisionComponentComponent implements OnInit { this.onFormValueChanges(); } + markTouched() { + this.subdInputComponent?.markAllAsTouched(); + } + + onRemove() { + this.remove.emit(); + } + private onFormValueChanges() { this.form.valueChanges.subscribe((changes) => { let dataChange = { @@ -167,7 +176,8 @@ export class DecisionComponentComponent implements OnInit { dataChange = { ...dataChange, ...this.getNfuDataChange() }; break; case APPLICATION_DECISION_COMPONENT_TYPE.TURP: - dataChange = { ...dataChange, ...this.getTurpDataChange() }; + case APPLICATION_DECISION_COMPONENT_TYPE.COVE: + dataChange = { ...dataChange, ...this.getExpiryDateDataChange() }; break; case APPLICATION_DECISION_COMPONENT_TYPE.POFO: dataChange = { ...dataChange, ...this.getPofoDataChange() }; @@ -205,7 +215,7 @@ export class DecisionComponentComponent implements OnInit { this.endDate.setValue(this.data.endDate ? new Date(this.data.endDate) : null); } - private patchTurpFields() { + private addExpiryDateField() { this.form.addControl('expiryDate', this.expiryDate); this.expiryDate.setValue(this.data.expiryDate ? new Date(this.data.expiryDate) : null); @@ -275,7 +285,7 @@ export class DecisionComponentComponent implements OnInit { }; } - private getTurpDataChange(): TurpDecisionComponentDto { + private getExpiryDateDataChange(): TurpDecisionComponentDto { return { expiryDate: this.expiryDate.value ? formatDateForApi(this.expiryDate.value) : null, }; @@ -334,18 +344,10 @@ export class DecisionComponentComponent implements OnInit { }; } - markTouched() { - this.subdInputComponent?.markAllAsTouched(); - } - private getInclExclDataChange() { return { inclExclApplicantType: this.applicantType.value ?? undefined, expiryDate: this.expiryDate.value ? formatDateForApi(this.expiryDate.value) : null, }; } - - onRemove() { - this.remove.emit(); - } } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html similarity index 100% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.html rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.scss similarity index 100% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.scss rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.scss diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts similarity index 60% rename from alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.spec.ts rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts index dc56df922d..4eb8ed26a4 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts @@ -1,19 +1,19 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TurpInputComponent } from './turp-input.component'; +import { ExpiryDateInputComponent } from './expiry-date-input.component'; describe('TurpInputComponent', () => { - let component: TurpInputComponent; - let fixture: ComponentFixture; + let component: ExpiryDateInputComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [TurpInputComponent], + declarations: [ExpiryDateInputComponent], schemas: [NO_ERRORS_SCHEMA], }).compileComponents(); - fixture = TestBed.createComponent(TurpInputComponent); + fixture = TestBed.createComponent(ExpiryDateInputComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.ts new file mode 100644 index 0000000000..cad007ad50 --- /dev/null +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core'; +import { FormGroup } from '@angular/forms'; + +@Component({ + selector: 'app-expiry-date-input', + templateUrl: './expiry-date-input.component.html', + styleUrls: ['./expiry-date-input.component.scss'], +}) +export class ExpiryDateInputComponent { + @Input() form!: FormGroup; +} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.ts deleted file mode 100644 index 4bf9a6f79e..0000000000 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/turp-input/turp-input.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { FormGroup } from '@angular/forms'; - -@Component({ - selector: 'app-turp-input', - templateUrl: './turp-input.component.html', - styleUrls: ['./turp-input.component.scss'], -}) -export class TurpInputComponent { - @Input() form!: FormGroup; -} diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts index 09429cc6d5..a6cdc0d82b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts @@ -104,8 +104,11 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView this.patchNfuFields(component); } - if (typeCode === APPLICATION_DECISION_COMPONENT_TYPE.TURP) { - this.patchTurpFields(component); + if ( + typeCode === APPLICATION_DECISION_COMPONENT_TYPE.TURP || + typeCode === APPLICATION_DECISION_COMPONENT_TYPE.COVE + ) { + this.setExpiryDateFields(component); } if (typeCode === APPLICATION_DECISION_COMPONENT_TYPE.POFO) { @@ -143,6 +146,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView case APPLICATION_DECISION_COMPONENT_TYPE.SUBD: case APPLICATION_DECISION_COMPONENT_TYPE.INCL: case APPLICATION_DECISION_COMPONENT_TYPE.EXCL: + case APPLICATION_DECISION_COMPONENT_TYPE.COVE: this.components.unshift({ applicationDecisionComponentTypeCode: typeCode, applicationDecisionComponentType: this.decisionComponentTypes.find( @@ -225,7 +229,7 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView component.endDate = this.application.proposalEndDate; } - private patchTurpFields(component: ApplicationDecisionComponentDto) { + private setExpiryDateFields(component: ApplicationDecisionComponentDto) { component.expiryDate = this.application.proposalExpiryDate; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html index b95c28df84..1adc7b6ee6 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-v2.component.html @@ -182,9 +182,12 @@
{{ component.applicationDecisionComponentType?.label }}
> - {{ component.applicationDecisionComponentType?.label }} [fillRow]="true" (saveAlrArea)="onSaveAlrArea(decision.uuid, component.uuid, $event)" > + > { + await queryRunner.query(` + INSERT INTO "alcs"."application_decision_component_type" + ("audit_deleted_date_at", "audit_created_at", "audit_updated_at", "audit_created_by", "audit_updated_by", "label", "code", "description") VALUES + (NULL, NOW(), NULL, 'seed-migration', 'seed-migration', 'Restrictive Covenant', 'COVE', 'Restrictive Covenant'); + `); + } + + public async down(): Promise { + //Nope + } +} From 62ad1c906ee8ad8d7d60ee9d973ae24a896267d0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 31 Oct 2023 13:26:51 -0700 Subject: [PATCH 2/2] Code Review Feedback --- .../expiry-date/expiry-date.component.spec.ts | 2 +- .../decision-component/decision-component.component.ts | 6 +++--- .../expiry-date-input/expiry-date-input.component.html | 2 +- .../expiry-date-input/expiry-date-input.component.spec.ts | 2 +- .../incl-excl-input/incl-excl-input.component.html | 2 +- .../application-decision-v2/application-decision-v2.dto.ts | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts index 208b3e5d41..3a802fd56b 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts @@ -4,7 +4,7 @@ import { ApplicationDecisionComponentDto } from '../../../../../../services/appl import { ExpiryDateComponent } from './expiry-date.component'; -describe('TurpComponent', () => { +describe('ExpiryDateComponent', () => { let component: ExpiryDateComponent; let fixture: ComponentFixture; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts index 86d658fd85..3592a1be0e 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts @@ -11,7 +11,7 @@ import { ProposedDecisionLotDto, RosoDecisionComponentDto, SubdDecisionComponentDto, - TurpDecisionComponentDto, + ExpiryDateDecisionComponentDto, } from '../../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; import { ToastService } from '../../../../../../../services/toast/toast.service'; import { AG_CAP_OPTIONS, AG_CAP_SOURCE_OPTIONS } from '../../../../../../../shared/dto/ag-cap.types.dto'; @@ -41,7 +41,7 @@ export class DecisionComponentComponent implements OnInit { nfuSubType = new FormControl(null, [Validators.required]); endDate = new FormControl(null, [Validators.required]); - // expiry-date & cove + // turp & cove expiryDate = new FormControl(null); // pofo, pfrs @@ -285,7 +285,7 @@ export class DecisionComponentComponent implements OnInit { }; } - private getExpiryDateDataChange(): TurpDecisionComponentDto { + private getExpiryDateDataChange(): ExpiryDateDecisionComponentDto { return { expiryDate: this.expiryDate.value ? formatDateForApi(this.expiryDate.value) : null, }; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html index b64b949e8b..418d69ca45 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.html @@ -1,4 +1,4 @@ - +
ALR Area Impacted (ha) diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts index 4eb8ed26a4..48fdd8ac68 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/expiry-date-input/expiry-date-input.component.spec.ts @@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ExpiryDateInputComponent } from './expiry-date-input.component'; -describe('TurpInputComponent', () => { +describe('ExpiryDateInputComponent', () => { let component: ExpiryDateInputComponent; let fixture: ComponentFixture; diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html index 1022aa19e4..5da41dfebd 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html @@ -1,4 +1,4 @@ - +
ALR Area Impacted (ha) diff --git a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts index 90138a5eae..46e408ee40 100644 --- a/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts +++ b/alcs-frontend/src/app/services/application/decision/application-decision-v2/application-decision-v2.dto.ts @@ -129,7 +129,7 @@ export interface NfuDecisionComponentDto { endDate?: number | null; } -export interface TurpDecisionComponentDto { +export interface ExpiryDateDecisionComponentDto { expiryDate?: number | null; } @@ -169,7 +169,7 @@ export interface InclExclDecisionComponentDto { export interface ApplicationDecisionComponentDto extends NfuDecisionComponentDto, - TurpDecisionComponentDto, + ExpiryDateDecisionComponentDto, PofoDecisionComponentDto, RosoDecisionComponentDto, NaruDecisionComponentDto,