Skip to content

Commit 6f7f6ec

Browse files
fbarretafbarreta
authored
Merge pull request #2005 from bcgov/feature/ALCS-2099-components-script-and-date-removals
Feature/alcs 2099 components script and date removals
2 parents 2646c1b + 7ca0350 commit 6f7f6ec

File tree

23 files changed

+189
-306
lines changed

23 files changed

+189
-306
lines changed

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/basic/basic.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div>
2-
<div class="subheading2">
2+
<div>
33
ALR Area Impacted
44
<ng-container *ngIf="component.applicationDecisionComponentTypeCode !== 'NARU'">(ha)</ng-container>
55
<ng-container *ngIf="component.applicationDecisionComponentTypeCode === 'NARU'">(m<sup>2</sup>)</ng-container>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/expiry-date/expiry-date.component.html

-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
11
<ng-content></ng-content>
2-
<div>
3-
<div class="subheading2">Expiry Date</div>
4-
{{ component.expiryDate | date }}
5-
<app-no-data *ngIf="component.expiryDate === null || component.expiryDate === undefined"></app-no-data>
6-
</div>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/incl-excl/incl-excl.component.html

-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,3 @@
77
></app-no-data>
88
</div>
99

10-
<div>
11-
<div class="subheading2">Expiry Date</div>
12-
{{ component.expiryDate | date }}
13-
<app-no-data *ngIf="component.expiryDate === null || component.expiryDate === undefined"></app-no-data>
14-
</div>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html

-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,2 @@
11
<ng-content></ng-content>
22

3-
<div>
4-
<div class="subheading2">Expiry Date</div>
5-
{{ component.expiryDate | date }}
6-
<app-no-data *ngIf="component.expiryDate === null || component.expiryDate === undefined"></app-no-data>
7-
</div>
8-
9-
<div>
10-
<div class="subheading2">Use End Date</div>
11-
{{ component.endDate | date }}
12-
<app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data>
13-
</div>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/nfup/nfup.component.html

-5
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,3 @@
99
{{ component.nfuSubType }}
1010
<app-no-data *ngIf="component.nfuSubType === null || component.nfuSubType === undefined"></app-no-data>
1111
</div>
12-
<div>
13-
<div class="subheading2">Use End Date</div>
14-
{{ component.endDate | date }}
15-
<app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data>
16-
</div>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.component.html

-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
<ng-content></ng-content>
22
<div></div>
3-
<div>
4-
<div class="subheading2">Use End Date (Placement of Fill)</div>
5-
{{ component.endDate2 | date }}
6-
<app-no-data *ngIf="component.endDate2 === null || component.endDate2 === undefined"></app-no-data>
7-
</div>
8-
<div>
9-
<div class="subheading2">Use End Date (Removal of Soil)</div>
10-
{{ component.endDate | date }}
11-
<app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data>
12-
</div>
133
<div class="full-width">
144
<div class="subheading2">Type of soil approved to be removed</div>
155
<div class="pre-wrapped-text">{{ component.soilTypeRemoved }}</div>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/pofo/pofo.component.html

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<ng-content></ng-content>
2-
<div>
3-
<div class="subheading2">Use End Date</div>
4-
{{ component.endDate | date }}
5-
<app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data>
6-
</div>
72
<div class="full-width">
83
<div class="subheading2">Type, origin and quality of fill proposed to be placed</div>
94
<div class="pre-wrapped-text">{{ component.soilFillTypeToPlace }}</div>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/roso/roso.component.html

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<ng-content></ng-content>
2-
<div>
3-
<div class="subheading2">Use End Date</div>
4-
{{ component.endDate | date }}
5-
<app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data>
6-
</div>
72
<div class="full-width">
83
<div class="subheading2">Type of soil approved to be removed</div>
94
<div class="pre-wrapped-text">{{ component.soilTypeRemoved }}</div>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/subd/subd.component.html

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<ng-content></ng-content>
2-
<div>
3-
<div class="subheading2">Expiry Date</div>
4-
{{ component.expiryDate | date }}
5-
<app-no-data *ngIf="component.expiryDate === null || component.expiryDate === undefined"></app-no-data>
6-
</div>
72
<div>
83
<div class="subheading2">Total Number of Lots Approved</div>
94
{{ component.lots?.length }}

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.html

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ <h5>{{ data.applicationDecisionComponentType?.label }}</h5>
1616
"
1717
class="row-no-flex"
1818
>
19-
<app-expiry-date-input [form]="form"></app-expiry-date-input>
2019
</div>
2120

2221
<div *ngIf="data.applicationDecisionComponentTypeCode === COMPONENT_TYPE.POFO" class="row-no-flex">

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/incl-excl-input/incl-excl-input.component.html

+26-41
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,32 @@
11
<ng-container *ngIf="form">
22
<form [formGroup]="form">
3-
<div class="grid">
4-
<mat-form-field appearance="outline">
5-
<mat-label>ALR Area Impacted (ha)</mat-label>
6-
<input
7-
matInput
8-
min="0.01"
9-
mask="separator.5"
10-
thousandSeparator=","
11-
separatorLimit="9999999999"
12-
formControlName="alrArea"
13-
required
14-
/>
15-
</mat-form-field>
3+
<mat-form-field appearance="outline" class="row">
4+
<mat-label>ALR Area Impacted (ha)</mat-label>
5+
<input
6+
matInput
7+
min="0.01"
8+
mask="separator.5"
9+
thousandSeparator=","
10+
separatorLimit="9999999999"
11+
formControlName="alrArea"
12+
required
13+
/>
14+
</mat-form-field>
1615

17-
<mat-form-field appearance="outline" class="date-picker">
18-
<mat-label>Expiry Date</mat-label>
19-
<input
20-
matInput
21-
(click)="expiryDatePicker.open()"
22-
[matDatepicker]="expiryDatePicker"
23-
formControlName="expiryDate"
24-
name="date"
25-
/>
26-
<mat-datepicker-toggle matSuffix [for]="expiryDatePicker"></mat-datepicker-toggle>
27-
<mat-datepicker #expiryDatePicker type="date"></mat-datepicker>
28-
</mat-form-field>
29-
30-
<div class="full-width">
31-
<mat-label class="toggle-label">Applicant Type*</mat-label>
32-
<mat-button-toggle-group
33-
required
34-
id="isFirstNation"
35-
formControlName="applicantType"
36-
name="isFirstNation"
37-
[ngClass]="{
38-
'error-field-outlined': !form.controls['applicantType'].valid && form.controls['applicantType'].touched
39-
}"
40-
>
41-
<mat-button-toggle value="Land Owner">Land Owner</mat-button-toggle>
42-
<mat-button-toggle value="L/FNG Initiated">L/FNG Initiated</mat-button-toggle>
43-
</mat-button-toggle-group>
44-
</div>
16+
<div class="full-width">
17+
<mat-label class="toggle-label">Applicant Type*</mat-label>
18+
<mat-button-toggle-group
19+
required
20+
id="isFirstNation"
21+
formControlName="applicantType"
22+
name="isFirstNation"
23+
[ngClass]="{
24+
'error-field-outlined': !form.controls['applicantType'].valid && form.controls['applicantType'].touched
25+
}"
26+
>
27+
<mat-button-toggle value="Land Owner">Land Owner</mat-button-toggle>
28+
<mat-button-toggle value="L/FNG Initiated">L/FNG Initiated</mat-button-toggle>
29+
</mat-button-toggle-group>
4530
</div>
4631
</form>
4732
</ng-container>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.html

+12-40
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,14 @@
11
<form [formGroup]="form" class="nfu-component-form">
2-
<div class="grid-2">
3-
<mat-form-field appearance="outline">
4-
<mat-label>ALR Area Impacted (m<sup>2</sup>)</mat-label>
5-
<input
6-
matInput
7-
min="0.01"
8-
mask="separator.5"
9-
thousandSeparator=","
10-
separatorLimit="9999999999"
11-
formControlName="alrArea"
12-
required
13-
/>
14-
</mat-form-field>
15-
16-
<mat-form-field appearance="outline" class="date-picker">
17-
<mat-label>Expiry Date</mat-label>
18-
<input
19-
matInput
20-
(click)="expiryDatePicker.open()"
21-
[matDatepicker]="expiryDatePicker"
22-
formControlName="expiryDate"
23-
name="date"
24-
/>
25-
<mat-datepicker-toggle matSuffix [for]="expiryDatePicker"></mat-datepicker-toggle>
26-
<mat-datepicker #expiryDatePicker type="date"></mat-datepicker>
27-
</mat-form-field>
28-
29-
<mat-form-field appearance="outline" class="date-picker">
30-
<mat-label>Use End Date</mat-label>
31-
<input
32-
matInput
33-
(click)="endDatePicker.open()"
34-
[matDatepicker]="endDatePicker"
35-
formControlName="naruEndDate"
36-
name="date"
37-
/>
38-
<mat-datepicker-toggle matSuffix [for]="endDatePicker"></mat-datepicker-toggle>
39-
<mat-datepicker #endDatePicker type="date"></mat-datepicker>
40-
</mat-form-field>
41-
</div>
2+
<mat-form-field appearance="outline" class="row">
3+
<mat-label>ALR Area Impacted (m<sup>2</sup>)</mat-label>
4+
<input
5+
matInput
6+
min="0.01"
7+
mask="separator.5"
8+
thousandSeparator=","
9+
separatorLimit="9999999999"
10+
formControlName="alrArea"
11+
required
12+
/>
13+
</mat-form-field>
4214
</form>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pfrs-input/pfrs-input.component.html

-28
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,6 @@
1212
/>
1313
</mat-form-field>
1414

15-
<div class="grid-2">
16-
<mat-form-field appearance="outline" class="date-picker">
17-
<mat-label>Use End Date (Placement of Fill)</mat-label>
18-
<input
19-
matInput
20-
(click)="endDatePicker2.open()"
21-
[matDatepicker]="endDatePicker2"
22-
formControlName="endDate2"
23-
name="date"
24-
/>
25-
<mat-datepicker-toggle matSuffix [for]="endDatePicker2"></mat-datepicker-toggle>
26-
<mat-datepicker #endDatePicker2 type="date"></mat-datepicker>
27-
</mat-form-field>
28-
29-
<mat-form-field appearance="outline" class="date-picker">
30-
<mat-label>Use End Date (Removal of Soil)</mat-label>
31-
<input
32-
matInput
33-
(click)="endDatePicker.open()"
34-
[matDatepicker]="endDatePicker"
35-
formControlName="endDate"
36-
name="date"
37-
/>
38-
<mat-datepicker-toggle matSuffix [for]="endDatePicker"></mat-datepicker-toggle>
39-
<mat-datepicker #endDatePicker type="date"></mat-datepicker>
40-
</mat-form-field>
41-
</div>
42-
4315
<mat-form-field appearance="outline" class="row">
4416
<mat-label>Type of soil approved to be removed</mat-label>
4517
<textarea

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/pofo-input/pofo-input.component.html

+12-26
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,17 @@
11
<form [formGroup]="form" class="pofo-component-form">
2-
<div class="grid-2">
3-
<mat-form-field appearance="outline">
4-
<mat-label>ALR Area Impacted (ha)</mat-label>
5-
<input
6-
matInput
7-
min="0.01"
8-
mask="separator.5"
9-
thousandSeparator=","
10-
separatorLimit="9999999999"
11-
formControlName="alrArea"
12-
required
13-
/>
14-
</mat-form-field>
152

16-
<mat-form-field appearance="outline" class="date-picker">
17-
<mat-label>Use End Date</mat-label>
18-
<input
19-
matInput
20-
(click)="endDatePicker.open()"
21-
[matDatepicker]="endDatePicker"
22-
formControlName="endDate"
23-
name="date"
24-
/>
25-
<mat-datepicker-toggle matSuffix [for]="endDatePicker"></mat-datepicker-toggle>
26-
<mat-datepicker #endDatePicker type="date"></mat-datepicker>
27-
</mat-form-field>
28-
</div>
3+
<mat-form-field appearance="outline" class="row">
4+
<mat-label>ALR Area Impacted (ha)</mat-label>
5+
<input
6+
matInput
7+
min="0.01"
8+
mask="separator.5"
9+
thousandSeparator=","
10+
separatorLimit="9999999999"
11+
formControlName="alrArea"
12+
required
13+
/>
14+
</mat-form-field>
2915

3016
<mat-form-field appearance="outline" class="row">
3117
<mat-label>Type, origin and quality of fill approved to be placed</mat-label>

‎alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/roso-input/roso-input.component.html

+12-27
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,16 @@
11
<form [formGroup]="form" class="roso-component-form">
2-
<div class="grid-2">
3-
<mat-form-field appearance="outline">
4-
<mat-label>ALR Area Impacted (ha)</mat-label>
5-
<input
6-
matInput
7-
min="0.01"
8-
mask="separator.5"
9-
thousandSeparator=","
10-
separatorLimit="9999999999"
11-
formControlName="alrArea"
12-
required
13-
/>
14-
</mat-form-field>
15-
16-
<mat-form-field appearance="outline" class="date-picker">
17-
<mat-label>Use End Date</mat-label>
18-
<input
19-
matInput
20-
(click)="endDatePicker.open()"
21-
[matDatepicker]="endDatePicker"
22-
formControlName="endDate"
23-
name="date"
24-
/>
25-
<mat-datepicker-toggle matSuffix [for]="endDatePicker"></mat-datepicker-toggle>
26-
<mat-datepicker #endDatePicker type="date"></mat-datepicker>
27-
</mat-form-field>
28-
</div>
2+
<mat-form-field appearance="outline" class="row">
3+
<mat-label>ALR Area Impacted (ha)</mat-label>
4+
<input
5+
matInput
6+
min="0.01"
7+
mask="separator.5"
8+
thousandSeparator=","
9+
separatorLimit="9999999999"
10+
formControlName="alrArea"
11+
required
12+
/>
13+
</mat-form-field>
2914

3015
<mat-form-field appearance="outline" class="row">
3116
<mat-label>Type of soil approved to be removed</mat-label>

‎alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/basic/basic.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div>
2-
<div class="subheading2">ALR Area Impacted (ha)</div>
2+
<div>ALR Area Impacted (ha)</div>
33
<app-inline-number
44
[value]="component.alrArea?.toString()"
55
(save)="onSaveAlrArea($event)"

‎alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.component.html

-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
<ng-content></ng-content>
2-
<div></div>
3-
<div>
4-
<div class="subheading2">Use End Date (Placement of Fill)</div>
5-
{{ component.endDate2 | date }}
6-
<app-no-data *ngIf="component.endDate2 === null || component.endDate2 === undefined"></app-no-data>
7-
</div>
8-
<div>
9-
<div class="subheading2">Use End Date (Removal of Soil)</div>
10-
{{ component.endDate | date }}
11-
<app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data>
12-
</div>
132
<div class="full-width">
143
<div class="subheading2">Type of soil approved to be removed</div>
154
<div class="pre-wrapped-text">{{ component.soilTypeRemoved }}</div>

‎alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.component.html

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<ng-content></ng-content>
2-
<div>
3-
<div class="subheading2">Use End Date</div>
4-
{{ component.endDate | date }}
5-
<app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data>
6-
</div>
72
<div class="full-width">
83
<div class="subheading2">Type, origin and quality of fill proposed to be placed</div>
94
<div class="pre-wrapped-text">{{ component.soilFillTypeToPlace }}</div>

‎alcs-frontend/src/app/features/notice-of-intent/decision/decision-v2/decision-component/roso/roso.component.html

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<ng-content></ng-content>
2-
<div>
3-
<div class="subheading2">Use End Date</div>
4-
{{ component.endDate | date }}
5-
<app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data>
6-
</div>
72
<div class="full-width">
83
<div class="subheading2">Type of soil approved to be removed</div>
94
<div class="pre-wrapped-text">{{ component.soilTypeRemoved }}</div>

0 commit comments

Comments
 (0)