-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1263 from Crown-Commercial-Service/p3sprint7
P3sprint7 release to UAT on 25th Apr 2023
- Loading branch information
Showing
22 changed files
with
388 additions
and
38 deletions.
There are no files selected for viewing
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
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
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 |
|---|---|---|
|
|
@@ -99,4 +99,8 @@ a { | |
| } | ||
| .role_group_table { | ||
| padding: 0px 0px 0px 0 !important; | ||
| } | ||
|
|
||
| .hide_dots{ | ||
| display: none; | ||
| } | ||
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
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
59 changes: 59 additions & 0 deletions
59
src/app/pages/manage-user/verify-user-status/verify-user-status.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 |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| <div class="govuk-grid-row"> | ||
| <div class="govuk-grid-column-two-thirds"> | ||
| <div class="user-profile-container"> | ||
| <div class="govuk-breadcrumbs"> | ||
| <ol class="govuk-breadcrumbs__list"> | ||
| <li class="govuk-breadcrumbs__list-item"> | ||
| <a *ngIf="isOrgAdmin" class="govuk-breadcrumbs__link" routerLink="/home"> | ||
| {{ 'ADMINISTRATOR_DASHBOARD' | translate }} | ||
| </a> | ||
| <a *ngIf="!isOrgAdmin" class="govuk-breadcrumbs__link" routerLink="/home"> | ||
| {{"PUBLIC_PROCUREMENT_GATEWAY_DASHBOARD" | translate}} | ||
| </a> | ||
| </li> | ||
| <li class="govuk-breadcrumbs__list-item" *ngIf="userStatus === 0"> | ||
| <span class="govuk-breadcrumbs__link">Account already created</span> | ||
| </li> | ||
| <li class="govuk-breadcrumbs__list-item" *ngIf="userStatus === 1 || userStatus === 2"> | ||
| <span class="govuk-breadcrumbs__link">User not created</span> | ||
| </li> | ||
| <li class="govuk-breadcrumbs__list-item" *ngIf="userStatus === 3"> | ||
| <span class="govuk-breadcrumbs__link">Error</span> | ||
| </li> | ||
| </ol> | ||
| </div> | ||
| <div *ngIf="userStatus === 3" class="govuk-error-summary contact-form-error" aria-labelledby="error-summary-title" | ||
| role="alert" tabindex="-1" id="error-summary" data-module="govuk-error-summary"> | ||
| <h2 class="govuk-error-summary__title" id="error-summary-title"> | ||
| {{ "ERROR_SUMMARY" | translate }} | ||
| </h2> | ||
| <div class="govuk-error-summary__body"> | ||
| <ul class="govuk-list govuk-error-summary__list"> | ||
| <li> | ||
| <a href="javascript:;" onClick="return false;">Invalid Link</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| <div *ngIf="userStatus === 0"> | ||
| <h1 class="govuk-heading-xl">Account already created</h1> | ||
| <div class="link_valid"> | ||
| <p class="govuk-body-l">An account has already been set up for {{userInfo.email}}</p> | ||
| </div> | ||
| </div> | ||
| <div *ngIf="userStatus === 1"> | ||
| <h1 class="govuk-heading-xl">User not created</h1> | ||
| <div class="link_valid"> | ||
| <p class="govuk-body-l">You do not have permission to action this request.</p> | ||
| </div> | ||
| </div> | ||
| <div *ngIf="userStatus === 2"> | ||
| <h1 class="govuk-heading-xl">User not created</h1> | ||
| <div class="link_valid"> | ||
| <p class="govuk-body-l">The user creation request has expired. You can set this user up by <a class="navigation-text" routerLink="/manage-users/add-user/details">Adding a new user</a>. </p> | ||
| </div> | ||
| </div> | ||
| <a *ngIf="userStatus != 3" href="javascript:;" class="navigation-text" routerLink="/home">Return to dashboard</a> | ||
| </div> | ||
| </div> | ||
| </div> |
35 changes: 35 additions & 0 deletions
35
src/app/pages/manage-user/verify-user-status/verify-user-status.component.scss
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 |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| h1 { | ||
| margin-top: 30px; | ||
| } | ||
|
|
||
| .govuk-body, | ||
| .govuk-body-m { | ||
| margin-bottom: 46px; | ||
| } | ||
| .navigation-text { | ||
| margin-bottom: 100px; | ||
| font-size: 19px; | ||
| } | ||
|
|
||
| a { | ||
| text-decoration: underline; | ||
| } | ||
|
|
||
| .navigation-text:hover { | ||
| color: #003078; | ||
| text-decoration-color: rgb(0, 48, 120); | ||
| text-decoration-line: underline; | ||
| text-decoration-skip-ink: none; | ||
| text-decoration-style: solid; | ||
| text-decoration-thickness: 3px; | ||
| } | ||
| .navigation-text:focus { | ||
| color: #0b0c0c !important; | ||
| background-color: #ffdd00 !important; | ||
| text-decoration-color: #0b0c0c !important; | ||
| text-decoration-line: underline; | ||
| text-decoration-skip-ink: none; | ||
| text-decoration-thickness: 3px; | ||
| text-decoration-style: solid; | ||
| } | ||
|
|
25 changes: 25 additions & 0 deletions
25
src/app/pages/manage-user/verify-user-status/verify-user-status.component.spec.ts
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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { VerifyUserStatusComponent } from './verify-user-status.component'; | ||
|
|
||
| describe('VerifyUserStatusComponent', () => { | ||
| let component: VerifyUserStatusComponent; | ||
| let fixture: ComponentFixture<VerifyUserStatusComponent>; | ||
|
|
||
| beforeEach(async () => { | ||
| await TestBed.configureTestingModule({ | ||
| declarations: [ VerifyUserStatusComponent ] | ||
| }) | ||
| .compileComponents(); | ||
| }); | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(VerifyUserStatusComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
Oops, something went wrong.