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

9028 qa registration affiliations ids must be unique #2142

Merged
merged 4 commits into from
Jan 24, 2024
Merged

9028 qa registration affiliations ids must be unique #2142

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c180119
9028-qa-registration-affiliations-ids-must-be-unique
Jan 24, 2024
a006f82
9028-qa-registration-affiliations-ids-must-be-unique
Jan 24, 2024
588db43
9028-qa-registration-affiliations-ids-must-be-unique
Jan 24, 2024
075e88b
Merge branch 'main' into 9028-qa-registration-affiliations-ids-must-b…
leomendoza123 Jan 24, 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
27 changes: 11 additions & 16 deletions src/app/register2/components/form-current-employment/form-current-employment.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,7 @@ <h3 class="orc-font-body" i18n="@@register.thisLooksLikeAPersonalEmail">
error: organizationIsInvalidAndTouched,
}"
>
<strong i18n="@@shared.organization" id="organizationLabel"
>Organization</strong
>
<strong i18n="@@shared.organization">Organization</strong>
</label>
</div>

Expand Down Expand Up @@ -149,19 +147,18 @@ <h3 class="orc-font-body" i18n="@@register.thisLooksLikeAPersonalEmail">

<div class="input-container">
<mat-label
id="department-input-label"
class="orc-font-small-print"
[ngClass]="{
error: departmentNameIsInvalidAndTouched
}"
><ng-container i18n="@@register.department">Department</ng-container>
<label id="family-names-input-label" i18n="@@register.optional"
>(Optional)</label
></mat-label
<label i18n="@@register.optional">(Optional)</label></mat-label
>
<mat-form-field appearance="outline" [hideRequiredMarker]="true">
<input
aria-labelledby="family-names-input-label"
id="family-names-input"
aria-labelledby="department-input-label"
id="department-input"
formControlName="departmentName"
matInput
[placeholder]="departmentPlaceholder"
Expand All @@ -177,21 +174,20 @@ <h3 class="orc-font-body" i18n="@@register.thisLooksLikeAPersonalEmail">

<div class="input-container">
<mat-label
id="role-input-label"
class="orc-font-small-print"
[ngClass]="{
error: roleTitleIsInvalidAndTouched
}"
><ng-container i18n="@@register.roleJobTitle"
>Role/Job title</ng-container
>
<label id="family-names-input-label" i18n="@@register.optional"
>(Optional)</label
></mat-label
<label i18n="@@register.optional">(Optional)</label></mat-label
>
<mat-form-field appearance="outline" [hideRequiredMarker]="true">
<input
aria-labelledby="family-names-input-label"
id="family-names-input"
aria-labelledby="role-input-label"
id="role-input"
formControlName="roleTitle"
matInput
[placeholder]="rolePlaceholder"
Expand All @@ -210,15 +206,14 @@ <h3 class="orc-font-body" i18n="@@register.thisLooksLikeAPersonalEmail">
<div class="input-container" formGroupName="startDateGroup">
<div class="row">
<mat-label
id="start-date-input-label"
class="orc-font-small-print"
[ngClass]="{
error: form.hasError('date', 'startDateGroup')
}"
>
<strong i18n="@@shared.startDate">Start date</strong>
<label id="family-names-input-label" i18n="@@register.optional"
>(Optional)</label
>
<label>(Optional)</label>
</mat-label>
</div>
<!--Start date year -->
Expand Down
Loading