-
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 branch 'develop' into feature/ALCS-1858-update-condition-pills
- Loading branch information
Showing
23 changed files
with
189 additions
and
306 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
...p/features/application/decision/decision-v2/decision-component/basic/basic.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
5 changes: 0 additions & 5 deletions
5
...pplication/decision/decision-v2/decision-component/expiry-date/expiry-date.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 |
|---|---|---|
| @@ -1,6 +1 @@ | ||
| <ng-content></ng-content> | ||
| <div> | ||
| <div class="subheading2">Expiry Date</div> | ||
| {{ component.expiryDate | date }} | ||
| <app-no-data *ngIf="component.expiryDate === null || component.expiryDate === undefined"></app-no-data> | ||
| </div> |
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
11 changes: 0 additions & 11 deletions
11
...app/features/application/decision/decision-v2/decision-component/naru/naru.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 |
|---|---|---|
| @@ -1,13 +1,2 @@ | ||
| <ng-content></ng-content> | ||
|
|
||
| <div> | ||
| <div class="subheading2">Expiry Date</div> | ||
| {{ component.expiryDate | date }} | ||
| <app-no-data *ngIf="component.expiryDate === null || component.expiryDate === undefined"></app-no-data> | ||
| </div> | ||
|
|
||
| <div> | ||
| <div class="subheading2">Use End Date</div> | ||
| {{ component.endDate | date }} | ||
| <app-no-data *ngIf="component.endDate === null || component.endDate === undefined"></app-no-data> | ||
| </div> |
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
10 changes: 0 additions & 10 deletions
10
...app/features/application/decision/decision-v2/decision-component/pfrs/pfrs.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
5 changes: 0 additions & 5 deletions
5
...app/features/application/decision/decision-v2/decision-component/pofo/pofo.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
5 changes: 0 additions & 5 deletions
5
...app/features/application/decision/decision-v2/decision-component/roso/roso.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
5 changes: 0 additions & 5 deletions
5
...app/features/application/decision/decision-v2/decision-component/subd/subd.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
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
67 changes: 26 additions & 41 deletions
67
...put/decision-components/decision-component/incl-excl-input/incl-excl-input.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 |
|---|---|---|
| @@ -1,47 +1,32 @@ | ||
| <ng-container *ngIf="form"> | ||
| <form [formGroup]="form"> | ||
| <div class="grid"> | ||
| <mat-form-field appearance="outline"> | ||
| <mat-label>ALR Area Impacted (ha)</mat-label> | ||
| <input | ||
| matInput | ||
| min="0.01" | ||
| mask="separator.5" | ||
| thousandSeparator="," | ||
| separatorLimit="9999999999" | ||
| formControlName="alrArea" | ||
| required | ||
| /> | ||
| </mat-form-field> | ||
| <mat-form-field appearance="outline" class="row"> | ||
| <mat-label>ALR Area Impacted (ha)</mat-label> | ||
| <input | ||
| matInput | ||
| min="0.01" | ||
| mask="separator.5" | ||
| thousandSeparator="," | ||
| separatorLimit="9999999999" | ||
| formControlName="alrArea" | ||
| required | ||
| /> | ||
| </mat-form-field> | ||
|
|
||
| <mat-form-field appearance="outline" class="date-picker"> | ||
| <mat-label>Expiry Date</mat-label> | ||
| <input | ||
| matInput | ||
| (click)="expiryDatePicker.open()" | ||
| [matDatepicker]="expiryDatePicker" | ||
| formControlName="expiryDate" | ||
| name="date" | ||
| /> | ||
| <mat-datepicker-toggle matSuffix [for]="expiryDatePicker"></mat-datepicker-toggle> | ||
| <mat-datepicker #expiryDatePicker type="date"></mat-datepicker> | ||
| </mat-form-field> | ||
|
|
||
| <div class="full-width"> | ||
| <mat-label class="toggle-label">Applicant Type*</mat-label> | ||
| <mat-button-toggle-group | ||
| required | ||
| id="isFirstNation" | ||
| formControlName="applicantType" | ||
| name="isFirstNation" | ||
| [ngClass]="{ | ||
| 'error-field-outlined': !form.controls['applicantType'].valid && form.controls['applicantType'].touched | ||
| }" | ||
| > | ||
| <mat-button-toggle value="Land Owner">Land Owner</mat-button-toggle> | ||
| <mat-button-toggle value="L/FNG Initiated">L/FNG Initiated</mat-button-toggle> | ||
| </mat-button-toggle-group> | ||
| </div> | ||
| <div class="full-width"> | ||
| <mat-label class="toggle-label">Applicant Type*</mat-label> | ||
| <mat-button-toggle-group | ||
| required | ||
| id="isFirstNation" | ||
| formControlName="applicantType" | ||
| name="isFirstNation" | ||
| [ngClass]="{ | ||
| 'error-field-outlined': !form.controls['applicantType'].valid && form.controls['applicantType'].touched | ||
| }" | ||
| > | ||
| <mat-button-toggle value="Land Owner">Land Owner</mat-button-toggle> | ||
| <mat-button-toggle value="L/FNG Initiated">L/FNG Initiated</mat-button-toggle> | ||
| </mat-button-toggle-group> | ||
| </div> | ||
| </form> | ||
| </ng-container> |
52 changes: 12 additions & 40 deletions
52
...ecision-input/decision-components/decision-component/naru-input/naru-input.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 |
|---|---|---|
| @@ -1,42 +1,14 @@ | ||
| <form [formGroup]="form" class="nfu-component-form"> | ||
| <div class="grid-2"> | ||
| <mat-form-field appearance="outline"> | ||
| <mat-label>ALR Area Impacted (m<sup>2</sup>)</mat-label> | ||
| <input | ||
| matInput | ||
| min="0.01" | ||
| mask="separator.5" | ||
| thousandSeparator="," | ||
| separatorLimit="9999999999" | ||
| formControlName="alrArea" | ||
| required | ||
| /> | ||
| </mat-form-field> | ||
|
|
||
| <mat-form-field appearance="outline" class="date-picker"> | ||
| <mat-label>Expiry Date</mat-label> | ||
| <input | ||
| matInput | ||
| (click)="expiryDatePicker.open()" | ||
| [matDatepicker]="expiryDatePicker" | ||
| formControlName="expiryDate" | ||
| name="date" | ||
| /> | ||
| <mat-datepicker-toggle matSuffix [for]="expiryDatePicker"></mat-datepicker-toggle> | ||
| <mat-datepicker #expiryDatePicker type="date"></mat-datepicker> | ||
| </mat-form-field> | ||
|
|
||
| <mat-form-field appearance="outline" class="date-picker"> | ||
| <mat-label>Use End Date</mat-label> | ||
| <input | ||
| matInput | ||
| (click)="endDatePicker.open()" | ||
| [matDatepicker]="endDatePicker" | ||
| formControlName="naruEndDate" | ||
| name="date" | ||
| /> | ||
| <mat-datepicker-toggle matSuffix [for]="endDatePicker"></mat-datepicker-toggle> | ||
| <mat-datepicker #endDatePicker type="date"></mat-datepicker> | ||
| </mat-form-field> | ||
| </div> | ||
| <mat-form-field appearance="outline" class="row"> | ||
| <mat-label>ALR Area Impacted (m<sup>2</sup>)</mat-label> | ||
| <input | ||
| matInput | ||
| min="0.01" | ||
| mask="separator.5" | ||
| thousandSeparator="," | ||
| separatorLimit="9999999999" | ||
| formControlName="alrArea" | ||
| required | ||
| /> | ||
| </mat-form-field> | ||
| </form> |
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
38 changes: 12 additions & 26 deletions
38
...ecision-input/decision-components/decision-component/pofo-input/pofo-input.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
39 changes: 12 additions & 27 deletions
39
...ecision-input/decision-components/decision-component/roso-input/roso-input.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
2 changes: 1 addition & 1 deletion
2
...tures/notice-of-intent/decision/decision-v2/decision-component/basic/basic.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
11 changes: 0 additions & 11 deletions
11
...eatures/notice-of-intent/decision/decision-v2/decision-component/pfrs/pfrs.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
5 changes: 0 additions & 5 deletions
5
...eatures/notice-of-intent/decision/decision-v2/decision-component/pofo/pofo.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
5 changes: 0 additions & 5 deletions
5
...eatures/notice-of-intent/decision/decision-v2/decision-component/roso/roso.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
Oops, something went wrong.