From 62ad1c906ee8ad8d7d60ee9d973ae24a896267d0 Mon Sep 17 00:00:00 2001 From: Daniel Haselhan Date: Tue, 31 Oct 2023 13:26:51 -0700 Subject: [PATCH] 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,