+
+
;
let mockModificationService: DeepMocked;
let mockReviewService: DeepMocked;
+ let mockAppSubmissionService: DeepMocked;
+ let mockAppStatusService: DeepMocked;
beforeEach(async () => {
mockAppDetailService = createMock();
@@ -33,6 +37,8 @@ describe('ApplicationComponent', () => {
mockModificationService.$modifications = new BehaviorSubject([]);
mockReviewService = createMock();
+ mockAppSubmissionService = createMock();
+ mockAppStatusService = createMock();
await TestBed.configureTestingModule({
providers: [
@@ -56,6 +62,14 @@ describe('ApplicationComponent', () => {
provide: ApplicationReviewService,
useValue: mockReviewService,
},
+ {
+ provide: ApplicationSubmissionService,
+ useValue: mockAppSubmissionService,
+ },
+ {
+ provide: ApplicationSubmissionStatusService,
+ useValue: mockAppStatusService,
+ },
{
provide: ActivatedRoute,
useValue: {
diff --git a/alcs-frontend/src/app/features/application/application.component.ts b/alcs-frontend/src/app/features/application/application.component.ts
index c966b1163c..38d973a9ec 100644
--- a/alcs-frontend/src/app/features/application/application.component.ts
+++ b/alcs-frontend/src/app/features/application/application.component.ts
@@ -8,7 +8,13 @@ import { ApplicationModificationDto } from '../../services/application/applicati
import { ApplicationModificationService } from '../../services/application/application-modification/application-modification.service';
import { ApplicationReconsiderationDto } from '../../services/application/application-reconsideration/application-reconsideration.dto';
import { ApplicationReconsiderationService } from '../../services/application/application-reconsideration/application-reconsideration.service';
-import { ApplicationDto } from '../../services/application/application.dto';
+import { ApplicationSubmissionService } from '../../services/application/application-submission/application-submission.service';
+import {
+ ApplicationDto,
+ ApplicationSubmissionDto,
+ SUBMISSION_STATUS,
+} from '../../services/application/application.dto';
+import { SYSTEM_SOURCE_TYPES } from '../../shared/dto/system-source.types.dto';
import { ApplicantInfoComponent } from './applicant-info/applicant-info.component';
import { ApplicationMeetingComponent } from './application-meeting/application-meeting.component';
import { decisionChildRoutes, DecisionModule } from './decision/decision.module';
@@ -20,6 +26,55 @@ import { OverviewComponent } from './overview/overview.component';
import { PostDecisionComponent } from './post-decision/post-decision.component';
import { ProposalComponent } from './proposal/proposal.component';
import { ReviewComponent } from './review/review.component';
+import { ApplicationSubmissionStatusService } from '../../services/application/application-submission-status/application-submission-status.service';
+
+export const unsubmittedRoutes = [
+ {
+ path: '',
+ menuTitle: 'Overview',
+ icon: 'summarize',
+ component: OverviewComponent,
+ portalOnly: true,
+ },
+ {
+ path: 'applicant-info',
+ menuTitle: 'App Preview',
+ icon: 'persons',
+ component: ApplicantInfoComponent,
+ portalOnly: true,
+ },
+];
+
+export const submittedLfngRoutes = [
+ {
+ path: '',
+ menuTitle: 'Overview',
+ icon: 'summarize',
+ component: OverviewComponent,
+ portalOnly: true,
+ },
+ {
+ path: 'applicant-info',
+ menuTitle: 'Applicant Info',
+ icon: 'persons',
+ component: ApplicantInfoComponent,
+ portalOnly: true,
+ },
+ {
+ path: 'lfng-info',
+ menuTitle: 'L/FNG Info',
+ icon: 'account_balance',
+ component: LfngInfoComponent,
+ portalOnly: true,
+ },
+ {
+ path: 'documents',
+ menuTitle: 'Documents',
+ icon: 'description',
+ component: DocumentsComponent,
+ portalOnly: false,
+ },
+];
export const appChildRoutes = [
{
@@ -80,7 +135,7 @@ export const appChildRoutes = [
},
{
path: 'decision',
- menuTitle: 'Decision',
+ menuTitle: 'Decisions',
icon: 'gavel',
module: DecisionModule,
portalOnly: false,
@@ -110,20 +165,27 @@ export const appChildRoutes = [
export class ApplicationComponent implements OnInit, OnDestroy {
destroy = new Subject();
childRoutes = appChildRoutes;
+ unsubmittedRoutes = unsubmittedRoutes;
+ submittedLfngRoutes = submittedLfngRoutes;
fileNumber?: string;
application: ApplicationDto | undefined;
reconsiderations: ApplicationReconsiderationDto[] = [];
modifications: ApplicationModificationDto[] = [];
+ submission?: ApplicationSubmissionDto;
isApplicantSubmission = false;
+ showSubmittedToAlcMenuItems = false;
+ showSubmittedToLfngMenuItems = false;
constructor(
private applicationDetailService: ApplicationDetailService,
+ private applicationSubmissionService: ApplicationSubmissionService,
private reconsiderationService: ApplicationReconsiderationService,
private modificationService: ApplicationModificationService,
private route: ActivatedRoute,
- private titleService: Title
+ private titleService: Title,
+ public applicationStatusService: ApplicationSubmissionStatusService,
) {}
ngOnInit(): void {
@@ -133,13 +195,37 @@ export class ApplicationComponent implements OnInit, OnDestroy {
this.loadApplication();
});
- this.applicationDetailService.$application.pipe(takeUntil(this.destroy)).subscribe((application) => {
+ this.applicationDetailService.$application.pipe(takeUntil(this.destroy)).subscribe(async (application) => {
if (application) {
this.titleService.setTitle(`${environment.siteName} | ${application.fileNumber} (${application.applicant})`);
this.application = application;
this.reconsiderationService.fetchByApplication(application.fileNumber);
this.modificationService.fetchByApplication(application.fileNumber);
- this.isApplicantSubmission = application.source === 'APPLICANT';
+
+ this.isApplicantSubmission = application.source !== SYSTEM_SOURCE_TYPES.ALCS;
+ let wasSubmittedToLfng = false;
+
+ if (this.isApplicantSubmission) {
+ this.submission = await this.applicationSubmissionService.fetchSubmission(application.fileNumber);
+
+ wasSubmittedToLfng =
+ this.isApplicantSubmission &&
+ [
+ SUBMISSION_STATUS.SUBMITTED_TO_LG,
+ SUBMISSION_STATUS.IN_REVIEW_BY_LG,
+ SUBMISSION_STATUS.REFUSED_TO_FORWARD_LG,
+ SUBMISSION_STATUS.RETURNED_TO_LG,
+ SUBMISSION_STATUS.WRONG_GOV,
+ SUBMISSION_STATUS.INCOMPLETE,
+ ].includes(this.submission?.status?.code);
+ }
+
+ const submittedToAlcsStatus = this.submission?.submissionStatuses.find(
+ (s) => s.statusTypeCode === SUBMISSION_STATUS.SUBMITTED_TO_ALC && !!s.effectiveDate,
+ );
+ this.showSubmittedToLfngMenuItems = wasSubmittedToLfng && !submittedToAlcsStatus;
+
+ this.showSubmittedToAlcMenuItems = this.isApplicantSubmission ? !!submittedToAlcsStatus : true;
}
});
diff --git a/alcs-frontend/src/app/features/application/application.module.ts b/alcs-frontend/src/app/features/application/application.module.ts
index 0792973942..049b6ce44a 100644
--- a/alcs-frontend/src/app/features/application/application.module.ts
+++ b/alcs-frontend/src/app/features/application/application.module.ts
@@ -1,4 +1,6 @@
+import { NgIf } from '@angular/common';
import { NgModule } from '@angular/core';
+import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { RouterModule, Routes } from '@angular/router';
import { MTX_DATETIME_FORMATS } from '@ng-matero/extensions/core';
import { ApplicationDetailService } from '../../services/application/application-detail.service';
@@ -17,12 +19,18 @@ import { InfoRequestsComponent } from './info-requests/info-requests.component';
import { InfoRequestDialogComponent } from './info-requests/info-rquest-dialog/info-request-dialog.component';
import { IntakeComponent } from './intake/intake.component';
import { LfngInfoComponent } from './lfng-info/lfng-info.component';
+import { ReturnApplicationDialogComponent } from './lfng-info/return-application-dialog/return-application-dialog.component';
import { OverviewComponent } from './overview/overview.component';
+import { UncancelApplicationDialogComponent } from './overview/uncancel-application-dialog/uncancel-application-dialog.component';
import { EditModificationDialogComponent } from './post-decision/edit-modification-dialog/edit-modification-dialog.component';
import { EditReconsiderationDialogComponent } from './post-decision/edit-reconsideration-dialog/edit-reconsideration-dialog.component';
import { PostDecisionComponent } from './post-decision/post-decision.component';
+import { InclProposalComponent } from './proposal/incl/incl.component';
+import { NaruProposalComponent } from './proposal/naru/naru.component';
import { NfuProposalComponent } from './proposal/nfu/nfu.component';
+import { ParcelPrepComponent } from './proposal/parcel-prep/parcel-prep.component';
import { ProposalComponent } from './proposal/proposal.component';
+import { ExclProposalComponent } from './proposal/excl/excl.component';
import { SoilProposalComponent } from './proposal/soil/soil.component';
import { SubdProposalComponent } from './proposal/subd/subd.component';
import { DecisionMeetingDialogComponent } from './review/decision-meeting-dialog/decision-meeting-dialog.component';
@@ -68,7 +76,13 @@ const routes: Routes = [
NfuProposalComponent,
SubdProposalComponent,
SoilProposalComponent,
+ ExclProposalComponent,
+ NaruProposalComponent,
+ InclProposalComponent,
+ ParcelPrepComponent,
+ UncancelApplicationDialogComponent,
+ ReturnApplicationDialogComponent,
],
- imports: [SharedModule.forRoot(), RouterModule.forChild(routes), ApplicationDetailsModule, DecisionModule],
+ imports: [SharedModule, RouterModule.forChild(routes), ApplicationDetailsModule, DecisionModule],
})
export class ApplicationModule {}
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html
new file mode 100644
index 0000000000..30a7671c59
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.html
@@ -0,0 +1,125 @@
+;
+ let mockApplicationDecisionConditionService: DeepMocked;
+
+ beforeEach(async () => {
+ mockApplicationDecisionConditionService = createMock();
+
+ await TestBed.configureTestingModule({
+ declarations: [ConditionComponent],
+ providers: [
+ {
+ provide: ApplicationDecisionConditionService,
+ useValue: mockApplicationDecisionConditionService,
+ },
+ ],
+ schemas: [NO_ERRORS_SCHEMA],
+ imports: [SharedModule, BrowserAnimationsModule],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(ConditionComponent);
+ component = fixture.componentInstance;
+
+ component.condition = createMock<
+ ApplicationDecisionConditionWithStatus & {
+ componentLabelsStr?: string;
+ componentLabels?: ConditionComponentLabels[];
+ }
+ >();
+ component.condition.conditionComponentsLabels = [];
+
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts
new file mode 100644
index 0000000000..982dbf0370
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.ts
@@ -0,0 +1,185 @@
+import { AfterViewInit, Component, Input, OnInit } from '@angular/core';
+import moment from 'moment';
+import { ApplicationDecisionComponentToConditionLotService } from '../../../../../services/application/decision/application-decision-v2/application-decision-component-to-condition-lot/application-decision-component-to-condition-lot.service';
+import { ApplicationDecisionConditionService } from '../../../../../services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service';
+import {
+ ApplicationDecisionConditionToComponentPlanNumberDto,
+ APPLICATION_DECISION_COMPONENT_TYPE,
+ ApplicationDecisionComponentDto,
+ UpdateApplicationDecisionConditionDto,
+} from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+import {
+ DECISION_CONDITION_COMPLETE_LABEL,
+ DECISION_CONDITION_INCOMPLETE_LABEL,
+ DECISION_CONDITION_SUPERSEDED_LABEL,
+} from '../../../../../shared/application-type-pill/application-type-pill.constants';
+import {
+ ApplicationDecisionConditionWithStatus,
+ ConditionComponentLabels,
+ CONDITION_STATUS,
+} from '../conditions.component';
+
+type Condition = ApplicationDecisionConditionWithStatus & {
+ componentLabelsStr?: string;
+ componentLabels?: ConditionComponentLabels[];
+};
+
+@Component({
+ selector: 'app-condition',
+ templateUrl: './condition.component.html',
+ styleUrls: ['./condition.component.scss'],
+})
+export class ConditionComponent implements OnInit, AfterViewInit {
+ @Input() condition!: Condition;
+ @Input() isDraftDecision!: boolean;
+ @Input() fileNumber!: string;
+
+ incompleteLabel = DECISION_CONDITION_INCOMPLETE_LABEL;
+ completeLabel = DECISION_CONDITION_COMPLETE_LABEL;
+ supersededLabel = DECISION_CONDITION_SUPERSEDED_LABEL;
+
+ CONDITION_STATUS = CONDITION_STATUS;
+
+ isReadMoreClicked = false;
+ isReadMoreVisible = false;
+ conditionStatus: string = '';
+ isRequireSurveyPlan = false;
+ subdComponent?: ApplicationDecisionComponentDto;
+ planNumbers: ApplicationDecisionConditionToComponentPlanNumberDto[] = [];
+
+ constructor(
+ private conditionService: ApplicationDecisionConditionService,
+ private conditionLotService: ApplicationDecisionComponentToConditionLotService
+ ) {}
+
+ ngOnInit() {
+ this.updateStatus();
+ if (this.condition) {
+ this.condition = {
+ ...this.condition,
+ componentLabelsStr: this.condition.conditionComponentsLabels?.flatMap((e) => e.label).join(';\n'),
+ };
+
+ this.isRequireSurveyPlan = this.condition.type?.code === 'RSPL';
+ this.loadLots();
+ this.loadPlanNumber();
+ }
+ }
+
+ async loadLots() {
+ if (this.condition.components) {
+ const subdComponent = this.condition.components.find(
+ (component) => component.applicationDecisionComponentTypeCode === APPLICATION_DECISION_COMPONENT_TYPE.SUBD
+ );
+ if (subdComponent && subdComponent.uuid) {
+ const planNumbers = await this.conditionLotService.fetchConditionLots(this.condition.uuid, subdComponent.uuid);
+ subdComponent.lots = subdComponent.lots
+ ?.map((lot) => ({
+ ...lot,
+ uuid: lot.uuid,
+ planNumbers:
+ planNumbers.find((planNumber) => planNumber.componentLotUuid === lot.uuid)?.planNumbers ?? null,
+ }))
+ .sort((a, b) => a.index - b.index);
+ this.subdComponent = subdComponent;
+ }
+ }
+ }
+
+ async loadPlanNumber() {
+ const subdComponent = this.condition.components?.find(
+ (component) => component.applicationDecisionComponentTypeCode === APPLICATION_DECISION_COMPONENT_TYPE.SUBD
+ );
+ if (
+ this.condition.components &&
+ this.condition.components.some(
+ (component) => component.applicationDecisionComponentTypeCode !== APPLICATION_DECISION_COMPONENT_TYPE.SUBD
+ ) &&
+ this.isRequireSurveyPlan
+ ) {
+ const planNumbers = (await this.conditionService.fetchPlanNumbers(this.condition.uuid)).filter(
+ (planNumber) => planNumber.applicationDecisionComponentUuid !== subdComponent?.uuid
+ );
+
+ this.planNumbers =
+ this.condition.components
+ ?.filter(
+ (component) => component.applicationDecisionComponentTypeCode !== APPLICATION_DECISION_COMPONENT_TYPE.SUBD
+ )
+ .map(
+ (component) =>
+ ({
+ applicationDecisionComponentUuid: component.uuid,
+ applicationDecisionConditionUuid: this.condition.uuid,
+ planNumbers: planNumbers.find(
+ (planNumber) => planNumber.applicationDecisionComponentUuid === component.uuid
+ )?.planNumbers,
+ } as ApplicationDecisionConditionToComponentPlanNumberDto)
+ ) ?? [];
+ }
+ }
+
+ ngAfterViewInit(): void {
+ setTimeout(() => (this.isReadMoreVisible = this.checkIfReadMoreVisible()));
+ }
+
+ async onUpdateCondition(
+ field: keyof UpdateApplicationDecisionConditionDto,
+ value: string[] | string | number | null
+ ) {
+ const condition = this.condition;
+
+ if (condition) {
+ const update = await this.conditionService.update(condition.uuid, {
+ [field]: value,
+ });
+
+ const labels = this.condition.componentLabelsStr;
+ this.condition = { ...update, componentLabelsStr: labels } as Condition;
+
+ this.updateStatus();
+ }
+ }
+
+ onToggleReadMore() {
+ this.isReadMoreClicked = !this.isReadMoreClicked;
+ }
+
+ isEllipsisActive(e: string): boolean {
+ const el = document.getElementById(e);
+ // + 2 required as adjustment to height
+ return el ? el.clientHeight + 2 < el.scrollHeight : false;
+ }
+
+ checkIfReadMoreVisible(): boolean {
+ return this.isReadMoreClicked || this.isEllipsisActive(this.condition.uuid + 'Description');
+ }
+
+ updateStatus() {
+ const today = moment().startOf('day').toDate().getTime();
+
+ if (this.condition.supersededDate && this.condition.supersededDate <= today) {
+ this.conditionStatus = CONDITION_STATUS.SUPERSEDED;
+ } else if (this.condition.completionDate && this.condition.completionDate <= today) {
+ this.conditionStatus = CONDITION_STATUS.COMPLETE;
+ } else {
+ this.conditionStatus = CONDITION_STATUS.INCOMPLETE;
+ }
+ }
+
+ async savePlanNumbers(lotUuid: string, conditionUuid: string, planNumbers: string | null) {
+ if (this.subdComponent && this.subdComponent.uuid && this.subdComponent?.lots) {
+ await this.conditionLotService.update(lotUuid, conditionUuid, planNumbers);
+ }
+ }
+
+ async updateConditionPlanNumbers(conditionUuid: string, componentUuid: string, $value: string | null) {
+ if (this.isRequireSurveyPlan) {
+ this.conditionService.updatePlanNumbers(conditionUuid, componentUuid, $value);
+ }
+ }
+
+ getComponentLabel(componentUuid: string) {
+ return this.condition.conditionComponentsLabels?.find((e) => e.componentUuid === componentUuid)?.label;
+ }
+}
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.html b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.html
new file mode 100644
index 0000000000..f7179c26ad
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.html
@@ -0,0 +1,82 @@
+
+
+
+
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss
new file mode 100644
index 0000000000..d216bf2f2b
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.scss
@@ -0,0 +1,135 @@
+@use '../../../../../styles/colors.scss';
+
+h3,
+div,
+span,
+p {
+ color: colors.$black;
+}
+
+.header,
+.footer {
+ display: flex;
+ padding-left: 16px;
+}
+
+.header {
+ justify-content: space-between;
+}
+
+.footer {
+ justify-content: flex-end;
+}
+
+:host ::ng-deep {
+ .display-none {
+ display: none !important;
+ }
+
+ .read-more {
+ display: flex;
+ justify-content: flex-end;
+ }
+
+ .decision-container {
+ padding: 28px 0;
+
+ .post-decisions {
+ padding: 8px 16px;
+ background-color: colors.$grey-light;
+ grid-template-columns: 50% 50%;
+ display: grid;
+ min-height: 36px;
+ text-transform: uppercase;
+ border-radius: 4px 4px 0 0;
+ }
+
+ .header {
+ margin: 0;
+ display: flex;
+ justify-content: space-between;
+ padding: 0 16px;
+
+ .title {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 16px;
+ }
+ }
+
+ .even-condition {
+ background-color: colors.$grey-light;
+ }
+
+ .condition-container {
+ display: block;
+ padding: 24px 16px;
+
+ .header {
+ display: flex;
+ padding: 0px;
+ gap: 16px;
+ padding-bottom: 16px;
+
+ color: colors.$black;
+ justify-content: flex-start;
+ }
+
+ .grid-3 {
+ display: grid;
+ grid-template-columns: 31% 31% 31%;
+ grid-row-gap: 24px;
+ grid-column-gap: 16px;
+
+ .full-width {
+ grid-column: 1/4;
+ }
+ }
+ }
+
+ .no-conditions {
+ margin: 16px 16px;
+ color: colors.$grey-dark;
+ }
+ }
+
+ .lot-table {
+ margin-top: 12px;
+ display: grid;
+ grid-template-columns: max-content max-content max-content 0.8fr;
+ grid-column-gap: 36px;
+ grid-row-gap: 12px;
+ align-items: center;
+ }
+
+ .container {
+ margin: 32px 0;
+ }
+
+ .subheading2 {
+ display: flex;
+ gap: 4px;
+ }
+
+ .icon {
+ height: 20px;
+ width: 20px;
+ font-size: 20px;
+ }
+
+ .component-labels {
+ white-space: pre-wrap;
+ }
+
+ .inline-plan-numbers {
+ width: 100%;
+
+ .editing {
+ width: 100%;
+ .mat-mdc-form-field {
+ width: 100%;
+ }
+ }
+ }
+}
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.spec.ts b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.spec.ts
new file mode 100644
index 0000000000..f3116b4875
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.spec.ts
@@ -0,0 +1,55 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute, convertToParamMap } from '@angular/router';
+import { createMock, DeepMocked } from '@golevelup/ts-jest';
+import { BehaviorSubject } from 'rxjs';
+import { ApplicationDetailService } from '../../../../services/application/application-detail.service';
+import { ApplicationDto } from '../../../../services/application/application.dto';
+import { ApplicationDecisionV2Service } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.service';
+
+import { ConditionsComponent } from './conditions.component';
+
+describe('ConditionsComponent', () => {
+ let component: ConditionsComponent;
+ let fixture: ComponentFixture;
+ let mockApplicationDetailService: DeepMocked;
+ let mockApplicationDecisionV2Service: DeepMocked;
+
+ beforeEach(async () => {
+ mockApplicationDetailService = createMock();
+ mockApplicationDetailService.$application = new BehaviorSubject(undefined);
+
+ mockApplicationDecisionV2Service = createMock();
+
+ await TestBed.configureTestingModule({
+ declarations: [ConditionsComponent],
+ providers: [
+ {
+ provide: ApplicationDetailService,
+ useValue: mockApplicationDetailService,
+ },
+ {
+ provide: ApplicationDecisionV2Service,
+ useValue: mockApplicationDecisionV2Service,
+ },
+ {
+ provide: ActivatedRoute,
+ useValue: {
+ snapshot: {
+ paramMap: convertToParamMap({ uuid: 'fake' }),
+ },
+ },
+ },
+ ],
+ schemas: [NO_ERRORS_SCHEMA],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(ConditionsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts
new file mode 100644
index 0000000000..4853798278
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/conditions/conditions.component.ts
@@ -0,0 +1,166 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import moment from 'moment';
+import { Subject, takeUntil } from 'rxjs';
+import { ApplicationDetailService } from '../../../../services/application/application-detail.service';
+import { ApplicationDto } from '../../../../services/application/application.dto';
+import {
+ ApplicationDecisionConditionDto,
+ ApplicationDecisionDto,
+ ApplicationDecisionWithLinkedResolutionDto,
+ ApplicationDecisionCodesDto,
+} from '../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+import { ApplicationDecisionV2Service } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.service';
+import {
+ DRAFT_DECISION_TYPE_LABEL,
+ MODIFICATION_TYPE_LABEL,
+ RECON_TYPE_LABEL,
+ RELEASED_DECISION_TYPE_LABEL,
+} from '../../../../shared/application-type-pill/application-type-pill.constants';
+
+export type ConditionComponentLabels = {
+ label: string[];
+ componentUuid: string;
+ conditionUuid: string;
+};
+
+export type ApplicationDecisionConditionWithStatus = ApplicationDecisionConditionDto & {
+ conditionComponentsLabels?: ConditionComponentLabels[];
+ status: string;
+};
+
+export type ApplicationDecisionWithConditionComponentLabels = ApplicationDecisionWithLinkedResolutionDto & {
+ conditions: ApplicationDecisionConditionWithStatus[];
+};
+
+export const CONDITION_STATUS = {
+ INCOMPLETE: 'incomplete',
+ COMPLETE: 'complete',
+ SUPERSEDED: 'superseded',
+};
+
+@Component({
+ selector: 'app-app-conditions',
+ templateUrl: './conditions.component.html',
+ styleUrls: ['./conditions.component.scss'],
+})
+export class ConditionsComponent implements OnInit {
+ $destroy = new Subject();
+
+ decisionUuid: string = '';
+ fileNumber: string = '';
+ decisions: ApplicationDecisionWithConditionComponentLabels[] = [];
+ decision!: ApplicationDecisionWithConditionComponentLabels;
+ conditionDecision!: ApplicationDecisionDto;
+ application: ApplicationDto | undefined;
+ codes!: ApplicationDecisionCodesDto;
+ today!: number;
+
+ dratDecisionLabel = DRAFT_DECISION_TYPE_LABEL;
+ releasedDecisionLabel = RELEASED_DECISION_TYPE_LABEL;
+ reconLabel = RECON_TYPE_LABEL;
+ modificationLabel = MODIFICATION_TYPE_LABEL;
+
+ constructor(
+ private applicationDetailService: ApplicationDetailService,
+ private decisionService: ApplicationDecisionV2Service,
+ private activatedRouter: ActivatedRoute
+ ) {
+ this.today = moment().startOf('day').toDate().getTime();
+ }
+
+ ngOnInit(): void {
+ this.fileNumber = this.activatedRouter.parent?.parent?.snapshot.paramMap.get('fileNumber')!;
+ this.decisionUuid = this.activatedRouter.snapshot.paramMap.get('uuid')!;
+
+ this.applicationDetailService.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => {
+ if (application) {
+ this.application = application;
+ this.loadDecisions(application.fileNumber);
+ }
+ });
+ }
+
+ async loadDecisions(fileNumber: string) {
+ this.codes = await this.decisionService.fetchCodes();
+ this.decisionService.$decisions.pipe(takeUntil(this.$destroy)).subscribe((decisions) => {
+ this.decisions = decisions.map((decision) => {
+ if (decision.uuid === this.decisionUuid) {
+ const conditions = this.mapConditions(decision, decisions);
+
+ this.sortConditions(decision, conditions);
+
+ this.decision = decision as ApplicationDecisionWithConditionComponentLabels;
+ }
+
+ return decision as ApplicationDecisionWithConditionComponentLabels;
+ });
+ });
+
+ this.decisionService.loadDecisions(fileNumber);
+ }
+
+ private sortConditions(
+ decision: ApplicationDecisionWithLinkedResolutionDto,
+ conditions: ApplicationDecisionConditionWithStatus[]
+ ) {
+ decision.conditions = conditions.sort((a, b) => {
+ const order = [CONDITION_STATUS.INCOMPLETE, CONDITION_STATUS.COMPLETE, CONDITION_STATUS.SUPERSEDED];
+ if (a.status === b.status) {
+ if (a.type && b.type) {
+ return a.type?.label.localeCompare(b.type.label);
+ } else {
+ return -1;
+ }
+ } else {
+ return order.indexOf(a.status) - order.indexOf(b.status);
+ }
+ });
+ }
+
+ private mapConditions(
+ decision: ApplicationDecisionWithLinkedResolutionDto,
+ decisions: ApplicationDecisionWithLinkedResolutionDto[]
+ ) {
+ return decision.conditions.map((condition) => {
+ const status = this.getStatus(condition, decision);
+
+ return {
+ ...condition,
+ status,
+ conditionComponentsLabels: condition.components?.map((c) => {
+ const matchingType = this.codes.decisionComponentTypes.find(
+ (type) => type.code === c.applicationDecisionComponentTypeCode
+ );
+
+ const componentsDecision = decisions.find((d) => d.uuid === c.applicationDecisionUuid);
+
+ if (componentsDecision) {
+ decision = componentsDecision;
+ }
+
+ const label =
+ decision.resolutionNumber && decision.resolutionYear
+ ? `#${decision.resolutionNumber}/${decision.resolutionYear} ${matchingType?.label}`
+ : `Draft ${matchingType?.label}`;
+
+ return { label, conditionUuid: condition.uuid, componentUuid: c.uuid };
+ }),
+ } as ApplicationDecisionConditionWithStatus;
+ });
+ }
+
+ private getStatus(condition: ApplicationDecisionConditionDto, decision: ApplicationDecisionWithLinkedResolutionDto) {
+ let status = '';
+ if (condition.supersededDate && condition.supersededDate <= this.today) {
+ status = CONDITION_STATUS.SUPERSEDED;
+ } else if (condition.completionDate && condition.completionDate <= this.today) {
+ status = CONDITION_STATUS.COMPLETE;
+ } else if (decision.isDraft === false) {
+ status = CONDITION_STATUS.INCOMPLETE;
+ } else {
+ status = '';
+ }
+ return status;
+ }
+}
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v1/decision-v1-dialog/decision-v1-dialog.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v1/decision-v1-dialog/decision-v1-dialog.component.ts
index b562dab028..884066d755 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v1/decision-v1-dialog/decision-v1-dialog.component.ts
+++ b/alcs-frontend/src/app/features/application/decision/decision-v1/decision-v1-dialog/decision-v1-dialog.component.ts
@@ -265,7 +265,7 @@ export class DecisionV1DialogComponent implements OnInit {
(reconsideration.type.code === RECONSIDERATION_TYPE.T_33_1 && !reconsideration.resultingDecision)
)
.map((reconsideration, index) => ({
- label: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.reconsideredDecisions
+ label: `Reconsideration Request #${reconsiderations.length - index} - ${reconsideration.reconsidersDecisions
.map((dec) => `#${dec.resolutionNumber}/${dec.resolutionYear}`)
.join(', ')}`,
uuid: reconsideration.uuid,
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html
new file mode 100644
index 0000000000..40aae52ce4
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html
@@ -0,0 +1,8 @@
+;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [BasicComponent],
+ schemas: [NO_ERRORS_SCHEMA],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(BasicComponent);
+ component = fixture.componentInstance;
+ component.component = {} as ApplicationDecisionComponentDto;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts
new file mode 100644
index 0000000000..3bbe0074cf
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.ts
@@ -0,0 +1,19 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+
+@Component({
+ selector: 'app-app-basic',
+ templateUrl: './basic.component.html',
+ styleUrls: ['./basic.component.scss'],
+})
+export class BasicComponent {
+ @Input() component!: ApplicationDecisionComponentDto;
+ @Input() fillRow = false;
+ @Output() saveAlrArea = new EventEmitter();
+
+ constructor() {}
+
+ async onSaveAlrArea(alrArea: string | null) {
+ this.saveAlrArea.emit(alrArea);
+ }
+}
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.html
new file mode 100644
index 0000000000..a05daeca10
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.html
@@ -0,0 +1,6 @@
+;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ExpiryDateComponent],
+ schemas: [NO_ERRORS_SCHEMA],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(ExpiryDateComponent);
+ component = fixture.componentInstance;
+ component.component = {} as ApplicationDecisionComponentDto;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.ts
new file mode 100644
index 0000000000..ad71090b7a
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.ts
@@ -0,0 +1,11 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+
+@Component({
+ selector: 'app-expiry-date',
+ templateUrl: './expiry-date.component.html',
+ styleUrls: ['./expiry-date.component.scss'],
+})
+export class ExpiryDateComponent {
+ @Input() component!: ApplicationDecisionComponentDto;
+}
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html
new file mode 100644
index 0000000000..a594ecffa7
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html
@@ -0,0 +1,14 @@
+
+;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [InclExclComponent],
+ schemas: [NO_ERRORS_SCHEMA],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(InclExclComponent);
+ component = fixture.componentInstance;
+ component.component = {} as ApplicationDecisionComponentDto;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts
new file mode 100644
index 0000000000..04747ca1d3
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.ts
@@ -0,0 +1,11 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+
+@Component({
+ selector: 'app-incl-excl',
+ templateUrl: './incl-excl.component.html',
+ styleUrls: ['./incl-excl.component.scss'],
+})
+export class InclExclComponent {
+ @Input() component!: ApplicationDecisionComponentDto;
+}
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html
new file mode 100644
index 0000000000..dafcee70ff
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html
@@ -0,0 +1,18 @@
+;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [NaruComponent],
+ schemas: [NO_ERRORS_SCHEMA],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(NaruComponent);
+ component = fixture.componentInstance;
+ component.component = {} as ApplicationDecisionComponentDto;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts
new file mode 100644
index 0000000000..1f4090aa51
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.ts
@@ -0,0 +1,11 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+
+@Component({
+ selector: 'app-naru',
+ templateUrl: './naru.component.html',
+ styleUrls: ['./naru.component.scss'],
+})
+export class NaruComponent {
+ @Input() component!: ApplicationDecisionComponentDto;
+}
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html
index e7ca1f4e28..16ccee771d 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html
@@ -1,12 +1,16 @@
+
+
+
+
+
+ {{ route.icon }}
+ {{ route.menuTitle }}
+
+
+
+
+
+ {{ route.icon }}
+ {{ route.menuTitle }}
+
+
+
+
+
+
+
+
+
+{{ condition.type.label }}
+
+
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.scss b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.scss
new file mode 100644
index 0000000000..b1976e0872
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.scss
@@ -0,0 +1,3 @@
+.component-labels {
+ white-space: pre-wrap;
+}
diff --git a/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.spec.ts b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.spec.ts
new file mode 100644
index 0000000000..e88d2d541f
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/conditions/condition/condition.component.spec.ts
@@ -0,0 +1,49 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { createMock, DeepMocked } from '@golevelup/ts-jest';
+import { ApplicationDecisionConditionService } from '../../../../../services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service';
+import { ApplicationDecisionConditionDto } from '../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+import { SharedModule } from '../../../../../shared/shared.module';
+import { ApplicationDecisionConditionWithStatus, ConditionComponentLabels } from '../conditions.component';
+
+import { ConditionComponent } from './condition.component';
+
+describe('ConditionComponent', () => {
+ let component: ConditionComponent;
+ let fixture: ComponentFixture
+
+
+ Component to Condition
+ {{ condition.componentLabelsStr }}
+
+
+
+ Approval Dependent
+ {{ condition.approvalDependant | booleanToString }}
+
+
+
+ Security Amount
+ {{ condition.securityAmount }}
+
+
+
+ Admin Fee
+ {{ condition.administrativeFee }}
+
+
+
+ Completion Date
+
+
+
+ Superseded Date
+
+
+
+
+
+
+
+
+ {{ getComponentLabel(plan.applicationDecisionComponentUuid) }} Survey Plans
+ info_outline
+
+
+
+
+
+
+
+ {{ getComponentLabel(subdComponent.uuid!) }} Survey Plans
+ info_outline
+
+
+
+
+
+ #
+ Type
+ Size (ha)
+ Plan numbers
+
+ {{ lot.index }}
+
+
+ {{ lot.type }}
+
+
+ {{ lot.size }}
+
+
+
+
+
+Description
+ {{
+ condition.description
+ }}
+
+
+ View Conditions
+ +
+
+
+
+
+ Modified By:
+ {{ decision.modifiedByResolutions?.join(', ') }}
+ N/A
+
+
+ Reconsidered By:
+ {{ decision.reconsideredByResolutions?.join(', ') }}
+ N/A
+
+
+
+
+
+
+
+
+ Res #{{ decision.resolutionNumber }}/{{ decision.resolutionYear }}
+
+ Decision #{{ decision.index }}
+
+
+ calendar_month
+ {{ application.activeDays }}
+
+
+ pause
+ {{ application.pausedDays }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.scss
similarity index 100%
rename from portal-frontend/src/app/features/application-details/nfu-details/nfu-details.component.scss
rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.scss
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.spec.ts
new file mode 100644
index 0000000000..0b966955c4
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.spec.ts
@@ -0,0 +1,26 @@
+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 { BasicComponent } from './basic.component';
+
+describe('BasicComponent', () => {
+ let component: BasicComponent;
+ let fixture: ComponentFixtureALR Area Impacted (ha)
+
+
diff --git a/portal-frontend/src/app/features/application-details/tur-details/tur-details.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 portal-frontend/src/app/features/application-details/tur-details/tur-details.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/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
new file mode 100644
index 0000000000..3a802fd56b
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.spec.ts
@@ -0,0 +1,26 @@
+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 { ExpiryDateComponent } from './expiry-date.component';
+
+describe('ExpiryDateComponent', () => {
+ let component: ExpiryDateComponent;
+ let fixture: ComponentFixtureExpiry Date
+ {{ component.expiryDate | date }}
+
+
+
+Applicant Type
+ {{ component.inclExclApplicantType }}
+
+
diff --git a/portal-frontend/src/app/features/edit-submission/land-use/land-use.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.scss
similarity index 100%
rename from portal-frontend/src/app/features/edit-submission/land-use/land-use.component.scss
rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.scss
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts
new file mode 100644
index 0000000000..b7c34fd7e7
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.spec.ts
@@ -0,0 +1,26 @@
+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 { InclExclComponent } from './incl-excl.component';
+
+describe('NaruComponent', () => {
+ let component: InclExclComponent;
+ let fixture: ComponentFixtureExpiry Date
+ {{ component.expiryDate | date }}
+
+
+
+Residential Use Type
+ {{ component.naruSubtype?.label }}
+
+
+
+Expiry Date
+ {{ component.expiryDate | date }}
+
+
diff --git a/portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.scss
similarity index 100%
rename from portal-frontend/src/app/features/edit-submission/parcel-details/application-owners-dialog/application-owners-dialog.component.scss
rename to alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.scss
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.spec.ts
new file mode 100644
index 0000000000..f5eb9c2369
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.spec.ts
@@ -0,0 +1,26 @@
+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 { NaruComponent } from './naru.component';
+
+describe('NaruComponent', () => {
+ let component: NaruComponent;
+ let fixture: ComponentFixtureUse End Date
+ {{ component.endDate | date }}
+ Non-Farm Use Type
{{ component.nfuType }}
+ Non-Farm Use Sub-Type
{{ component.nfuSubType }}
+ Use End Date
{{ component.endDate | date }}
+
-
@@ -20,26 +32,83 @@
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts
index cfef8adbd3..23476b67a0 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.spec.ts
@@ -1,5 +1,6 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
import { PfrsComponent } from './pfrs.component';
@@ -10,11 +11,12 @@ describe('PfrsComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [PfrsComponent],
+ schemas: [NO_ERRORS_SCHEMA],
}).compileComponents();
fixture = TestBed.createComponent(PfrsComponent);
component = fixture.componentInstance;
- component.component = {} as DecisionComponentDto;
+ component.component = {} as ApplicationDecisionComponentDto;
fixture.detectChanges();
});
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts
index 07576498d1..02ad7403ce 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.ts
@@ -1,11 +1,11 @@
import { Component, Input } from '@angular/core';
-import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+import { PfrsDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
@Component({
- selector: 'app-pfrs',
+ selector: 'app-app-pfrs',
templateUrl: './pfrs.component.html',
- styleUrls: ['./pfrs.component.scss']
+ styleUrls: ['./pfrs.component.scss'],
})
export class PfrsComponent {
- @Input() component!: DecisionComponentDto;
-}
\ No newline at end of file
+ @Input() component!: PfrsDecisionComponentDto;
+}
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html
index 6d4d915862..3288a2c74e 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html
@@ -1,37 +1,33 @@
-
Use End Date
+
+
+Use End Date (Placement of Fill)
+ {{ component.endDate2 | date }}
+
+
Use End Date (Removal of Soil)
{{ component.endDate | date }}
+
-
Type of soil approved to be removed.
+ Type of soil approved to be removed
{{ component.soilTypeRemoved }}
+
-
Type, origin and quality of fill proposed to be placed.
+ Type, origin and quality of fill proposed to be placed
{{ component.soilFillTypeToPlace }}
+ | Volume | -{{ component.soilToRemoveVolume }} m3 | -{{ component.soilToPlaceVolume }} m3 | +
+ {{ component.soilToRemoveVolume }} m3
+ |
+
+
+ {{ component.soilToPlaceVolume }} m3
+ |
|
|
- Area
- Note: 0.01 ha is 100m2
+ | Area | +
+
+ {{ component.soilToRemoveArea }} m2
+ |
+
+
+ {{ component.soilToPlaceArea }} m2
+ |
- {{ component.soilToRemoveArea }} ha | -{{ component.soilToPlaceArea }} ha |
| Maximum Depth | -{{ component.soilToRemoveMaximumDepth }} m | -{{ component.soilToPlaceMaximumDepth }} m | +
+ {{ component.soilToRemoveMaximumDepth }} m
+ |
+
+
+ {{ component.soilToPlaceMaximumDepth }} m
+ |
|
| Average Depth | -{{ component.soilToRemoveAverageDepth }} m | -{{ component.soilToPlaceAverageDepth }} m | +
+ {{ component.soilToRemoveAverageDepth }} m
+ |
+
+
+
+ {{ component.soilToPlaceAverageDepth }} m
+ |
+
Use End Date
{{ component.endDate | date }}
+
-
-Type, origin and quality of fill proposed to be placed.
+ Type, origin and quality of fill proposed to be placed
{{ component.soilFillTypeToPlace }}
+
-
-
-
+
| - | Fill to be Placed | - - -
|---|---|
| Volume | -{{ component.soilToPlaceVolume }} m3 | -
|
- Area
- Note: 0.01 ha is 100m2
- |
- {{ component.soilToPlaceArea }} ha | -
| Maximum Depth | -{{ component.soilToPlaceMaximumDepth }} m | -
| Average Depth | -{{ component.soilToPlaceAverageDepth }} m | -
+
+Volume
+ {{ component.soilToPlaceVolume }} m3
+
+
+Area
+ {{ component.soilToPlaceArea }} m2
+
+
+Maximum Depth
+ {{ component.soilToPlaceMaximumDepth }} m
+
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts
index d3b5977136..21a5215761 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.spec.ts
@@ -1,5 +1,6 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
import { PofoComponent } from './pofo.component';
@@ -10,11 +11,12 @@ describe('PofoComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [PofoComponent],
+ schemas: [NO_ERRORS_SCHEMA],
}).compileComponents();
fixture = TestBed.createComponent(PofoComponent);
component = fixture.componentInstance;
- component.component = {} as DecisionComponentDto;
+ component.component = {} as ApplicationDecisionComponentDto;
fixture.detectChanges();
});
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts
index 77535c41b7..c4d5b9912c 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.ts
@@ -1,11 +1,11 @@
-import { Component, Input } from '@angular/core';
-import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
@Component({
- selector: 'app-pofo',
+ selector: 'app-app-pofo',
templateUrl: './pofo.component.html',
- styleUrls: ['./pofo.component.scss']
+ styleUrls: ['./pofo.component.scss'],
})
export class PofoComponent {
- @Input() component!: DecisionComponentDto;
+ @Input() component!: ApplicationDecisionComponentDto;
}
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html
index 0c7b96f43a..160bf4b370 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html
@@ -1,34 +1,31 @@
-Average Depth
+ {{ component.soilToPlaceAverageDepth }} m
+
+
Use End Date
{{ component.endDate | date }}
+
-
-Type of soil approved to be removed.
+ Type of soil approved to be removed
{{ component.soilTypeRemoved }}
+
-
-
-
+;
+ let mockComponentLotService: DeepMocked;
+
+ beforeEach(async () => {
+ mockComponentLotService = createMock();
+
+ await TestBed.configureTestingModule({
+ declarations: [SubdComponent],
+ providers: [
+ {
+ provide: ApplicationDecisionComponentLotService,
+ useValue: mockComponentLotService,
+ },
+ ],
+ schemas: [NO_ERRORS_SCHEMA],
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(SubdComponent);
+ component = fixture.componentInstance;
+ component.component = {} as ApplicationDecisionComponentDto;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts
new file mode 100644
index 0000000000..ab5cdd4253
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.ts
@@ -0,0 +1,28 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { ApplicationDecisionComponentLotService } from '../../../../../../services/application/decision/application-decision-v2/application-decision-component-lot/application-decision-component-lot.service';
+import {
+ ApplicationDecisionComponentDto,
+ ProposedDecisionLotDto,
+} from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+
+@Component({
+ selector: 'app-subd[component]',
+ templateUrl: './subd.component.html',
+ styleUrls: ['./subd.component.scss'],
+})
+export class SubdComponent implements OnInit {
+ constructor(private componentLotService: ApplicationDecisionComponentLotService) {}
+
+ @Input() component!: ApplicationDecisionComponentDto;
+
+ ngOnInit(): void {
+ this.component.lots = this.component.lots?.sort((a, b) => a.index - b.index) ?? undefined;
+ }
+
+ async onSaveAlrParcelArea(lot: ProposedDecisionLotDto, alrArea: string | null) {
+ if (lot.uuid) {
+ lot.alrArea = alrArea ? parseFloat(alrArea) : null;
+ await this.componentLotService.update(lot.uuid, lot);
+ }
+ }
+}
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/turp/turp.component.html
deleted file mode 100644
index 17a8d58c79..0000000000
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.html
+++ /dev/null
@@ -1,4 +0,0 @@
-;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [TurpComponent],
- schemas: [NO_ERRORS_SCHEMA],
- }).compileComponents();
-
- fixture = TestBed.createComponent(TurpComponent);
- component = fixture.componentInstance;
- component.component = {} as DecisionComponentDto;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
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/turp/turp.component.ts
deleted file mode 100644
index 06337647cc..0000000000
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
-
-@Component({
- selector: 'app-turp',
- templateUrl: './turp.component.html',
- styleUrls: ['./turp.component.scss']
-})
-export class TurpComponent {
- @Input() component!: DecisionComponentDto;
-}
-
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html
index 9298139c2f..8874f6bea1 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.html
@@ -1,9 +1,20 @@
-
| - | Soil to be Removed | - - -
|---|---|
| Volume | -{{ component.soilToRemoveVolume }} m3 | -
| Area | -{{ component.soilToRemoveArea }} ha | -
| Maximum Depth | -{{ component.soilToRemoveMaximumDepth }} m | -
| Average Depth | -{{ component.soilToRemoveAverageDepth }} m | -
+
+Volume
+ {{ component.soilToRemoveVolume }} m3
+
+
+Area
+ {{ component.soilToRemoveArea }} m2
+
+
+Maximum Depth
+ {{ component.soilToRemoveMaximumDepth }} m
+
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts
index d70b4c57ef..c30b323ba4 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.spec.ts
@@ -1,5 +1,6 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
import { RosoComponent } from './roso.component';
@@ -10,11 +11,12 @@ describe('RosoComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [RosoComponent],
+ schemas: [NO_ERRORS_SCHEMA],
}).compileComponents();
fixture = TestBed.createComponent(RosoComponent);
component = fixture.componentInstance;
- component.component = {} as DecisionComponentDto;
+ component.component = {} as ApplicationDecisionComponentDto;
fixture.detectChanges();
});
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts
index 0266291d00..e3e7983691 100644
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.ts
@@ -1,11 +1,11 @@
-import { Component, Input } from '@angular/core';
-import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
@Component({
- selector: 'app-roso',
+ selector: 'app-app-roso',
templateUrl: './roso.component.html',
- styleUrls: ['./roso.component.scss']
+ styleUrls: ['./roso.component.scss'],
})
export class RosoComponent {
- @Input() component!: DecisionComponentDto;
+ @Input() component!: ApplicationDecisionComponentDto;
}
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html
new file mode 100644
index 0000000000..9078778b4d
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html
@@ -0,0 +1,36 @@
+Average Depth
+ {{ component.soilToRemoveAverageDepth }} m
+
+
+Total Number of Lots Approved
+ {{ component.lots?.length }}
+
+ Proposed Lot Areas
+
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.scss b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.scss
new file mode 100644
index 0000000000..1944097143
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.scss
@@ -0,0 +1,8 @@
+.lot-table {
+ margin-top: 12px;
+ display: grid;
+ grid-template-columns: max-content max-content max-content 0.8fr;
+ grid-column-gap: 36px;
+ grid-row-gap: 12px;
+ align-items: center;
+}
diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts
new file mode 100644
index 0000000000..c1d3d73a7f
--- /dev/null
+++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.spec.ts
@@ -0,0 +1,38 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { createMock, DeepMocked } from '@golevelup/ts-jest';
+import { ApplicationDecisionComponentLotService } from '../../../../../../services/application/decision/application-decision-v2/application-decision-component-lot/application-decision-component-lot.service';
+import { ApplicationDecisionComponentService } from '../../../../../../services/application/decision/application-decision-v2/application-decision-component/application-decision-component.service';
+import { ApplicationDecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+
+import { SubdComponent } from './subd.component';
+
+describe('PfrsComponent', () => {
+ let component: SubdComponent;
+ let fixture: ComponentFixture
+
+
+
+#
+ Type
+ Size (ha)
+ ALR Area Impacted (ha)
+
+ {{ lot.index }}
+
+
+ {{ lot.type }}
+
+
+ {{ lot.size }}
+
+
+
+
-
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/turp/turp.component.spec.ts
deleted file mode 100644
index 1ad0c0b3fc..0000000000
--- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/turp/turp.component.spec.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto';
-
-import { TurpComponent } from './turp.component';
-
-describe('TurpComponent', () => {
- let component: TurpComponent;
- let fixture: ComponentFixtureExpiry Date
- {{ component.expiryDate | date }}
-
-
Decision Documents
- Decision Documents *
-
-
+
+
Documents
+
+
+
+ | - A*, - C*, - G*, - P* + A*, + C*, + G*, + P* | Upload Date | -{{ element.uploadedAt | date }} | +{{ element.uploadedAt | momentFormat }} |
|---|