-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #695 from bcgov/develop
Deployment PR - 273
- Loading branch information
Showing
184 changed files
with
5,469 additions
and
793 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
109 changes: 109 additions & 0 deletions
109
...s/application/applicant-info/application-details/naru-details/naru-details.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| <div *ngIf="_applicationSubmission" class="review-table"> | ||
| <div class="subheading2 grid-1">Selected Subtype:</div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruSubtype?.label }} | ||
| </div> | ||
| <div class="subheading2 grid-1">What is the purpose of the proposal?</div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruPurpose }} | ||
| </div> | ||
| <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'ARFU'"> | ||
| <div class="subheading2 grid-1"> | ||
| What is the total floor area (m<sup>2</sup>) of the proposed additional residence? | ||
| </div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruFloorArea }} | ||
| </div> | ||
| <div class="subheading2 grid-1"> | ||
| Describe the necessity for an additional residence for farm use and how it will support agriculture in the short | ||
| or long term. | ||
| </div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruResidenceNecessity }} | ||
| </div> | ||
| <div class="subheading2 grid-1">Describe the rationale for the proposed location of the additional residence.</div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruLocationRationale }} | ||
| </div> | ||
| <div class="subheading2 grid-1"> | ||
| Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the additional | ||
| residence. | ||
| </div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruInfrastructure }} | ||
| </div> | ||
| </ng-container> | ||
| <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'PRIN'"> | ||
| <div class="subheading2 grid-1"> | ||
| What is the total floor area (m<sup>2</sup>) of the proposed principal residence? | ||
| </div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruFloorArea }} | ||
| </div> | ||
| <div class="subheading2 grid-1"> | ||
| Describe how the proposal for a principal residence more than 500 m<sup>2</sup> will support agriculture in the | ||
| short or long term. | ||
| </div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruResidenceNecessity }} | ||
| </div> | ||
| <div class="subheading2 grid-1">Describe the rationale for the proposed location of the principal residence.</div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruLocationRationale }} | ||
| </div> | ||
| <div class="subheading2 grid-1"> | ||
| Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the principal | ||
| residence. | ||
| </div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruInfrastructure }} | ||
| </div> | ||
| </ng-container> | ||
| <div class="subheading2 grid-1"> | ||
| Describe the total floor area (m<sup>2</sup>), type, number, and occupancy of all residential structures currently | ||
| located on the property. | ||
| </div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruExistingStructures }} | ||
| </div> | ||
|
|
||
| <div class="subheading2 grid-1">Proposal Map / Site Plan</div> | ||
| <div class="grid-double"> | ||
| <a *ngFor="let file of proposalMap" (click)="openFile(file)"> | ||
| {{ file.fileName }} | ||
| </a> | ||
| </div> | ||
|
|
||
| <div class="subheading2 grid-1"> | ||
| Do you need to import any fill to construct or conduct the proposed Non-farm use? Fill is any material brought onto | ||
| the property, including gravel for construction. | ||
| </div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruWillImportFill ? 'Yes' : 'No' }} | ||
| </div> | ||
| <ng-container *ngIf="_applicationSubmission.naruWillImportFill"> | ||
| <div class="subheading1 full-width">Fill to be Placed</div> | ||
| <div class="full-width soil-table"> | ||
| <div class="grid-1"><strong>Volume</strong></div> | ||
| <div class="grid-2">{{ _applicationSubmission.naruToPlaceVolume }} m<sup>3</sup></div> | ||
| <div class="grid-1"><strong>Area</strong></div> | ||
| <div class="grid-2">{{ _applicationSubmission.naruToPlaceArea }} ha</div> | ||
| <div class="grid-1"><strong>Maximum Depth</strong></div> | ||
| <div class="grid-2">{{ _applicationSubmission.naruToPlaceMaximumDepth }} m</div> | ||
| <div class="grid-1"><strong>Average Depth</strong></div> | ||
| <div class="grid-2">{{ _applicationSubmission.naruToPlaceAverageDepth }} m</div> | ||
| </div> | ||
|
|
||
| <div class="full-width"> | ||
| <span class="subheading1">Project Duration</span> | ||
| </div> | ||
| <div class="subheading2 grid-1">Duration</div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruProjectDurationUnit }} | ||
| </div> | ||
| <div class="subheading2 grid-1">Length</div> | ||
| <div class="grid-double"> | ||
| {{ _applicationSubmission.naruProjectDurationAmount }} | ||
| </div> | ||
| </ng-container> | ||
| </div> |
7 changes: 7 additions & 0 deletions
7
...s/application/applicant-info/application-details/naru-details/naru-details.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| .soil-table { | ||
| display: grid; | ||
| grid-template-columns: max-content max-content; | ||
| overflow-x: auto; | ||
| grid-column-gap: 36px; | ||
| grid-row-gap: 12px; | ||
| } |
31 changes: 31 additions & 0 deletions
31
...pplication/applicant-info/application-details/naru-details/naru-details.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
| import { DeepMocked } from '@golevelup/ts-jest'; | ||
| import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service'; | ||
|
|
||
| import { NaruDetailsComponent } from './naru-details.component'; | ||
|
|
||
| describe('RosoDetailsComponent', () => { | ||
| let component: NaruDetailsComponent; | ||
| let fixture: ComponentFixture<NaruDetailsComponent>; | ||
| let mockAppDocumentService: DeepMocked<ApplicationDocumentService>; | ||
|
|
||
| beforeEach(async () => { | ||
| await TestBed.configureTestingModule({ | ||
| declarations: [NaruDetailsComponent], | ||
| providers: [ | ||
| { | ||
| provide: ApplicationDocumentService, | ||
| useValue: mockAppDocumentService, | ||
| }, | ||
| ], | ||
| }).compileComponents(); | ||
|
|
||
| fixture = TestBed.createComponent(NaruDetailsComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
36 changes: 36 additions & 0 deletions
36
...res/application/applicant-info/application-details/naru-details/naru-details.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import { Component, Input } from '@angular/core'; | ||
| import { Router } from '@angular/router'; | ||
| import { ApplicationDocumentDto } from '../../../../../services/application/application-document/application-document.dto'; | ||
| import { | ||
| ApplicationDocumentService, | ||
| DOCUMENT_TYPE, | ||
| } from '../../../../../services/application/application-document/application-document.service'; | ||
| import { ApplicationSubmissionDto } from '../../../../../services/application/application.dto'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-naru-details[applicationSubmission]', | ||
| templateUrl: './naru-details.component.html', | ||
| styleUrls: ['./naru-details.component.scss'], | ||
| }) | ||
| export class NaruDetailsComponent { | ||
| _applicationSubmission: ApplicationSubmissionDto | undefined; | ||
| @Input() set applicationSubmission(application: ApplicationSubmissionDto | undefined) { | ||
| if (application) { | ||
| this._applicationSubmission = application; | ||
| } | ||
| } | ||
|
|
||
| @Input() set files(documents: ApplicationDocumentDto[] | undefined) { | ||
| if (documents) { | ||
| this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP); | ||
| } | ||
| } | ||
|
|
||
| proposalMap: ApplicationDocumentDto[] = []; | ||
|
|
||
| constructor(private router: Router, private applicationDocumentService: ApplicationDocumentService) {} | ||
|
|
||
| async openFile(file: ApplicationDocumentDto) { | ||
| await this.applicationDocumentService.download(file.uuid, file.fileName); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...res/application/decision/decision-v1/decision-v1-dialog/decision-v1-dialog.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
...app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <div> | ||
| <div class="subheading2">Non-Farm Use Type</div> | ||
| {{ component.nfuType }} | ||
| </div> | ||
| <div> | ||
| <div class="subheading2">Non-Farm Use Sub-Type</div> | ||
| {{ component.nfuSubType }} | ||
| </div> | ||
| <div> | ||
| <div class="subheading2">Use End Date</div> | ||
| {{ component.endDate | date }} | ||
| </div> |
Empty file.
26 changes: 26 additions & 0 deletions
26
.../features/application/decision/decision-v2/decision-component/nfup/nfup.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| 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 { NfupComponent } from './nfup.component'; | ||
|
|
||
| describe('NfupComponent', () => { | ||
| let component: NfupComponent; | ||
| let fixture: ComponentFixture<NfupComponent>; | ||
|
|
||
| beforeEach(async () => { | ||
| await TestBed.configureTestingModule({ | ||
| declarations: [NfupComponent], | ||
| schemas: [NO_ERRORS_SCHEMA], | ||
| }).compileComponents(); | ||
|
|
||
| fixture = TestBed.createComponent(NfupComponent); | ||
| component = fixture.componentInstance; | ||
| component.component = {} as DecisionComponentDto; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
11 changes: 11 additions & 0 deletions
11
...c/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import { Component, Input } from '@angular/core'; | ||
| import { DecisionComponentDto } from '../../../../../../services/application/decision/application-decision-v2/application-decision-v2.dto'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-nfup', | ||
| templateUrl: './nfup.component.html', | ||
| styleUrls: ['./nfup.component.scss'], | ||
| }) | ||
| export class NfupComponent { | ||
| @Input() component!: DecisionComponentDto; | ||
| } |
Oops, something went wrong.