Skip to content

Commit

Permalink
Merge pull request #1116 from Crown-Commercial-Service/p3sprint5
Browse files Browse the repository at this point in the history 
P3sprint5 release to sandbox
  • Loading branch information
@ponselvamsakthivel-bc
ponselvamsakthivel-bc authored Feb 9, 2023
2 parents 07c63b0 + ec45db4 commit 2740d9a
Show file tree
Hide file tree
Showing 11 changed files with 201 additions and 166 deletions.
8 changes: 5 additions & 3 deletions Auth0Templates/ResetPassword.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,10 +563,11 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
});

var handleSuccess = function (res) {
debugger;
if(res.success === false){
window.location.replace(res.result_url);
} else {
var field = "initial";
var _status = window.location.href.indexOf('&' + field);

if (_status != -1) {
$('title').html("Success - Set Password - CCS");
document.getElementById("longin-success-message").innerHTML = "Your password has been setup";
Expand All @@ -577,9 +578,10 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
}
$("#success-view").show();
$("#reset-view").hide();
// window.location.replace(result_url);
// window.location.replace(result_url);
var errorSummary = document.getElementById('error-summary');
errorSummary.style.display = 'none';
}
};

var handleError = function (res) {
Expand Down
2 changes: 1 addition & 1 deletion ...pages/manage-buyer-and-both-requests/buyer-both-requests/buyer-both-requests.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export class BuyerBothRequestsComponent implements OnInit {
],
organisationAuditList: '',
pageName: 'Contactadmin',
hyperTextrray: ['Decline', 'Accept', 'View'],
hyperTextrray: ['View'],
};

public verifiedBuyerAndBoth: any = {
Expand Down
29 changes: 15 additions & 14 deletions src/app/pages/manage-buyer-and-both-requests/confirm-decline/confirm-decline.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,22 @@
</li>
</ol>
</div>
<h1 class="govuk-heading-xl page-title header-bread-align">Confirm you want to decline right to buy status for organisation {{routeDetails.organisationName}}</h1>
<h1 class="govuk-heading-xl page-title header-bread-align">Please confirm that you want to decline right to
buy status for the following organisation {{routeDetails.organisationName}}</h1>
<div>
<p class="govuk-body-l">
The organisation’s administrator(s) will be notified that the right to buy status was declined.
<p class="govuk-body-l">
The organisation’s administrator(s) will be notified that the right to buy status has been declined.
</p>
<div class="govuk-button-group save-cancel-button-group">
<button type="submit" class="govuk-button govuk-button--warning" data-module="govuk-button"
(click)="confirmAndDecline()">
Decline
</button>
<button type="button" class="govuk-button govuk-button--secondary" data-module="govuk-button"
(click)="Back()">
Cancel
</button>
<div class="govuk-button-group save-cancel-button-group">
<button type="submit" class="govuk-button govuk-button--warning" data-module="govuk-button"
(click)="confirmAndDecline()">
Decline
</button>
<button type="button" class="govuk-button govuk-button--secondary" data-module="govuk-button"
(click)="Back()">
Cancel
</button>
</div>
</div>
</div>
</div>
</div>
</div>
149 changes: 81 additions & 68 deletions ...uyer-and-both-requests/view-pending-verification/view-pending-verification.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,90 +18,103 @@
</div>
<h1 class="govuk-heading-xl page-title header-bread-align">View organisations’ Buyer status request</h1>
<div>
<p class="govuk-body-l">
View the details of the organisation that is pending the manual verification process for buyer status. If you want to accept this organisation as a verified buyer, please use ‘Accept buyer status’ button on the bottom of this page.
<p class="govuk-body-l">
View the details of the organisation that is pending the manual verification process for buyer
status. If you want to accept this organisation as a verified buyer, please use ‘Accept right to buy
status’ button on the bottom of this page.
</p>
</div>
<div class="span-group govuk-!-margin-top-4">
<h2 class="govuk-heading-m">Organisation details</h2>
<p class="govuk-body">
Organisation name&nbsp;:<strong class="govuk-!-margin-left-2">{{routeDetails.organisationName}}</strong>
Organisation name&nbsp;:<strong
class="govuk-!-margin-left-2">{{routeDetails.organisationName}}</strong>
</p>
<p class="govuk-body">
Organisation type&nbsp;&nbsp;&nbsp;:<strong class="govuk-!-margin-left-2">{{routeDetails.organisationType == 0 ? 'Supplier' : (routeDetails.organisationType == 1 ? 'Buyer' : 'Both')}}</strong>
Organisation type&nbsp;&nbsp;&nbsp;:<strong
class="govuk-!-margin-left-2">{{routeDetails.organisationType == 0 ? 'Supplier' :
(routeDetails.organisationType == 1 ? 'Buyer' : 'Both')}}</strong>
</p>
<p class="govuk-body">
Date of registration:<strong class="govuk-!-margin-left-2 govuk-!-display-inline-block govuk-valign-top">{{routeDetails.dateOfRegistration | date: 'dd/MM/yyyy'}} <br>{{routeDetails.dateOfRegistration | date: 'HH:mm'}}</strong>
Date of registration:<strong
class="govuk-!-margin-left-2 govuk-!-display-inline-block govuk-valign-top">{{routeDetails.dateOfRegistration
| date: 'dd/MM/yyyy'}} <br>{{routeDetails.dateOfRegistration | date: 'HH:mm'}}</strong>
</p>
</div>
<div class="span-group govuk-!-margin-top-4">
<h2 class="govuk-heading-m">Organisation Administrator(s)</h2>
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<div class="user-table">
<app-govuk-table [headerTextKeys]="organisationAdministrator.usersTableHeaders" [data]="organisationAdministrator.userListResponse.userList"
[dataKeys]="organisationAdministrator.usersColumnsToDisplay" [isHyperLinkVisible]="true"
(hyperLinkClickEvent)="openEmailWindow($event)" [useServerPagination]="true"
[serverPageCount]="organisationAdministrator.pageCount" [serverPageCurrentPage]="organisationAdministrator.currentPage"
(changeCurrentPageEvent)="setPageOrganisationAdministrator($event)" [pageName]="pageName"></app-govuk-table>
</div>
<div class="span-group govuk-!-margin-top-4">
<h2 class="govuk-heading-m">Organisation Administrator(s)</h2>
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<div class="user-table">
<app-govuk-table [headerTextKeys]="organisationAdministrator.usersTableHeaders"
[data]="organisationAdministrator.userListResponse.userList"
[dataKeys]="organisationAdministrator.usersColumnsToDisplay" [isHyperLinkVisible]="true"
(hyperLinkClickEvent)="openEmailWindow($event)" [useServerPagination]="true"
[serverPageCount]="organisationAdministrator.pageCount"
[serverPageCurrentPage]="organisationAdministrator.currentPage"
(changeCurrentPageEvent)="setPageOrganisationAdministrator($event)"
[pageName]="pageName"></app-govuk-table>
</div>
</div>
</div>
</div>
</div>
<div class="span-group govuk-!-margin-top-4">
<h2 class="govuk-heading-m">Organisation registries</h2>
<div class="govuk-grid-row" *ngIf="additionalIdentifiers != undefined">
<div class="govuk-grid-column-full">
<div class="user-table">
<table class="govuk-table">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th scope="row" class="govuk-table__header">Registry</th>
<th scope="col" class="govuk-table__header">ID</th>
<th scope="col" class="govuk-table__header remove_element">.</th>
</tr>
</thead>
<tbody class="govuk-table__body">
<tr class="govuk-table__row">
<th scope="row" class="govuk-table__header">{{ getSchemaName(registries.identifier?.scheme||'') }}</th>
<td class="govuk-table__cell">{{ registries.identifier?.id}}</td>
<td class="govuk-table__cell">Primary</td>
</tr>
<tr class="govuk-table__row" *ngFor="let row of additionalIdentifiers">
<th scope="row" class="govuk-table__header">{{ getSchemaName(row.scheme) }}</th>
<td class="govuk-table__cell">{{ row.id }}</td>
<td class="govuk-table__cell"></td>
</tr>
</tbody>
</table>
<div class="span-group govuk-!-margin-top-4">
<h2 class="govuk-heading-m">Organisation registries</h2>
<div class="govuk-grid-row" *ngIf="additionalIdentifiers != undefined">
<div class="govuk-grid-column-full">
<div class="user-table">
<table class="govuk-table">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th scope="row" class="govuk-table__header">Registry</th>
<th scope="col" class="govuk-table__header">ID</th>
<th scope="col" class="govuk-table__header remove_element">.</th>
</tr>
</thead>
<tbody class="govuk-table__body">
<tr class="govuk-table__row">
<th scope="row" class="govuk-table__header">{{
getSchemaName(registries.identifier?.scheme||'') }}</th>
<td class="govuk-table__cell">{{ registries.identifier?.id}}</td>
<td class="govuk-table__cell">Primary</td>
</tr>
<tr class="govuk-table__row" *ngFor="let row of additionalIdentifiers">
<th scope="row" class="govuk-table__header">{{ getSchemaName(row.scheme) }}</th>
<td class="govuk-table__cell">{{ row.id }}</td>
<td class="govuk-table__cell"></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<p class="govuk-body govuk-!-font-weight-bold" *ngIf="additionalIdentifiers == undefined">
There are no matching results.
</p>
</div>
<p class="govuk-body govuk-!-font-weight-bold" *ngIf="additionalIdentifiers == undefined">
There are no matching results.
</p>
</div>
<div class="span-group govuk-!-margin-top-4">
<h2 class="govuk-heading-m">Event log</h2>
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<div class="user-table">
<app-govuk-table [headerTextKeys]="eventLog.usersTableHeaders" [data]="eventLog.organisationAuditEventListResponse.organisationAuditEventList"
[dataKeys]="eventLog.usersColumnsToDisplay" [isHyperLinkVisible]="false" [useServerPagination]="true"
[serverPageCount]="eventLog.pageCount" [serverPageCurrentPage]="eventLog.currentPage"
(changeCurrentPageEvent)="setPageOrganisationEventLogs($event)"></app-govuk-table>
<div class="span-group govuk-!-margin-top-4">
<h2 class="govuk-heading-m">Event log</h2>
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<div class="user-table">
<app-govuk-table [headerTextKeys]="eventLog.usersTableHeaders"
[data]="eventLog.organisationAuditEventListResponse.organisationAuditEventList"
[dataKeys]="eventLog.usersColumnsToDisplay" [isHyperLinkVisible]="false"
[useServerPagination]="true" [serverPageCount]="eventLog.pageCount"
[serverPageCurrentPage]="eventLog.currentPage"
(changeCurrentPageEvent)="setPageOrganisationEventLogs($event)"></app-govuk-table>
</div>
</div>
</div>
</div>
</div>
<br>
<div class="govuk-button-group" *ngIf="!isDeletedOrg">
<button type="submit" class="govuk-!-font-size-18 govuk-!-font-weight-bold govuk-button" data-module="govuk-button"
(click)="acceptRightToBuy()">Accept right to buy status</button>
<button type="button" class="govuk-button govuk-button--warning" data-module="govuk-button"
(click)="declineRightToBuy()">Decline right to buy status</button>
</div>
<button type="button" class="govuk-button govuk-button--secondary" data-module="govuk-button"
(click)="goBack()">Cancel</button>
</div>
</div>
<br>
<div class="govuk-button-group" *ngIf="!isDeletedOrg">
<button type="submit" class="govuk-!-font-size-18 govuk-!-font-weight-bold govuk-button"
data-module="govuk-button" (click)="acceptRightToBuy()">Accept right to buy status</button>
<button type="button" class="govuk-button govuk-button--warning" data-module="govuk-button"
(click)="declineRightToBuy()">Decline right to buy status</button>
</div>
<button type="button" class="govuk-button govuk-button--secondary" data-module="govuk-button"
(click)="goBack()">Cancel</button>
</div>
</div>
Loading

0 comments on commit 2740d9a

Please sign in to comment.