Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DEVOPS-15, DEVOPS-50: Typo Fixes #2490

Merged
merged 4 commits into from
Oct 18, 2024
Merged

DEVOPS-15, DEVOPS-50: Typo Fixes #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e46a225
DEVOPS-50: Typo fix
sam-warren Oct 16, 2024
3d94052
DEVOPS-15
sam-warren Oct 17, 2024
394af95
DEVOPS-15: Updates from business feedback
sam-warren Oct 18, 2024
c913203
DEVOPS-15: Update language on responders and registrants address section
sam-warren Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...gistrant/src/app/sharedModules/forms/address-forms/can-address/can-address.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<p>Please enter your address</p>
<form [formGroup]="addressForm">
<div class="row">
<div class="col-md-5">
Expand Down
56 changes: 28 additions & 28 deletions ...gistrant/src/app/sharedModules/forms/evacuee-profile-forms/address/address.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
</div>

<div *ngIf="primaryAddressFormControl?.isBcAddress?.value === 'Yes'" class="row">
<p>Enter the address of your primary residence</p>
<div class="col-md-12">
<app-bc-address [addressForm]="primaryAddressFormControl?.address"></app-bc-address>
</div>
Expand Down Expand Up @@ -86,29 +87,27 @@
</div>
</div>
</div>

<app-can-address
*ngIf="primaryAddressFormControl?.address?.controls?.country?.value?.code === 'CAN'; else usa"
[addressForm]="primaryAddressFormControl?.address"
>
</app-can-address>
<div *ngIf="primaryAddressFormControl?.address?.controls?.country?.value?.code === 'CAN'; else usa">
<p>Enter the address of your primary residence</p>
<app-can-address [addressForm]="primaryAddressFormControl?.address"> </app-can-address>
</div>
<ng-template #usa>
<app-usa-address
*ngIf="primaryAddressFormControl?.address?.controls?.country?.value?.code === 'USA'; else other"
[addressForm]="primaryAddressFormControl?.address"
>
</app-usa-address>
<div *ngIf="primaryAddressFormControl?.address?.controls?.country?.value?.code === 'USA'; else other">
<p>Enter the address of your primary residence</p>
<app-usa-address [addressForm]="primaryAddressFormControl?.address"> </app-usa-address>
</div>
</ng-template>
<ng-template #other>
<app-other-address
<div
*ngIf="
primaryAddressFormControl?.address?.controls?.country?.value?.code !== 'USA' &&
primaryAddressFormControl?.address?.controls?.country?.value?.code !== 'CAN' &&
primaryAddressFormControl?.address?.controls?.country?.value !== null
"
[addressForm]="primaryAddressFormControl?.address"
>
</app-other-address>
<p>Enter the address of your primary residence</p>
<app-other-address [addressForm]="primaryAddressFormControl?.address"> </app-other-address>
</div>
</ng-template>
</div>
<!-- </form> -->
Expand All @@ -125,7 +124,7 @@
<div class="row">
<div class="col-md-12">
<label id="isNewMailingAddress-radio-group-label" class="requiredField"
>Is your <b>mailing address</b> the same as their primary residence above?</label
>Is your <b>mailing address</b> the same as your primary residence above?</label
>
<mat-radio-group
formControlName="isNewMailingAddress"
Expand Down Expand Up @@ -181,6 +180,7 @@
</div>

<div *ngIf="primaryAddressFormControl?.isBcMailingAddress.value === 'Yes'" class="row">
<p>Enter your mailing address</p>
<div class="col-md-12">
<app-bc-address [addressForm]="primaryAddressFormControl?.mailingAddress"></app-bc-address>
</div>
Expand All @@ -190,7 +190,7 @@
<div formGroupName="mailingAddress">
<div class="row">
<div class="col-md-5">
<p>In what <b>country</b> is your primary residence located?</p>
<p>In what <b>country</b> is your mailing address located?</p>
<mat-form-field appearance="outline">
<input
type="text"
Expand Down Expand Up @@ -224,29 +224,29 @@
</div>
</div>
</div>

<app-can-address
*ngIf="primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code === 'CAN'; else usa"
[addressForm]="primaryAddressFormControl?.mailingAddress"
>
</app-can-address>
<div *ngIf="primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code === 'CAN'; else usa">
<p>Enter your mailing address</p>
<app-can-address [addressForm]="primaryAddressFormControl?.mailingAddress"> </app-can-address>
</div>
<ng-template #usa>
<app-usa-address
<div
*ngIf="primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code === 'USA'; else other"
[addressForm]="primaryAddressFormControl?.mailingAddress"
>
</app-usa-address>
<p>Enter your mailing address</p>
<app-usa-address [addressForm]="primaryAddressFormControl?.mailingAddress"> </app-usa-address>
</div>
</ng-template>
<ng-template #other>
<app-other-address
<div
*ngIf="
primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code !== 'USA' &&
primaryAddressFormControl?.mailingAddress?.controls?.country?.value?.code !== 'CAN' &&
primaryAddressFormControl?.mailingAddress?.controls?.country?.value !== null
"
[addressForm]="primaryAddressFormControl?.mailingAddress"
>
</app-other-address>
<p>Enter your mailing address</p>
<app-other-address [addressForm]="primaryAddressFormControl?.mailingAddress"> </app-other-address>
</div>
</ng-template>
</div>
</div>
Expand Down
56 changes: 27 additions & 29 deletions ...onder/src/app/feature-components/wizard/profile-components/address/address.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@

<div *ngIf="primaryAddressFormControl?.isBcAddress?.value === 'Yes'" class="row">
<div class="col-md-12">
<p>Enter the address of your primary residence</p>
<app-bc-address [addressForm]="primaryAddressFormGroup"></app-bc-address>
</div>
</div>
Expand Down Expand Up @@ -95,29 +96,27 @@
</div>
</div>
</div>

<app-can-address
*ngIf="primaryAddressFormGroup?.controls?.country?.value?.code === 'CAN'; else usa"
[addressForm]="primaryAddressFormGroup"
>
</app-can-address>
<div *ngIf="primaryAddressFormGroup?.controls?.country?.value?.code === 'CAN'; else usa">
<p>Enter the address of your primary residence</p>
<app-can-address [addressForm]="primaryAddressFormGroup"> </app-can-address>
</div>
<ng-template #usa>
<app-usa-address
*ngIf="primaryAddressFormGroup?.controls?.country?.value?.code === 'USA'; else other"
[addressForm]="primaryAddressFormGroup"
>
</app-usa-address>
<div *ngIf="primaryAddressFormGroup?.controls?.country?.value?.code === 'USA'; else other">
<p>Enter the address of your primary residence</p>
<app-usa-address [addressForm]="primaryAddressFormGroup"> </app-usa-address>
</div>
</ng-template>
<ng-template #other>
<app-other-address
<div
*ngIf="
primaryAddressFormGroup?.controls?.country?.value?.code !== 'USA' &&
primaryAddressFormGroup?.controls?.country?.value?.code !== 'CAN' &&
primaryAddressFormGroup?.controls?.country?.value !== null
"
[addressForm]="primaryAddressFormGroup"
>
</app-other-address>
<p>Enter the address of your primary residence</p>
<app-other-address [addressForm]="primaryAddressFormGroup"> </app-other-address>
</div>
</ng-template>
</div>

Expand Down Expand Up @@ -183,6 +182,7 @@

<div *ngIf="primaryAddressFormControl?.isBcMailingAddress.value === 'Yes'" class="row">
<div class="col-md-12">
<p>Enter your mailing address</p>
<app-bc-address [addressForm]="mailingAddressFormGroup"></app-bc-address>
</div>
</div>
Expand All @@ -191,7 +191,7 @@
<div formGroupName="mailingAddress">
<div class="row">
<div class="col-md-5">
<p>In what <b>country</b> is your primary residence located?</p>
<p>In what <b>country</b> is your mailing address located?</p>
<mat-form-field appearance="outline">
<input
type="text"
Expand Down Expand Up @@ -229,29 +229,27 @@
</div>
</div>
</div>

<app-can-address
*ngIf="mailingAddressFormGroup?.controls?.country?.value?.code === 'CAN'; else usa"
[addressForm]="mailingAddressFormGroup"
>
</app-can-address>
<div *ngIf="mailingAddressFormGroup?.controls?.country?.value?.code === 'CAN'; else usa">
<p>Enter your mailing address</p>
<app-can-address [addressForm]="mailingAddressFormGroup"> </app-can-address>
</div>
<ng-template #usa>
<app-usa-address
*ngIf="mailingAddressFormGroup?.controls?.country?.value?.code === 'USA'; else other"
[addressForm]="mailingAddressFormGroup"
>
</app-usa-address>
<div *ngIf="mailingAddressFormGroup?.controls?.country?.value?.code === 'USA'; else other">
<p>Enter your mailing address</p>
<app-usa-address [addressForm]="mailingAddressFormGroup"> </app-usa-address>
</div>
</ng-template>
<ng-template #other>
<app-other-address
<div
*ngIf="
mailingAddressFormGroup?.controls?.country?.value?.code !== 'USA' &&
mailingAddressFormGroup?.controls?.country?.value?.code !== 'CAN' &&
mailingAddressFormGroup?.controls?.country?.value !== null
"
[addressForm]="mailingAddressFormGroup"
>
</app-other-address>
<p>Enter your mailing address</p>
<app-other-address [addressForm]="mailingAddressFormGroup"> </app-other-address>
</div>
</ng-template>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...ature-components/wizard/support-components/support-details/support-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@

@if (!checkDateRange()) {
<mat-error class="custom-mat-error">
Valid To Date cannot be greater then the 30 days from the Valid From Date</mat-error
Valid date cannot be greater than 30 days from the Valid from date</mat-error
>
}
</div>
Expand Down
1 change: 0 additions & 1 deletion .../embc-responder/src/app/shared/forms/address-forms/can-address/can-address.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<p><b>Enter the address of your primary residence</b></p>
<div [formGroup]="addressForm">
<div class="row">
<div class="col-md-6">
Expand Down
Loading