Compare commits

..

No commits in common. "main" and "dev_mohaimen_bonus" have entirely different histories.

70 changed files with 1106 additions and 7760 deletions

View File

@ -1,55 +0,0 @@
/*
ADParameterBasicUserIDNullable_DB_Changes.sql
Why:
ADParameterDA.Insert (HRM.DA/DA/AllowDeduct/ADParameterDA.cs) wrote a hard-coded 1 into
dbo.ADPARAMETERBASIC.USERID. On databases with no USERS.USERID = 1 (MasterProjectDBUATBRAC)
every allowance parameter save fails on FK_ADPARAMETERBASIC_USERS. The insert will stop
writing USERID, so the column has to accept NULL.
What:
Makes dbo.ADPARAMETERBASIC.USERID int NULL. The foreign key FK_ADPARAMETERBASIC_USERS is kept:
it is dropped only for the ALTER and re-created on USERS(USERID). A NULL value is allowed by the
foreign key; any value written stays checked.
Run order:
Run BEFORE deploying the code that removes USERID from the insert (a NOT NULL column with no
value in the INSERT fails). Re-runnable: does nothing when the column is already nullable.
*/
IF COL_LENGTH('dbo.ADPARAMETERBASIC', 'USERID') IS NOT NULL
AND COLUMNPROPERTY(OBJECT_ID('dbo.ADPARAMETERBASIC'), 'USERID', 'AllowsNull') = 0
BEGIN
BEGIN TRANSACTION;
IF OBJECT_ID('dbo.FK_ADPARAMETERBASIC_USERS', 'F') IS NOT NULL
ALTER TABLE dbo.ADPARAMETERBASIC DROP CONSTRAINT FK_ADPARAMETERBASIC_USERS;
ALTER TABLE dbo.ADPARAMETERBASIC ALTER COLUMN USERID int NULL;
ALTER TABLE dbo.ADPARAMETERBASIC WITH NOCHECK
ADD CONSTRAINT FK_ADPARAMETERBASIC_USERS FOREIGN KEY (USERID) REFERENCES dbo.USERS (USERID);
COMMIT TRANSACTION;
PRINT 'dbo.ADPARAMETERBASIC.USERID is now NULL-able (FK_ADPARAMETERBASIC_USERS re-created).';
END
ELSE
PRINT 'dbo.ADPARAMETERBASIC.USERID is already NULL-able (or missing) - nothing to do.';
GO
-- Part 2: USERID carries DEFAULT ((1)), so an INSERT that leaves the column out still writes 1 and
-- fails the same foreign key. Drop that default so the column stays NULL.
DECLARE @dfName sysname;
SELECT @dfName = dc.name
FROM sys.default_constraints dc
JOIN sys.columns c ON c.object_id = dc.parent_object_id AND c.column_id = dc.parent_column_id
WHERE dc.parent_object_id = OBJECT_ID('dbo.ADPARAMETERBASIC') AND c.name = 'USERID';
IF @dfName IS NOT NULL
BEGIN
EXEC ('ALTER TABLE dbo.ADPARAMETERBASIC DROP CONSTRAINT ' + @dfName);
PRINT 'Default constraint ' + @dfName + ' on dbo.ADPARAMETERBASIC.USERID dropped.';
END
ELSE
PRINT 'dbo.ADPARAMETERBASIC.USERID has no default - nothing to do.';
GO

View File

@ -449,28 +449,6 @@ Gotcha in user approval: `UserDA.Approve` always sets `Status = Approved` (5), w
can never actually be approved. The user list labels that action "Re-activate" for this reason; the fix can never actually be approved. The user list labels that action "Re-activate" for this reason; the fix
belongs in the server. belongs in the server.
### Authentication pages: maker-checker and audit log
Role, Role Permission, User, User Role and User Access Type (Authentication menu) are **maker-checker**: a
change is saved with an `EnumAuthStatus` (`HRM.BO/HRBasic/Enums.cs`) pending state — `NewNotYetApprove` (2),
`DeletedNotYetApprove` (3), `EditedNotYetApprove` (4), `Inactive_Not_Yet_Approve` (9) — and only becomes
`Approved` (5) / `Rejected` (10) when a second user approves it (`UserAccessTypeService.RequestChange` /
`Approve` / `Reject`, `RoleService` for roles and permissions). Follow that state set for any new
Authentication page rather than inventing a status column.
The **System Audit Log** page (`SystemAuditHistoryService`, `HRM.DA/DA/Users/SystemAuditHistoryDA.cs`) writes
nothing itself: it reads `Z_ROLE`, `Z_ROLEPERMISSION`, `Z_USERS`, `Z_USERROLE`, `Z_USERACCESSTYPE`, which
**database triggers** (`trRole`, `trRolePermission`, `trUsers`, `truserrole`, `trUserAccessType`) fill. Only
`trRole` and `trUserAccessType` are scripted (root `SystemAuditHistory_DB_Changes.sql`); the other three
already exist in the databases and are not in the repo. Triggers must be set-based (approve/reject touch many
rows in one statement). The acting user reaches a trigger through `SESSION_CONTEXT(N'AuditUserID')`, set by
`UserAccessTypeDA` (`sp_set_session_context`) inside the same transaction — do the same when auditing a new
table. That script's stated prerequisite, `UserAccessTypeMakerChecker_DB_Changes.sql`, is not in this repo.
`AuthController.CipherMechanism` (`api/Authentication/CipherMechanism`, Angular `authentication/cipher-engine`)
encrypts a value with the same `Ease.NetCore` cipher used for passwords — another reason that NuGet stays at
1.0.5.
`PayrollTypeID` is the scoping key threaded through most payroll/attendance queries — when adding a `PayrollTypeID` is the scoping key threaded through most payroll/attendance queries — when adding a
query that returns employee data, check whether existing siblings filter by it. Reading `EmployeeID` query that returns employee data, check whether existing siblings filter by it. Reading `EmployeeID`
throws for a self-service (`EnumUserType.Employee`) login that has none, so guard accordingly. throws for a self-service (`EnumUserType.Employee`) login that has none, so guard accordingly.

View File

@ -401,13 +401,6 @@ namespace HRM.BO
routerLink = "/authentication/system-auditlog", routerLink = "/authentication/system-auditlog",
icon = "pi pi-fw pi-database", icon = "pi pi-fw pi-database",
}, },
new WebMenuItem()
{
uniqueName = "WEB.01.09",
label = "Cipher Engine",
routerLink = "/authentication/cipher-engine",
icon = "pi pi-fw pi-code",
},
} }
}, },

View File

@ -1,67 +0,0 @@
using System;
using System.Collections.Generic;
using Ease.Core.Model;
namespace HRM.BO
{
#region SystemAuditHistory
/// <summary>Which change history the System Audit Log page asks for (one tab each).</summary>
public enum EnumSystemAuditHistory
{
Role = 1,
RolePermission = 2,
User = 3,
UserRole = 4,
UserAccessType = 5
}
/// <summary>
/// One row of a change history, read from the Z_ table of that page
/// (Z_ROLE, Z_ROLEPERMISSION, Z_USERS, Z_USERROLE, Z_USERACCESSTYPE - see
/// SystemAuditHistory_DB_Changes.sql). Fields a history does not have stay null.
/// </summary>
public class SystemAuditHistory : ObjectTemplate
{
#region Constructor
public SystemAuditHistory()
{
}
#endregion
#region Properties
/// <summary>What happened, e.g. "User created", "Role modified", "Access type removed".</summary>
public string AuditType { get; set; }
public DateTime? AuditDate { get; set; }
public string LoginID { get; set; }
public string Name { get; set; }
public string Code { get; set; }
public string UserType { get; set; }
public string RoleName { get; set; }
public string RoleType { get; set; }
public string MenuKey { get; set; }
public string MenuName { get; set; }
public string AccessType { get; set; }
public string Activities { get; set; }
public int? ActionBy { get; set; }
public string ActionByLoginID { get; set; }
public string ActionByName { get; set; }
#endregion
}
#endregion
#region ISystemAuditHistory Service
public interface ISystemAuditHistoryService
{
/// <summary>The change history of one page in a date range (both days inclusive), newest first.</summary>
List<SystemAuditHistory> Get(EnumSystemAuditHistory type, DateTime dtFrom, DateTime dtTo);
}
#endregion
}

View File

@ -13,8 +13,6 @@ namespace HRM.BO
PayrollTypeID = 0; PayrollTypeID = 0;
UserID = 0; UserID = 0;
UserObj = null; UserObj = null;
// A row nobody approved yet is never live access (see UserAccessTypeMakerChecker_DB_Changes.sql).
AccessTypeStatus = EnumAuthStatus.NewNotYetApprove;
} }
#endregion #endregion
@ -25,22 +23,9 @@ namespace HRM.BO
public string Description { get; set; } public string Description { get; set; }
public int UserID { get; set; } public int UserID { get; set; }
public User UserObj { get; set; } public User UserObj { get; set; }
/// <summary> public EnumAuthStatus accessTypeStatus;
/// UserAccessType.Status: Approved (5) = live; NewNotYetApprove (2) = requested, not live yet; public int? ApprovedBy;
/// DeletedNotYetApprove (3) = removal requested, still live until approved. public DateTime? ApprovedDate;
/// </summary>
public EnumAuthStatus AccessTypeStatus { get; set; }
public int? ApprovedBy { get; set; }
public DateTime? ApprovedDate { get; set; }
// Filled only by GetPending (the Pending approvals list), for display.
public string UserName { get; set; }
public string LoginID { get; set; }
/// <summary>Who requested this pending row: CreatedBy for a new access, ModifiedBy for a removal.</summary>
public int MakerID { get; set; }
public string MakerLoginID { get; set; }
/// <summary>When it was requested: CreatedDate for a new access, ModifiedDate for a removal.</summary>
public DateTime? RequestDate { get; set; }
#endregion #endregion
} }
@ -56,16 +41,6 @@ namespace HRM.BO
int Save(UserAccessType item); int Save(UserAccessType item);
void Save(List<UserAccessType> userAccessTypes); void Save(List<UserAccessType> userAccessTypes);
void Delete(int id); void Delete(int id);
// Maker-checker (Authentication > User Access Type)
/// <summary>Maker: records the wanted payroll types of a user as pending changes. Returns how many rows changed.</summary>
int RequestChange(int userID, List<int> payrollTypeIDs, int makerID);
/// <summary>Checker: makes every pending change of the user live.</summary>
void Approve(int userID, int approverID);
/// <summary>Checker: drops every pending change of the user; access stays as it was.</summary>
void Reject(int userID, int rejecterID);
/// <summary>Every row waiting for approval, of every user, with user, payroll type and maker for display.</summary>
List<UserAccessType> GetPending();
} }
#endregion #endregion

View File

@ -68,109 +68,6 @@ namespace HRM.BO
void Save(List<UserRole> userRoles, int payrolltypeid); void Save(List<UserRole> userRoles, int payrolltypeid);
void Delete(int id); void Delete(int id);
// Maker-checker (Authentication > User Role Permission). See UserRoleMakerChecker_DB_Changes.sql.
/// <summary>The person's live roles of the subject's role type, and any change waiting for approval.</summary>
UserRoleState GetRoleState(UserRoleSubject subject);
/// <summary>Maker: records the wanted roles as pending requests. Returns how many requests were made.</summary>
int RequestChange(UserRoleChangeRequest request, int makerID);
/// <summary>Checker: makes the subject's pending requests live (creates the login first if needed).</summary>
void Approve(UserRoleSubject subject, int approverID);
/// <summary>Checker: drops the subject's pending requests; live roles stay as they were.</summary>
void Reject(UserRoleSubject subject, int approverID);
/// <summary>Every request waiting for approval, of everyone, with names for display.</summary>
List<UserRoleRequest> GetPending();
}
#endregion
#region User role maker-checker
/// <summary>What a UserRoleRequest asks for.</summary>
public enum EnumUserRoleRequestType
{
Add = 1,
Remove = 2,
}
/// <summary>
/// Whose roles: an Admin user (RoleType Admin, UserID) or a Self Service employee
/// (RoleType Self_Service, EmployeeID + PayrollTypeID; UserID only once the employee has a login).
/// </summary>
public class UserRoleSubject
{
public EnumRoleType RoleType { get; set; }
public int? UserID { get; set; }
public int? EmployeeID { get; set; }
public int? PayrollTypeID { get; set; }
}
/// <summary>Maker's request: the roles (of the subject's role type) the person should have.</summary>
public class UserRoleChangeRequest : UserRoleSubject
{
public UserRoleChangeRequest()
{
RoleIDs = new List<int>();
}
public List<int> RoleIDs { get; set; }
}
/// <summary>
/// One UserRole row as the maker-checker screens show it (not a table of its own). A row waiting for
/// approval is a request: UserRole.Status 2 = give the role (RequestType Add, maker = CreatedBy),
/// Status 3 = take it away (RequestType Remove, maker = ModifiedBy). ID is the UserRoleID.
/// </summary>
public class UserRoleRequest : BasicBaseObject
{
public UserRoleRequest()
{
Status = EnumAuthStatus.NewNotYetApprove;
}
public EnumUserRoleRequestType RequestType { get; set; }
public int RoleID { get; set; }
public EnumRoleType RoleType { get; set; }
public int? UserID { get; set; }
public int? EmployeeID { get; set; }
public int? PayrollTypeID { get; set; }
/// <summary>NewNotYetApprove (2) = waiting, Approved (5), Rejected (10).</summary>
public EnumAuthStatus Status { get; set; }
public int? ApprovedBy { get; set; }
public DateTime? ApprovedDate { get; set; }
// Not database properties: filled for display.
public string RoleName { get; set; }
public string LoginID { get; set; }
public string PersonName { get; set; }
public string EmployeeNo { get; set; }
public string MakerLoginID { get; set; }
}
/// <summary>A person's roles of one role type, as the User Role Permission page shows them.</summary>
public class UserRoleState
{
public UserRoleState()
{
LiveRoleIDs = new List<int>();
Pending = new List<UserRoleRequest>();
}
public EnumRoleType RoleType { get; set; }
public int? UserID { get; set; }
public int? EmployeeID { get; set; }
/// <summary>Self Service: the employee's payroll type.</summary>
public int? PayrollTypeID { get; set; }
public string LoginID { get; set; }
public string PersonName { get; set; }
/// <summary>False for a Self Service employee who has no login yet (one is made when a change is sent).</summary>
public bool HasLogin { get; set; }
/// <summary>The login was made for a change still waiting for approval (Users.Status 2): it cannot sign in yet.</summary>
public bool LoginWaiting { get; set; }
/// <summary>Roles of this role type the person has now (live).</summary>
public List<int> LiveRoleIDs { get; set; }
/// <summary>Requests waiting for approval.</summary>
public List<UserRoleRequest> Pending { get; set; }
} }
#endregion #endregion

View File

@ -22,15 +22,15 @@ namespace HRM.DA
{ {
// 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 // 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
tc.ExecuteNonQuery( tc.ExecuteNonQuery(
"INSERT INTO ADPARAMETERBASIC(ADParameterID, allowDeductID, isForConfirmOnly, flatAmount, percentOfBasic, percentOfGross, GFFlatAmount, GFPercentOfBasic, GFPercentOfGross, minAmount, maxAmount, isCurrentlyActive, TAXABLEPERCENTAGE, ISTAXABLE, ISTaxProjection, IsDependsOnAttendance, IsDependsOnOTHour,ISDEPENDSONSPECIALHOUR, IsWithException, Periodicity, ALLOWORDEDUCT, GENDER, CreatedBy, CreationDate, PAYROLLTYPEID, LASTACTIVATIONDATE,ENTITLETYPE,PercentOfEarnedBasic,IsFractionateApplicable, TaxProjection)" + "INSERT INTO ADPARAMETERBASIC(ADParameterID, allowDeductID, isForConfirmOnly, flatAmount, percentOfBasic, percentOfGross, GFFlatAmount, GFPercentOfBasic, GFPercentOfGross, minAmount, maxAmount, isCurrentlyActive, TAXABLEPERCENTAGE, ISTAXABLE, ISTaxProjection, IsDependsOnAttendance, IsDependsOnOTHour,ISDEPENDSONSPECIALHOUR, IsWithException, Periodicity, ALLOWORDEDUCT, GENDER, CreatedBy, CreationDate, PAYROLLTYPEID, LASTACTIVATIONDATE,ENTITLETYPE,PercentOfEarnedBasic,IsFractionateApplicable,userid, TaxProjection)" +
" VALUES(%n, %n, %b, %n, %n, %n, %n, %n, %n, %n, %n, %b, %n, %b, %b, %b, %b, %n, %b, %n, %n, %n, %n, %d, %n, %D, %n, %n, %n,%n)", " VALUES(%n, %n, %b, %n, %n, %n, %n, %n, %n, %n, %n, %b, %n, %b, %b, %b, %b, %n, %b, %n, %n, %n, %n, %d, %n, %D, %n, %n, %n,%n,%n)",
item.ID, item.AllowDeductID, item.IsForConfirmOnly, item.FlatAmount, item.PercentOfBasic, item.ID, item.AllowDeductID, item.IsForConfirmOnly, item.FlatAmount, item.PercentOfBasic,
item.PercentOfGross, item.GFFlatAmount, item.GFPercentOfBasic, item.GFPercentOfGross, item.MinAmount, item.PercentOfGross, item.GFFlatAmount, item.GFPercentOfBasic, item.GFPercentOfGross, item.MinAmount,
item.MaxAmount, item.IsCurrentlyActive, item.TaxablePercentage, item.IsTaxable, item.IsTaxProjection, item.MaxAmount, item.IsCurrentlyActive, item.TaxablePercentage, item.IsTaxable, item.IsTaxProjection,
item.IsDependsOnAttendance, item.IsDependsOnOTHour, item.ISDEPENDSONSPECIALHOUR, item.IsWithException, item.IsDependsOnAttendance, item.IsDependsOnOTHour, item.ISDEPENDSONSPECIALHOUR, item.IsWithException,
item.Periodicity, item.AllowOrDeductType, item.Gender, item.CreatedBy, item.CreatedDate, item.Periodicity, item.AllowOrDeductType, item.Gender, item.CreatedBy, item.CreatedDate,
item.PayrollTypeID, DateTime.Now, item.EntitleType, item.PercentOfEarnedBasic, item.PayrollTypeID, DateTime.Now, item.EntitleType, item.PercentOfEarnedBasic,
item.IsFractionateApplicable, 0); item.IsFractionateApplicable, 1, 0);
} }
internal static void Insert(TransactionContext tc, ADParameter.ADParameterGrade item) internal static void Insert(TransactionContext tc, ADParameter.ADParameterGrade item)

View File

@ -56,11 +56,8 @@ namespace HRM.DA
internal static IDataReader GetUserPayrollType(TransactionContext tc, string loginID) internal static IDataReader GetUserPayrollType(TransactionContext tc, string loginID)
{ {
// Live access only: a requested access (Status 2) is not live until approved; a requested
// removal (Status 3) stays live until approved.
string sql = SQLParser.MakeSQL(@"SELECT p.* FROM PayrollType p, UserAccessType ua,Users u string sql = SQLParser.MakeSQL(@"SELECT p.* FROM PayrollType p, UserAccessType ua,Users u
where p.PayrollTypeID==ua.PayrollTypeID and u.UserID =ua.UserID and u.LoginID=%s and ua.Status<>%n", where p.PayrollTypeID==ua.PayrollTypeID and u.UserID =ua.UserID and u.LoginID=%s", loginID);
loginID, (int)EnumAuthStatus.NewNotYetApprove);
return tc.ExecuteReader(sql); return tc.ExecuteReader(sql);
} }
@ -71,8 +68,7 @@ namespace HRM.DA
string sql = SQLParser.MakeSQL(@"SELECT * FROM PAYROLLTYPE WHERE PAYROLLTYPEID IN string sql = SQLParser.MakeSQL(@"SELECT * FROM PAYROLLTYPE WHERE PAYROLLTYPEID IN
(SELECT DISTINCT ua.PAYROLLTYPEID FROM USERS u (SELECT DISTINCT ua.PAYROLLTYPEID FROM USERS u
JOIN USERACCESSTYPE ua ON u.USERID = ua.UserId JOIN USERACCESSTYPE ua ON u.USERID = ua.UserId
WHERE u.EMPLOYEEID=%n AND u.USERTYPE=%n AND ua.Status<>%n)", WHERE u.EMPLOYEEID=%n AND u.USERTYPE=%n)", employeeId, userType);
employeeId, userType, (int)EnumAuthStatus.NewNotYetApprove);
return tc.ExecuteReader(sql); return tc.ExecuteReader(sql);
} }

View File

@ -73,8 +73,8 @@ namespace HRM.DA
//" WHERE RoleID = %n", item.Code, item.Name, item.ModifiedBy, item.ModifiedDate, item.Sequence, (int)item.RoleStatus, item.ApproveBy, item.ApproveDate, (int)item.RoleStatus, item.Description, item.ID); //" WHERE RoleID = %n", item.Code, item.Name, item.ModifiedBy, item.ModifiedDate, item.Sequence, (int)item.RoleStatus, item.ApproveBy, item.ApproveDate, (int)item.RoleStatus, item.Description, item.ID);
tc.ExecuteNonQuery( tc.ExecuteNonQuery(
"UPDATE Role SET Code=%s, name = %s, Description = %s, ROLETYPE = %n, Sequence = %n, ApproveBy = %n,ApproveDate=%D,Status=%n , AUTHORIZEDBY=%n, AUTHORIZEDDATE=%D" + "UPDATE Role SET Code=%s, name = %s, Sequence = %n, ApproveBy = %n,ApproveDate=%D,Status=%n , AUTHORIZEDBY=%n, AUTHORIZEDDATE=%D" +
" WHERE RoleID = %n", item.Code, item.Name, item.Description, (int)item.RoleType, item.Sequence, item.ApproveBy, item.ApproveDate, " WHERE RoleID = %n", item.Code, item.Name, item.Sequence, item.ApproveBy, item.ApproveDate,
(int)item.RoleStatus, item.ModifiedBy, item.ModifiedDate, item.ID); (int)item.RoleStatus, item.ModifiedBy, item.ModifiedDate, item.ID);
} }
@ -137,10 +137,8 @@ namespace HRM.DA
//" WHERE r.RoleID= u.roleid and u.userid=%n order by PermissionCode", //" WHERE r.RoleID= u.roleid and u.userid=%n order by PermissionCode",
//useridID); //useridID);
// u.Status<>2: a role given but not approved yet is not live (UserRoleMakerChecker_DB_Changes.sql).
return tc.ExecuteReader(@"SELECT distinct r.*, CAST(REPLACE(r.PermissionCode, '.', '') AS int) pcode FROM RolePermission r, UserRole u return tc.ExecuteReader(@"SELECT distinct r.*, CAST(REPLACE(r.PermissionCode, '.', '') AS int) pcode FROM RolePermission r, UserRole u
WHERE r.RoleID = u.roleid and u.userid = %n and u.Status <> %n order by pcode", WHERE r.RoleID = u.roleid and u.userid = %n order by pcode",useridID);
useridID, (int)EnumAuthStatus.NewNotYetApprove);
} }
internal static IDataReader GetRolePermissionByUserID(TransactionContext tc, int userID, int employeeID) internal static IDataReader GetRolePermissionByUserID(TransactionContext tc, int userID, int employeeID)
@ -159,8 +157,7 @@ namespace HRM.DA
//useridID); //useridID);
return tc.ExecuteReader(@"SELECT distinct r.*, CAST(REPLACE(r.PermissionCode, '.', '') AS int) pcode FROM RolePermission r, UserRole u return tc.ExecuteReader(@"SELECT distinct r.*, CAST(REPLACE(r.PermissionCode, '.', '') AS int) pcode FROM RolePermission r, UserRole u
WHERE (r.RoleID = u.roleid or r.ROLEID = 12) and u.userid = %n and u.Status <> %n order by pcode", WHERE (r.RoleID = u.roleid or r.ROLEID = 12) and u.userid = %n order by pcode", useridID);
useridID, (int)EnumAuthStatus.NewNotYetApprove);
} }
internal static IDataReader GetRoleActionPermissionByRoleID(TransactionContext tc, int roleID) internal static IDataReader GetRoleActionPermissionByRoleID(TransactionContext tc, int roleID)

View File

@ -131,9 +131,8 @@ namespace HRM.DA
return tc.ExecuteDataSet( return tc.ExecuteDataSet(
@"select distinct rp.PERMISSIONCODE MenuKey, rp.roleid RoleID from RolePermission rp @"select distinct rp.PERMISSIONCODE MenuKey, rp.roleid RoleID from RolePermission rp
inner join UserRole ur on rp.roleID = ur.RoleID inner join UserRole ur on rp.roleID = ur.RoleID
where ur.UserID=%n and rp.STATUS=%n and ur.Status<>%n", where ur.UserID=%n and rp.STATUS=%n",
userID, (int)EnumAuthStatus.Approved, (int)EnumAuthStatus.NewNotYetApprove); userID, (int)EnumAuthStatus.Approved);
// ur.Status<>2: a role given but not approved yet is not live (UserRoleMakerChecker_DB_Changes.sql).
} }
} }
} }

View File

@ -1,121 +0,0 @@
using System;
using System.Data;
using Ease.Core.DataAccess;
using HRM.BO;
namespace HRM.DA
{
// Change history of the Authentication pages, read from their Z_ tables
// (SystemAuditHistory_DB_Changes.sql). Every query returns the same columns, so one
// MapObject reads them all: AuditType, AuditDate, LoginID, Name, Code, UserType, RoleName,
// RoleType, MenuKey, MenuName, AccessType, Status, Activities, ActionBy, ActionByLoginID,
// ActionByName. Date range: both days inclusive, newest first.
internal class SystemAuditHistoryDA
{
#region Constructor
private SystemAuditHistoryDA()
{
}
#endregion
#region Get Function
// Z_ROLE keeps a copy of the row. "Update (before)" rows are left out (the "after" row
// shows the change). Who did it: the approver on an approval, else the editor, else the creator.
internal static IDataReader GetRole(TransactionContext tc, DateTime dtFrom, DateTime dtTo)
{
string sql = SQLParser.MakeSQL(
@"SELECT CASE z.AUDITTYPE WHEN 'Inserted' THEN 'Role created'
WHEN 'Deleted' THEN 'Role deleted'
ELSE 'Role modified' END AuditType,
z.AUDITDATE AuditDate, NULL LoginID, z.NAME Name, z.CODE Code, NULL UserType,
NULL RoleName, z.ROLETYPE RoleType, NULL MenuKey, NULL MenuName, NULL AccessType,
z.STATUS Status, NULL Activities, a.ActionBy, u.LoginID ActionByLoginID, u.UserName ActionByName
FROM Z_ROLE z
CROSS APPLY (SELECT CASE WHEN z.AUDITTYPE = 'Deleted' THEN NULL
WHEN z.AUDITTYPE = 'Inserted' THEN z.CREATEDBY
WHEN z.STATUS = %n AND z.APPROVEBY IS NOT NULL THEN z.APPROVEBY
ELSE COALESCE(z.AUTHORIZEDBY, z.CREATEDBY) END ActionBy) a
LEFT JOIN Users u ON u.UserID = a.ActionBy
WHERE z.AUDITTYPE <> 'Update (before)'
AND z.AUDITDATE >= %d AND z.AUDITDATE < %d
ORDER BY z.AUDITDATE DESC",
(int)EnumAuthStatus.Approved, dtFrom.Date, dtTo.Date.AddDays(1));
return tc.ExecuteReader(sql);
}
// Z_ROLEPERMISSION (trigger trRolePermission). Menu name from the uploaded menu
// (ConfigurationAttribute), the same lookup RolePermissionDA.GetRolePerAudit uses.
internal static IDataReader GetRolePermission(TransactionContext tc, DateTime dtFrom, DateTime dtTo)
{
string sql = SQLParser.MakeSQL(
@"SELECT z.audittype AuditType, z.auditdate AuditDate, NULL LoginID, NULL Name, r.Code Code, NULL UserType,
r.Name RoleName, r.RoleType RoleType, z.menukey MenuKey,
(SELECT TOP 1 ca.Value FROM ConfigurationAttribute ca
WHERE ca.AttributeName = 'name'
AND ca.ParentID = (SELECT MAX(ck.ParentID) FROM ConfigurationAttribute ck
WHERE ck.Value = z.menukey AND ck.AttributeName = 'key')) MenuName,
NULL AccessType, z.status Status, z.activities Activities,
z.actionby ActionBy, u.LoginID ActionByLoginID, u.UserName ActionByName
FROM Z_ROLEPERMISSION z
LEFT JOIN Role r ON r.RoleID = z.roleid
LEFT JOIN Users u ON u.UserID = z.actionby
WHERE z.auditdate >= %d AND z.auditdate < %d
ORDER BY z.auditdate DESC",
dtFrom.Date, dtTo.Date.AddDays(1));
return tc.ExecuteReader(sql);
}
// Z_USERS (trigger trUsers).
internal static IDataReader GetUser(TransactionContext tc, DateTime dtFrom, DateTime dtTo)
{
string sql = SQLParser.MakeSQL(
@"SELECT z.audittype AuditType, z.auditdate AuditDate, z.loginid LoginID, z.name Name, NULL Code,
z.usertype UserType, NULL RoleName, NULL RoleType, NULL MenuKey, NULL MenuName, NULL AccessType,
NULL Status, z.activities Activities,
z.actionby ActionBy, u.LoginID ActionByLoginID, u.UserName ActionByName
FROM Z_USERS z
LEFT JOIN Users u ON u.UserID = z.actionby
WHERE z.auditdate >= %d AND z.auditdate < %d
ORDER BY z.auditdate DESC",
dtFrom.Date, dtTo.Date.AddDays(1));
return tc.ExecuteReader(sql);
}
// Z_USERROLE (trigger truserrole): Code / name are the role's.
internal static IDataReader GetUserRole(TransactionContext tc, DateTime dtFrom, DateTime dtTo)
{
string sql = SQLParser.MakeSQL(
@"SELECT z.audittype AuditType, z.auditdate AuditDate, NULL LoginID, NULL Name, z.Code Code, NULL UserType,
z.name RoleName, NULL RoleType, NULL MenuKey, NULL MenuName, NULL AccessType,
NULL Status, z.activities Activities,
z.actionby ActionBy, u.LoginID ActionByLoginID, u.UserName ActionByName
FROM Z_USERROLE z
LEFT JOIN Users u ON u.UserID = z.actionby
WHERE z.auditdate >= %d AND z.auditdate < %d
ORDER BY z.auditdate DESC",
dtFrom.Date, dtTo.Date.AddDays(1));
return tc.ExecuteReader(sql);
}
// Z_USERACCESSTYPE (trigger trUserAccessType).
internal static IDataReader GetUserAccessType(TransactionContext tc, DateTime dtFrom, DateTime dtTo)
{
string sql = SQLParser.MakeSQL(
@"SELECT z.audittype AuditType, z.auditdate AuditDate, z.loginid LoginID, z.name Name, NULL Code,
NULL UserType, NULL RoleName, NULL RoleType, NULL MenuKey, NULL MenuName, z.payrolltype AccessType,
NULL Status, z.activities Activities,
z.actionby ActionBy, u.LoginID ActionByLoginID, u.UserName ActionByName
FROM Z_USERACCESSTYPE z
LEFT JOIN Users u ON u.UserID = z.actionby
WHERE z.auditdate >= %d AND z.auditdate < %d
ORDER BY z.auditdate DESC",
dtFrom.Date, dtTo.Date.AddDays(1));
return tc.ExecuteReader(sql);
}
#endregion
}
}

View File

@ -18,14 +18,8 @@ namespace HRM.DA
internal static void Insert(TransactionContext tc, UserAccessType item) internal static void Insert(TransactionContext tc, UserAccessType item)
{ {
tc.ExecuteNonQuery("INSERT INTO UserAccessType(UserAccessTypeID, PayrollTypeID, UserID, Status," + tc.ExecuteNonQuery("INSERT INTO UserAccessType(UserAccessTypeID, PayrollTypeID, UserID)" +
" CreatedBy, CreatedDate, ApprovedBy, ApprovedDate)" + " VALUES(%n, %n, %n)", item.ID, item.PayrollTypeID, item.UserID);
" VALUES(%n, %n, %n, %n, %n, %D, %n, %D)",
item.ID, item.PayrollTypeID, item.UserID, (int)item.AccessTypeStatus,
item.CreatedBy == 0 ? null : item.CreatedBy,
item.CreatedDate == System.DateTime.MinValue ? null : item.CreatedDate,
item.ApprovedBy == 0 ? null : item.ApprovedBy,
item.ApprovedDate == System.DateTime.MinValue ? null : item.ApprovedDate);
} }
#endregion #endregion
@ -38,43 +32,6 @@ namespace HRM.DA
" WHERE UserAccessTypeID=%n", item.PayrollTypeID, item.UserID, item.ID); " WHERE UserAccessTypeID=%n", item.PayrollTypeID, item.UserID, item.ID);
} }
// Maker asks to take a live access away: it stays live (Status 3) until approved.
internal static void RequestRemoval(TransactionContext tc, int userAccessTypeID, int makerID, System.DateTime requestDate)
{
tc.ExecuteNonQuery("UPDATE UserAccessType SET Status=%n, ModifiedBy=%n, ModifiedDate=%D" +
" WHERE UserAccessTypeID=%n",
(int)EnumAuthStatus.DeletedNotYetApprove, makerID, requestDate, userAccessTypeID);
}
// Checker approves: requested removals go, requested accesses become live.
internal static void Approve(TransactionContext tc, int userID, int approverID, System.DateTime approveDate)
{
tc.ExecuteNonQuery("DELETE FROM UserAccessType WHERE UserID=%n AND Status=%n",
userID, (int)EnumAuthStatus.DeletedNotYetApprove);
tc.ExecuteNonQuery("UPDATE UserAccessType SET Status=%n, ApprovedBy=%n, ApprovedDate=%D" +
" WHERE UserID=%n AND Status=%n",
(int)EnumAuthStatus.Approved, approverID, approveDate, userID, (int)EnumAuthStatus.NewNotYetApprove);
}
// Tells trigger trUserAccessType who is making the change (SystemAuditHistory_DB_Changes.sql),
// for the rows it cannot tell from the row itself (a reject, a deleted row). Lasts for this
// connection only; a pooled connection is reset before it is used again. Skipped on a
// SQL Server older than 2016, which has no session context.
internal static void SetAuditUser(TransactionContext tc, int userID)
{
tc.ExecuteNonQuery("IF OBJECT_ID('sys.sp_set_session_context') IS NOT NULL" +
" EXEC sp_set_session_context @key = N'AuditUserID', @value = %n", userID);
}
// Checker rejects: requested accesses go, requested removals stay live as before.
internal static void Reject(TransactionContext tc, int userID)
{
tc.ExecuteNonQuery("DELETE FROM UserAccessType WHERE UserID=%n AND Status=%n",
userID, (int)EnumAuthStatus.NewNotYetApprove);
tc.ExecuteNonQuery("UPDATE UserAccessType SET Status=%n WHERE UserID=%n AND Status=%n",
(int)EnumAuthStatus.Approved, userID, (int)EnumAuthStatus.DeletedNotYetApprove);
}
#endregion #endregion
#region Get Function #region Get Function
@ -96,29 +53,7 @@ namespace HRM.DA
return tc.ExecuteReader("SELECT * FROM UserAccessType WHERE UserID=%n", UserID); return tc.ExecuteReader("SELECT * FROM UserAccessType WHERE UserID=%n", UserID);
} }
// Every row waiting for approval, of every user (Pending approvals list).
internal static IDataReader GetPending(TransactionContext tc)
{
return tc.ExecuteReader(@"SELECT ua.*, p.Description PayrollTypeName, u.LoginID UserLoginID, u.UserName UserFullName,
mk.LoginID MakerLoginID
FROM UserAccessType ua
JOIN PayrollType p ON p.PayrollTypeID = ua.PayrollTypeID
JOIN Users u ON u.UserID = ua.UserID
LEFT JOIN Users mk ON mk.UserID = CASE WHEN ua.Status=%n THEN ua.ModifiedBy ELSE ua.CreatedBy END
WHERE ua.Status IN (%n, %n)
ORDER BY u.UserName, p.Description",
(int)EnumAuthStatus.DeletedNotYetApprove,
(int)EnumAuthStatus.NewNotYetApprove, (int)EnumAuthStatus.DeletedNotYetApprove);
}
// Names of the payroll types a pending approval of this user will newly give access to.
internal static IDataReader GetPendingNewDescriptions(TransactionContext tc, int userID)
{
return tc.ExecuteReader(@"SELECT p.Description FROM UserAccessType ua
JOIN PayrollType p ON p.PayrollTypeID = ua.PayrollTypeID
WHERE ua.UserID=%n AND ua.Status=%n",
userID, (int)EnumAuthStatus.NewNotYetApprove);
}
#endregion #endregion

View File

@ -95,13 +95,6 @@ namespace HRM.DA
item.ParentID, item.UserStatus, item.ApprovedBy, item.ApprovedDate, item.ComputerName, item.ParentID, item.UserStatus, item.ApprovedBy, item.ApprovedDate, item.ComputerName,
item.ApprovedComputerName, DataReader.GetNullValue(item.ExpireDate),item.UserStatus, item.ID); item.ApprovedComputerName, DataReader.GetNullValue(item.ExpireDate),item.UserStatus, item.ID);
} }
// User Role Permission maker-checker: switches a waiting employee login on (or records its status).
internal static void UpdateStatus(TransactionContext tc, int userID, EnumAuthStatus status, int approvedBy, DateTime approvedDate)
{
tc.ExecuteNonQuery("UPDATE Users SET Status = %n, ApprovedBy=%n, ApprovedDate=%D WHERE UserID = %n",
(int)status, approvedBy, approvedDate, userID);
}
internal static void Approve(TransactionContext tc, User item) internal static void Approve(TransactionContext tc, User item)
{ {
tc.ExecuteNonQuery("UPDATE Users SET Status = %n, ApprovedBy=%n, ApprovedDate=%D,ComputerName=%s,ApprovedComputerName=%s," + tc.ExecuteNonQuery("UPDATE Users SET Status = %n, ApprovedBy=%n, ApprovedDate=%D,ComputerName=%s,ApprovedComputerName=%s," +
@ -250,8 +243,8 @@ namespace HRM.DA
{ {
return tc.ExecuteReader(@"SELECT u.* FROM Users u return tc.ExecuteReader(@"SELECT u.* FROM Users u
WHERE u.UserType=%n AND u.UserID IN WHERE u.UserType=%n AND u.UserID IN
(SELECT ua.UserID FROM UserAccessType ua WHERE ua.PayrollTypeID=%n AND ua.Status<>%n)", (SELECT ua.UserID FROM UserAccessType ua WHERE ua.PayrollTypeID=%n)",
type, payrollTypeID, (int)EnumAuthStatus.NewNotYetApprove); type, payrollTypeID);
} }
internal static IDataReader GetAll(TransactionContext tc) internal static IDataReader GetAll(TransactionContext tc)

View File

@ -72,9 +72,7 @@ namespace HRM.DA
} }
return tc.ExecuteReader( return tc.ExecuteReader(
@"SELECT ur.*, u.LOGINID LoginID, u.USERNAME UserName,R.Name RoleName, u.EmployeeID employeeID, @"SELECT ur.*, u.LOGINID LoginID, u.USERNAME UserName,R.Name RoleName FROM UserRole ur,[Users] u, Role R
(SELECT e.PayrollTypeID FROM Employee e WHERE e.EmployeeID = u.EmployeeID) EmpPayrollTypeID
FROM UserRole ur,[Users] u, Role R
WHERE ur.RoleID=r.RoleID and u.UserID =ur.UserID %q order by u.LoginID,R.Name", sqlClause); WHERE ur.RoleID=r.RoleID and u.UserID =ur.UserID %q order by u.LoginID,R.Name", sqlClause);
} }
@ -146,111 +144,6 @@ namespace HRM.DA
tc.ExecuteNonQuery("DELETE FROM UserRole WHERE UserID=%n", nUserID); tc.ExecuteNonQuery("DELETE FROM UserRole WHERE UserID=%n", nUserID);
} }
#region Maker-checker (Authentication > User Role Permission, UserRoleMakerChecker_DB_Changes.sql)
// UserRole.Status: Approved (5) = live; NewNotYetApprove (2) = given, not live until approved;
// DeletedNotYetApprove (3) = being taken away, still live until approved.
// Maker gives a role: it waits for approval (Status 2). CreatedBy is the maker.
internal static void InsertPending(TransactionContext tc, int userRoleID, int roleID, int userID,
int makerID, DateTime requestDate)
{
tc.ExecuteNonQuery(
"INSERT INTO UserRole(UserRoleID, RoleID, UserID, EventDate, CreatedBy, Status, ComputerName, ApprovedComputerName)" +
" VALUES(%n, %n, %n, %D, %n, %n, %s, %s)",
userRoleID, roleID, userID, requestDate, makerID, (int)EnumAuthStatus.NewNotYetApprove, "", "");
}
// Every change below touches ONE UserRole row (by UserRoleID): the audit trigger dbo.truserrole
// handles a single row only, and a multi-row UPDATE fails inside it (Msg 512).
// Maker takes a live role away: it stays live (Status 3) until approved. ModifiedBy is the maker.
internal static void RequestRemoval(TransactionContext tc, int userRoleID, int makerID, DateTime requestDate)
{
tc.ExecuteNonQuery(
"UPDATE UserRole SET Status=%n, ModifiedBy=%n, ModifiedDate=%D WHERE UserRoleID=%n",
(int)EnumAuthStatus.DeletedNotYetApprove, makerID, requestDate, userRoleID);
}
// Checker approves a given role: it becomes live. AuthorizedBy / AuthorizedDate are the checker.
internal static void ApproveRow(TransactionContext tc, int userRoleID, int approverID, DateTime approveDate)
{
tc.ExecuteNonQuery(
"UPDATE UserRole SET Status=%n, AuthorizedBy=%n, AuthorizedDate=%D WHERE UserRoleID=%n",
(int)EnumAuthStatus.Approved, approverID, approveDate, userRoleID);
}
// Checker rejects a removal: the role stays live as before.
internal static void RestoreRow(TransactionContext tc, int userRoleID)
{
tc.ExecuteNonQuery("UPDATE UserRole SET Status=%n WHERE UserRoleID=%n",
(int)EnumAuthStatus.Approved, userRoleID);
}
// Checker approves a removal, or rejects a given role: the row goes.
internal static void DeleteRow(TransactionContext tc, int userRoleID)
{
tc.ExecuteNonQuery("DELETE FROM UserRole WHERE UserRoleID=%n", userRoleID);
}
// Inside the maker's write transaction: counts the user's changes of one role type waiting for approval
// and keeps that range locked until commit, so a second maker sending at the same moment waits here
// and then sees the first change (instead of making a second pending change).
internal static int CountPendingLocked(TransactionContext tc, int userID, EnumRoleType roleType)
{
object o = tc.ExecuteScalar(
"SELECT COUNT(*) FROM UserRole WITH (UPDLOCK, HOLDLOCK)" +
" WHERE UserID=%n AND Status IN (%n, %n) AND RoleID IN (SELECT RoleID FROM Role WHERE RoleType=%n)",
userID, (int)EnumAuthStatus.NewNotYetApprove, (int)EnumAuthStatus.DeletedNotYetApprove, (int)roleType);
return o == null || o == DBNull.Value ? 0 : Convert.ToInt32(o);
}
// Same idea for a Self Service employee with no login yet: counts the employee's logins and keeps them
// locked, so two makers cannot both create a login for the same employee.
internal static int CountEmployeeLoginsLocked(TransactionContext tc, int employeeID)
{
object o = tc.ExecuteScalar(
"SELECT COUNT(*) FROM Users WITH (UPDLOCK, HOLDLOCK) WHERE EmployeeID=%n AND UserType=%n",
employeeID, (int)EnumUserType.Employee);
return o == null || o == DBNull.Value ? 0 : Convert.ToInt32(o);
}
internal static int CountByUser(TransactionContext tc, int userID)
{
object o = tc.ExecuteScalar("SELECT COUNT(*) FROM UserRole WHERE UserID=%n", userID);
return o == null || o == DBNull.Value ? 0 : Convert.ToInt32(o);
}
// UserRole rows with role, person and maker for the maker-checker screens. pendingOnly: only rows
// waiting for approval (Status 2 / 3). userID / roleType narrow it to one person's roles of one type.
internal static IDataReader GetForMakerChecker(TransactionContext tc, bool pendingOnly, int? userID, EnumRoleType? roleType)
{
string clause = "";
if (pendingOnly)
clause += SQLParser.MakeSQL(" AND ur.Status IN (%n, %n)",
(int)EnumAuthStatus.NewNotYetApprove, (int)EnumAuthStatus.DeletedNotYetApprove);
if (userID.HasValue)
clause += SQLParser.MakeSQL(" AND ur.UserID=%n", userID.Value);
if (roleType.HasValue)
clause += SQLParser.MakeSQL(" AND r.RoleType=%n", (int)roleType.Value);
return tc.ExecuteReader(
@"SELECT ur.UserRoleID, ur.RoleID, ur.UserID, ur.Status, ur.CreatedBy, ur.EventDate,
ur.ModifiedBy, ur.ModifiedDate, r.Name RoleName, r.RoleType,
u.LoginID, COALESCE(e.Name, u.UserName) PersonName, u.EmployeeID,
e.EmployeeNo, e.PayrollTypeID, mk.LoginID MakerLoginID
FROM UserRole ur
JOIN Role r ON r.RoleID = ur.RoleID
JOIN Users u ON u.UserID = ur.UserID
LEFT JOIN Employee e ON e.EmployeeID = u.EmployeeID
LEFT JOIN Users mk ON mk.UserID = CASE WHEN ur.Status = %n THEN ur.ModifiedBy ELSE ur.CreatedBy END
WHERE 1 = 1 %q
ORDER BY PersonName, r.Name",
(int)EnumAuthStatus.DeletedNotYetApprove, clause);
}
#endregion
internal static void Update(TransactionContext tc, int id, EnumStatus status) internal static void Update(TransactionContext tc, int id, EnumStatus status)
{ {
tc.ExecuteNonQuery("UPDATE UserRole SET Status = %n,AuthorizedBy=%n,AuthorizedDate=%D WHERE UserID = %n", tc.ExecuteNonQuery("UPDATE UserRole SET Status = %n,AuthorizedBy=%n,AuthorizedDate=%D WHERE UserID = %n",

View File

@ -343,11 +343,13 @@ namespace HRM.DA
if (oBank.Code ==string.Empty) if (oBank.Code ==string.Empty)
oBank.Code = GlobalFunctionService.GetMaxCode(tc, "banks", "Code"); oBank.Code = GlobalFunctionService.GetMaxCode(tc, "banks", "Code");
oBank.CreatedBy = 1;
oBank.CreatedDate = DateTime.Now; oBank.CreatedDate = DateTime.Now;
BankDA.Insert(tc, oBank); BankDA.Insert(tc, oBank);
} }
else else
{ {
oBank.ModifiedBy = 1;
oBank.ModifiedDate = DateTime.Now; oBank.ModifiedDate = DateTime.Now;
BankDA.Update(tc, oBank); BankDA.Update(tc, oBank);
} }

View File

@ -4759,32 +4759,6 @@ namespace HRM.DA
//} //}
// Stamps the uploading user on every object of an upload list before its SaveForUpload:
// CreatedBy/CreatedDate on new rows, ModifiedBy/ModifiedDate on every row.
private void SetAuditInfo<T>(List<T> items, int userID) where T : AuditTrailBase
{
if (items == null)
return;
DateTime now = DateTime.Now;
foreach (T item in items)
{
if (item == null)
continue;
if (item.IsNew || item.CreatedBy <= 0)
{
item.CreatedBy = userID;
item.CreatedDate = now;
}
else
{
item.ModifiedBy = userID;
item.ModifiedDate = now;
}
}
}
public void Save(List<Category> categorys, List<Grade> grades, List<Department> departments, public void Save(List<Category> categorys, List<Grade> grades, List<Department> departments,
List<Location> locations, List<Location> locations,
List<Religion> religions, List<Designation> designations, List<Bank> banks, List<Religion> religions, List<Designation> designations, List<Bank> banks,

View File

@ -109,7 +109,6 @@ namespace HRM.DA
_employees = employees; _employees = employees;
_processMonth = processMonth; _processMonth = processMonth;
_euroRate = euroRate; _euroRate = euroRate;
UpdateprocessStatus("Collecting Employee basic information...."); UpdateprocessStatus("Collecting Employee basic information....");
this.Initialize(); this.Initialize();
this.AddEmployeeToProcess(); this.AddEmployeeToProcess();

View File

@ -469,19 +469,16 @@ return oTaxParameter;
{ {
PayrollType ptype = new PayrollTypeService().Get(payrollTypeID); PayrollType ptype = new PayrollTypeService().Get(payrollTypeID);
TransactionContext tc = null; TransactionContext tc = null;
List<TaxParameter> allTaxParameter = GetbyPayrolltype(payrollTypeID);
try try
{ {
tc = TransactionContext.Begin(true); tc = TransactionContext.Begin(true);
if (oTaxParameter.IsNew) if (oTaxParameter.IsNew)
{
if (allTaxParameter != null && allTaxParameter.Count > 0)
{ {
if (ptype.TaxParamID != null) throw new Exception("Not allowed to create new tax-year until current year-end."); if (ptype.TaxParamID != null) throw new Exception("Not allowed to create new tax-year until current year-end.");
}
int MaxID = TaxParameterDA.GetMaxID(tc, payrollTypeID); int MaxID = TaxParameterDA.GetMaxID(tc, payrollTypeID);
int id = tc.GenerateID("TaxParameter", "TaxParamID"); int id = tc.GenerateID("TaxParameter", "TaxParamID");
base.SetObjectID(oTaxParameter, (id)); base.SetObjectID(oTaxParameter, (id));
TaxParameterDA.InsertWithSignature(tc, oTaxParameter); TaxParameterDA.InsertWithSignature(tc, oTaxParameter);

View File

@ -329,12 +329,11 @@ namespace HRM.DA
public int Save(Role oRole) public int Save(Role oRole)
{ {
TransactionContext tc = null; TransactionContext tc = null;
try try
{ {
tc = TransactionContext.Begin(true); tc = TransactionContext.Begin(true);
// Audit of the permission rows, by PermissionCode, read before they are deleted and
// re-inserted below, so each kept menu keeps who/when it was created and approved.
Dictionary<string, Role.RolePermission> existingPermissions = new Dictionary<string, Role.RolePermission>();
if (oRole.IsNew) if (oRole.IsNew)
{ {
int id = tc.GenerateID("Role", "RoleID"); int id = tc.GenerateID("Role", "RoleID");
@ -345,15 +344,6 @@ namespace HRM.DA
} }
else else
{ {
DataReader existingReader = new DataReader(RoleDA.GetRolePermissionByRoleID(tc, oRole.ID));
while (existingReader.Read())
{
Role.RolePermission existingPermission = this.CreateRolePermissionObject(existingReader);
if (existingPermission.PermissionCode != null && !existingPermissions.ContainsKey(existingPermission.PermissionCode))
existingPermissions.Add(existingPermission.PermissionCode, existingPermission);
}
existingReader.Close();
RoleDA.Update(tc, oRole); RoleDA.Update(tc, oRole);
#region Delete Children #region Delete Children
RoleDA.Delete(tc, "RolePermission", "RoleID", oRole.ID); RoleDA.Delete(tc, "RolePermission", "RoleID", oRole.ID);
@ -361,6 +351,7 @@ namespace HRM.DA
// RoleDA.Delete(tc, "RoleDesignation", "RoleID", oRole.ID); // RoleDA.Delete(tc, "RoleDesignation", "RoleID", oRole.ID);
#endregion #endregion
} }
if (oRole.RolePermissions != null & oRole.RolePermissions.Count > 0) if (oRole.RolePermissions != null & oRole.RolePermissions.Count > 0)
{ {
int maxID = oRole.RolePermissions.Max(x => x.ID); int maxID = oRole.RolePermissions.Max(x => x.ID);
@ -381,31 +372,11 @@ namespace HRM.DA
newid = newid + 1; newid = newid + 1;
} }
// Whoever made this change: the editor, or the creator for a new role. On approval
// the controller keeps the maker in ModifiedBy, so this is still the maker.
int makerID = (oRole.ModifiedBy ?? 0) > 0 ? oRole.ModifiedBy.Value : oRole.CreatedBy;
foreach (Role.RolePermission rolePermission in oRole.RolePermissions) foreach (Role.RolePermission rolePermission in oRole.RolePermissions)
{ {
rolePermission.RoleID = oRole.ID; rolePermission.RoleID = oRole.ID;
Role.RolePermission existingPermission = null; rolePermission.CreatedBy = oRole.CreatedBy;
if (rolePermission.PermissionCode != null) rolePermission.CreatedDate = oRole.CreatedDate;
existingPermissions.TryGetValue(rolePermission.PermissionCode, out existingPermission);
if (existingPermission != null)
{
// Menu the role already had: keep its original audit.
rolePermission.CreatedBy = existingPermission.CreatedBy;
rolePermission.CreatedDate = existingPermission.CreatedDate;
rolePermission.ApproveBy = existingPermission.ApproveBy;
rolePermission.ApproveDate = existingPermission.ApproveDate;
}
else
{
// Menu added by this change.
rolePermission.CreatedBy = makerID;
rolePermission.CreatedDate = DateTime.Now;
rolePermission.ApproveBy = null;
rolePermission.ApproveDate = null;
}
//if (oRole.RoleStatus == EnumAuthStatus.Approved ) //if (oRole.RoleStatus == EnumAuthStatus.Approved )
//{ //{
// if (rolePermission.Status == EnumAuthStatus.DeletedNotYetApprove) // if (rolePermission.Status == EnumAuthStatus.DeletedNotYetApprove)
@ -420,17 +391,6 @@ namespace HRM.DA
rolePermission.Status = EnumAuthStatus.Approved; rolePermission.Status = EnumAuthStatus.Approved;
else else
rolePermission.Status = EnumAuthStatus.None; rolePermission.Status = EnumAuthStatus.None;
// A menu approved by this approval (new, or still pending before it) gets this
// approver; a menu that was already approved keeps its earlier approver.
bool approvedNow = existingPermission == null
|| existingPermission.Status == EnumAuthStatus.NewNotYetApprove
|| existingPermission.Status == EnumAuthStatus.EditedNotYetApprove;
if (rolePermission.Status == EnumAuthStatus.Approved && approvedNow)
{
rolePermission.ApproveBy = oRole.ApproveBy;
rolePermission.ApproveDate = oRole.ApproveDate;
}
} }
else else
{ {

View File

@ -1,147 +0,0 @@
using Ease.Core.DataAccess;
using Ease.Core.Model;
using Ease.Core.Utility;
using System;
using System.Collections.Generic;
using System.Data;
using HRM.BO;
namespace HRM.DA
{
public class SystemAuditHistoryService : ServiceTemplate, ISystemAuditHistoryService
{
public SystemAuditHistoryService()
{
}
private void MapObject(SystemAuditHistory oItem, DataReader oReader)
{
oItem.AuditType = oReader.GetString("AuditType");
oItem.AuditDate = oReader.GetDateTime("AuditDate");
oItem.LoginID = oReader.GetString("LoginID");
oItem.Name = oReader.GetString("Name");
oItem.Code = oReader.GetString("Code");
oItem.UserType = UserTypeText(oReader.GetString("UserType"));
oItem.RoleName = oReader.GetString("RoleName");
oItem.RoleType = RoleTypeText(oReader.GetInt32("RoleType"));
oItem.MenuKey = oReader.GetString("MenuKey");
oItem.MenuName = oReader.GetString("MenuName");
oItem.AccessType = oReader.GetString("AccessType");
oItem.Activities = oReader.GetString("Activities");
oItem.ActionBy = oReader.GetInt32("ActionBy");
oItem.ActionByLoginID = oReader.GetString("ActionByLoginID");
oItem.ActionByName = oReader.GetString("ActionByName");
// Z_ROLE has no activities column: show the role's status, as the other triggers write it.
int? status = oReader.GetInt32("Status");
if (string.IsNullOrWhiteSpace(oItem.Activities) && status.HasValue)
oItem.Activities = StatusText(status.Value);
}
protected override T CreateObject<T>(DataReader oReader)
{
SystemAuditHistory oItem = new SystemAuditHistory();
MapObject(oItem, oReader);
return oItem as T;
}
// Same words the Z_ triggers write into "activities".
private static string StatusText(int status)
{
switch (status)
{
case 1: return "Active";
case 2: return "New Not Yet Approve";
case 3: return "Deleted Not Yet Approve";
case 4: return "Edited Not Yet Approve";
case 5: return "Approved";
case 6: return "Locked";
case 7: return "Archived";
case 8: return "Inactive";
case 9: return "Inactive Not Yet Approve";
case 10: return "Rejected";
default: return "None";
}
}
private static string RoleTypeText(int? roleType)
{
if (!roleType.HasValue)
return null;
switch ((EnumRoleType)roleType.Value)
{
case EnumRoleType.Admin: return "Admin";
case EnumRoleType.Self_Service: return "Self Service";
case EnumRoleType.Mobile: return "Mobile";
default: return roleType.Value.ToString();
}
}
// Z_USERS.usertype is the Users.UserType number as text.
private static string UserTypeText(string userType)
{
int value;
if (string.IsNullOrWhiteSpace(userType) || !int.TryParse(userType.Trim(), out value))
return userType;
switch ((EnumUserType)value)
{
case EnumUserType.SuperUser: return "Super User";
case EnumUserType.User: return "User";
case EnumUserType.Employee: return "Employee";
default: return userType;
}
}
#region Service implementation
public List<SystemAuditHistory> Get(EnumSystemAuditHistory type, DateTime dtFrom, DateTime dtTo)
{
List<SystemAuditHistory> items = new List<SystemAuditHistory>();
TransactionContext tc = null;
try
{
tc = TransactionContext.Begin();
IDataReader reader;
switch (type)
{
case EnumSystemAuditHistory.Role:
reader = SystemAuditHistoryDA.GetRole(tc, dtFrom, dtTo);
break;
case EnumSystemAuditHistory.RolePermission:
reader = SystemAuditHistoryDA.GetRolePermission(tc, dtFrom, dtTo);
break;
case EnumSystemAuditHistory.User:
reader = SystemAuditHistoryDA.GetUser(tc, dtFrom, dtTo);
break;
case EnumSystemAuditHistory.UserRole:
reader = SystemAuditHistoryDA.GetUserRole(tc, dtFrom, dtTo);
break;
case EnumSystemAuditHistory.UserAccessType:
reader = SystemAuditHistoryDA.GetUserAccessType(tc, dtFrom, dtTo);
break;
default:
throw new ArgumentException("Unknown audit history.");
}
DataReader dr = new DataReader(reader);
items = this.CreateObjects<SystemAuditHistory>(dr);
dr.Close();
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
return items;
}
#endregion
}
}

View File

@ -19,13 +19,6 @@ namespace HRM.DA
base.SetObjectID(oUserAccessType, oReader.GetInt32("UserAccessTypeID").Value); base.SetObjectID(oUserAccessType, oReader.GetInt32("UserAccessTypeID").Value);
oUserAccessType.PayrollTypeID = oReader.GetInt32("PayrollTypeID").Value; oUserAccessType.PayrollTypeID = oReader.GetInt32("PayrollTypeID").Value;
oUserAccessType.UserID = oReader.GetInt32("UserID", 0); oUserAccessType.UserID = oReader.GetInt32("UserID", 0);
oUserAccessType.AccessTypeStatus = (EnumAuthStatus)oReader.GetInt32("Status", (int)EnumAuthStatus.Approved);
oUserAccessType.CreatedBy = oReader.GetInt32("CreatedBy", 0);
oUserAccessType.CreatedDate = oReader.GetDateTime("CreatedDate", DateTime.MinValue);
oUserAccessType.ModifiedBy = oReader.GetInt32("ModifiedBy");
oUserAccessType.ModifiedDate = oReader.GetDateTime("ModifiedDate");
oUserAccessType.ApprovedBy = oReader.GetInt32("ApprovedBy");
oUserAccessType.ApprovedDate = oReader.GetDateTime("ApprovedDate");
this.SetObjectState(oUserAccessType, Ease.Core.ObjectState.Saved); this.SetObjectState(oUserAccessType, Ease.Core.ObjectState.Saved);
} }
@ -219,178 +212,6 @@ namespace HRM.DA
} }
} }
#region Maker-checker
public int RequestChange(int userID, List<int> payrollTypeIDs, int makerID)
{
TransactionContext tc = null;
int changed = 0;
try
{
tc = TransactionContext.Begin(true);
DataReader dr = new DataReader(UserAccessTypeDA.GetByUserID(tc, userID));
List<UserAccessType> current = this.CreateObjects<UserAccessType>(dr);
dr.Close();
if (current.Any(x => x.AccessTypeStatus == EnumAuthStatus.NewNotYetApprove
|| x.AccessTypeStatus == EnumAuthStatus.DeletedNotYetApprove))
{
throw new InvalidOperationException("This user already has an access change waiting for approval.");
}
DateTime now = DateTime.Now;
List<int> wanted = (payrollTypeIDs ?? new List<int>()).Distinct().ToList();
UserAccessTypeDA.SetAuditUser(tc, makerID);
// Newly ticked payroll type: requested, not live until approved.
foreach (int payrollTypeID in wanted.Where(p => !current.Any(c => c.PayrollTypeID == p)))
{
UserAccessType item = new UserAccessType();
item.UserID = userID;
item.PayrollTypeID = payrollTypeID;
item.AccessTypeStatus = EnumAuthStatus.NewNotYetApprove;
item.CreatedBy = makerID;
item.CreatedDate = now;
item.ApprovedBy = null;
item.ApprovedDate = null;
this.Save(tc, item);
changed++;
}
// Unticked live access: removal requested, still live until approved.
foreach (UserAccessType item in current.Where(c => !wanted.Contains(c.PayrollTypeID)))
{
UserAccessTypeDA.RequestRemoval(tc, item.ID, makerID, now);
changed++;
}
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
return changed;
}
public void Approve(int userID, int approverID)
{
TransactionContext tc = null;
try
{
tc = TransactionContext.Begin(true);
User oUser = new UserService().Get(tc, userID);
// Read before approving: the payroll types this approval newly gives access to.
List<string> newAccessNames = new List<string>();
DataReader dr = new DataReader(UserAccessTypeDA.GetPendingNewDescriptions(tc, userID));
while (dr.Read())
{
string name = dr.GetString("Description");
if (!string.IsNullOrWhiteSpace(name) && !newAccessNames.Contains(name))
newAccessNames.Add(name);
}
dr.Close();
UserAccessTypeDA.SetAuditUser(tc, approverID);
UserAccessTypeDA.Approve(tc, userID, approverID, DateTime.Now);
// The "access granted" notification now goes out when the access is really live.
if (oUser != null && oUser.EmployeeID.HasValue && newAccessNames.Any())
{
var notification = new EmployeeNotification
{
EmployeeID = oUser.EmployeeID.Value,
Header = "New Access Permission Granted",
Description = $"You have been granted access to: {string.Join(", ", newAccessNames)}.",
Link = "",
CreatedDate = DateTime.Now,
CreatedBy = approverID,
ReferenceID = oUser.ID,
IsRead = 0,
ReadDate = null,
ReadBy = null
};
new EmployeeNotificationService().Insert(tc, notification);
}
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
}
public List<UserAccessType> GetPending()
{
List<UserAccessType> items = new List<UserAccessType>();
TransactionContext tc = null;
try
{
tc = TransactionContext.Begin();
DataReader dr = new DataReader(UserAccessTypeDA.GetPending(tc));
while (dr.Read())
{
UserAccessType item = this.CreateObject<UserAccessType>(dr);
item.Description = dr.GetString("PayrollTypeName");
item.LoginID = dr.GetString("UserLoginID");
item.UserName = dr.GetString("UserFullName");
item.MakerLoginID = dr.GetString("MakerLoginID");
bool isRemoval = item.AccessTypeStatus == EnumAuthStatus.DeletedNotYetApprove;
item.MakerID = isRemoval ? (item.ModifiedBy ?? 0) : item.CreatedBy;
item.RequestDate = isRemoval
? item.ModifiedDate
: (item.CreatedDate == DateTime.MinValue ? (DateTime?)null : item.CreatedDate);
items.Add(item);
}
dr.Close();
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
return items;
}
public void Reject(int userID, int rejecterID)
{
TransactionContext tc = null;
try
{
tc = TransactionContext.Begin(true);
UserAccessTypeDA.SetAuditUser(tc, rejecterID);
UserAccessTypeDA.Reject(tc, userID);
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
}
#endregion
internal int Save(TransactionContext tc, UserAccessType oUserAccessType) internal int Save(TransactionContext tc, UserAccessType oUserAccessType)
{ {
try try

View File

@ -31,9 +31,6 @@ namespace HRM.DA
oUserRole.ApprovedComputerName = oReader.GetString("ApprovedComputerName"); oUserRole.ApprovedComputerName = oReader.GetString("ApprovedComputerName");
oUserRole.UserRoleStatus = (EnumAuthStatus)oReader.GetInt32("Status").Value; oUserRole.UserRoleStatus = (EnumAuthStatus)oReader.GetInt32("Status").Value;
oUserRole.employeeID = oReader.GetInt32("employeeID",true, 0) ==0? null: oReader.GetInt32("employeeID"); oUserRole.employeeID = oReader.GetInt32("employeeID",true, 0) ==0? null: oReader.GetInt32("employeeID");
// Only the list query (UserRoleDA.Get by role type) carries EmpPayrollTypeID: the employee's payroll type.
int empPayrollTypeID = oReader.GetInt32("EmpPayrollTypeID", true, 0);
oUserRole.payrollTypeID = empPayrollTypeID == 0 ? null : empPayrollTypeID;
oUserRole.loginIDView = oReader.GetString("LoginID", true, string.Empty); oUserRole.loginIDView = oReader.GetString("LoginID", true, string.Empty);
oUserRole.userNameView = oReader.GetString("userName", true, string.Empty); oUserRole.userNameView = oReader.GetString("userName", true, string.Empty);
oUserRole.roleNameView = oReader.GetString("roleName", true, string.Empty); oUserRole.roleNameView = oReader.GetString("roleName", true, string.Empty);
@ -440,467 +437,6 @@ namespace HRM.DA
// #endregion // #endregion
// } // }
//} //}
#region Maker-checker (Authentication > User Role Permission)
// UserRole.Status (UserRoleMakerChecker_DB_Changes.sql): Approved (5) = live; NewNotYetApprove (2) =
// given, not live until approved; DeletedNotYetApprove (3) = being taken away, still live until approved.
private static bool IsSelfService(UserRoleSubject subject)
{
return subject.RoleType == EnumRoleType.Self_Service;
}
private static bool IsPendingStatus(EnumAuthStatus status)
{
return status == EnumAuthStatus.NewNotYetApprove || status == EnumAuthStatus.DeletedNotYetApprove;
}
// The Self Service employee's login, if there is one: by EmployeeID first, then by
// LoginID = EmployeeNo (how older employee logins were made).
private User FindEmployeeLogin(int employeeID, string employeeNo)
{
UserService userService = new UserService();
User user = userService.Get(employeeID, EnumUserType.Employee);
if (user == null && !string.IsNullOrWhiteSpace(employeeNo))
{
User byLogin = userService.Get(employeeNo);
if (byLogin != null && byLogin.UserType == EnumUserType.Employee)
user = byLogin;
}
return user;
}
// UserRole rows as the maker-checker screens show them. A row waiting for approval becomes a request:
// Status 2 = give the role (maker CreatedBy, asked on EventDate), Status 3 = take it away (maker
// ModifiedBy, asked on ModifiedDate).
private List<UserRoleRequest> ReadRows(TransactionContext tc, bool pendingOnly, int? userID, EnumRoleType? roleType)
{
List<UserRoleRequest> items = new List<UserRoleRequest>();
DataReader dr = new DataReader(UserRoleDA.GetForMakerChecker(tc, pendingOnly, userID, roleType));
while (dr.Read())
{
UserRoleRequest item = new UserRoleRequest();
base.SetObjectID(item, dr.GetInt32("UserRoleID", 0));
item.Status = (EnumAuthStatus)dr.GetInt32("Status", (int)EnumAuthStatus.Approved);
bool isRemoval = item.Status == EnumAuthStatus.DeletedNotYetApprove;
item.RequestType = isRemoval ? EnumUserRoleRequestType.Remove : EnumUserRoleRequestType.Add;
item.RoleID = dr.GetInt32("RoleID", 0);
item.RoleType = (EnumRoleType)dr.GetInt32("RoleType", 0);
item.UserID = dr.GetInt32("UserID");
item.EmployeeID = dr.GetInt32("EmployeeID");
item.PayrollTypeID = dr.GetInt32("PayrollTypeID");
item.CreatedBy = isRemoval ? dr.GetInt32("ModifiedBy", 0) : dr.GetInt32("CreatedBy", 0);
item.CreatedDate = isRemoval
? dr.GetDateTime("ModifiedDate", DateTime.MinValue)
: dr.GetDateTime("EventDate", DateTime.MinValue);
item.RoleName = dr.GetString("RoleName");
item.LoginID = dr.GetString("LoginID");
item.PersonName = dr.GetString("PersonName");
item.EmployeeNo = dr.GetString("EmployeeNo");
item.MakerLoginID = dr.GetString("MakerLoginID");
this.SetObjectState(item, Ease.Core.ObjectState.Saved);
items.Add(item);
}
dr.Close();
return items;
}
public UserRoleState GetRoleState(UserRoleSubject subject)
{
UserRoleState state = new UserRoleState();
state.RoleType = subject.RoleType;
try
{
User login = null;
if (IsSelfService(subject))
{
int employeeID = subject.EmployeeID ?? 0;
Employee emp = null;
if (employeeID <= 0 && (subject.UserID ?? 0) > 0)
{
// Opened from the list by the employee's login: older logins have no EmployeeID and
// are tied to the employee only by LoginID = EmployeeNo.
User subjectLogin = new UserService().Get(subject.UserID.Value);
employeeID = subjectLogin?.EmployeeID ?? 0;
if (employeeID <= 0 && !string.IsNullOrWhiteSpace(subjectLogin?.LoginID))
emp = new EmployeeService().GetByEmployeeNo(subjectLogin.LoginID);
}
if (emp == null || emp.ID <= 0)
emp = new EmployeeService().Get(employeeID);
if (emp == null || emp.ID <= 0)
throw new InvalidOperationException("Employee not found.");
state.EmployeeID = emp.ID;
state.PayrollTypeID = emp.PayrollTypeID;
state.PersonName = emp.Name;
state.LoginID = emp.EmployeeNo;
login = FindEmployeeLogin(emp.ID, emp.EmployeeNo);
}
else
{
login = new UserService().Get(subject.UserID ?? 0);
if (login == null)
throw new InvalidOperationException("User not found.");
state.PersonName = login.UserName;
}
if (login != null)
{
state.UserID = login.ID;
state.LoginID = login.LoginID;
state.HasLogin = true;
state.LoginWaiting = login.UserStatus == EnumAuthStatus.NewNotYetApprove;
}
if (state.HasLogin)
{
TransactionContext tc = null;
try
{
tc = TransactionContext.Begin();
List<UserRoleRequest> rows = ReadRows(tc, false, state.UserID, subject.RoleType);
tc.End();
state.LiveRoleIDs = rows.Where(r => r.Status != EnumAuthStatus.NewNotYetApprove)
.Select(r => r.RoleID).Distinct().ToList();
state.Pending = rows.Where(r => IsPendingStatus(r.Status)).ToList();
}
catch
{
if (tc != null)
tc.HandleError();
throw;
}
}
}
catch (Exception e)
{
#region Handle Exception
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
return state;
}
public int RequestChange(UserRoleChangeRequest request, int makerID)
{
TransactionContext tc = null;
int changed = 0;
try
{
UserRoleState state = this.GetRoleState(request);
if (state.Pending.Count > 0)
throw new InvalidOperationException("This person already has a role change waiting for approval.");
List<int> live = state.LiveRoleIDs;
List<int> wanted = (request.RoleIDs ?? new List<int>()).Distinct().ToList();
List<int> adds = wanted.Where(r => !live.Contains(r)).ToList();
List<int> removes = live.Where(r => !wanted.Contains(r)).ToList();
if (adds.Count == 0 && removes.Count == 0)
return 0;
// A Self Service employee with no login gets one now, switched off (Status 2) until approved.
User newLogin = null;
if (IsSelfService(request) && !state.HasLogin)
{
Employee emp = new EmployeeService()
.GetByEmpIDs(state.EmployeeID.ToString(), request.PayrollTypeID ?? 0).FirstOrDefault();
if (emp == null)
throw new InvalidOperationException("Employee not found in the selected payroll type.");
newLogin = this.NewEmployeeLogin(emp, makerID);
}
DateTime now = DateTime.Now;
tc = TransactionContext.Begin(true);
// Checked again inside the transaction, with a lock: another maker may be sending a change for
// the same person at this very moment.
if (newLogin != null)
{
if (UserRoleDA.CountEmployeeLoginsLocked(tc, state.EmployeeID ?? 0) > 0)
throw new InvalidOperationException("Someone else has just sent a role change for this employee. Open the employee again to see it.");
}
else if (UserRoleDA.CountPendingLocked(tc, state.UserID ?? 0, request.RoleType) > 0)
{
throw new InvalidOperationException("This person already has a role change waiting for approval.");
}
int userID = state.UserID ?? 0;
if (newLogin != null)
userID = new UserService().Save(tc, newLogin);
foreach (int roleID in adds)
{
UserRoleDA.InsertPending(tc, tc.GenerateID("UserRole", "UserRoleID"), roleID, userID, makerID, now);
changed++;
}
if (removes.Count > 0)
{
// One row at a time (see UserRoleDA): every live row of each role being taken away.
foreach (UserRoleRequest row in ReadRows(tc, false, userID, request.RoleType)
.Where(r => r.Status != EnumAuthStatus.NewNotYetApprove && removes.Contains(r.RoleID)))
{
UserRoleDA.RequestRemoval(tc, row.ID, makerID, now);
}
changed += removes.Count;
}
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
return changed;
}
public void Approve(UserRoleSubject subject, int approverID)
{
TransactionContext tc = null;
User loginToMail = null;
try
{
UserRoleState state = this.GetRoleState(subject);
if (state.Pending.Count == 0)
throw new InvalidOperationException("No role change is waiting for approval.");
int userID = state.UserID.Value;
// A login made by the maker for a Self Service employee is switched on now, and mailed as before.
if (IsSelfService(subject) && state.LoginWaiting)
{
loginToMail = new UserService().Get(userID);
}
int? notifyEmployeeID = IsSelfService(subject) ? state.EmployeeID : new UserService().Get(userID)?.EmployeeID;
DateTime now = DateTime.Now;
tc = TransactionContext.Begin(true);
// One row at a time (see UserRoleDA): removals go, given roles become live.
foreach (UserRoleRequest row in state.Pending)
{
if (row.RequestType == EnumUserRoleRequestType.Remove)
UserRoleDA.DeleteRow(tc, row.ID);
else
UserRoleDA.ApproveRow(tc, row.ID, approverID, now);
}
if (loginToMail != null)
UserDA.UpdateStatus(tc, userID, EnumAuthStatus.Approved, approverID, now);
foreach (UserRoleRequest req in state.Pending.Where(p => p.RequestType == EnumUserRoleRequestType.Add))
this.NotifyRoleGranted(tc, subject.RoleType, notifyEmployeeID, req.RoleName, req.ID, approverID);
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
if (loginToMail != null)
this.MailNewEmployeeLogin(loginToMail);
}
public void Reject(UserRoleSubject subject, int approverID)
{
TransactionContext tc = null;
try
{
UserRoleState state = this.GetRoleState(subject);
if (state.Pending.Count == 0)
throw new InvalidOperationException("No role change is waiting for approval.");
int userID = state.UserID.Value;
tc = TransactionContext.Begin(true);
// One row at a time (see UserRoleDA): given roles go, removals stay live.
foreach (UserRoleRequest row in state.Pending)
{
if (row.RequestType == EnumUserRoleRequestType.Remove)
UserRoleDA.RestoreRow(tc, row.ID);
else
UserRoleDA.DeleteRow(tc, row.ID);
}
// A login the maker made for this change, never switched on and now without any role, goes too.
if (IsSelfService(subject) && state.LoginWaiting && UserRoleDA.CountByUser(tc, userID) == 0)
UserDA.Delete(tc, userID);
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
}
/// <summary>
/// User page rejected a new login (Status 2): its role changes waiting for approval are rejected too,
/// in the caller's transaction, exactly as User Role Permission's Reject does them (given roles go,
/// removals stay live), one row at a time (see UserRoleDA). Returns how many rows were decided.
/// </summary>
internal int RejectPendingRolesOfLogin(TransactionContext tc, int userID)
{
List<UserRoleRequest> pending = ReadRows(tc, true, userID, null);
foreach (UserRoleRequest row in pending)
{
if (row.RequestType == EnumUserRoleRequestType.Remove)
UserRoleDA.RestoreRow(tc, row.ID);
else
UserRoleDA.DeleteRow(tc, row.ID);
}
return pending.Count;
}
public List<UserRoleRequest> GetPending()
{
List<UserRoleRequest> items = new List<UserRoleRequest>();
TransactionContext tc = null;
try
{
tc = TransactionContext.Begin();
items = ReadRows(tc, true, null, null);
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
return items;
}
// The employee login the old Save created (same values), but switched off (Status 2) until the
// role change is approved.
private User NewEmployeeLogin(Employee emp, int parentUserID)
{
User userObject = new User();
userObject.LoginID = emp.EmployeeNo;
userObject.UserName = emp.Name;
userObject.Password = MakePassWord(emp.BirthDate);
userObject.ParentID = parentUserID;
userObject.PasswordHints = MakePassWord(emp.BirthDate);
userObject.EmployeeID = emp.ID;
userObject.Email = string.IsNullOrWhiteSpace(emp.EmailAddress) ? null : emp.EmailAddress.Trim();
userObject.UserStatus = EnumAuthStatus.NewNotYetApprove;
userObject.ChangePasswordAtNextLogon = true;
userObject.SISU = false;
userObject.CreatedDate = DateTime.Now;
userObject.UserType = EnumUserType.Employee;
return userObject;
}
// The "role assigned" notification the old Save sent, now sent when the role is really live.
private void NotifyRoleGranted(TransactionContext tc, EnumRoleType roleType, int? employeeID, string roleName,
int userRoleID, int approverID)
{
if (!employeeID.HasValue || (roleType != EnumRoleType.Self_Service && roleType != EnumRoleType.Admin))
return;
bool hasRoleName = !string.IsNullOrWhiteSpace(roleName);
string description = roleType == EnumRoleType.Admin
? (hasRoleName ? $"You have been granted Admin access with the role: {roleName}." : "You have been granted a new Admin role.")
: (hasRoleName ? $"You have been assigned to the Self Service role: {roleName}." : "You have been assigned a new Self Service role.");
// The menu is loaded at sign-in, so the new role shows from the next sign-in.
description += " Sign out and sign in again to see it in your menu.";
var notification = new EmployeeNotification
{
EmployeeID = employeeID.Value,
Header = roleType == EnumRoleType.Admin ? "New Admin Role Assigned" : "New Self Service Role Assigned",
Description = description,
Link = "",
CreatedDate = DateTime.Now,
CreatedBy = approverID,
ReferenceID = userRoleID,
IsRead = 0,
ReadDate = null,
ReadBy = null
};
new EmployeeNotificationService().Insert(tc, notification);
}
/// <summary>
/// Sends the existing employee login e-mail (MailNewLogin: Login ID + the birth-date password) when a
/// new Self Service employee login is switched on, from either page that can do it: User Role
/// Permission approval or User page approval. Sent only while the login still has that first
/// birth-date password, i.e. it was made by User Role Permission; any other login is left alone,
/// so a wrong password is never mailed. Never throws.
/// </summary>
internal void MailNewEmployeeLogin(User login)
{
try
{
if (login == null || login.UserType != EnumUserType.Employee)
return;
Employee emp = null;
if ((login.EmployeeID ?? 0) > 0)
emp = new EmployeeService().Get(login.EmployeeID.Value);
if ((emp == null || emp.ID <= 0) && !string.IsNullOrWhiteSpace(login.LoginID))
emp = new EmployeeService().GetByEmployeeNo(login.LoginID);
if (emp == null || emp.ID <= 0)
return;
string firstPassword = Ease.Core.Utility.Global.CipherFunctions.Encrypt("CeLiMiTeD.AdMIn", MakePassWord(emp.BirthDate));
if (login.Password != firstPassword)
return;
this.MailNewLogin(new List<Employee> { emp });
}
catch (Exception e)
{
ExceptionLog.Write(e);
}
}
// The login e-mail the old Save sent to newly created employee logins (now sent on approval).
private void MailNewLogin(List<Employee> oemps)
{
try
{
EmailSettings st = new EmailSettings();
var builder = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json");
IConfiguration Configuration = builder.Build();
Configuration.GetSection("EmailSettings").Bind(st);
foreach (Employee emp in oemps)
{
if (!string.IsNullOrWhiteSpace(emp.EmailAddress))
{
string password = MakePassWord(emp.BirthDate);
MailSender mailSender = new MailSender();
mailSender.AddTo(emp.EmailAddress);
mailSender.Subject = "Your HR software Login information";
mailSender.Body = @"Your HR software Login information are following.
<p> <b>Log-in ID : </b> " + emp.EmployeeNo + "</p>";
mailSender.Body += "<p> <b>Password : </b> " + password.Trim() + "</p>";
mailSender.ThreadSendMail(st);
}
}
}
catch (Exception e)
{
// The roles are already approved; a mail failure must not undo that.
ExceptionLog.Write(e);
}
}
#endregion
internal int Save(TransactionContext tc, UserRole oUserRole, int userRoleID) internal int Save(TransactionContext tc, UserRole oUserRole, int userRoleID)
{ {
try try

View File

@ -809,27 +809,15 @@ namespace HRM.DA
TransactionContext tc = null; TransactionContext tc = null;
try try
{ {
// The login as it is before this change: rejecting a new Employee login (Status 2) also rejects
// its role changes waiting in User Role Permission (below), so the two never disagree.
User before = this.Get(oUser.ID);
tc = TransactionContext.Begin(true); tc = TransactionContext.Begin(true);
UserDA.DoActiveAndIntacive(tc, oUser); UserDA.DoActiveAndIntacive(tc, oUser);
if (before != null && before.UserType == EnumUserType.Employee
&& before.UserStatus == EnumAuthStatus.NewNotYetApprove
&& oUser.UserStatus == EnumAuthStatus.Rejected)
{
new UserRoleService().RejectPendingRolesOfLogin(tc, oUser.ID);
}
tc.End(); tc.End();
} }
catch (Exception ex) catch (Exception ex)
{ {
if (tc != null)
tc.HandleError();
throw new Exception(ex.Message); throw new Exception(ex.Message);
} }
@ -1058,13 +1046,8 @@ namespace HRM.DA
public void Approve(User oUser) public void Approve(User oUser)
{ {
TransactionContext tc = null; TransactionContext tc = null;
User before = null;
try try
{ {
// The login as it is before this approval: a new login (Status 2) being switched on may need
// its login e-mail (below).
before = this.Get(oUser.ID);
tc = TransactionContext.Begin(true); tc = TransactionContext.Begin(true);
UserDA.Approve(tc, oUser); UserDA.Approve(tc, oUser);
tc.End(); tc.End();
@ -1078,14 +1061,6 @@ namespace HRM.DA
throw new ServiceException(e.Message, e); throw new ServiceException(e.Message, e);
#endregion #endregion
} }
// A new Self Service employee login (made by User Role Permission) approved here gets the same
// login e-mail it gets when its roles are approved first; MailNewEmployeeLogin decides and never throws.
if (before != null && before.UserStatus == EnumAuthStatus.NewNotYetApprove
&& oUser.UserStatus == EnumAuthStatus.Approved)
{
new UserRoleService().MailNewEmployeeLogin(before);
}
} }

View File

@ -1,174 +1,25 @@
import { Injectable, EventEmitter } from '@angular/core'; import { Injectable, EventEmitter } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; import { CanActivate, Router } from '@angular/router';
import { Observable, of } from 'rxjs';
import { catchError, map, shareReplay } from 'rxjs/operators';
import { AuthService } from '../_services/auth/auth.service'; import { AuthService } from '../_services/auth/auth.service';
import { HRMNotificationService } from '../app.notification.service';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class AuthGuard implements CanActivate, CanActivateChild { export class AuthGuard implements CanActivate {
public menuEvent: EventEmitter<boolean>; public menuEvent: EventEmitter<boolean>;
/** constructor(private authService: AuthService, private router: Router) {
* Pages every logged-in user may open even when they are not in the user's role menu:
* the home pages that login / the dashboard redirect to, and the forced change-password
* screen (shown before the menu is loaded). Keep these normalized (lower case, no slashes).
*/
private static readonly ALWAYS_ALLOWED: string[] = [
'',
'landing-page',
'ess/ess-dashboard',
'ess/landing-page',
'authentication/change-password',
];
/** Every link that exists in the master menu (all roles), cached per login token. */
private allMenuLinks$: Observable<string[] | null> = null;
private allMenuLinksToken: string = null;
constructor(private authService: AuthService, private router: Router,
private notificationService: HRMNotificationService) {
this.menuEvent = new EventEmitter(); this.menuEvent = new EventEmitter();
this.authService.logout$.subscribe(() => this.onLogout());
} }
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | boolean | UrlTree { canActivate(): boolean {
if (!this.authService.loggedIn()) { if (this.authService.loggedIn()) {
return true;
}
// this.alertify.error('You shall not pass!!!');
this.router.navigate(['/login']); this.router.navigate(['/login']);
// this.router.navigate(['']);
return false; return false;
} }
return this.checkMenuPermission(state.url);
}
canActivateChild(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | boolean | UrlTree {
return this.canActivate(route, state);
}
private checkMenuPermission(url: string): Observable<boolean | UrlTree> | boolean | UrlTree {
debugger;
const target = AuthGuard.normalize(url);
if (AuthGuard.ALWAYS_ALLOWED.indexOf(target) >= 0) {
return true;
}
const userLinks = this.collectLinks(this.getMenuList());
if (userLinks.some(l => AuthGuard.covers(l, target))) {
return true;
}
// The app uses HashLocationStrategy (#/...): editing / pasting a URL in the address bar
// does NOT reload the page, it fires a 'hashchange'/'popstate' navigation. So a direct hit
// is the very first navigation OR any navigation not started by the app's own code.
const trigger = this.router.getCurrentNavigation()?.trigger;
const isDirectHit = !this.router.navigated || trigger !== 'imperative';
if (isDirectHit) {
return this.isVisitedInApp(target) ? true : this.deny();
}
return this.getAllMenuLinks().pipe(
map(allLinks => {
debugger;
if (allLinks !== null && allLinks.some(l => AuthGuard.covers(l, target))) {
return this.deny();
}
// Not a menu screen (or master menu unavailable): allow and remember it.
this.rememberVisitedInApp(target);
return true;
})
);
}
private deny(): UrlTree {
this.notificationService.showError('You do not have permission to access this page.');
return this.router.createUrlTree(['/']);
}
/** Non-menu pages this user reached through in-app navigation, per browser tab. */
private static readonly VISITED_KEY = 'menuGuardVisited';
private getVisited(): { token: string, urls: string[] } {
const token = localStorage.getItem('token');
try {
const data = JSON.parse(sessionStorage.getItem(AuthGuard.VISITED_KEY));
if (data && data.token === token && Array.isArray(data.urls)) {
return data;
}
} catch { }
return { token: token, urls: [] };
}
private isVisitedInApp(target: string): boolean {
return this.getVisited().urls.indexOf(target) >= 0;
}
private rememberVisitedInApp(target: string): void {
const data = this.getVisited();
if (data.urls.indexOf(target) < 0) {
data.urls.push(target);
try { sessionStorage.setItem(AuthGuard.VISITED_KEY, JSON.stringify(data)); } catch { }
}
}
private getAllMenuLinks(): Observable<string[] | null> {
const token = localStorage.getItem('token');
if (this.allMenuLinks$ == null || this.allMenuLinksToken !== token) {
this.allMenuLinksToken = token;
const request$ = this.authService.getMenuesFromConfig().pipe(
map((items: any[]) => this.collectLinks(items)),
catchError(() => {
// Don't keep a failed result - retry on the next navigation.
this.resetMenuCache();
return of(null);
}),
shareReplay(1)
);
this.allMenuLinks$ = request$;
}
return this.allMenuLinks$;
}
private resetMenuCache(): void {
this.allMenuLinks$ = null;
this.allMenuLinksToken = null;
}
private onLogout(): void {
this.resetMenuCache();
sessionStorage.removeItem(AuthGuard.VISITED_KEY);
}
/** Flattens a menu tree (menuList) or a flat RolePermission list into normalized links. */
private collectLinks(items: any[]): string[] {
const links: string[] = [];
const walk = (nodes: any[]) => {
if (!Array.isArray(nodes)) { return; }
for (const node of nodes) {
if (node == null) { continue; }
const link = node.routerLink ?? node.link ?? node.Link;
if (typeof link === 'string') {
const normalized = AuthGuard.normalize(link);
if (normalized !== '') { // the dashboard link "/" must not cover every URL
links.push(normalized);
}
}
walk(node.items);
}
};
walk(items);
return links;
}
/** Lower case, decoded path without query string, fragment, matrix params or edge slashes. */
private static normalize(url: string): string {
let path = (url || '').split('?')[0].split('#')[0];
path = path.split('/').map(seg => seg.split(';')[0]).join('/');
try { path = decodeURIComponent(path); } catch { }
return path.replace(/^\/+|\/+$/g, '').toLowerCase();
}
/** True when the menu link is the target itself or a parent path of it (segment boundary). */
private static covers(link: string, target: string): boolean {
return target === link || target.startsWith(link + '/');
}
public getMenuList(): any { public getMenuList(): any {
return JSON.parse(localStorage.getItem('menuList')); return JSON.parse(localStorage.getItem('menuList'));
@ -188,8 +39,8 @@ export class AuthGuard implements CanActivate, CanActivateChild {
if (x.label === "") { if (x.label === "") {
if (x.items.length > 0) { if (x.items.length > 0) {
for (let i = 0; i < x.items.length; i++) { for (let i = 0; i < x.items.length; i++) {
if (x.items[i].label === "Dash-Board") { if (x.items[i].label === "Dashboard") {
x.label = "Dash-Board"; x.label = "Dashboard";
x.items = null; x.items = null;
x.routerLink = "/"; x.routerLink = "/";
break; break;
@ -202,6 +53,7 @@ export class AuthGuard implements CanActivate, CanActivateChild {
menuKey:menu.menuCode || '', menuKey:menu.menuCode || '',
label: menu.label || '', label: menu.label || '',
icon: menu.icon || null, icon: menu.icon || null,
dividerAfter: menu.dividerAfter || false,
routerLink: menu.routerLink || null, routerLink: menu.routerLink || null,
items: menu.items ? this.transformMenuData(menu.items) : null items: menu.items ? this.transformMenuData(menu.items) : null
})); }));

View File

@ -14,8 +14,5 @@ export class UserAccessType extends BaseObject
public description: string = ""; public description: string = "";
public userID: number; public userID: number;
public payrollTypeNameview: string; public payrollTypeNameview: string;
/** Approved (5) = live; New_Not_Yet_Approve (2) = requested, not live yet; Deleted_Not_Yet_Approve (3) = removal requested, still live. */
public accessTypeStatus: EnumAuthStatus; public accessTypeStatus: EnumAuthStatus;
public approvedBy?: number;
public approvedDate?: Date;
} }

View File

@ -48,59 +48,3 @@ export class UserRole extends BaseObject {
} }
// ---------- Maker-checker (Authentication > User Role Permission) ----------
/** What a role request asks for (EnumUserRoleRequestType on the server). */
export enum EnumUserRoleRequestType {
Add = 1,
Remove = 2,
}
/** Whose roles: an Admin user (userID) or a Self Service employee (employeeID + payrollTypeID). */
export class UserRoleSubject {
roleType: EnumRoleType;
userID?: number;
employeeID?: number;
payrollTypeID?: number;
}
/** Maker's request: the roles (of the subject's role type) the person should have. */
export class UserRoleChangeRequest extends UserRoleSubject {
roleIDs: number[] = [];
}
/** One UserRole row waiting for approval (Status 2 = give, 3 = take away); id is the UserRoleID. */
export class UserRoleRequest {
id: number;
requestType: EnumUserRoleRequestType;
roleID: number;
roleType: EnumRoleType;
userID?: number;
employeeID?: number;
payrollTypeID?: number;
status: EnumAuthStatus;
createdBy: number;
createdDate: Date;
roleName: string;
loginID: string;
personName: string;
employeeNo: string;
makerLoginID: string;
}
/** A person's roles of one role type, as the page shows them. */
export class UserRoleState {
roleType: EnumRoleType;
userID?: number;
employeeID?: number;
payrollTypeID?: number;
loginID: string;
personName: string;
/** False for a Self Service employee who has no login yet (one is made when a change is sent). */
hasLogin: boolean;
/** The login was made for a change still waiting for approval: it cannot sign in yet. */
loginWaiting: boolean;
liveRoleIDs: number[] = [];
pending: UserRoleRequest[] = [];
}

View File

@ -47,31 +47,3 @@ export class BadLoginAttemptInfo extends BaseObject {
this.userName = ''; this.userName = '';
} }
} }
/** Which change history the System Audit Log page asks for (HRM.BO EnumSystemAuditHistory). */
export enum EnumSystemAuditHistory {
Role = 1,
RolePermission = 2,
User = 3,
UserRole = 4,
UserAccessType = 5
}
/** One row of a page's change history (Z_ table), as returned by api/Authentication/getSystemAuditHistory. */
export interface SystemAuditHistory {
auditType: string;
auditDate: Date;
loginID: string;
name: string;
code: string;
userType: string;
roleName: string;
roleType: string;
menuKey: string;
menuName: string;
accessType: string;
activities: string;
actionBy: number;
actionByLoginID: string;
actionByName: string;
}

View File

@ -9,10 +9,10 @@ import { HRMNotificationService } from '../../app.notification.service';
import { Role, RolePermission } from '../../_models/Authentication/role'; import { Role, RolePermission } from '../../_models/Authentication/role';
import { SearchEmployee } from '../../_models/Employee/searchEmployee'; import { SearchEmployee } from '../../_models/Employee/searchEmployee';
import { PayrollType } from '../../_models/Authentication/payrollType'; import { PayrollType } from '../../_models/Authentication/payrollType';
import { UserRole, UserRoleChangeRequest, UserRoleRequest, UserRoleState, UserRoleSubject } from '../../_models/Authentication/UserRole'; import { UserRole } from '../../_models/Authentication/UserRole';
import { UserAccessType } from '../../_models/Authentication/UserAccessType'; import { UserAccessType } from '../../_models/Authentication/UserAccessType';
import { PasswordHistory } from '../../_models/Authentication/passwordHistory'; import { PasswordHistory } from '../../_models/Authentication/passwordHistory';
import { UserLogInInfo, BadLoginAttemptInfo, EnumSystemAuditHistory, SystemAuditHistory } from '../../_models/Authentication/auditTrail'; import { UserLogInInfo, BadLoginAttemptInfo } from '../../_models/Authentication/auditTrail';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { Bookmark } from '../../_models/Basic/bookmark'; import { Bookmark } from '../../_models/Basic/bookmark';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
@ -146,10 +146,6 @@ export class AuthService {
return this.apiService.httpGet<BadLoginAttemptInfo[]>('/Authentication/getBadLoginAuditTrail/' + return this.apiService.httpGet<BadLoginAttemptInfo[]>('/Authentication/getBadLoginAuditTrail/' +
this.apiService.getApiDateString(fromDate) + '/' + this.apiService.getApiDateString(toDate)); this.apiService.getApiDateString(fromDate) + '/' + this.apiService.getApiDateString(toDate));
} }
getSystemAuditHistory(type: EnumSystemAuditHistory, fromDate: Date, toDate: Date) {
return this.apiService.httpGet<SystemAuditHistory[]>('/Authentication/getSystemAuditHistory/' + type + '/' +
this.apiService.getApiDateString(fromDate) + '/' + this.apiService.getApiDateString(toDate));
}
getBookmarks() { getBookmarks() {
return this.apiService.httpGet<Bookmark[]>('/Authentication/getBookmarks'); return this.apiService.httpGet<Bookmark[]>('/Authentication/getBookmarks');
} }
@ -209,35 +205,6 @@ export class AuthService {
saveUserRole(params: any) { saveUserRole(params: any) {
return this.apiService.httpPost<number>('/Authentication/saveUserRole', params); return this.apiService.httpPost<number>('/Authentication/saveUserRole', params);
} }
// ---------- User Role Permission maker-checker ----------
/** True when this session is, or is linked to, a Super User login (may send role changes). */
CanMakeUserRoleChange() {
return this.apiService.httpGet<boolean>('/Authentication/CanMakeUserRoleChange');
}
GetUserRoleState(roleType: EnumRoleType, userID?: number, employeeID?: number) {
return this.apiService.httpGet<UserRoleState>('/Authentication/GetUserRoleState/' + roleType + '/'
+ (userID ?? 0) + '/' + (employeeID ?? 0));
}
SaveUserRoleRequest(request: UserRoleChangeRequest) {
return this.apiService.httpPost<boolean>('/Authentication/SaveUserRoleRequest', request);
}
ApproveUserRole(subject: UserRoleSubject) {
return this.apiService.httpPost<boolean>('/Authentication/ApproveUserRole', subject);
}
RejectUserRole(subject: UserRoleSubject) {
return this.apiService.httpPost<boolean>('/Authentication/RejectUserRole', subject);
}
/** Returns { done: number, failed: { index, message }[] } (index into the list sent). */
ApproveUserRoles(subjects: UserRoleSubject[]) {
return this.apiService.httpPost<any>('/Authentication/ApproveUserRoles', subjects);
}
/** Returns { done: number, failed: { index, message }[] } (index into the list sent). */
RejectUserRoles(subjects: UserRoleSubject[]) {
return this.apiService.httpPost<any>('/Authentication/RejectUserRoles', subjects);
}
GetPendingUserRoles() {
return this.apiService.httpGet<UserRoleRequest[]>('/Authentication/GetPendingUserRoles');
}
GetAllPayrollTypes() { GetAllPayrollTypes() {
return this.apiService.httpGet<PayrollType[]>('/Authentication/GetAllPayrollTypes'); return this.apiService.httpGet<PayrollType[]>('/Authentication/GetAllPayrollTypes');
} }
@ -264,23 +231,6 @@ export class AuthService {
return this.apiService.httpPost<boolean>('/Authentication/SaveUserAccessType', acesssTypes); return this.apiService.httpPost<boolean>('/Authentication/SaveUserAccessType', acesssTypes);
} }
ApproveUserAccessType(userID: number) {
return this.apiService.httpPost<boolean>('/Authentication/ApproveUserAccessType/' + userID, {});
}
RejectUserAccessType(userID: number) {
return this.apiService.httpPost<boolean>('/Authentication/RejectUserAccessType/' + userID, {});
}
GetPendingUserAccessTypes() {
return this.apiService.httpGet<UserAccessType[]>('/Authentication/GetPendingUserAccessTypes');
}
/** Returns { done: number, failed: { userID, message }[] }. */
ApproveUserAccessTypes(userIDs: number[]) {
return this.apiService.httpPost<any>('/Authentication/ApproveUserAccessTypes', userIDs);
}
/** Returns { done: number, failed: { userID, message }[] }. */
RejectUserAccessTypes(userIDs: number[]) {
return this.apiService.httpPost<any>('/Authentication/RejectUserAccessTypes', userIDs);
}
changePassword(userData: any) { changePassword(userData: any) {
return this.apiService.httpPost<any>('/Authentication/changePassword', userData); return this.apiService.httpPost<any>('/Authentication/changePassword', userData);
} }
@ -347,7 +297,4 @@ export class AuthService {
getIsFromUser(): boolean { getIsFromUser(): boolean {
return this.isFromUserSubject.value; return this.isFromUserSubject.value;
} }
CipherMechanism(userData: any) {
return this.apiService.httpPost<any>('/Authentication/CipherMechanism', userData);
}
} }

View File

@ -10,7 +10,6 @@ import { UserAccessTypeComponent } from './user-access-type/user-access-type.com
import {ChangePasswordComponent} from './change-password/change-password.component'; import {ChangePasswordComponent} from './change-password/change-password.component';
import { DataPermssionComponent } from './data-permssion/data-permssion.component'; import { DataPermssionComponent } from './data-permssion/data-permssion.component';
import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component'; import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component';
import { CipherEngineComponent } from './cipher-engine/cipher-engine.component';
@ -23,7 +22,6 @@ export const routes: Routes = [
{ path: 'change-password', component: ChangePasswordComponent, canActivate: [AuthGuard] }, { path: 'change-password', component: ChangePasswordComponent, canActivate: [AuthGuard] },
{ path: 'data-permssion', component: DataPermssionComponent, canActivate: [AuthGuard] }, { path: 'data-permssion', component: DataPermssionComponent, canActivate: [AuthGuard] },
{ path: 'system-auditlog', component: SystemAuditTrailComponent, canActivate: [AuthGuard] }, { path: 'system-auditlog', component: SystemAuditTrailComponent, canActivate: [AuthGuard] },
{ path: 'cipher-engine', component: CipherEngineComponent, canActivate: [AuthGuard] },
]; ];

View File

@ -110,7 +110,6 @@ import { KENDO_TREEVIEW } from '@progress/kendo-angular-treeview';
import { LayoutModule } from '@progress/kendo-angular-layout'; import { LayoutModule } from '@progress/kendo-angular-layout';
import { ExcelExportModule } from '@progress/kendo-angular-excel-export'; import { ExcelExportModule } from '@progress/kendo-angular-excel-export';
import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component'; import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component';
import { CipherEngineComponent } from './cipher-engine/cipher-engine.component';
@NgModule({ @NgModule({
@ -226,8 +225,7 @@ import { CipherEngineComponent } from './cipher-engine/cipher-engine.component';
ChangePasswordComponent, ChangePasswordComponent,
UserComponent, UserComponent,
DataPermssionComponent, DataPermssionComponent,
SystemAuditTrailComponent, SystemAuditTrailComponent
CipherEngineComponent
], ],
providers: [ providers: [
AppWindowPopUp, AppWindowPopUp,

View File

@ -1,34 +0,0 @@
<app-loading-panel> </app-loading-panel>
<div class="card grid marginBottomNone" style="margin: auto;">
<div class="col-12" style="margin: auto;">
<div class="textarea-wrapper">
<textarea [(ngModel)]="decryptedvalue"
rows="4" class="encryptTextArea"
placeholder="Enter text to encrypt..."></textarea>
<button *ngIf="decryptedvalue" type="button" class="clear-btn" title="clear" (click)="clearInput()">✖</button>
</div>
</div>
</div>
<div class="grid" style="margin: auto;">
<div class="col-12" style="margin: auto;" align="middle">
<div class="textarea-wrapper">
<button kendoButton themeColor="primary"
(click)="CipherMechanism()"
(keydown.enter)="handleEnterKey($event)"
[svgIcon]="apiService.KendoSVGIcon['forward']">Execute</button>
</div>
</div>
</div>
<div class="card grid" style="margin: auto;">
<div class="col-12" style="margin: auto;">
<div class="textarea-wrapper">
<textarea [(ngModel)]="encryptedValue" readonly="true" placeholder="Encrypt text will appear here..."
rows="6" class="decryptTextArea">
</textarea>
<button *ngIf="encryptedValue" [svgIcon]="apiService.KendoSVGIcon['copy']" kendoButton class="copy-btn" title="Copy" (click)="copyDecryptValueToClipboard()"></button>
</div>
</div>
</div>

View File

@ -1,61 +0,0 @@
.textarea-wrapper {
position: relative;
width: 100%;
}
textarea.encryptTextArea {
font-size: 1rem;
padding: 0.75rem 2.5rem 0.75rem 0.75rem;
border-radius: 0.5rem;
resize: none;
width: 100%;
height: 78%;
box-sizing: border-box;
}
textarea.decryptTextArea {
font-size: 1rem;
padding: 0.75rem 2.5rem 0.75rem 0.75rem;
border-radius: 0.5rem;
resize: none;
width: 100%;
height: 78%;
box-sizing: border-box;
font-weight: bold;
}
.clear-btn {
position: absolute;
right: 10px;
top: 50%;
transform: translateY(-50%);
background: transparent;
border: none;
cursor: pointer;
font-size: 1.2rem;
color: #888;
z-index: 10;
padding: 0;
line-height: 1;
}
.clear-btn:hover {
color: #333;
}
.copy-btn {
position: absolute;
right: 10px;
top: 17%;
transform: translateY(-50%);
background: transparent;
border: none;
cursor: pointer;
font-size: 1.2rem;
color: #888;
z-index: 10;
padding: 0;
line-height: 1;
}
.copy-btn:hover {
color: #333;
}
.marginBottomNone{
margin-bottom: 0px !important;
}

View File

@ -1,61 +0,0 @@
import { loadingPanelService } from './../../hrm-loding panel/loding.panel.service';
import {Component, OnInit} from '@angular/core';
import { AuthService } from 'src/app/_services/auth/auth.service';
import { ApiService } from 'src/app/app.api.service';
import { HRMNotificationService } from 'src/app/app.notification.service';
@Component({
selector: 'app-cipher-engine',
templateUrl: './cipher-engine.component.html',
styleUrl: './cipher-engine.component.scss',
standalone: false,
})
export class CipherEngineComponent implements OnInit{
constructor(public notificationService: HRMNotificationService,
public authService: AuthService, public apiService: ApiService,
public loadingPanelService : loadingPanelService) {
this.apiService.selectedMenuName = 'Cipher Engine';
}
decryptedvalue : any = "";
encryptedValue : any = "";
ngOnInit() {
this.decryptedvalue = "";
this.encryptedValue = "";
}
clearInput() {
this.decryptedvalue = "";
}
handleEnterKey(event: KeyboardEvent): void {
event.preventDefault();
if (this.encryptedValue?.trim()) {
}
}
CipherMechanism(){
if(!this.decryptedvalue){
this.notificationService.showWarning("Please enter text to encrypt first.");
return;
}
const data = {
decryptedvalue : this.decryptedvalue
}
this.loadingPanelService.ShowLoadingPanel = true;
this.authService.CipherMechanism(data).subscribe(
(resp: any) => {
this.encryptedValue = resp as string;
},
(err) => {
this.loadingPanelService.ShowLoadingPanel = false;
this.notificationService.showError(err.error);
},
() => {
this.loadingPanelService.ShowLoadingPanel = false;
});
}
copyDecryptValueToClipboard(){
if (!this.encryptedValue) return;
navigator.clipboard.writeText(this.encryptedValue).catch(() => {});
}
}

View File

@ -121,7 +121,7 @@ export class RolePermissionEntryComponent implements OnInit {
}, },
(err: any) => { (err: any) => {
//ON ERROR //ON ERROR
this.loadingpanelService.ShowLoadingPanel = false; this.loadingpanelService.ShowLoadingPanel = true;
}, },
() => { () => {
@ -378,7 +378,7 @@ export class RolePermissionEntryComponent implements OnInit {
(err: any) => { (err: any) => {
//ON ERROR //ON ERROR
this.loadingpanelService.ShowLoadingPanel = false; this.loadingpanelService.ShowLoadingPanel = false;
this.notificationService.showError(err.error); this.notificationService.showSuccess(err.error);
}, },
() => { () => {
this.loadingpanelService.ShowLoadingPanel = false; this.loadingpanelService.ShowLoadingPanel = false;

View File

@ -1,137 +1 @@
/* Table design matching the User page grid (users-list.component.scss). 
This component uses ViewEncapsulation.None, so every rule is scoped under .rl-grid. */
/* Uniform, compact rows */
.rl-grid .k-grid-table td {
padding-top: 4px;
padding-bottom: 4px;
vertical-align: middle;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.rl-grid .k-grid-toolbar {
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;
align-items: center;
gap: 6px;
padding: 2px 10px;
border-radius: 999px;
font-size: 12px;
font-weight: 600;
line-height: 20px;
white-space: nowrap;
}
.rl-grid .rl-badge__dot {
width: 6px;
height: 6px;
border-radius: 50%;
background: currentColor;
}
.rl-grid .rl-badge--success { background: #E6F4EC; color: #137A4B; }
.rl-grid .rl-badge--neutral { background: #EEEEF2; color: #5B5B6B; }
.rl-grid .rl-badge--warning { background: #FFF2DB; color: #8A5300; }
/* Role Type badge, same shape as the Status badge */
.rl-grid .rl-badge--admin { background: #E8EEFC; color: #2F4FB5; }
.rl-grid .rl-badge--ess { background: #F1EAFB; color: #6B3FA0; }
.rl-grid .rl-badge--mobile { background: #E4F5F7; color: #0F6E7A; }

View File

@ -1,48 +1,18 @@
<app-loading-panel></app-loading-panel>
<kendo-grid #rlGrid [kendoGridBinding]="gridView" <kendo-grid [data]="roles"
class="rl-grid"
kendoGridSelectBy="id" kendoGridSelectBy="id"
[pageSize]="20"
[pageable]="true" [pageable]="true"
[sortable]="true" [sortable]="true"
[filterable]="true"
[reorderable]="true" [reorderable]="true"
[resizable]="true" [resizable]="true"
[scrollable]="true" [scrollable]="true"
[columnMenu]="{ filter: true }" [columnMenu]="{ filter: true }"
(add)="addHandler()"> (add)="addHandler()">
<ng-template kendoGridToolbarTemplate> <ng-template kendoGridToolbarTemplate>
<div class="rl-toolbar"> <button themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['plus']" kendoGridAddCommand>Add new</button>
<div class="rl-toolbar__filters"> <input placeholder="Search in all columns..." kendoTextBox (input)="onFilter($event.target.value)" />
<input placeholder="Search in all columns..." kendoTextBox class="rl-search" (input)="onFilter($event.target.value)" /> <button kendoGridExcelCommand type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']" style="float:right;">Export to Excel</button>
<button kendoGridPDFCommand [svgIcon]="apiService.KendoSVGIcon['filePdf']" style="float:right;">Export to PDF</button>
<!-- Status chips (same as the User page): count, and click to filter the grid -->
<div class="rl-chips" role="group" aria-label="Filter by status">
<button type="button" class="rl-chip" [class.is-selected]="statusFilter === 'all'" (click)="setStatusFilter('all')">
All <span class="rl-chip__count">{{ roleCounts.all }}</span>
</button>
<button type="button" class="rl-chip" [class.is-selected]="statusFilter === 'active'" (click)="setStatusFilter('active')">
Active <span class="rl-chip__count">{{ roleCounts.active }}</span>
</button>
<button type="button" class="rl-chip rl-chip--pending" [class.is-selected]="statusFilter === 'pending'" (click)="setStatusFilter('pending')">
Pending approval <span class="rl-chip__count">{{ roleCounts.pending }}</span>
</button>
<button type="button" class="rl-chip" [class.is-selected]="statusFilter === 'inactive'" (click)="setStatusFilter('inactive')">
Inactive <span class="rl-chip__count">{{ roleCounts.inactive }}</span>
</button>
</div>
</div>
<div class="rl-toolbar__actions">
<!-- Plain buttons, not kendoGridExcelCommand/kendoGridPDFCommand: grid toolbar commands take the
focus on any toolbar click, which steals it from the search box. -->
<button kendoButton type="button" fillMode="outline"
[svgIcon]="apiService.KendoSVGIcon['fileExcel']" (click)="rlGrid.saveAsExcel()">Export to Excel</button>
<button kendoButton type="button" fillMode="outline"
[svgIcon]="apiService.KendoSVGIcon['filePdf']" (click)="rlGrid.saveAsPDF()">Export to PDF</button>
<button kendoButton type="button" themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['plus']" (click)="addHandler()">Add new</button>
</div>
</div>
</ng-template> </ng-template>
<kendo-grid-column field="code" title="Code"> <kendo-grid-column field="code" title="Code">
</kendo-grid-column> </kendo-grid-column>
@ -50,59 +20,21 @@
</kendo-grid-column> </kendo-grid-column>
<kendo-grid-column field="description" title="Description"> <kendo-grid-column field="description" title="Description">
</kendo-grid-column> </kendo-grid-column>
<kendo-grid-column field="roleType" title="Role Type">
<ng-template kendoGridCellTemplate let-dataItem>
<span class="rl-badge"
[class.rl-badge--admin]="dataItem.roleType == 1"
[class.rl-badge--ess]="dataItem.roleType == 2"
[class.rl-badge--mobile]="dataItem.roleType == 3"
[class.rl-badge--neutral]="dataItem.roleType != 1 && dataItem.roleType != 2 && dataItem.roleType != 3">
<span class="rl-badge__dot"></span>{{ roleTypeString(dataItem.roleType) }}
</span>
</ng-template>
</kendo-grid-column>
<kendo-grid-column field="roleStatus" title="Status"> <kendo-grid-column field="roleStatus" title="Status">
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex"> <ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
<span class="rl-badge" {{ statusString(dataItem.roleStatus)}}
[class.rl-badge--success]="statusString(dataItem.roleStatus) == 'Active'"
[class.rl-badge--warning]="dataItem.roleStatus == 2 || dataItem.roleStatus == 3 || dataItem.roleStatus == 4"
[class.rl-badge--neutral]="statusString(dataItem.roleStatus) == 'In-Active'">
<span class="rl-badge__dot"></span>{{ statusString(dataItem.roleStatus)}}
</span>
</ng-template> </ng-template>
</kendo-grid-column> </kendo-grid-column>
<kendo-grid-command-column title="Edit/Approve" width="220"> <kendo-grid-command-column title="Edit/Approve" width="220">
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex"> <ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
@if (dataItem.roleStatus ==1 || dataItem.roleStatus ==5) { @if (dataItem.roleStatus ==1 || dataItem.roleStatus ==5) {
<button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']" (click)="ViewPermission(roles.indexOf(dataItem));">Edit</button> <button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']" (click)="ViewPermission(rowIndex);">Edit</button>
} }
@if (dataItem.roleStatus !=1 && dataItem.roleStatus !=5) { @if (dataItem.roleStatus !=1 && dataItem.roleStatus !=5) {
<button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']" <button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']" (click)="Approve(rowIndex);">Approve</button>
[disabled]="isMakerOf(dataItem)"
[attr.title]="isMakerOf(dataItem) ? 'You made this change, so another user must approve it.' : null"
(click)="Approve(roles.indexOf(dataItem));">Approve</button>
} }
</ng-template> </ng-template>
</kendo-grid-command-column> </kendo-grid-command-column>
<kendo-grid-excel fileName="Roles.xlsx" [fetchData]="allData">
<kendo-excelexport-column field="code" title="Code" [width]="120"></kendo-excelexport-column>
<kendo-excelexport-column field="name" title="Name" [width]="200"></kendo-excelexport-column>
<kendo-excelexport-column field="description" title="Description" [width]="260"></kendo-excelexport-column>
<kendo-excelexport-column field="roleTypeText" title="Role Type" [width]="130"></kendo-excelexport-column>
<kendo-excelexport-column field="statusText" title="Status" [width]="110"></kendo-excelexport-column>
</kendo-grid-excel>
<kendo-grid-pdf fileName="Roles.pdf" [allPages]="true" [repeatHeaders]="true" paperSize="A4" [landscape]="true" [scale]="0.7">
<kendo-grid-column field="code" title="Code"></kendo-grid-column>
<kendo-grid-column field="name" title="Name"></kendo-grid-column>
<kendo-grid-column field="description" title="Description"></kendo-grid-column>
<kendo-grid-column field="roleType" title="Role Type">
<ng-template kendoGridCellTemplate let-dataItem>{{ roleTypeString(dataItem.roleType) }}</ng-template>
</kendo-grid-column>
<kendo-grid-column field="roleStatus" title="Status">
<ng-template kendoGridCellTemplate let-dataItem>{{ statusString(dataItem.roleStatus) }}</ng-template>
</kendo-grid-column>
</kendo-grid-pdf>
</kendo-grid> </kendo-grid>
@ -110,15 +42,14 @@
@if (showModal) { @if (showModal) {
<div class="blur-background"> <kendo-dialog (close)="onPopUpClose()" [minWidth]="650"
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650"> >
<kendo-dialog-titlebar> <kendo-dialog-titlebar>
Role Permission Role Permission
</kendo-dialog-titlebar> </kendo-dialog-titlebar>
<app-role-permission-entry [setviewMode]="viewMode" [setRole]="selectedRole" (saveCompleted)="saveCompleted($event)"> <app-role-permission-entry [setviewMode]="viewMode" [setRole]="selectedRole" (saveCompleted)="saveCompleted($event)">
</app-role-permission-entry> </app-role-permission-entry>
</kendo-dialog> </kendo-dialog>
</div>
} }
<!--<p-dialog [(visible)]="showModal" [style]="{width: '700px',height:'800px', position: 'absolute'}" header="Role Information" <!--<p-dialog [(visible)]="showModal" [style]="{width: '700px',height:'800px', position: 'absolute'}" header="Role Information"

View File

@ -1,14 +1,12 @@
import {Component, OnInit, ViewChild, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core'; import {Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';
import {process, State} from '@progress/kendo-data-query'; import {State} from '@progress/kendo-data-query';
import {DataBindingDirective, GridComponent} from '@progress/kendo-angular-grid'; 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 {AuthService} from '../../../_services/auth/auth.service';
import {Role} from '../../../_models/Authentication/role'; import {Role} from '../../../_models/Authentication/role';
import { HRMNotificationService } from '../../../app.notification.service'; import { HRMNotificationService } from '../../../app.notification.service';
import { UntilityHandlerService } from '../../../utility.hanldler.service'; import { UntilityHandlerService } from '../../../utility.hanldler.service';
import { ApiService } from '../../../app.api.service'; import { ApiService } from '../../../app.api.service';
import { EnumAuthStatus, EnumExtension, EnumRoleType } from '../../../_models/enums'; import { EnumAuthStatus } from '../../../_models/enums';
import { loadingPanelService } from '../../../hrm-loding panel/loding.panel.service';
import { ButtonModule } from '@progress/kendo-angular-buttons'; import { ButtonModule } from '@progress/kendo-angular-buttons';
import { DropDownListModule } from '@progress/kendo-angular-dropdowns'; import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
@ -28,90 +26,38 @@ import { DatePickerModule } from '@progress/kendo-angular-dateinputs';
// This blocks global css to this component // This blocks global css to this component
}) })
export class RolePermissionListComponent implements OnInit { export class RolePermissionListComponent implements OnInit {
@ViewChild(DataBindingDirective) dataBinding: DataBindingDirective;
@ViewChild(GridComponent) grid: GridComponent;
/** Rows the grid binds to: `roles` narrowed by the toolbar search box. Column filters, sort and paging are done by kendoGridBinding. */
gridView: Role[] = [];
searchText = '';
showModal: boolean; showModal: boolean;
IsNew = true; IsNew = true;
roles: Role[]; roles: Role[];
selectedRole: Role; selectedRole: Role;
viewMode: number =1; //1 new, 2 edit ,3 approve 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, constructor(public useService: AuthService,public apiService: ApiService,
public router: Router, public utilityService: UntilityHandlerService, public apiservice: ApiService, public router: Router, public utilityService: UntilityHandlerService, public apiservice: ApiService) {
public loadingPanel: loadingPanelService) {
this.setSelectableSettings(); this.setSelectableSettings();
this.loadingPanel.ShowLoadingPanel = true; this.utilityService.ShowLoadingPanel = true;
this.apiservice.selectedMenuName="Role Entry" this.apiservice.selectedMenuName="Role Entry"
this.allData = this.allData.bind(this);
} }
public ngOnInit(): void { public ngOnInit(): void {
this.selectedRole = new Role(); this.selectedRole = new Role();
this.showModal = false; this.showModal = false;
this.useService.GetCurrentUser().subscribe(
(resp: any) => {
this.currentUserID = resp?.userID;
},
);
this.load(); this.load();
} }
/** Logged-in user's ID: the maker of a pending role cannot approve it. */
currentUserID: number;
/**
* True when the logged-in user made the role's pending change: whoever last edited it, or its
* creator if it was never edited (same rule as the entry dialog and the server). Their Approve is disabled.
*/
isMakerOf(role: Role): boolean {
if (this.currentUserID == undefined || role == undefined) {
return false;
}
const makerID = (role.modifiedBy ?? 0) > 0 ? role.modifiedBy : role.createdBy;
return makerID == this.currentUserID;
}
load() { load() {
this.useService.getAllRoles() this.useService.getAllRoles()
.subscribe( .subscribe(
(resp: any) => { (resp: any) => {
debugger;
this.roles = resp; this.roles = resp;
this.refreshGridView();
}, },
(err: any) => { (err: any) => {
//ON ERROR //ON ERROR
console.log(err); console.log(err);
this.loadingPanel.ShowLoadingPanel = false; this.utilityService.ShowLoadingPanel = false;
}, },
() => { () => {
this.loadingPanel.ShowLoadingPanel = false; this.utilityService.ShowLoadingPanel = false;
} }
); );
@ -131,9 +77,6 @@ export class RolePermissionListComponent implements OnInit {
switch (status) { switch (status) {
case EnumAuthStatus.Active: { str = "Active"; break }; case EnumAuthStatus.Active: { str = "Active"; break };
case EnumAuthStatus.Approved: { str = "Active"; break }; case EnumAuthStatus.Approved: { str = "Active"; break };
case EnumAuthStatus.New_Not_Yet_Approve: { str = "New - Not Yet Approved"; break };
case EnumAuthStatus.Edited_Not_Yet_Approve: { str = "Edited - Not Yet Approved"; break };
case EnumAuthStatus.Deleted_Not_Yet_Approve: { str = "Deleted - Not Yet Approved"; break };
default: str="In-Active" default: str="In-Active"
} }
@ -161,77 +104,12 @@ export class RolePermissionListComponent implements OnInit {
this.roles[index] = role; this.roles[index] = role;
} }
this.refreshGridView();
} }
this.showModal = false; this.showModal = false;
} }
/**
* Excel export: every row the grid currently shows across all pages (not just the visible page),
* with Role Type and Status as text.
*/
public allData(): ExcelExportData {
const rows = process(this.gridView ?? [], {
filter: this.grid?.filter,
sort: this.grid?.sort,
}).data;
return {
data: rows.map((r: Role) => ({
code: r.code,
name: r.name,
description: r.description,
roleTypeText: this.roleTypeString(r.roleType),
statusText: this.statusString(r.roleStatus),
})),
};
}
/** Role Type column text, the same names the entry dialog's Role Type dropdown shows. */
roleTypeString(roleType: number): string {
return EnumExtension.getName(EnumRoleType, roleType);
}
/** Toolbar search box: keeps the roles whose code, name or description contain the text. */
public onFilter(value: string): void {
this.searchText = value ?? '';
this.refreshGridView();
if (this.dataBinding) {
this.dataBinding.skip = 0;
}
}
/** 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 = base;
return;
}
this.gridView = process(base, {
filter: {
logic: 'or',
filters: [
{field: 'code', operator: 'contains', value: term},
{field: 'name', operator: 'contains', value: term},
{field: 'description', operator: 'contains', value: term},
],
},
}).data;
}
public editHandler(rowIndex: any) { public editHandler(rowIndex: any) {
this.viewMode = 2; this.viewMode = 2;
this.selectedRole = this.roles[rowIndex]; this.selectedRole = this.roles[rowIndex];

View File

@ -1,36 +1,33 @@
<div class="sal-page">
<app-loading-panel></app-loading-panel> <app-loading-panel></app-loading-panel>
<!-- ── Page header ── --> <div class="card card-w-title audit-trail">
<section class="sal-card sal-header"> <kendo-tabstrip [keepTabContent]="true">
<span class="sal-header-ico"><i class="pi pi-shield"></i></span>
<div class="sal-header-text">
<h2>System Audit Log</h2>
<p>Who signed in, failed logins, and every change made on the Role, Role Permission, User, User Role and User Access Type pages.</p>
</div>
</section>
<kendo-tabstrip class="sal-tabs" [keepTabContent]="true" [scrollable]="true">
<!-- ── Tab 1: User Audit Trail (dbo.UserLoginInfo) ── --> <!-- ── Tab 1: User Audit Trail (dbo.UserLoginInfo) ── -->
<kendo-tabstrip-tab [selected]="true"> <kendo-tabstrip-tab title="User Audit Trail" [selected]="true">
<ng-template kendoTabTitle><i class="pi pi-sign-in"></i><span>User Audit Trail</span></ng-template>
<ng-template kendoTabContent> <ng-template kendoTabContent>
<section class="sal-card sal-body"> <div class="grid audit-trail-filter">
<div class="sal-filter"> <div class="col-12 md:col-1 audit-trail-label">
<div class="sal-field">
<label for="dtUserFrom">From Date</label> <label for="dtUserFrom">From Date</label>
<kendo-datepicker id="dtUserFrom" [(ngModel)]="userFromDate" [format]="'dd-MMM-yyyy'" [max]="userToDate"></kendo-datepicker>
</div> </div>
<div class="sal-field"> <div class="col-12 md:col-3">
<kendo-datepicker id="dtUserFrom" [(ngModel)]="userFromDate" [format]="'dd-MMM-yyyy'" [max]="userToDate"
style="width: 100%"></kendo-datepicker>
</div>
<div class="col-12 md:col-1 audit-trail-label">
<label for="dtUserTo">To Date</label> <label for="dtUserTo">To Date</label>
<kendo-datepicker id="dtUserTo" [(ngModel)]="userToDate" [format]="'dd-MMM-yyyy'" [min]="userFromDate"></kendo-datepicker>
</div> </div>
<button kendoButton themeColor="primary" class="sal-load" [svgIcon]="apiService.KendoSVGIcon['search']" <div class="col-12 md:col-3">
(click)="loadUserAuditTrail()">Load</button> <kendo-datepicker id="dtUserTo" [(ngModel)]="userToDate" [format]="'dd-MMM-yyyy'" [min]="userFromDate"
style="width: 100%"></kendo-datepicker>
</div>
<div class="col-12 md:col-2">
<button kendoButton themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['search']"
(click)="loadUserAuditTrail()" style="width: 100%;">Load</button>
</div>
</div> </div>
<kendo-grid #userGridRef class="sal-grid" <kendo-grid #userGridRef
[data]="userGrid.view" [data]="userGrid.view"
[skip]="userGrid.state.skip" [skip]="userGrid.state.skip"
[pageSize]="pageSize" [pageSize]="pageSize"
@ -45,13 +42,10 @@
(dataStateChange)="userGrid.onStateChange($event)"> (dataStateChange)="userGrid.onStateChange($event)">
<ng-template kendoGridToolbarTemplate> <ng-template kendoGridToolbarTemplate>
<span class="sal-search"> <input kendoTextBox class="audit-trail-search" placeholder="Search in all columns..."
<i class="pi pi-search"></i>
<input kendoTextBox placeholder="Search in all columns..."
[value]="userGrid.searchText" (input)="userGrid.onSearch($any($event.target).value)" /> [value]="userGrid.searchText" (input)="userGrid.onSearch($any($event.target).value)" />
</span> <span class="audit-trail-count">
<span class="sal-count"> {{ userGrid.filteredCount | number }} of {{ userGrid.rows.length | number }} records
<strong>{{ userGrid.filteredCount | number }}</strong>&nbsp;of {{ userGrid.rows.length | number }} records
</span> </span>
<kendo-grid-spacer></kendo-grid-spacer> <kendo-grid-spacer></kendo-grid-spacer>
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']" <button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']"
@ -69,10 +63,7 @@
<kendo-grid-column field="deviceId" title="Device ID" [width]="220"></kendo-grid-column> <kendo-grid-column field="deviceId" title="Device ID" [width]="220"></kendo-grid-column>
<ng-template kendoGridNoRecordsTemplate> <ng-template kendoGridNoRecordsTemplate>
<div class="sal-empty">
<i class="pi" [class.pi-inbox]="userGrid.loaded" [class.pi-calendar]="!userGrid.loaded"></i>
{{ userGrid.loaded ? 'No login found for this date range.' : 'Select a date range and press Load.' }} {{ userGrid.loaded ? 'No login found for this date range.' : 'Select a date range and press Load.' }}
</div>
</ng-template> </ng-template>
<kendo-grid-excel [fileName]="fileName('UserAuditTrail', userFromDate, userToDate, 'xlsx')" <kendo-grid-excel [fileName]="fileName('UserAuditTrail', userFromDate, userToDate, 'xlsx')"
@ -91,29 +82,34 @@
<kendo-grid-pdf-margin top="1cm" left="1cm" right="1cm" bottom="1cm"></kendo-grid-pdf-margin> <kendo-grid-pdf-margin top="1cm" left="1cm" right="1cm" bottom="1cm"></kendo-grid-pdf-margin>
</kendo-grid-pdf> </kendo-grid-pdf>
</kendo-grid> </kendo-grid>
</section>
</ng-template> </ng-template>
</kendo-tabstrip-tab> </kendo-tabstrip-tab>
<!-- ── Tab 2: Bad Login Attempt (dbo.BadLoginAttemptInfo) ── --> <!-- ── Tab 2: Bad Login Attempt (dbo.BadLoginAttemptInfo) ── -->
<kendo-tabstrip-tab> <kendo-tabstrip-tab title="Bad Login Attempt">
<ng-template kendoTabTitle><i class="pi pi-ban"></i><span>Bad Login Attempt</span></ng-template>
<ng-template kendoTabContent> <ng-template kendoTabContent>
<section class="sal-card sal-body"> <div class="grid audit-trail-filter">
<div class="sal-filter"> <div class="col-12 md:col-1 audit-trail-label">
<div class="sal-field">
<label for="dtBadFrom">From Date</label> <label for="dtBadFrom">From Date</label>
<kendo-datepicker id="dtBadFrom" [(ngModel)]="badFromDate" [format]="'dd-MMM-yyyy'" [max]="badToDate"></kendo-datepicker>
</div> </div>
<div class="sal-field"> <div class="col-12 md:col-3">
<kendo-datepicker id="dtBadFrom" [(ngModel)]="badFromDate" [format]="'dd-MMM-yyyy'" [max]="badToDate"
style="width: 100%"></kendo-datepicker>
</div>
<div class="col-12 md:col-1 audit-trail-label">
<label for="dtBadTo">To Date</label> <label for="dtBadTo">To Date</label>
<kendo-datepicker id="dtBadTo" [(ngModel)]="badToDate" [format]="'dd-MMM-yyyy'" [min]="badFromDate"></kendo-datepicker>
</div> </div>
<button kendoButton themeColor="primary" class="sal-load" [svgIcon]="apiService.KendoSVGIcon['search']" <div class="col-12 md:col-3">
(click)="loadBadLoginAttempts()">Load</button> <kendo-datepicker id="dtBadTo" [(ngModel)]="badToDate" [format]="'dd-MMM-yyyy'" [min]="badFromDate"
style="width: 100%"></kendo-datepicker>
</div>
<div class="col-12 md:col-2">
<button kendoButton themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['search']"
(click)="loadBadLoginAttempts()" style="width: 100%;">Load</button>
</div>
</div> </div>
<kendo-grid #badGridRef class="sal-grid" <kendo-grid #badGridRef
[data]="badGrid.view" [data]="badGrid.view"
[skip]="badGrid.state.skip" [skip]="badGrid.state.skip"
[pageSize]="pageSize" [pageSize]="pageSize"
@ -128,13 +124,10 @@
(dataStateChange)="badGrid.onStateChange($event)"> (dataStateChange)="badGrid.onStateChange($event)">
<ng-template kendoGridToolbarTemplate> <ng-template kendoGridToolbarTemplate>
<span class="sal-search"> <input kendoTextBox class="audit-trail-search" placeholder="Search in all columns..."
<i class="pi pi-search"></i>
<input kendoTextBox placeholder="Search in all columns..."
[value]="badGrid.searchText" (input)="badGrid.onSearch($any($event.target).value)" /> [value]="badGrid.searchText" (input)="badGrid.onSearch($any($event.target).value)" />
</span> <span class="audit-trail-count">
<span class="sal-count"> {{ badGrid.filteredCount | number }} of {{ badGrid.rows.length | number }} records
<strong>{{ badGrid.filteredCount | number }}</strong>&nbsp;of {{ badGrid.rows.length | number }} records
</span> </span>
<kendo-grid-spacer></kendo-grid-spacer> <kendo-grid-spacer></kendo-grid-spacer>
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']" <button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']"
@ -151,10 +144,7 @@
<kendo-grid-column field="deviceId" title="Device ID" [width]="220"></kendo-grid-column> <kendo-grid-column field="deviceId" title="Device ID" [width]="220"></kendo-grid-column>
<ng-template kendoGridNoRecordsTemplate> <ng-template kendoGridNoRecordsTemplate>
<div class="sal-empty">
<i class="pi" [class.pi-inbox]="badGrid.loaded" [class.pi-calendar]="!badGrid.loaded"></i>
{{ badGrid.loaded ? 'No bad login attempt found for this date range.' : 'Select a date range and press Load.' }} {{ badGrid.loaded ? 'No bad login attempt found for this date range.' : 'Select a date range and press Load.' }}
</div>
</ng-template> </ng-template>
<kendo-grid-excel [fileName]="fileName('BadLoginAttempt', badFromDate, badToDate, 'xlsx')" <kendo-grid-excel [fileName]="fileName('BadLoginAttempt', badFromDate, badToDate, 'xlsx')"
@ -172,98 +162,8 @@
<kendo-grid-pdf-margin top="1cm" left="1cm" right="1cm" bottom="1cm"></kendo-grid-pdf-margin> <kendo-grid-pdf-margin top="1cm" left="1cm" right="1cm" bottom="1cm"></kendo-grid-pdf-margin>
</kendo-grid-pdf> </kendo-grid-pdf>
</kendo-grid> </kendo-grid>
</section>
</ng-template> </ng-template>
</kendo-tabstrip-tab> </kendo-tabstrip-tab>
<!-- ── Tabs 3-7: change history of the Authentication pages (Z_ tables) ── -->
@for (tab of historyTabs; track tab.type) {
<kendo-tabstrip-tab>
<ng-template kendoTabTitle><i [class]="tab.icon"></i><span>{{ tab.title }}</span></ng-template>
<ng-template kendoTabContent>
<section class="sal-card sal-body">
<div class="sal-filter">
<div class="sal-field">
<label [for]="'dtHistFrom' + tab.type">From Date</label>
<kendo-datepicker [id]="'dtHistFrom' + tab.type" [(ngModel)]="tab.fromDate" [format]="'dd-MMM-yyyy'"
[max]="tab.toDate"></kendo-datepicker>
</div>
<div class="sal-field">
<label [for]="'dtHistTo' + tab.type">To Date</label>
<kendo-datepicker [id]="'dtHistTo' + tab.type" [(ngModel)]="tab.toDate" [format]="'dd-MMM-yyyy'"
[min]="tab.fromDate"></kendo-datepicker>
</div>
<button kendoButton themeColor="primary" class="sal-load" [svgIcon]="apiService.KendoSVGIcon['search']"
(click)="loadHistory(tab)">Load</button>
</div>
<kendo-grid #historyGridRef class="sal-grid"
[data]="tab.grid.view"
[skip]="tab.grid.state.skip"
[pageSize]="pageSize"
[sort]="tab.grid.state.sort"
[filter]="tab.grid.state.filter"
[sortable]="true"
filterable="menu"
scrollable="virtual"
[rowHeight]="36"
[height]="520"
[navigable]="true"
(dataStateChange)="tab.grid.onStateChange($event)">
<ng-template kendoGridToolbarTemplate>
<span class="sal-search">
<i class="pi pi-search"></i>
<input kendoTextBox placeholder="Search in all columns..."
[value]="tab.grid.searchText" (input)="tab.grid.onSearch($any($event.target).value)" />
</span>
<span class="sal-count">
<strong>{{ tab.grid.filteredCount | number }}</strong>&nbsp;of {{ tab.grid.rows.length | number }} records
</span>
<kendo-grid-spacer></kendo-grid-spacer>
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']"
(click)="exportExcel(historyGridRef, tab.grid)">Export to Excel</button>
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['filePdf']"
(click)="exportPdf(historyGridRef, tab.grid)">Export to PDF</button>
</ng-template>
@for (col of tab.allColumns; track col.field) {
@if (col.isDate) {
<kendo-grid-column [field]="col.field" [title]="col.title" [width]="col.width" filter="date"
[format]="gridDateFormat"></kendo-grid-column>
} @else {
<kendo-grid-column [field]="col.field" [title]="col.title" [width]="col.width"></kendo-grid-column>
}
}
<ng-template kendoGridNoRecordsTemplate>
<div class="sal-empty">
<i class="pi" [class.pi-inbox]="tab.grid.loaded" [class.pi-calendar]="!tab.grid.loaded"></i>
{{ tab.grid.loaded ? 'No change found for this date range.' : 'Select a date range and press Load.' }}
</div>
</ng-template>
<kendo-grid-excel [fileName]="fileName(tab.filePrefix, tab.fromDate, tab.toDate, 'xlsx')"
[fetchData]="tab.grid.allData">
@for (col of tab.allColumns; track col.field) {
@if (col.isDate) {
<kendo-excelexport-column [field]="col.field" [title]="col.title" [width]="col.width"
[cellOptions]="{ format: excelDateFormat }"></kendo-excelexport-column>
} @else {
<kendo-excelexport-column [field]="col.field" [title]="col.title" [width]="col.width"></kendo-excelexport-column>
}
}
</kendo-grid-excel>
<kendo-grid-pdf [fileName]="fileName(tab.filePrefix, tab.fromDate, tab.toDate, 'pdf')"
[allPages]="true" [repeatHeaders]="true" paperSize="A4" [landscape]="true" [scale]="0.7">
<kendo-grid-pdf-margin top="1cm" left="1cm" right="1cm" bottom="1cm"></kendo-grid-pdf-margin>
</kendo-grid-pdf>
</kendo-grid>
</section>
</ng-template>
</kendo-tabstrip-tab>
}
</kendo-tabstrip> </kendo-tabstrip>
</div> </div>

View File

@ -1,252 +1,18 @@
@use '../../../styles/abstracts/tokens' as *; .audit-trail-filter {
margin: 0.5rem 0 0.75rem;
// Tab colours: the same boxed tabs as Employee Bulk Upload (employee-bulk-upload.component.scss).
$sal-tab-text: #2C4A6B;
$sal-tab-bg: #F4F8FC;
$sal-tab-hover: #D8E4F0;
$sal-tab-border: #C9D8E8;
$sal-tab-active-border: #9DB4CC;
:host {
@include empcard-host-vars;
}
.sal-page {
position: relative;
display: flex;
flex-direction: column;
gap: 10px;
// The loading panel is not a card: keep it out of the flex gap (its overlay is absolute).
> app-loading-panel {
display: contents;
}
}
/* ── card shell ─────────────────────────────────────────────────── */
.sal-card {
background: var(--brand-card-bg);
border: 1px solid var(--brand-card-border);
border-radius: 20px;
box-shadow: var(--brand-card-shadow);
padding: 18px 20px;
position: relative;
}
/* ── page header ────────────────────────────────────────────────── */
.sal-header {
display: flex;
align-items: center; align-items: center;
gap: 14px;
} }
.sal-header-ico { .audit-trail-label {
flex: 0 0 auto; margin: auto;
width: 44px;
height: 44px;
border-radius: 12px;
display: flex;
align-items: center;
justify-content: center;
background: $sal-tab-hover;
color: $sal-tab-text;
i {
font-size: 1.35rem;
}
} }
.sal-header-text { .audit-trail-search {
min-width: 0;
h2 {
margin: 0;
font-size: 1.2rem;
font-weight: 700;
color: var(--brand-text);
}
p {
margin: 2px 0 0;
font-size: 0.85rem;
color: var(--brand-text-sub);
}
}
/* ── tabs ───────────────────────────────────────────────────────── */
/*
* Each tab a bordered box, the open one white with a blue top edge. The tab items are rendered
* by kendo-tabstrip, hence ::ng-deep.
*/
:host ::ng-deep kendo-tabstrip.sal-tabs {
border: 0;
background: transparent;
> .k-tabstrip-items-wrapper {
border-bottom: 1px solid #E2E8F0;
background: transparent;
}
> .k-tabstrip-items-wrapper .k-tabstrip-item {
display: inline-flex;
align-items: center;
margin: 0 6px -1px 0;
padding: 10px 16px;
border: 1px solid $sal-tab-border;
border-radius: 10px 10px 0 0;
background: $sal-tab-bg;
color: $sal-tab-text;
font-weight: 700;
white-space: nowrap;
transition: background .15s ease, border-color .15s ease;
&:hover {
background: $sal-tab-hover;
}
&.k-active {
background: #FFFFFF;
border-color: $sal-tab-active-border;
border-bottom-color: #FFFFFF;
box-shadow: inset 0 3px 0 $sal-tab-text;
}
.k-link {
display: inline-flex;
align-items: center;
gap: 8px;
padding: 0;
color: inherit;
}
}
// Scroll arrows when the tabs do not fit.
> .k-tabstrip-items-wrapper .k-tabstrip-prev,
> .k-tabstrip-items-wrapper .k-tabstrip-next {
color: $sal-tab-text;
}
> .k-tabstrip-content {
padding: 10px 0 0;
border: 0;
background: transparent;
&:focus,
&.k-focus {
outline: none;
box-shadow: none;
}
}
}
/* ── tab body: filter bar + grid ────────────────────────────────── */
.sal-body {
display: flex;
flex-direction: column;
gap: 14px;
}
.sal-filter {
display: flex;
flex-wrap: wrap;
align-items: flex-end;
gap: 12px 16px;
padding: 12px 14px;
border: 1px solid var(--brand-card-border);
border-radius: 14px;
background: $sal-tab-bg;
}
.sal-field {
display: flex;
flex-direction: column;
gap: 4px;
width: 220px;
label {
font-size: 0.78rem;
font-weight: 600;
letter-spacing: .02em;
text-transform: uppercase;
color: var(--brand-text-sub);
}
kendo-datepicker {
width: 100%;
}
@media (max-width: 576px) {
width: 100%;
}
}
.sal-load {
min-width: 120px;
@media (max-width: 576px) {
width: 100%;
}
}
:host ::ng-deep kendo-grid.sal-grid {
border-radius: 12px;
overflow: hidden;
.k-grid-toolbar {
gap: 10px;
padding: 10px 12px;
}
.k-grid-header .k-header {
font-weight: 700;
}
}
.sal-search {
position: relative;
display: inline-flex;
align-items: center;
width: 280px; width: 280px;
max-width: 100%;
i {
position: absolute;
left: 10px;
z-index: 1;
font-size: 0.85rem;
color: var(--brand-text-muted);
pointer-events: none;
} }
input { .audit-trail-count {
width: 100%; margin-left: 0.5rem;
padding-left: 30px; font-size: 0.875rem;
} opacity: 0.75;
}
.sal-count {
padding: 3px 10px;
border-radius: 999px;
background: $sal-tab-bg;
border: 1px solid $sal-tab-border;
font-size: 0.8rem;
color: $sal-tab-text;
white-space: nowrap;
strong {
font-weight: 700;
}
}
.sal-empty {
display: flex;
flex-direction: column;
align-items: center;
gap: 6px;
padding: 28px 0;
color: var(--brand-text-muted);
i {
font-size: 1.6rem;
}
} }

View File

@ -6,7 +6,7 @@ import { ApiService } from '../../app.api.service';
import { AuthService } from '../../_services/auth/auth.service'; import { AuthService } from '../../_services/auth/auth.service';
import { HRMNotificationService } from '../../app.notification.service'; import { HRMNotificationService } from '../../app.notification.service';
import { loadingPanelService } from '../../hrm-loding panel/loding.panel.service'; import { loadingPanelService } from '../../hrm-loding panel/loding.panel.service';
import { UserLogInInfo, BadLoginAttemptInfo, EnumSystemAuditHistory, SystemAuditHistory } from '../../_models/Authentication/auditTrail'; import { UserLogInInfo, BadLoginAttemptInfo } from '../../_models/Authentication/auditTrail';
/** Rows per virtual "page" - enough to fill the grid viewport a few times over. */ /** Rows per virtual "page" - enough to fill the grid viewport a few times over. */
const PAGE_SIZE = 60; const PAGE_SIZE = 60;
@ -24,48 +24,22 @@ export interface AuditTrailRow {
deviceId: string; deviceId: string;
} }
/** One row of a change-history grid (Z_ tables), the same shape for every history tab. */
export interface AuditHistoryRow {
auditDate: Date;
auditType: string;
loginID: string;
name: string;
code: string;
userType: string;
roleName: string;
roleType: string;
menu: string;
accessType: string;
activities: string;
actionBy: string;
}
/** A column of a change-history tab. */
export interface AuditHistoryColumn {
field: keyof AuditHistoryRow;
title: string;
width: number;
isDate?: boolean;
}
/** /**
* State of one audit-trail grid: all loaded rows, the toolbar search, and the * State of one audit-trail grid: all loaded rows, the toolbar search, and the
* grid's sort / filter / virtual-scroll state. Everything is done client side over * grid's sort / filter / virtual-scroll state. Everything is done client side over
* the rows of the selected date range. * the rows of the selected date range.
*/ */
export class AuditTrailGrid<T = AuditTrailRow> { export class AuditTrailGrid {
rows: T[] = []; rows: AuditTrailRow[] = [];
private searched: T[] = []; private searched: AuditTrailRow[] = [];
searchText = ''; searchText = '';
loaded = false; loaded = false;
state: State; state: State = { skip: 0, take: PAGE_SIZE, sort: [{ field: 'punchTime', dir: 'desc' }], filter: { logic: 'and', filters: [] } };
view: GridDataResult = { data: [], total: 0 }; view: GridDataResult = { data: [], total: 0 };
constructor(private searchFields: (keyof T)[], sortField: string = 'punchTime') { constructor(private searchFields: (keyof AuditTrailRow)[]) { }
this.state = { skip: 0, take: PAGE_SIZE, sort: [{ field: sortField, dir: 'desc' }], filter: { logic: 'and', filters: [] } };
}
setRows(rows: T[]): void { setRows(rows: AuditTrailRow[]): void {
this.rows = rows; this.rows = rows;
this.loaded = true; this.loaded = true;
this.state = { ...this.state, skip: 0 }; this.state = { ...this.state, skip: 0 };
@ -106,8 +80,8 @@ export class AuditTrailGrid<T = AuditTrailRow> {
this.view = process(this.searched, this.state); this.view = process(this.searched, this.state);
} }
private static searchValue<R>(row: R, field: keyof R): string { private static searchValue(row: AuditTrailRow, field: keyof AuditTrailRow): string {
const value: unknown = row[field]; const value = row[field];
if (value === undefined || value === null) { if (value === undefined || value === null) {
return ''; return '';
} }
@ -127,31 +101,6 @@ export class AuditTrailGrid<T = AuditTrailRow> {
} }
} }
/** One change-history tab: which Z_ table, its own columns, date range and grid state. */
export class AuditHistoryTab {
fromDate: Date;
toDate: Date;
readonly grid: AuditTrailGrid<AuditHistoryRow>;
/** Every column of the tab: when, what, the page's own columns, then the details and who. */
readonly allColumns: AuditHistoryColumn[];
constructor(public readonly type: EnumSystemAuditHistory,
public readonly title: string,
public readonly filePrefix: string,
columns: AuditHistoryColumn[],
/** PrimeIcons class shown in the tab title. */
public readonly icon: string) {
this.allColumns = [
{ field: 'auditDate', title: 'Date', width: 190, isDate: true },
{ field: 'auditType', title: 'Action', width: 200 },
...columns,
{ field: 'activities', title: 'Activities', width: 220 },
{ field: 'actionBy', title: 'Action By', width: 220 }
];
this.grid = new AuditTrailGrid<AuditHistoryRow>(this.allColumns.map(c => c.field), 'auditDate');
}
}
@Component({ @Component({
selector: 'app-system-audittrail', selector: 'app-system-audittrail',
templateUrl: './system.audittrail.component.html', templateUrl: './system.audittrail.component.html',
@ -173,33 +122,6 @@ export class SystemAuditTrailComponent implements OnInit {
badToDate: Date; badToDate: Date;
badGrid = new AuditTrailGrid(['loginID', 'punchTime', 'pcNumber', 'ipAddress', 'deviceId']); badGrid = new AuditTrailGrid(['loginID', 'punchTime', 'pcNumber', 'ipAddress', 'deviceId']);
/** Change-history tabs (Z_ tables), one per Authentication page. */
historyTabs: AuditHistoryTab[] = [
new AuditHistoryTab(EnumSystemAuditHistory.Role, 'Role History', 'RoleHistory', [
{ field: 'code', title: 'Role Code', width: 140 },
{ field: 'name', title: 'Role Name', width: 220 },
{ field: 'roleType', title: 'Role Type', width: 130 }
], 'pi pi-id-card'),
new AuditHistoryTab(EnumSystemAuditHistory.RolePermission, 'Role Permission History', 'RolePermissionHistory', [
{ field: 'roleName', title: 'Role', width: 200 },
{ field: 'menu', title: 'Menu', width: 260 }
], 'pi pi-key'),
new AuditHistoryTab(EnumSystemAuditHistory.User, 'User History', 'UserHistory', [
{ field: 'loginID', title: 'Login ID', width: 150 },
{ field: 'name', title: 'Name', width: 220 },
{ field: 'userType', title: 'User Type', width: 130 }
], 'pi pi-user'),
new AuditHistoryTab(EnumSystemAuditHistory.UserRole, 'User Role History', 'UserRoleHistory', [
{ field: 'code', title: 'Role Code', width: 140 },
{ field: 'roleName', title: 'Role Name', width: 220 }
], 'pi pi-users'),
new AuditHistoryTab(EnumSystemAuditHistory.UserAccessType, 'User Access Type History', 'UserAccessTypeHistory', [
{ field: 'loginID', title: 'Login ID', width: 150 },
{ field: 'name', title: 'Name', width: 220 },
{ field: 'accessType', title: 'Access Type', width: 200 }
], 'pi pi-sitemap')
];
constructor(public apiService: ApiService, constructor(public apiService: ApiService,
public authService: AuthService, public authService: AuthService,
public notificationService: HRMNotificationService, public notificationService: HRMNotificationService,
@ -217,10 +139,6 @@ export class SystemAuditTrailComponent implements OnInit {
this.userToDate = new Date(today); this.userToDate = new Date(today);
this.badFromDate = new Date(weekAgo); this.badFromDate = new Date(weekAgo);
this.badToDate = new Date(today); this.badToDate = new Date(today);
this.historyTabs.forEach(tab => {
tab.fromDate = new Date(weekAgo);
tab.toDate = new Date(today);
});
this.loadingPanel.ShowLoadingPanel = false; this.loadingPanel.ShowLoadingPanel = false;
} }
@ -276,44 +194,10 @@ export class SystemAuditTrailComponent implements OnInit {
}); });
} }
// -- Change-history tabs (Z_ tables) ---------------------------------------
loadHistory(tab: AuditHistoryTab): void {
if (!this.validDateRange(tab.fromDate, tab.toDate)) {
return;
}
this.loadingPanel.ShowLoadingPanel = true;
this.authService.getSystemAuditHistory(tab.type, tab.fromDate, tab.toDate).subscribe({
next: (items: SystemAuditHistory[]) => {
tab.grid.setRows((items ?? []).map(x => ({
auditDate: x.auditDate ? new Date(x.auditDate) : null,
auditType: x.auditType ?? '',
loginID: x.loginID ?? '',
name: x.name ?? '',
code: x.code ?? '',
userType: x.userType ?? '',
roleName: x.roleName ?? '',
roleType: x.roleType ?? '',
menu: x.menuName || x.menuKey || '',
accessType: x.accessType ?? '',
activities: (x.activities ?? '').trim(),
actionBy: x.actionByName
? x.actionByName + (x.actionByLoginID ? ' (' + x.actionByLoginID + ')' : '')
: (x.actionByLoginID ?? '')
})));
this.loadingPanel.ShowLoadingPanel = false;
},
error: (err) => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showError(err?.error ?? 'Could not load the ' + tab.title.toLowerCase() + '.');
}
});
}
// -- Shared ---------------------------------------------------------------- // -- Shared ----------------------------------------------------------------
/** PDF renders every row into the page first, so refuse it for very large results. */ /** PDF renders every row into the page first, so refuse it for very large results. */
exportPdf(grid: GridComponent, auditGrid: { filteredCount: number }): void { exportPdf(grid: GridComponent, auditGrid: AuditTrailGrid): void {
if (auditGrid.filteredCount === 0) { if (auditGrid.filteredCount === 0) {
this.notificationService.showError('There is no data to export.'); this.notificationService.showError('There is no data to export.');
return; return;
@ -326,7 +210,7 @@ export class SystemAuditTrailComponent implements OnInit {
grid.saveAsPDF(); grid.saveAsPDF();
} }
exportExcel(grid: GridComponent, auditGrid: { filteredCount: number }): void { exportExcel(grid: GridComponent, auditGrid: AuditTrailGrid): void {
if (auditGrid.filteredCount === 0) { if (auditGrid.filteredCount === 0) {
this.notificationService.showError('There is no data to export.'); this.notificationService.showError('There is no data to export.');
return; return;

View File

@ -1,233 +1 @@
.sc-page { 
/* padding: 1.5rem; */
}
.sc-header {
display: flex;
align-items: center;
gap: 14px;
margin-bottom: 0.5rem;
}
.sc-header-icon {
width: 44px;
height: 44px;
border-radius: 10px;
background: #f0f0f0;
display: flex;
align-items: center;
justify-content: center;
font-size: 20px;
color: #555;
flex-shrink: 0;
}
.sc-title {
font-size: 18px;
font-weight: 600;
color: #1a1a1a;
margin: 0 0 2px;
}
.sc-subtitle {
font-size: 13px;
color: #888;
margin: 0;
}
.sc-card {
background: #fff;
border: 1px solid #e8e8e8;
border-radius: 12px;
padding: 0.85rem;
}
.sc-field {
margin-bottom: 0.5rem;
}
.sc-label {
display: block;
font-size: 12px;
font-weight: 600;
color: #888;
text-transform: uppercase;
letter-spacing: 0.05em;
margin-bottom: 8px;
}
.sc-drop-zone {
border: 1.5px dashed #d4d4d4;
border-radius: 10px;
transition: border-color 0.15s, background 0.15s;
overflow: hidden;
}
.sc-drop-zone--dragging {
border-color: #4a90d9;
background: #f0f6fd;
}
.sc-drop-zone--has-file {
border-style: solid;
border-color: #c8e0f7;
background: #f7fbff;
}
.sc-drop-empty {
padding: 1rem 1rem;
text-align: center;
}
.sc-drop-icon {
font-size: 28px;
color: #bbb;
display: block;
margin-bottom: 10px;
}
.sc-drop-label {
font-size: 14px;
color: #777;
margin: 0 0 4px;
}
.sc-drop-hint {
font-size: 13px;
color: #aaa;
margin: 0 0 12px;
}
.sc-browse-btn {
display: inline-block;
padding: 6px 18px;
border: 1px solid #4a90d9;
border-radius: 6px;
font-size: 13px;
font-weight: 500;
color: #4a90d9;
cursor: pointer;
transition: background 0.15s;
}
.sc-browse-btn:hover {
background: #f0f6fd;
}
.sc-drop-selected {
padding: 12px 14px;
}
.sc-file-info {
display: flex;
align-items: center;
gap: 12px;
}
.sc-file-icon-wrap {
width: 38px;
height: 38px;
border-radius: 8px;
background: #e8f2fd;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
}
.sc-file-icon {
font-size: 18px;
color: #4a90d9;
}
.sc-file-details {
display: flex;
flex-direction: column;
flex: 1;
min-width: 0;
}
.sc-file-name {
font-size: 14px;
font-weight: 500;
color: #1a1a1a;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.sc-file-size {
font-size: 12px;
color: #aaa;
margin-top: 2px;
}
.sc-file-clear {
background: none;
border: none;
cursor: pointer;
color: #bbb;
padding: 4px;
display: flex;
align-items: center;
border-radius: 4px;
transition: color 0.15s, background 0.15s;
flex-shrink: 0;
}
.sc-file-clear:hover {
color: #e24b4a;
background: #fef0f0;
}
.sc-drop-restriction {
font-size: 12px;
color: #aaa;
margin-top: 6px;
}
.sc-drop-restriction code {
font-family: monospace;
background: #f4f4f4;
padding: 1px 5px;
border-radius: 4px;
font-size: 11px;
color: #666;
}
.sc-divider {
border: none;
border-top: 1px solid #f0f0f0;
margin: 1.25rem 0;
}
.sc-btn-row {
display: flex;
gap: 10px;
}
.sc-btn {
display: inline-flex;
align-items: center;
gap: 7px;
height: 38px;
padding: 0 18px;
border-radius: 8px;
font-size: 14px;
font-weight: 500;
cursor: pointer;
transition: background 0.15s, opacity 0.15s, transform 0.1s;
border: 1px solid transparent;
}
.sc-btn:active:not(:disabled) {
transform: scale(0.98);
}
.sc-btn:disabled {
opacity: 0.4;
cursor: not-allowed;
}
.sc-btn--primary {
background: #1a1a1a;
color: #fff;
border-color: #1a1a1a;
}
.sc-btn--primary:hover:not(:disabled) {
background: #333;
}
.sc-btn--secondary {
background: #fff;
color: #1a1a1a;
border-color: #ddd;
}
.sc-btn--secondary:hover:not(:disabled) {
background: #f7f7f7;
}
.sc-status {
display: flex;
align-items: center;
gap: 8px;
font-size: 13px;
margin-top: 14px;
padding: 10px 14px;
border-radius: 8px;
}
.sc-status--success {
background: #f0faf4;
color: #2e7d52;
border: 1px solid #c3e8d4;
}
.sc-status--error {
background: #fff5f5;
color: #c0392b;
border: 1px solid #f5c6c6;
}

View File

@ -1,118 +1,36 @@
<app-loading-panel> </app-loading-panel> <app-loading-panel> </app-loading-panel>
<div class="card card-w-title">
<div class="sc-page"> <div class="col-12">
<div class="col-12" style="font-weight: bold;color: red;">
<!-- Page header --> <label>Please select respective Configuration Type from the dropboox & choose file to upload the configuration type</label>
<div class="sc-header">
<div class="sc-header-icon">
<i class="pi pi-cog"></i>
</div> </div>
<div> <div class="col-12">
<h2 class="sc-title">System Configuration</h2> <div class="grid">
<p class="sc-subtitle">Upload or download XML configuration files</p> <div class="col-12">
<div class="example-wrapper">
<p>Configuration Type:</p>
</div> </div>
</div> </div>
<div class="col-3" style="margin: auto;">
<!-- Main card -->
<div class="sc-card">
<!-- Configuration type -->
<div class="sc-field">
<label class="sc-label" for="configTypeSelect">Configuration type</label>
<kendo-dropdownlist [(ngModel)]="fileTypeid" <kendo-dropdownlist [(ngModel)]="fileTypeid"
[data]="configtypes" [data]="configtypes"
[defaultItem]="{ name: 'Select a configuration type', value: null }" [defaultItem]="{ name: 'Select a configuration type', value: null }"
[textField]="'name'" [textField]="'name'"
[valueField]="'value'" [valueField]="'value'"
[valuePrimitive]="true" [valuePrimitive]="true"
id="configTypeSelect" style="width: 100%;"> id="itemid" style="width: 100%;">
</kendo-dropdownlist> </kendo-dropdownlist>
</div> </div>
<div class="col-7">
<!-- File upload drop zone --> <input id="fupEmpPhoto" kendoTextBox (change)="selectFile($event)" type="file" style="width: 100%;">
<div class="sc-field">
<label class="sc-label">Configuration file</label>
<div
class="sc-drop-zone"
[class.sc-drop-zone--dragging]="isDragging"
[class.sc-drop-zone--has-file]="selectedFileName"
(dragover)="onDragOver($event)"
(dragleave)="onDragLeave()"
(drop)="onDrop($event)">
<!-- Empty state -->
<div *ngIf="!selectedFileName" class="sc-drop-empty">
<i class="pi pi-upload sc-drop-icon"></i>
<p class="sc-drop-label">Drag & drop your XML file here</p>
<p class="sc-drop-hint">or</p>
<label class="sc-browse-btn" for="fileInputHidden">
Browse file
</label>
<input
id="fileInputHidden"
type="file"
accept=".xml"
(change)="selectFile($event)"
style="display:none">
</div> </div>
<div class="col-1" style="margin: auto;">
<!-- File selected state --> <button kendoButton themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['upload']" (click)="upload()" style="width: 100%;">upload</button>
<div *ngIf="selectedFileName" class="sc-drop-selected">
<div class="sc-file-info">
<div class="sc-file-icon-wrap">
<i class="pi pi-file sc-file-icon"></i>
</div> </div>
<div class="sc-file-details"> <div class="col-1" style="margin: auto;">
<span class="sc-file-name">{{ selectedFileName }}</span> <button kendoButton themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['download']" (click)="download()" style="width: 100%;">Download</button>
<span class="sc-file-size">{{ selectedFileSize }}</span>
</div>
<button class="sc-file-clear" (click)="clearFile()" title="Remove file" type="button">
<i class="pi pi-times"></i>
</button>
</div> </div>
</div> </div>
</div> </div>
<p class="sc-drop-restriction">Only <code>.xml</code> files are accepted</p>
</div>
<hr class="sc-divider">
<!-- Action buttons -->
<div class="sc-btn-row">
<button
class="sc-btn sc-btn--primary"
[disabled]="!canUpload"
(click)="upload()"
type="button">
<i class="pi pi-upload"></i>
Upload
</button>
<button
class="sc-btn sc-btn--secondary"
[disabled]="!canDownload"
(click)="download()"
type="button">
<i class="pi pi-download"></i>
Download
</button>
</div>
<!-- Status message -->
<div
*ngIf="statusType"
class="sc-status"
[class.sc-status--success]="statusType === 'success'"
[class.sc-status--error]="statusType === 'error'">
<i
class="pi"
[class.pi-check-circle]="statusType === 'success'"
[class.pi-times-circle]="statusType === 'error'">
</i>
<span>{{ statusMessage }}</span>
</div>
</div> </div>
</div> </div>

View File

@ -59,13 +59,6 @@ export class SystemConfigurationComponent implements OnInit {
_fromValidator: FormGroup; _fromValidator: FormGroup;
selectedFiles?: FileList; selectedFiles?: FileList;
// UI state for the redesigned template
public isDragging = false;
public selectedFileName = '';
public selectedFileSize = '';
public statusType: 'success' | 'error' | '' = '';
public statusMessage = '';
configtypes: any = EnumExtension.getNamesAndValues(EnumConfigurationType); configtypes: any = EnumExtension.getNamesAndValues(EnumConfigurationType);
constructor(public systemConfigService: SystemConfigurationService, constructor(public systemConfigService: SystemConfigurationService,
@ -167,14 +160,10 @@ export class SystemConfigurationComponent implements OnInit {
(err) => { (err) => {
this.loadingPanelService.ShowLoadingPanel = false; this.loadingPanelService.ShowLoadingPanel = false;
this.notificationService.showError(err.error); this.notificationService.showError(err.error);
this.statusType = 'error';
this.statusMessage = err.error;
}, },
() => { () => {
this.loadingPanelService.ShowLoadingPanel = false; this.loadingPanelService.ShowLoadingPanel = false;
this.notificationService.showSuccess("Data uploaded successfully.") this.notificationService.showSuccess("Data uploaded successfully.")
this.statusType = 'success';
this.statusMessage = 'File uploaded successfully.';
}); });
} }
@ -290,63 +279,12 @@ export class SystemConfigurationComponent implements OnInit {
selectFile(event: any): void { selectFile(event: any): void {
this.selectedFiles = event.target.files; this.selectedFiles = event.target.files;
if (this.selectedFiles && this.selectedFiles.length > 0) {
const file = this.selectedFiles.item(0);
this.selectedFileName = file.name;
this.selectedFileSize = this.formatFileSize(file.size);
this.statusType = '';
this.statusMessage = '';
}
//if (this.selectedFiles.length > 0) { //if (this.selectedFiles.length > 0) {
// const file: File | null = this.selectedFiles.item(0); // const file: File | null = this.selectedFiles.item(0);
// this.selectedFiles = file; // this.selectedFiles = file;
//} //}
} }
onDragOver(event: DragEvent): void {
event.preventDefault();
this.isDragging = true;
}
onDragLeave(): void {
this.isDragging = false;
}
onDrop(event: DragEvent): void {
event.preventDefault();
this.isDragging = false;
const files = event.dataTransfer?.files;
if (files && files.length > 0) {
const file = files[0];
if (!file.name.endsWith('.xml')) {
this.notificationService.showWarning('Only .xml files are accepted.');
return;
}
const dt = new DataTransfer();
dt.items.add(file);
this.selectedFiles = dt.files;
this.selectedFileName = file.name;
this.selectedFileSize = this.formatFileSize(file.size);
this.statusType = '';
this.statusMessage = '';
}
}
clearFile(): void {
this.selectedFiles = null;
this.selectedFileName = '';
this.selectedFileSize = '';
this.statusType = '';
this.statusMessage = '';
}
formatFileSize(bytes: number): string {
if (bytes < 1024) return bytes + ' B';
if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(1) + ' KB';
return (bytes / (1024 * 1024)).toFixed(1) + ' MB';
}
get canUpload(): boolean {
return !!this.fileTypeid && !!this.selectedFiles && this.selectedFiles.length > 0;
}
get canDownload(): boolean {
return !!this.fileTypeid;
}
public downloadFile(uid: string): void { public downloadFile(uid: string): void {
const temporiginalName = ''; const temporiginalName = '';
let tempName = ''; let tempName = '';

View File

@ -1,598 +1 @@
/* User Access Type page. This component uses ViewEncapsulation.None, so every rule carries the uat- prefix. 
Colours follow the app tokens (src/styles/abstracts/_tokens.scss) and the User / Role page badges. */
.uat-page {
display: flex;
flex-direction: column;
gap: 14px;
}
/* ---------- header ---------- */
.uat-header {
display: flex;
align-items: center;
gap: 14px;
}
.uat-header__icon {
width: 44px;
height: 44px;
border-radius: 10px;
background: #DEDEFF;
color: #414278;
display: flex;
align-items: center;
justify-content: center;
font-size: 20px;
flex-shrink: 0;
}
.uat-title {
margin: 0 0 2px;
font-size: 18px;
font-weight: 600;
color: #1a1a1a;
}
.uat-subtitle {
margin: 0;
font-size: 13px;
color: #888888;
}
/* ---------- view switch ---------- */
.uat-views {
display: inline-flex;
gap: 4px;
padding: 4px;
border: 1px solid #E3E3EC;
border-radius: 10px;
background: #FFFFFF;
align-self: flex-start;
}
.uat-view {
display: inline-flex;
align-items: center;
gap: 8px;
height: 34px;
padding: 0 14px;
border: none;
border-radius: 8px;
background: transparent;
color: #424242;
font: inherit;
font-size: 13px;
font-weight: 600;
cursor: pointer;
transition: background-color 0.15s, color 0.15s;
}
.uat-view:hover {
background: #F3F3FF;
}
.uat-view.is-active {
background: #52527A;
color: #FFFFFF;
}
.uat-view__count {
min-width: 20px;
padding: 0 6px;
border-radius: 999px;
background: #EEEEF2;
color: #5B5B6B;
font-size: 12px;
line-height: 18px;
text-align: center;
}
.uat-view__count.has-items {
background: #FFF2DB;
color: #8A5300;
}
.uat-view.is-active .uat-view__count {
background: rgba(255, 255, 255, 0.22);
color: #FFFFFF;
}
/* ---------- pending approvals table ---------- */
.uat-table-wrap {
border: 1px solid #E3E3EC;
border-radius: 10px;
overflow: auto;
max-height: 560px;
}
.uat-table {
width: 100%;
border-collapse: collapse;
font-size: 13px;
}
.uat-table th {
position: sticky;
top: 0;
z-index: 1;
background: #F7F7FB;
color: #666666;
font-size: 12px;
font-weight: 600;
text-align: left;
padding: 10px 12px;
border-bottom: 1px solid #E3E3EC;
white-space: nowrap;
}
.uat-table td {
padding: 10px 12px;
border-bottom: 1px solid #F0F0F4;
vertical-align: top;
}
.uat-table tbody tr:last-child td {
border-bottom: none;
}
.uat-table tbody tr:hover {
background: #F7F7FB;
}
.uat-table tbody tr.is-selected {
background: #F3F3FF;
}
.uat-table tbody tr.is-mine {
color: #888888;
}
.uat-table__check {
width: 40px;
text-align: center;
}
.uat-table__open {
width: 70px;
text-align: right;
}
.uat-block {
display: block;
}
.uat-mine {
margin-top: 4px;
}
/* ---------- layout ---------- */
.uat-layout {
display: grid;
grid-template-columns: 320px minmax(0, 1fr);
gap: 14px;
align-items: start;
}
.uat-main {
display: flex;
flex-direction: column;
gap: 14px;
min-width: 0;
}
.uat-card {
background: #FFFFFF;
border: 1px solid #E3E3EC;
border-radius: 12px;
padding: 16px;
}
.uat-card__title {
margin: 0 0 2px;
font-size: 15px;
font-weight: 600;
color: #1a1a1a;
}
/* Pending approvals table, "Requested by" cell: maker, date and "Your change" side by side */
.uat-requested {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 4px 10px;
}
/* Left column: user card, then the pending change card under it */
.uat-side {
display: flex;
flex-direction: column;
gap: 14px;
min-width: 0;
}
/* In the narrow left column the note sits above full-width buttons */
.uat-side .uat-pending__actions {
flex-direction: column;
align-items: stretch;
}
.uat-side .uat-pending__actions .uat-btns > button {
flex: 1;
}
/* "3 of 12 selected" next to the Payroll access title */
.uat-count {
display: inline-block;
margin-left: 8px;
padding: 0 10px;
border-radius: 999px;
background: #DEDEFF;
color: #414278;
font-size: 12px;
font-weight: 600;
line-height: 22px;
vertical-align: middle;
}
.uat-label {
display: block;
margin-bottom: 8px;
font-size: 12px;
font-weight: 600;
color: #888888;
text-transform: uppercase;
letter-spacing: 0.05em;
}
.uat-muted {
color: #888888;
font-size: 12px;
}
.uat-btns {
display: flex;
gap: 8px;
flex-wrap: wrap;
}
/* ---------- user card ---------- */
.uat-user__select {
width: 100%;
}
.uat-user__option {
display: flex;
flex-direction: column;
line-height: 1.3;
}
.uat-user__summary {
display: flex;
align-items: center;
gap: 12px;
margin-top: 16px;
}
.uat-avatar {
width: 40px;
height: 40px;
border-radius: 50%;
background: #52527A;
color: #FFFFFF;
display: flex;
align-items: center;
justify-content: center;
font-weight: 600;
flex-shrink: 0;
}
.uat-user__info {
display: flex;
flex-direction: column;
min-width: 0;
}
.uat-user__name {
font-weight: 600;
color: #1a1a1a;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.uat-stats {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
margin-top: 14px;
padding: 10px 12px;
border-radius: 10px;
background: #F7F7FB;
}
.uat-stat {
display: flex;
align-items: baseline;
gap: 6px;
}
.uat-stat__value {
font-size: 20px;
font-weight: 700;
color: #414278;
}
.uat-stat__label {
font-size: 12px;
color: #666666;
}
.uat-legend {
margin-top: 16px;
padding-top: 14px;
border-top: 1px solid #F0F0F4;
display: flex;
flex-direction: column;
gap: 8px;
}
.uat-legend__title {
font-size: 12px;
font-weight: 600;
color: #888888;
text-transform: uppercase;
letter-spacing: 0.05em;
}
.uat-legend__row {
display: flex;
flex-direction: column;
align-items: flex-start;
gap: 2px;
}
/* ---------- empty state ---------- */
.uat-empty {
padding: 48px 16px;
text-align: center;
}
.uat-empty__icon {
font-size: 32px;
color: #C9C9D6;
}
.uat-empty__title {
margin: 10px 0 4px;
font-weight: 600;
color: #424242;
}
/* ---------- pending change ---------- */
.uat-pending {
border-color: #F5D9A8;
background: #FFFAF0;
}
.uat-pending__head {
display: flex;
gap: 12px;
align-items: flex-start;
color: #8A5300;
}
.uat-pending__head > .pi {
font-size: 20px;
margin-top: 2px;
}
.uat-pending__title {
margin: 0 0 2px;
font-weight: 600;
font-size: 15px;
}
.uat-pending__text {
margin: 0;
font-size: 13px;
}
.uat-change {
margin-top: 12px;
}
.uat-change__label {
display: block;
margin-bottom: 6px;
font-size: 12px;
font-weight: 600;
color: #8A5300;
}
.uat-pending__actions {
margin-top: 16px;
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
gap: 10px;
}
.uat-pending__note {
font-size: 13px;
font-weight: 600;
color: #8A5300;
}
/* ---------- chips ---------- */
.uat-chips {
display: flex;
flex-wrap: wrap;
gap: 6px;
}
.uat-chip {
display: inline-flex;
align-items: center;
gap: 6px;
padding: 3px 10px;
border-radius: 999px;
font-size: 12px;
font-weight: 600;
line-height: 20px;
}
.uat-chip .pi {
font-size: 10px;
}
.uat-chip--add { background: #E6F4EC; color: #137A4B; }
.uat-chip--remove { background: #FDE8EA; color: #D11A2A; }
/* ---------- payroll type list ---------- */
.uat-list__head {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
gap: 10px;
margin-bottom: 12px;
}
.uat-list__tools {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 6px;
}
.uat-search {
width: 220px;
}
.uat-list {
border: 1px solid #E3E3EC;
border-radius: 10px;
overflow: hidden;
max-height: 579px;
overflow-y: auto;
}
.uat-row {
display: flex;
align-items: center;
gap: 12px;
margin: 0;
padding: 8px 14px;
border-bottom: 1px solid #F0F0F4;
cursor: pointer;
transition: background-color 0.15s;
}
.uat-row:last-child {
border-bottom: none;
}
.uat-row:hover {
background: #F7F7FB;
}
.uat-row.is-ticked {
background: #F3F3FF;
}
.uat-row__name {
flex: 1;
min-width: 0;
color: #1a1a1a;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.uat-list--locked .uat-row {
cursor: default;
}
.uat-list--locked .uat-row:hover {
background: inherit;
}
.uat-list--locked .uat-row.is-ticked:hover {
background: #F3F3FF;
}
.uat-list__empty {
padding: 24px 16px;
text-align: center;
}
/* ---------- save bar ---------- */
.uat-savebar {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
gap: 10px;
margin-top: 14px;
padding-top: 14px;
border-top: 1px solid #F0F0F4;
}
.uat-savebar__summary {
display: flex;
flex-wrap: wrap;
gap: 6px;
align-items: center;
}
/* ---------- badges / pills (same look as the User and Role pages) ---------- */
.uat-badge,
.uat-pill {
display: inline-flex;
align-items: center;
gap: 6px;
padding: 2px 10px;
border-radius: 999px;
font-size: 12px;
font-weight: 600;
line-height: 20px;
white-space: nowrap;
}
.uat-badge__dot {
width: 6px;
height: 6px;
border-radius: 50%;
background: currentColor;
}
.uat-badge--success,
.uat-pill--success { background: #E6F4EC; color: #137A4B; }
.uat-badge--warning,
.uat-pill--warning { background: #FFF2DB; color: #8A5300; }
.uat-badge--neutral { background: #EEEEF2; color: #5B5B6B; }
.uat-badge--info { background: #E8EEFC; color: #2F4FB5; }
@media (max-width: 900px) {
.uat-layout {
grid-template-columns: 1fr;
}
.uat-search {
width: 100%;
}
}

View File

@ -1,287 +1,50 @@
<app-loading-panel></app-loading-panel>
<div class="uat-page"> <div class="card">
<div class="grid form-group" style="margin: auto;">
<div class="col-12 md:col-1" style="margin: auto;">
<label for="idUser">Users</label>
</div>
<div class="col-12 md:col-5">
<!-- Page header --> <kendo-dropdownlist [data]="_users"
<div class="uat-header"> id="idUser"
<div class="uat-header__icon"><i class="pi pi-id-card"></i></div> [defaultItem]="{ name: 'select a User', id: null }"
<div>
<h2 class="uat-title">User Access Type</h2>
<p class="uat-subtitle">Choose which payroll types a user can work in. Every change is approved by another administrator before it takes effect.</p>
</div>
</div>
<!-- View switch -->
<div class="uat-views" role="tablist">
<button type="button" role="tab" class="uat-view" [class.is-active]="activeView === 'manage'" (click)="activeView = 'manage'">
<i class="pi pi-user-edit"></i> Manage access
</button>
<button type="button" role="tab" class="uat-view" [class.is-active]="activeView === 'pending'" (click)="activeView = 'pending'; loadPending()">
<i class="pi pi-clock"></i> Pending approvals
<span class="uat-view__count" [class.has-items]="pendingGroups.length > 0">{{ pendingGroups.length }}</span>
</button>
</div>
@if (activeView === 'pending') {
<div class="uat-card">
<div class="uat-list__head">
<div>
<p class="uat-card__title">Pending approvals</p>
<p class="uat-muted">Every user whose payroll access change is waiting for approval. Select several and approve or reject them at once.</p>
</div>
<button kendoButton type="button" fillMode="flat" [svgIcon]="apiService.KendoSVGIcon['arrowRotateCw']" (click)="loadPending()">Refresh</button>
</div>
@if (pendingGroups.length === 0) {
<div class="uat-empty">
<i class="pi pi-check-circle uat-empty__icon"></i>
<p class="uat-empty__title">Nothing to approve</p>
<p class="uat-muted">No user access change is waiting for approval.</p>
</div>
} @else {
<div class="uat-table-wrap">
<table class="uat-table">
<thead>
<tr>
<th class="uat-table__check">
<input type="checkbox" kendoCheckBox [checked]="allPendingSelected"
[disabled]="selectablePending.length === 0" (change)="toggleAllPending()" title="Select all" />
</th>
<th>User</th>
<th>Will get access to</th>
<th>Will lose access to</th>
<th>Requested by</th>
<th></th>
</tr>
</thead>
<tbody>
@for (g of pendingGroups; track g.userID) {
<tr [class.is-selected]="isPendingSelected(g.userID)" [class.is-mine]="g.isMine">
<td class="uat-table__check">
<input type="checkbox" kendoCheckBox [checked]="isPendingSelected(g.userID)" [disabled]="g.isMine"
(change)="togglePendingSelection(g.userID)"
[attr.title]="g.isMine ? 'You made this change; another administrator must decide it' : null" />
</td>
<td>
<span class="uat-user__name">{{ g.userName }}</span>
<span class="uat-muted uat-block">{{ g.loginID }}</span>
</td>
<td>
<div class="uat-chips">
@for (n of g.adds; track n) { <span class="uat-chip uat-chip--add"><i class="pi pi-plus"></i>{{ n }}</span> }
@if (g.adds.length === 0) { <span class="uat-muted">-</span> }
</div>
</td>
<td>
<div class="uat-chips">
@for (n of g.removes; track n) { <span class="uat-chip uat-chip--remove"><i class="pi pi-minus"></i>{{ n }}</span> }
@if (g.removes.length === 0) { <span class="uat-muted">-</span> }
</div>
</td>
<td>
<div class="uat-requested">
<span>{{ g.makers.join(', ') || '-' }}</span>
@if (g.requestDate) {
<span class="uat-muted">{{ g.requestDate | date: 'dd MMM yyyy, h:mm a' }}</span>
}
@if (g.isMine) {
<span class="uat-badge uat-badge--neutral"><span class="uat-badge__dot"></span>Your change</span>
}
</div>
</td>
<td class="uat-table__open">
<button kendoButton type="button" fillMode="flat" (click)="openPendingUser(g.userID)">Open</button>
</td>
</tr>
}
</tbody>
</table>
</div>
<div class="uat-savebar">
<div class="uat-savebar__summary">
<span class="uat-muted">{{ selectedPendingIDs.length }} of {{ selectablePending.length }} selected</span>
</div>
<div class="uat-btns">
<button kendoButton type="button" themeColor="error" fillMode="outline" [svgIcon]="apiService.KendoSVGIcon['cancel']"
[disabled]="selectedPendingIDs.length === 0" (click)="bulkReject()">Reject selected</button>
<button kendoButton type="button" themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['check']"
[disabled]="selectedPendingIDs.length === 0" (click)="bulkApprove()">Approve selected</button>
</div>
</div>
}
</div>
}
@if (activeView === 'manage') {
<div class="uat-layout">
<!-- Left: the user, and below it any change waiting for approval -->
<div class="uat-side">
<div class="uat-card uat-user">
<label class="uat-label" for="idUser">User</label>
<kendo-dropdownlist id="idUser"
[data]="filteredUsers"
[filterable]="true"
(filterChange)="onUserFilter($event)"
[defaultItem]="{ userName: 'Select a user', id: null }"
[textField]="'userName'" [textField]="'userName'"
[valueField]="'id'" [valueField]="'id'"
[valuePrimitive]="true" [valuePrimitive]="true"
[(ngModel)]="_selectedUserID" [(ngModel)]="_selectedUserID"
(valueChange)="RefreshGrid($event)" (valueChange)="RefreshGrid($event)"
class="uat-user__select"> class="form-control form-control-sm input-sm">
<ng-template kendoDropDownListItemTemplate let-dataItem>
<span class="uat-user__option">
<span>{{ dataItem?.userName }}</span>
@if (dataItem?.loginID) {
<span class="uat-muted">{{ dataItem.loginID }}</span>
}
</span>
</ng-template>
</kendo-dropdownlist> </kendo-dropdownlist>
</div>
@if (selectedUser) { <div class="col-12 md:col-6">
<div class="uat-user__summary"> </div>
<div class="uat-avatar">{{ (selectedUser.userName || '?').charAt(0) | uppercase }}</div>
<div class="uat-user__info">
<span class="uat-user__name">{{ selectedUser.userName }}</span>
<span class="uat-muted">{{ selectedUser.loginID }}</span>
</div> </div>
</div> </div>
<div class="uat-stats"> <div class="card card-w-title">
<div class="uat-stat"> <div class="grid">
<span class="uat-stat__value">{{ liveCount }}</span> <div class="col-12">
<span class="uat-stat__label">payroll types in use</span> <kendo-grid [kendoGridBinding]="_payrollTypes"
</div> kendoGridSelectBy="id"
<div class="uat-stat"> [selectable]="selectableSettings"
@if (hasPending) { [(selectedKeys)]="_selectedPayrollTypes"
<span class="uat-pill uat-pill--warning"><span class="uat-badge__dot"></span>Waiting for approval</span>
} @else {
<span class="uat-pill uat-pill--success"><span class="uat-badge__dot"></span>Up to date</span>
}
</div>
</div>
}
<div class="uat-legend"> >
<span class="uat-legend__title">Status</span> <kendo-grid-checkbox-column [width]="40"
<div class="uat-legend__row"><span class="uat-badge uat-badge--success"><span class="uat-badge__dot"></span>Active</span><span class="uat-muted">user can use it</span></div> [headerClass]="{'text-center': true}"
<div class="uat-legend__row"><span class="uat-badge uat-badge--warning"><span class="uat-badge__dot"></span>New - Not Yet Approved</span><span class="uat-muted">not usable until approved</span></div> [class]="{'text-center': true}"
<div class="uat-legend__row"><span class="uat-badge uat-badge--warning"><span class="uat-badge__dot"></span>Removal - Not Yet Approved</span><span class="uat-muted">still usable until approved</span></div> [resizable]="false"
[columnMenu]="false"
showSelectAll="true"></kendo-grid-checkbox-column>
<kendo-grid-column field="description" title="Access Type" [width]="220">
</kendo-grid-column>
</kendo-grid>
</div>
</div>
<div class="col-12">
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['save']" class="k-button k-primary" (click)="onSave()">Save</button>
</div> </div>
</div> </div>
<!-- A change waiting for approval -->
@if (selectedUser && hasPending) {
<div class="uat-card uat-pending">
<div class="uat-pending__head">
<i class="pi pi-clock"></i>
<div>
<p class="uat-pending__title">Change waiting for approval</p>
<p class="uat-pending__text">Until it is approved, {{ selectedUser.userName }} keeps the current access.</p>
</div>
</div>
@if (pendingAddNames.length > 0) {
<div class="uat-change">
<span class="uat-change__label">Will get access to</span>
<div class="uat-chips">
@for (n of pendingAddNames; track n) { <span class="uat-chip uat-chip--add"><i class="pi pi-plus"></i>{{ n }}</span> }
</div>
</div>
}
@if (pendingRemoveNames.length > 0) {
<div class="uat-change">
<span class="uat-change__label">Will lose access to</span>
<div class="uat-chips">
@for (n of pendingRemoveNames; track n) { <span class="uat-chip uat-chip--remove"><i class="pi pi-minus"></i>{{ n }}</span> }
</div>
</div>
}
<div class="uat-pending__actions">
@if (isMakerOfPending) {
<span class="uat-pending__note"><i class="pi pi-info-circle"></i> You made this change, so another administrator must approve or reject it.</span>
}
<div class="uat-btns">
<button kendoButton type="button" themeColor="error" fillMode="outline" [svgIcon]="apiService.KendoSVGIcon['cancel']"
[disabled]="isMakerOfPending" (click)="onReject()">Reject</button>
<button kendoButton type="button" themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['check']"
[disabled]="isMakerOfPending" (click)="onApprove()">Approve</button>
</div>
</div>
</div>
}
</div>
<!-- Right: the access -->
<div class="uat-main">
@if (!selectedUser) {
<div class="uat-card uat-empty">
<i class="pi pi-user uat-empty__icon"></i>
<p class="uat-empty__title">Select a user</p>
<p class="uat-muted">Their payroll access and any change waiting for approval will show here.</p>
</div>
} @else {
<!-- Payroll types -->
<div class="uat-card">
<div class="uat-list__head">
<div>
<p class="uat-card__title">
Payroll access
<span class="uat-count">{{ _selectedPayrollTypes.length }} of {{ _payrollTypes?.length || 0 }} selected</span>
</p>
<p class="uat-muted">{{ hasPending ? 'Locked while the change waits for approval.' : 'Tick the payroll types this user should have.' }}</p>
</div>
<div class="uat-list__tools">
<kendo-textbox class="uat-search" placeholder="Search payroll type" [clearButton]="true"
[value]="payrollSearch" (valueChange)="payrollSearch = $event ?? ''"></kendo-textbox>
@if (!hasPending) {
<button kendoButton type="button" fillMode="flat" (click)="selectAllVisible()">Select all</button>
<button kendoButton type="button" fillMode="flat" (click)="clearAllVisible()">Clear</button>
}
</div>
</div>
<div class="uat-list" [class.uat-list--locked]="hasPending">
@for (p of visiblePayrollTypes; track p.id) {
<label class="uat-row" [class.is-ticked]="isTicked(p.id)">
<input type="checkbox" kendoCheckBox [checked]="isTicked(p.id)" [disabled]="hasPending" (change)="toggle(p.id)" />
<span class="uat-row__name">{{ p.description }}</span>
<span class="uat-badge uat-badge--{{ rowBadge(p.id).tone }}">
<span class="uat-badge__dot"></span>{{ rowBadge(p.id).text }}
</span>
</label>
} @empty {
<div class="uat-list__empty uat-muted">No payroll type matches the search.</div>
}
</div>
<!-- Save bar -->
@if (!hasPending) {
<div class="uat-savebar">
<div class="uat-savebar__summary">
@if (hasDraftChanges) {
@if (draftAddNames.length > 0) { <span class="uat-chip uat-chip--add"><i class="pi pi-plus"></i>{{ draftAddNames.length }} to add</span> }
@if (draftRemoveNames.length > 0) { <span class="uat-chip uat-chip--remove"><i class="pi pi-minus"></i>{{ draftRemoveNames.length }} to remove</span> }
} @else {
<span class="uat-muted">No changes yet.</span>
}
</div>
<div class="uat-btns">
<button kendoButton type="button" fillMode="flat" [disabled]="!hasDraftChanges" (click)="resetSelection()">Reset</button>
<button kendoButton type="button" themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['paperPlane']"
[disabled]="!hasDraftChanges" (click)="onSave()">Send for approval</button>
</div>
</div>
}
</div>
}
</div>
</div>
}
</div>

View File

@ -9,7 +9,6 @@ import {EnumUserType, EnumAuthStatus} from '../../_models/enums';
import {SelectableSettings} from '@progress/kendo-angular-grid'; import {SelectableSettings} from '@progress/kendo-angular-grid';
import {ApiService} from '../../app.api.service'; import {ApiService} from '../../app.api.service';
import {HRMNotificationService} from '../../app.notification.service'; import {HRMNotificationService} from '../../app.notification.service';
import {loadingPanelService} from '../../hrm-loding panel/loding.panel.service';
import { ButtonModule } from '@progress/kendo-angular-buttons'; import { ButtonModule } from '@progress/kendo-angular-buttons';
import { DropDownListModule } from '@progress/kendo-angular-dropdowns'; import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
@ -39,30 +38,18 @@ export class UserAccessTypeComponent implements OnInit {
_selectedUserID: number; _selectedUserID: number;
_selectedPayrollTypes: number[]=[]; _selectedPayrollTypes: number[]=[];
public selectableSettings: SelectableSettings; public selectableSettings: SelectableSettings;
/** Logged-in user's ID: the maker of a pending change cannot approve or reject it. */
currentUserID: number;
constructor(public notificationService: HRMNotificationService, public useService: AuthService, public apiService: ApiService, constructor(public notificationService: HRMNotificationService, public useService: AuthService, public apiService: ApiService) {
public loadingPanel: loadingPanelService) {
this.apiService.selectedMenuName = ' User Access-Type Entry'; this.apiService.selectedMenuName = ' User Access-Type Entry';
} }
ngOnInit(): void { ngOnInit(): void {
this._selectedUserID = undefined; this._selectedUserID = undefined;
this._selectedPayrollTypes = []; this._selectedPayrollTypes = [];
this._userAcessTypes = [];
this.useService.GetCurrentUser().subscribe(
(resp: any) => {
this.currentUserID = resp?.userID;
// After the current user is known, so "your own change" can be marked.
this.loadPending();
},
);
this.useService.GetUsers(EnumUserType.User) this.useService.GetUsers(EnumUserType.User)
.subscribe( .subscribe(
(resp: any) => { (resp: any) => {
this._users = resp; this._users = resp;
this.filteredUsers = (resp ?? []).slice();
}, },
(err: any) => { (err: any) => {
//ON ERROR //ON ERROR
@ -91,153 +78,6 @@ export class UserAccessTypeComponent implements OnInit {
this.setSelectableSettings(); this.setSelectableSettings();
} }
// ---------- Pending approvals (many users at once) ----------
/** Which view the page shows. */
activeView: 'manage' | 'pending' = 'manage';
/** One entry per user with a change waiting for approval. */
pendingGroups: {
userID: number, userName: string, loginID: string,
adds: string[], removes: string[], makers: string[], requestDate: Date, isMine: boolean,
}[] = [];
selectedPendingIDs: number[] = [];
loadPending(): void {
this.useService.GetPendingUserAccessTypes().subscribe(
(rows: any[]) => {
const groups = new Map<number, any>();
(rows ?? []).forEach(r => {
let g = groups.get(r.userID);
if (!g) {
g = { userID: r.userID, userName: r.userName, loginID: r.loginID,
adds: [], removes: [], makers: [], makerIDs: [], requestDate: null, isMine: false };
groups.set(r.userID, g);
}
if (r.accessTypeStatus == EnumAuthStatus.Deleted_Not_Yet_Approve) {
g.removes.push(r.description);
} else {
g.adds.push(r.description);
}
const maker = r.makerLoginID || (r.makerID ? '#' + r.makerID : '');
if (maker && !g.makers.includes(maker)) {
g.makers.push(maker);
}
if (r.makerID && !g.makerIDs.includes(r.makerID)) {
g.makerIDs.push(r.makerID);
}
const d = r.requestDate ? new Date(r.requestDate) : null;
if (d && (!g.requestDate || d > g.requestDate)) {
g.requestDate = d;
}
});
this.pendingGroups = Array.from(groups.values()).map(g => ({
...g, isMine: g.makerIDs.includes(this.currentUserID),
}));
// Keep only selections that are still pending and selectable.
this.selectedPendingIDs = this.selectedPendingIDs.filter(id =>
this.pendingGroups.some(g => g.userID == id && !g.isMine));
},
(err: any) => {
this.pendingGroups = [];
}
);
}
/** Pending users the logged-in user may decide (not their own changes). */
get selectablePending() {
return this.pendingGroups.filter(g => !g.isMine);
}
isPendingSelected(userID: number): boolean {
return this.selectedPendingIDs.includes(userID);
}
togglePendingSelection(userID: number): void {
const g = this.pendingGroups.find(x => x.userID == userID);
if (!g || g.isMine) {
return;
}
this.selectedPendingIDs = this.isPendingSelected(userID)
? this.selectedPendingIDs.filter(x => x != userID)
: [...this.selectedPendingIDs, userID];
}
get allPendingSelected(): boolean {
return this.selectablePending.length > 0 && this.selectablePending.every(g => this.isPendingSelected(g.userID));
}
toggleAllPending(): void {
this.selectedPendingIDs = this.allPendingSelected ? [] : this.selectablePending.map(g => g.userID);
}
/** Opens one pending user in the Manage access view. */
openPendingUser(userID: number): void {
this.activeView = 'manage';
this._selectedUserID = userID;
this.RefreshGrid(userID);
}
bulkApprove(): void {
this.bulkDecide(true);
}
bulkReject(): void {
this.bulkDecide(false);
}
private bulkDecide(approve: boolean): void {
const ids = this.selectedPendingIDs.slice();
if (ids.length == 0) {
this.notificationService.showWarning('Select at least one user.');
return;
}
const count = ids.length + (ids.length == 1 ? ' user' : ' users');
const question = approve
? `Are you sure you want to approve the access changes of ${count}?`
: `Are you sure you want to reject the access changes of ${count}?`;
this.notificationService.showActiveConfirm('Confirmation', question).then((isConfirmed) => {
if (isConfirmed) {
this.sendBulkDecision(approve, ids);
}
});
}
private sendBulkDecision(approve: boolean, ids: number[]): void {
const call = approve ? this.useService.ApproveUserAccessTypes(ids) : this.useService.RejectUserAccessTypes(ids);
let result: any;
this.loadingPanel.ShowLoadingPanel = true;
call.subscribe(
(resp: any) => {
result = resp;
},
(err: any) => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showError(err?.error ?? err);
},
() => {
this.loadingPanel.ShowLoadingPanel = false;
const done = result?.done ?? 0;
const failed: any[] = result?.failed ?? [];
if (done > 0) {
this.notificationService.showSuccess(
(approve ? 'Approved' : 'Rejected') + ' for ' + done + (done == 1 ? ' user.' : ' users.'));
}
if (failed.length > 0) {
const names = failed.map(f => {
const g = this.pendingGroups.find(x => x.userID == f.userID);
return (g?.userName ?? ('User ' + f.userID)) + ': ' + f.message;
});
this.notificationService.showError(names.join(' | '));
}
this.selectedPendingIDs = [];
this.loadPending();
if (this._selectedUserID && ids.includes(this._selectedUserID)) {
this.RefreshGrid(this._selectedUserID);
}
}
);
}
setSelectableSettings(): void { setSelectableSettings(): void {
this.selectableSettings = { this.selectableSettings = {
checkboxOnly: true, checkboxOnly: true,
@ -245,209 +85,12 @@ export class UserAccessTypeComponent implements OnInit {
}; };
} }
// ---------- view helpers (screen only; saving and approval logic is below) ----------
/** Users dropdown, narrowed by what is typed in it. */
filteredUsers: User[] = [];
/** Search box over the payroll type list. */
payrollSearch = '';
onUserFilter(term: string): void {
const t = (term ?? '').trim().toLowerCase();
this.filteredUsers = (this._users ?? []).filter(u =>
!t || (u.userName ?? '').toLowerCase().includes(t) || (u.loginID ?? '').toLowerCase().includes(t));
}
get selectedUser(): User {
return (this._users ?? []).find(u => u.id == this._selectedUserID);
}
/** Payroll types shown in the list, after the search box. */
get visiblePayrollTypes(): PayrollType[] {
const t = this.payrollSearch.trim().toLowerCase();
return (this._payrollTypes ?? []).filter(p => !t || (p.description ?? '').toLowerCase().includes(t));
}
isTicked(payrollTypeID: number): boolean {
return this._selectedPayrollTypes.includes(payrollTypeID);
}
/** Ticks or unticks one payroll type. Locked while a change waits for approval. */
toggle(payrollTypeID: number): void {
if (this.hasPending || !this._selectedUserID) {
return;
}
this._selectedPayrollTypes = this.isTicked(payrollTypeID)
? this._selectedPayrollTypes.filter(x => x != payrollTypeID)
: [...this._selectedPayrollTypes, payrollTypeID];
}
selectAllVisible(): void {
if (this.hasPending || !this._selectedUserID) {
return;
}
const ids = this.visiblePayrollTypes.map(p => p.id).filter(id => !this.isTicked(id));
this._selectedPayrollTypes = [...this._selectedPayrollTypes, ...ids];
}
clearAllVisible(): void {
if (this.hasPending || !this._selectedUserID) {
return;
}
const ids = this.visiblePayrollTypes.map(p => p.id);
this._selectedPayrollTypes = this._selectedPayrollTypes.filter(x => !ids.includes(x));
}
/** Undoes unsaved ticks: back to what the user has now. */
resetSelection(): void {
this._selectedPayrollTypes = (this._userAcessTypes ?? [])
.filter(x => x.accessTypeStatus != EnumAuthStatus.Deleted_Not_Yet_Approve)
.map(x => x.payrollTypeID);
}
payrollName(payrollTypeID: number): string {
return (this._payrollTypes ?? []).find(p => p.id == payrollTypeID)?.description ?? '';
}
/** Payroll types the user can use right now (approved, or a removal not yet approved). */
get liveCount(): number {
return (this._userAcessTypes ?? []).filter(x => x.accessTypeStatus != EnumAuthStatus.New_Not_Yet_Approve).length;
}
/** Waiting for approval: access to be given. */
get pendingAddNames(): string[] {
return (this._userAcessTypes ?? []).filter(x => x.accessTypeStatus == EnumAuthStatus.New_Not_Yet_Approve)
.map(x => this.payrollName(x.payrollTypeID));
}
/** Waiting for approval: access to be taken away. */
get pendingRemoveNames(): string[] {
return (this._userAcessTypes ?? []).filter(x => x.accessTypeStatus == EnumAuthStatus.Deleted_Not_Yet_Approve)
.map(x => this.payrollName(x.payrollTypeID));
}
/** Unsaved ticks that would give new access. */
get draftAddNames(): string[] {
return this._selectedPayrollTypes
.filter(id => !(this._userAcessTypes ?? []).some(x => x.payrollTypeID == id))
.map(id => this.payrollName(id));
}
/** Unsaved unticks that would take access away. */
get draftRemoveNames(): string[] {
return (this._userAcessTypes ?? [])
.filter(x => !this.isPendingStatus(x.accessTypeStatus) && !this.isTicked(x.payrollTypeID))
.map(x => this.payrollName(x.payrollTypeID));
}
/** Badge on one payroll type row: unsaved ticks first, then the saved status. */
rowBadge(payrollTypeID: number): { text: string, tone: string } {
const saved = this.statusOf(payrollTypeID);
if (!this.hasPending) {
const row = (this._userAcessTypes ?? []).find(x => x.payrollTypeID == payrollTypeID);
if (!row && this.isTicked(payrollTypeID)) {
return { text: 'To be added', tone: 'info' };
}
if (row && !this.isTicked(payrollTypeID)) {
return { text: 'To be removed', tone: 'info' };
}
}
return saved;
}
get hasDraftChanges(): boolean {
return this.draftAddNames.length > 0 || this.draftRemoveNames.length > 0;
}
// ---------- maker-checker ----------
private isPendingStatus(status: EnumAuthStatus): boolean {
return status == EnumAuthStatus.New_Not_Yet_Approve || status == EnumAuthStatus.Deleted_Not_Yet_Approve;
}
/** The selected user has an access change waiting for approval. */
get hasPending(): boolean {
return (this._userAcessTypes ?? []).some(x => this.isPendingStatus(x.accessTypeStatus));
}
/** The logged-in user made (part of) the pending change, so cannot approve or reject it. */
get isMakerOfPending(): boolean {
return (this._userAcessTypes ?? []).some(x => {
const row: any = x;
const maker = x.accessTypeStatus == EnumAuthStatus.Deleted_Not_Yet_Approve ? row.modifiedBy : row.createdBy;
return this.isPendingStatus(x.accessTypeStatus) && maker == this.currentUserID;
});
}
/** Status column: the access the user has, or what is waiting for approval. */
statusOf(payrollTypeID: number): { text: string, tone: string } {
const row = (this._userAcessTypes ?? []).find(x => x.payrollTypeID == payrollTypeID);
if (row == undefined) {
return { text: 'No access', tone: 'neutral' };
}
switch (row.accessTypeStatus) {
case EnumAuthStatus.New_Not_Yet_Approve:
return { text: 'New - Not Yet Approved', tone: 'warning' };
case EnumAuthStatus.Deleted_Not_Yet_Approve:
return { text: 'Removal - Not Yet Approved', tone: 'warning' };
default:
return { text: 'Active', tone: 'success' };
}
}
onApprove(): void {
this.decide(true);
}
onReject(): void {
this.decide(false);
}
private decide(approve: boolean): void {
const userID = this._selectedUserID;
if (userID == undefined || !this.hasPending) {
return;
}
const who = this.selectedUser?.userName ?? '';
const question = approve
? `Are you sure you want to approve the access change of ${who}?`
: `Are you sure you want to reject the access change of ${who}?`;
this.notificationService.showActiveConfirm('Confirmation', question).then((isConfirmed) => {
if (isConfirmed) {
this.sendDecision(approve, userID);
}
});
}
private sendDecision(approve: boolean, userID: number): void {
const call = approve ? this.useService.ApproveUserAccessType(userID) : this.useService.RejectUserAccessType(userID);
this.loadingPanel.ShowLoadingPanel = true;
call.subscribe(
() => { },
(err: any) => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showError(err?.error ?? err);
},
() => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showSuccess(approve ? 'Approved Successfully.' : 'Rejected Successfully.');
this.RefreshGrid(userID);
this.loadPending();
}
);
}
RefreshGrid(selectedUser: any) { RefreshGrid(selectedUser: any) {
this._selectedPayrollTypes = []; this._selectedPayrollTypes = [];
this._userAcessTypes = [];
this.setSelectableSettings();
if (selectedUser == undefined || selectedUser == null) {
return;
}
this.useService.GetUserAccessType(selectedUser) this.useService.GetUserAccessType(selectedUser)
.subscribe( .subscribe(
(resp: any) => { (resp: any) => {
this._userAcessTypes = resp ?? []; this._userAcessTypes = resp;
}, },
(err: any) => { (err: any) => {
//ON ERROR //ON ERROR
@ -455,17 +98,13 @@ export class UserAccessTypeComponent implements OnInit {
() => { () => {
this._userAcessTypes.forEach(x => { this._userAcessTypes.forEach(x => {
// A removal waiting for approval shows unticked: the ticks show the requested state.
if (x.accessTypeStatus == EnumAuthStatus.Deleted_Not_Yet_Approve) {
return;
}
var ptype: PayrollType = this._payrollTypes.find(y => y.id == x.payrollTypeID); var ptype: PayrollType = this._payrollTypes.find(y => y.id == x.payrollTypeID);
if (ptype != undefined) { if (ptype != undefined) {
this._selectedPayrollTypes.push(ptype.id); this._selectedPayrollTypes.push(ptype.id);
} }
}); });
this._selectedPayrollTypes = [... this._selectedPayrollTypes]; this._selectedPayrollTypes = [... this._selectedPayrollTypes];
this.setSelectableSettings();
} }
); );
@ -480,49 +119,57 @@ export class UserAccessTypeComponent implements OnInit {
public onSave(): void { public onSave(): void {
this._userAcessTypesforSave= []; this._userAcessTypesforSave= [];
if (this._selectedUserID == undefined || this._selectedUserID == null) {
this.notificationService.showWarning('Select a user.');
return;
}
if (this.hasPending) {
this.notificationService.showWarning('This user already has an access change waiting for approval. Approve or reject it first.');
return;
}
if (this._selectedPayrollTypes.length <= 0) { if (this._selectedPayrollTypes.length <= 0) {
this.notificationService.showWarning('Select at least one payroll type.');
return; return;
} }
// The ticked payroll types are sent as they are; the server works out what is new // New Item
// (New - Not Yet Approved) and what was unticked (Removal - Not Yet Approved).
this._selectedPayrollTypes.forEach(x => { this._selectedPayrollTypes.forEach(x => {
var ptype: UserAccessType = new UserAccessType();
var ptype: UserAccessType = this._userAcessTypes.find(y => x == y.payrollTypeID);
if (ptype == undefined) {
var newItem: UserAccessType = new UserAccessType();
newItem.userID = this._selectedUserID;
newItem.payrollTypeID = x;
this._userAcessTypes.push(newItem);
ptype = new UserAccessType();
ptype.userID = this._selectedUserID; ptype.userID = this._selectedUserID;
ptype.payrollTypeID = x; ptype.payrollTypeID = x;
let payrollType = this._payrollTypes.find(p => p.id === x);
if (payrollType) {
ptype.description = payrollType.description;
} }
this._userAcessTypesforSave.push(ptype); this._userAcessTypesforSave.push(ptype);
}); });
this.loadingPanel.ShowLoadingPanel = true;
// Modify Existing which unchecked
this._userAcessTypes.forEach(x => {
var ptype: number = this._selectedPayrollTypes.find(y => x.payrollTypeID == y);
if (ptype == undefined) {
x.accessTypeStatus = EnumAuthStatus.Deleted_Not_Yet_Approve;
}
});
this._userAcessTypesforSave.forEach(x =>{
let payrollType = this._payrollTypes.find(p => p.id === x.payrollTypeID);
if(payrollType){
x.description = payrollType.description;
}
});
this.useService.SaveUserAccessType(this._userAcessTypesforSave) this.useService.SaveUserAccessType(this._userAcessTypesforSave)
.subscribe( .subscribe(
(resp: any) => { (resp: any) => {
}, },
(err: any) => { (err: any) => {
this.loadingPanel.ShowLoadingPanel = false; this.notificationService.showError(err);
this.notificationService.showError(err?.error ?? err);
//ON ERROR //ON ERROR
}, },
() => { () => {
//ON Success //ON Success
this.loadingPanel.ShowLoadingPanel = false; this.notificationService.showSuccess('Saved Successfully.');
this.notificationService.showSuccess('Saved. The change is waiting for approval.');
// this.loadGrid(); // this.loadGrid();
this.RefreshGrid(this._userAcessTypesforSave[0].userID); this.RefreshGrid(this._userAcessTypesforSave[0].userID);
this.loadPending();
} }
); );

View File

@ -1,407 +1 @@
/* User-Role Assignment dialog. Scoped to this component (default emulated encapsulation). 
Same look as the User Access Type page (user-access-type.component.css). */
.ura {
display: flex;
flex-direction: column;
gap: 14px;
}
.ura-layout {
display: grid;
grid-template-columns: 330px minmax(0, 1fr);
gap: 14px;
align-items: start;
}
.ura-side {
display: flex;
flex-direction: column;
gap: 14px;
min-width: 0;
}
.ura-card {
background: #FFFFFF;
border: 1px solid #E3E3EC;
border-radius: 12px;
padding: 16px;
}
.ura-card__title {
margin: 0 0 2px;
font-size: 15px;
font-weight: 600;
color: #1a1a1a;
}
.ura-label {
display: block;
margin-bottom: 8px;
font-size: 12px;
font-weight: 600;
color: #888888;
text-transform: uppercase;
letter-spacing: 0.05em;
}
.ura-label--gap {
margin-top: 14px;
}
.ura-muted {
color: #888888;
font-size: 12px;
}
.ura-select {
width: 100%;
}
.ura-option {
display: flex;
flex-direction: column;
line-height: 1.3;
}
/* Admin / Self Service switch */
.ura-switch {
display: flex;
gap: 4px;
padding: 4px;
border: 1px solid #E3E3EC;
border-radius: 10px;
}
.ura-switch__btn {
flex: 1;
display: inline-flex;
align-items: center;
justify-content: center;
gap: 6px;
height: 32px;
border: none;
border-radius: 8px;
background: transparent;
color: #424242;
font: inherit;
font-size: 13px;
font-weight: 600;
cursor: pointer;
transition: background-color 0.15s, color 0.15s;
}
.ura-switch__btn:hover:not(:disabled) {
background: #F3F3FF;
}
.ura-switch__btn.is-active {
background: #52527A;
color: #FFFFFF;
}
.ura-switch__btn:disabled:not(.is-active) {
opacity: 0.45;
cursor: default;
}
/* Person */
.ura-person {
display: flex;
align-items: center;
gap: 12px;
margin-top: 16px;
}
.ura-avatar {
width: 40px;
height: 40px;
border-radius: 50%;
background: #52527A;
color: #FFFFFF;
display: flex;
align-items: center;
justify-content: center;
font-weight: 600;
flex-shrink: 0;
}
.ura-person__info {
display: flex;
flex-direction: column;
min-width: 0;
}
.ura-person__name {
font-weight: 600;
color: #1a1a1a;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ura-stats {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
margin-top: 14px;
padding: 10px 12px;
border-radius: 10px;
background: #F7F7FB;
}
.ura-stat {
display: flex;
align-items: baseline;
gap: 6px;
}
.ura-stat__value {
font-size: 20px;
font-weight: 700;
color: #414278;
}
.ura-stat__label {
font-size: 12px;
color: #666666;
}
.ura-note {
margin: 12px 0 0;
padding: 8px 10px;
border-radius: 8px;
background: #E8EEFC;
color: #2F4FB5;
font-size: 12px;
}
/* Pending change */
.ura-pending {
border-color: #F5D9A8;
background: #FFFAF0;
color: #8A5300;
}
.ura-pending__head {
display: flex;
gap: 12px;
align-items: flex-start;
}
.ura-pending__head > .pi {
font-size: 20px;
margin-top: 2px;
}
.ura-pending__title {
margin: 0 0 2px;
font-weight: 600;
font-size: 15px;
}
.ura-pending__text {
margin: 0;
font-size: 13px;
}
.ura-change__label {
display: block;
margin: 12px 0 6px;
font-size: 12px;
font-weight: 600;
}
.ura-pending__note {
margin: 12px 0 0;
font-size: 13px;
font-weight: 600;
}
/* Chips */
.ura-chips {
display: flex;
flex-wrap: wrap;
gap: 6px;
}
.ura-chip {
display: inline-flex;
align-items: center;
gap: 6px;
padding: 3px 10px;
border-radius: 999px;
font-size: 12px;
font-weight: 600;
line-height: 20px;
}
.ura-chip .pi {
font-size: 10px;
}
.ura-chip--add { background: #E6F4EC; color: #137A4B; }
.ura-chip--remove { background: #FDE8EA; color: #D11A2A; }
/* Buttons */
.ura-btns {
display: flex;
gap: 8px;
flex-wrap: wrap;
}
.ura-btns--full {
margin-top: 14px;
}
.ura-btns--full > button {
flex: 1;
}
/* Roles list */
.ura-main {
min-width: 0;
}
.ura-list__head {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
gap: 10px;
margin-bottom: 12px;
}
.ura-list__tools {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 6px;
}
.ura-search {
width: 200px;
}
.ura-count {
display: inline-block;
margin-left: 8px;
padding: 0 10px;
border-radius: 999px;
background: #DEDEFF;
color: #414278;
font-size: 12px;
font-weight: 600;
line-height: 22px;
vertical-align: middle;
}
.ura-list {
border: 1px solid #E3E3EC;
border-radius: 10px;
max-height: 550px;
overflow-y: auto;
}
.ura-row {
display: flex;
align-items: center;
gap: 12px;
margin: 0;
padding: 10px 14px;
border-bottom: 1px solid #F0F0F4;
cursor: pointer;
transition: background-color 0.15s;
}
.ura-row:last-child {
border-bottom: none;
}
.ura-row:hover {
background: #F7F7FB;
}
.ura-row.is-ticked {
background: #F3F3FF;
}
.ura-row__name {
flex: 1;
min-width: 0;
color: #1a1a1a;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.ura-list--locked .ura-row {
cursor: default;
}
.ura-list--locked .ura-row:hover {
background: inherit;
}
.ura-list--locked .ura-row.is-ticked:hover {
background: #F3F3FF;
}
.ura-list__empty {
padding: 24px 16px;
text-align: center;
}
/* Footer */
.ura-footer {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
gap: 10px;
padding-top: 14px;
border-top: 1px solid #F0F0F4;
}
.ura-footer__summary {
display: flex;
flex-wrap: wrap;
gap: 6px;
align-items: center;
}
/* Badges (same look as the User, Role and User Access Type pages) */
.ura-badge {
display: inline-flex;
align-items: center;
gap: 6px;
padding: 2px 10px;
border-radius: 999px;
font-size: 12px;
font-weight: 600;
line-height: 20px;
white-space: nowrap;
}
.ura-badge__dot {
width: 6px;
height: 6px;
border-radius: 50%;
background: currentColor;
}
.ura-badge--success { background: #E6F4EC; color: #137A4B; }
.ura-badge--warning { background: #FFF2DB; color: #8A5300; }
.ura-badge--neutral { background: #EEEEF2; color: #5B5B6B; }
.ura-badge--info { background: #E8EEFC; color: #2F4FB5; }
@media (max-width: 900px) {
.ura-layout {
grid-template-columns: 1fr;
}
.ura-search {
width: 100%;
}
}

View File

@ -1,196 +1,123 @@
<app-loading-panel> </app-loading-panel> <app-loading-panel> </app-loading-panel>
<div class="grid form-group" style="margin: auto;">
<div class="ura"> <div class="col-12 md:col-2" style="margin: auto;">
<div class="ura-layout"> <label for="idRoleType">Role Type</label>
<!-- Left: whose roles -->
<div class="ura-side">
<div class="ura-card">
<span class="ura-label">Role type</span>
<div class="ura-switch" role="tablist">
<button type="button" role="tab" class="ura-switch__btn" [class.is-active]="roleType == roletypeEnum.Admin"
[disabled]="!!openFor" (click)="setRoleType(roletypeEnum.Admin)">
<i class="pi pi-shield"></i> Admin
</button>
<button type="button" role="tab" class="ura-switch__btn" [class.is-active]="roleType == roletypeEnum.Self_Service"
[disabled]="!!openFor" (click)="setRoleType(roletypeEnum.Self_Service)">
<i class="pi pi-users"></i> Self Service
</button>
</div> </div>
<div class="col-12 md:col-2">
@if (roleType == roletypeEnum.Admin) { <kendo-dropdownlist [data]="roleTypes"
<label class="ura-label ura-label--gap" for="uraUser">User</label> id="idRoleType"
<kendo-dropdownlist id="uraUser" class="ura-select" [defaultItem]="{ name: 'select a Type', value: null }"
[data]="filteredUsers" [textField]="'name'"
[filterable]="true" [valueField]="'value'"
(filterChange)="onUserFilter($event)" [valuePrimitive]="true"
[defaultItem]="{ userName: 'Select a user', id: null }" class="form-control form-control-sm input-sm"
(valueChange)="onRoleChange($event)"
[(ngModel)]="_selectedRoleType">
</kendo-dropdownlist>
</div>
<div class="col-12 md:col-8">
</div>
</div>
@if (_selectedRoleType == roletypeEnum.Admin) {
<div >
<div class="grid form-group" style="margin: auto;">
<div class="col-12 md:col-2" style="margin: auto;">
<label for="idUser">Users</label>
</div>
<div class="col-12 md:col-2">
<kendo-dropdownlist [data]="_users"
id="idUser"
[defaultItem]="{ name: 'select a Type', value: null }"
[textField]="'userName'" [textField]="'userName'"
[valueField]="'id'" [valueField]="'id'"
[valuePrimitive]="true" [valuePrimitive]="true"
[disabled]="!!openFor" [(ngModel)]="_selectedUserID"
[(ngModel)]="selectedUserID" class="form-control form-control-sm input-sm">
(valueChange)="onUserChange($event)">
<ng-template kendoDropDownListItemTemplate let-dataItem>
<span class="ura-option">
<span>{{ dataItem?.userName }}</span>
@if (dataItem?.loginID) { <span class="ura-muted">{{ dataItem.loginID }}</span> }
</span>
</ng-template>
</kendo-dropdownlist> </kendo-dropdownlist>
</div>
<div class="col-12 md:col-8" align="right">
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['plus']" class="k-button k-primary" (click)="AddUser()">Add User</button>
</div>
</div>
</div>
} }
@if (_selectedRoleType == roletypeEnum.Self_Service) {
@if (roleType == roletypeEnum.Self_Service) { <div >
<label class="ura-label ura-label--gap" for="uraPayroll">Payroll type</label> <div class="grid form-group" style="margin: auto;">
<kendo-dropdownlist id="uraPayroll" class="ura-select" <div class="col-12 md:col-2" style="margin: auto;">
[data]="payrollTypes" <label for="idpayrollType">Payroll Type</label>
[defaultItem]="{ description: 'Select a payroll type', id: null }" </div>
<div class="col-12 md:col-4">
<kendo-dropdownlist [data]="_payrollTypes"
id="idpayrollType"
[defaultItem]="{ description: 'select a Type', id: null }"
[textField]="'description'" [textField]="'description'"
[valueField]="'id'" [valueField]="'id'"
[valuePrimitive]="true" [valuePrimitive]="true"
[disabled]="!!openFor" class="form-control form-control-sm input-sm"
[(ngModel)]="selectedPayrollTypeID" [(ngModel)]="_selectedPayrollTypeid">
(valueChange)="onPayrollTypeChange()">
</kendo-dropdownlist> </kendo-dropdownlist>
</div>
@if (!openFor) { <div class="col-12 md:col-2" style="margin: auto;">
<label class="ura-label ura-label--gap">Employee</label> <label for="idemployeeselection">Select Employee:</label>
@if (selectedPayrollTypeID) { </div>
<app-employee-picker (ItemSelected)="onEmployeeSelected($event)" <div class="col-12 md:col-4">
[payrollTypeID]="selectedPayrollTypeID" <app-employee-picker id="idemployeeselection" (ItemSelected)="GetSelectedEmployee($event)"
[isActive]="true" [payrollTypeID]="_selectedPayrollTypeid"
[MultiSelect]="false"></app-employee-picker> [isActive]="_selectedPayrollTypeid != undefined"
} @else { [MultiSelect]="true"></app-employee-picker>
<p class="ura-muted">Select a payroll type first.</p> </div>
} <!--<div class="col-12 md:col-4">
} <button class="k-button" (click)="SearchUnAssingedEmp()">Find all un-Assinged Employees</button>
</div>-->
</div>
</div>
} }
@if (state) { <div class="card">
<div class="ura-person"> <div class="grid ">
<div class="ura-avatar">{{ (state.personName || '?').charAt(0) | uppercase }}</div> <div class="col-12 lg:col-3">
<div class="ura-person__info"> <kendo-grid [data]="_gridRoles" style="height: 300px; width: 100%;"
<span class="ura-person__name">{{ state.personName }}</span> [(selectedKeys)]="_selectedRoles"
<span class="ura-muted">{{ state.loginID }}</span> [selectable]="selectableSettings"
</div> [kendoGridSelectBy]="'id'"
</div> (selectionChange)="onSelectionRoleChange($event)">
<div class="ura-stats"> <kendo-grid-checkbox-column width="25%" [headerClass]="{'text-center': true}" [class]="{'text-center': true}"></kendo-grid-checkbox-column>
<div class="ura-stat"> <kendo-grid-column field="name" title="Role-Name" width="75%">
<span class="ura-stat__value">{{ state.liveRoleIDs.length }}</span> </kendo-grid-column>
<span class="ura-stat__label">{{ state.liveRoleIDs.length == 1 ? 'role' : 'roles' }} now</span> </kendo-grid>
</div>
@if (hasPending) {
<span class="ura-badge ura-badge--warning"><span class="ura-badge__dot"></span>Waiting for approval</span>
} @else {
<span class="ura-badge ura-badge--success"><span class="ura-badge__dot"></span>Up to date</span>
}
</div>
@if (!state.hasLogin) {
<p class="ura-note"><i class="pi pi-info-circle"></i> No login yet. Sending this change creates one, switched off; it can sign in, and the login details are e-mailed, only after approval.</p>
} @else if (state.loginWaiting) {
<p class="ura-note"><i class="pi pi-info-circle"></i> The login is waiting for this change to be approved and cannot sign in yet.</p>
}
}
</div> </div>
<!-- A change waiting for approval --> <div class="col-12 lg:col-9">
@if (state && hasPending) { <kendo-grid [data]="_gridUsers" style="height: 300px; width: 100%;"
<div class="ura-card ura-pending"> [selectedKeys]="_selectedLoginIDs"
<div class="ura-pending__head"> [selectable]="selectableSettings"
<i class="pi pi-clock"></i> [kendoGridSelectBy]="'loginID'">
<div> <kendo-grid-column field="loginID" title="Login-ID" width="15%">
<p class="ura-pending__title">Change waiting for approval</p> </kendo-grid-column>
<p class="ura-pending__text"> <kendo-grid-column field="userName" title="Name" width="15%">
Requested by <b>{{ pendingMaker || '-' }}</b> </kendo-grid-column>
@if (pendingDate) { on {{ pendingDate | date: 'dd MMM yyyy, h:mm a' }} }. <kendo-grid-column field="roleNames" title="Role-Name" width="35%">
Until it is approved, {{ state.personName }} keeps the current roles. </kendo-grid-column>
</p> <kendo-grid-column title="Status" width="15%">
</div> </kendo-grid-column>
</div> <kendo-grid-command-column title="Edit/Delete" width="20%" [style]="{'text-align':'center'}">
@if (pendingAddNames.length > 0) { <ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
<span class="ura-change__label">Will get</span> <button kendoGridRemoveCommand [svgIcon]="apiService.KendoSVGIcon['delete']" class="kt-delete" (click)="Remove( rowIndex )"></button>
<div class="ura-chips"> </ng-template>
@for (n of pendingAddNames; track n) { <span class="ura-chip ura-chip--add"><i class="pi pi-plus"></i>{{ n }}</span> } </kendo-grid-command-column>
</div>
}
@if (pendingRemoveNames.length > 0) {
<span class="ura-change__label">Will lose</span>
<div class="ura-chips">
@for (n of pendingRemoveNames; track n) { <span class="ura-chip ura-chip--remove"><i class="pi pi-minus"></i>{{ n }}</span> }
</div>
}
@if (isMakerOfPending) {
<p class="ura-pending__note"><i class="pi pi-info-circle"></i> You made this change, so another administrator must approve or reject it.</p>
}
<div class="ura-btns ura-btns--full">
<button kendoButton type="button" themeColor="error" fillMode="outline" [svgIcon]="apiService.KendoSVGIcon['cancel']"
[disabled]="isMakerOfPending" (click)="onReject()">Reject</button>
<button kendoButton type="button" themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['check']"
[disabled]="isMakerOfPending" (click)="onApprove()">Approve</button>
</div>
</div>
}
</div>
<!-- Right: roles --> </kendo-grid>
<div class="ura-card ura-main">
<div class="ura-list__head">
<div>
<p class="ura-card__title">
Roles
@if (state) { <span class="ura-count">{{ selectedRoleIDs.length }} of {{ rolesForType.length }} selected</span> }
</p>
<p class="ura-muted">
@if (!state) { Select {{ roleType == roletypeEnum.Admin ? 'a user' : 'an employee' }} to see and change their roles. }
@else if (hasPending) { Locked while the change waits for approval. }
@else { Tick the roles this person should have. Only approved roles can be given. }
</p>
</div>
<div class="ura-list__tools">
<kendo-textbox class="ura-search" placeholder="Search role" [clearButton]="true"
[value]="roleSearch" (valueChange)="roleSearch = $event ?? ''"></kendo-textbox>
@if (state && !hasPending) {
<button kendoButton type="button" fillMode="flat" (click)="selectAllVisible()">Select all</button>
<button kendoButton type="button" fillMode="flat" (click)="clearAllVisible()">Clear</button>
}
</div>
</div>
<div class="ura-list" [class.ura-list--locked]="locked"> </div>
@for (r of visibleRoles; track r.id) { </div>
<label class="ura-row" [class.is-ticked]="state && isTicked(r.id)"> <div class="grid">
<input type="checkbox" kendoCheckBox [checked]="state && isTicked(r.id)" [disabled]="locked" (change)="toggle(r.id)" /> <div class="col-12" align="right">
<span class="ura-row__name">{{ r.name }}</span> <button kendoButton [svgIcon]="apiService.KendoSVGIcon['cross']" class="k-button k-primary" (click)="onCancel($event)" style="margin-right: 5px;">Cancel</button>
@if (state) { <button kendoButton [svgIcon]="apiService.KendoSVGIcon['save']" class="k-button k-primary" (click)="onSave()">Save</button>
<span class="ura-badge ura-badge--{{ roleBadge(r.id).tone }}">
<span class="ura-badge__dot"></span>{{ roleBadge(r.id).text }}
</span>
}
</label>
} @empty {
<div class="ura-list__empty ura-muted">No role matches.</div>
}
</div> </div>
</div> </div>
</div> </div>
<!-- Footer -->
<div class="ura-footer">
<div class="ura-footer__summary">
@if (hasDraftChanges) {
@if (draftAddNames.length > 0) { <span class="ura-chip ura-chip--add"><i class="pi pi-plus"></i>{{ draftAddNames.length }} to add</span> }
@if (draftRemoveNames.length > 0) { <span class="ura-chip ura-chip--remove"><i class="pi pi-minus"></i>{{ draftRemoveNames.length }} to remove</span> }
} @else if (state && !hasPending) {
<span class="ura-muted">No changes yet.</span>
}
</div>
<div class="ura-btns">
<button kendoButton type="button" fillMode="flat" (click)="onCancel()">Close</button>
@if (state && !hasPending) {
<button kendoButton type="button" fillMode="flat" [disabled]="!hasDraftChanges" (click)="resetSelection()">Reset</button>
<button kendoButton type="button" themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['paperPlane']"
[disabled]="!hasDraftChanges" (click)="sendForApproval()">Send for approval</button>
}
</div>
</div>
</div>

View File

@ -1,23 +1,27 @@
import {Component, EventEmitter, OnInit, Output, Input, ChangeDetectionStrategy} from '@angular/core'; import {Component, EventEmitter, OnInit, Output, Input, ChangeDetectionStrategy} from '@angular/core';
import {FormControl, FormGroup} from '@angular/forms';
import {Role} from '../../../_models/Authentication/role'; import {Role} from '../../../_models/Authentication/role';
import {User} from '../../../_models/Authentication/user'; import {User} from '../../../_models/Authentication/user';
import {AuthService} from '../../../_services/auth/auth.service'; import {AuthService} from '../../../_services/auth/auth.service';
import {HRMNotificationService} from '../../../app.notification.service'; import {HRMNotificationService} from '../../../app.notification.service';
import {EnumAuthStatus, EnumRoleType, EnumUserType} from '../../../_models/enums'; import {ActivatedRoute, Router} from '@angular/router';
import { import {EnumExtension, EnumRoleType, EnumUserType, EnumAuthStatus} from '../../../_models/enums';
EnumUserRoleRequestType, UserRoleChangeRequest, UserRoleState, UserRoleSubject, import {SelectableSettings} from '@progress/kendo-angular-grid';
} from '../../../_models/Authentication/UserRole'; import {UserRole} from '../../../_models/Authentication/UserRole';
import { SearchEmployee } from '../../../_models/Employee/searchEmployee'; import { SearchEmployee } from '../../../_models/Employee/searchEmployee';
import { PayrollType } from '../../../_models/Authentication/payrollType'; import { PayrollType } from '../../../_models/Authentication/payrollType';
import { ApiService } from 'src/app/app.api.service'; import { EmployeeServices } from '../../../_services/employee/employee.service';
import { loadingPanelService } from '../../../hrm-loding panel/loding.panel.service'; import { UntilityHandlerService } from '../../../utility.hanldler.service';
/** import { LoadingPanelComponent } from 'src/app/hrm-loding panel/loading-panel.component';
* User-Role Assignment dialog (Authentication > User Role Permission). import { ButtonModule } from '@progress/kendo-angular-buttons';
* Pick whose roles (an Admin user, or a Self Service employee), tick the roles they should have and import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
* send the change for approval; a change waiting for approval is shown, and another administrator import { ReactiveFormsModule } from '@angular/forms';
* approves or rejects it here. Nothing is live until it is approved (server-side maker-checker). import { FormsModule } from '@angular/forms';
*/
import { KENDO_GRID } from '@progress/kendo-angular-grid';
import { DatePickerModule } from '@progress/kendo-angular-dateinputs';
import { ApiService } from 'src/app/app.api.service';
@Component({ @Component({
selector: 'app-user-role-entry', selector: 'app-user-role-entry',
templateUrl: './user-role-entry.component.html', templateUrl: './user-role-entry.component.html',
@ -25,342 +29,342 @@ import { loadingPanelService } from '../../../hrm-loding panel/loding.panel.serv
changeDetection: ChangeDetectionStrategy.Eager, changeDetection: ChangeDetectionStrategy.Eager,
standalone: false, standalone: false,
}) })
export class UserRoleEntryComponent implements OnInit { export class UserRoleEntryComponent implements OnInit {
readonly roletypeEnum: typeof EnumRoleType = EnumRoleType; userRolePermissionForm: FormGroup;
public active = false;
/** Emits true when something changed (sent, approved or rejected), false on cancel. */ _userRoles: UserRole[];
_allroles: Role[];
_gridRoles: Role[];
_users: User[];
_gridUsers: User[];
_selectedUserID: number;
_previousRoles: number[] = [];
_selectedRoles: number[] = [];
_selectedRoleType: EnumRoleType ;
roletypeEnum: typeof EnumRoleType = EnumRoleType;
_payrollTypes: PayrollType[];
_selectedPayrollTypeid: number;
roleTypes: any = EnumExtension.getNamesAndValues(EnumRoleType);
public selectableSettings: SelectableSettings;
@Output() saveCompleted: EventEmitter<boolean> = new EventEmitter(); @Output() saveCompleted: EventEmitter<boolean> = new EventEmitter();
_selectedEmployees: SearchEmployee[];
/** Kept for the list page: true when the dialog is opened. */ _selectedLoginIDs: string[];
@Input() public set InitializeForm(initializeValue: boolean) { _initializeValue : boolean;
if (initializeValue === true) {
this.resetPerson();
}
}
/** Open the dialog on this person (from the list or the Pending approvals view). */
@Input() openFor: UserRoleSubject;
roleType: EnumRoleType = EnumRoleType.Admin;
users: User[] = [];
filteredUsers: User[] = [];
payrollTypes: PayrollType[] = [];
allRoles: Role[] = [];
currentUserID: number;
selectedUserID: number;
selectedPayrollTypeID: number;
selectedEmployee: SearchEmployee;
state: UserRoleState;
selectedRoleIDs: number[] = [];
roleSearch = '';
constructor(public userService: AuthService, constructor(public userService: AuthService,
public apiService: ApiService, public apiService: ApiService,
public notificationService: HRMNotificationService, public notificationService: HRMNotificationService,
public loadingPanel: loadingPanelService) { public router: Router,
public route: ActivatedRoute, public employeeService: EmployeeServices,
public utilityService: UntilityHandlerService) {
}
@Input() public set InitializeForm(initializeValue: boolean) {
this._initializeValue = initializeValue;
if (this._initializeValue == true) {
this._gridRoles = [];
this._gridUsers = [];
this._selectedEmployees = [];
this._selectedLoginIDs = [];
this._selectedPayrollTypeid = undefined;
this._selectedRoleType = undefined;
}
} }
ngOnInit() { ngOnInit() {
this.userService.GetCurrentUser().subscribe((resp: any) => { this.utilityService.ShowLoadingPanel = true;
this.currentUserID = resp?.userID; this._selectedRoleType = null;
}); this._gridUsers = [];
this.userService.GetUsers(EnumUserType.User).subscribe((resp: any) => { this._gridRoles = [];
this.users = resp ?? []; this._selectedUserID = 0;
this.filteredUsers = this.users.slice(); this._selectedLoginIDs = [];
}); this.userRolePermissionForm = new FormGroup({
this.userService.GetAllPayrollTypes().subscribe((resp: any) => { selectedUsers: new FormControl()
this.payrollTypes = resp ?? [];
});
this.userService.getAllRoles().subscribe((resp: any) => {
this.allRoles = resp ?? [];
}); });
if (this.openFor) { this.userService.GetUsers(EnumUserType.User)
this.roleType = this.openFor.roleType; .subscribe(
if (this.roleType == EnumRoleType.Self_Service) { (resp: any) => {
this.selectedPayrollTypeID = this.openFor.payrollTypeID; this._users = resp;
} else {
this.selectedUserID = this.openFor.userID;
}
this.loadState(this.openFor.userID, this.openFor.employeeID);
}
}
// ---------- whose roles ----------
setRoleType(type: EnumRoleType): void {
if (this.roleType == type) {
return;
}
this.roleType = type;
this.resetPerson();
}
private resetPerson(): void {
this.selectedUserID = undefined;
this.selectedEmployee = undefined;
this.state = undefined;
this.selectedRoleIDs = [];
this.roleSearch = '';
}
onUserFilter(term: string): void {
const t = (term ?? '').trim().toLowerCase();
this.filteredUsers = this.users.filter(u =>
!t || (u.userName ?? '').toLowerCase().includes(t) || (u.loginID ?? '').toLowerCase().includes(t));
}
onUserChange(userID: number): void {
this.state = undefined;
this.selectedRoleIDs = [];
if (userID) {
this.loadState(userID, undefined);
}
}
onPayrollTypeChange(): void {
this.selectedEmployee = undefined;
this.state = undefined;
this.selectedRoleIDs = [];
}
onEmployeeSelected(emp: any): void {
this.selectedEmployee = emp && !Array.isArray(emp) ? emp : undefined;
this.state = undefined;
this.selectedRoleIDs = [];
if (this.selectedEmployee?.employeeID) {
this.loadState(undefined, this.selectedEmployee.employeeID);
}
}
private loadState(userID: number, employeeID: number): void {
this.loadingPanel.ShowLoadingPanel = true;
this.userService.GetUserRoleState(this.roleType, userID, employeeID).subscribe(
(resp: UserRoleState) => {
this.state = resp;
if (this.roleType == EnumRoleType.Self_Service && !this.selectedPayrollTypeID) {
this.selectedPayrollTypeID = resp?.payrollTypeID;
}
this.resetSelection();
}, },
(err: any) => { (err: any) => {
this.loadingPanel.ShowLoadingPanel = false; // ON ERROR
this.notificationService.showError(err?.error ?? err);
}, },
() => { () => {
this.loadingPanel.ShowLoadingPanel = false; // ON Success
// this.loadGrid();
}
);
this.userService.getAllRoles()
.subscribe(
(resp: any) => {
this._allroles = resp;
},
(err: any) => {
// ON ERROR
},
() => {
this.pageLoaded();
}
);
this.userService.GetAllPayrollTypes()
.subscribe(
(resp: any) => {
this._payrollTypes = resp;
},
(err: any) => {
//ON ERROR
},
() => {
}
);
this.setSelectableSettings();
}
pageLoaded() {
this.utilityService.ShowLoadingPanel = false;
}
setSelectableSettings(): void {
this.selectableSettings = {
checkboxOnly: true,
mode: 'multiple', // this.mode
};
}
onRoleChange(value: any) {
this._gridRoles = [];
this._selectedRoles = [];
this._gridUsers = [];
this._gridRoles = this._allroles.filter(x => x.roleType === this._selectedRoleType);
}
SearchUnAssingedEmp() {
this.utilityService.ShowLoadingPanel = true;
this.employeeService.GetEmployeeNotYetUser(this._selectedPayrollTypeid)
.subscribe(
(resp: any) => {
this._selectedEmployees = resp;
},
(err: any) => {
//ON ERROR
this.utilityService.ShowLoadingPanel = false;
},
() => {
this.utilityService.ShowLoadingPanel = false;
this._selectedEmployees.forEach(x => {
var ouser: User = new User();
ouser.loginID = x.employeeNo;
ouser.userName = x.name;
ouser.employeeID = x.employeeID;
var Item = this._gridUsers.find(u => u.employeeID == x.employeeID);
if (Item == undefined)
this._gridUsers.push(ouser)
});
} }
); );
} }
// ---------- roles ---------- public onSelectionRoleChange(event: any): void {
// this._selectedRoles = event.selectedRows.map(r => r.dataItem.id);
private isApprovedRole(r: Role): boolean {
return r.roleStatus == EnumAuthStatus.Approved || r.roleStatus == EnumAuthStatus.Active;
} }
/** Roles of the selected role type: approved ones, plus any the person has or has asked for. */ public Remove(nIndex:number) {
get rolesForType(): Role[] { this._gridUsers.splice(nIndex, 1);
const live = this.state?.liveRoleIDs ?? [];
const pending = (this.state?.pending ?? []).map(p => p.roleID);
return this.allRoles
.filter(r => r.roleType == this.roleType && (this.isApprovedRole(r) || live.includes(r.id) || pending.includes(r.id)))
.sort((a, b) => (a.name ?? '').localeCompare(b.name ?? ''));
} }
get visibleRoles(): Role[] { public onSave(): void {
const t = this.roleSearch.trim().toLowerCase(); if (this._gridUsers.length == 0) {
return this.rolesForType.filter(r => !t || (r.name ?? '').toLowerCase().includes(t) this.notificationService.showError("There is no user/employee selected");
|| ((r as any).code ?? '').toString().toLowerCase().includes(t));
}
isTicked(roleID: number): boolean {
return this.selectedRoleIDs.includes(roleID);
}
get locked(): boolean {
return !this.state || this.hasPending;
}
toggle(roleID: number): void {
if (this.locked) {
return; return;
} }
this.selectedRoleIDs = this.isTicked(roleID) if (this._selectedRoles.length == 0) {
? this.selectedRoleIDs.filter(x => x != roleID) this.notificationService.showError("please select a role");
: [...this.selectedRoleIDs, roleID];
}
selectAllVisible(): void {
if (this.locked) {
return; return;
}
const ids = this.visibleRoles.map(r => r.id).filter(id => !this.isTicked(id));
this.selectedRoleIDs = [...this.selectedRoleIDs, ...ids];
} }
clearAllVisible(): void { let userRoles: UserRole[] = [];
if (this.locked) { this._gridUsers.forEach(u => {
return; this._selectedRoles.forEach(r => {
var userRole: UserRole = new UserRole();
if (this._selectedRoleType == EnumRoleType.Self_Service) {
userRole.payrollTypeID = this._selectedPayrollTypeid;
userRole.employeeID = u.employeeID;
userRole.roleType = EnumRoleType.Self_Service;
} }
const ids = this.visibleRoles.map(r => r.id); if (this._selectedRoleType == EnumRoleType.Admin)
this.selectedRoleIDs = this.selectedRoleIDs.filter(x => !ids.includes(x)); {
userRole.userID = u.id;
userRole.roleType = EnumRoleType.Admin;
} }
userRole.loginIDView = u.loginID;
userRole.roleID = r;
userRoles.push(userRole);
});
/** Ticks show what the person has now, or what is asked for while a change waits for approval. */ });
resetSelection(): void { this.utilityService.ShowLoadingPanel = true;
const live = this.state?.liveRoleIDs ?? []; if(userRoles && userRoles.length > 0)
const pending = this.state?.pending ?? []; {
const removing = pending.filter(p => p.requestType == EnumUserRoleRequestType.Remove).map(p => p.roleID); userRoles.forEach(x=> {
const adding = pending.filter(p => p.requestType == EnumUserRoleRequestType.Add).map(p => p.roleID); let isFind = this._previousRoles.some(y => y === x.roleID);
this.selectedRoleIDs = [...live.filter(id => !removing.includes(id)), ...adding.filter(id => !live.includes(id))]; if(!isFind){
} x.isOld = false;
let role = this._gridRoles.find(z => z.id === x.roleID);
roleName(roleID: number): string { if(role && role.id > 0){
return this.allRoles.find(r => r.id == roleID)?.name ?? ''; x.newRoleName = role.name;
}
/** Badge of one role row. */
roleBadge(roleID: number): { text: string, tone: string } {
const live = (this.state?.liveRoleIDs ?? []).includes(roleID);
const pending = (this.state?.pending ?? []).find(p => p.roleID == roleID);
if (pending) {
return pending.requestType == EnumUserRoleRequestType.Remove
? { text: 'Removal - Not Yet Approved', tone: 'warning' }
: { text: 'New - Not Yet Approved', tone: 'warning' };
}
if (!this.hasPending && this.state) {
if (!live && this.isTicked(roleID)) {
return { text: 'To be added', tone: 'info' };
}
if (live && !this.isTicked(roleID)) {
return { text: 'To be removed', tone: 'info' };
} }
} }
return live ? { text: 'Active', tone: 'success' } : { text: 'Not assigned', tone: 'neutral' }; });
} }
this.userService.saveUserRole(userRoles)
// ---------- maker-checker ---------- .subscribe(
(resp: any) => {
get hasPending(): boolean { },
return (this.state?.pending ?? []).length > 0;
}
get isMakerOfPending(): boolean {
return (this.state?.pending ?? []).some(p => p.createdBy == this.currentUserID);
}
get pendingAddNames(): string[] {
return (this.state?.pending ?? []).filter(p => p.requestType == EnumUserRoleRequestType.Add).map(p => p.roleName);
}
get pendingRemoveNames(): string[] {
return (this.state?.pending ?? []).filter(p => p.requestType == EnumUserRoleRequestType.Remove).map(p => p.roleName);
}
get pendingMaker(): string {
const p = (this.state?.pending ?? [])[0];
return p ? (p.makerLoginID || '') : '';
}
get pendingDate(): Date {
const p = (this.state?.pending ?? [])[0];
return p?.createdDate ? new Date(p.createdDate) : null;
}
get draftAddNames(): string[] {
const live = this.state?.liveRoleIDs ?? [];
return this.selectedRoleIDs.filter(id => !live.includes(id)).map(id => this.roleName(id));
}
get draftRemoveNames(): string[] {
return (this.state?.liveRoleIDs ?? []).filter(id => !this.isTicked(id)).map(id => this.roleName(id));
}
get hasDraftChanges(): boolean {
return !this.hasPending && (this.draftAddNames.length > 0 || this.draftRemoveNames.length > 0);
}
private subject(): UserRoleSubject {
const s = new UserRoleSubject();
s.roleType = this.roleType;
s.userID = this.state?.userID ?? (this.roleType == EnumRoleType.Admin ? this.selectedUserID : undefined);
s.employeeID = this.state?.employeeID;
s.payrollTypeID = this.state?.payrollTypeID ?? this.selectedPayrollTypeID;
return s;
}
sendForApproval(): void {
if (!this.state) {
this.notificationService.showWarning(this.roleType == EnumRoleType.Admin ? 'Select a user.' : 'Select an employee.');
return;
}
if (!this.hasDraftChanges) {
this.notificationService.showWarning('Nothing changed.');
return;
}
const request = Object.assign(new UserRoleChangeRequest(), this.subject());
request.roleIDs = this.selectedRoleIDs.slice();
this.loadingPanel.ShowLoadingPanel = true;
this.userService.SaveUserRoleRequest(request).subscribe(
() => { },
(err: any) => { (err: any) => {
this.loadingPanel.ShowLoadingPanel = false; //ON ERROR
this.notificationService.showError(err?.error ?? err); this.notificationService.showSuccess(err.error);
this.utilityService.ShowLoadingPanel = false;
}, },
() => { () => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showSuccess('Sent for approval. Nothing changes until another administrator approves it.');
this.saveCompleted.emit(true); this.saveCompleted.emit(true);
this.utilityService.ShowLoadingPanel = false;
this.notificationService.showSuccess("Data Saved Successfully.");
} }
); );
} }
onApprove(): void { public GetSelectedEmployee(childData) {
this.decide(true); this._selectedEmployees = childData;
} if (this._selectedEmployees == undefined) {
onReject(): void {
this.decide(false);
}
private decide(approve: boolean): void {
if (!this.hasPending) {
return; return;
} }
const who = this.state?.personName ?? '';
const question = approve
? `Are you sure you want to approve the role change of ${who}?`
: `Are you sure you want to reject the role change of ${who}?`;
this.notificationService.showActiveConfirm('Confirmation', question).then((isConfirmed) => {
if (isConfirmed) {
this.sendDecision(approve);
}
});
}
private sendDecision(approve: boolean): void { this._selectedEmployees.forEach(x => {
const call = approve ? this.userService.ApproveUserRole(this.subject()) : this.userService.RejectUserRole(this.subject());
this.loadingPanel.ShowLoadingPanel = true; var ouser: User = new User();
call.subscribe( ouser.loginID = x.employeeNo;
() => { }, ouser.userName = x.name;
ouser.employeeID = x.employeeID;
var Item = this._gridUsers.find(u => u.employeeID == x.employeeID);
if (Item == undefined)
this._gridUsers.push(ouser);
});
this.AddEmployeeAsUser();
}
AddUser() {
this.userService.getUserRoles(EnumRoleType.Admin, this._selectedUserID);
let oUser: User = this._users.find(x => x.id === this._selectedUserID);
let userRole: UserRole[];
this.userService.getUserRoles(EnumRoleType.Admin, this._selectedUserID)
.subscribe(
(resp: any) => {
this._userRoles = resp;
},
(err: any) => { (err: any) => {
this.loadingPanel.ShowLoadingPanel = false; // ON ERROR
this.notificationService.showError(err?.error ?? err);
}, },
() => { () => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showSuccess(approve const Users: User[] = [];
? 'Approved. The roles are now live; the person sees the new menu from their next sign-in.' Users.push(oUser);
: 'Rejected. The roles stay as they were.'); var uRole: UserRole = new UserRole();
this.saveCompleted.emit(true);
var Item = this._gridUsers.find(u => u.id == oUser.id);
if (Item == undefined)
this._gridUsers.push(oUser);
this.setPrviousRole();
}
);
}
private setPrviousRole() {
this._gridUsers.forEach(x => {
var empUseRoles: UserRole[] = this._userRoles.filter(t => t.loginIDView == x.loginID)
if (empUseRoles != undefined) {
empUseRoles.forEach(u => {
if (x.roleNames == undefined) x.roleNames = '';
x.roleNames = x.roleNames + u.roleNameView + ", ";
x.id = u.userID;
if (this._selectedRoles.findIndex(r => r == u.roleID) == -1) {
this._selectedRoles.push(u.roleID);
}
})
}
});
this._selectedRoles = [...this._selectedRoles];
this._previousRoles = [...this._selectedRoles];
}
AddEmployeeAsUser() {
this.userService.GetEmpUserRole(this._selectedEmployees).subscribe(
(resp: any) => {
this._userRoles = resp;
},
(err: any) => {
},
() => {
this.setPrviousRole();
}
);
return;
this._users = [];
this._selectedEmployees.forEach(x => {
var ouser: User = new User();
ouser.loginID = x.employeeNo;
ouser.userName = x.name;
oUser.userStatus = EnumAuthStatus.New_Not_Yet_Approve;
this._users.push(oUser);
});
this.userService.getUserRoles(EnumRoleType.Admin, this._selectedUserID);
let oUser: User = this._users.find(x => x.id === this._selectedUserID);
let userRole: UserRole[];
this.userService.getUserRoles(EnumRoleType.Admin, this._selectedUserID)
.subscribe(
(resp: any) => {
userRole = resp;
},
(err: any) => {
// ON ERROR
},
() => {
const Users: User[] = [];
Users.push(oUser);
/*var uRole: UserRole = new UserRole();
uRole.getRoleNames(Users, this.userRoles);*/
var uRole: UserRole = new UserRole();
// uRole.getRoleNames(Users, userRole);
this._gridUsers.push(oUser);
} }
); );
} }
public onCancel(): void { public onCancel(e): void {
this.saveCompleted.emit(false); this.saveCompleted.emit(false);
} }
private closeForm(): void {
}
} }

View File

@ -1,463 +1 @@
/* User Role Permission page. This component uses ViewEncapsulation.None, so every rule carries the 
url- prefix (grid rules sit under .url-grid). Same look as User Access Type / Role / User pages. */
.url-page {
display: flex;
flex-direction: column;
gap: 14px;
}
/* ---------- header ---------- */
.url-header {
display: flex;
align-items: center;
gap: 14px;
}
.url-header__icon {
width: 44px;
height: 44px;
border-radius: 10px;
background: #DEDEFF;
color: #414278;
display: flex;
align-items: center;
justify-content: center;
font-size: 20px;
flex-shrink: 0;
}
.url-title {
margin: 0 0 2px;
font-size: 18px;
font-weight: 600;
color: #1a1a1a;
}
.url-subtitle {
margin: 0;
font-size: 13px;
color: #888888;
}
.url-muted {
color: #888888;
font-size: 12px;
}
.url-block {
display: block;
}
/* ---------- view switch ---------- */
.url-views {
display: inline-flex;
gap: 4px;
padding: 4px;
border: 1px solid #E3E3EC;
border-radius: 10px;
background: #FFFFFF;
align-self: flex-start;
}
.url-view {
display: inline-flex;
align-items: center;
gap: 8px;
height: 34px;
padding: 0 14px;
border: none;
border-radius: 8px;
background: transparent;
color: #424242;
font: inherit;
font-size: 13px;
font-weight: 600;
cursor: pointer;
transition: background-color 0.15s, color 0.15s;
}
.url-view:hover {
background: #F3F3FF;
}
.url-view.is-active {
background: #52527A;
color: #FFFFFF;
}
.url-view__count {
min-width: 20px;
padding: 0 6px;
border-radius: 999px;
background: #EEEEF2;
color: #5B5B6B;
font-size: 12px;
line-height: 18px;
text-align: center;
}
.url-view__count.has-items {
background: #FFF2DB;
color: #8A5300;
}
.url-view.is-active .url-view__count {
background: rgba(255, 255, 255, 0.22);
color: #FFFFFF;
}
/* ---------- grid toolbar ---------- */
.url-grid .k-grid-toolbar {
padding: 8px 12px;
}
.url-grid .k-grid-table td {
padding-top: 6px;
padding-bottom: 6px;
vertical-align: middle;
}
.url-toolbar {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
gap: 12px;
width: 100%;
padding: 4px 0;
}
.url-toolbar__filters,
.url-toolbar__actions {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 8px;
}
.url-search {
width: 240px;
}
.url-switch {
display: inline-flex;
gap: 2px;
padding: 3px;
border: 1px solid #E3E3EC;
border-radius: 8px;
background: #FFFFFF;
}
.url-switch__btn {
height: 28px;
padding: 0 12px;
border: none;
border-radius: 6px;
background: transparent;
color: #424242;
font: inherit;
font-size: 13px;
font-weight: 600;
cursor: pointer;
}
.url-switch__btn:hover {
background: #F3F3FF;
}
.url-switch__btn.is-active {
background: #52527A;
color: #FFFFFF;
}
/* Status chips (same as the User and Role pages) */
.url-chips {
display: inline-flex;
flex-wrap: wrap;
gap: 6px;
}
.url-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;
}
.url-chip:hover {
border-color: #52527A;
}
.url-chip.is-selected {
background: #52527A;
border-color: #52527A;
color: #FFFFFF;
}
.url-chip__count {
min-width: 20px;
padding: 0 6px;
border-radius: 999px;
background: #F1F1F1;
color: #666666;
font-size: 12px;
line-height: 18px;
text-align: center;
}
.url-chip.is-selected .url-chip__count {
background: rgba(255, 255, 255, 0.22);
color: #FFFFFF;
}
.url-chip--pending:not(.is-selected) .url-chip__count {
background: #FFF2DB;
color: #8A5300;
}
/* ---------- grid cells ---------- */
.url-login {
font-weight: 600;
color: #424242;
}
.url-roles {
display: flex;
flex-wrap: wrap;
gap: 4px;
}
.url-role {
display: inline-block;
padding: 1px 8px;
border-radius: 999px;
background: #F3F3FF;
color: #414278;
font-size: 12px;
font-weight: 600;
line-height: 20px;
white-space: nowrap;
}
.url-badge {
display: inline-flex;
align-items: center;
gap: 6px;
padding: 2px 10px;
border-radius: 999px;
font-size: 12px;
font-weight: 600;
line-height: 20px;
white-space: nowrap;
}
.url-badge__dot {
width: 6px;
height: 6px;
border-radius: 50%;
background: currentColor;
}
.url-badge--success { background: #E6F4EC; color: #137A4B; }
.url-badge--warning { background: #FFF2DB; color: #8A5300; }
.url-badge--neutral { background: #EEEEF2; color: #5B5B6B; }
.url-empty {
padding: 32px 16px;
color: #888888;
text-align: center;
}
.url-empty--big {
padding: 48px 16px;
}
.url-empty__icon {
font-size: 32px;
color: #C9C9D6;
}
.url-empty__title {
margin: 10px 0 4px;
font-weight: 600;
color: #424242;
}
/* ---------- pending approvals ---------- */
.url-card {
background: #FFFFFF;
border: 1px solid #E3E3EC;
border-radius: 12px;
padding: 16px;
}
.url-card__head {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
gap: 10px;
margin-bottom: 12px;
}
.url-card__title {
margin: 0 0 2px;
font-size: 15px;
font-weight: 600;
color: #1a1a1a;
}
.url-table-wrap {
border: 1px solid #E3E3EC;
border-radius: 10px;
overflow: auto;
max-height: 560px;
}
.url-table {
width: 100%;
border-collapse: collapse;
font-size: 13px;
}
.url-table th {
position: sticky;
top: 0;
z-index: 1;
background: #F7F7FB;
color: #666666;
font-size: 12px;
font-weight: 600;
text-align: left;
padding: 10px 12px;
border-bottom: 1px solid #E3E3EC;
white-space: nowrap;
}
.url-table td {
padding: 10px 12px;
border-bottom: 1px solid #F0F0F4;
vertical-align: top;
}
.url-table tbody tr:last-child td {
border-bottom: none;
}
.url-table tbody tr:hover {
background: #F7F7FB;
}
.url-table tbody tr.is-selected {
background: #F3F3FF;
}
.url-table tbody tr.is-mine {
color: #888888;
}
.url-table__check {
width: 40px;
text-align: center;
}
.url-table__open {
width: 70px;
text-align: right;
}
.url-person {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 6px;
}
.url-type {
padding: 0 8px;
border-radius: 999px;
background: #E8EEFC;
color: #2F4FB5;
font-size: 11px;
font-weight: 600;
line-height: 18px;
}
.url-type--ess {
background: #F1EAFB;
color: #6B3FA0;
}
.url-chips-inline {
display: flex;
flex-wrap: wrap;
gap: 4px;
}
.url-mini {
display: inline-flex;
align-items: center;
gap: 4px;
padding: 1px 8px;
border-radius: 999px;
font-size: 12px;
font-weight: 600;
line-height: 20px;
}
.url-mini .pi {
font-size: 9px;
}
.url-mini--add { background: #E6F4EC; color: #137A4B; }
.url-mini--remove { background: #FDE8EA; color: #D11A2A; }
.url-requested {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 4px 10px;
}
.url-savebar {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
gap: 10px;
margin-top: 14px;
padding-top: 14px;
border-top: 1px solid #F0F0F4;
}
.url-btns {
display: flex;
gap: 8px;
flex-wrap: wrap;
}
@media (max-width: 768px) {
.url-toolbar__actions {
width: 100%;
justify-content: flex-end;
}
.url-search {
width: 100%;
}
}

View File

@ -1,222 +1,67 @@
<app-loading-panel></app-loading-panel> <div class="card">
<div class="grid " style="margin: auto;">
<div class="col-12 md:col-1" style="margin: auto;">
<label for="idRoleType">Role Type</label>
</div>
<div class="col-12 md:col-2">
<div class="url-page"> <kendo-dropdownlist [data]="roleTypes"
id="idRoleType"
<!-- Page header --> [defaultItem]="{ name: 'select a Type', value: null }"
<div class="url-header"> [textField]="'name'"
<div class="url-header__icon"><i class="pi pi-key"></i></div> [valueField]="'value'"
<div> [valuePrimitive]="true"
<h2 class="url-title">User Role Permission</h2> class="form-control form-control-sm input-sm"
<p class="url-subtitle">Give users and employees their roles. Every change is approved by another administrator before it takes effect.</p> [(ngModel)]="_selectedRoleType">
</kendo-dropdownlist>
</div>
<div class="col-12 md:col-2" style="margin: auto;">
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['redo']" class="k-button k-primary" (click)="RefreshControl()">Refresh</button>
</div>
<div class="col-12 md:col-7">
</div> </div>
</div> </div>
<!-- View switch -->
<div class="url-views" role="tablist">
<button type="button" role="tab" class="url-view" [class.is-active]="activeView === 'assignments'" (click)="activeView = 'assignments'">
<i class="pi pi-list"></i> All assignments
</button>
<button type="button" role="tab" class="url-view" [class.is-active]="activeView === 'pending'" (click)="activeView = 'pending'; loadPending()">
<i class="pi pi-clock"></i> Pending approvals
<span class="url-view__count" [class.has-items]="pendingGroups.length > 0">{{ pendingGroups.length }}</span>
</button>
</div> </div>
<div class="card card-w-title">
<!-- All assignments --> <kendo-grid [data]="userRoles"
@if (activeView === 'assignments') { (add)="addHandler()">
<kendo-grid #urlGrid class="url-grid"
[kendoGridBinding]="gridView"
[pageSize]="20"
[pageable]="true"
[sortable]="true"
[filterable]="true"
[resizable]="true">
<ng-template kendoGridToolbarTemplate> <ng-template kendoGridToolbarTemplate>
<div class="url-toolbar"> <button themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['plus']" kendoGridAddCommand>Add new</button>
<div class="url-toolbar__filters"> <input placeholder="Search in all columns..." kendoTextBox (input)="onFilter($event.target.value)" />
<div class="url-switch" role="tablist" aria-label="Role type"> <button kendoButton themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['save']">Approve All</button>
<button type="button" class="url-switch__btn" [class.is-active]="listRoleType == roletypeEnum.Admin" <button kendoGridExcelCommand type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']" style="float:right;">Export to Excel</button>
(click)="setListRoleType(roletypeEnum.Admin)">Admin</button> <button kendoGridPDFCommand [svgIcon]="apiService.KendoSVGIcon['filePdf']" style="float:right;">Export to PDF</button>
<button type="button" class="url-switch__btn" [class.is-active]="listRoleType == roletypeEnum.Self_Service"
(click)="setListRoleType(roletypeEnum.Self_Service)">Self Service</button>
</div>
<input kendoTextBox class="url-search" placeholder="Search login ID, name or role"
[value]="searchText" (input)="onSearch($event.target.value)" />
<div class="url-chips" role="group" aria-label="Filter by status">
<button type="button" class="url-chip" [class.is-selected]="statusFilter === 'all'" (click)="setStatusFilter('all')">
All <span class="url-chip__count">{{ counts.all }}</span>
</button>
<button type="button" class="url-chip url-chip--pending" [class.is-selected]="statusFilter === 'pending'" (click)="setStatusFilter('pending')">
Waiting for approval <span class="url-chip__count">{{ counts.pending }}</span>
</button>
<button type="button" class="url-chip" [class.is-selected]="statusFilter === 'uptodate'" (click)="setStatusFilter('uptodate')">
Up to date <span class="url-chip__count">{{ counts.uptodate }}</span>
</button>
</div>
</div>
<div class="url-toolbar__actions">
<button kendoButton type="button" fillMode="flat" [svgIcon]="apiService.KendoSVGIcon['arrowRotateCw']"
title="Reload list" aria-label="Reload list" (click)="RefreshControl(); loadPending()"></button>
<button kendoButton type="button" fillMode="outline" [svgIcon]="apiService.KendoSVGIcon['fileExcel']"
(click)="urlGrid.saveAsExcel()">Export to Excel</button>
<button kendoButton type="button" fillMode="outline" [svgIcon]="apiService.KendoSVGIcon['filePdf']"
(click)="urlGrid.saveAsPDF()">Export to PDF</button>
<button kendoButton type="button" themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['plus']"
(click)="addHandler()">Assign roles</button>
</div>
</div>
</ng-template> </ng-template>
<kendo-grid-column field="loginID" title="Login ID" [width]="170"> <kendo-grid-column field="loginIDView" title="Login Id">
<ng-template kendoGridCellTemplate let-dataItem> </kendo-grid-column>
<span class="url-login">{{ dataItem.loginID }}</span> <kendo-grid-column field="userNameView" title="Name">
</kendo-grid-column>
<kendo-grid-column field="roleNameView" title="Role">
</kendo-grid-column>
<!--<kendo-grid-column field="" title="Status">
<kendo-grid-column field="roleStatus" title="Status">
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
{{ statusString(dataItem.userRoleStatus)}}
</ng-template> </ng-template>
</kendo-grid-column> </kendo-grid-column>
<kendo-grid-column field="userName" title="Name" [width]="220"></kendo-grid-column> </kendo-grid-column>-->
<kendo-grid-column field="payrollTypeName" title="Payroll Type" [width]="180"
[hidden]="listRoleType != roletypeEnum.Self_Service"></kendo-grid-column>
<kendo-grid-column field="rolesText" title="Roles">
<ng-template kendoGridCellTemplate let-dataItem>
<div class="url-roles">
@for (r of dataItem.roles; track r) { <span class="url-role">{{ r }}</span> }
</div>
</ng-template>
</kendo-grid-column>
<kendo-grid-column field="statusText" title="Status" [width]="190">
<ng-template kendoGridCellTemplate let-dataItem>
<span class="url-badge" [class.url-badge--warning]="dataItem.pending" [class.url-badge--success]="!dataItem.pending">
<span class="url-badge__dot"></span>{{ dataItem.statusText }}
</span>
</ng-template>
</kendo-grid-column>
<kendo-grid-column title="Actions" [width]="120" [filterable]="false" [sortable]="false">
<ng-template kendoGridCellTemplate let-dataItem>
<button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']"
(click)="openRow(dataItem)">{{ dataItem.pending ? 'Review' : 'Edit' }}</button>
</ng-template>
</kendo-grid-column>
<ng-template kendoGridNoRecordsTemplate>
<div class="url-empty">
@if (rows.length === 0) { No {{ listRoleType == roletypeEnum.Admin ? 'admin user' : 'self service user' }} has a role yet. }
@else { No one matches the current search or filters. }
</div>
</ng-template>
<kendo-grid-excel fileName="UserRoles.xlsx" [fetchData]="allData">
<kendo-excelexport-column field="loginID" title="Login ID" [width]="140"></kendo-excelexport-column>
<kendo-excelexport-column field="userName" title="Name" [width]="200"></kendo-excelexport-column>
<kendo-excelexport-column field="rolesText" title="Roles" [width]="360"></kendo-excelexport-column>
<kendo-excelexport-column field="statusText" title="Status" [width]="150"></kendo-excelexport-column>
</kendo-grid-excel>
<kendo-grid-pdf fileName="UserRoles.pdf" [allPages]="true" [repeatHeaders]="true" paperSize="A4" [landscape]="true" [scale]="0.7">
<kendo-grid-column field="loginID" title="Login ID"></kendo-grid-column>
<kendo-grid-column field="userName" title="Name"></kendo-grid-column>
<kendo-grid-column field="rolesText" title="Roles"></kendo-grid-column>
<kendo-grid-column field="statusText" title="Status"></kendo-grid-column>
</kendo-grid-pdf>
</kendo-grid> </kendo-grid>
}
<!-- Pending approvals -->
@if (activeView === 'pending') {
<div class="url-card">
<div class="url-card__head">
<div>
<p class="url-card__title">Pending approvals</p>
<p class="url-muted">Everyone whose role change is waiting for approval. Select several and approve or reject them at once.</p>
</div>
<button kendoButton type="button" fillMode="flat" [svgIcon]="apiService.KendoSVGIcon['arrowRotateCw']" (click)="loadPending()">Refresh</button>
</div> </div>
@if (pendingGroups.length === 0) { <div class="card card-w-title">
<div class="url-empty url-empty--big">
<i class="pi pi-check-circle url-empty__icon"></i>
<p class="url-empty__title">Nothing to approve</p>
<p class="url-muted">No role change is waiting for approval.</p>
</div>
} @else {
<div class="url-table-wrap">
<table class="url-table">
<thead>
<tr>
<th class="url-table__check">
<input type="checkbox" kendoCheckBox [checked]="allPendingSelected"
[disabled]="selectablePending.length === 0" (change)="toggleAllPending()" title="Select all" />
</th>
<th>Person</th>
<th>Will get</th>
<th>Will lose</th>
<th>Requested by</th>
<th></th>
</tr>
</thead>
<tbody>
@for (g of pendingGroups; track g.key) {
<tr [class.is-selected]="isPendingSelected(g.key)" [class.is-mine]="g.isMine">
<td class="url-table__check">
<input type="checkbox" kendoCheckBox [checked]="isPendingSelected(g.key)" [disabled]="g.isMine"
(change)="togglePendingSelection(g)"
[attr.title]="g.isMine ? 'You made this change; another administrator must decide it' : null" />
</td>
<td>
<div class="url-person">
<span class="url-login">{{ g.personName }}</span>
<span class="url-type" [class.url-type--ess]="g.roleType == roletypeEnum.Self_Service">
{{ g.roleType == roletypeEnum.Self_Service ? 'Self Service' : 'Admin' }}
</span>
</div>
<span class="url-muted url-block">{{ g.loginID }}</span>
</td>
<td>
<div class="url-chips-inline">
@for (n of g.adds; track n) { <span class="url-mini url-mini--add"><i class="pi pi-plus"></i>{{ n }}</span> }
@if (g.adds.length === 0) { <span class="url-muted">-</span> }
</div>
</td>
<td>
<div class="url-chips-inline">
@for (n of g.removes; track n) { <span class="url-mini url-mini--remove"><i class="pi pi-minus"></i>{{ n }}</span> }
@if (g.removes.length === 0) { <span class="url-muted">-</span> }
</div>
</td>
<td>
<div class="url-requested">
<span>{{ g.makers.join(', ') || '-' }}</span>
@if (g.requestDate) { <span class="url-muted">{{ g.requestDate | date: 'dd MMM yyyy, h:mm a' }}</span> }
@if (g.isMine) { <span class="url-badge url-badge--neutral"><span class="url-badge__dot"></span>Your change</span> }
</div>
</td>
<td class="url-table__open">
<button kendoButton type="button" fillMode="flat" (click)="openPending(g)">Open</button>
</td>
</tr>
}
</tbody>
</table>
</div>
<div class="url-savebar">
<span class="url-muted">{{ selectedPendingKeys.length }} of {{ selectablePending.length }} selected</span>
<div class="url-btns">
<button kendoButton type="button" themeColor="error" fillMode="outline" [svgIcon]="apiService.KendoSVGIcon['cancel']"
[disabled]="selectedPendingKeys.length === 0" (click)="bulkReject()">Reject selected</button>
<button kendoButton type="button" themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['check']"
[disabled]="selectedPendingKeys.length === 0" (click)="bulkApprove()">Approve selected</button>
</div>
</div>
}
</div>
}
</div>
<!-- User-Role Assignment dialog (blurred background) -->
@if (showModal) { @if (showModal) {
<div class="blur-background"> <kendo-dialog (close)="onPopUpClose()" [minWidth]="750"
<kendo-dialog title="User-Role Assignment" [width]="1080" maxHeight="92vh" [width]="850">
(close)="onPopUpClose()" (keydown.escape)="$event.stopPropagation()"> <kendo-dialog-titlebar>
<app-user-role-entry [InitializeForm]="initializeEntryFrom" [openFor]="openFor" (saveCompleted)="saveCompleted($event)"> User-Role Assignment
</kendo-dialog-titlebar>
<app-user-role-entry [InitializeForm]="initializeEntryFrom" (saveCompleted)="saveCompleted($event)">
</app-user-role-entry> </app-user-role-entry>
</kendo-dialog> </kendo-dialog>
</div>
} }
</div>

View File

@ -1,373 +1,122 @@
import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/core'; import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/core';
import { HRMNotificationService } from '../../../app.notification.service'; import { HRMNotificationService } from '../../../app.notification.service';
import { DataTransferService } from '../../../data.transfer.service';
import { UntilityHandlerService } from '../../../utility.hanldler.service';
import { AuthService } from '../../../_services/auth/auth.service'; import { AuthService } from '../../../_services/auth/auth.service';
import { EnumAuthStatus, EnumRoleType } from '../../../_models/enums'; import { EnumRoleType, EnumUserType, EnumExtension, EnumAuthStatus } from '../../../_models/enums';
import { ExcelExportData } from '@progress/kendo-angular-excel-export'; import { User } from '../../../_models/Authentication/user';
import { process } from '@progress/kendo-data-query'; import { DataStateChangeEvent, GridDataResult } from '@progress/kendo-angular-grid';
import { process, State } from '@progress/kendo-data-query';
import { ApiService } from '../../../app.api.service'; import { ApiService } from '../../../app.api.service';
import { loadingPanelService } from '../../../hrm-loding panel/loding.panel.service';
import { EnumUserRoleRequestType, UserRoleSubject } from '../../../_models/Authentication/UserRole';
/** One person in the All assignments grid (one row per person, roles as chips). */ import { ButtonModule } from '@progress/kendo-angular-buttons';
interface AssignmentRow { import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
key: string; import { ReactiveFormsModule } from '@angular/forms';
userID: number; import { FormsModule } from '@angular/forms';
employeeID: number;
loginID: string;
userName: string;
/** Self Service only: the employee's payroll type. */
payrollTypeID: number;
payrollTypeName: string;
roles: string[];
rolesText: string;
pending: boolean;
statusText: string;
}
/** One person with a role change waiting for approval. */ import { KENDO_GRID } from '@progress/kendo-angular-grid';
interface PendingGroup { import { DatePickerModule } from '@progress/kendo-angular-dateinputs';
key: string;
roleType: EnumRoleType;
userID: number;
employeeID: number;
payrollTypeID: number;
personName: string;
loginID: string;
adds: string[];
removes: string[];
makers: string[];
makerIDs: number[];
requestDate: Date;
isMine: boolean;
}
/**
* Authentication > User Role Permission: who has which roles (All assignments), the role changes
* waiting for approval (Pending approvals, many at once), and the User-Role Assignment dialog.
*/
@Component({ @Component({
selector: 'app-user-role-list', selector: 'app-user-role-list',
templateUrl: './user-role-list.component.html', templateUrl: './user-role-list.component.html',
styleUrls: ['./user-role-list.component.css'],
encapsulation: ViewEncapsulation.None, encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.Eager, changeDetection: ChangeDetectionStrategy.Eager,
standalone: false, standalone: false,
}) })
/** user-role-list component*/
export class UserRoleListComponent implements OnInit { export class UserRoleListComponent implements OnInit {
readonly roletypeEnum: typeof EnumRoleType = EnumRoleType; public isNew: boolean;
userRole: any;
activeView: 'assignments' | 'pending' = 'assignments'; users: User[];
listRoleType: EnumRoleType = EnumRoleType.Admin; userRoles: any[];
currentUserID: number;
/** Payroll type names by ID, for the Self Service Payroll Type column. */
payrollTypeNames = new Map<number, string>();
// All assignments
rows: AssignmentRow[] = [];
gridView: AssignmentRow[] = [];
searchText = '';
statusFilter: 'all' | 'pending' | 'uptodate' = 'all';
// Pending approvals
pendingGroups: PendingGroup[] = [];
selectedPendingKeys: string[] = [];
// Dialog
showModal = false; showModal = false;
initializeEntryFrom = false; _selectedRoleType: EnumRoleType;
openFor: UserRoleSubject; roleTypes: any = EnumExtension.getNamesAndValues(EnumRoleType);
initializeEntryFrom: boolean;
gridView: GridDataResult;
public state: State = {
skip: 0,
take: 10
};
/** user-role-list ctor */
constructor(public userService: AuthService, constructor(public userService: AuthService,
public notificationService: HRMNotificationService, public notificationService: HRMNotificationService,
public apiService: ApiService, public datatransferservice: DataTransferService,
public loadingPanel: loadingPanelService) { public utilityHandlerService: UntilityHandlerService, public apiService: ApiService,) {
this.apiService.selectedMenuName = 'User Role Permission Entry'; this.apiService.selectedMenuName="User Role Permission Entry"
this.allData = this.allData.bind(this);
} }
public ngOnInit(): void { public ngOnInit(): void {
this.userService.GetCurrentUser().subscribe((resp: any) => { this.showModal = false;
this.currentUserID = resp?.userID; this.initializeEntryFrom = false;
this.loadPending();
});
this.userService.GetAllPayrollTypes().subscribe((resp: any[]) => {
this.payrollTypeNames = new Map((resp ?? []).map(p => [p.id, p.description] as [number, string]));
this.rows.forEach(r => r.payrollTypeName = this.payrollTypeName(r));
});
this.RefreshControl();
} }
// ---------- All assignments ---------- public RefreshControl() {
this.userService.getUserRoles(this._selectedRoleType)
setListRoleType(type: EnumRoleType): void { .subscribe(
if (this.listRoleType == type) { (resp: any) => {
return; this.userRoles = resp;
}
this.listRoleType = type;
this.RefreshControl();
}
/** Loads who has which roles of the selected role type. */
public RefreshControl(): void {
this.loadingPanel.ShowLoadingPanel = true;
this.userService.getUserRoles(this.listRoleType).subscribe(
(resp: any[]) => {
const byUser = new Map<number, AssignmentRow>();
(resp ?? []).forEach(r => {
let row = byUser.get(r.userID);
if (!row) {
row = {
key: 'u' + r.userID, userID: r.userID, employeeID: r.employeeID, loginID: r.loginIDView,
userName: r.userNameView, payrollTypeID: r.payrollTypeID, payrollTypeName: '', roles: [], rolesText: '', pending: false, statusText: '',
};
byUser.set(r.userID, row);
}
// Only live roles are shown: a role given but not approved yet (Status 2) is not live.
if (r.userRoleStatus != EnumAuthStatus.New_Not_Yet_Approve
&& r.roleNameView && !row.roles.includes(r.roleNameView)) {
row.roles.push(r.roleNameView);
}
});
this.rows = Array.from(byUser.values());
this.rows.forEach(r => {
r.rolesText = r.roles.join(', ');
r.payrollTypeName = this.payrollTypeName(r);
});
this.markPendingRows();
}, },
(err: any) => { (err: any) => {
this.loadingPanel.ShowLoadingPanel = false; //ON ERROR
this.notificationService.showError(err?.error ?? err);
}, },
() => { () => {
this.loadingPanel.ShowLoadingPanel = false; this.gridView = process(this.userRoles, this.state);
} }
); );
} }
public dataStateChange(state: DataStateChangeEvent): void {
private payrollTypeName(row: AssignmentRow): string { this.state = state;
const id = row.payrollTypeID; this.gridView = process(this.userRoles, this.state);
return id ? (this.payrollTypeNames.get(id) ?? '') : ''; }
public onFilter(inputValue: string): void {
}
onRoleChange() {
this.userRoles = [];
} }
private pendingFor(row: AssignmentRow): PendingGroup { public addHandler() {
return this.pendingGroups.find(g => g.roleType == this.listRoleType && g.userID == row.userID);
}
private markPendingRows(): void {
this.rows.forEach(r => {
r.pending = !!this.pendingFor(r);
r.statusText = r.pending ? 'Waiting for approval' : 'Up to date';
});
this.applyView();
}
get counts() {
const pending = this.rows.filter(r => r.pending).length;
return { all: this.rows.length, pending, uptodate: this.rows.length - pending };
}
onSearch(value: string): void {
this.searchText = value ?? '';
this.applyView();
}
setStatusFilter(filter: 'all' | 'pending' | 'uptodate'): void {
this.statusFilter = filter;
this.applyView();
}
private applyView(): void {
const t = this.searchText.trim().toLowerCase();
this.gridView = this.rows.filter(r =>
(this.statusFilter === 'all' || (this.statusFilter === 'pending') === r.pending) &&
(!t || (r.loginID ?? '').toLowerCase().includes(t) || (r.userName ?? '').toLowerCase().includes(t)
|| r.rolesText.toLowerCase().includes(t)));
}
/** Excel export: every row the grid shows (all pages). */
public allData(): ExcelExportData {
return { data: process(this.gridView, {}).data };
}
// ---------- Pending approvals ----------
/** Every pending row has a login (made with the change for a new Self Service employee). */
private subjectKey(roleType: EnumRoleType, userID: number): string {
return (roleType == EnumRoleType.Self_Service ? 's' : 'a') + userID;
}
loadPending(): void {
this.userService.GetPendingUserRoles().subscribe(
(items: any[]) => {
const groups = new Map<string, PendingGroup>();
(items ?? []).forEach(p => {
const key = this.subjectKey(p.roleType, p.userID);
let g = groups.get(key);
if (!g) {
g = {
key, roleType: p.roleType, userID: p.userID, employeeID: p.employeeID,
payrollTypeID: p.payrollTypeID, personName: p.personName, loginID: p.loginID,
adds: [], removes: [], makers: [], makerIDs: [], requestDate: null, isMine: false,
};
groups.set(key, g);
}
(p.requestType == EnumUserRoleRequestType.Remove ? g.removes : g.adds).push(p.roleName);
if (p.makerLoginID && !g.makers.includes(p.makerLoginID)) {
g.makers.push(p.makerLoginID);
}
if (p.createdBy && !g.makerIDs.includes(p.createdBy)) {
g.makerIDs.push(p.createdBy);
}
const d = p.createdDate ? new Date(p.createdDate) : null;
if (d && (!g.requestDate || d > g.requestDate)) {
g.requestDate = d;
}
});
this.pendingGroups = Array.from(groups.values());
this.pendingGroups.forEach(g => g.isMine = g.makerIDs.includes(this.currentUserID));
this.selectedPendingKeys = this.selectedPendingKeys.filter(k =>
this.pendingGroups.some(g => g.key == k && !g.isMine));
this.markPendingRows();
},
() => {
this.pendingGroups = [];
}
);
}
get selectablePending(): PendingGroup[] {
return this.pendingGroups.filter(g => !g.isMine);
}
isPendingSelected(key: string): boolean {
return this.selectedPendingKeys.includes(key);
}
togglePendingSelection(g: PendingGroup): void {
if (g.isMine) {
return;
}
this.selectedPendingKeys = this.isPendingSelected(g.key)
? this.selectedPendingKeys.filter(k => k != g.key)
: [...this.selectedPendingKeys, g.key];
}
get allPendingSelected(): boolean {
return this.selectablePending.length > 0 && this.selectablePending.every(g => this.isPendingSelected(g.key));
}
toggleAllPending(): void {
this.selectedPendingKeys = this.allPendingSelected ? [] : this.selectablePending.map(g => g.key);
}
private toSubject(g: PendingGroup): UserRoleSubject {
const s = new UserRoleSubject();
s.roleType = g.roleType;
s.userID = g.userID ?? undefined;
s.employeeID = g.employeeID ?? undefined;
s.payrollTypeID = g.payrollTypeID ?? undefined;
return s;
}
bulkApprove(): void {
this.bulkDecide(true);
}
bulkReject(): void {
this.bulkDecide(false);
}
private bulkDecide(approve: boolean): void {
const groups = this.pendingGroups.filter(g => this.isPendingSelected(g.key));
if (groups.length == 0) {
this.notificationService.showWarning('Select at least one person.');
return;
}
const count = groups.length + (groups.length == 1 ? ' person' : ' people');
const question = approve
? `Are you sure you want to approve the role changes of ${count}?`
: `Are you sure you want to reject the role changes of ${count}?`;
this.notificationService.showActiveConfirm('Confirmation', question).then((isConfirmed) => {
if (isConfirmed) {
this.sendBulkDecision(approve, groups);
}
});
}
private sendBulkDecision(approve: boolean, groups: PendingGroup[]): void {
const subjects = groups.map(g => this.toSubject(g));
const call = approve ? this.userService.ApproveUserRoles(subjects) : this.userService.RejectUserRoles(subjects);
let result: any;
this.loadingPanel.ShowLoadingPanel = true;
call.subscribe(
(resp: any) => { result = resp; },
(err: any) => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showError(err?.error ?? err);
},
() => {
this.loadingPanel.ShowLoadingPanel = false;
const done = result?.done ?? 0;
const failed: any[] = result?.failed ?? [];
if (done > 0) {
this.notificationService.showSuccess(
(approve ? 'Approved' : 'Rejected') + ' for ' + done + (done == 1 ? ' person.' : ' people.')
+ (approve ? ' New menus show from their next sign-in.' : ''));
}
if (failed.length > 0) {
this.notificationService.showError(failed.map(f =>
(groups[f.index]?.personName ?? 'Person ' + (f.index + 1)) + ': ' + f.message).join(' | '));
}
this.selectedPendingKeys = [];
this.loadPending();
this.RefreshControl();
}
);
}
// ---------- User-Role Assignment dialog ----------
/** New assignment: pick the person in the dialog. */
public addHandler(): void {
this.openFor = undefined;
this.openDialog();
}
/** Change one person's roles from the All assignments grid. */
openRow(row: AssignmentRow): void {
const s = new UserRoleSubject();
s.roleType = this.listRoleType;
if (this.listRoleType == EnumRoleType.Self_Service && row.employeeID) {
s.employeeID = row.employeeID;
} else {
s.userID = row.userID;
}
this.openFor = s;
this.openDialog();
}
/** Review one person's pending change in the dialog. */
openPending(g: PendingGroup): void {
this.openFor = this.toSubject(g);
this.openDialog();
}
private openDialog(): void {
this.initializeEntryFrom = true; this.initializeEntryFrom = true;
this.showModal = true; this.showModal = true;
} }
onPopUpClose(): void { public editHandler({ dataItem }) {
this.initializeEntryFrom = false;
this.showModal = false;
} }
saveCompleted(changed: boolean): void { onPopUpClose() {
this.onPopUpClose(); this.initializeEntryFrom = false;
if (changed === true) { this.showModal = false;
this.loadPending();
}
statusString(roleStatus: number): string {
var str = "";
var status: EnumAuthStatus = roleStatus;
switch (status) {
case EnumAuthStatus.Active: { str = "Active"; break };
default: str = "In-Active"
}
return str;
}
saveCompleted(faction: any) {
if (faction !== undefined) {
if (faction === true) {
this.RefreshControl(); this.RefreshControl();
} }
} }
this.showModal = false;
this.initializeEntryFrom = false;
}
cancelHandler() {
}
saveHandler(userRole: any) {
}
removeHandler({ dataItem }) {
}
} }

View File

@ -1 +1,4 @@
<div class="card">
<app-user-role-list></app-user-role-list> <app-user-role-list></app-user-role-list>
</div>

View File

@ -30,8 +30,13 @@
</ng-template> </ng-template>
</kendo-dropdownlist> </kendo-dropdownlist>
<input kendoTextBox class="ul-search" placeholder="Search login ID or name" <kendo-textbox
[value]="searchText" (input)="onSearch($event.target.value)" /> class="ul-search"
placeholder="Search login ID or name"
[clearButton]="true"
[value]="searchText"
(valueChange)="onSearch($event)">
</kendo-textbox>
<div class="ul-chips" role="group" aria-label="Filter by status"> <div class="ul-chips" role="group" aria-label="Filter by status">
<button type="button" class="ul-chip" [class.is-selected]="statusFilter === 'all'" (click)="setStatusFilter('all')"> <button type="button" class="ul-chip" [class.is-selected]="statusFilter === 'all'" (click)="setStatusFilter('all')">
@ -52,10 +57,13 @@
<div class="ul-toolbar__actions"> <div class="ul-toolbar__actions">
<button kendoButton type="button" fillMode="flat" [svgIcon]="icons.refresh" <button kendoButton type="button" fillMode="flat" [svgIcon]="icons.refresh"
title="Reload list" aria-label="Reload list" (click)="RefreshControl()"></button> title="Reload list" aria-label="Reload list" (click)="RefreshControl()"></button>
<!-- Plain buttons, not kendoGridExcelCommand/kendoGridPDFCommand: grid toolbar commands take the <kendo-dropdownbutton
focus on any toolbar click, which closed the User type dropdown before it could open. --> [data]="exportItems"
<button kendoButton type="button" fillMode="outline" [svgIcon]="icons.excel" (click)="grid.saveAsExcel()">Export to Excel</button> [svgIcon]="icons.export"
<button kendoButton type="button" fillMode="outline" [svgIcon]="icons.pdf" (click)="grid.saveAsPDF()">Export to PDF</button> fillMode="outline"
(itemClick)="onExport($event)">
Export
</kendo-dropdownbutton>
<button kendoButton type="button" themeColor="primary" [svgIcon]="icons.add" (click)="addHandler()">Add user</button> <button kendoButton type="button" themeColor="primary" [svgIcon]="icons.add" (click)="addHandler()">Add user</button>
</div> </div>
</div> </div>
@ -84,19 +92,22 @@
<span>{{ dataItem.createdDate | date: 'dd MMM yyyy' }}</span> <span>{{ dataItem.createdDate | date: 'dd MMM yyyy' }}</span>
} }
@if (dataItem.createdByName) { @if (dataItem.createdByName) {
<span class="ul-badge ul-badge--info ul-created-by" title="Created by"><span class="ul-badge__dot"></span>{{ dataItem.createdByName }}</span> <span class="ul-muted"> · {{ dataItem.createdByName }}</span>
} }
</ng-template> </ng-template>
</kendo-grid-column> </kendo-grid-column>
<!-- Same look as the Role page's last column: one button per action. Which actions a row gets <kendo-grid-column title="" [width]="64" [filterable]="false" [sortable]="false" class="ul-actions-cell" headerClass="ul-actions-cell">
is still decided by actionsFor() (dataItem.actions), and a click still runs onRowAction(). -->
<kendo-grid-column title="Actions" [width]="180" [filterable]="false" [sortable]="false">
<ng-template kendoGridCellTemplate let-dataItem> <ng-template kendoGridCellTemplate let-dataItem>
@for (a of dataItem.actions; track a.action) { <kendo-dropdownbutton
<button class="k-button k-primary ul-row-action" kendoButton [svgIcon]="a.svgIcon" [data]="dataItem.actions"
(click)="onRowAction(a, dataItem)">{{ a.text }}</button> [svgIcon]="icons.more"
} fillMode="flat"
[popupSettings]="{ align: 'right' }"
[attr.aria-label]="'Actions for ' + dataItem.loginID"
title="Actions"
(itemClick)="onRowAction($event, dataItem)">
</kendo-dropdownbutton>
</ng-template> </ng-template>
</kendo-grid-column> </kendo-grid-column>
@ -128,14 +139,12 @@
</div> </div>
@if (showModal) { @if (showModal) {
<div class="blur-background">
<kendo-dialog (close)="onPopUpClose()" [minWidth]="750" [width]="650"> <kendo-dialog (close)="onPopUpClose()" [minWidth]="750" [width]="650">
<kendo-dialog-titlebar> <kendo-dialog-titlebar>
Add/Edit User Add/Edit User
</kendo-dialog-titlebar> </kendo-dialog-titlebar>
<app-users-entry [inputObject]="_user" (saveCompleted)="saveCompleted($event)"></app-users-entry> <app-users-entry [inputObject]="_user" (saveCompleted)="saveCompleted($event)"></app-users-entry>
</kendo-dialog> </kendo-dialog>
</div>
} }
@if (showReason) { @if (showReason) {

View File

@ -103,15 +103,9 @@
// ---------- grid ---------- // ---------- grid ----------
:host ::ng-deep .ul-grid { :host ::ng-deep .ul-grid {
// The global `.k-dropdownlist { width: 100% !important }` (styles/vendors/kendo/_calendar.scss)
// made the User type dropdown fill the whole toolbar row and pushed the rest onto the next line.
// Keep it compact so dropdown, search, chips and buttons stay on one line, like the Role page.
.ul-type.k-dropdownlist {
width: 170px !important;
}
// Uniform, compact rows // Uniform, compact rows
.k-grid-table td { .k-grid-table td {
height: 44px;
padding-top: 4px; padding-top: 4px;
padding-bottom: 4px; padding-bottom: 4px;
vertical-align: middle; vertical-align: middle;
@ -132,11 +126,6 @@
} }
} }
// Row action buttons (last column), side by side like the Role page
.ul-row-action + .ul-row-action {
margin-left: 6px;
}
.ul-login { .ul-login {
font-weight: 600; font-weight: 600;
color: $gray-700; color: $gray-700;
@ -171,12 +160,6 @@
.ul-badge--warning { background: $userlist-warning-bg; color: $userlist-warning; } .ul-badge--warning { background: $userlist-warning-bg; color: $userlist-warning; }
.ul-badge--neutral { background: $userlist-neutral-bg; color: $userlist-neutral; } .ul-badge--neutral { background: $userlist-neutral-bg; color: $userlist-neutral; }
.ul-badge--danger { background: $userlist-danger-bg; color: $danger; } .ul-badge--danger { background: $userlist-danger-bg; color: $danger; }
// "Created by" name next to the date in the Created column
.ul-badge--info { background: #E8EEFC; color: #2F4FB5; }
.ul-created-by {
margin-left: 8px;
}
.ul-empty { .ul-empty {
padding: 32px 16px; padding: 32px 16px;
@ -211,8 +194,4 @@
.ul-search { .ul-search {
width: 100%; width: 100%;
} }
:host ::ng-deep .ul-grid .ul-type.k-dropdownlist {
width: 100% !important;
}
} }

View File

@ -373,13 +373,6 @@ export class UsersListComponent implements OnInit {
ouser.modifiedBy = oselecteduser.userID; ouser.modifiedBy = oselecteduser.userID;
ouser.modifiedDate = new Date(); ouser.modifiedDate = new Date();
const question = this.actionselected == "deactivate-approve"
? `Are you sure you want to approve the deactivation of ${oselecteduser.userName ?? ''} (${oselecteduser.loginID ?? ''})?`
: `Are you sure you want to approve ${oselecteduser.userName ?? ''} (${oselecteduser.loginID ?? ''})?`;
this.notificationService.showActiveConfirm('Confirmation', question).then((isConfirmed) => {
if (!isConfirmed) {
return;
}
this.loadingPanel.ShowLoadingPanel = true; this.loadingPanel.ShowLoadingPanel = true;
this.userService.ApproveUser(ouser).subscribe( this.userService.ApproveUser(ouser).subscribe(
(x: User) => { (x: User) => {
@ -396,7 +389,6 @@ export class UsersListComponent implements OnInit {
this.notificationService.showError(x.error); this.notificationService.showError(x.error);
}, },
); );
});
} }
// ---------- deactivate ---------- // ---------- deactivate ----------
@ -450,19 +442,7 @@ export class UsersListComponent implements OnInit {
changed.modifiedBy = target.userID; changed.modifiedBy = target.userID;
changed.modifiedDate = new Date(); changed.modifiedDate = new Date();
if (this.actionselected == 'reject') {
this.notificationService.showActiveConfirm('Confirmation',
`Are you sure you want to reject ${target.userName ?? ''} (${target.loginID ?? ''})?`).then((isConfirmed) => {
if (isConfirmed) {
this.saveStatusChange(target, changed);
}
});
return;
}
this.saveStatusChange(target, changed);
}
private saveStatusChange(target: User, changed: User) {
this.loadingPanel.ShowLoadingPanel = true; this.loadingPanel.ShowLoadingPanel = true;
this.userService.DoActiveAndIntacive(changed).subscribe( this.userService.DoActiveAndIntacive(changed).subscribe(
() => { () => {

View File

@ -400,7 +400,6 @@
<app-life-cycle-entry [SetEmployee]="pickerEmployee" [fromCoreHr]="true"></app-life-cycle-entry> <app-life-cycle-entry [SetEmployee]="pickerEmployee" [fromCoreHr]="true"></app-life-cycle-entry>
</div> </div>
</app-tab-panel> </app-tab-panel>
@if (isSuperUser) {
<app-tab-panel header="Role Permission" leftIcon="pi pi-user" (onChange)="RolePermission()"> <app-tab-panel header="Role Permission" leftIcon="pi pi-user" (onChange)="RolePermission()">
<div class="grid form-group"> <div class="grid form-group">
<div class="lg:col-8"> <div class="lg:col-8">
@ -413,23 +412,6 @@
<!--<div *ngIf="userid ==undefined" class="lg:col-6"> <!--<div *ngIf="userid ==undefined" class="lg:col-6">
Password: {{password}} Password: {{password}}
</div>--> </div>-->
@if (roleState && roleHasPending) {
<div class="lg:col-12">
<p><i class="pi pi-clock"></i> <b>Change waiting for approval.</b>
Until another administrator approves it in Authentication &gt; User Role Permission, the employee keeps the current roles.</p>
@if (pendingRoleAddNames.length > 0) { <p>Will get: {{ pendingRoleAddNames.join(', ') }}</p> }
@if (pendingRoleRemoveNames.length > 0) { <p>Will lose: {{ pendingRoleRemoveNames.join(', ') }}</p> }
</div>
}
@if (roleState && !roleState.hasLogin) {
<div class="lg:col-12">
<p><i class="pi pi-info-circle"></i> No login yet. Sending this change creates one, switched off; it can sign in, and the login details are e-mailed, only after approval.</p>
</div>
} @else if (roleState?.loginWaiting) {
<div class="lg:col-12">
<p><i class="pi pi-info-circle"></i> The login is waiting for this change to be approved and cannot sign in yet.</p>
</div>
}
<div class="lg:col-12"> <div class="lg:col-12">
<kendo-grid [data]="_allroles" [(selectedKeys)]="_selectedUserRoles" <kendo-grid [data]="_allroles" [(selectedKeys)]="_selectedUserRoles"
[selectable]="userRoleselectableSettings" [kendoGridSelectBy]="'id'" (selectionChange)="onSelectionRoleChange($event)"> [selectable]="userRoleselectableSettings" [kendoGridSelectBy]="'id'" (selectionChange)="onSelectionRoleChange($event)">
@ -437,20 +419,12 @@
[class]="{'text-center': true}"></kendo-grid-checkbox-column> [class]="{'text-center': true}"></kendo-grid-checkbox-column>
<kendo-grid-column field="name" title="Role-Name"> <kendo-grid-column field="name" title="Role-Name">
</kendo-grid-column> </kendo-grid-column>
<kendo-grid-column title="Status" [width]="220">
<ng-template kendoGridCellTemplate let-dataItem>
{{ roleStatusText(dataItem.id) }}
</ng-template>
</kendo-grid-column>
</kendo-grid> </kendo-grid>
</div> </div>
<div class="lg:col-12" align="right"> <div class="lg:col-12" align="right">
<button kendoButton type="button" fillMode="flat" [disabled]="!hasRoleDraftChanges" (click)="onUserRoleReset()" style="height:auto;"> <button class="k-button k-primary" kendoButton (click)="onUserRoleSave()" style="height:auto;">
Reset Assign Role
</button>
<button kendoButton type="button" themeColor="primary" [disabled]="!hasRoleDraftChanges" (click)="onUserRoleSave()" style="height:auto;">
Send for approval
</button> </button>
</div> </div>
</fieldset> </fieldset>
@ -482,7 +456,6 @@
</div> </div>
</div> </div>
</app-tab-panel> </app-tab-panel>
}
</app-tab-view> </app-tab-view>
@if (nidPopUp||tinPopUp||dlnoPopUp||passnoPopUp||signaturePopUp) { @if (nidPopUp||tinPopUp||dlnoPopUp||passnoPopUp||signaturePopUp) {

View File

@ -11,14 +11,10 @@ import {
EnumExtension, EnumExtension,
EnumGender, EnumGender,
EnumMaritalStatus, EnumMaritalStatus,
EnumAuthStatus,
EnumRoleType, EnumRoleType,
EnumStatus, EnumStatus,
EnumSystemType, EnumSystemType
EnumUserType
} from '../../../_models/enums'; } from '../../../_models/enums';
import { JwtHelperService } from '@auth0/angular-jwt';
import { EnumUserRoleRequestType, UserRoleChangeRequest, UserRoleState } from '../../../_models/Authentication/UserRole';
import { Grade } from '../../../_models/Basic/grade'; import { Grade } from '../../../_models/Basic/grade';
import { Department } from '../../../_models/Basic/department'; import { Department } from '../../../_models/Basic/department';
import { Role } from '../../../_models/Authentication/role'; import { Role } from '../../../_models/Authentication/role';
@ -119,8 +115,6 @@ export class GeneralComponent implements OnInit {
designationpicker: DynamicPicker; designationpicker: DynamicPicker;
userPassword = ''; userPassword = '';
_selectedUserRoles: number[]; _selectedUserRoles: number[];
/** The employee's live Self Service roles and any change waiting for approval (maker-checker). */
roleState: UserRoleState;
_gridRoles: Role[]; _gridRoles: Role[];
_allroles: Role[]; _allroles: Role[];
@ -315,8 +309,6 @@ export class GeneralComponent implements OnInit {
if (this.hrEmployee.id !== undefined && this.hrEmployee.id !== 0) { if (this.hrEmployee.id !== undefined && this.hrEmployee.id !== 0) {
this.showEmpImage(); this.showEmpImage();
this.userid = undefined; this.userid = undefined;
this.roleState = undefined;
this._selectedUserRoles = [];
var emp: SearchEmployee = new SearchEmployee(); var emp: SearchEmployee = new SearchEmployee();
emp.employeeID = this.employeeService.hrEmployee.id; emp.employeeID = this.employeeService.hrEmployee.id;
emp.employeeNo = this.employeeService.hrEmployee.employeeNo; emp.employeeNo = this.employeeService.hrEmployee.employeeNo;
@ -375,7 +367,6 @@ export class GeneralComponent implements OnInit {
} }
); );
this.setUserRoleSelectableSettings(); this.setUserRoleSelectableSettings();
this.loadCanMakeRoleChange();
this.contact = new EmpContact(); this.contact = new EmpContact();
this.employeeService.Employee_Get_Completed.subscribe( this.employeeService.Employee_Get_Completed.subscribe(
@ -448,131 +439,9 @@ export class GeneralComponent implements OnInit {
this.userRoleselectableSettings = { this.userRoleselectableSettings = {
checkboxOnly: true, checkboxOnly: true,
mode: 'multiple', // this.mode mode: 'multiple', // this.mode
enabled: !this.roleLocked,
}; };
} }
/**
* The Role Permission tab is for a Super User only: a Super User session, or an Admin/ESS session of
* a person who also has a Super User login (the server decides, and allows only them too).
*/
isSuperUser = false;
private loadCanMakeRoleChange(): void {
const token = localStorage.getItem('token');
const user = token ? new JwtHelperService().decodeToken(token) : undefined;
if (user == undefined) {
this.isSuperUser = false;
return;
}
if (user.UserType == EnumUserType.SuperUser) {
this.isSuperUser = true;
return;
}
this.userService.CanMakeUserRoleChange().subscribe(
(resp: boolean) => { this.isSuperUser = resp === true; },
() => { this.isSuperUser = false; }
);
}
get roleHasPending(): boolean {
return (this.roleState?.pending ?? []).length > 0;
}
/** Ticks cannot change until the roles are loaded, or while a change waits for approval. */
get roleLocked(): boolean {
return !this.roleState || this.roleHasPending;
}
get pendingRoleAddNames(): string[] {
return (this.roleState?.pending ?? []).filter(p => p.requestType == EnumUserRoleRequestType.Add).map(p => p.roleName);
}
get pendingRoleRemoveNames(): string[] {
return (this.roleState?.pending ?? []).filter(p => p.requestType == EnumUserRoleRequestType.Remove).map(p => p.roleName);
}
get hasRoleDraftChanges(): boolean {
if (this.roleLocked) {
return false;
}
const live = this.roleState.liveRoleIDs ?? [];
const ticked = this._selectedUserRoles ?? [];
return ticked.some(id => !live.includes(id)) || live.some(id => !ticked.includes(id));
}
/** Badge of one role row, the same wording as Authentication > User Role Permission. */
roleStatusText(roleID: number): string {
if (!this.roleState) {
return '';
}
const live = (this.roleState.liveRoleIDs ?? []).includes(roleID);
const pending = (this.roleState.pending ?? []).find(p => p.roleID == roleID);
if (pending) {
return pending.requestType == EnumUserRoleRequestType.Remove ? 'Removal - Not Yet Approved' : 'New - Not Yet Approved';
}
const ticked = (this._selectedUserRoles ?? []).includes(roleID);
if (!live && ticked) {
return 'To be added';
}
if (live && !ticked) {
return 'To be removed';
}
return live ? 'Active' : 'Not assigned';
}
/** Ticks show the live roles, or what is asked for while a change waits for approval. */
private resetRoleSelection(): void {
const live = this.roleState?.liveRoleIDs ?? [];
const pending = this.roleState?.pending ?? [];
const removing = pending.filter(p => p.requestType == EnumUserRoleRequestType.Remove).map(p => p.roleID);
const adding = pending.filter(p => p.requestType == EnumUserRoleRequestType.Add).map(p => p.roleID);
this._selectedUserRoles = [...live.filter(id => !removing.includes(id)), ...adding.filter(id => !live.includes(id))];
this.setUserRoleSelectableSettings();
}
/** Loads the Self Service roles that can be given and the employee's role state. */
private loadRoleState(): void {
const employeeID = this.employeeService.hrEmployee?.id;
if (!employeeID) {
return;
}
this.roleState = undefined;
this._selectedUserRoles = [];
this.setUserRoleSelectableSettings();
this.loadingPanel.ShowLoadingPanel = true;
this.userService.getAllRoles().subscribe(
(resp: any) => {
this._allroles = (resp ?? []).filter((r: Role) => r.roleType == EnumRoleType.Self_Service);
},
(err: any) => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showError(err?.error ?? err);
},
() => {
this.userService.GetUserRoleState(EnumRoleType.Self_Service, undefined, employeeID).subscribe(
(state: UserRoleState) => {
this.roleState = state;
const live = state?.liveRoleIDs ?? [];
const pending = (state?.pending ?? []).map(p => p.roleID);
// Only approved roles can be given; keep any the employee has or has asked for.
this._allroles = this._allroles.filter(r =>
r.roleStatus == EnumAuthStatus.Approved || r.roleStatus == EnumAuthStatus.Active
|| live.includes(r.id) || pending.includes(r.id));
this.resetRoleSelection();
},
(err: any) => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showError(err?.error ?? err);
},
() => {
this.loadingPanel.ShowLoadingPanel = false;
}
);
}
);
}
public GetSelectedEmployee(childData) { public GetSelectedEmployee(childData) {
//debugger; //debugger;
if (childData != undefined) { if (childData != undefined) {
@ -902,49 +771,47 @@ export class GeneralComponent implements OnInit {
public onSelectionRoleChange(event: any): void { public onSelectionRoleChange(event: any): void {
this._selectedUserRoles = [...this._selectedUserRoles]; this._selectedUserRoles = [...this._selectedUserRoles];
} }
/**
* Maker side of the User Role Permission maker-checker: the ticked roles are sent for approval
* (SaveUserRoleRequest) and nothing is live until another administrator approves them in
* Authentication > User Role Permission. An employee without a login gets one, switched off.
*/
public onUserRoleSave(): void { public onUserRoleSave(): void {
if (!this.roleState) {
this.notificationService.showWarning('Roles are not loaded yet.'); if (this._selectedUserRoles.length == 0) {
return; this.notificationService.showWarning('select a role for Acess permision.');
}
if (this.roleHasPending) {
this.notificationService.showWarning('This employee already has a role change waiting for approval.');
return;
}
if (!this.hasRoleDraftChanges) {
this.notificationService.showWarning('Nothing changed.');
return; return;
} }
const request = new UserRoleChangeRequest(); let userRoles: UserRole[] = [];
request.roleType = EnumRoleType.Self_Service; this._selectedUserRoles.forEach(r => {
request.userID = this.roleState.userID;
request.employeeID = this.roleState.employeeID ?? this.employeeService.hrEmployee.id; var userRole: UserRole = new UserRole();
request.payrollTypeID = this.roleState.payrollTypeID ?? this.employeeService.hrEmployee.payrollTypeID; if (this.userid != undefined) {
request.roleIDs = this._selectedUserRoles.slice(); userRole.userID = this.userid;
}
userRole.payrollTypeID = this.employeeService.hrEmployee.payrollTypeID;
userRole.employeeID = this.employeeService.hrEmployee.id;
userRole.loginIDView = this.employeeService.hrEmployee.employeeNo;
userRole.roleID = r;
userRoles.push(userRole);
});
this.loadingPanel.ShowLoadingPanel = true; this.loadingPanel.ShowLoadingPanel = true;
this.userService.SaveUserRoleRequest(request).subscribe(
() => { }, this.userService.saveUserRole(userRoles)
.subscribe(
(resp: any) => {
},
(err: any) => { (err: any) => {
//ON ERROR
this.notificationService.showSuccess(err.error);
this.loadingPanel.ShowLoadingPanel = false; this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showError(err?.error ?? err);
}, },
() => { () => {
this.notificationService.showSuccess('Data Saved scuccessfully.');
this.loadingPanel.ShowLoadingPanel = false; this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showSuccess('Sent for approval. Nothing changes until another administrator approves it.');
this.loadRoleState();
} }
); );
}
public onUserRoleReset(): void {
this.resetRoleSelection();
} }
generateDefaultNumber(): string { generateDefaultNumber(): string {
@ -968,7 +835,7 @@ export class GeneralComponent implements OnInit {
this.pickerEmployee = emp; this.pickerEmployee = emp;
} }
this.userid = undefined; this.userid = undefined;
if (e.index == 2 && this.employeeService.hrEmployee.id > 0 && this.isSuperUser) { if (e.index == 2 && this.employeeService.hrEmployee.id > 0) {
this.loadingPanel.ShowLoadingPanel = true; this.loadingPanel.ShowLoadingPanel = true;
this.loginid = this.employeeService.hrEmployee.employeeNo; this.loginid = this.employeeService.hrEmployee.employeeNo;
this.userService.GetUserByLoingID(this.hrEmployee.employeeNo, EnumSystemType.Self_Service).subscribe( this.userService.GetUserByLoingID(this.hrEmployee.employeeNo, EnumSystemType.Self_Service).subscribe(
@ -999,7 +866,43 @@ export class GeneralComponent implements OnInit {
//console.log(this.employeeService.hrEmployee.birthDate.getFullYear()); //console.log(this.employeeService.hrEmployee.birthDate.getFullYear());
} }
this.loadRoleState(); this.userService.getAllRoles().subscribe(
(resp: any) => {
this._allroles = resp;
this._allroles = this._allroles.filter(r => r.roleType == EnumRoleType.Self_Service);
},
(err: any) => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showError(err.error);
},
() => {
var emp: SearchEmployee[] = [];
this._selectedUserRoles = [];
var srchemp = new SearchEmployee();
srchemp.employeeID = this.employeeService.hrEmployee.id;
emp.push(srchemp);
this.userService.GetEmpUserRole(emp).subscribe(
(resp: any) => {
debugger;
var userRoles: UserRole[] = resp;
if (userRoles != undefined && userRoles.length > 0) {
userRoles.forEach(y => {
this._selectedUserRoles.push(y.roleID);
}
);
}
this._selectedUserRoles = [...this._selectedUserRoles];
},
(err: any) => {
this.loadingPanel.ShowLoadingPanel = false;
this.notificationService.showError(err.error);
},
() => {
this.loadingPanel.ShowLoadingPanel = false;
}
);
}
);
}); });
} }
} }

View File

@ -673,7 +673,6 @@
</div> </div>
@if (showModal) { @if (showModal) {
<div class="card" class="blur-background">
<kendo-dialog (close)="onPopUpClose()" [minWidth]="390"> <kendo-dialog (close)="onPopUpClose()" [minWidth]="390">
<kendo-dialog-titlebar>Access Types</kendo-dialog-titlebar> <kendo-dialog-titlebar>Access Types</kendo-dialog-titlebar>
<div class="grid"> <div class="grid">
@ -691,7 +690,6 @@
</div> </div>
</div> </div>
</kendo-dialog> </kendo-dialog>
</div>
} }
@if (showAttachment) { @if (showAttachment) {

View File

@ -44,9 +44,7 @@ import {
imageIcon, imageIcon,
shareIcon, shareIcon,
zoomInIcon, zoomInIcon,
zoomOutIcon, zoomOutIcon
copyIcon,
forwardIcon
} from '@progress/kendo-svg-icons'; } from '@progress/kendo-svg-icons';
@NgModule({}) @NgModule({})
@ -95,8 +93,6 @@ export class KendoIconsModule {
image: imageIcon, image: imageIcon,
share: shareIcon, share: shareIcon,
zoomIn: zoomInIcon, zoomIn: zoomInIcon,
zoomOut: zoomOutIcon, zoomOut: zoomOutIcon
copy : copyIcon,
forward : forwardIcon
}; };
} }

View File

@ -54,7 +54,7 @@ export class GradeListComponent implements OnInit {
this.msv.entryFrom.iDColumnName = 'id'; this.msv.entryFrom.iDColumnName = 'id';
this.msv.entryFrom.sourceObject = 'Grade'; this.msv.entryFrom.sourceObject = 'Grade';
var Item: BasicEntryFormControl = this.msv.entryFrom.AddControl('Code', 'Code', EnumDynamicControlType.TextBox, '', true, EnumDefaultValidatorType.Custom, 256, 2); var Item: BasicEntryFormControl = this.msv.entryFrom.AddControl('Code', 'Code', EnumDynamicControlType.TextBox, '', true, EnumDefaultValidatorType.Custom, 256, 3);
//Item.codeAutoGenerate = true; //Item.codeAutoGenerate = true;
//var Item: BasicEntryFormControl = this.msv.entryFrom.AddControl('Code', 'Code', EnumDynamicControlType.TextBox, '', true, EnumDefaultValidatorType.Custom, 256, 1); //var Item: BasicEntryFormControl = this.msv.entryFrom.AddControl('Code', 'Code', EnumDynamicControlType.TextBox, '', true, EnumDefaultValidatorType.Custom, 256, 1);

View File

@ -1,6 +1,6 @@
<app-loading-panel></app-loading-panel> <app-loading-panel></app-loading-panel>
<div class="col-12"> <div class="col-12">
<kendo-grid [data]="adparameters" class="grid-header-nowrap grid-cell-wrap" <kendo-grid [data]="adparameters"
(add)="addHandler()" (add)="addHandler()"
(edit)="editHandler($event)"> (edit)="editHandler($event)">
@ -17,14 +17,14 @@
<kendo-grid-column field="allowDeductName" title="Allowance/Deduction" width="20%"> <kendo-grid-column field="allowDeductName" title="Allowance/Deduction" width="20%">
</kendo-grid-column> </kendo-grid-column>
<kendo-grid-column field="gradeNames" title="Grades" width="40%"> <kendo-grid-column field="gradeNames" title="Grades" width="45%">
</kendo-grid-column> </kendo-grid-column>
<kendo-grid-column field="periodicity" title="Periodicity" width="10%"> <kendo-grid-column field="periodicity" title="Periodicity" width="10%">
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex"> <ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
{{preodicityString(rowIndex)}} {{preodicityString(rowIndex)}}
</ng-template> </ng-template>
</kendo-grid-column> </kendo-grid-column>
<kendo-grid-column field="isTaxable" title="Taxable ?" width="10%"> <kendo-grid-column field="isTaxable" title="Taxable ?" width="5%">
<ng-template kendoGridCellTemplate let-dataItem> <ng-template kendoGridCellTemplate let-dataItem>
{{dataItem.isTaxable ? 'Yes' : 'No'}} {{dataItem.isTaxable ? 'Yes' : 'No'}}
</ng-template> </ng-template>

View File

@ -60,8 +60,7 @@ kendo-numerictextbox{
/* the four check boxes in two even columns, starting under the inputs (label width + gap) */ /* the four check boxes in two even columns, starting under the inputs (label width + gap) */
.adp-checks { .adp-checks {
display: grid; display: grid;
/* two columns while they fit, one column when the section gets narrow */ grid-template-columns: repeat(2, minmax(0, 1fr));
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
gap: 8px 12px; gap: 8px 12px;
margin: 4px 0 0 120px; margin: 4px 0 0 120px;
padding: 10px 12px; padding: 10px 12px;
@ -70,25 +69,16 @@ kendo-numerictextbox{
background: #fafbfc; background: #fafbfc;
} }
/* a long label wraps inside its own column instead of running out of the box */
.adp-check { .adp-check {
display: flex; display: flex;
align-items: flex-start; align-items: center;
gap: 6px; gap: 6px;
margin: 0; margin: 0;
min-width: 0; white-space: nowrap;
}
.adp-check input {
flex: 0 0 auto;
margin-top: 2px;
} }
.adp-check .k-checkbox-label { .adp-check .k-checkbox-label {
margin: 0; margin: 0;
min-width: 0;
white-space: normal;
overflow-wrap: anywhere;
} }
/* the tab panels on this page are empty (only the headers are used), so drop their padding */ /* the tab panels on this page are empty (only the headers are used), so drop their padding */

View File

@ -9,18 +9,6 @@
padding: 0 !important; padding: 0 !important;
} }
// Opt-in: keep every column title of a grid on one line (overrides the wrapping default above).
.k-grid.grid-header-nowrap .k-column-title {
white-space: nowrap;
}
// Opt-in: body cell values wrap inside their column, even a long value with no spaces
// (e.g. "AVP,SPO,PO,FAVP,...").
.k-grid.grid-cell-wrap .k-grid-content td {
white-space: normal;
overflow-wrap: anywhere;
}
// Compact "dashboard widget" grid header variant (ESS dashboards), scoped under .dashboard-card // Compact "dashboard widget" grid header variant (ESS dashboards), scoped under .dashboard-card
// so it doesn't change the app-wide default .k-grid-header color set in styles.scss. // so it doesn't change the app-wide default .k-grid-header color set in styles.scss.
.dashboard-card .k-grid-header { .dashboard-card .k-grid-header {

View File

@ -1,4 +1,4 @@
{ {
"version": "20261118-02", "version": "20261115-03",
"buildTime": "2026-11-18T08:51:48.7258631Z" "buildTime": "2026-11-15T08:30:42.0805569Z"
} }

View File

@ -43,7 +43,6 @@ namespace HRM.UI.Configuration.DI
services.AddTransient<IUserService, UserService>(); services.AddTransient<IUserService, UserService>();
services.AddTransient<IUserLogInInfoService, UserLogInInfoService>(); services.AddTransient<IUserLogInInfoService, UserLogInInfoService>();
services.AddTransient<IBadLoginAttemptInfoService, BadLoginAttemptInfoService>(); services.AddTransient<IBadLoginAttemptInfoService, BadLoginAttemptInfoService>();
services.AddTransient<ISystemAuditHistoryService, SystemAuditHistoryService>();
services.AddTransient<IPasswordHistoryService, PasswordHistoryService>(); services.AddTransient<IPasswordHistoryService, PasswordHistoryService>();
services.AddTransient<ISearchEmployeeService, SearchEmployeeService>(); services.AddTransient<ISearchEmployeeService, SearchEmployeeService>();
services.AddTransient<IHREmployeeService, HREmployeeService>(); services.AddTransient<IHREmployeeService, HREmployeeService>();

View File

@ -55,7 +55,6 @@ namespace HRM.UI.Controllers
private readonly IMemoryCache _cache; private readonly IMemoryCache _cache;
private readonly IUserLogInInfoService _userLogInInfoService; private readonly IUserLogInInfoService _userLogInInfoService;
private readonly IBadLoginAttemptInfoService _badLoginAttemptInfoService; private readonly IBadLoginAttemptInfoService _badLoginAttemptInfoService;
private readonly ISystemAuditHistoryService _systemAuditHistoryService;
public AuthController(IConfiguration config, public AuthController(IConfiguration config,
IUserService userService, IUserService userService,
@ -74,8 +73,7 @@ namespace HRM.UI.Controllers
ISmsService smsService, ISmsService smsService,
IMemoryCache cache, IMemoryCache cache,
IUserLogInInfoService userLogInInfoService, IUserLogInInfoService userLogInInfoService,
IBadLoginAttemptInfoService badLoginAttemptInfoService, IBadLoginAttemptInfoService badLoginAttemptInfoService)
ISystemAuditHistoryService systemAuditHistoryService)
{ {
_config = config; _config = config;
_jwt = jwtOptions.Value; _jwt = jwtOptions.Value;
@ -96,7 +94,6 @@ namespace HRM.UI.Controllers
_cache = cache; _cache = cache;
_userLogInInfoService = userLogInInfoService; _userLogInInfoService = userLogInInfoService;
_badLoginAttemptInfoService = badLoginAttemptInfoService; _badLoginAttemptInfoService = badLoginAttemptInfoService;
_systemAuditHistoryService = systemAuditHistoryService;
} }
[HttpPost] [HttpPost]
@ -297,14 +294,6 @@ namespace HRM.UI.Controllers
if (userForLoginDto.IsSSO) if (userForLoginDto.IsSSO)
{ {
userFromRepo = _userService.GetByEmail(userForLoginDto.Email); userFromRepo = _userService.GetByEmail(userForLoginDto.Email);
// Same rule as the password sign-in (UserDA.GetByLoginIDAndPassword: Status 1 or 5): a login that
// is not switched on (waiting for approval, rejected, inactive, ...) cannot sign in by SSO either.
if (userFromRepo != null
&& userFromRepo.UserStatus != EnumAuthStatus.Active
&& userFromRepo.UserStatus != EnumAuthStatus.Approved)
{
userFromRepo = null;
}
if (userFromRepo != null && userForLoginDto.nextPayProcessDate == null) if (userFromRepo != null && userForLoginDto.nextPayProcessDate == null)
{ {
List<PayrollType> payrollTypes = new List<PayrollType>(); List<PayrollType> payrollTypes = new List<PayrollType>();
@ -435,12 +424,6 @@ namespace HRM.UI.Controllers
{ {
return BadRequest("Access Type and process date is not valid."); return BadRequest("Access Type and process date is not valid.");
} }
else if (userFromRepo.UserType == EnumUserType.User
&& !this._payrollTypeService.GetPayrollTypes(userFromRepo.LoginID).Any(p => p.ID == userForLoginDto.payrollTypeid))
{
// Only an approved (live) access type may be used to sign in; a requested one is not live yet.
return BadRequest("You do not have approved access to the selected Access Type.");
}
else if (userFromRepo.UserType == EnumUserType.Employee) else if (userFromRepo.UserType == EnumUserType.Employee)
{ {
DateTime eocd= _userService.GetEndofContractDate(userForLoginDto.Username); DateTime eocd= _userService.GetEndofContractDate(userForLoginDto.Username);
@ -756,26 +739,6 @@ namespace HRM.UI.Controllers
return Ok(new { userToken }); return Ok(new { userToken });
} }
[HttpPost("CipherMechanism")]
public ActionResult CipherMechanism(dynamic data)
{
var item = Newtonsoft.Json.JsonConvert.DeserializeObject(Convert.ToString(data));
string decryptedvalue = (string)item["decryptedvalue"].ToObject<string>();
var encryptedValue = "";
try
{
if (!string.IsNullOrEmpty(decryptedvalue))
{
encryptedValue = Ease.NetCore.Utility.Global.CipherFunctions.Encrypt("CeLiMiTeD.AdMIn", decryptedvalue.Trim());
}
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return Ok(encryptedValue);
}
// Clears the HttpOnly "JWToken" cookie the API authenticates from (see Startup), so the // Clears the HttpOnly "JWToken" cookie the API authenticates from (see Startup), so the
// session really ends on logout. Anonymous so an invalid/expired cookie can still be removed. // session really ends on logout. Anonymous so an invalid/expired cookie can still be removed.
[HttpPost("logOut")] [HttpPost("logOut")]
@ -864,11 +827,6 @@ namespace HRM.UI.Controllers
{ {
PayrollType optype = new PayrollTypeService().Get(payrollTypeId); PayrollType optype = new PayrollTypeService().Get(payrollTypeId);
User oempUser = new UserService().Get(ouser.ID); User oempUser = new UserService().Get(ouser.ID);
// Only an approved (live) access type may be switched to.
if (oempUser == null || !this._payrollTypeService.GetPayrollTypes(oempUser.LoginID).Any(p => p.ID == payrollTypeId))
{
return BadRequest("You do not have approved access to this Access Type.");
}
token = this.CreateToten(oempUser, optype.ID, optype.NextPayProcessDate); token = this.CreateToten(oempUser, optype.ID, optype.NextPayProcessDate);
} }
catch (Exception e) catch (Exception e)
@ -939,21 +897,6 @@ namespace HRM.UI.Controllers
return BadRequest("Your account is now locked. Please contact with your Line Manager."); return BadRequest("Your account is now locked. Please contact with your Line Manager.");
} }
// Only an approved (live) access type may be switched to: the same list the ESS
// switch shows (getAdminPayrollTypes).
List<PayrollType> liveAccessTypes = this._payrollTypeService.GetUsersAdminPayrollTypes((int)currentUser.EmployeeID);
if (!liveAccessTypes.Any(p => p.ID == payrollTypeId))
{
if (item["payrollTypeId"] != null || liveAccessTypes.Count == 0)
{
return BadRequest("You do not have approved access to this Access Type.");
}
// No type was chosen and the employee's own one is not an approved access:
// use the first approved one instead.
payrollTypeId = liveAccessTypes[0].ID;
optype = new PayrollTypeService().Get(payrollTypeId);
}
#region Save User Login History #region Save User Login History
if (guser != null) if (guser != null)
{ {
@ -1300,14 +1243,8 @@ namespace HRM.UI.Controllers
public ActionResult SaveRole(Role role) public ActionResult SaveRole(Role role)
{ {
int id = 0; int id = 0;
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User); CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
try
{
User actingUser = this._userService.Get(currentUser.UserID);
if (actingUser == null || (actingUser.UserType != EnumUserType.SuperUser && actingUser.SISU != true))
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to create, edit or approve roles.");
}
if (role.IsNew == true) if (role.IsNew == true)
{ {
role.CreatedBy = currentUser.UserID; role.CreatedBy = currentUser.UserID;
@ -1316,56 +1253,20 @@ namespace HRM.UI.Controllers
} }
else else
{ {
Role existingRole = this._roleService.Get(role.ID);
if (existingRole == null)
{
return BadRequest("Role not found.");
}
bool isPending = existingRole.RoleStatus == EnumAuthStatus.NewNotYetApprove
|| existingRole.RoleStatus == EnumAuthStatus.EditedNotYetApprove
|| existingRole.RoleStatus == EnumAuthStatus.DeletedNotYetApprove;
if (role.RoleStatus == EnumAuthStatus.Approved)
{
if (!isPending)
{
return BadRequest("This role has no pending change to approve.");
}
int makerID = (existingRole.ModifiedBy ?? 0) > 0 ? existingRole.ModifiedBy.Value : existingRole.CreatedBy;
if (makerID == currentUser.UserID)
{
return BadRequest("You cannot approve a change you made yourself. Another user must approve it.");
}
}
else
{
if (isPending)
{
return BadRequest("This role is waiting for approval and cannot be edited.");
}
role.RoleStatus = EnumAuthStatus.EditedNotYetApprove;
}
role.CreatedBy = existingRole.CreatedBy;
role.CreatedDate = existingRole.CreatedDate;
// The browser does not send Sequence either; keep the role's own value instead of 0.
role.Sequence = existingRole.Sequence;
role.ApproveDate = null; role.ApproveDate = null;
role.ApproveBy = null; role.ApproveBy = null;
if (role.RoleStatus == EnumAuthStatus.Approved)
{
role.ModifiedBy = existingRole.ModifiedBy;
role.ModifiedDate = existingRole.ModifiedDate;
}
else
{
role.ModifiedBy = currentUser.UserID; role.ModifiedBy = currentUser.UserID;
role.ModifiedDate = DateTime.Now; role.ModifiedDate = DateTime.Now;
} }
}
if (role.RoleStatus == EnumAuthStatus.Approved) if (role.RoleStatus == EnumAuthStatus.Approved)
{ {
role.ApproveDate = DateTime.Today; role.ApproveDate = DateTime.Today;
role.ApproveBy = currentUser.UserID; role.ApproveBy = currentUser.UserID;
} }
try
{
id = this._roleService.Save(role); id = this._roleService.Save(role);
} }
catch (Exception e) catch (Exception e)
@ -1375,43 +1276,6 @@ namespace HRM.UI.Controllers
return Ok(id); return Ok(id);
} }
//[HttpPost("saveRole")]
//public ActionResult SaveRole(Role role)
//{
// int id = 0;
// CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
// if (role.IsNew == true)
// {
// role.CreatedBy = currentUser.UserID;
// role.CreatedDate = DateTime.Now;
// role.RoleStatus = EnumAuthStatus.NewNotYetApprove;
// }
// else
// {
// role.ApproveDate = null;
// role.ApproveBy = null;
// role.ModifiedBy = currentUser.UserID;
// role.ModifiedDate = DateTime.Now;
// }
// if (role.RoleStatus == EnumAuthStatus.Approved)
// {
// role.ApproveDate = DateTime.Today;
// role.ApproveBy = currentUser.UserID;
// }
// try
// {
// id = this._roleService.Save(role);
// }
// catch (Exception e)
// {
// return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
// }
// return Ok(id);
//}
[HttpPost("GetEmpUserRole")] [HttpPost("GetEmpUserRole")]
public ActionResult GetEmpUserRole(List<SearchEmployee> searchEmps) public ActionResult GetEmpUserRole(List<SearchEmployee> searchEmps)
@ -1420,12 +1284,6 @@ namespace HRM.UI.Controllers
try try
{ {
// Admin screens only (Employee Profile's access permission): a self-service login may not read roles.
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
if (currentUser.UserType == EnumUserType.Employee)
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to see user roles.");
}
ouroles = this._userRoleService.Get(searchEmps); ouroles = this._userRoleService.Get(searchEmps);
} }
catch (Exception e) catch (Exception e)
@ -1444,12 +1302,6 @@ namespace HRM.UI.Controllers
int? nroleid = GlobalFunctions.GetApiDefaultIntData(roleid); int? nroleid = GlobalFunctions.GetApiDefaultIntData(roleid);
try try
{ {
// Only the User Role Permission page reads this list (super users only, like its other endpoints).
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
if (!CanManageUserRole(currentUser))
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to see user roles.");
}
items = this._userRoleService.Get(roletype, nuserid, nroleid); items = this._userRoleService.Get(roletype, nuserid, nroleid);
// employee Name, Login-Status, status1, statu2, statu3 // employee Name, Login-Status, status1, statu2, statu3
@ -1559,330 +1411,6 @@ namespace HRM.UI.Controllers
return Ok(); return Ok();
} }
#region User Role Permission maker-checker
// Only super users manage role assignments (the page is in WebMenu.AdminMenus only), the same
// rule as User Access Type.
private bool CanManageUserRole(CurrentUser currentUser)
{
return CanManageUserAccessType(currentUser);
}
// The Super User login that makes a role change in this session: the session's own login when it
// is a super user, otherwise the super user login linked to the same employee (a super user who
// has switched to Admin or ESS, e.g. on Employee Profile > Role Permission). The change is
// recorded under that super user, so the same person cannot approve it after switching back.
// Null when the person is not a super user.
private int? UserRoleMakerID(CurrentUser currentUser)
{
if (CanManageUserRole(currentUser))
return currentUser.UserID;
try
{
if ((currentUser.EmployeeID ?? 0) <= 0)
return null;
int superUserID = this._userService.GetUserId((int)currentUser.EmployeeID, EnumUserType.SuperUser);
return superUserID > 0 ? superUserID : (int?)null;
}
catch (Exception)
{
// A login with no linked employee.
return null;
}
}
// Whether this session may send role changes (shows the Employee Profile > Role Permission tab).
[HttpGet("CanMakeUserRoleChange")]
public ActionResult CanMakeUserRoleChange()
{
try
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
return Ok(UserRoleMakerID(currentUser) != null);
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
}
// Admin requests are about a User-type login; Self Service requests about an employee + payroll type.
private static string CheckUserRoleSubject(UserRoleSubject subject)
{
if (subject == null)
return "Select a user or an employee.";
if (subject.RoleType == EnumRoleType.Admin)
return (subject.UserID ?? 0) > 0 ? null : "Select a user.";
if (subject.RoleType == EnumRoleType.Self_Service)
return (subject.EmployeeID ?? 0) > 0 || (subject.UserID ?? 0) > 0 ? null : "Select an employee.";
return "Select Admin or Self Service.";
}
// Who made the pending change (the same maker for every request of one change).
private static bool IsUserRoleMaker(UserRoleState state, int userID)
{
return state.Pending.Any(p => p.CreatedBy == userID);
}
// The person's live roles of one role type, and any change waiting for approval.
[HttpGet("GetUserRoleState/{roleType}/{userID}/{employeeID}")]
public ActionResult GetUserRoleState(EnumRoleType roleType, int userID, int employeeID)
{
try
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
if (UserRoleMakerID(currentUser) == null)
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to manage user roles.");
}
UserRoleSubject subject = new UserRoleSubject
{
RoleType = roleType,
UserID = userID > 0 ? userID : (int?)null,
EmployeeID = employeeID > 0 ? employeeID : (int?)null,
};
string problem = CheckUserRoleSubject(subject);
if (problem != null)
{
return BadRequest(problem);
}
return Ok(this._userRoleService.GetRoleState(subject));
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
}
// Maker: the ticked roles become pending requests; nothing is live until approved.
[HttpPost("SaveUserRoleRequest")]
public ActionResult SaveUserRoleRequest(UserRoleChangeRequest request)
{
try
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
int? makerID = UserRoleMakerID(currentUser);
if (makerID == null)
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to change user roles.");
}
string problem = CheckUserRoleSubject(request);
if (problem != null)
{
return BadRequest(problem);
}
if (request.RoleType == EnumRoleType.Admin)
{
User target = this._userService.Get(request.UserID.Value);
if (target == null || target.UserType != EnumUserType.User)
{
return BadRequest("Select a valid admin user.");
}
}
UserRoleState state = this._userRoleService.GetRoleState(request);
if (state.Pending.Count > 0)
{
return BadRequest("This person already has a role change waiting for approval. Approve or reject it first.");
}
// A Self Service employee with no login gets one with this change: it needs the payroll type.
if (request.RoleType == EnumRoleType.Self_Service && !state.HasLogin && (request.PayrollTypeID ?? 0) <= 0)
{
return BadRequest("Select a payroll type.");
}
// Every wanted role must be of this role type; a role the person does not have yet must
// also be approved (a role still waiting for its own approval cannot be given).
List<int> wanted = (request.RoleIDs ?? new List<int>()).Distinct().ToList();
List<Role> allRoles = this._roleService.GetAllRole();
foreach (int roleID in wanted)
{
Role role = allRoles.FirstOrDefault(r => r.ID == roleID);
if (role == null || role.RoleType != request.RoleType)
{
return BadRequest("Invalid role for this role type.");
}
bool live = state.LiveRoleIDs.Contains(roleID);
bool approved = role.RoleStatus == EnumAuthStatus.Approved || role.RoleStatus == EnumAuthStatus.Active;
if (!live && !approved)
{
return BadRequest("Role '" + role.Name + "' is not approved yet, so it cannot be given.");
}
}
request.RoleIDs = wanted;
int changed = this._userRoleService.RequestChange(request, makerID.Value);
if (changed == 0)
{
return BadRequest("Nothing changed.");
}
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return Ok(true);
}
// Checker: makes the person's pending role change live. The maker cannot approve.
[HttpPost("ApproveUserRole")]
public ActionResult ApproveUserRole(UserRoleSubject subject)
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
string problem;
try
{
if (!CanManageUserRole(currentUser))
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to approve user roles.");
}
problem = DecideUserRole(subject, true, currentUser);
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return problem == null ? Ok(true) : BadRequest(problem);
}
// Checker: drops the person's pending role change; live roles stay as they were. The maker cannot reject.
[HttpPost("RejectUserRole")]
public ActionResult RejectUserRole(UserRoleSubject subject)
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
string problem;
try
{
if (!CanManageUserRole(currentUser))
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to reject user roles.");
}
problem = DecideUserRole(subject, false, currentUser);
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return problem == null ? Ok(true) : BadRequest(problem);
}
// Checker, many people at once: each one is decided on its own, with the same checks, so one
// that cannot be decided does not stop the rest. Returns { done, failed: [{ index, message }] }.
[HttpPost("ApproveUserRoles")]
public ActionResult ApproveUserRoles(List<UserRoleSubject> subjects)
{
return DecideUserRoles(subjects, true);
}
[HttpPost("RejectUserRoles")]
public ActionResult RejectUserRoles(List<UserRoleSubject> subjects)
{
return DecideUserRoles(subjects, false);
}
// Every role change waiting for approval, of everyone (Pending approvals list).
[HttpGet("GetPendingUserRoles")]
public ActionResult GetPendingUserRoles()
{
try
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
if (!CanManageUserRole(currentUser))
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to see user role approvals.");
}
return Ok(this._userRoleService.GetPending());
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
}
private ActionResult DecideUserRoles(List<UserRoleSubject> subjects, bool approve)
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
try
{
if (!CanManageUserRole(currentUser))
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to approve or reject user roles.");
}
if (subjects == null || subjects.Count == 0)
{
return BadRequest("Select at least one person.");
}
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
int done = 0;
var failed = new List<object>();
for (int i = 0; i < subjects.Count; i++)
{
try
{
string problem = DecideUserRole(subjects[i], approve, currentUser);
if (problem == null)
done++;
else
failed.Add(new { index = i, message = problem });
}
catch (Exception e)
{
failed.Add(new { index = i, message = e.Message });
}
}
return Ok(new { done, failed });
}
// Returns null when decided, or why it could not be.
private string DecideUserRole(UserRoleSubject subject, bool approve, CurrentUser currentUser)
{
string problem = CheckUserRoleSubject(subject);
if (problem != null)
return problem;
UserRoleState state = this._userRoleService.GetRoleState(subject);
if (state.Pending.Count == 0)
return "No role change is waiting for approval.";
if (IsUserRoleMaker(state, currentUser.UserID))
return approve
? "You cannot approve a change you made yourself. Another user must approve it."
: "You cannot reject a change you made yourself. Another user must reject it.";
if (approve)
{
// A role given in this change must still be approved now: it may have been edited (and be
// waiting for its own approval) on the Role page since the change was sent.
List<int> giving = state.Pending
.Where(p => p.RequestType == EnumUserRoleRequestType.Add)
.Select(p => p.RoleID).Distinct().ToList();
if (giving.Count > 0)
{
List<Role> allRoles = this._roleService.GetAllRole();
foreach (int roleID in giving)
{
Role role = allRoles.FirstOrDefault(r => r.ID == roleID);
if (role == null)
return "A role in this change no longer exists. Reject the change and send it again.";
if (role.RoleStatus != EnumAuthStatus.Approved && role.RoleStatus != EnumAuthStatus.Active)
return "Role '" + role.Name + "' is not approved now (it may be waiting for its own approval on the Role page), so it cannot be given yet. Approve the role first, or reject this change.";
}
}
}
if (approve)
this._userRoleService.Approve(subject, currentUser.UserID);
else
this._userRoleService.Reject(subject, currentUser.UserID);
return null;
}
#endregion
[HttpGet("GetUserAccessType/{userid}")] [HttpGet("GetUserAccessType/{userid}")]
public ActionResult GetUserAccessType(int userid) public ActionResult GetUserAccessType(int userid)
{ {
@ -1899,65 +1427,20 @@ namespace HRM.UI.Controllers
return Ok(items); return Ok(items);
} }
// Maker-checker for User Access Type. The page is in the super-user menu only
// (WebMenu.AdminMenus, given to SuperUser / SISU users), so only they may request or decide.
private bool CanManageUserAccessType(CurrentUser currentUser)
{
User actingUser = this._userService.Get(currentUser.UserID);
return actingUser != null && (actingUser.UserType == EnumUserType.SuperUser || actingUser.SISU == true);
}
private static bool IsPendingAccess(UserAccessType x)
{
return x.AccessTypeStatus == EnumAuthStatus.NewNotYetApprove
|| x.AccessTypeStatus == EnumAuthStatus.DeletedNotYetApprove;
}
// Who made a pending row: the requester of a new access, or of a removal.
private static int AccessMakerID(UserAccessType x)
{
return x.AccessTypeStatus == EnumAuthStatus.DeletedNotYetApprove ? (x.ModifiedBy ?? 0) : x.CreatedBy;
}
// Maker: the ticked payroll types become pending changes; nothing is live until approved.
[HttpPost("SaveUserAccessType")] [HttpPost("SaveUserAccessType")]
public ActionResult SaveUserAccessType(List<UserAccessType> userAccessTypes) public ActionResult SaveUserAccessType(List<UserAccessType> userAccessTypes)
{ {
try try
{ {
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User); CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
if (!CanManageUserAccessType(currentUser)) userAccessTypes.ForEach(x =>
{ {
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to change user access types."); x.CreatedBy = currentUser.UserID;
} x.CreatedDate = DateTime.Today;
if (userAccessTypes == null || userAccessTypes.Count == 0) x.ApprovedBy = currentUser.UserID;
{ x.ApprovedDate = DateTime.Today;
return BadRequest("Select at least one payroll type."); });
} this._userAccessTypeService.Save(userAccessTypes);
int userID = userAccessTypes[0].UserID;
if (userID <= 0 || userAccessTypes.Any(x => x.UserID != userID))
{
return BadRequest("Select a user.");
}
List<int> payrollTypeIDs = userAccessTypes.Select(x => x.PayrollTypeID).Distinct().ToList();
List<PayrollType> allPayrollTypes = this._payrollTypeService.Get();
if (payrollTypeIDs.Any(id => !allPayrollTypes.Any(p => p.ID == id)))
{
return BadRequest("Invalid payroll type.");
}
if (this._userAccessTypeService.GetByUserID(userID).Any(IsPendingAccess))
{
return BadRequest("This user already has an access change waiting for approval. Approve or reject it first.");
}
int changed = this._userAccessTypeService.RequestChange(userID, payrollTypeIDs, currentUser.UserID);
if (changed == 0)
{
return BadRequest("Nothing changed.");
}
} }
catch (Exception e) catch (Exception e)
{ {
@ -1967,156 +1450,6 @@ namespace HRM.UI.Controllers
return Ok(true); return Ok(true);
} }
// Checker: makes the user's pending access changes live. The maker cannot approve.
[HttpPost("ApproveUserAccessType/{userID}")]
public ActionResult ApproveUserAccessType(int userID)
{
try
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
if (!CanManageUserAccessType(currentUser))
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to approve user access types.");
}
List<UserAccessType> pending = this._userAccessTypeService.GetByUserID(userID).Where(IsPendingAccess).ToList();
if (pending.Count == 0)
{
return BadRequest("This user has no access change waiting for approval.");
}
if (pending.Any(x => AccessMakerID(x) == currentUser.UserID))
{
return BadRequest("You cannot approve a change you made yourself. Another user must approve it.");
}
this._userAccessTypeService.Approve(userID, currentUser.UserID);
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return Ok(true);
}
// Checker: drops the user's pending access changes; access stays as it was. The maker cannot reject.
[HttpPost("RejectUserAccessType/{userID}")]
public ActionResult RejectUserAccessType(int userID)
{
try
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
if (!CanManageUserAccessType(currentUser))
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to reject user access types.");
}
List<UserAccessType> pending = this._userAccessTypeService.GetByUserID(userID).Where(IsPendingAccess).ToList();
if (pending.Count == 0)
{
return BadRequest("This user has no access change waiting for approval.");
}
if (pending.Any(x => AccessMakerID(x) == currentUser.UserID))
{
return BadRequest("You cannot reject a change you made yourself. Another user must reject it.");
}
this._userAccessTypeService.Reject(userID, currentUser.UserID);
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return Ok(true);
}
// Pending approvals list: every user access change waiting for approval, one row per payroll type.
[HttpGet("GetPendingUserAccessTypes")]
public ActionResult GetPendingUserAccessTypes()
{
try
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
if (!CanManageUserAccessType(currentUser))
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to see user access type approvals.");
}
return Ok(this._userAccessTypeService.GetPending());
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
}
// Checker, many users at once: approves each user's pending change on its own, with the same
// checks as ApproveUserAccessType, so one user that cannot be approved does not stop the rest.
[HttpPost("ApproveUserAccessTypes")]
public ActionResult ApproveUserAccessTypes(List<int> userIDs)
{
return DecideUserAccessTypes(userIDs, true);
}
// Checker, many users at once: rejects each user's pending change on its own (see ApproveUserAccessTypes).
[HttpPost("RejectUserAccessTypes")]
public ActionResult RejectUserAccessTypes(List<int> userIDs)
{
return DecideUserAccessTypes(userIDs, false);
}
private ActionResult DecideUserAccessTypes(List<int> userIDs, bool approve)
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
try
{
if (!CanManageUserAccessType(currentUser))
{
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to approve or reject user access types.");
}
if (userIDs == null || userIDs.Count == 0)
{
return BadRequest("Select at least one user.");
}
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
int done = 0;
var failed = new List<object>();
foreach (int userID in userIDs.Distinct())
{
try
{
List<UserAccessType> pending = this._userAccessTypeService.GetByUserID(userID).Where(IsPendingAccess).ToList();
if (pending.Count == 0)
{
failed.Add(new { userID, message = "No access change waiting for approval." });
continue;
}
if (pending.Any(x => AccessMakerID(x) == currentUser.UserID))
{
failed.Add(new { userID, message = "You made this change yourself; another user must decide it." });
continue;
}
if (approve)
this._userAccessTypeService.Approve(userID, currentUser.UserID);
else
this._userAccessTypeService.Reject(userID, currentUser.UserID);
done++;
}
catch (Exception e)
{
failed.Add(new { userID, message = e.Message });
}
}
return Ok(new { done, failed });
}
// password history // password history
//[HttpGet] //[HttpGet]
//[Route("getPasswordHistoryList")] //[Route("getPasswordHistoryList")]
@ -2499,38 +1832,6 @@ namespace HRM.UI.Controllers
return Ok(items); return Ok(items);
} }
// Change history of the Role, Role Permission, User, User Role and User Access Type pages,
// read from their Z_ tables (SystemAuditHistory_DB_Changes.sql). type = EnumSystemAuditHistory.
[HttpGet]
[Route("getSystemAuditHistory/{type}/{fromDate}/{toDate}")]
public ActionResult GetSystemAuditHistory(int type, string fromDate, string toDate)
{
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
if (currentUser.UserType == EnumUserType.Employee)
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to view the audit trail.");
if (!Enum.IsDefined(typeof(EnumSystemAuditHistory), type))
return StatusCode(StatusCodes.Status400BadRequest, "Unknown audit history.");
List<SystemAuditHistory> items = new List<SystemAuditHistory>();
try
{
DateTime dFromDate = GlobalFunctions.GetApiDefaultDateData(fromDate);
DateTime dToDate = GlobalFunctions.GetApiDefaultDateData(toDate);
if (dFromDate == DateTime.MinValue || dToDate == DateTime.MinValue)
return StatusCode(StatusCodes.Status400BadRequest, "From date and To date are required.");
if (dFromDate.Date > dToDate.Date)
return StatusCode(StatusCodes.Status400BadRequest, "From date can not be after To date.");
items = _systemAuditHistoryService.Get((EnumSystemAuditHistory)type, dFromDate, dToDate);
}
catch (Exception ex)
{
return StatusCode(StatusCodes.Status500InternalServerError, ex.Message);
}
return Ok(items);
}
#endregion #endregion
[HttpGet] [HttpGet]

View File

@ -52,8 +52,8 @@
//"Default": "provider=sql;sqlSyntax=SQL;server=103.197.204.164,1718;Database=MasterProjectDB;User Id=DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;", //"Default": "provider=sql;sqlSyntax=SQL;server=103.197.204.164,1718;Database=MasterProjectDB;User Id=DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;",
//"SqlCommandConnection": "Data Source=103.197.204.164,1718;Initial Catalog=autocrop;Persist Security Info=True; User ID=DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;", // Development //"SqlCommandConnection": "Data Source=103.197.204.164,1718;Initial Catalog=autocrop;Persist Security Info=True; User ID=DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;", // Development
"Default": "provider=sql;sqlSyntax=SQL;server=103.197.204.164,1718;Database=MasterProjectDBBRAC;User Id= DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;", "Default": "provider=sql;sqlSyntax=SQL;server=103.197.204.164,1718;Database=MasterProjectDBUATBRAC;User Id= DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;",
"SqlCommandConnection": "Data Source=103.197.204.164,1718;Initial Catalog=MasterProjectDBBRAC;Persist Security Info=True; User ID=DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;" // Development "SqlCommandConnection": "Data Source=103.197.204.164,1718;Initial Catalog=MasterProjectDBUATBRAC;Persist Security Info=True; User ID=DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;" // Development
}, },
"Calendar": { "Calendar": {

View File

@ -1,913 +0,0 @@
CEL HRM · AUTHENTICATION / ADMINISTRATION
Super User Module
User Manual & Test Case Document
Application CEL HRM (HRM-10)
Scope
Every page available to a Super User: Home, Configuration, Role, User, User
Environment Role Permission, User Access Type, Change Password, Data Permission, Audit
Test users log, Cipher Engine — plus Login and Switch to Super-User
Test date
Test method Local development build (http://localhost:4200), version 20261118-01
SuperUser (direct Super User login) and d1210 (employee who switches to
Super User)
18 November 2026
Manual, run in a browser. Every screenshot in this document comes from that
run.
How to read the Status column. Pass = run during this test and behaved as expected. Fail = run and did not
behave as expected (see Section 13, Defects). Not Run = written for the tester but not executed here, because it
saves, approves or deletes real data (all maker-checker saves and approvals), or because it needs a second Super User
/ a file.
⚠ Read first: maker-checker
The Role, User, User Role Permission and User Access Type pages are maker-checker. The person who
creates or edits a change can neither edit it again nor approve it. A different Super User must
approve or reject it. Section 1 explains this in full; the boxes and the orange MAKER-CHECKER test cases
mark it on each page.
Contents
1. Overview: what a Super User is and the maker-checker rule
2. Login and Switch to Super-User
3. Home and the Administration menu
4. Configuration
5. Role
6. User
7. User Role Permission
8. User Access Type
9. Change Password
10. Data Permission
11. Audit log (System Audit Log)
12. Cipher Engine
13. Defects and observations found during testing
14. Test summary
1. Overview
A Super User is the system administrator of CEL HRM. A Super User does not run payroll, leave or attendance.
The Super User manages who can log in and what each person can see or do. The whole Super User menu
sits under Administration:
Menu Route What it is for
Home / Landing page after login
Configuration /authentication/configuration Upload or download the XML configuration files (UI, Logic,
Menu)
Role /authentication/role Create roles, give each role its menu permissions, approve role
changes
User /authentication/user Create, edit, deactivate, re-activate and approve login users
User Role /authentication/user-role Give users and employees their roles, and approve those changes
Permission
User Access Type /authentication/user-access- Choose which payroll types a user can work in, and approve
type those changes
Change Password /authentication/change- Change the logged-in user's own password
password
Data Permission /authentication/data-permssion Limit a user's data to certain Categories, Grades, Departments or
Locations
Audit log /authentication/system-auditlog Logins, failed logins, and the history of every change made on
the five pages above
Cipher Engine /authentication/cipher-engine Encrypt a text with the same cipher the system uses for
passwords
⚠ THE MOST IMPORTANT RULE: MAKER-CHECKER
Five pages follow maker-checker: Role (with Role Permission), User, User Role Permission and User
Access Type. The Super User who creates or edits something is the maker. A different Super User,
the checker, must approve it.
1. Nothing takes effect at once. A create, edit, deactivation or removal is saved as pending. It is live
only after approval.
2. A pending change is locked. While it waits, no one can edit it again, not even the maker. It must
be approved or rejected first.
3. The maker can never approve or reject their own change. The system blocks it, both on the
screen and on the server.
4. Only a different Super User can approve or reject. So every installation needs at least two Super
User accounts.
5. Every approval is recorded. It appears on the Audit log page with who did it and when.
Page Can the maker edit it again Can the maker approve / Who
Role Maker creates / edits reject it? approves
User while pending?
User Role Role and its menu NO – "This role is waiting for NO – "You cannot approve Another
Permission permissions approval and cannot be a change you made Super User
User Access edited." yourself."
Type
New user, edit, NO – only Approve / Reject is NO – "Created user and Another
deactivate, re-activate shown Approve user can't be Super User
Same."
Roles given to / taken NO – "Approve or reject it NO – marked "Your Another
change" Super User
from a person first."
Payroll types given to / NO – "Approve or reject it NO – marked "Your Another
change" Super User
taken from a user first."
The statuses you will see are:
Status Meaning
Active / Approved Live: the change is in effect
New – Not Yet Approved Newly requested. Not usable until it is approved
Removal / Deleted – Not Yet Approved Removal requested. Still usable until it is approved
Edited – Not Yet Approved An edit is waiting for approval
Inactive – Not Yet Approved A deactivation is waiting for approval
Inactive / Rejected Not usable
Every change made on these five pages is recorded and can be read on the Audit log page (Section 11).
2. Login and Switch to Super-User
There are two ways to reach the Super User screens:
Direct Super User login: log in with a Super User login ID (for example SuperUser ). The Administration
menu opens immediately.
Employee who is also a Super User: log in with your own employee login (for example d1210 ). You
land on the Employee Self Service dashboard. Open the profile menu (the round avatar at the top right)
and click Switch to Super-User. To go back, open the same menu and click Switch to ESS.
Step by step
1. Open the application. The login page appears.
2. Type the Username and Password, then click Sign In.
3. If you logged in with an employee login, click the avatar at the top right, then Switch to Super-User.
Figure 2.1 – Login page
Figure 2.2 – d1210 lands on the Employee Self Service dashboard
Figure 2.3 – Profile menu shows "Switch to Super-User"
Figure 2.4 – After switching: the Super User layout with the Administration menu
Figure 2.5 – In Super User mode the profile menu offers "Switch to ESS" to go back
Figure 2.6 – Direct login as SuperUser: the profile menu has no switch option
Test cases
TC ID Scenario Steps Expected Result Status
1. Open the application URL Pass
TC-LG-01 Login page loads Login page shows Username,
Password, Sign In and Forgot Pass
TC-LG-02 Direct Super User 1. Enter SuperUser and its Password?
login password
Dashboard opens with Home and
TC-LG-03 Employee login of a 2. Click Sign In the Administration menu
Super User
1. Enter d1210 and its password Employee Self Service dashboard Pass
TC-LG-04 Switch to Super- 2. Click Sign In
User opens
1. Logged in as d1210
TC-LG-05 Switch back to ESS 2. Click the avatar Super User layout opens with the Pass
3. Click Switch to Super-User
Administration menu
1. In Super User mode click the
avatar Employee Self Service dashboard Not Run
opens again
2. Click Switch to ESS
TC-LG-06 Direct Super User Menu shows the name, Change Pass
has no switch 1. Log in as SuperUser
option 2. Click the avatar Password and Sign Out only
TC-LG-07 Wrong password 1. Enter a valid login ID and a Error "Login ID/Password is Not Run
wrong password invalid". The attempt is recorded in Pass
TC-LG-08 Sign out Audit log › Bad Login Attempt
2. Click Sign In
User is signed out and the login
1. Click the avatar page is shown
2. Click Sign Out
3. Home and the Administration menu
The left sidebar holds the whole Super User menu. Click Administration to expand it, and click a menu item to
open its page. The hamburger icon (☰) at the top left collapses or expands the sidebar. The bell icon shows
notifications.
Figure 3.1 – Administration menu expanded
TC ID Scenario Steps Expected Result Status
TC-HM-01 Menu items shown 1. Log in as Super User Nine items: Configuration, Role, Pass
2. Click Administration
User, User Role Permission, User
Access Type, Change Password,
Data Permission, Audit log, Cipher
Engine
TC-HM-02 Every menu item 1. Click each menu item in turn The matching page opens, with its Pass
opens its page title shown in the top bar
4. Configuration
Purpose: upload or download the system's XML configuration files. There are three types:
UI: screen-level settings.
Logic: business rules that differ between clients (the *LogicConfiguration.xml files).
Menu: the menu tree (the *-Menu.xml files). Uploading a Menu file updates the menu names, links and
icons that roles can be given.
How to use
1. Select a Configuration type.
2. To download the current file of that type, click Download.
3. To upload, drag an .xml file onto the drop area or click Browse file, then click Upload. Only .xml files are
accepted. Use the X next to a chosen file to remove it.
Figure 4.1 – Configuration page; Upload and Download stay disabled until a type is chosen
Figure 4.2 – Configuration type list: UI, Logic, Menu
Figure 4.3 – Type "Menu" selected: Download is enabled; Upload waits for a file
TC ID Scenario Steps Expected Result Status
TC-CF-01 Page loads 1. Open Administration › Configuration type, file drop area, Pass
Configuration
Upload and Download are shown
1. Open the page and choose
TC-CF-02 Buttons disabled nothing Upload and Download are disabled Pass
without a type
TC ID Scenario Steps Expected Result Status
1. Open the Configuration type Options: UI, Logic, Menu Pass
TC-CF-03 Type list
dropdown Download becomes enabled Pass
TC-CF-04 Download enabled 1. Choose Menu
after choosing a
type 1. Choose a type
2. Click Download
TC-CF-05 Download a file 1. Choose a type The current XML of that type is Not Run
2. Pick a non-.xml file downloaded Not Run
TC-CF-06 Only .xml accepted 1. Choose Menu Not Run
2. Pick a valid Menu XML Warning "Only .xml files are
TC-CF-07 Upload a valid file 3. Click Upload accepted."; the file is not taken
Success message; the menu data is
updated
5. Role
⚠ MAKER-CHECKER RULE: ROLE
1. A change saved here is pending. It does not take effect until it is approved.
2. No one can edit it while it is pending, including the maker. On screen, the role list shows only
Approve on a pending role; there is no Edit. If an edit is still attempted, the system replies "This role
is waiting for approval and cannot be edited."
3. The maker cannot approve or reject their own change. The system replies "You cannot approve a
change you made yourself. Another user must approve it."
4. Only a different Super User (the checker) can approve or reject it. After that it can be edited again.
Purpose: a role is a named set of menu permissions. A role's type is Admin (back-office menus), Self Service
(employee menus) or Mobile. Roles are given to people on the User Role Permission page (Section 7). Creating
or editing a role is maker-checker: it stays pending until another Super User approves it.
The list
Search in all columns filters every column at once; each column also has its own filter box.
Status chips filter the list: All, Active, Pending approval, Inactive. Each chip shows its count.
Export to Excel / Export to PDF export the list.
Each row has Edit (approved or new roles) or Approve (roles waiting for approval).
Create a role
1. Click Add new.
2. Fill Code, Name and Description (the red bar marks a mandatory field).
3. Choose the Role Type. The menu tree for that type appears.
4. Tick the menus this role should have. Ticking a parent ticks all its children.
5. Click Save. The role is saved as pending. Click Cancel to close without saving.
Approve a role
1. Log in as a different Super User.
2. Click the Pending approval chip.
3. Click Approve on the row, check the details and menus, and approve or reject.
Figure 5.1 – Role list with status chips, search, export and Edit buttons
Figure 5.2 – "Add new" opens the Role Permission form
Figure 5.3 – Role Type "Admin" chosen: the Admin menu tree appears with checkboxes
Figure 5.4 – Edit of an existing role (Payroll Operation): its current permissions are ticked
Figure 5.5 – "Pending approval" chip (0 pending at the time of testing)
TC ID Scenario Steps Expected Result Status
1. Open Administration › Role Pass
TC-RL-01 List loads All roles are listed with Code,
1. Click Active, Pending approval, Name, Description, Role Type, Pass
TC-RL-02 Status chips filter Inactive, All Status and an action button Not Run
TC-RL-03 Search The list shows only roles of that Pass
TC-RL-04 Add form opens 1. Type part of a role name in status; counts match
Search in all columns Only matching roles remain Pass
TC-RL-05 Role type list Pass
1. Click Add new Role Permission form opens with Pass
TC-RL-06 Menu tree by type empty Code, Name, Description Pass
1. Open the Role Type dropdown and Role Type Not Run
TC-RL-07 Cancel does not Options: Admin, Self Service,
save 1. Choose Admin Mobile Not Run
The Admin menu tree with
TC-RL-08 Edit shows current 1. Fill some fields checkboxes appears
permissions 2. Click Cancel Form closes; the list is unchanged
1. Click Edit on an approved role
TC-RL-09 Mandatory fields Form opens with the role's data
1. Click Add new and its menus ticked
TC-RL-10 Create role goes to 2. Leave Code/Name empty Save is refused with a validation
pending 3. Click Save message
1. Add a role with menus
2. Save Role appears with a pending
status; Pending approval count
goes up by 1
TC ID Scenario Steps Expected Result Status
TC-RL-11 MAKER-CHECKER 1. As the maker, click Approve on Refused: "You cannot approve a Not Run
your own pending role change you made yourself.
Maker cannot Another user must approve it."
approve own role
TC-RL-14 MAKER-CHECKER 1. Save a change to a role (it Only Approve is shown; a save is Not Run
becomes pending) refused: "This role is waiting for
Pending role cannot approval and cannot be edited."
be edited 2. Look for Edit on that row, or try This applies to the maker too
to save the role again
TC-RL-12 MAKER-CHECKER 1. Log in as another Super User Status becomes Active; the change Not Run
Checker approves 2. Approve the pending role shows in Audit log › Role History /
Role Permission History
TC-RL-13 Export 1. Click Export to Excel, then Files are downloaded with the Not Run
Export to PDF listed rows
6. User
⚠ MAKER-CHECKER RULE: USER
1. A change saved here is pending. It does not take effect until it is approved.
2. No one can edit it while it is pending, including the maker. On screen, a pending user shows only
Approve / Reject; there is no Edit or Deactivate.
3. The maker cannot approve or reject their own change. The system replies "Created user and
Approve user can't be Same."
4. Only a different Super User (the checker) can approve or reject it. After that it can be edited again.
Purpose: manage the login users. The Type dropdown switches between User (back-office logins) and
Employee (self-service logins). Every create, edit, deactivation and re-activation needs a second administrator's
approval. The person who created a change cannot approve it ("Created user and Approve user can't be
Same.").
The list
Type dropdown, Search login ID or name, and status chips All / Active / Pending approval / Inactive.
Reload (↻), Export to Excel, Export to PDF, Add user.
Columns: Login ID, Name, Status, Created (date and who created it), Actions.
Actions depend on the status: Edit and Deactivate… for an Active user; Approve / Reject for a pending
user; Re-activate for an Inactive user.
Statuses: Active, Pending: new user, Pending: changes, Pending: deactivation, Pending: deletion, Inactive,
Locked, Rejected.
Create a user
1. Click Add user.
2. Fill Login ID, Name, Temporary Password and Temporary Confirm Password (mandatory), and
optionally Email and Employee-ID.
3. Click Save. The user is created as "Pending: new user".
4. Another administrator approves it from the list.
Deactivate a user
1. Click Deactivate… on the row.
2. Type the Reason (mandatory) and click Deactivate.
3. The user becomes "Pending: deactivation" and stays usable until another administrator approves it.
Figure 6.1 – User list
Figure 6.2 – Type dropdown: User or Employee
Figure 6.3 – Add user form
Figure 6.4 – Edit user form (Login ID and Name filled; new temporary password needed)
Figure 6.5 – Deactivate user: a reason is required, and another administrator must approve
Figure 6.6 – Inactive chip: inactive users show a "Re-activate" action
TC ID Scenario Steps Expected Result Status
1. Open Administration › User
TC-US-01 List loads Users are listed with status, created Pass
1. Open Type date and actions
2. Choose Employee, then User
TC-US-02 Type switch The list switches between Pass
employee logins and back-office
users
TC ID Scenario Steps Expected Result Status
TC-US-03 Status chips 1. Click Active, Pending approval, List filters by status; counts match Pass
Inactive
TC-US-04 Add form opens 1. Click Add user Add/Edit User form opens; Save Pass
stays disabled until mandatory
fields are filled
TC-US-05 Edit form opens 1. Click Edit on an Active user Form opens with Login ID and Pass
Name filled
TC-US-06 Deactivate needs a 1. Click Deactivate… Error "Please enter reason" Not Run
reason 2. Leave Reason empty
3. Click Deactivate
TC-US-07 Deactivate dialog 1. Click Deactivate… Dialog closes; the user stays Active Pass
can be cancelled 2. Click Cancel
TC-US-08 Create user 1. Add user with all mandatory User appears as "Pending: new Not Run
fields user"
2. Save
TC-US-09 Password mismatch 1. Add user Save is refused Not Run
2. Different values in the two
password fields
3. Save
TC-US-10 MAKER-CHECKER 1. As the creator, click Approve on Error "Created user and Approve Not Run
Maker cannot your own pending user user can't be Same."
approve
TC-US-11 MAKER-CHECKER 1. Log in as another administrator Status becomes Active; a row Not Run
Checker approves
2. Approve the pending user appears in Audit log › User History
TC-US-12 MAKER-CHECKER 1. As checker click Reject on a The pending change is dropped Not Run
Reject pending user
TC-US-14 MAKER-CHECKER 1. Edit or deactivate a user (it Only Approve / Reject are shown; Not Run
becomes pending) no Edit or Deactivate until it is
Pending user cannot approved or rejected
be edited 2. Look at that row's actions
TC-US-15 MAKER-CHECKER 1. As the creator, click Reject on Refused: "Created user and Not Run
your own pending user Approve user can't be Same."
Maker cannot reject
own change
TC-US-13 Re-activate 1. Click Re-activate on an Inactive User becomes Active Not Run
user
2. Save
3. Approve as another
administrator
7. User Role Permission
⚠ MAKER-CHECKER RULE: PERSON'S ROLES
1. A change saved here is pending. It does not take effect until it is approved.
2. No one can edit it while it is pending, including the maker. On screen, the role ticks are locked
and Send for approval is hidden; the dialog shows "Change waiting for approval". If an edit is still
attempted, the system replies "This person already has a role change waiting for approval. Approve or
reject it first."
3. The maker cannot approve or reject their own change. The system replies "You cannot approve a
change you made yourself. Another user must approve it." (the row is marked "Your change")
4. Only a different Super User (the checker) can approve or reject it. After that it can be edited again.
Purpose: give users (Admin roles) and employees (Self Service roles) their roles. Every change is sent for
approval, and another administrator approves or rejects it. Only approved roles can be given.
All assignments tab
Toggle Admin / Self Service to see back-office users or employees.
Search, status chips All / Waiting for approval / Up to date, Reload, Export to Excel / PDF, and Assign
roles.
Each row shows the person's current roles and an Edit button.
Assign or change roles
1. Click Assign roles (or Edit on a row).
2. Choose the Role type, then the User (for Self Service, first the Payroll type, then the Employee).
3. Tick or untick roles. Use Search role, Select all and Clear if needed. Each role shows Active, Not
assigned, To be added or To be removed.
4. The footer shows how many roles will be added or removed. Click Send for approval, or Reset to undo
your ticks.
Pending approvals tab
Lists everyone whose role change is waiting, with Will get, Will lose and Requested by. Your own requests are
marked "Your change" and cannot be approved by you. Tick several rows and use Approve selected or Reject
selected, or click Open to review one person.
Figure 7.1 – All assignments (Admin)
Figure 7.2 – All assignments (Self Service)
Figure 7.3 – Assign roles: choose the role type and the user first
Figure 7.4 – Edit: the user's current roles are ticked, each with its state
Figure 7.5 – Pending approvals (empty at the time of testing)
TC ID Scenario Steps Expected Result Status
TC-UR-01 List loads 1. Open Administration › User Role All assignments shows users with Pass
Permission their roles and status
TC-UR-02 Admin / Self Service 1. Click Self Service, then Admin List switches between employees Pass
toggle and back-office users
TC-UR-03 Assign dialog opens 1. Click Assign roles Dialog asks for role type and user; Pass
the role list is disabled until a user
is chosen
TC-UR-04 Edit shows current 1. Click Edit on a row Dialog opens with the user's roles Pass
roles ticked and "Up to date"
TC-UR-05 Pending tab 1. Click Pending approvals Pending list, or "Nothing to Pass
approve" when empty
TC-UR-06 Send for approval 1. Edit a user Row shows "Waiting for approval"; Not Run
2. Tick one more role pending count +1
3. Send for approval
TC-UR-07 MAKER-CHECKER 1. Open your own pending change Marked "Your change"; Not Run
Approve/Reject are not available
Maker cannot to you
approve or reject
own change
TC-UR-08 MAKER-CHECKER 1. Log in as another administrator User now has the new role; Audit Not Run
Checker approves
2. Approve the change log › User Role History shows it
TC-UR-09 MAKER-CHECKER 1. Tick several pending rows All selected changes are approved Not Run
2. Approve selected (or Reject (or dropped); your own changes
Bulk approve / cannot be selected
reject selected)
TC ID Scenario Steps Expected Result Status
TC-UR-11 MAKER-CHECKER 1. Send a role change for a person Role ticks are locked and Send for Not Run
2. Open the same person again (as approval is hidden; a new request
Pending change is refused: "This person already has
cannot be edited maker or anyone) a role change waiting for approval.
Approve or reject it first."
TC-UR-10 Reset 1. Tick or untick roles Selection returns to the current Not Run
2. Click Reset roles
8. User Access Type
⚠ MAKER-CHECKER RULE: USER'S PAYROLL ACCESS
1. A change saved here is pending. It does not take effect until it is approved.
2. No one can edit it while it is pending, including the maker. On screen, the payroll-type ticks are
locked and Send for approval is hidden; the page shows "Change waiting for approval". If an edit is
still attempted, the system replies "This user already has an access change waiting for approval.
Approve or reject it first."
3. The maker cannot approve or reject their own change. The system replies "You cannot approve a
change you made yourself. Another user must approve it." (the row is marked "Your change")
4. Only a different Super User (the checker) can approve or reject it. After that it can be edited again.
Purpose: choose which payroll types a user can work in. A new access is not usable until it is approved; a
removed access stays usable until the removal is approved.
How to use
1. On Manage access, choose a User. The left card shows how many payroll types they use and whether a
change is waiting.
2. On the right, tick the payroll types the user should have and untick the ones to remove. Each row shows
Active, No access, To be added or To be removed.
3. The footer counts the changes. Click Send for approval, or Reset to undo.
4. Another administrator approves or rejects from the Pending approvals tab (one by one with Open, or
with Approve selected / Reject selected).
Figure 8.1 – User Access Type, before a user is chosen, with the status legend
Figure 8.2 – User dropdown
Figure 8.3 – A user chosen: their payroll access is listed
Figure 8.4 – A payroll type ticked: "To be added", "1 to add", Send for approval (then Reset was clicked; nothing was sent)
Figure 8.5 – Pending approvals tab
TC ID Scenario Steps Expected Result Status
TC-UA-01 Page loads 1. Open Administration › User "Select a user" message and the Pass
Access Type
status legend are shown
1. Choose a user
TC-UA-02 Choose a user All payroll types are listed; the Pass
user's current ones are ticked and
Active
TC ID Scenario Steps Expected Result Status
1. Tick a payroll type
TC-UA-03 Draft change Row shows "To be added"; footer Pass
1. After ticking, click Reset
shows "1 to add"; Send for
1. Click Pending approvals
approval is enabled
1. Tick a payroll type
TC-UA-04 Reset 2. Send for approval Selection returns to the current Pass
TC-UA-05 Pending tab
TC-UA-06 Send for approval 1. Untick an Active payroll type access
2. Send for approval
Pending list, or "Nothing to Pass
1. As maker open your own
pending change approve"
Row becomes "New – Not Yet Not Run
Approved"; the user cannot use it
yet
TC-UA-07 Request removal Row becomes "Removal – Not Yet Not Run
Approved"; still usable until
approved
TC-UA-08 MAKER-CHECKER Marked "Your change"; cannot Not Run
approve it
Maker cannot
approve or reject
TC-UA-09 MAKER-CHECKER 1. Log in as another administrator Access becomes live (or is Not Run
Checker approves 2. Approve removed); Audit log › User Access Not Run
Type History shows it Not Run
TC-UA-10 MAKER-CHECKER 1. Reject a pending change Access stays as it was before the
Checker rejects request
TC-UA-11 MAKER-CHECKER 1. Send an access change for a Ticks are locked and Send for
user approval is hidden; a new request
Pending change is refused: "This user already has
cannot be edited 2. Open the same user again (as an access change waiting for
maker or anyone) approval. Approve or reject it first."
9. Change Password
Purpose: change the logged-in user's own password. The card shows who is logged in.
1. Enter the Existing Password.
2. Enter the New Password and repeat it in Confirm Password.
3. Click Change Password.
Rules: the new password cannot be the same as the current one, and the two new fields must match.
Figure 9.1 – Change Password
Figure 9.2 – Clicking Change Password with every field empty
TC ID Scenario Steps Expected Result Status
TC-CP-01 Page loads 1. Open Administration › Change Card shows the user name and the Pass
Password three password fields
TC-CP-02 All fields empty 1. Click Change Password with "Required fields are empty" Fail
every field empty
TC-CP-03 Same as current "Current Password and new Not Run
1. Existing = New password can not be same." Not Run
TC-CP-04 Confirm mismatch 2. Click Change Password Not Run
"Confirm password is not equal to Not Run
TC-CP-05 Wrong existing 1. New and Confirm differ new-Password"
password 2. Click Change Password
Error from the server; password
TC-CP-06 Successful change 1. Wrong Existing Password not changed
2. Valid new password
Success; the new password works
1. Correct existing password at the next login
2. Valid new password twice
3. Click Change Password
10. Data Permission
Purpose: limit which employees a user can see, by Category, Grade, Department or Location, within a payroll
type.
1. Choose the User Type (SuperUser, User, Employee), then the User.
2. Choose the Payroll Type and the Permission Type.
3. A picker for that permission type appears (for example Department). Search and pick the item.
4. Click Add. The permission is listed in the grid. Use the delete action on a row to remove a permission.
Figure 10.1 – Data Permission
Figure 10.2 – User Type list: SuperUser, User, Employee
Figure 10.3 – Permission Type list
Figure 10.4 – User, Payroll Type and Permission Type chosen: the Department picker appears
TC ID Scenario Steps Expected Result Status
TC-DP-01 Page loads 1. Open Administration › Data Four dropdowns, Add button and Pass
Permission
an empty grid
TC-DP-02 User type list 1. Open User Type SuperUser, User, Employee Pass
TC-DP-03 Permission type list 1. Open Permission Type Category, Grade, Department, Fail
Location
TC-DP-04 Picker by permission 1. Choose Department A Department search picker Pass
type
appears
TC-DP-05 Existing permissions 1. Choose a user and payroll type Grid lists them Not Run
load that already has permissions
TC-DP-06 Mandatory fields 1. Leave a dropdown empty "Please Select Necessary Fields" Not Run
2. Click Add
TC-DP-07 Add permission 1. Fill everything, pick an item Permission saved and listed in the Not Run
2. Click Add grid
TC-DP-08 Delete permission 1. Click delete on a grid row Permission is removed Not Run
TC-DP-09 No page error on 1. Open the page with the browser No error in the console Fail
open console open
11. Audit log (System Audit Log)
Purpose: read-only history. Nothing can be changed here. The page has seven tabs:
Tab Shows
User Audit Trail Every successful login and user switch: Login ID, Name, time, computer, IP address, device
Bad Login Attempt Every failed login
Role History Roles created, modified, deleted
Role Permission History Menu permissions given to or taken from a role
User History User created, modified, activated, deactivated
User Role History Roles given to or taken from users
User Access Type History Payroll types given to or taken from users
How to use
1. Open a tab. The dates default to the last 7 days.
2. Change From Date / To Date if needed and click Load.
3. Use Search in all columns, the column filters and sorting. The chip shows "shown of total records".
4. Export to Excel / Export to PDF export what is shown. Each tab keeps its own data when you move
between tabs.
Figure 11.1 – Audit log before Load
Figure 11.2 – User Audit Trail loaded (164 records, 11–18 Nov 2026)
Figure 11.3 – Bad Login Attempt: Load fails with "Invalid column name 'LoginID'"
Figure 11.4 – Role History: "No change found for this date range"
Figure 11.5 – Role Permission History (1,785 records)
Figure 11.6 – User History (5 records)
Figure 11.7 – User Role History
Figure 11.8 – User Access Type History: "No change found for this date range"
TC ID Scenario Steps Expected Result Status
TC-AL-01 Page loads 1. Open Administration › Audit log Seven tabs; dates default to the Pass
last 7 days; "Select a date range
and press Load"
TC-AL-02 User Audit Trail 1. Click Load Logins in the range are listed, Pass
TC-AL-03 Bad Login Attempt newest first
TC-AL-04 Role History 1. Open the tab Failed logins in the range are listed Fail
2. Click Load
TC-AL-05 Role Permission
History 1. Open the tab Role changes listed, or "No change Pass
2. Click Load found for this date range"
TC-AL-06 User History
1. Open the tab Role permission changes listed Pass
TC-AL-07 User Role History 2. Click Load
TC-AL-08 User Access Type 1. Open the tab User changes listed Pass
History 2. Click Load
TC-AL-09 Date validation 1. Open the tab User role changes listed Pass
2. Click Load
TC-AL-10 Search and filter
1. Open the tab Access type changes listed, or "No Pass
TC-AL-11 Export 2. Click Load change found"
1. Set From Date after To Date Load is refused with a message Not Run
2. Click Load
1. Type a Login ID in Search Only matching rows; the count Not Run
chip updates
1. Click Export to Excel and Export Files are downloaded with the Not Run
to PDF shown rows
TC ID Scenario Steps Expected Result Status
Not Run
TC-AL-12 Change is recorded 1. Approve a change on The change appears with date,
Role/User/User Role/User action, activities and who did it
Access Type
2. Load the matching history tab
Note: Role History and User Access Type History are filled by the database triggers in SystemAuditHistory_DB_Changes.sql .
Until that script is run on a database, these two tabs show "No change found".
12. Cipher Engine
Purpose: encrypt a text with the same cipher the system uses for passwords. Support staff use it, for example,
to prepare an encrypted value for a configuration or database fix.
1. Type the text in the top box (the X clears it).
2. Click Execute.
3. The encrypted value appears in the lower box. Click the copy icon to copy it.
Figure 12.1 – Cipher Engine
Figure 12.2 – Execute with an empty box: "Please enter text to encrypt first."
Figure 12.3 – After Execute: the server answered (200 OK), but the screen stays on "Loading..."
TC ID Scenario Steps Expected Result Status
Pass
TC-CE-01 Page loads 1. Open Administration › Cipher Input box, Execute button and
Engine output box Pass
TC-CE-02 Empty input 1. Click Execute with an empty box Warning "Please enter text to
encrypt first."
TC ID Scenario Steps Expected Result Status
Fail
TC-CE-03 Encrypt a text 1. Type Sample@123 Encrypted value appears in the
2. Click Execute lower box; loading closes Not Run
Not Run
TC-CE-04 Copy 1. After a result, click the copy icon Value is copied to the clipboard
TC-CE-05 Clear
1. Click the X in the input box Input is cleared
13. Defects and observations found during testing
# Page Finding Severity Test case
D-01
Audit log › Bad Load fails with the error Invalid column name 'LoginID', so failed High TC-AL-03
D-02 Login Attempt logins cannot be viewed (Figure 11.3). The query reads a LoginID
D-03 column that the BadLoginAttemptInfo table in this database does
not have.
D-04
D-05 Cipher Engine After Execute the server answers 200 OK, but the "Loading..." High TC-CE-03
D-06 overlay never closes and the result usually does not appear (Figure
D-07 12.3). Seen in two different browsers.
Change With every field empty the message is "Current Password and new Low TC-CP-02
Password password can not be same." instead of "Required fields are empty"
(Figure 9.2). The two empty values are compared before the empty
check.
Data Permission Opening the page logs a console error: TypeError: Cannot set Medium TC-DP-09
properties of undefined (setting 'value') in
DataPermssionComponent.ngOnInit . The page still works.
Data Permission Permission Type list shows "Cagtegory" (spelling) instead of Low TC-DP-03
"Category". The grid pager shows "0 - NaN of 0 items" when
empty.
Audit log Role History and User Access Type History are empty until Info TC-AL-
04/08
SystemAuditHistory_DB_Changes.sql is run on the database
(setup step, not a code defect).
Role Some roles have an empty Code (Superuser, Finance, Reviewer and Info TC-RL-01
Validator, Finance data entry). This is data, not a screen defect.
14. Test summary
Counts are filled in from the test case tables above.
Page Test cases Pass Fail Not Run
Login / Switch 8 6
Home / Menu 2 2 0 2
Configuration 7 4
Role 14 7 0 0
User 15 6
User Role Permission 11 5 0 3
User Access Type 11 5
Change Password 6 1 0 7
Data Permission 9 3
Audit log 12 7 0 9
Cipher Engine 5 2
Total 100 48 0 6
0 6
1 4
2 4
1 4
1 2
5 47
The Not Run cases save, approve or delete real data, or need a second Super User or a file. Run them on a test
database with two Super User accounts: one as maker and one as checker.

View File

@ -1,172 +0,0 @@
/*
System Audit History (Authentication > System Audit Log)
========================================================
The System Audit Log page shows the change history of the Authentication pages, one tab each:
Role -> dbo.Z_ROLE (trigger trRole - NEW, below)
Role Permission -> dbo.Z_ROLEPERMISSION (trigger trRolePermission - already in the database)
User -> dbo.Z_USERS (trigger trUsers - already in the database)
User Role -> dbo.Z_USERROLE (trigger truserrole - already in the database)
User Access Type -> dbo.Z_USERACCESSTYPE (table + trigger trUserAccessType - NEW, below)
This script:
Part 1 creates dbo.Z_UserAccessType (same shape as dbo.z_users, plus the payroll type).
Part 2 creates trigger dbo.trUserAccessType on dbo.UserAccessType (insert, update, delete).
Part 3 creates trigger dbo.trRole on dbo.Role (insert, update, delete) writing dbo.Z_ROLE.
dbo.Role had no trigger, so dbo.Z_ROLE stayed empty.
Both new triggers are set-based: User Access Type approves / rejects many rows of a user in
one UPDATE / DELETE, and a trigger that reads one value from "inserted" fails on that (Msg 512).
Who did it (actionby):
UserAccessType: the application puts the acting user into SESSION_CONTEXT(N'AuditUserID')
(UserAccessTypeService RequestChange / Approve / Reject). Without it the trigger falls back to
the row's own ApprovedBy / ModifiedBy / CreatedBy (a delete then has no known user).
Role: worked out when reading, from the copied row (ApproveBy / AUTHORIZEDBY / CreatedBy).
Run order: after UserAccessTypeMakerChecker_DB_Changes.sql (needs UserAccessType.Status,
CreatedBy, ModifiedBy, ApprovedBy). Safe to run before or after the code deploys; re-runnable.
*/
-- ---------------------------------------------------------------------------------------------
-- Part 1: dbo.Z_UserAccessType
-- ---------------------------------------------------------------------------------------------
IF OBJECT_ID('dbo.Z_UserAccessType', 'U') IS NULL
BEGIN
CREATE TABLE dbo.Z_UserAccessType
(
audittype VARCHAR(100) NULL,
auditdate DATETIME NULL,
loginid VARCHAR(100) NULL,
name VARCHAR(500) NULL,
payrolltype VARCHAR(500) NULL,
actionby INT NULL,
activities VARCHAR(MAX) NULL
);
PRINT 'Created dbo.Z_UserAccessType';
END
GO
-- ---------------------------------------------------------------------------------------------
-- Part 2: dbo.trUserAccessType
-- ---------------------------------------------------------------------------------------------
IF OBJECT_ID('dbo.trUserAccessType', 'TR') IS NOT NULL
DROP TRIGGER dbo.trUserAccessType;
GO
CREATE TRIGGER dbo.trUserAccessType
ON dbo.UserAccessType
FOR INSERT, UPDATE, DELETE
AS
BEGIN
SET NOCOUNT ON;
DECLARE @auditTime DATETIME = GETDATE();
DECLARE @auditUser INT = TRY_CAST(SESSION_CONTEXT(N'AuditUserID') AS INT);
-- insert: access requested (maker) or given directly
INSERT INTO dbo.Z_UserAccessType (audittype, auditdate, loginid, name, payrolltype, actionby, activities)
SELECT CASE WHEN i.Status = 2 THEN 'Access type requested' ELSE 'Access type assigned' END,
@auditTime, u.LoginID, u.UserName, p.Description,
COALESCE(@auditUser, i.CreatedBy, i.ApprovedBy),
CASE i.Status
WHEN 1 THEN 'Active'
WHEN 2 THEN 'New Not Yet Approve'
WHEN 5 THEN 'Approved'
ELSE 'None'
END
FROM inserted i
LEFT JOIN deleted d ON d.UserAccessTypeID = i.UserAccessTypeID
LEFT JOIN dbo.Users u ON u.UserID = i.UserID
LEFT JOIN dbo.PayrollType p ON p.PayrollTypeID = i.PayrollTypeID
WHERE d.UserAccessTypeID IS NULL;
-- update: removal requested (maker), request approved, removal rejected, other change
INSERT INTO dbo.Z_UserAccessType (audittype, auditdate, loginid, name, payrolltype, actionby, activities)
SELECT 'Access type modified',
@auditTime, u.LoginID, u.UserName, p.Description,
COALESCE(@auditUser,
CASE
WHEN i.Status = 3 THEN i.ModifiedBy
WHEN ISNULL(i.ApprovedBy, 0) <> ISNULL(d.ApprovedBy, 0) THEN i.ApprovedBy
ELSE COALESCE(i.ModifiedBy, i.CreatedBy)
END),
CASE
WHEN ISNULL(d.Status, 0) = 2 AND i.Status = 5 THEN 'Approved'
WHEN ISNULL(d.Status, 0) = 3 AND i.Status = 5 THEN 'Removal Rejected'
WHEN ISNULL(d.Status, 0) <> ISNULL(i.Status, 0) THEN
CASE i.Status
WHEN 1 THEN 'Active'
WHEN 2 THEN 'New Not Yet Approve'
WHEN 3 THEN 'Deleted Not Yet Approve'
WHEN 4 THEN 'Edited Not Yet Approve'
WHEN 5 THEN 'Approved'
ELSE 'None'
END
WHEN ISNULL(d.PayrollTypeID, 0) <> ISNULL(i.PayrollTypeID, 0) THEN 'Access type changed'
ELSE ' '
END
FROM inserted i
JOIN deleted d ON d.UserAccessTypeID = i.UserAccessTypeID
LEFT JOIN dbo.Users u ON u.UserID = i.UserID
LEFT JOIN dbo.PayrollType p ON p.PayrollTypeID = i.PayrollTypeID;
-- delete: removal approved, request rejected, or access deleted
INSERT INTO dbo.Z_UserAccessType (audittype, auditdate, loginid, name, payrolltype, actionby, activities)
SELECT 'Access type removed',
@auditTime, u.LoginID, u.UserName, p.Description,
@auditUser,
CASE d.Status
WHEN 3 THEN 'Removal Approved'
WHEN 2 THEN 'Request Rejected'
ELSE 'Deleted'
END
FROM deleted d
LEFT JOIN inserted i ON i.UserAccessTypeID = d.UserAccessTypeID
LEFT JOIN dbo.Users u ON u.UserID = d.UserID
LEFT JOIN dbo.PayrollType p ON p.PayrollTypeID = d.PayrollTypeID
WHERE i.UserAccessTypeID IS NULL;
END
GO
PRINT 'Created trigger dbo.trUserAccessType';
GO
-- ---------------------------------------------------------------------------------------------
-- Part 3: dbo.trRole -> dbo.Z_ROLE (copy of the row: Inserted / Update (before) / Update (after) / Deleted)
-- ---------------------------------------------------------------------------------------------
IF OBJECT_ID('dbo.trRole', 'TR') IS NOT NULL
DROP TRIGGER dbo.trRole;
GO
CREATE TRIGGER dbo.trRole
ON dbo.Role
FOR INSERT, UPDATE, DELETE
AS
BEGIN
SET NOCOUNT ON;
DECLARE @auditTime DATETIME = GETDATE();
-- the row before the change (update) or the removed row (delete)
INSERT INTO dbo.Z_ROLE (AUDITTYPE, AUDITDATE, ROLEID, CODE, NAME, CREATEDBY, CREATEDDATE, SEQUENCE, STATUS,
ROLETYPE, AUTHORIZEDBY, AUTHORIZEDDATE, DESCRIPTION, APPROVEBY, APPROVEDATE)
SELECT CASE WHEN i.RoleID IS NULL THEN 'Deleted' ELSE 'Update (before)' END,
@auditTime, d.RoleID, LEFT(d.Code, 20), LEFT(d.Name, 50), d.CreatedBy, d.CreatedDate, d.Sequence, d.Status,
d.RoleType, d.AUTHORIZEDBY, d.AUTHORIZEDDATE, LEFT(d.Description, 255), d.ApproveBy, d.ApproveDate
FROM deleted d
LEFT JOIN inserted i ON i.RoleID = d.RoleID;
-- the new row (insert) or the row after the change (update)
INSERT INTO dbo.Z_ROLE (AUDITTYPE, AUDITDATE, ROLEID, CODE, NAME, CREATEDBY, CREATEDDATE, SEQUENCE, STATUS,
ROLETYPE, AUTHORIZEDBY, AUTHORIZEDDATE, DESCRIPTION, APPROVEBY, APPROVEDATE)
SELECT CASE WHEN d.RoleID IS NULL THEN 'Inserted' ELSE 'Update (after)' END,
@auditTime, i.RoleID, LEFT(i.Code, 20), LEFT(i.Name, 50), i.CreatedBy, i.CreatedDate, i.Sequence, i.Status,
i.RoleType, i.AUTHORIZEDBY, i.AUTHORIZEDDATE, LEFT(i.Description, 255), i.ApproveBy, i.ApproveDate
FROM inserted i
LEFT JOIN deleted d ON d.RoleID = i.RoleID;
END
GO
PRINT 'Created trigger dbo.trRole';
GO