Skip to content

Commit

Permalink
PR-Ppg 40 the manage groups functionality changes UI (#1283)
Browse files Browse the repository at this point in the history 
* common component creation completed

* org user view complete (#1250)

* juki work added (#1253)

* Ppg 40 manage user api inegration (#1254)

* juki work added

* role pending status functionlity done

* Approval status changes

* Group - Save button enable

* Task 5412: PPG-40 - The Manage Groups functionality Changes - service tab creation (#1261)

Co-authored-by: chudasama brijrajsinh <chudasama.brijrajsinh@brickendon.com>

* Feature/ppg 40 vijay the manage groups functionality changes UI (#1262)

* Group related changes are done
for manage my account page

* normal users A/Cs are
verified and fixed.

* govuk table pending label implementation

* Feature/ppg 40 vijay the manage groups functionality changes UI (#1272)

* Group related changes are done
for manage my account page

* normal users A/Cs are
verified and fixed.

* can see all the group services

* Ppg 40 tab group access - Fixed approval status in individual tab in manage my account page (#1273)

* Task 5412: PPG-40 - The Manage Groups functionality Changes - service tab creation

* PPG-40- Pending role access for individual user in manage my account page.

* PPG-40-Fixed approval status label flag in Individual access tab in manage my account page

---------

Co-authored-by: chudasama brijrajsinh <chudasama.brijrajsinh@brickendon.com>

* Buddy check changes

* bug-5535-Manage user (Add/ Edit)/Manage
 my Account (User/Admin) - Accordion titles must be changed.

* bug-5537-Manage my account -
Groups - Show and hide link must be
 place as manage user. Now the links are
  displayed in right end of the page

* Manage groups from manage my account

---------

Co-authored-by: ajithmuthukumar-bc <ajith.muthukumar@brickendon.com>
Co-authored-by: ajithmuthukumar-bc <99731656+ajithmuthukumar-bc@users.noreply.github.com>
Co-authored-by: chudasama brijrajsinh <chudasama.brijrajsinh@brickendon.com>
Co-authored-by: jukibaskar-bc <130968637+jukibaskar-bc@users.noreply.github.com>
  • Loading branch information
@VijayHirudayasamy-bc @ajithmuthukumar-bc
@brijrajsinh-bc @jukibaskar-bc
5 people authored Apr 27, 2023
1 parent 4349773 commit 7613d23
Show file tree
Hide file tree
Showing 6 changed files with 132 additions and 116 deletions.
2 changes: 1 addition & 1 deletion src/app/components/accordion/accordion.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<table class="govuk-table" *ngIf="data.length > 0; else noDataIsNotAdmin">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th scope="col" class="govuk-table__header">Group name</th>
<th scope="col" class="govuk-table__header">{{headerText}}</th>
<th scope="col" class="govuk-table__header"></th>
</tr>
</thead>
Expand Down
7 changes: 4 additions & 3 deletions src/app/components/accordion/accordion.component.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { Router, ActivatedRoute } from '@angular/router';

@Component({
selector: 'app-accordion',
Expand Down Expand Up @@ -27,7 +27,7 @@ export class AccordionComponent implements OnInit, OnChanges {


// public groupShow: boolean = false;
constructor(private activatedRoute: ActivatedRoute,) { }
constructor(private router: Router, private activatedRoute: ActivatedRoute) { }

ngOnChanges(): void {
}
Expand Down Expand Up @@ -60,6 +60,7 @@ export class AccordionComponent implements OnInit, OnChanges {
}

public goToEditGroup(groupId: any) {
let isFromManageMyAccount = this.router.url === '/profile';
let queryParams = this.activatedRoute.snapshot.queryParams;
if(queryParams.data)
{
Expand All @@ -69,7 +70,7 @@ export class AccordionComponent implements OnInit, OnChanges {
let data = {
isEdit: true,
groupId: groupId,
accessFrom: "users",
accessFrom: isFromManageMyAccount ? "profile" : "users",
isUserAccess: true,
userEditStatus: this.isEdit
};
Expand Down
50 changes: 35 additions & 15 deletions src/app/pages/manage-group/manage-group-view/manage-group-view-component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="govuk-grid-column-two-thirds">
<div class="user-profile-container">
<div class="govuk-breadcrumbs">
<ol class="govuk-breadcrumbs__list" *ngIf="routeData.accessFrom != 'users'">
<ol class="govuk-breadcrumbs__list" *ngIf="routeData.accessFrom != 'users' && routeData.accessFrom != 'profile'">
<li class="govuk-breadcrumbs__list-item">
<a class="govuk-breadcrumbs__link" routerLink="/home">{{ 'ADMINISTRATOR_DASHBOARD' | translate
}}</a>
Expand All @@ -16,7 +16,9 @@
<span *ngIf="isEdit!=true" class="govuk-breadcrumbs__link">{{ 'VIEW_GROUP' | translate}}</span>
</li>
</ol>
<ol class="govuk-breadcrumbs__list" *ngIf="(routeData.accessFrom === 'users' && routeData.isUserAccess)">
<ol class="govuk-breadcrumbs__list"
*ngIf="(routeData.accessFrom === 'users' && routeData.isUserAccess)">

<li class="govuk-breadcrumbs__list-item">
<a class="govuk-breadcrumbs__link" routerLink="/home">{{ 'ADMINISTRATOR_DASHBOARD' | translate
}}</a>
Expand All @@ -26,15 +28,17 @@
translate
}}</a>
</li>
<li class="govuk-breadcrumbs__list-item">
<li class="govuk-breadcrumbs__list-item">
<a class="govuk-breadcrumbs__link" (click)="history.back()" *ngIf="routeData.userEditStatus === false"> {{ 'CREATE_NEW_USER_ACCOUNT' | translate }}</a>
<a class="govuk-breadcrumbs__link" (click)="history.back()" *ngIf="routeData.userEditStatus === true"> {{ 'EDIT_YOUR_USER_ACCOUNTS' | translate }}</a>
</li>

<li class="govuk-breadcrumbs__list-item">
<span class="govuk-breadcrumbs__link">{{ 'VIEW_GROUP' | translate}}</span>
<span class="govuk-breadcrumbs__link">{{ 'VIEW_GROUP' | translate}}</span>
</li>
</ol>
<ol class="govuk-breadcrumbs__list" *ngIf="(routeData.accessFrom === 'users' && !routeData.isUserAccess)">
<ol class="govuk-breadcrumbs__list"
*ngIf="(routeData.accessFrom === 'users' && !routeData.isUserAccess)">
<li class="govuk-breadcrumbs__list-item">
<a class="govuk-breadcrumbs__link" routerLink="/home">{{ 'ADMINISTRATOR_DASHBOARD' | translate
}}</a>
Expand All @@ -45,7 +49,21 @@
}}</a>
</li>
<li class="govuk-breadcrumbs__list-item">
<span class="govuk-breadcrumbs__link">{{ 'VIEW_GROUP' | translate}}</span>
<span class="govuk-breadcrumbs__link">{{ 'VIEW_GROUP' | translate}}</span>
</li>
</ol>
<ol class="govuk-breadcrumbs__list"
*ngIf="(routeData.accessFrom === 'profile')">

<li class="govuk-breadcrumbs__list-item">
<a class="govuk-breadcrumbs__link" routerLink="/home">{{ 'ADMINISTRATOR_DASHBOARD' | translate
}}</a>
</li>
<li class="govuk-breadcrumbs__list-item">
<a class="govuk-breadcrumbs__link" routerLink="/profile">{{ 'MANAGE_MY_ACCOUNT' | translate }}</a>
</li>
<li class="govuk-breadcrumbs__list-item">
<span class="govuk-breadcrumbs__link">{{ 'VIEW_GROUP' | translate}}</span>
</li>
</ol>
</div>
Expand Down Expand Up @@ -82,7 +100,8 @@ <h2 class="govuk-heading-s">{{ 'ROLES_FOR_GROUP' | translate }}</h2>
</div>
<div *ngIf="!showRoleView">
<h2 class="govuk-heading-s">{{ 'SERVICE_FOR_GROUP' | translate }}</h2>
<p class="govuk-hints">This group has access to the services below. To manage these, select 'Manage group services'.</p>
<p class="govuk-hints">This group has access to the services below. To manage these, select 'Manage
group services'.</p>
</div>
<div *ngIf="group.roles.length == 0">
<p>{{'NONE'| translate}}
Expand All @@ -102,14 +121,14 @@ <h2 class="govuk-heading-s">{{ 'SERVICE_FOR_GROUP' | translate }}</h2>
<div class="govuk-grid-row" *ngIf="isEdit==true">
<div class="govuk-grid-column-two-thirds">
<div class="govuk-button-group">
<button *ngIf="showRoleView" type="button" (click)="onRoleEditClick()" class="govuk-button govuk-button--secondary"
data-module="govuk-button">
<button *ngIf="showRoleView" type="button" (click)="onRoleEditClick()"
class="govuk-button govuk-button--secondary" data-module="govuk-button">
{{ 'MANAGE_GROUP_ROLE_BTN' | translate }}
</button>
<button *ngIf="!showRoleView" type="button" (click)="onRoleEditClick()" class="govuk-button govuk-button--secondary"
data-module="govuk-button">
{{ 'MANAGE_GROUP_SERVICE_BTN' | translate }}
</button>
<button *ngIf="!showRoleView" type="button" (click)="onRoleEditClick()"
class="govuk-button govuk-button--secondary" data-module="govuk-button">
{{ 'MANAGE_GROUP_SERVICE_BTN' | translate }}
</button>
</div>
</div>
</div>
Expand All @@ -120,7 +139,7 @@ <h2 class="govuk-heading-s">{{ 'SERVICE_FOR_GROUP' | translate }}</h2>
<legend class="govuk-heading-s">
Security Level
</legend>
<app-details [detailsData]="detailsData[1]"></app-details>
<app-details [detailsData]="detailsData[1]"></app-details>
<div class="govuk-form-group govuk-checkboxes__item" id="user-mfa-form-group">
<input [attr.disabled]=true [checked]="group.mfaEnabled" class="govuk-checkboxes__input" id="mfaEnabled"
formControlName="mfaEnabled" name="mfaEnabled" type="checkbox">
Expand Down Expand Up @@ -161,7 +180,8 @@ <h2 class="govuk-heading-s">{{ 'LIST_OF_USERS_GROUP' | translate }}</h2>
</button>
</div>
<div>
<a href="javascript:;" (click)="onDeleteClick()" class="navigation-text delete-link">{{ 'DELETE_GROUP' | translate }}</a>
<a href="javascript:;" (click)="onDeleteClick()" class="navigation-text delete-link">{{ 'DELETE_GROUP' |
translate }}</a>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit 7613d23

Please sign in to comment.