Skip to content

Commit

Permalink
Role rename changes (#932) (#933)
Browse files Browse the repository at this point in the history
  • Loading branch information
@brijrajsinh-bc
brijrajsinh-bc authored Dec 13, 2022
1 parent 21b6ac9 commit 80ba971
Show file tree
Hide file tree
Showing 11 changed files with 146 additions and 522 deletions.
145 changes: 36 additions & 109 deletions ...pp/pages/buyer/auto-validation-buyer-success/auto-validation-buyer-success.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,31 +58,14 @@ <h1 class="govuk-heading-xl page-title">You have successfully saved the changes<
<div class="govuk-checkboxes">
<ng-container *ngFor="let role of changes?.toAdd">
<div class="govuk-__item">
<label class="govuk-label">{{
role.roleKey === "JAEGGER_SUPPLIER"
? "eSourcing Service as a supplier"
: role.roleKey === "ACCESS_JAGGAER"
? "eSourcing Service - dashboard"
: role.roleKey === "CAT_USER"
? "Contract Award Service (CAS) - service"
: role.roleKey === "ACCESS_CAAAC_CLIENT"
? "Contract Award Service (CAS) - dashboard"
: role.roleKey === "JAEGGER_BUYER"
? "eSourcing Service as a buyer"
: role.roleKey === "JAGGAER_USER"
? "eSourcing Service - service"
: role.roleName
}}
<span
*ngIf="
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
role.roleKey != 'ACCESS_CAAAC_CLIENT' &&
role.roleKey != 'JAEGGER_BUYER' &&
role.roleKey != 'JAGGAER_USER'
"
>- {{ role.serviceName }}</span
<label class="govuk-label">{{ role.roleName }}
<span *ngIf="role.serviceName &&
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
role.roleKey != 'ACCESS_CAAAC_CLIENT' &&
role.roleKey != 'JAEGGER_BUYER' &&
role.roleKey != 'JAGGAER_USER'">- {{ role.serviceName }}</span
></label>
</div>
</ng-container>
Expand All @@ -92,23 +75,9 @@ <h1 class="govuk-heading-xl page-title">You have successfully saved the changes<
<div class="govuk-checkboxes">
<ng-container *ngFor="let role of changes?.toDelete">
<div class="govuk-__item">
<label class="govuk-label">{{
role.roleKey === "JAEGGER_SUPPLIER"
? "eSourcing Service as a supplier"
: role.roleKey === "ACCESS_JAGGAER"
? "eSourcing Service - dashboard"
: role.roleKey === "CAT_USER"
? "Contract Award Service (CAS) - service"
: role.roleKey === "ACCESS_CAAAC_CLIENT"
? "Contract Award Service (CAS) - dashboard"
: role.roleKey === "JAEGGER_BUYER"
? "eSourcing Service as a buyer"
: role.roleKey === "JAGGAER_USER"
? "eSourcing Service - service"
: role.roleName
}}
<label class="govuk-label">{{ role.roleName }}
<span
*ngIf="
*ngIf=" role.serviceName &&
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
Expand Down Expand Up @@ -137,32 +106,18 @@ <h1 class="govuk-heading-xl page-title">You have successfully saved the changes<
<div class="govuk-checkboxes">
<ng-container *ngFor="let role of changes?.toAutoValid">
<div class="govuk-__item">
<label class="govuk-label">{{
role.roleKey === "JAEGGER_SUPPLIER"
? "eSourcing Service as a supplier"
: role.roleKey === "ACCESS_JAGGAER"
? "eSourcing Service - dashboard"
: role.roleKey === "CAT_USER"
? "Contract Award Service (CAS) - service"
: role.roleKey === "ACCESS_CAAAC_CLIENT"
? "Contract Award Service (CAS) - dashboard"
: role.roleKey === "JAEGGER_BUYER"
? "eSourcing Service as a buyer"
: role.roleKey === "JAGGAER_USER"
? "eSourcing Service - service"
: role.roleName
}}
<span
*ngIf="
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
role.roleKey != 'ACCESS_CAAAC_CLIENT' &&
role.roleKey != 'JAEGGER_BUYER' &&
role.roleKey != 'JAGGAER_USER'
"
>- {{ role.serviceName }}</span
></label>
<label class="govuk-label">{{ role.roleName }}
<span
*ngIf=" role.serviceName &&
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
role.roleKey != 'ACCESS_CAAAC_CLIENT' &&
role.roleKey != 'JAEGGER_BUYER' &&
role.roleKey != 'JAGGAER_USER'
"
>- {{ role.serviceName }}</span
></label>
</div>
</ng-container>
</div>
Expand All @@ -171,32 +126,18 @@ <h1 class="govuk-heading-xl page-title">You have successfully saved the changes<
<div class="govuk-checkboxes">
<ng-container *ngFor="let role of changes?.toAdd">
<div class="govuk-__item">
<label class="govuk-label">{{
role.roleKey === "JAEGGER_SUPPLIER"
? "eSourcing Service as a supplier"
: role.roleKey === "ACCESS_JAGGAER"
? "eSourcing Service - dashboard"
: role.roleKey === "CAT_USER"
? "Contract Award Service (CAS) - service"
: role.roleKey === "ACCESS_CAAAC_CLIENT"
? "Contract Award Service (CAS) - dashboard"
: role.roleKey === "JAEGGER_BUYER"
? "eSourcing Service as a buyer"
: role.roleKey === "JAGGAER_USER"
? "eSourcing Service - service"
: role.roleName
}}
<span
*ngIf="
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
role.roleKey != 'ACCESS_CAAAC_CLIENT' &&
role.roleKey != 'JAEGGER_BUYER' &&
role.roleKey != 'JAGGAER_USER'
"
>- {{ role.serviceName }}</span
></label>
<label class="govuk-label">{{ role.roleName }}
<span
*ngIf=" role.serviceName &&
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
role.roleKey != 'ACCESS_CAAAC_CLIENT' &&
role.roleKey != 'JAEGGER_BUYER' &&
role.roleKey != 'JAGGAER_USER'
"
>- {{ role.serviceName }}</span
></label>
</div>
</ng-container>
</div>
Expand All @@ -205,23 +146,9 @@ <h1 class="govuk-heading-xl page-title">You have successfully saved the changes<
<div class="govuk-checkboxes">
<ng-container *ngFor="let role of changes?.toDelete">
<div class="govuk-__item">
<label class="govuk-label">{{
role.roleKey === "JAEGGER_SUPPLIER"
? "eSourcing Service as a supplier"
: role.roleKey === "ACCESS_JAGGAER"
? "eSourcing Service - dashboard"
: role.roleKey === "CAT_USER"
? "Contract Award Service (CAS) - service"
: role.roleKey === "ACCESS_CAAAC_CLIENT"
? "Contract Award Service (CAS) - dashboard"
: role.roleKey === "JAEGGER_BUYER"
? "eSourcing Service as a buyer"
: role.roleKey === "JAGGAER_USER"
? "eSourcing Service - service"
: role.roleName
}}
<label class="govuk-label">{{ role.roleName }}
<span
*ngIf="
*ngIf=" role.serviceName &&
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
Expand Down
70 changes: 21 additions & 49 deletions src/app/pages/buyer/confirm-changes/confirm.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,56 +58,9 @@ <h1 class="govuk-heading-xl page-title">Confirm service roles changes for the or
<div class="govuk-checkboxes">
<ng-container *ngFor="let role of changes?.toAdd">
<div class="govuk-__item">
<label class="govuk-label">{{
role.roleKey === "JAEGGER_SUPPLIER"
? "eSourcing Service as a supplier"
: role.roleKey === "ACCESS_JAGGAER"
? "eSourcing Service - dashboard"
: role.roleKey === "CAT_USER"
? "Contract Award Service (CAS) - service"
: role.roleKey === "ACCESS_CAAAC_CLIENT"
? "Contract Award Service (CAS) - dashboard"
: role.roleKey === "JAEGGER_BUYER"
? "eSourcing Service as a buyer"
: role.roleKey === "JAGGAER_USER"
? "eSourcing Service - service"
: role.roleName
}}
<span
*ngIf="
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
role.roleKey != 'ACCESS_CAAAC_CLIENT' &&
role.roleKey != 'JAEGGER_BUYER' &&
role.roleKey != 'JAGGAER_USER'
"
>- {{ role.serviceName }}</span
></label>
</div>
</ng-container>
</div>
<legend *ngIf="changes?.toDelete.length > 0" class="govuk-fieldset__legend" style="font-size: 22px;margin-top:30px;">Service roles you are removing from this organisation</legend>
<div class="govuk-checkboxes">
<ng-container *ngFor="let role of changes?.toDelete">
<div class="govuk-__item">
<label class="govuk-label">{{
role.roleKey === "JAEGGER_SUPPLIER"
? "eSourcing Service as a supplier"
: role.roleKey === "ACCESS_JAGGAER"
? "eSourcing Service - dashboard"
: role.roleKey === "CAT_USER"
? "Contract Award Service (CAS) - service"
: role.roleKey === "ACCESS_CAAAC_CLIENT"
? "Contract Award Service (CAS) - dashboard"
: role.roleKey === "JAEGGER_BUYER"
? "eSourcing Service as a buyer"
: role.roleKey === "JAGGAER_USER"
? "eSourcing Service - service"
: role.roleName
}}
<label class="govuk-label">{{ role.roleName }}
<span
*ngIf="
*ngIf=" role.serviceName &&
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
Expand All @@ -120,6 +73,25 @@ <h1 class="govuk-heading-xl page-title">Confirm service roles changes for the or
</div>
</ng-container>
</div>
<legend *ngIf="changes?.toDelete.length > 0" class="govuk-fieldset__legend" style="font-size: 22px;margin-top:30px;">Service roles you are removing from this organisation</legend>
<div class="govuk-checkboxes">
<ng-container *ngFor="let role of changes?.toDelete">
<div class="govuk-__item">
<label class="govuk-label">{{role.roleName}}
<span
*ngIf=" role.serviceName &&
role.roleKey != 'JAEGGER_SUPPLIER' &&
role.roleKey != 'ACCESS_JAGGAER' &&
role.roleKey != 'CAT_USER' &&
role.roleKey != 'ACCESS_CAAAC_CLIENT' &&
role.roleKey != 'JAEGGER_BUYER' &&
role.roleKey != 'JAGGAER_USER'
"
>- {{ role.serviceName }}</span
></label>
</div>
</ng-container>
</div>
</fieldset>
</div>
<div class="govuk-button-group" style="margin-top: 40px;">
Expand Down
Loading

0 comments on commit 80ba971

Please sign in to comment.