Skip to content

Commit

Permalink
Merge pull request #1012 from bcgov/feature/ALCS-1109
Browse files Browse the repository at this point in the history
Text Updates
  • Loading branch information
dhaselhan authored Sep 27, 2023
2 parents fff7a8f + 8cbd34a commit 7cd87df
Show file tree
Hide file tree
Showing 24 changed files with 52 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<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-2">{{ _applicationSubmission.naruToPlaceArea }} m<sup>2</sup></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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ <h4>Soil and Fill Components</h4>
<div class="grid-1"><strong>Volume</strong></div>
<div class="grid-2">{{ applicationSubmission.nfuFillVolume }} m<sup>3</sup></div>
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">{{ applicationSubmission.nfuTotalFillArea }} ha</div>
<div class="grid-2">{{ applicationSubmission.nfuTotalFillArea }} m<sup>2</sup></div>
<div class="grid-1"><strong>Maximum Depth</strong></div>
<div class="grid-2">{{ applicationSubmission.nfuMaxFillDepth }} m</div>
<div class="grid-1"><strong>Average Depth</strong></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<div><strong>Area</strong></div>
<div>
{{ _applicationSubmission.soilToRemoveArea }}
<span *ngIf="_applicationSubmission.soilToRemoveArea !== null">ha</span>
<span *ngIf="_applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span>
</div>
<div>
{{ _applicationSubmission.soilToPlaceArea }}
Expand Down Expand Up @@ -78,11 +78,11 @@
<div><strong>Area</strong></div>
<div>
{{ _applicationSubmission.soilAlreadyRemovedArea }}
<span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">ha</span>
<span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
</div>
<div>
{{ _applicationSubmission.soilAlreadyPlacedArea }}
<span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">ha</span>
<span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
</div>

<div><strong>Maximum Depth</strong></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</div>
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">
{{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">ha</span>
{{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span>
</div>
<div class="grid-1"><strong>Maximum Depth</strong></div>
<div class="grid-2">
Expand All @@ -47,7 +47,7 @@
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">
{{ _applicationSubmission.soilAlreadyPlacedArea }}
<span *ngIf="_applicationSubmission.soilAlreadyPlacedArea">ha</span>
<span *ngIf="_applicationSubmission.soilAlreadyPlacedArea">m<sup>2</sup></span>
</div>
<div class="grid-1"><strong>Maximum Depth</strong></div>
<div class="grid-2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@
<tr>
<td class="soil-table-label">
Area
<div class="subtext">Note: 0.01 ha is 100m2</div>
</td>
<td>
<span *ngIf="component.soilToRemoveArea !== null && component.soilToRemoveArea !== undefined">
{{ component.soilToRemoveArea }} ha</span
{{ component.soilToRemoveArea }} m<sup>2</sup></span
>
<app-no-data
*ngIf="component.soilToRemoveArea === null || component.soilToRemoveArea === undefined"
Expand All @@ -60,7 +59,7 @@

<td>
<span *ngIf="component.soilToPlaceArea !== null && component.soilToPlaceArea !== undefined"
>{{ component.soilToPlaceArea }} ha</span
>{{ component.soilToPlaceArea }} m<sup>2</sup></span
>
<app-no-data
*ngIf="component.soilToPlaceArea === null || component.soilToPlaceArea === undefined"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@
</div>
<div class="label">
<label for="areaToRemove">Area*</label>
<div class="subtext">Note: 0.01 ha is 100m2</div>
</div>
<div>
<mat-form-field appearance="outline" class="full-width">
Expand All @@ -101,7 +100,7 @@
matInput
formControlName="areaToRemove"
/>
<span matTextSuffix>ha</span>
<span matTextSuffix>m<sup>2</sup></span>
</mat-form-field>
</div>
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
</tr>
<tr>
<td class="soil-table-label">Area</td>
<td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} ha</td>
<td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} ha</td>
<td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} m<sup>2</sup></td>
<td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} m<sup>2</sup></td>
</tr>
<tr>
<td class="soil-table-label">Maximum Depth</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
<div><strong>Area</strong></div>
<div>
{{ _noiSubmission.soilToRemoveArea }}
<span *ngIf="_noiSubmission.soilToRemoveArea !== null">ha</span>
<span *ngIf="_noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span>
</div>
<div>
{{ _noiSubmission.soilToPlaceArea }}
<span *ngIf="_noiSubmission.soilToPlaceArea !== null">ha</span>
<span *ngIf="_noiSubmission.soilToPlaceArea !== null">m<sup>2</sup></span>
</div>

<div><strong>Maximum Depth</strong></div>
Expand Down Expand Up @@ -78,11 +78,11 @@
<div><strong>Area</strong></div>
<div>
{{ _noiSubmission.soilAlreadyRemovedArea }}
<span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">ha</span>
<span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
</div>
<div>
{{ _noiSubmission.soilAlreadyPlacedArea }}
<span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">ha</span>
<span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
</div>

<div><strong>Maximum Depth</strong></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</div>
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">
{{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">ha</span>
{{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span>
</div>
<div class="grid-1"><strong>Maximum Depth</strong></div>
<div class="grid-2">
Expand All @@ -47,7 +47,7 @@
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">
{{ _noiSubmission.soilAlreadyPlacedArea }}
<span *ngIf="_noiSubmission.soilAlreadyPlacedArea">ha</span>
<span *ngIf="_noiSubmission.soilAlreadyPlacedArea">m<sup>2</sup></span>
</div>
<div class="grid-1"><strong>Maximum Depth</strong></div>
<div class="grid-2">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@
<tr>
<td class="soil-table-label">
Area
<div class="subtext">Note: 0.01 ha is 100m2</div>
</td>
<td>
<span *ngIf="component.soilToRemoveArea !== null && component.soilToRemoveArea !== undefined">
{{ component.soilToRemoveArea }} ha</span
{{ component.soilToRemoveArea }} m<sup>2</sup></span
>
<app-no-data
*ngIf="component.soilToRemoveArea === null || component.soilToRemoveArea === undefined"
Expand All @@ -60,7 +59,7 @@

<td>
<span *ngIf="component.soilToPlaceArea !== null && component.soilToPlaceArea !== undefined"
>{{ component.soilToPlaceArea }} ha</span
>{{ component.soilToPlaceArea }} m<sup>2</sup></span
>
<app-no-data
*ngIf="component.soilToPlaceArea === null || component.soilToPlaceArea === undefined"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
</div>
<div class="label">
<label for="areaToRemove">Area*</label>
<div class="subtext">Note: 0.01 ha is 100m2</div>
</div>
<div>
<mat-form-field appearance="outline" class="full-width">
Expand All @@ -100,7 +99,7 @@
matInput
formControlName="areaToRemove"
/>
<span matTextSuffix>ha</span>
<span matTextSuffix>m<sup>2</sup></span>
</mat-form-field>
</div>
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
</tr>
<tr>
<td class="soil-table-label">Area</td>
<td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} ha</td>
<td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} ha</td>
<td *ngIf="submission.soilToPlaceArea !== null">{{ submission.soilToPlaceArea }} m<sup>2</sup></td>
<td *ngIf="submission.soilToRemoveArea !== null">{{ submission.soilToRemoveArea }} m<sup>2</sup></td>
</tr>
<tr>
<td class="soil-table-label">Maximum Depth</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">
{{ _applicationSubmission.naruToPlaceArea }}
<span *ngIf="_applicationSubmission.naruToPlaceArea !== null">ha</span>
<span *ngIf="_applicationSubmission.naruToPlaceArea !== null">m<sup>2</sup></span>
<app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.naruToPlaceArea === null"></app-no-data>
</div>
<div class="grid-1"><strong>Maximum Depth</strong></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ <h4>Soil and Fill Components</h4>
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">
{{ applicationSubmission.nfuTotalFillArea }}
<span *ngIf="applicationSubmission.nfuTotalFillArea !== null">ha</span>
<span *ngIf="applicationSubmission.nfuTotalFillArea !== null">m<sup>2</sup></span>
<app-no-data
[showRequired]="showErrors"
*ngIf="applicationSubmission.nfuTotalFillArea === null"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
<div><strong>Area</strong></div>
<div>
{{ _applicationSubmission.soilToRemoveArea }}
<span *ngIf="_applicationSubmission.soilToRemoveArea !== null">ha</span>
<span *ngIf="_applicationSubmission.soilToRemoveArea !== null">m<sup>2</sup></span>
<app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToRemoveArea === null"></app-no-data>
</div>
<div>
{{ _applicationSubmission.soilToPlaceArea }}
<span *ngIf="_applicationSubmission.soilToPlaceArea !== null">ha</span>
<span *ngIf="_applicationSubmission.soilToPlaceArea !== null">m<sup>2</sup></span>
<app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilToPlaceArea === null"></app-no-data>
</div>

Expand Down Expand Up @@ -120,15 +120,15 @@
<div><strong>Area</strong></div>
<div>
{{ _applicationSubmission.soilAlreadyRemovedArea }}
<span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">ha</span>
<span *ngIf="_applicationSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
<app-no-data
[showRequired]="showErrors"
*ngIf="_applicationSubmission.soilAlreadyRemovedArea === null"
></app-no-data>
</div>
<div>
{{ _applicationSubmission.soilAlreadyPlacedArea }}
<span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">ha</span>
<span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
<app-no-data
[showRequired]="showErrors"
*ngIf="_applicationSubmission.soilAlreadyPlacedArea === null"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</div>
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">
{{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">ha</span>
{{ _applicationSubmission.soilToPlaceArea }} <span *ngIf="_applicationSubmission.soilToPlaceArea">m<sup>2</sup></span>
<app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilToPlaceArea"></app-no-data>
</div>
<div class="grid-1"><strong>Maximum Depth</strong></div>
Expand Down Expand Up @@ -75,7 +75,7 @@
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">
{{ _applicationSubmission.soilAlreadyPlacedArea }}
<span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">ha</span>
<span *ngIf="_applicationSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
<app-no-data
[showRequired]="showErrors"
*ngIf="_applicationSubmission.soilAlreadyPlacedArea === null"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ <h5>Land Use of Parcel(s) under Application</h5>
<div *ngIf="parcelsAgricultureDescription.errors?.['required']">This field is required</div>
</div>
<mat-hint class="subtext"
>Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep. Example 2: Parcel 1: 10%
blueberry crop, 30% vegetables, 60% hay. Parcel 2: 100% hay.
>Example 1: PID 001-002-003: 60 ha hay crop, 40 ha grazing, 200 sheep. Example 2: Parcel 1: 10% blueberry
crop, 30% vegetables, 60% hay. Parcel 2: 100% hay.
</mat-hint>
<div class="subtext">Characters left: {{ 4000 - parcelsAgricultureDescriptionText.textLength }}</div>
</div>
Expand Down Expand Up @@ -88,7 +88,8 @@ <h6>
Describe all other uses that currently take place on the parcel(s).
</label>
<div class="subtext">
Describe other uses such as residential, home-based businesses, commercial, recreational, institutional, industrial, etc.
Describe other uses such as residential, home-based businesses, commercial, recreational, institutional,
industrial, etc.
</div>
<mat-form-field class="display-block" appearance="outline">
<textarea
Expand All @@ -111,14 +112,14 @@ <h6>
<mat-icon>warning</mat-icon>
<div *ngIf="parcelsNonAgricultureUseDescription.errors?.['required']">This field is required</div>
</div>
<mat-hint class="subtext">Example: House and 100 square metre detached auto repair shop.</mat-hint>
<mat-hint class="subtext"
>Example: 100m<sup>2</sup> house and 50m<sup>2</sup> detached auto repair shop</mat-hint
>
<div class="subtext">Characters left: {{ 4000 - parcelsNonAgricultureUseDescriptionText.textLength }}</div>
</div>
</div>
<h5>Choose and describe neighbouring land uses.</h5>
<div class="subtext">
Choose the main land use type from the drop-down and describe the specific activities.
</div>
<div class="subtext">Choose the main land use type from the drop-down and describe the specific activities.</div>
<div class="form-row">
<div class="full-row">
<label for="northLandUseType">North</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ <h2>Proposal</h2>

<div class="full-row">
<label for="will-import-fill">
Do you need to import any fill to construct or conduct the proposed Non-farm use?
Do you need to import any fill to construct or conduct the proposed non-adhering residential use?
</label>
<div class="subtext">Fill is any material brought onto the property, including gravel for construction.</div>
<mat-button-toggle-group
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,8 @@ <h6>
<div class="subtext">Characters left: {{ 4000 - parcelsNonAgricultureUseDescriptionText.textLength }}</div>
</div>
</div>
<h5>Identify the land uses surrounding the parcel(s) under notice of intent.</h5>
<div class="subtext">
Choose the Primary Land Use Type from the drop-down list. If there is more than one land use type, choose the main
land use and describe all the uses under Specific Activity.
</div>
<h5>Choose and describe neighbouring land uses.</h5>
<div class="subtext">Choose the main land use type from the drop-down and describe the specific activities.</div>
<div class="form-row">
<div class="full-row">
<label for="northLandUseType">North</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@
<div><strong>Area</strong></div>
<div>
{{ _noiSubmission.soilToRemoveArea }}
<span *ngIf="_noiSubmission.soilToRemoveArea !== null">ha</span>
<span *ngIf="_noiSubmission.soilToRemoveArea !== null">m<sup>2</sup></span>
<app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToRemoveArea === null"></app-no-data>
</div>
<div>
{{ _noiSubmission.soilToPlaceArea }}
<span *ngIf="_noiSubmission.soilToPlaceArea !== null">ha</span>
<span *ngIf="_noiSubmission.soilToPlaceArea !== null">m<sup>2</sup></span>
<app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilToPlaceArea === null"></app-no-data>
</div>

Expand Down Expand Up @@ -168,12 +168,12 @@
<div><strong>Area</strong></div>
<div>
{{ _noiSubmission.soilAlreadyRemovedArea }}
<span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">ha</span>
<span *ngIf="_noiSubmission.soilAlreadyRemovedArea !== null">m<sup>2</sup></span>
<app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyRemovedArea === null"></app-no-data>
</div>
<div>
{{ _noiSubmission.soilAlreadyPlacedArea }}
<span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">ha</span>
<span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
<app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</div>
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">
{{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">ha</span>
{{ _noiSubmission.soilToPlaceArea }} <span *ngIf="_noiSubmission.soilToPlaceArea">m<sup>2</sup></span>
<app-no-data [showRequired]="showErrors" *ngIf="!_noiSubmission.soilToPlaceArea"></app-no-data>
</div>
<div class="grid-1"><strong>Maximum Depth</strong></div>
Expand Down Expand Up @@ -97,7 +97,7 @@
<div class="grid-1"><strong>Area</strong></div>
<div class="grid-2">
{{ _noiSubmission.soilAlreadyPlacedArea }}
<span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">ha</span>
<span *ngIf="_noiSubmission.soilAlreadyPlacedArea !== null">m<sup>2</sup></span>
<app-no-data [showRequired]="showErrors" *ngIf="_noiSubmission.soilAlreadyPlacedArea === null"></app-no-data>
</div>
<div class="grid-1"><strong>Maximum Depth</strong></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
matSortDisableClear
>
<ng-container matColumnDef="fileId">
<th mat-header-cell *matHeaderCellDef mat-sort-header>Application ID</th>
<th mat-header-cell *matHeaderCellDef mat-sort-header>Notice of Intent ID</th>
<td mat-cell *matCellDef="let element">
<a (click)="onSelectRecord(element)">{{ element.fileNumber | emptyColumn }}</a>
</td>
Expand Down
Loading

0 comments on commit 7cd87df

Please sign in to comment.