From 182effa8b5fc807802b3a51f5e3ea3a4f8207cf2 Mon Sep 17 00:00:00 2001 From: Mohaimen Hasan Date: Tue, 17 Nov 2026 10:28:46 +0600 Subject: [PATCH] Role Permission --- .../role-permission-list.component.css | 92 +++++++++++++++++++ .../role-permission-list.component.html | 33 ++++++- .../role-permission-list.component.ts | 42 ++++++++- 3 files changed, 159 insertions(+), 8 deletions(-) diff --git a/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.css b/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.css index 876b23f..26f953f 100644 --- a/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.css +++ b/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.css @@ -15,6 +15,98 @@ padding: 8px 12px; } +/* Toolbar, same layout as the User page: search + counts on the left, Export + Add on the right */ +.rl-grid .rl-toolbar { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 12px; + width: 100%; + padding: 4px 0; +} + +.rl-grid .rl-toolbar__filters, +.rl-grid .rl-toolbar__actions { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 8px; +} + +.rl-grid .rl-search { + width: 240px; +} +/* Count chips (display only) */ +.rl-grid .rl-chips { + display: inline-flex; + flex-wrap: wrap; + gap: 6px; +} + +.rl-grid .rl-chip { + display: inline-flex; + align-items: center; + gap: 6px; + height: 30px; + padding: 0 12px; + border: 1px solid #E3E3EC; + border-radius: 999px; + background: #FFFFFF; + color: #424242; + font: inherit; + font-size: 13px; + cursor: pointer; + transition: background-color 0.15s, border-color 0.15s, color 0.15s; +} + +.rl-grid .rl-chip:hover { + border-color: #52527A; +} + +.rl-grid .rl-chip:focus-visible { + outline: 2px solid #52527A; + outline-offset: 1px; +} + +.rl-grid .rl-chip.is-selected { + background: #52527A; + border-color: #52527A; + color: #FFFFFF; +} + +.rl-grid .rl-chip.is-selected .rl-chip__count { + background: rgba(255, 255, 255, 0.22); + color: #FFFFFF; +} + +.rl-grid .rl-chip__count { + min-width: 20px; + padding: 0 6px; + border-radius: 999px; + background: #F1F1F1; + color: #666666; + font-size: 12px; + line-height: 18px; + text-align: center; +} + +.rl-grid .rl-chip--pending:not(.is-selected) .rl-chip__count { + background: #FFF2DB; + color: #8A5300; +} + +@media (max-width: 768px) { + .rl-grid .rl-toolbar__actions { + width: 100%; + justify-content: flex-end; + } + + .rl-grid .rl-search { + width: 100%; + } +} + /* Status badge */ .rl-grid .rl-badge { display: inline-flex; diff --git a/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.html b/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.html index 27107dc..17bdbbc 100644 --- a/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.html +++ b/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.html @@ -12,10 +12,35 @@ [columnMenu]="{ filter: true }" (add)="addHandler()"> - - - - +
+
+ + + +
+ + + + +
+
+ +
+ + + +
+
diff --git a/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.ts b/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.ts index 6e35139..939c618 100644 --- a/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.ts +++ b/HRM.UI/ClientApp/src/app/authentication/role/role-permission-list/role-permission-list.component.ts @@ -1,8 +1,7 @@ import {Component, OnInit, ViewChild, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core'; import {process, State} from '@progress/kendo-data-query'; import {DataBindingDirective, GridComponent} from '@progress/kendo-angular-grid'; -import {ExcelExportData} from '@progress/kendo-angular-excel-export'; -import {Router} from '@angular/router'; +import {ExcelExportData} from '@progress/kendo-angular-excel-export';import {Router} from '@angular/router'; import {AuthService} from '../../../_services/auth/auth.service'; import {Role} from '../../../_models/Authentication/role'; import { HRMNotificationService } from '../../../app.notification.service'; @@ -39,6 +38,29 @@ export class RolePermissionListComponent implements OnInit { roles: Role[]; selectedRole: Role; viewMode: number =1; //1 new, 2 edit ,3 approve + + /** Status chip group of a role: New / Edited / Deleted not yet approved count as Pending. */ + statusGroup(r: Role): 'active' | 'pending' | 'inactive' { + if (r.roleStatus == EnumAuthStatus.Active || r.roleStatus == EnumAuthStatus.Approved) { + return 'active'; + } + if (r.roleStatus == EnumAuthStatus.New_Not_Yet_Approve + || r.roleStatus == EnumAuthStatus.Edited_Not_Yet_Approve + || r.roleStatus == EnumAuthStatus.Deleted_Not_Yet_Approve) { + return 'pending'; + } + return 'inactive'; + } + + /** Toolbar chip counts (all roles, not narrowed by search or chip). */ + get roleCounts(): { all: number, active: number, pending: number, inactive: number } { + const counts = { all: 0, active: 0, pending: 0, inactive: 0 }; + (this.roles ?? []).forEach(r => { + counts.all++; + counts[this.statusGroup(r)]++; + }); + return counts; + } constructor(public useService: AuthService,public apiService: ApiService, public router: Router, public utilityService: UntilityHandlerService, public apiservice: ApiService, public loadingPanel: loadingPanelService) { @@ -160,13 +182,25 @@ export class RolePermissionListComponent implements OnInit { } } + /** Toolbar status chip: which group of roles the grid shows. */ + statusFilter: 'all' | 'active' | 'pending' | 'inactive' = 'all'; + + setStatusFilter(filter: 'all' | 'active' | 'pending' | 'inactive'): void { + this.statusFilter = filter; + this.refreshGridView(); + if (this.dataBinding) { + this.dataBinding.skip = 0; + } + } + private refreshGridView(): void { + const base = (this.roles ?? []).filter(r => this.statusFilter === 'all' || this.statusGroup(r) === this.statusFilter); const term = this.searchText.trim(); if (!term) { - this.gridView = (this.roles ?? []).slice(); + this.gridView = base; return; } - this.gridView = process(this.roles ?? [], { + this.gridView = process(base, { filter: { logic: 'or', filters: [