Compare commits
No commits in common. "dev_mohaimen_auth" and "main" have entirely different histories.
dev_mohaim
...
main
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -749,6 +749,11 @@ FodyWeavers.xsd
|
|||
# Additional files built by Visual Studio
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/csharp,angular,aspnetcore,visualstudio,visualstudiocode
|
||||
/HRM.UI/appsettings.json
|
||||
/HRM.UI/appsettings.json
|
||||
/HRM.UI/appsettings.json
|
||||
/HRM.UI/appsettings.json
|
||||
/HRM.UI/appsettings.json
|
||||
|
||||
# Employee photos written at runtime (approved thumbnails + photos awaiting approval).
|
||||
# Not source; regenerated/repopulated by the app.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
30
CLAUDE.md
30
CLAUDE.md
|
|
@ -106,9 +106,7 @@ npm test # ng test (Karma, entry src/test.ts)
|
|||
Both SPAs `ng serve` on 4200, so only one of the two can run at a time.
|
||||
|
||||
- `npm run lint` is **broken**: `angular.json` still points at the `@angular-devkit/build-angular:tslint`
|
||||
builder (with a `tslint.json`), which no longer exists in Angular 19. The `@angular-eslint/*` and `eslint` 9 devDependencies are
|
||||
installed, but there is no ESLint config file and no `@angular-eslint/builder:lint` target yet, so
|
||||
wiring ESLint up means adding both.
|
||||
builder (with a `tslint.json`), which no longer exists in Angular 19. There is no ESLint config.
|
||||
- `npm test` works, but coverage is nominal — 18 `.spec.ts` files across the whole app. Single spec:
|
||||
`ng test --include='**/some.component.spec.ts'`.
|
||||
- There are no `*.Tests.csproj` anywhere in the solution.
|
||||
|
|
@ -449,28 +447,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
|
||||
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
|
||||
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.
|
||||
|
|
@ -498,9 +474,7 @@ When behavior differs between clients, look for or add a Logic key rather than b
|
|||
## Branches: one product, many client deployments
|
||||
|
||||
**This checkout is not that repo.** It is `HRM-10` (`origin` = `103.197.204.162:3025/CelHRTeam/HRM-10`),
|
||||
a fresh import whose history starts at one squashed commit (`838b8d4` "first commit"). Since then it
|
||||
uses ordinary short-lived branches: `main` is the integration branch (PR target), with per-developer
|
||||
branches (`dev_<name>`, `dev_<name>_<feature>`, `shamim`) merged back into it.
|
||||
a fresh import with a single branch `main` and a single squashed commit (`838b8d4` "first commit").
|
||||
None of the older history exists here: every commit hash quoted elsewhere in this file (`c8588ce67`,
|
||||
`91369150c`, `ac179c03e`, `73f466cd0`, `bfd085e0e`) is from the original `CelHRTeam/cel.hrm` repo, and
|
||||
`git show`/`git log` recovery commands only work in a clone of that repo, not here.
|
||||
|
|
|
|||
|
|
@ -949,13 +949,6 @@ namespace HRM.BO
|
|||
DataSet GetBonusBankAdvice(int BonusID, DateTime dBonusMonth, string sEmpID);
|
||||
DataSet GetBonusPaySlip(int BonusID, DateTime dBonusMonth, string sEmpID);
|
||||
int Save(BonusProcess item);
|
||||
BonusProcessAndSaveResult ProcessAndSave(BonusProcessAndSaveRequest request, int payrolltypeid, int userID);
|
||||
BonusProcessAndSaveResult UploadAndSave(List<BonusProcess.BonusProcessDetail> uploadedRows,
|
||||
BonusProcessAndSaveRequest request, int payrolltypeid, int userID);
|
||||
BonusProcessRowTaxResult CalculateRowTax(BonusProcessRowTaxRequest request, int payrolltypeid);
|
||||
BonusProcessGridRow SaveRow(BonusProcessRowSaveRequest request, int payrolltypeid, int userID);
|
||||
List<BonusProcessGridRow> ClearTaxAndSave(int bonusProcessID, int payrolltypeid, int userID);
|
||||
BonusProcessRowRemoveResult RemoveRow(int bonusProcessDetailID, int payrolltypeid);
|
||||
void Delete(BonusProcess oBonusProcess);
|
||||
List<BonusProcess> GetProcess(int bonusID, DateTime bonusMonth);
|
||||
List<BonusProcess> GetProcess(DateTime bonusMonth);
|
||||
|
|
|
|||
|
|
@ -1,96 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace HRM.BO
|
||||
{
|
||||
/// <summary>
|
||||
/// Bonus Process screen, "Process" button: calculate the bonus (and tax) of these employees and save it
|
||||
/// in the same request (api/Bonus/processAndSave). Only the header and the employee IDs travel — the
|
||||
/// browser no longer sends the whole calculated BonusProcess back for a separate Save.
|
||||
/// </summary>
|
||||
public class BonusProcessAndSaveRequest
|
||||
{
|
||||
public int BonusID { get; set; }
|
||||
public DateTime BasicMonth { get; set; }
|
||||
public DateTime PayDate { get; set; }
|
||||
public DateTime CuttOfDate { get; set; }
|
||||
public double CurrProcess { get; set; }
|
||||
public bool IsDisburseWithSalary { get; set; }
|
||||
public bool IsTaxProcess { get; set; }
|
||||
public List<int> EmployeeIDs { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>One saved row of the Bonus Process grid, read back from the database.</summary>
|
||||
public class BonusProcessGridRow
|
||||
{
|
||||
public int BonusProcessDetailID { get; set; }
|
||||
public int BonusProcessID { get; set; }
|
||||
public int BonusID { get; set; }
|
||||
public int EmployeeID { get; set; }
|
||||
public string EmployeeNo { get; set; }
|
||||
public string Name { get; set; }
|
||||
public DateTime? JoiningDate { get; set; }
|
||||
public bool IsConfirmed { get; set; }
|
||||
public double GrossSalary { get; set; }
|
||||
public double BasicSalary { get; set; }
|
||||
public double BonusAmount { get; set; }
|
||||
public double ChangeBonusAmount { get; set; }
|
||||
public double TaxAmount { get; set; }
|
||||
public double ChangeTaxAmount { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>What processAndSave returns: the saved process and its rows.</summary>
|
||||
public class BonusProcessAndSaveResult
|
||||
{
|
||||
public int BonusProcessID { get; set; }
|
||||
public List<BonusProcessGridRow> Rows { get; set; } = new List<BonusProcessGridRow>();
|
||||
/// <summary>Employees left out because this bonus was already processed for them this month.</summary>
|
||||
public List<int> AlreadyProcessedEmployeeIDs { get; set; } = new List<int>();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Modify dialog, "Calculate": the tax of one saved row for this bonus amount
|
||||
/// (api/Bonus/calculateRowTax). Nothing is saved.
|
||||
/// </summary>
|
||||
public class BonusProcessRowTaxRequest
|
||||
{
|
||||
public int BonusProcessDetailID { get; set; }
|
||||
public double BonusAmount { get; set; }
|
||||
}
|
||||
|
||||
public class BonusProcessRowTaxResult
|
||||
{
|
||||
public int BonusProcessDetailID { get; set; }
|
||||
public double BonusAmount { get; set; }
|
||||
public double TaxAmount { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Modify dialog, "Save": saves one row (api/Bonus/saveRow). With CalculateTax the server works the tax
|
||||
/// out again from BonusAmount (TaxAmount is ignored); without it TaxAmount is the amount typed in.
|
||||
/// </summary>
|
||||
public class BonusProcessRowSaveRequest
|
||||
{
|
||||
public int BonusProcessDetailID { get; set; }
|
||||
public double BonusAmount { get; set; }
|
||||
public double TaxAmount { get; set; }
|
||||
public bool CalculateTax { get; set; }
|
||||
/// <summary>
|
||||
/// "Edited Tax Amount" (with CalculateTax): the tax the user settled on after seeing the calculated one.
|
||||
/// Saved as CHANGETAXAMOUNT and on the Tax Deducted line; TAXAMOUNT keeps the calculated tax.
|
||||
/// Null = use the calculated tax.
|
||||
/// </summary>
|
||||
public double? EditedTaxAmount { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Remove button on a saved row (api/Bonus/removeRow/{id}): what was deleted. ProcessDeleted is true when
|
||||
/// that was the process's last employee, so the (now empty) BONUSPROCESS header was deleted too.
|
||||
/// </summary>
|
||||
public class BonusProcessRowRemoveResult
|
||||
{
|
||||
public int BonusProcessDetailID { get; set; }
|
||||
public int BonusProcessID { get; set; }
|
||||
public bool ProcessDeleted { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
@ -563,7 +563,6 @@ namespace HRM.BO
|
|||
//void SaveBasicInfo(Employee item);
|
||||
List<Employee> GetByEmpIDs(string empIDs, int payrollTypeID);
|
||||
List<Employee> GetByEmpIDs(string empIDs);
|
||||
List<EmployeeLite> GetLiteByEmpIDs(List<int> empIDs);
|
||||
List<Employee> GetFssEmp(string empIDs, int payrollTypeID);
|
||||
List<Employee> GetEmpsWithDiscontinue(string empIDs, int payrollTypeID);
|
||||
DataSet GetEmpJoining4Novartis(DateTime dEffectDate, int payrollTypeID);
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
using System;
|
||||
|
||||
namespace HRM.BO
|
||||
{
|
||||
/// <summary>
|
||||
/// A light Employee: only the few columns that screens working on thousands of employees at once need
|
||||
/// (Bonus Process today). Loading the whole Employee row for 10k+ employees never reached the browser.
|
||||
/// To add a field: add the property here, the column in EmployeeDA.GetLiteByEmpIDs, and the read in
|
||||
/// EmployeeService.GetLiteByEmpIDs (and in ClientApp _models/Employee/employeeLite.ts).
|
||||
/// </summary>
|
||||
public class EmployeeLite
|
||||
{
|
||||
public int EmployeeID { get; set; }
|
||||
public bool IsConfirmed { get; set; }
|
||||
public DateTime? JoiningDate { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
@ -401,13 +401,6 @@ namespace HRM.BO
|
|||
routerLink = "/authentication/system-auditlog",
|
||||
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",
|
||||
},
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
@ -13,8 +13,6 @@ namespace HRM.BO
|
|||
PayrollTypeID = 0;
|
||||
UserID = 0;
|
||||
UserObj = null;
|
||||
// A row nobody approved yet is never live access (see UserAccessTypeMakerChecker_DB_Changes.sql).
|
||||
AccessTypeStatus = EnumAuthStatus.NewNotYetApprove;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
@ -25,22 +23,9 @@ namespace HRM.BO
|
|||
public string Description { get; set; }
|
||||
public int UserID { get; set; }
|
||||
public User UserObj { get; set; }
|
||||
/// <summary>
|
||||
/// UserAccessType.Status: Approved (5) = live; NewNotYetApprove (2) = requested, not live yet;
|
||||
/// DeletedNotYetApprove (3) = removal requested, still live until approved.
|
||||
/// </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; }
|
||||
public EnumAuthStatus accessTypeStatus;
|
||||
public int? ApprovedBy;
|
||||
public DateTime? ApprovedDate;
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
|
@ -56,16 +41,6 @@ namespace HRM.BO
|
|||
int Save(UserAccessType item);
|
||||
void Save(List<UserAccessType> userAccessTypes);
|
||||
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
|
||||
|
|
|
|||
|
|
@ -68,109 +68,6 @@ namespace HRM.BO
|
|||
|
||||
void Save(List<UserRole> userRoles, int payrolltypeid);
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
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)" +
|
||||
" 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)",
|
||||
"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,%n)",
|
||||
item.ID, item.AllowDeductID, item.IsForConfirmOnly, item.FlatAmount, item.PercentOfBasic,
|
||||
item.PercentOfGross, item.GFFlatAmount, item.GFPercentOfBasic, item.GFPercentOfGross, item.MinAmount,
|
||||
item.MaxAmount, item.IsCurrentlyActive, item.TaxablePercentage, item.IsTaxable, item.IsTaxProjection,
|
||||
item.IsDependsOnAttendance, item.IsDependsOnOTHour, item.ISDEPENDSONSPECIALHOUR, item.IsWithException,
|
||||
item.Periodicity, item.AllowOrDeductType, item.Gender, item.CreatedBy, item.CreatedDate,
|
||||
item.PayrollTypeID, DateTime.Now, item.EntitleType, item.PercentOfEarnedBasic,
|
||||
item.IsFractionateApplicable, 0);
|
||||
item.IsFractionateApplicable, 1, 0);
|
||||
}
|
||||
|
||||
internal static void Insert(TransactionContext tc, ADParameter.ADParameterGrade item)
|
||||
|
|
|
|||
|
|
@ -56,11 +56,8 @@ namespace HRM.DA
|
|||
|
||||
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
|
||||
where p.PayrollTypeID==ua.PayrollTypeID and u.UserID =ua.UserID and u.LoginID=%s and ua.Status<>%n",
|
||||
loginID, (int)EnumAuthStatus.NewNotYetApprove);
|
||||
where p.PayrollTypeID==ua.PayrollTypeID and u.UserID =ua.UserID and u.LoginID=%s", loginID);
|
||||
return tc.ExecuteReader(sql);
|
||||
|
||||
}
|
||||
|
|
@ -71,8 +68,7 @@ namespace HRM.DA
|
|||
string sql = SQLParser.MakeSQL(@"SELECT * FROM PAYROLLTYPE WHERE PAYROLLTYPEID IN
|
||||
(SELECT DISTINCT ua.PAYROLLTYPEID FROM USERS u
|
||||
JOIN USERACCESSTYPE ua ON u.USERID = ua.UserId
|
||||
WHERE u.EMPLOYEEID=%n AND u.USERTYPE=%n AND ua.Status<>%n)",
|
||||
employeeId, userType, (int)EnumAuthStatus.NewNotYetApprove);
|
||||
WHERE u.EMPLOYEEID=%n AND u.USERTYPE=%n)", employeeId, userType);
|
||||
return tc.ExecuteReader(sql);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
using Ease.Core.DataAccess;
|
||||
using Ease.Core.Utility;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
|
||||
|
||||
|
|
@ -33,176 +32,6 @@ namespace HRM.DA
|
|||
item.UsedProcess, item.PayrollTypeID, item.IsApprove, item.wfstatus);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Inserts every detail row in one SqlBulkCopy (10k+ rows), instead of one INSERT per row.
|
||||
/// Same columns and values as Insert(tc, BonusProcessDetail) below; IDs must already be set.
|
||||
/// Runs inside the caller's transaction.
|
||||
/// </summary>
|
||||
internal static void InsertBulk(TransactionContext tc, List<BonusProcess.BonusProcessDetail> items)
|
||||
{
|
||||
if (items == null || items.Count == 0)
|
||||
return;
|
||||
|
||||
// money columns: round like SQL Server does when it converts a number literal to money (4 places)
|
||||
Func<double, decimal> money = v => Math.Round((decimal)v, 4, MidpointRounding.AwayFromZero);
|
||||
|
||||
// column names exactly as in the BONUSPROCESSDETAIL table (bulk copy mapping is case-sensitive)
|
||||
DataTable table = new DataTable("BONUSPROCESSDETAIL");
|
||||
table.Columns.Add("BONUSPROCESSDETAILID", typeof(int));
|
||||
table.Columns.Add("BONUSPROCESSID", typeof(int));
|
||||
table.Columns.Add("BONUSID", typeof(int));
|
||||
table.Columns.Add("EMPLOYEEID", typeof(int));
|
||||
table.Columns.Add("DISBURSEDATE", typeof(DateTime));
|
||||
table.Columns.Add("BONUSAMOUNT", typeof(decimal));
|
||||
table.Columns.Add("GROSSSALARY", typeof(decimal));
|
||||
table.Columns.Add("BASICSALARY", typeof(decimal));
|
||||
table.Columns.Add("CHANGEBONUSAMOUNT", typeof(decimal));
|
||||
table.Columns.Add("CHANGETAXAMOUNT", typeof(decimal));
|
||||
table.Columns.Add("CHANGEADJUSTAMOUNT", typeof(decimal));
|
||||
table.Columns.Add("CHANGESALARYITEMAMOUNT", typeof(decimal));
|
||||
table.Columns.Add("CALCULATEDADJUSTAMOUNT", typeof(decimal));
|
||||
table.Columns.Add("CALCULATEDSALARYITEMAMOUNT", typeof(decimal));
|
||||
table.Columns.Add("TAXAMOUNT", typeof(decimal));
|
||||
|
||||
foreach (BonusProcess.BonusProcessDetail item in items)
|
||||
{
|
||||
table.Rows.Add(item.ID, item.BonusProcessID, item.BonusID, item.EmployeeID,
|
||||
item.BonusMonth.Date, // Insert writes it with %d (date only)
|
||||
money(item.BonusAmount), money(item.GrossSalary), money(item.BasicSalary),
|
||||
money(item.ChangeBonusAmount), money(item.ChangeTaxAmount), money(item.ChangeAdjustAmount),
|
||||
money(item.ChangeSalaryItemAmount), money(item.CalculatedAdjustAmount),
|
||||
money(item.CalculatedSalaryItemAmount), money(item.TaxAmount));
|
||||
}
|
||||
|
||||
using (Microsoft.Data.SqlClient.SqlBulkCopy bulkCopy = new Microsoft.Data.SqlClient.SqlBulkCopy(
|
||||
(Microsoft.Data.SqlClient.SqlConnection)tc.Connection, Microsoft.Data.SqlClient.SqlBulkCopyOptions.Default,
|
||||
(Microsoft.Data.SqlClient.SqlTransaction)tc.Transaction))
|
||||
{
|
||||
bulkCopy.BulkCopyTimeout = 6000; // in seconds, as SaveBonusEmpCostCenter
|
||||
bulkCopy.DestinationTableName = "BONUSPROCESSDETAIL";
|
||||
foreach (DataColumn column in table.Columns)
|
||||
bulkCopy.ColumnMappings.Add(column.ColumnName, column.ColumnName);
|
||||
bulkCopy.WriteToServer(table);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>The saved rows of one bonus process, with the employee columns the Bonus Process grid shows.</summary>
|
||||
internal static IDataReader GetGridRows(TransactionContext tc, int bonusProcessID)
|
||||
{
|
||||
return tc.ExecuteReader(@"SELECT bd.BONUSPROCESSDETAILID, bd.BONUSPROCESSID, bd.BONUSID, bd.EMPLOYEEID,
|
||||
e.EMPLOYEENO, e.NAME, e.JOININGDATE, e.ISCONFIRMED,
|
||||
bd.GROSSSALARY, bd.BASICSALARY, bd.BONUSAMOUNT, bd.CHANGEBONUSAMOUNT, bd.TAXAMOUNT, bd.CHANGETAXAMOUNT
|
||||
FROM BONUSPROCESSDETAIL bd
|
||||
INNER JOIN EMPLOYEE e ON e.EMPLOYEEID = bd.EMPLOYEEID
|
||||
WHERE bd.BONUSPROCESSID = %n
|
||||
ORDER BY e.EMPLOYEENO", bonusProcessID);
|
||||
}
|
||||
|
||||
/// <summary>One saved row (Modify dialog), with the employee columns the grid shows.</summary>
|
||||
internal static IDataReader GetGridRow(TransactionContext tc, int bonusProcessDetailID)
|
||||
{
|
||||
return tc.ExecuteReader(@"SELECT bd.BONUSPROCESSDETAILID, bd.BONUSPROCESSID, bd.BONUSID, bd.EMPLOYEEID,
|
||||
e.EMPLOYEENO, e.NAME, e.JOININGDATE, e.ISCONFIRMED,
|
||||
bd.GROSSSALARY, bd.BASICSALARY, bd.BONUSAMOUNT, bd.CHANGEBONUSAMOUNT, bd.TAXAMOUNT, bd.CHANGETAXAMOUNT
|
||||
FROM BONUSPROCESSDETAIL bd
|
||||
INNER JOIN EMPLOYEE e ON e.EMPLOYEEID = bd.EMPLOYEEID
|
||||
WHERE bd.BONUSPROCESSDETAILID = %n", bonusProcessDetailID);
|
||||
}
|
||||
|
||||
/// <summary>One saved row and the header fields the Modify dialog needs (bonus, month, payroll type).</summary>
|
||||
internal static IDataReader GetRowWithHeader(TransactionContext tc, int bonusProcessDetailID)
|
||||
{
|
||||
return tc.ExecuteReader(@"SELECT bd.BONUSPROCESSDETAILID, bd.BONUSPROCESSID, bd.BONUSID, bd.EMPLOYEEID,
|
||||
bd.CHANGEBONUSAMOUNT, bd.CHANGETAXAMOUNT, bd.TAXAMOUNT,
|
||||
b.BONUSMONTH, b.PAYROLLTYPEID, b.ISTAXPROCESS
|
||||
FROM BONUSPROCESSDETAIL bd
|
||||
INNER JOIN BONUSPROCESS b ON b.BONUSPROCESSID = bd.BONUSPROCESSID
|
||||
WHERE bd.BONUSPROCESSDETAILID = %n", bonusProcessDetailID);
|
||||
}
|
||||
|
||||
/// <summary>Modify dialog, Save: the amounts of one row.</summary>
|
||||
internal static void UpdateRowAmounts(TransactionContext tc, int bonusProcessDetailID, double changeBonusAmount,
|
||||
double changeTaxAmount, double taxAmount, int modifiedBy, DateTime modifiedDate)
|
||||
{
|
||||
tc.ExecuteNonQuery(@"UPDATE BONUSPROCESSDETAIL SET CHANGEBONUSAMOUNT = %n, CHANGETAXAMOUNT = %n, TAXAMOUNT = %n,
|
||||
MODIFIEDBY = %n, MODIFIEDDATE = %D
|
||||
WHERE BONUSPROCESSDETAILID = %n",
|
||||
changeBonusAmount, changeTaxAmount, taxAmount, modifiedBy, modifiedDate, bonusProcessDetailID);
|
||||
}
|
||||
|
||||
/// <summary>Clear Tax: the header fields of one bonus process (bonus, month, payroll type, options).</summary>
|
||||
internal static IDataReader GetProcessHeaderForClearTax(TransactionContext tc, int bonusProcessID)
|
||||
{
|
||||
return tc.ExecuteReader(@"SELECT BONUSPROCESSID, BONUSID, BONUSMONTH, PAYROLLTYPEID, ISTAXPROCESS, ISDISBURSEWITHSALARY
|
||||
FROM BONUSPROCESS
|
||||
WHERE BONUSPROCESSID = %n", bonusProcessID);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Clear Tax: the tax of every row of one bonus process becomes 0 — what the old Clear Tax + Save wrote
|
||||
/// to BONUSPROCESSDETAIL (only CHANGETAXAMOUNT; TAXAMOUNT, the calculated tax, is kept).
|
||||
/// </summary>
|
||||
internal static void ClearTaxOfProcess(TransactionContext tc, int bonusProcessID, int modifiedBy, DateTime modifiedDate)
|
||||
{
|
||||
tc.ExecuteNonQuery(@"UPDATE BONUSPROCESSDETAIL SET CHANGETAXAMOUNT = 0, MODIFIEDBY = %n, MODIFIEDDATE = %D
|
||||
WHERE BONUSPROCESSID = %n",
|
||||
modifiedBy, modifiedDate, bonusProcessID);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Clear Tax: the Tax Deducted line (ITEMCODE = Tax_Deducted, -212) of the bonus tax data (BONUSTEMPIT) of
|
||||
/// every employee of one bonus process gets THISMONTHAMOUNT = 0 — the old save() merge with a cleared tax.
|
||||
/// The other lines and columns are not touched.
|
||||
/// </summary>
|
||||
internal static void ClearBonusTempTaxOfProcess(TransactionContext tc, int bonusProcessID, int taxDeductedItemCode)
|
||||
{
|
||||
tc.ExecuteNonQuery(@"UPDATE BONUSTEMPIT SET THISMONTHAMOUNT = 0
|
||||
WHERE ITEMCODE = %n
|
||||
AND EMPLOYEEID IN (SELECT EMPLOYEEID FROM BONUSPROCESSDETAIL WHERE BONUSPROCESSID = %n)",
|
||||
taxDeductedItemCode, bonusProcessID);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Remove (saved row): this employee's bonus tax data (BONUSTEMPIT), only when the process was saved
|
||||
/// with Calculate Tax — a process without tax wrote no BONUSTEMPIT rows for it.
|
||||
/// </summary>
|
||||
internal static void DeleteRowBonusTempTax(TransactionContext tc, int bonusProcessID, int employeeID)
|
||||
{
|
||||
tc.ExecuteNonQuery(@"DELETE FROM BONUSTEMPIT
|
||||
WHERE EMPLOYEEID = %n
|
||||
AND EXISTS (SELECT 1 FROM BONUSPROCESS WHERE BONUSPROCESSID = %n AND ISTAXPROCESS = 1)",
|
||||
employeeID, bonusProcessID);
|
||||
}
|
||||
|
||||
/// <summary>Remove (saved row): this employee's cost-center split in this process.</summary>
|
||||
internal static void DeleteRowCostCenter(TransactionContext tc, int bonusProcessID, int employeeID)
|
||||
{
|
||||
tc.ExecuteNonQuery("DELETE FROM BonusEmpCostCenter WHERE BonusProcessID = %n AND EmployeeID = %n",
|
||||
bonusProcessID, employeeID);
|
||||
}
|
||||
|
||||
/// <summary>Remove (saved row): the row itself.</summary>
|
||||
internal static void DeleteRow(TransactionContext tc, int bonusProcessDetailID)
|
||||
{
|
||||
tc.ExecuteNonQuery("DELETE FROM BONUSPROCESSDETAIL WHERE BONUSPROCESSDETAILID = %n", bonusProcessDetailID);
|
||||
}
|
||||
|
||||
/// <summary>Remove (saved row): how many rows the process still has.</summary>
|
||||
internal static int CountRows(TransactionContext tc, int bonusProcessID)
|
||||
{
|
||||
object count = tc.ExecuteScalar("SELECT COUNT(*) FROM BONUSPROCESSDETAIL WHERE BONUSPROCESSID = %n", bonusProcessID);
|
||||
return count == null || count == DBNull.Value ? 0 : Convert.ToInt32(count);
|
||||
}
|
||||
|
||||
/// <summary>Remove (saved row): the header of a process that has no rows left, and anything still hanging on it.</summary>
|
||||
internal static void DeleteEmptyProcess(TransactionContext tc, int bonusProcessID)
|
||||
{
|
||||
tc.ExecuteNonQuery("DELETE FROM BonusEmpCostCenter WHERE BonusProcessID = %n", bonusProcessID);
|
||||
tc.ExecuteNonQuery(@"DELETE FROM BONUSPROCESS WHERE BONUSPROCESSID = %n
|
||||
AND NOT EXISTS (SELECT 1 FROM BONUSPROCESSDETAIL WHERE BONUSPROCESSID = %n)",
|
||||
bonusProcessID, bonusProcessID);
|
||||
}
|
||||
|
||||
internal static void Insert(TransactionContext tc, BonusProcess.BonusProcessDetail item)
|
||||
{
|
||||
string sql = SQLParser.MakeSQL(
|
||||
|
|
@ -658,19 +487,6 @@ AND BP.PayrollTypeID=%n", emps, FromDate, ToDate, payrollTypeID);
|
|||
|
||||
return approved;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Bonus Process screen: how many BONUSPROCESS headers this bonus already has in this month (whole month)
|
||||
/// for this payroll type. Used to stop the same bonus type being processed twice in one month.
|
||||
/// </summary>
|
||||
internal static int CountProcessInMonth(TransactionContext tc, int payrolltypeid, int bonusid, DateTime bonusMonth)
|
||||
{
|
||||
object count = tc.ExecuteScalar(
|
||||
"SELECT COUNT(*) FROM BONUSPROCESS WHERE PAYROLLTYPEID = %n AND BONUSID = %n AND BONUSMONTH BETWEEN %d AND %d",
|
||||
payrolltypeid, bonusid, PayrollGlobalFunctions.PayrollFirstDateOfMonth(bonusMonth),
|
||||
PayrollGlobalFunctions.PayrollLastDateOfMonth(bonusMonth));
|
||||
return (count == null || count == DBNull.Value) ? 0 : Convert.ToInt32(count);
|
||||
}
|
||||
#endregion
|
||||
|
||||
internal static DataSet GetMontlyProdBonus(TransactionContext tc, DateTime dBonusMonth)
|
||||
|
|
|
|||
|
|
@ -785,32 +785,6 @@ namespace HRM.DA
|
|||
tc.ExecuteNonQuery("UPDATE EMPCONTACT SET presentPOInBangla = %s, presentAddressInBangla = %s, parmanentPOInBangla = %s, permanentAddressInBangla =%s WHERE EMPLOYEEID = %s", employeBanglaInfo[1], employeBanglaInfo[2], employeBanglaInfo[3], employeBanglaInfo[4], employeBanglaInfo[0]);
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// The full Employee rows of the given employees of one payroll type, for any number of employees
|
||||
/// (10k+). Same result as GetByEmpIDs(tc, empIDs, payrollTypeID), but the IDs go in as ONE
|
||||
/// varchar(max) parameter and a temp table with a primary key instead of an "IN (1,2,3,...)" list in
|
||||
/// the SQL text. Needs SQL Server 2016+ (STRING_SPLIT).
|
||||
/// </summary>
|
||||
internal static IDataReader GetByEmpIDList(TransactionContext tc, List<int> empIDs, int payrollTypeID)
|
||||
{
|
||||
string sql = SQLParser.MakeSQL(@"SET NOCOUNT ON;
|
||||
IF OBJECT_ID('tempdb..#empListIds') IS NOT NULL DROP TABLE #empListIds;
|
||||
CREATE TABLE #empListIds (ID int NOT NULL PRIMARY KEY);
|
||||
INSERT INTO #empListIds (ID) SELECT DISTINCT CONVERT(int, value) FROM STRING_SPLIT(@empIds, ',') WHERE value <> '';
|
||||
SELECT e.* FROM Employee e
|
||||
INNER JOIN #empListIds t ON t.ID = e.EMPLOYEEID
|
||||
WHERE e.PAYROLLTYPEID = %n
|
||||
ORDER BY e.EmployeeNo;
|
||||
DROP TABLE #empListIds;", payrollTypeID);
|
||||
|
||||
// must be a SqlParameter[]: Ease.Core casts the array to SqlParameter[]
|
||||
SqlParameter[] parameters =
|
||||
{
|
||||
SqlHelperExtension.CreateInParam("@empIds", SqlDbType.VarChar, string.Join(",", empIDs), -1) // varchar(max)
|
||||
};
|
||||
return tc.ExecuteReader(CommandType.Text, sql, parameters);
|
||||
}
|
||||
|
||||
internal static IDataReader GetByEmpIDs(TransactionContext tc, string empIDs)
|
||||
{
|
||||
string sTableName;
|
||||
|
|
@ -824,34 +798,6 @@ namespace HRM.DA
|
|||
return dr;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The EmployeeLite columns only, for any number of employees (10k+ at a time).
|
||||
/// The IDs go in as ONE varchar(max) parameter and land in a temp table with a primary key, so the
|
||||
/// SQL text stays small and SQL Server knows how many rows to expect (an inline IN list or
|
||||
/// STRING_SPLIT in the join is much slower at this size). Needs SQL Server 2016+ (STRING_SPLIT).
|
||||
/// </summary>
|
||||
internal static IDataReader GetLiteByEmpIDs(TransactionContext tc, List<int> empIDs)
|
||||
{
|
||||
const string sql = @"SET NOCOUNT ON;
|
||||
IF OBJECT_ID('tempdb..#elEmpIds') IS NOT NULL DROP TABLE #elEmpIds;
|
||||
CREATE TABLE #elEmpIds (ID int NOT NULL PRIMARY KEY);
|
||||
INSERT INTO #elEmpIds (ID) SELECT DISTINCT CONVERT(int, value) FROM STRING_SPLIT(@empIds, ',') WHERE value <> '';
|
||||
SELECT e.EMPLOYEEID AS EmployeeID, e.ISCONFIRMED AS IsConfirmed, e.JOININGDATE AS JoiningDate
|
||||
FROM Employee e
|
||||
INNER JOIN #elEmpIds t ON t.ID = e.EMPLOYEEID;
|
||||
DROP TABLE #elEmpIds;";
|
||||
|
||||
// ints only (the caller passes List<int>), so the parameter can never carry anything but digits and commas
|
||||
string ids = string.Join(",", empIDs);
|
||||
// must be a SqlParameter[]: Ease.Core casts the array to SqlParameter[], and a lone parameter
|
||||
// passed to "params IDataParameter[]" would arrive as an IDataParameter[] and fail that cast
|
||||
SqlParameter[] parameters =
|
||||
{
|
||||
SqlHelperExtension.CreateInParam("@empIds", SqlDbType.VarChar, ids, -1) // varchar(max)
|
||||
};
|
||||
return tc.ExecuteReader(CommandType.Text, sql, parameters);
|
||||
}
|
||||
|
||||
internal static IDataReader GetFssEmp(TransactionContext tc, string empIDs, int payrollTypeID)
|
||||
{
|
||||
string sTableName;
|
||||
|
|
|
|||
|
|
@ -160,19 +160,6 @@ namespace HRM.DA
|
|||
else return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Like hasTaxDataInSalaryTemp(tc, employeeId), but only SALARYTEMPIT (a salary processed and not yet
|
||||
/// finalized) — BONUSTEMPIT is not looked at. Used by the Bonus Process Modify dialog: there the
|
||||
/// employee's BONUSTEMPIT rows are that same bonus's own tax data, saved by Process.
|
||||
/// </summary>
|
||||
internal static bool hasTaxDataInSalaryTempOnly(TransactionContext tc, int employeeId)
|
||||
{
|
||||
object isprocessed = tc.ExecuteScalar(@"select count(*) cnt from SALARYTEMPIT WHERE EmployeeID =%n", employeeId);
|
||||
if (isprocessed == null || isprocessed == DBNull.Value)
|
||||
return false;
|
||||
return Convert.ToInt32(isprocessed) > 0;
|
||||
}
|
||||
|
||||
internal static EnumIncomeTaxDataFrom TaxDataFrom(TransactionContext tc, int employeeId)
|
||||
{
|
||||
object isprocessed = tc.ExecuteScalar(@"if exists(select * from SALARYTEMPIT where EmployeeID =%n ) select 3
|
||||
|
|
@ -225,54 +212,17 @@ namespace HRM.DA
|
|||
DataSet oIncomeTaxs = new DataSet();
|
||||
try
|
||||
{
|
||||
// The employee IDs used to be spliced in twice as "in(1,2,3,...)". With 10k+ employees
|
||||
// SQL Server cannot build a plan for that ("The query processor ran out of internal
|
||||
// resources", error 8623). Now they go in as ONE varchar(max) parameter, land in a temp
|
||||
// table with a primary key, and both parts of the UNION read "in (SELECT ID FROM #tdrEmpIds)".
|
||||
// The query itself (columns, conditions, result) is unchanged. Needs SQL Server 2016+ (STRING_SPLIT).
|
||||
List<string> ids = new List<string>();
|
||||
foreach (string part in (empids ?? string.Empty).Split(','))
|
||||
{
|
||||
string id = part.Trim();
|
||||
if (id.Length == 0) continue;
|
||||
if (!int.TryParse(id, out int empId))
|
||||
throw new ArgumentException("Invalid employee id: " + id);
|
||||
ids.Add(empId.ToString());
|
||||
}
|
||||
|
||||
//string sql = SQLParser.MakeSQL(@"select salarytax.EMPLOYEENO,salarytax.Name,salarytax.EMPLOYEEID, salarytax.TaxAmount SalaryData, st.thisyeartotal TaxData from
|
||||
// (Select tab.EMPLOYEENO,tab.Name,tab.EMPLOYEEID,sum(tab.TaxAmount) TaxAmount from
|
||||
// (Select e.EMPLOYEENO,e.Name,e.EMPLOYEEID,sd.CHANGEDAMOUNT TaxAmount,s.salarymonth from SALARYMONTHLYDETAIL sd, SALARYMONTHLY s,Employee e where s.EMPLOYEEID=e.EMPLOYEEID and sd.SALARYMONTHLYID=s.SALARYMONTHLYID and s.SALARYMONTH
|
||||
// between %d and %d and ITEMCODE=-129 and ITEMID=-129 and s.EMPLOYEEID in(%q)
|
||||
// union
|
||||
// Select e.EMPLOYEENO,e.Name,e.EMPLOYEEID,s.CHANGETAXAMOUNT TaxAmount,s.DISBURSEDATE salarymonth from BONUSPROCESSDETAIL s,Employee e where e.EMPLOYEEID=s.EMPLOYEEID and s.DISBURSEDATE between %d and %d and s.EMPLOYEEID in (%q)
|
||||
// ) tab group by tab.EMPLOYEENO,tab.Name,tab.EMPLOYEEID) salarytax
|
||||
// left join
|
||||
// %q st on salarytax.Employeeid=st.employeeid and st.itemcode=-212 and st.itemid=-212",
|
||||
//fromdate, toDate, empids, fromdate, toDate, empids, GetTableName(dataFrom));
|
||||
|
||||
string sql = SQLParser.MakeSQL(@"SET NOCOUNT ON;
|
||||
IF OBJECT_ID('tempdb..#tdrEmpIds') IS NOT NULL DROP TABLE #tdrEmpIds;
|
||||
CREATE TABLE #tdrEmpIds (ID int NOT NULL PRIMARY KEY);
|
||||
INSERT INTO #tdrEmpIds (ID) SELECT DISTINCT CONVERT(int, value) FROM STRING_SPLIT(@empIds, ',') WHERE value <> '';
|
||||
select salarytax.EMPLOYEENO,salarytax.Name,salarytax.EMPLOYEEID, salarytax.TaxAmount SalaryData, st.thisyeartotal TaxData from
|
||||
string sql = SQLParser.MakeSQL(@"select salarytax.EMPLOYEENO,salarytax.Name,salarytax.EMPLOYEEID, salarytax.TaxAmount SalaryData, st.thisyeartotal TaxData from
|
||||
(Select tab.EMPLOYEENO,tab.Name,tab.EMPLOYEEID,sum(tab.TaxAmount) TaxAmount from
|
||||
(Select e.EMPLOYEENO,e.Name,e.EMPLOYEEID,sd.CHANGEDAMOUNT TaxAmount,s.salarymonth from SALARYMONTHLYDETAIL sd, SALARYMONTHLY s,Employee e where s.EMPLOYEEID=e.EMPLOYEEID and sd.SALARYMONTHLYID=s.SALARYMONTHLYID and s.SALARYMONTH
|
||||
between %d and %d and ITEMCODE=-129 and ITEMID=-129 and s.EMPLOYEEID in (SELECT ID FROM #tdrEmpIds)
|
||||
between %d and %d and ITEMCODE=-129 and ITEMID=-129 and s.EMPLOYEEID in(%q)
|
||||
union
|
||||
Select e.EMPLOYEENO,e.Name,e.EMPLOYEEID,s.CHANGETAXAMOUNT TaxAmount,s.DISBURSEDATE salarymonth from BONUSPROCESSDETAIL s,Employee e where e.EMPLOYEEID=s.EMPLOYEEID and s.DISBURSEDATE between %d and %d and s.EMPLOYEEID in (SELECT ID FROM #tdrEmpIds)
|
||||
Select e.EMPLOYEENO,e.Name,e.EMPLOYEEID,s.CHANGETAXAMOUNT TaxAmount,s.DISBURSEDATE salarymonth from BONUSPROCESSDETAIL s,Employee e where e.EMPLOYEEID=s.EMPLOYEEID and s.DISBURSEDATE between %d and %d and s.EMPLOYEEID in (%q)
|
||||
) tab group by tab.EMPLOYEENO,tab.Name,tab.EMPLOYEEID) salarytax
|
||||
left join
|
||||
%q st on salarytax.Employeeid=st.employeeid and st.itemcode=-212 and st.itemid=-212;
|
||||
DROP TABLE #tdrEmpIds;",
|
||||
fromdate, toDate, fromdate, toDate, GetTableName(dataFrom));
|
||||
|
||||
// must be a Microsoft.Data.SqlClient.SqlParameter[]: Ease.Core casts the array to that type
|
||||
Microsoft.Data.SqlClient.SqlParameter[] parameters =
|
||||
{
|
||||
Ease.Core.DataAccess.SQL.SqlHelperExtension.CreateInParam("@empIds", SqlDbType.VarChar, string.Join(",", ids), -1) // varchar(max)
|
||||
};
|
||||
oIncomeTaxs = tc.ExecuteDataSet(CommandType.Text, sql, parameters);
|
||||
%q st on salarytax.Employeeid=st.employeeid and st.itemcode=-212 and st.itemid=-212",
|
||||
fromdate, toDate, empids, fromdate, toDate, empids, GetTableName(dataFrom));
|
||||
oIncomeTaxs = tc.ExecuteDataSet(sql);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
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" +
|
||||
" WHERE RoleID = %n", item.Code, item.Name, item.Description, (int)item.RoleType, item.Sequence, item.ApproveBy, item.ApproveDate,
|
||||
"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.Sequence, item.ApproveBy, item.ApproveDate,
|
||||
(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",
|
||||
//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
|
||||
WHERE r.RoleID = u.roleid and u.userid = %n and u.Status <> %n order by pcode",
|
||||
useridID, (int)EnumAuthStatus.NewNotYetApprove);
|
||||
WHERE r.RoleID = u.roleid and u.userid = %n order by pcode",useridID);
|
||||
}
|
||||
|
||||
internal static IDataReader GetRolePermissionByUserID(TransactionContext tc, int userID, int employeeID)
|
||||
|
|
@ -159,8 +157,7 @@ namespace HRM.DA
|
|||
//useridID);
|
||||
|
||||
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",
|
||||
useridID, (int)EnumAuthStatus.NewNotYetApprove);
|
||||
WHERE (r.RoleID = u.roleid or r.ROLEID = 12) and u.userid = %n order by pcode", useridID);
|
||||
}
|
||||
|
||||
internal static IDataReader GetRoleActionPermissionByRoleID(TransactionContext tc, int roleID)
|
||||
|
|
|
|||
|
|
@ -131,9 +131,8 @@ namespace HRM.DA
|
|||
return tc.ExecuteDataSet(
|
||||
@"select distinct rp.PERMISSIONCODE MenuKey, rp.roleid RoleID from RolePermission rp
|
||||
inner join UserRole ur on rp.roleID = ur.RoleID
|
||||
where ur.UserID=%n and rp.STATUS=%n and ur.Status<>%n",
|
||||
userID, (int)EnumAuthStatus.Approved, (int)EnumAuthStatus.NewNotYetApprove);
|
||||
// ur.Status<>2: a role given but not approved yet is not live (UserRoleMakerChecker_DB_Changes.sql).
|
||||
where ur.UserID=%n and rp.STATUS=%n",
|
||||
userID, (int)EnumAuthStatus.Approved);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
@ -18,14 +18,8 @@ namespace HRM.DA
|
|||
|
||||
internal static void Insert(TransactionContext tc, UserAccessType item)
|
||||
{
|
||||
tc.ExecuteNonQuery("INSERT INTO UserAccessType(UserAccessTypeID, PayrollTypeID, UserID, Status," +
|
||||
" CreatedBy, CreatedDate, ApprovedBy, ApprovedDate)" +
|
||||
" 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);
|
||||
tc.ExecuteNonQuery("INSERT INTO UserAccessType(UserAccessTypeID, PayrollTypeID, UserID)" +
|
||||
" VALUES(%n, %n, %n)", item.ID, item.PayrollTypeID, item.UserID);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
@ -38,43 +32,6 @@ namespace HRM.DA
|
|||
" 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
|
||||
|
||||
#region Get Function
|
||||
|
|
@ -96,29 +53,7 @@ namespace HRM.DA
|
|||
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
|
||||
|
|
|
|||
|
|
@ -95,13 +95,6 @@ namespace HRM.DA
|
|||
item.ParentID, item.UserStatus, item.ApprovedBy, item.ApprovedDate, item.ComputerName,
|
||||
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)
|
||||
{
|
||||
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
|
||||
WHERE u.UserType=%n AND u.UserID IN
|
||||
(SELECT ua.UserID FROM UserAccessType ua WHERE ua.PayrollTypeID=%n AND ua.Status<>%n)",
|
||||
type, payrollTypeID, (int)EnumAuthStatus.NewNotYetApprove);
|
||||
(SELECT ua.UserID FROM UserAccessType ua WHERE ua.PayrollTypeID=%n)",
|
||||
type, payrollTypeID);
|
||||
}
|
||||
|
||||
internal static IDataReader GetAll(TransactionContext tc)
|
||||
|
|
|
|||
|
|
@ -72,9 +72,7 @@ namespace HRM.DA
|
|||
}
|
||||
|
||||
return tc.ExecuteReader(
|
||||
@"SELECT ur.*, u.LOGINID LoginID, u.USERNAME UserName,R.Name RoleName, u.EmployeeID employeeID,
|
||||
(SELECT e.PayrollTypeID FROM Employee e WHERE e.EmployeeID = u.EmployeeID) EmpPayrollTypeID
|
||||
FROM UserRole ur,[Users] u, Role R
|
||||
@"SELECT ur.*, u.LOGINID LoginID, u.USERNAME UserName,R.Name RoleName 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);
|
||||
}
|
||||
|
||||
|
|
@ -146,111 +144,6 @@ namespace HRM.DA
|
|||
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)
|
||||
{
|
||||
tc.ExecuteNonQuery("UPDATE UserRole SET Status = %n,AuthorizedBy=%n,AuthorizedDate=%D WHERE UserID = %n",
|
||||
|
|
|
|||
|
|
@ -343,11 +343,13 @@ namespace HRM.DA
|
|||
if (oBank.Code ==string.Empty)
|
||||
oBank.Code = GlobalFunctionService.GetMaxCode(tc, "banks", "Code");
|
||||
|
||||
oBank.CreatedBy = 1;
|
||||
oBank.CreatedDate = DateTime.Now;
|
||||
BankDA.Insert(tc, oBank);
|
||||
}
|
||||
else
|
||||
{
|
||||
oBank.ModifiedBy = 1;
|
||||
oBank.ModifiedDate = DateTime.Now;
|
||||
BankDA.Update(tc, oBank);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -495,60 +495,6 @@ namespace HRM.DA
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A copy of CalculateTax for the Bonus Process Modify dialog (one employee, after Process has already
|
||||
/// saved). The only difference: the "salary processed and not yet finalized" check looks at SALARYTEMPIT
|
||||
/// only, not at BONUSTEMPIT — after Process the employee's BONUSTEMPIT rows are this same bonus's own
|
||||
/// tax data, so CalculateTax would always refuse. A salary in the middle of its process still stops it.
|
||||
/// CalculateTax itself is unchanged and still used by Process, Upload and CalculateBonusTax.
|
||||
/// </summary>
|
||||
public void CalculateTaxForModify(List<BonusProcess.BonusProcessDetail> bprocesdetails, List<Employee> oEmployees, Bonus oBonus, int payrolltypeid)
|
||||
{
|
||||
if (_payrolltype == null)
|
||||
_payrolltype = new PayrollTypeService().Get(payrolltypeid);
|
||||
|
||||
if (_parameters == null)
|
||||
_parameters = new BonusParameterService().Get(EnumStatus.Regardless, payrolltypeid);
|
||||
|
||||
if (_payrolltype.TaxParamID == null) throw new ServiceException("Current year Tax paramter setup not found.");
|
||||
TaxParameter oparamter = new TaxParameterService().Get((int)_payrolltype.TaxParamID);
|
||||
|
||||
List<ADParameter> oParams = new ADParameterService().Get(EnumStatus.Regardless, EnumAllowOrDeduct.Allowance, _payrolltype.ID);
|
||||
List<IncomeTax> oTaxes = new IncomeTaxService().Get(EnumIncomeTaxDataFrom.ProcessTempData, _payrolltype.ID);
|
||||
double nTaxAmount = 0;
|
||||
int nCount = 0;
|
||||
// salary only (SALARYTEMPIT); the employee's own bonus tax rows (BONUSTEMPIT) do not stop a Modify
|
||||
IncomeTaxService taxService = new IncomeTaxService();
|
||||
bool salaryProcessed = oEmployees.Any(e => e != null && taxService.hasTaxDataInSalaryTempOnly(e.ID));
|
||||
if (salaryProcessed == true)
|
||||
{
|
||||
throw new ServiceException("Current month salary is processed and not yet finalized. Tax calculation "
|
||||
+ " is not allowed middle of this process. You have to Undo or finalize the salary to calculate tax.");
|
||||
}
|
||||
TaxCalculator oCalculator = new TaxCalculator((int)_payrolltype.TaxParamID, _payrolltype.ID);
|
||||
oCalculator.TaxParameter = oparamter;
|
||||
oCalculator.payrolltype = _payrolltype;
|
||||
foreach (BonusProcess.BonusProcessDetail item in bprocesdetails)
|
||||
{
|
||||
nCount++;
|
||||
oCalculator.Employee = oEmployees.FirstOrDefault(x => x.ID == item.EmployeeID);
|
||||
if (item.BonusParam == null)
|
||||
{
|
||||
item.BonusParam = new BonusParameterService().GetApplicableParameter(item.Employee, (int)item.Employee.GradeID, _parameters, oBonus.ID);
|
||||
}
|
||||
|
||||
if (item.ChangeBonusAmount > 0)
|
||||
{
|
||||
List<TaxRawItem> oTaxRowItems = new List<TaxRawItem>();
|
||||
oTaxRowItems.Add(TaxRawItem.Create(oBonus.Name, item.ChangeBonusAmount, enumIncomeTaxItemType.Bonus, item.BonusID));
|
||||
nTaxAmount = 0;
|
||||
item.IncomeTaxcoll = oCalculator.CalculateBonus(oTaxRowItems, item.BonusParam, ref nTaxAmount, oParams, oTaxes);
|
||||
item.TaxAmount = nTaxAmount;
|
||||
item.ChangeTaxAmount = nTaxAmount;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void UndoTax(BonusProcess oProcessedItems, List<Employee> oEmployees, Bonus oBonus)
|
||||
{
|
||||
if (_payrolltype.TaxParamID == null) throw new ServiceException("Current year Tax paramter setup not found.");
|
||||
|
|
|
|||
|
|
@ -860,7 +860,8 @@ namespace HRM.DA
|
|||
else
|
||||
{
|
||||
BonusProcessDA.Update(tc, oBonusProcess);
|
||||
BonusProcessDA.DeleteProcessDetailByProcessID(tc, oBonusProcess.BonusID, oBonusProcess.ID, oBonusProcess.PayrollTypeID);
|
||||
BonusProcessDA.DeleteProcessDetailByProcessID(tc, oBonusProcess.BonusID, oBonusProcess.ID,
|
||||
oBonusProcess.PayrollTypeID);
|
||||
BonusProcessDA.DeleteEmpCostCenter(tc, oBonusProcess.ID);
|
||||
}
|
||||
List<IncomeTax> incometaxes = new List<IncomeTax>();
|
||||
|
|
@ -903,694 +904,6 @@ namespace HRM.DA
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Bonus Process screen, "Process" button: calculate the bonus (and tax) of the given employees and
|
||||
/// save it in the same call — there is no separate Save step any more. Does on the server what the
|
||||
/// screen used to do in three requests (BonusProcess, the tax-merge step of save(), saveBonusProcess):
|
||||
/// 1. checks: bonus not approved, inputs present; employees this bonus was already processed for this
|
||||
/// month are left out (the screen already leaves them out and lists them);
|
||||
/// 2. CalculateBonus — the same BonusCalculator.CalCulate the old Process button called;
|
||||
/// 3. tax merge — the same rule save() applied in the browser, now for every row;
|
||||
/// 4. save — the same rows Save(BonusProcess) writes, in ONE transaction (all or nothing), with the
|
||||
/// detail rows inserted by one bulk copy instead of one INSERT each;
|
||||
/// 5. returns the saved rows, read back from the database.
|
||||
/// </summary>
|
||||
public BonusProcessAndSaveResult ProcessAndSave(BonusProcessAndSaveRequest request, int payrolltypeid, int userID)
|
||||
{
|
||||
if (request == null)
|
||||
throw new ServiceException("Nothing to process.");
|
||||
if (request.BonusID <= 0)
|
||||
throw new ServiceException("Please select a bonus.");
|
||||
if (request.EmployeeIDs == null || request.EmployeeIDs.Count == 0)
|
||||
throw new ServiceException("Please select employee for the proces");
|
||||
if (request.CurrProcess <= 0)
|
||||
throw new ServiceException("Currently Process For Basic must be greater than zero.");
|
||||
|
||||
PayrollType payrollType = new PayrollTypeService().Get(payrolltypeid);
|
||||
if (payrollType == null)
|
||||
throw new ServiceException("Payroll type not found.");
|
||||
DateTime bonusMonth = payrollType.NextPayProcessDate;
|
||||
|
||||
// 1. checks
|
||||
if (this.IsApproved(request.BonusID, bonusMonth, payrolltypeid))
|
||||
throw new ServiceException("selected Bonus is already process and Approved");
|
||||
this.CheckAlreadyProcessedInMonth(request.BonusID, bonusMonth, payrolltypeid);
|
||||
|
||||
BonusProcessAndSaveResult result = new BonusProcessAndSaveResult();
|
||||
HashSet<int> alreadyProcessed = new HashSet<int>(
|
||||
(this.GetBonusDetails(payrolltypeid, request.BonusID, bonusMonth) ?? new List<BonusProcess.BonusProcessDetail>())
|
||||
.Select(x => x.EmployeeID));
|
||||
List<int> empIDs = new List<int>();
|
||||
foreach (int id in request.EmployeeIDs.Distinct())
|
||||
{
|
||||
if (alreadyProcessed.Contains(id)) result.AlreadyProcessedEmployeeIDs.Add(id);
|
||||
else empIDs.Add(id);
|
||||
}
|
||||
if (empIDs.Count == 0)
|
||||
throw new ServiceException("The selected bonus is already processed for all the selected employees.");
|
||||
|
||||
List<Employee> employees = new EmployeeService().GetByEmpIDList(empIDs, payrolltypeid);
|
||||
if (employees.Count == 0)
|
||||
throw new ServiceException("Selected employees not found in the current payroll type.");
|
||||
|
||||
// 2. calculate (bonus, and tax when IsTaxProcess and not disbursed with salary)
|
||||
BonusProcess oProcess = this.CalculateBonus(payrolltypeid, employees, request.BonusID, request.BasicMonth,
|
||||
request.PayDate, request.CuttOfDate, request.CurrProcess, request.IsDisburseWithSalary, request.IsTaxProcess);
|
||||
if (oProcess == null || oProcess.BonusProcessDetails == null || oProcess.BonusProcessDetails.Count == 0)
|
||||
throw new ServiceException("There are no data to save");
|
||||
|
||||
// 3. tax merge: the bonus head's tax line carries the bonus amount, the Tax Deducted line the tax
|
||||
if (request.IsTaxProcess)
|
||||
ApplyTaxMerge(oProcess, employees, payrollType, request.BonusID);
|
||||
|
||||
// 4. save — header as saveBonusProcess set it, then the same rows Save(BonusProcess) writes
|
||||
oProcess.PayrollTypeID = payrolltypeid;
|
||||
oProcess.DisburseDate = request.PayDate;
|
||||
oProcess.IsTaxProcess = request.IsTaxProcess;
|
||||
oProcess.IsDisburseWithSalary = request.IsDisburseWithSalary;
|
||||
oProcess.CreatedBy = userID;
|
||||
oProcess.CreatedDate = DateTime.Today;
|
||||
SaveNewProcess(oProcess);
|
||||
|
||||
// 5. what was saved
|
||||
result.BonusProcessID = oProcess.ID;
|
||||
result.Rows = this.GetGridRows(oProcess.ID);
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Bonus Process screen, "Upload Data": the rows read from the bonus Excel file (employee + amount,
|
||||
/// RegularDataUploadService.GetBonusData) are saved in the same request — what used to be upload →
|
||||
/// (Tax Re-calculate) → Save, now on the server in one go:
|
||||
/// 1. checks: bonus selected, pay date, not approved; every employee in the current payroll type and
|
||||
/// only once in the file; employees this bonus was already processed for this month are left out;
|
||||
/// 2. with IsTaxProcess, the tax of every row (the same CalculateTax "Tax Re-calculate" ran) and the
|
||||
/// save() tax merge; without it the amounts are saved as they are in the file;
|
||||
/// 3. the same save as the Process button (one transaction, all or nothing);
|
||||
/// 4. returns the saved rows, read back from the database.
|
||||
/// The header is filled the way the screen filled it after an upload (bonus month and basic month =
|
||||
/// the next pay process month, disburse date = pay date).
|
||||
/// </summary>
|
||||
public BonusProcessAndSaveResult UploadAndSave(List<BonusProcess.BonusProcessDetail> uploadedRows,
|
||||
BonusProcessAndSaveRequest request, int payrolltypeid, int userID)
|
||||
{
|
||||
if (request == null || request.BonusID <= 0)
|
||||
throw new ServiceException("Please select a bonus.");
|
||||
if (request.PayDate == DateTime.MinValue)
|
||||
throw new ServiceException("Please select the pay date.");
|
||||
if (uploadedRows == null || uploadedRows.Count == 0)
|
||||
throw new ServiceException("No employee found in the uploaded file.");
|
||||
|
||||
PayrollType payrollType = new PayrollTypeService().Get(payrolltypeid);
|
||||
if (payrollType == null)
|
||||
throw new ServiceException("Payroll type not found.");
|
||||
DateTime bonusMonth = payrollType.NextPayProcessDate;
|
||||
|
||||
// 1. checks
|
||||
if (this.IsApproved(request.BonusID, bonusMonth, payrolltypeid))
|
||||
throw new ServiceException("selected Bonus is already process and Approved");
|
||||
this.CheckAlreadyProcessedInMonth(request.BonusID, bonusMonth, payrolltypeid);
|
||||
|
||||
List<string> problems = new List<string>();
|
||||
var otherPayroll = uploadedRows.Where(x => x.Employee != null && x.Employee.PayrollTypeID != payrolltypeid)
|
||||
.Select(x => x.Employee.EmployeeNo).Distinct().ToList();
|
||||
if (otherPayroll.Count > 0)
|
||||
problems.Add("Not in the current payroll type: " + string.Join(", ", otherPayroll));
|
||||
var duplicates = uploadedRows.GroupBy(x => x.EmployeeID).Where(g => g.Count() > 1)
|
||||
.Select(g => g.First().Employee?.EmployeeNo ?? g.Key.ToString()).ToList();
|
||||
if (duplicates.Count > 0)
|
||||
problems.Add("More than once in the file: " + string.Join(", ", duplicates));
|
||||
var negative = uploadedRows.Where(x => x.BonusAmount < 0).Select(x => x.Employee?.EmployeeNo ?? x.EmployeeID.ToString()).ToList();
|
||||
if (negative.Count > 0)
|
||||
problems.Add("Negative amount: " + string.Join(", ", negative));
|
||||
if (problems.Count > 0)
|
||||
throw new ServiceException("Nothing was saved. " + string.Join(" | ", problems));
|
||||
|
||||
BonusProcessAndSaveResult result = new BonusProcessAndSaveResult();
|
||||
HashSet<int> alreadyProcessed = new HashSet<int>(
|
||||
(this.GetBonusDetails(payrolltypeid, request.BonusID, bonusMonth) ?? new List<BonusProcess.BonusProcessDetail>())
|
||||
.Select(x => x.EmployeeID));
|
||||
|
||||
BonusProcess oProcess = new BonusProcess();
|
||||
oProcess.BonusProcessDetails = new List<BonusProcess.BonusProcessDetail>();
|
||||
oProcess.BonusID = request.BonusID;
|
||||
oProcess.BonusMonth = bonusMonth;
|
||||
oProcess.BasicOnMonth = bonusMonth;
|
||||
oProcess.DisburseDate = request.PayDate;
|
||||
oProcess.IsTaxProcess = request.IsTaxProcess;
|
||||
oProcess.IsDisburseWithSalary = request.IsDisburseWithSalary;
|
||||
oProcess.PayrollTypeID = payrolltypeid;
|
||||
oProcess.CreatedBy = userID;
|
||||
oProcess.CreatedDate = DateTime.Today;
|
||||
|
||||
List<Employee> employees = new List<Employee>();
|
||||
foreach (BonusProcess.BonusProcessDetail row in uploadedRows)
|
||||
{
|
||||
if (alreadyProcessed.Contains(row.EmployeeID))
|
||||
{
|
||||
result.AlreadyProcessedEmployeeIDs.Add(row.EmployeeID);
|
||||
continue;
|
||||
}
|
||||
row.BonusID = request.BonusID;
|
||||
row.BonusMonth = bonusMonth;
|
||||
oProcess.BonusProcessDetails.Add(row);
|
||||
if (row.Employee != null) employees.Add(row.Employee);
|
||||
}
|
||||
if (oProcess.BonusProcessDetails.Count == 0)
|
||||
throw new ServiceException("The selected bonus is already processed for all the employees in the file.");
|
||||
|
||||
// 2. tax (as "Tax Re-calculate" did) and the save() merge
|
||||
if (request.IsTaxProcess)
|
||||
{
|
||||
Bonus obonus = new BonusService().Get(request.BonusID);
|
||||
new BonusCalculator().CalculateTax(oProcess.BonusProcessDetails, employees, obonus, payrolltypeid);
|
||||
ApplyTaxMerge(oProcess, employees, payrollType, request.BonusID);
|
||||
}
|
||||
|
||||
// 3. save
|
||||
SaveNewProcess(oProcess);
|
||||
|
||||
// 4. what was saved
|
||||
result.BonusProcessID = oProcess.ID;
|
||||
result.Rows = this.GetGridRows(oProcess.ID);
|
||||
return result;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The tax-merge rule the screen's save() applied: on every row the bonus head's tax line
|
||||
/// (TaxMergeMaster of this bonus) carries the bonus amount and the Tax Deducted line the tax.
|
||||
/// </summary>
|
||||
private void ApplyTaxMerge(BonusProcess oProcess, List<Employee> employees, PayrollType payrollType, int bonusID)
|
||||
{
|
||||
// a row with no bonus gets no tax lines (CalculateTax skips it), so only rows with a bonus need them
|
||||
if (oProcess.BonusProcessDetails.Any(x => x.ChangeBonusAmount > 0 && (x.IncomeTaxcoll == null || x.IncomeTaxcoll.Count == 0)))
|
||||
throw new ServiceException("Tax Calculation not yet done");
|
||||
if (payrollType.TaxParamID == null)
|
||||
throw new ServiceException("Current year Tax paramter setup not found.");
|
||||
|
||||
TaxMergeMaster mitem = new TaxMergeMasterService().Get(payrollType.ID, (int)payrollType.TaxParamID,
|
||||
EnumTaxMergeType.Bonus, bonusID);
|
||||
if (mitem == null)
|
||||
throw new ServiceException("Bonus head not found in the income tax Grouping");
|
||||
|
||||
Dictionary<int, Employee> empByID = employees.GroupBy(x => x.ID).ToDictionary(g => g.Key, g => g.First());
|
||||
foreach (BonusProcess.BonusProcessDetail detail in oProcess.BonusProcessDetails)
|
||||
{
|
||||
if (detail.IncomeTaxcoll == null || detail.IncomeTaxcoll.Count == 0)
|
||||
continue; // no bonus, no tax lines
|
||||
IncomeTax bonusLine = detail.IncomeTaxcoll.Find(y => y.ItemGroup == mitem.ItemGroup && y.ItemID == mitem.ItemID);
|
||||
if (bonusLine == null)
|
||||
{
|
||||
Employee emp;
|
||||
empByID.TryGetValue(detail.EmployeeID, out emp);
|
||||
throw new ServiceException("Income tax amount not found in the collection"
|
||||
+ (emp != null ? " (" + emp.EmployeeNo + " " + emp.Name + ")" : ""));
|
||||
}
|
||||
bonusLine.ThisMonthAmount = detail.ChangeBonusAmount;
|
||||
|
||||
IncomeTax taxLine = detail.IncomeTaxcoll.Find(y => y.ItemGroup == EnumIncomeTaxItemGroup.Tax_Deducted);
|
||||
if (taxLine != null)
|
||||
taxLine.ThisMonthAmount = detail.ChangeTaxAmount;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Saves a new bonus process in ONE transaction: the header, every detail row (one bulk copy), the
|
||||
/// bonus tax data (BonusITTempData) and the employee cost-center split — the rows Save(BonusProcess)
|
||||
/// writes for a new process. Sets the IDs on oProcess and its details.
|
||||
/// </summary>
|
||||
private void SaveNewProcess(BonusProcess oProcess)
|
||||
{
|
||||
TransactionContext tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin(true);
|
||||
|
||||
int processID = tc.GenerateID("BONUSPROCESS", "BONUSPROCESSID");
|
||||
base.SetObjectID(oProcess, processID);
|
||||
BonusProcessDA.Insert(tc, oProcess);
|
||||
|
||||
int detailID = tc.GenerateID("BONUSPROCESSDETAIL", "BonusProcessDetailID");
|
||||
List<IncomeTax> incometaxes = new List<IncomeTax>();
|
||||
foreach (BonusProcess.BonusProcessDetail detail in oProcess.BonusProcessDetails)
|
||||
{
|
||||
base.SetObjectID(detail, detailID++);
|
||||
detail.BonusProcessID = oProcess.ID;
|
||||
// IncomeTaxcoll null means tax process not required
|
||||
if (detail.IncomeTaxcoll != null && detail.IncomeTaxcoll.Count > 0)
|
||||
incometaxes.AddRange(detail.IncomeTaxcoll);
|
||||
}
|
||||
BonusProcessDA.InsertBulk(tc, oProcess.BonusProcessDetails);
|
||||
|
||||
if (incometaxes.Count > 0)
|
||||
new IncomeTaxService().SaveBulk(tc, incometaxes, EnumIncomeTaxDataFrom.BonusITTempData);
|
||||
|
||||
SaveBonusEmpCostCenter(tc, oProcess);
|
||||
|
||||
tc.End();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
#region Handle Exception
|
||||
|
||||
if (tc != null)
|
||||
tc.HandleError();
|
||||
ExceptionLog.Write(e);
|
||||
throw new ServiceException(e.Message, e);
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>The saved rows of one bonus process, as the Bonus Process grid shows them.</summary>
|
||||
public List<BonusProcessGridRow> GetGridRows(int bonusProcessID)
|
||||
{
|
||||
List<BonusProcessGridRow> rows = new List<BonusProcessGridRow>();
|
||||
TransactionContext tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin();
|
||||
|
||||
DataReader dr = new DataReader(BonusProcessDA.GetGridRows(tc, bonusProcessID));
|
||||
while (dr.Read())
|
||||
rows.Add(MapGridRow(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 rows;
|
||||
}
|
||||
|
||||
private static BonusProcessGridRow MapGridRow(DataReader dr)
|
||||
{
|
||||
return new BonusProcessGridRow
|
||||
{
|
||||
BonusProcessDetailID = dr.GetInt32("BONUSPROCESSDETAILID", 0),
|
||||
BonusProcessID = dr.GetInt32("BONUSPROCESSID", 0),
|
||||
BonusID = dr.GetInt32("BONUSID", 0),
|
||||
EmployeeID = dr.GetInt32("EMPLOYEEID", 0),
|
||||
EmployeeNo = dr.GetString("EMPLOYEENO", string.Empty),
|
||||
Name = dr.GetString("NAME", string.Empty),
|
||||
JoiningDate = dr.GetDateTime("JOININGDATE"),
|
||||
IsConfirmed = dr.GetBoolean("ISCONFIRMED", false),
|
||||
GrossSalary = dr.GetDouble("GROSSSALARY", 0),
|
||||
BasicSalary = dr.GetDouble("BASICSALARY", 0),
|
||||
BonusAmount = dr.GetDouble("BONUSAMOUNT", 0),
|
||||
ChangeBonusAmount = dr.GetDouble("CHANGEBONUSAMOUNT", 0),
|
||||
TaxAmount = dr.GetDouble("TAXAMOUNT", 0),
|
||||
ChangeTaxAmount = dr.GetDouble("CHANGETAXAMOUNT", 0),
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>One saved row of the Bonus Process grid (after a Modify-dialog save).</summary>
|
||||
public BonusProcessGridRow GetGridRow(int bonusProcessDetailID)
|
||||
{
|
||||
BonusProcessGridRow row = null;
|
||||
TransactionContext tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin();
|
||||
|
||||
DataReader dr = new DataReader(BonusProcessDA.GetGridRow(tc, bonusProcessDetailID));
|
||||
if (dr.Read())
|
||||
row = MapGridRow(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 row;
|
||||
}
|
||||
|
||||
#region Modify dialog (one row at a time)
|
||||
|
||||
/// <summary>A saved bonus row and the header fields the Modify dialog needs.</summary>
|
||||
private class ModifyRow
|
||||
{
|
||||
public int BonusProcessDetailID;
|
||||
public int BonusProcessID;
|
||||
public int BonusID;
|
||||
public int EmployeeID;
|
||||
public double TaxAmount;
|
||||
public DateTime BonusMonth;
|
||||
public int PayrollTypeID;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Loads a saved row for the Modify dialog and refuses it when it is not the current payroll type's
|
||||
/// or the bonus is already approved (the same rule as the Process button).
|
||||
/// </summary>
|
||||
private ModifyRow GetRowForModify(int bonusProcessDetailID, int payrolltypeid)
|
||||
{
|
||||
ModifyRow row = null;
|
||||
TransactionContext tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin();
|
||||
|
||||
DataReader dr = new DataReader(BonusProcessDA.GetRowWithHeader(tc, bonusProcessDetailID));
|
||||
if (dr.Read())
|
||||
{
|
||||
row = new ModifyRow
|
||||
{
|
||||
BonusProcessDetailID = dr.GetInt32("BONUSPROCESSDETAILID", 0),
|
||||
BonusProcessID = dr.GetInt32("BONUSPROCESSID", 0),
|
||||
BonusID = dr.GetInt32("BONUSID", 0),
|
||||
EmployeeID = dr.GetInt32("EMPLOYEEID", 0),
|
||||
TaxAmount = dr.GetDouble("TAXAMOUNT", 0),
|
||||
BonusMonth = dr.GetDateTime("BONUSMONTH", DateTime.MinValue),
|
||||
PayrollTypeID = dr.GetInt32("PAYROLLTYPEID", 0),
|
||||
};
|
||||
}
|
||||
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
|
||||
}
|
||||
|
||||
if (row == null)
|
||||
throw new ServiceException("Bonus row not found. Please process the bonus again.");
|
||||
if (row.PayrollTypeID != payrolltypeid)
|
||||
throw new ServiceException("This bonus row does not belong to the current payroll type.");
|
||||
if (this.IsApproved(row.BonusID, row.BonusMonth, payrolltypeid))
|
||||
throw new ServiceException("selected Bonus is already process and Approved");
|
||||
return row;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The tax of one row for this bonus amount — the same BonusCalculator.CalculateTax that
|
||||
/// "Tax Re-calculate" (CalculateBonusTax) runs, for one employee. Returns the detail with TaxAmount,
|
||||
/// ChangeTaxAmount and IncomeTaxcoll filled in.
|
||||
/// </summary>
|
||||
private BonusProcess.BonusProcessDetail CalculateTaxFor(ModifyRow row, double bonusAmount, int payrolltypeid)
|
||||
{
|
||||
Employee emp = new EmployeeService().Get(row.EmployeeID);
|
||||
if (emp == null)
|
||||
throw new ServiceException("Employee not found.");
|
||||
|
||||
BonusProcess.BonusProcessDetail detail = new BonusProcess.BonusProcessDetail();
|
||||
detail.BonusID = row.BonusID;
|
||||
detail.EmployeeID = row.EmployeeID;
|
||||
detail.BonusMonth = row.BonusMonth;
|
||||
detail.ChangeBonusAmount = bonusAmount;
|
||||
detail.Employee = emp;
|
||||
|
||||
Bonus obonus = new BonusService().Get(row.BonusID);
|
||||
// CalculateTaxForModify: CalculateTax, except that this employee's own (already saved) bonus tax rows
|
||||
// do not block it — only an unfinalized salary does
|
||||
new BonusCalculator().CalculateTaxForModify(new List<BonusProcess.BonusProcessDetail> { detail },
|
||||
new List<Employee> { emp }, obonus, payrolltypeid);
|
||||
return detail;
|
||||
}
|
||||
|
||||
/// <summary>Modify dialog, "Calculate": the tax for this bonus amount. Nothing is saved.</summary>
|
||||
public BonusProcessRowTaxResult CalculateRowTax(BonusProcessRowTaxRequest request, int payrolltypeid)
|
||||
{
|
||||
if (request == null || request.BonusProcessDetailID <= 0)
|
||||
throw new ServiceException("Please select a bonus row.");
|
||||
if (request.BonusAmount < 0)
|
||||
throw new ServiceException("Bonus amount can not be negative.");
|
||||
|
||||
ModifyRow row = GetRowForModify(request.BonusProcessDetailID, payrolltypeid);
|
||||
BonusProcess.BonusProcessDetail detail = CalculateTaxFor(row, request.BonusAmount, payrolltypeid);
|
||||
return new BonusProcessRowTaxResult
|
||||
{
|
||||
BonusProcessDetailID = row.BonusProcessDetailID,
|
||||
BonusAmount = request.BonusAmount,
|
||||
TaxAmount = detail.ChangeTaxAmount,
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Modify dialog, "Save": saves ONE row — what Save(BonusProcess) did for every row after
|
||||
/// "Tax Re-calculate", now for one employee, in one transaction:
|
||||
/// - BONUSPROCESSDETAIL: ChangeBonusAmount, ChangeTaxAmount (and TaxAmount when the tax is calculated);
|
||||
/// - this employee's BonusITTempData (BONUSTEMPIT) rows: deleted and written again, with the bonus
|
||||
/// head's line carrying the bonus amount and the Tax Deducted line the tax (the save() merge rule).
|
||||
/// With CalculateTax the tax is worked out again here (the amount the browser sent is not trusted);
|
||||
/// without it the typed tax is used and the employee's existing tax rows are updated, as the old
|
||||
/// screen did when a tax was typed into the grid and saved without recalculating.
|
||||
/// </summary>
|
||||
public BonusProcessGridRow SaveRow(BonusProcessRowSaveRequest request, int payrolltypeid, int userID)
|
||||
{
|
||||
if (request == null || request.BonusProcessDetailID <= 0)
|
||||
throw new ServiceException("Please select a bonus row.");
|
||||
if (request.BonusAmount < 0)
|
||||
throw new ServiceException("Bonus amount can not be negative.");
|
||||
if (!request.CalculateTax && request.TaxAmount < 0)
|
||||
throw new ServiceException("Tax amount can not be negative.");
|
||||
if (request.CalculateTax && request.EditedTaxAmount.HasValue && request.EditedTaxAmount.Value < 0)
|
||||
throw new ServiceException("Edited tax amount can not be negative.");
|
||||
|
||||
ModifyRow row = GetRowForModify(request.BonusProcessDetailID, payrolltypeid);
|
||||
|
||||
double bonusAmount = request.BonusAmount;
|
||||
double changeTaxAmount;
|
||||
double taxAmount = row.TaxAmount; // the calculated tax; kept when a tax is typed in
|
||||
List<IncomeTax> taxLines = null;
|
||||
|
||||
if (request.CalculateTax)
|
||||
{
|
||||
BonusProcess.BonusProcessDetail detail = CalculateTaxFor(row, bonusAmount, payrolltypeid);
|
||||
// the user's "Edited Tax Amount" wins over the calculated one; TAXAMOUNT keeps the calculated tax
|
||||
changeTaxAmount = request.EditedTaxAmount.HasValue ? request.EditedTaxAmount.Value : detail.ChangeTaxAmount;
|
||||
taxAmount = detail.TaxAmount;
|
||||
taxLines = detail.IncomeTaxcoll;
|
||||
}
|
||||
else
|
||||
{
|
||||
changeTaxAmount = request.TaxAmount;
|
||||
List<IncomeTax> existing = new IncomeTaxService().Get(row.EmployeeID, EnumIncomeTaxDataFrom.BonusITTempData);
|
||||
if (existing != null && existing.Count > 0)
|
||||
taxLines = existing;
|
||||
}
|
||||
|
||||
if (taxLines != null && taxLines.Count > 0)
|
||||
{
|
||||
PayrollType payrollType = new PayrollTypeService().Get(payrolltypeid);
|
||||
if (payrollType == null || payrollType.TaxParamID == null)
|
||||
throw new ServiceException("Current year Tax paramter setup not found.");
|
||||
TaxMergeMaster mitem = new TaxMergeMasterService().Get(payrolltypeid, (int)payrollType.TaxParamID,
|
||||
EnumTaxMergeType.Bonus, row.BonusID);
|
||||
if (mitem == null)
|
||||
throw new ServiceException("Bonus head not found in the income tax Grouping");
|
||||
|
||||
IncomeTax bonusLine = taxLines.Find(y => y.ItemGroup == mitem.ItemGroup && y.ItemID == mitem.ItemID);
|
||||
if (bonusLine == null)
|
||||
throw new ServiceException("Income tax amount not found in the collection");
|
||||
bonusLine.ThisMonthAmount = bonusAmount;
|
||||
|
||||
IncomeTax taxLine = taxLines.Find(y => y.ItemGroup == EnumIncomeTaxItemGroup.Tax_Deducted);
|
||||
if (taxLine != null)
|
||||
taxLine.ThisMonthAmount = changeTaxAmount;
|
||||
}
|
||||
|
||||
TransactionContext tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin(true);
|
||||
|
||||
BonusProcessDA.UpdateRowAmounts(tc, row.BonusProcessDetailID, bonusAmount, changeTaxAmount, taxAmount,
|
||||
userID, DateTime.Now);
|
||||
|
||||
if (taxLines != null && taxLines.Count > 0)
|
||||
{
|
||||
IncomeTaxService taxService = new IncomeTaxService();
|
||||
taxService.Delete(tc, row.EmployeeID.ToString(), EnumIncomeTaxDataFrom.BonusITTempData);
|
||||
taxService.SaveBulk(tc, taxLines, EnumIncomeTaxDataFrom.BonusITTempData);
|
||||
}
|
||||
|
||||
tc.End();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
#region Handle Exception
|
||||
|
||||
if (tc != null)
|
||||
tc.HandleError();
|
||||
ExceptionLog.Write(e);
|
||||
throw new ServiceException(e.Message, e);
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
return this.GetGridRow(row.BonusProcessDetailID);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Remove (one saved row, deleted straight away)
|
||||
|
||||
/// <summary>
|
||||
/// Remove button on a saved row: what the old Remove + Save left in the database (the employee simply
|
||||
/// not saved), now deleted at once since Process already saved it — in one transaction:
|
||||
/// - BONUSTEMPIT: this employee's rows (only when the process was saved with Calculate Tax);
|
||||
/// - BonusEmpCostCenter: this employee's rows in this process;
|
||||
/// - BONUSPROCESSDETAIL: the row;
|
||||
/// - BONUSPROCESS: the header too, when that was the process's last employee.
|
||||
/// Refused when the row is not found, not the current payroll type's, or the bonus is already approved
|
||||
/// (the same checks as the Modify dialog). Rows not saved yet are removed in the browser only, as before.
|
||||
/// </summary>
|
||||
public BonusProcessRowRemoveResult RemoveRow(int bonusProcessDetailID, int payrolltypeid)
|
||||
{
|
||||
if (bonusProcessDetailID <= 0)
|
||||
throw new ServiceException("Please select a bonus row.");
|
||||
|
||||
ModifyRow row = GetRowForModify(bonusProcessDetailID, payrolltypeid);
|
||||
BonusProcessRowRemoveResult result = new BonusProcessRowRemoveResult
|
||||
{
|
||||
BonusProcessDetailID = row.BonusProcessDetailID,
|
||||
BonusProcessID = row.BonusProcessID,
|
||||
};
|
||||
|
||||
TransactionContext tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin(true);
|
||||
|
||||
BonusProcessDA.DeleteRowBonusTempTax(tc, row.BonusProcessID, row.EmployeeID);
|
||||
BonusProcessDA.DeleteRowCostCenter(tc, row.BonusProcessID, row.EmployeeID);
|
||||
BonusProcessDA.DeleteRow(tc, row.BonusProcessDetailID);
|
||||
|
||||
if (BonusProcessDA.CountRows(tc, row.BonusProcessID) == 0)
|
||||
{
|
||||
BonusProcessDA.DeleteEmptyProcess(tc, row.BonusProcessID);
|
||||
result.ProcessDeleted = true;
|
||||
}
|
||||
|
||||
tc.End();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
#region Handle Exception
|
||||
|
||||
if (tc != null)
|
||||
tc.HandleError();
|
||||
ExceptionLog.Write(e);
|
||||
throw new ServiceException(e.Message, e);
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Clear Tax (whole process, saved straight away)
|
||||
|
||||
/// <summary>
|
||||
/// Bonus Process screen, "Clear Tax": what the old Clear Tax + Save did, now saved at once (there is no
|
||||
/// Save button any more), for every employee of the process on the screen, in one transaction:
|
||||
/// - BONUSPROCESSDETAIL: CHANGETAXAMOUNT = 0 (TAXAMOUNT, the calculated tax, is kept);
|
||||
/// - BONUSTEMPIT: THISMONTHAMOUNT = 0 on the Tax Deducted line (-212) of those employees.
|
||||
/// Refused when the process is not the current payroll type's or the bonus is already approved.
|
||||
/// The old clearTax() (browser only) is kept as it was.
|
||||
/// </summary>
|
||||
public List<BonusProcessGridRow> ClearTaxAndSave(int bonusProcessID, int payrolltypeid, int userID)
|
||||
{
|
||||
if (bonusProcessID <= 0)
|
||||
throw new ServiceException("Please process the bonus first.");
|
||||
|
||||
int bonusID = 0;
|
||||
int processPayrollTypeID = 0;
|
||||
DateTime bonusMonth = DateTime.MinValue;
|
||||
bool found = false;
|
||||
|
||||
TransactionContext tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin();
|
||||
DataReader dr = new DataReader(BonusProcessDA.GetProcessHeaderForClearTax(tc, bonusProcessID));
|
||||
if (dr.Read())
|
||||
{
|
||||
found = true;
|
||||
bonusID = dr.GetInt32("BONUSID", 0);
|
||||
bonusMonth = dr.GetDateTime("BONUSMONTH", DateTime.MinValue);
|
||||
processPayrollTypeID = dr.GetInt32("PAYROLLTYPEID", 0);
|
||||
}
|
||||
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
|
||||
}
|
||||
|
||||
if (!found)
|
||||
throw new ServiceException("Bonus process not found. Please process the bonus again.");
|
||||
if (processPayrollTypeID != payrolltypeid)
|
||||
throw new ServiceException("This bonus process does not belong to the current payroll type.");
|
||||
if (this.IsApproved(bonusID, bonusMonth, payrolltypeid))
|
||||
throw new ServiceException("selected Bonus is already process and Approved");
|
||||
|
||||
tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin(true);
|
||||
|
||||
BonusProcessDA.ClearTaxOfProcess(tc, bonusProcessID, userID, DateTime.Now);
|
||||
BonusProcessDA.ClearBonusTempTaxOfProcess(tc, bonusProcessID, (int)EnumIncomeTaxItemGroup.Tax_Deducted);
|
||||
|
||||
tc.End();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
#region Handle Exception
|
||||
|
||||
if (tc != null)
|
||||
tc.HandleError();
|
||||
ExceptionLog.Write(e);
|
||||
throw new ServiceException(e.Message, e);
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
return this.GetGridRows(bonusProcessID);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// Builds the employee cost-center split for every employee in the bonus process and
|
||||
/// bulk-inserts it into BonusEmpCostCenter (mirrors the SalaryEmpCostCenter handling in
|
||||
|
|
@ -1844,36 +1157,6 @@ namespace HRM.DA
|
|||
return isApproved;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Bonus Process screen (Process and Upload): the same bonus type may be processed only once in a month.
|
||||
/// Throws when this bonus already has a process in this month for this payroll type.
|
||||
/// </summary>
|
||||
public void CheckAlreadyProcessedInMonth(int bonusID, DateTime bonusMonth, int payrolltypeid)
|
||||
{
|
||||
TransactionContext tc = null;
|
||||
int count = 0;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin();
|
||||
count = BonusProcessDA.CountProcessInMonth(tc, payrolltypeid, bonusID, bonusMonth);
|
||||
tc.End();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
#region Handle Exception
|
||||
|
||||
if (tc != null)
|
||||
tc.HandleError();
|
||||
ExceptionLog.Write(e);
|
||||
throw new ServiceException(e.Message, e);
|
||||
|
||||
#endregion
|
||||
}
|
||||
if (count > 0)
|
||||
throw new ServiceException("This bonus type is already processed for " + bonusMonth.ToString("MMMM yyyy") +
|
||||
". The same bonus type cannot be processed twice in the same month.");
|
||||
}
|
||||
|
||||
|
||||
public DataTable GetUnApprovedBonuses(DateTime dMonthDate, int payrollTypeID)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
List<Location> locations,
|
||||
List<Religion> religions, List<Designation> designations, List<Bank> banks,
|
||||
|
|
|
|||
|
|
@ -1860,43 +1860,6 @@ namespace HRM.DA
|
|||
return employees;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Same as GetByEmpIDs(string, int), for any number of employees (10k+): the IDs reach SQL Server as
|
||||
/// one parameter and a temp table, not as an IN list in the SQL text.
|
||||
/// </summary>
|
||||
public List<Employee> GetByEmpIDList(List<int> empIDs, int payrollTypeID)
|
||||
{
|
||||
List<Employee> employees = new List<Employee>();
|
||||
if (empIDs == null || empIDs.Count == 0)
|
||||
return employees;
|
||||
|
||||
TransactionContext tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin();
|
||||
|
||||
DataReader dr = new DataReader(EmployeeDA.GetByEmpIDList(tc, empIDs.Distinct().ToList(), payrollTypeID));
|
||||
employees = this.CreateObjects<Employee>(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 employees;
|
||||
}
|
||||
|
||||
public List<Employee> GetByEmpIDs(string empIDs)
|
||||
{
|
||||
List<Employee> employees = new List<Employee>();
|
||||
|
|
@ -1927,51 +1890,6 @@ namespace HRM.DA
|
|||
|
||||
return employees;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A light Employee (EmployeeLite) for each of the given employees — an alternative to GetByEmpIDs
|
||||
/// for screens that need only a few fields for thousands of employees (Bonus Process).
|
||||
/// </summary>
|
||||
public List<EmployeeLite> GetLiteByEmpIDs(List<int> empIDs)
|
||||
{
|
||||
List<EmployeeLite> items = new List<EmployeeLite>();
|
||||
if (empIDs == null || empIDs.Count == 0)
|
||||
return items;
|
||||
|
||||
TransactionContext tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin();
|
||||
|
||||
DataReader dr = new DataReader(EmployeeDA.GetLiteByEmpIDs(tc, empIDs.Distinct().ToList()));
|
||||
while (dr.Read())
|
||||
{
|
||||
items.Add(new EmployeeLite
|
||||
{
|
||||
EmployeeID = dr.GetInt32("EmployeeID").Value,
|
||||
IsConfirmed = dr.GetBoolean("IsConfirmed", false),
|
||||
JoiningDate = dr.GetDateTime("JoiningDate")
|
||||
});
|
||||
}
|
||||
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 UpdateBanglaInformation(List<object> employeBanglaInfo)
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -316,36 +316,6 @@ namespace HRM.DA
|
|||
return DataExist;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Only SALARYTEMPIT (salary processed, not yet finalized) — unlike hasTaxDataInSalaryTemp, the
|
||||
/// employee's BONUSTEMPIT rows are not counted. For the Bonus Process Modify dialog.
|
||||
/// </summary>
|
||||
public bool hasTaxDataInSalaryTempOnly(int employeeID)
|
||||
{
|
||||
bool DataExist = false;
|
||||
TransactionContext tc = null;
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin();
|
||||
DataExist = IncomeTaxDA.hasTaxDataInSalaryTempOnly(tc, employeeID);
|
||||
tc.End();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
#region Handle Exception
|
||||
|
||||
if (tc != null)
|
||||
tc.HandleError();
|
||||
ExceptionLog.Write(e);
|
||||
|
||||
throw new ServiceException(e.Message, e);
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
return DataExist;
|
||||
}
|
||||
|
||||
|
||||
public EnumIncomeTaxDataFrom currentYeardataSource(int employeeID)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -469,19 +469,16 @@ return oTaxParameter;
|
|||
{
|
||||
PayrollType ptype = new PayrollTypeService().Get(payrollTypeID);
|
||||
TransactionContext tc = null;
|
||||
List<TaxParameter> allTaxParameter = GetbyPayrolltype(payrollTypeID);
|
||||
|
||||
try
|
||||
try
|
||||
{
|
||||
tc = TransactionContext.Begin(true);
|
||||
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 id = tc.GenerateID("TaxParameter", "TaxParamID");
|
||||
base.SetObjectID(oTaxParameter, (id));
|
||||
TaxParameterDA.InsertWithSignature(tc, oTaxParameter);
|
||||
|
|
|
|||
|
|
@ -329,12 +329,11 @@ namespace HRM.DA
|
|||
public int Save(Role oRole)
|
||||
{
|
||||
TransactionContext tc = null;
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
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)
|
||||
{
|
||||
int id = tc.GenerateID("Role", "RoleID");
|
||||
|
|
@ -345,22 +344,14 @@ namespace HRM.DA
|
|||
}
|
||||
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);
|
||||
#region Delete Children
|
||||
RoleDA.Delete(tc, "RolePermission", "RoleID", oRole.ID);
|
||||
//RoleDA.Delete(tc, "Role.RoleActionPermission", "RoleID", oRole.ID);
|
||||
//RoleDA.Delete(tc, "RoleDesignation", "RoleID", oRole.ID);
|
||||
// RoleDA.Delete(tc, "Role.RoleActionPermission", "RoleID", oRole.ID);
|
||||
// RoleDA.Delete(tc, "RoleDesignation", "RoleID", oRole.ID);
|
||||
#endregion
|
||||
}
|
||||
|
||||
if (oRole.RolePermissions != null & oRole.RolePermissions.Count > 0)
|
||||
{
|
||||
int maxID = oRole.RolePermissions.Max(x => x.ID);
|
||||
|
|
@ -381,31 +372,11 @@ namespace HRM.DA
|
|||
|
||||
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)
|
||||
{
|
||||
rolePermission.RoleID = oRole.ID;
|
||||
Role.RolePermission existingPermission = null;
|
||||
if (rolePermission.PermissionCode != null)
|
||||
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;
|
||||
}
|
||||
rolePermission.CreatedBy = oRole.CreatedBy;
|
||||
rolePermission.CreatedDate = oRole.CreatedDate;
|
||||
//if (oRole.RoleStatus == EnumAuthStatus.Approved )
|
||||
//{
|
||||
// if (rolePermission.Status == EnumAuthStatus.DeletedNotYetApprove)
|
||||
|
|
@ -420,17 +391,6 @@ namespace HRM.DA
|
|||
rolePermission.Status = EnumAuthStatus.Approved;
|
||||
else
|
||||
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
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
@ -19,13 +19,6 @@ namespace HRM.DA
|
|||
base.SetObjectID(oUserAccessType, oReader.GetInt32("UserAccessTypeID").Value);
|
||||
oUserAccessType.PayrollTypeID = oReader.GetInt32("PayrollTypeID").Value;
|
||||
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);
|
||||
}
|
||||
|
||||
|
|
@ -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)
|
||||
{
|
||||
try
|
||||
|
|
|
|||
|
|
@ -31,9 +31,6 @@ namespace HRM.DA
|
|||
oUserRole.ApprovedComputerName = oReader.GetString("ApprovedComputerName");
|
||||
oUserRole.UserRoleStatus = (EnumAuthStatus)oReader.GetInt32("Status").Value;
|
||||
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.userNameView = oReader.GetString("userName", true, string.Empty);
|
||||
oUserRole.roleNameView = oReader.GetString("roleName", true, string.Empty);
|
||||
|
|
@ -440,467 +437,6 @@ namespace HRM.DA
|
|||
// #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)
|
||||
{
|
||||
try
|
||||
|
|
|
|||
|
|
@ -809,27 +809,15 @@ namespace HRM.DA
|
|||
TransactionContext tc = null;
|
||||
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);
|
||||
|
||||
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();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
if (tc != null)
|
||||
tc.HandleError();
|
||||
throw new Exception(ex.Message);
|
||||
}
|
||||
|
||||
|
|
@ -1058,13 +1046,8 @@ namespace HRM.DA
|
|||
public void Approve(User oUser)
|
||||
{
|
||||
TransactionContext tc = null;
|
||||
User before = null;
|
||||
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);
|
||||
UserDA.Approve(tc, oUser);
|
||||
tc.End();
|
||||
|
|
@ -1078,14 +1061,6 @@ namespace HRM.DA
|
|||
throw new ServiceException(e.Message, e);
|
||||
#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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -14,8 +14,5 @@ export class UserAccessType extends BaseObject
|
|||
public description: string = "";
|
||||
public userID: number;
|
||||
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 approvedBy?: number;
|
||||
public approvedDate?: Date;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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[] = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,31 +47,3 @@ export class BadLoginAttemptInfo extends BaseObject {
|
|||
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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
// A light Employee: only the few fields screens working on thousands of employees at once need
|
||||
// (api/Employee/getEmployeeLiteByEmpIDs). Mirrors HRM.BO.EmployeeLite — add a field in both.
|
||||
export class EmployeeLite {
|
||||
public employeeID: number;
|
||||
public isConfirmed: boolean;
|
||||
public joiningDate: Date;
|
||||
}
|
||||
|
|
@ -31,8 +31,6 @@ export class BonusProcess extends BaseObject {
|
|||
}
|
||||
|
||||
export class BonusProcessDetail {
|
||||
// the saved row's BONUSPROCESSDETAILID (set on rows that came back from api/Bonus/processAndSave)
|
||||
bonusProcessDetailID?: number;
|
||||
isProjectedBonus: boolean;
|
||||
bonusProcessID: number;
|
||||
bonusID: number;
|
||||
|
|
|
|||
|
|
@ -1,66 +0,0 @@
|
|||
// api/Bonus/processAndSave — mirrors HRM.BO BonusProcessAndSave.cs (add a field in both).
|
||||
|
||||
// What the Process button sends: the header and the employee IDs only.
|
||||
export interface BonusProcessAndSaveRequest {
|
||||
bonusID: number;
|
||||
basicMonth: Date;
|
||||
payDate: Date;
|
||||
cuttOfDate: Date;
|
||||
currProcess: number;
|
||||
isDisburseWithSalary: boolean;
|
||||
isTaxProcess: boolean;
|
||||
employeeIDs: number[];
|
||||
}
|
||||
|
||||
// One saved row of the Bonus Process grid, read back from the database.
|
||||
export interface BonusProcessGridRow {
|
||||
bonusProcessDetailID: number;
|
||||
bonusProcessID: number;
|
||||
bonusID: number;
|
||||
employeeID: number;
|
||||
employeeNo: string;
|
||||
name: string;
|
||||
joiningDate: Date;
|
||||
isConfirmed: boolean;
|
||||
grossSalary: number;
|
||||
basicSalary: number;
|
||||
bonusAmount: number;
|
||||
changeBonusAmount: number;
|
||||
taxAmount: number;
|
||||
changeTaxAmount: number;
|
||||
}
|
||||
|
||||
// Modify dialog, Calculate (api/Bonus/calculateRowTax): nothing is saved
|
||||
export interface BonusProcessRowTaxRequest {
|
||||
bonusProcessDetailID: number;
|
||||
bonusAmount: number;
|
||||
}
|
||||
export interface BonusProcessRowTaxResult {
|
||||
bonusProcessDetailID: number;
|
||||
bonusAmount: number;
|
||||
taxAmount: number;
|
||||
}
|
||||
|
||||
// Modify dialog, Save (api/Bonus/saveRow): with calculateTax the server works the tax out again
|
||||
export interface BonusProcessRowSaveRequest {
|
||||
bonusProcessDetailID: number;
|
||||
bonusAmount: number;
|
||||
taxAmount: number;
|
||||
calculateTax: boolean;
|
||||
// "Edited Tax Amount": with calculateTax, the tax the user settled on (saved as changeTaxAmount); undefined = the calculated tax
|
||||
editedTaxAmount?: number;
|
||||
}
|
||||
|
||||
export interface BonusProcessAndSaveResult {
|
||||
bonusProcessID: number;
|
||||
rows: BonusProcessGridRow[];
|
||||
// employees left out because this bonus was already processed for them this month
|
||||
alreadyProcessedEmployeeIDs: number[];
|
||||
}
|
||||
|
||||
// Remove on a saved row (api/Bonus/removeRow/{id}): processDeleted = it was the last employee, the header is gone too
|
||||
export interface BonusProcessRowRemoveResult {
|
||||
bonusProcessDetailID: number;
|
||||
bonusProcessID: number;
|
||||
processDeleted: boolean;
|
||||
}
|
||||
|
|
@ -2,7 +2,6 @@ import {Injectable} from '@angular/core';
|
|||
import {ApiService} from '../../app.api.service';
|
||||
import {HttpClient, HttpEvent, HttpRequest} from '@angular/common/http';
|
||||
import { Observable } from 'rxjs';
|
||||
import { BonusProcessAndSaveRequest, BonusProcessAndSaveResult } from '../../_models/Payroll/bonusProcessAndSave';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
|
|
@ -36,15 +35,6 @@ export class DataUploadService {
|
|||
return this.http.request<any>(req);
|
||||
}
|
||||
|
||||
// Bonus Process, Upload Data: the file is read AND saved (with the tax when asked) in one request.
|
||||
// header = the same fields the Process button sends (api/dataUpload/uploadBonusFileAndSave)
|
||||
public uploadBonusFileAndSave(selectedFile: File, header: BonusProcessAndSaveRequest): Observable<BonusProcessAndSaveResult> {
|
||||
const formData: FormData = new FormData();
|
||||
formData.append('excelfile', selectedFile);
|
||||
formData.append('header', JSON.stringify(header));
|
||||
return this.http.post<BonusProcessAndSaveResult>(`${this.apiService.base_url + '/'}dataUpload/uploadBonusFileAndSave`, formData);
|
||||
}
|
||||
|
||||
public uploadBonusFile(selectedFile: File, payrolltypeid: number):
|
||||
Observable<HttpEvent<any>> {
|
||||
const formData: FormData = new FormData();
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ import { HRMNotificationService } from '../../app.notification.service';
|
|||
import { Role, RolePermission } from '../../_models/Authentication/role';
|
||||
import { SearchEmployee } from '../../_models/Employee/searchEmployee';
|
||||
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 { 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 { Bookmark } from '../../_models/Basic/bookmark';
|
||||
import { Subject } from 'rxjs';
|
||||
|
|
@ -146,10 +146,6 @@ export class AuthService {
|
|||
return this.apiService.httpGet<BadLoginAttemptInfo[]>('/Authentication/getBadLoginAuditTrail/' +
|
||||
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() {
|
||||
return this.apiService.httpGet<Bookmark[]>('/Authentication/getBookmarks');
|
||||
}
|
||||
|
|
@ -209,31 +205,6 @@ export class AuthService {
|
|||
saveUserRole(params: any) {
|
||||
return this.apiService.httpPost<number>('/Authentication/saveUserRole', params);
|
||||
}
|
||||
// ---------- User Role Permission maker-checker ----------
|
||||
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() {
|
||||
return this.apiService.httpGet<PayrollType[]>('/Authentication/GetAllPayrollTypes');
|
||||
}
|
||||
|
|
@ -260,23 +231,6 @@ export class AuthService {
|
|||
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) {
|
||||
return this.apiService.httpPost<any>('/Authentication/changePassword', userData);
|
||||
}
|
||||
|
|
@ -343,7 +297,4 @@ export class AuthService {
|
|||
getIsFromUser(): boolean {
|
||||
return this.isFromUserSubject.value;
|
||||
}
|
||||
CipherMechanism(userData: any) {
|
||||
return this.apiService.httpPost<any>('/Authentication/CipherMechanism', userData);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ import {TrainingType} from '../../_models/Basic/trainingType';
|
|||
import {EducationType} from '../../_models/HRBasic/education-type';
|
||||
import {NominationPurpose} from '../../_models/HRBasic/nomination-purpose';
|
||||
import {Employee} from '../../_models/Employee/employee';
|
||||
import {EmployeeLite} from '../../_models/Employee/employeeLite';
|
||||
import {EmployeeBankAccount} from '../../_models/Employee/employeeBankAccount';
|
||||
import {EmployeeCostCenter} from '../../_models/Employee/employeeCostCenter';
|
||||
import {Relation} from '../../_models/HRBasic/relation';
|
||||
|
|
@ -139,11 +138,6 @@ export class EmployeeServices {
|
|||
getEmployeesByEmpIDs(data: any) {
|
||||
return this.apiService.httpPost<Employee[]>('/Employee/getEmployeesByEmpIDs', data);
|
||||
}
|
||||
|
||||
// A light Employee (only a few fields) — light enough for 10k+ employees (Bonus Process).
|
||||
getEmployeeLiteByEmpIDs(empIds: number[]) {
|
||||
return this.apiService.httpPost<EmployeeLite[]>('/Employee/getEmployeeLiteByEmpIDs', empIds);
|
||||
}
|
||||
getEmployeeDetailByEmpIDs(data: any) {
|
||||
return this.apiService.httpPost<Employee[]>('/Employee/getEmployeeDetailByEmpIDs', data);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ import { ProductionBonusSetup } from '../../_models/Payroll/ProductionBonus/prod
|
|||
import { ProductionBonusSetupComponent } from 'src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component';
|
||||
import { ProdBonusLine } from 'src/app/_models/Payroll/ProductionBonus/prodBonusLine';
|
||||
import { Employee } from 'src/app/_models/Employee/employee';
|
||||
import { BonusProcessAndSaveRequest, BonusProcessAndSaveResult, BonusProcessGridRow, BonusProcessRowSaveRequest,
|
||||
BonusProcessRowTaxRequest, BonusProcessRowTaxResult, BonusProcessRowRemoveResult } from 'src/app/_models/Payroll/bonusProcessAndSave';
|
||||
import { ProdBonusAttn } from 'src/app/_models/Payroll/ProductionBonus/prodBonusAttn';
|
||||
import { ProdBonusProcess } from 'src/app/_models/Payroll/ProductionBonus/prodBonusProcess';
|
||||
import { PRBCalculation, PRBCalculationReport, PRBKpi } from '../../_models/Payroll/prbCalculation';
|
||||
|
|
@ -46,23 +44,6 @@ export class BonusService {
|
|||
saveBonusProcess(param: any) {
|
||||
return this.apiService.httpPost<any>('/Bonus/saveBonusProcess/', param);
|
||||
}
|
||||
// Process button: calculates and saves in one request; returns the saved rows (see BonusProcessService.ProcessAndSave)
|
||||
processAndSave(param: BonusProcessAndSaveRequest) {
|
||||
return this.apiService.httpPost<BonusProcessAndSaveResult>('/Bonus/processAndSave', param);
|
||||
}
|
||||
// Modify dialog: tax of one saved row (nothing saved), and saving one row
|
||||
calculateRowTax(param: BonusProcessRowTaxRequest) {
|
||||
return this.apiService.httpPost<BonusProcessRowTaxResult>('/Bonus/calculateRowTax', param);
|
||||
}
|
||||
saveRow(param: BonusProcessRowSaveRequest) {
|
||||
return this.apiService.httpPost<BonusProcessGridRow>('/Bonus/saveRow', param);
|
||||
}
|
||||
clearTaxAndSave(bonusProcessID: number) {
|
||||
return this.apiService.httpPost<BonusProcessGridRow[]>('/Bonus/clearTaxAndSave/' + bonusProcessID, {});
|
||||
}
|
||||
removeRow(bonusProcessDetailID: number) {
|
||||
return this.apiService.httpPost<BonusProcessRowRemoveResult>('/Bonus/removeRow/' + bonusProcessDetailID, {});
|
||||
}
|
||||
GetUnApprovedBonusses() {
|
||||
return this.apiService.httpGet<any>('/Bonus/GetUnApprovedBonusses' );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import { UserAccessTypeComponent } from './user-access-type/user-access-type.com
|
|||
import {ChangePasswordComponent} from './change-password/change-password.component';
|
||||
import { DataPermssionComponent } from './data-permssion/data-permssion.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: 'data-permssion', component: DataPermssionComponent, canActivate: [AuthGuard] },
|
||||
{ path: 'system-auditlog', component: SystemAuditTrailComponent, canActivate: [AuthGuard] },
|
||||
{ path: 'cipher-engine', component: CipherEngineComponent, canActivate: [AuthGuard] },
|
||||
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -110,7 +110,6 @@ import { KENDO_TREEVIEW } from '@progress/kendo-angular-treeview';
|
|||
import { LayoutModule } from '@progress/kendo-angular-layout';
|
||||
import { ExcelExportModule } from '@progress/kendo-angular-excel-export';
|
||||
import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component';
|
||||
import { CipherEngineComponent } from './cipher-engine/cipher-engine.component';
|
||||
|
||||
|
||||
@NgModule({
|
||||
|
|
@ -226,8 +225,7 @@ import { CipherEngineComponent } from './cipher-engine/cipher-engine.component';
|
|||
ChangePasswordComponent,
|
||||
UserComponent,
|
||||
DataPermssionComponent,
|
||||
SystemAuditTrailComponent,
|
||||
CipherEngineComponent
|
||||
SystemAuditTrailComponent
|
||||
],
|
||||
providers: [
|
||||
AppWindowPopUp,
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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(() => {});
|
||||
}
|
||||
}
|
||||
|
|
@ -121,7 +121,7 @@ export class RolePermissionEntryComponent implements OnInit {
|
|||
},
|
||||
(err: any) => {
|
||||
//ON ERROR
|
||||
this.loadingpanelService.ShowLoadingPanel = false;
|
||||
this.loadingpanelService.ShowLoadingPanel = true;
|
||||
|
||||
},
|
||||
() => {
|
||||
|
|
@ -378,7 +378,7 @@ export class RolePermissionEntryComponent implements OnInit {
|
|||
(err: any) => {
|
||||
//ON ERROR
|
||||
this.loadingpanelService.ShowLoadingPanel = false;
|
||||
this.notificationService.showError(err.error);
|
||||
this.notificationService.showSuccess(err.error);
|
||||
},
|
||||
() => {
|
||||
this.loadingpanelService.ShowLoadingPanel = false;
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,48 +1,18 @@
|
|||
<app-loading-panel></app-loading-panel>
|
||||
<kendo-grid #rlGrid [kendoGridBinding]="gridView"
|
||||
class="rl-grid"
|
||||
|
||||
<kendo-grid [data]="roles"
|
||||
kendoGridSelectBy="id"
|
||||
[pageSize]="20"
|
||||
[pageable]="true"
|
||||
[sortable]="true"
|
||||
[filterable]="true"
|
||||
[reorderable]="true"
|
||||
[resizable]="true"
|
||||
[scrollable]="true"
|
||||
[columnMenu]="{ filter: true }"
|
||||
(add)="addHandler()">
|
||||
<ng-template kendoGridToolbarTemplate>
|
||||
<div class="rl-toolbar">
|
||||
<div class="rl-toolbar__filters">
|
||||
<input placeholder="Search in all columns..." kendoTextBox class="rl-search" (input)="onFilter($event.target.value)" />
|
||||
|
||||
<!-- 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>
|
||||
<button themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['plus']" kendoGridAddCommand>Add new</button>
|
||||
<input placeholder="Search in all columns..." kendoTextBox (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>
|
||||
</ng-template>
|
||||
<kendo-grid-column field="code" title="Code">
|
||||
</kendo-grid-column>
|
||||
|
|
@ -50,59 +20,21 @@
|
|||
</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>
|
||||
<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">
|
||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||
<span class="rl-badge"
|
||||
[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>
|
||||
{{ statusString(dataItem.roleStatus)}}
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-command-column title="Edit/Approve" width="220">
|
||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||
@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) {
|
||||
<button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']"
|
||||
[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>
|
||||
<button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']" (click)="Approve(rowIndex);">Approve</button>
|
||||
}
|
||||
</ng-template>
|
||||
</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>
|
||||
|
||||
|
||||
|
|
@ -110,15 +42,14 @@
|
|||
|
||||
|
||||
@if (showModal) {
|
||||
<div class="blur-background">
|
||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650">
|
||||
<kendo-dialog-titlebar>
|
||||
Role Permission
|
||||
</kendo-dialog-titlebar>
|
||||
<app-role-permission-entry [setviewMode]="viewMode" [setRole]="selectedRole" (saveCompleted)="saveCompleted($event)">
|
||||
</app-role-permission-entry>
|
||||
</kendo-dialog>
|
||||
</div>
|
||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650"
|
||||
>
|
||||
<kendo-dialog-titlebar>
|
||||
Role Permission
|
||||
</kendo-dialog-titlebar>
|
||||
<app-role-permission-entry [setviewMode]="viewMode" [setRole]="selectedRole" (saveCompleted)="saveCompleted($event)">
|
||||
</app-role-permission-entry>
|
||||
</kendo-dialog>
|
||||
}
|
||||
|
||||
<!--<p-dialog [(visible)]="showModal" [style]="{width: '700px',height:'800px', position: 'absolute'}" header="Role Information"
|
||||
|
|
|
|||
|
|
@ -1,14 +1,12 @@
|
|||
import {Component, OnInit, ViewChild, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';
|
||||
import {process, State} from '@progress/kendo-data-query';
|
||||
import {DataBindingDirective, GridComponent} from '@progress/kendo-angular-grid';
|
||||
import {ExcelExportData} from '@progress/kendo-angular-excel-export';import {Router} from '@angular/router';
|
||||
import {Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';
|
||||
import {State} from '@progress/kendo-data-query';
|
||||
import {Router} from '@angular/router';
|
||||
import {AuthService} from '../../../_services/auth/auth.service';
|
||||
import {Role} from '../../../_models/Authentication/role';
|
||||
import { HRMNotificationService } from '../../../app.notification.service';
|
||||
import { UntilityHandlerService } from '../../../utility.hanldler.service';
|
||||
import { ApiService } from '../../../app.api.service';
|
||||
import { EnumAuthStatus, EnumExtension, EnumRoleType } from '../../../_models/enums';
|
||||
import { loadingPanelService } from '../../../hrm-loding panel/loding.panel.service';
|
||||
import { EnumAuthStatus } from '../../../_models/enums';
|
||||
|
||||
import { ButtonModule } from '@progress/kendo-angular-buttons';
|
||||
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
|
||||
})
|
||||
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;
|
||||
IsNew = true;
|
||||
roles: Role[];
|
||||
selectedRole: Role;
|
||||
viewMode: number =1; //1 new, 2 edit ,3 approve
|
||||
|
||||
/** Status chip group of a role: New / Edited / Deleted not yet approved count as Pending. */
|
||||
statusGroup(r: Role): 'active' | 'pending' | 'inactive' {
|
||||
if (r.roleStatus == EnumAuthStatus.Active || r.roleStatus == EnumAuthStatus.Approved) {
|
||||
return 'active';
|
||||
}
|
||||
if (r.roleStatus == EnumAuthStatus.New_Not_Yet_Approve
|
||||
|| r.roleStatus == EnumAuthStatus.Edited_Not_Yet_Approve
|
||||
|| r.roleStatus == EnumAuthStatus.Deleted_Not_Yet_Approve) {
|
||||
return 'pending';
|
||||
}
|
||||
return 'inactive';
|
||||
}
|
||||
|
||||
/** Toolbar chip counts (all roles, not narrowed by search or chip). */
|
||||
get roleCounts(): { all: number, active: number, pending: number, inactive: number } {
|
||||
const counts = { all: 0, active: 0, pending: 0, inactive: 0 };
|
||||
(this.roles ?? []).forEach(r => {
|
||||
counts.all++;
|
||||
counts[this.statusGroup(r)]++;
|
||||
});
|
||||
return counts;
|
||||
}
|
||||
constructor(public useService: AuthService,public apiService: ApiService,
|
||||
public router: Router, public utilityService: UntilityHandlerService, public apiservice: ApiService,
|
||||
public loadingPanel: loadingPanelService) {
|
||||
public router: Router, public utilityService: UntilityHandlerService, public apiservice: ApiService) {
|
||||
this.setSelectableSettings();
|
||||
this.loadingPanel.ShowLoadingPanel = true;
|
||||
this.utilityService.ShowLoadingPanel = true;
|
||||
this.apiservice.selectedMenuName="Role Entry"
|
||||
this.allData = this.allData.bind(this);
|
||||
}
|
||||
|
||||
public ngOnInit(): void {
|
||||
this.selectedRole = new Role();
|
||||
this.showModal = false;
|
||||
this.useService.GetCurrentUser().subscribe(
|
||||
(resp: any) => {
|
||||
this.currentUserID = resp?.userID;
|
||||
},
|
||||
);
|
||||
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() {
|
||||
this.useService.getAllRoles()
|
||||
.subscribe(
|
||||
(resp: any) => {
|
||||
debugger;
|
||||
this.roles = resp;
|
||||
this.refreshGridView();
|
||||
},
|
||||
(err: any) => {
|
||||
//ON ERROR
|
||||
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) {
|
||||
case EnumAuthStatus.Active: { 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"
|
||||
}
|
||||
|
|
@ -161,77 +104,12 @@ export class RolePermissionListComponent implements OnInit {
|
|||
this.roles[index] = role;
|
||||
|
||||
}
|
||||
this.refreshGridView();
|
||||
}
|
||||
|
||||
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) {
|
||||
this.viewMode = 2;
|
||||
this.selectedRole = this.roles[rowIndex];
|
||||
|
|
|
|||
|
|
@ -1,269 +1,169 @@
|
|||
<div class="sal-page">
|
||||
<app-loading-panel></app-loading-panel>
|
||||
<app-loading-panel></app-loading-panel>
|
||||
|
||||
<!-- ── Page header ── -->
|
||||
<section class="sal-card sal-header">
|
||||
<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">
|
||||
<div class="card card-w-title audit-trail">
|
||||
<kendo-tabstrip [keepTabContent]="true">
|
||||
|
||||
<!-- ── Tab 1: User Audit Trail (dbo.UserLoginInfo) ── -->
|
||||
<kendo-tabstrip-tab [selected]="true">
|
||||
<ng-template kendoTabTitle><i class="pi pi-sign-in"></i><span>User Audit Trail</span></ng-template>
|
||||
<kendo-tabstrip-tab title="User Audit Trail" [selected]="true">
|
||||
<ng-template kendoTabContent>
|
||||
<section class="sal-card sal-body">
|
||||
<div class="sal-filter">
|
||||
<div class="sal-field">
|
||||
<label for="dtUserFrom">From Date</label>
|
||||
<kendo-datepicker id="dtUserFrom" [(ngModel)]="userFromDate" [format]="'dd-MMM-yyyy'" [max]="userToDate"></kendo-datepicker>
|
||||
</div>
|
||||
<div class="sal-field">
|
||||
<label for="dtUserTo">To Date</label>
|
||||
<kendo-datepicker id="dtUserTo" [(ngModel)]="userToDate" [format]="'dd-MMM-yyyy'" [min]="userFromDate"></kendo-datepicker>
|
||||
</div>
|
||||
<button kendoButton themeColor="primary" class="sal-load" [svgIcon]="apiService.KendoSVGIcon['search']"
|
||||
(click)="loadUserAuditTrail()">Load</button>
|
||||
<div class="grid audit-trail-filter">
|
||||
<div class="col-12 md:col-1 audit-trail-label">
|
||||
<label for="dtUserFrom">From Date</label>
|
||||
</div>
|
||||
<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>
|
||||
</div>
|
||||
<div class="col-12 md:col-3">
|
||||
<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>
|
||||
|
||||
<kendo-grid #userGridRef class="sal-grid"
|
||||
[data]="userGrid.view"
|
||||
[skip]="userGrid.state.skip"
|
||||
[pageSize]="pageSize"
|
||||
[sort]="userGrid.state.sort"
|
||||
[filter]="userGrid.state.filter"
|
||||
[sortable]="true"
|
||||
filterable="menu"
|
||||
scrollable="virtual"
|
||||
[rowHeight]="36"
|
||||
[height]="520"
|
||||
[navigable]="true"
|
||||
(dataStateChange)="userGrid.onStateChange($event)">
|
||||
<kendo-grid #userGridRef
|
||||
[data]="userGrid.view"
|
||||
[skip]="userGrid.state.skip"
|
||||
[pageSize]="pageSize"
|
||||
[sort]="userGrid.state.sort"
|
||||
[filter]="userGrid.state.filter"
|
||||
[sortable]="true"
|
||||
filterable="menu"
|
||||
scrollable="virtual"
|
||||
[rowHeight]="36"
|
||||
[height]="520"
|
||||
[navigable]="true"
|
||||
(dataStateChange)="userGrid.onStateChange($event)">
|
||||
|
||||
<ng-template kendoGridToolbarTemplate>
|
||||
<span class="sal-search">
|
||||
<i class="pi pi-search"></i>
|
||||
<input kendoTextBox placeholder="Search in all columns..."
|
||||
[value]="userGrid.searchText" (input)="userGrid.onSearch($any($event.target).value)" />
|
||||
</span>
|
||||
<span class="sal-count">
|
||||
<strong>{{ userGrid.filteredCount | number }}</strong> of {{ userGrid.rows.length | number }} records
|
||||
</span>
|
||||
<kendo-grid-spacer></kendo-grid-spacer>
|
||||
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']"
|
||||
(click)="exportExcel(userGridRef, userGrid)">Export to Excel</button>
|
||||
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['filePdf']"
|
||||
(click)="exportPdf(userGridRef, userGrid)">Export to PDF</button>
|
||||
</ng-template>
|
||||
<ng-template kendoGridToolbarTemplate>
|
||||
<input kendoTextBox class="audit-trail-search" placeholder="Search in all columns..."
|
||||
[value]="userGrid.searchText" (input)="userGrid.onSearch($any($event.target).value)" />
|
||||
<span class="audit-trail-count">
|
||||
{{ userGrid.filteredCount | number }} of {{ userGrid.rows.length | number }} records
|
||||
</span>
|
||||
<kendo-grid-spacer></kendo-grid-spacer>
|
||||
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']"
|
||||
(click)="exportExcel(userGridRef, userGrid)">Export to Excel</button>
|
||||
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['filePdf']"
|
||||
(click)="exportPdf(userGridRef, userGrid)">Export to PDF</button>
|
||||
</ng-template>
|
||||
|
||||
<kendo-grid-column field="loginID" title="Login ID" [width]="160"></kendo-grid-column>
|
||||
<kendo-grid-column field="userName" title="Name" [width]="240"></kendo-grid-column>
|
||||
<kendo-grid-column field="punchTime" title="Punch Time" [width]="210" filter="date"
|
||||
[format]="gridDateFormat"></kendo-grid-column>
|
||||
<kendo-grid-column field="pcNumber" title="Computer" [width]="260"></kendo-grid-column>
|
||||
<kendo-grid-column field="ipAddress" title="IP Address" [width]="150"></kendo-grid-column>
|
||||
<kendo-grid-column field="deviceId" title="Device ID" [width]="220"></kendo-grid-column>
|
||||
<kendo-grid-column field="loginID" title="Login ID" [width]="160"></kendo-grid-column>
|
||||
<kendo-grid-column field="userName" title="Name" [width]="240"></kendo-grid-column>
|
||||
<kendo-grid-column field="punchTime" title="Punch Time" [width]="210" filter="date"
|
||||
[format]="gridDateFormat"></kendo-grid-column>
|
||||
<kendo-grid-column field="pcNumber" title="Computer" [width]="260"></kendo-grid-column>
|
||||
<kendo-grid-column field="ipAddress" title="IP Address" [width]="150"></kendo-grid-column>
|
||||
<kendo-grid-column field="deviceId" title="Device ID" [width]="220"></kendo-grid-column>
|
||||
|
||||
<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.' }}
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template kendoGridNoRecordsTemplate>
|
||||
{{ userGrid.loaded ? 'No login found for this date range.' : 'Select a date range and press Load.' }}
|
||||
</ng-template>
|
||||
|
||||
<kendo-grid-excel [fileName]="fileName('UserAuditTrail', userFromDate, userToDate, 'xlsx')"
|
||||
[fetchData]="userGrid.allData">
|
||||
<kendo-excelexport-column field="loginID" title="Login ID" [width]="140"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="userName" title="Name" [width]="220"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="punchTime" title="Punch Time" [width]="180"
|
||||
[cellOptions]="{ format: excelDateFormat }"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="pcNumber" title="Computer" [width]="300"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="ipAddress" title="IP Address" [width]="130"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="deviceId" title="Device ID" [width]="220"></kendo-excelexport-column>
|
||||
</kendo-grid-excel>
|
||||
<kendo-grid-excel [fileName]="fileName('UserAuditTrail', userFromDate, userToDate, 'xlsx')"
|
||||
[fetchData]="userGrid.allData">
|
||||
<kendo-excelexport-column field="loginID" title="Login ID" [width]="140"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="userName" title="Name" [width]="220"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="punchTime" title="Punch Time" [width]="180"
|
||||
[cellOptions]="{ format: excelDateFormat }"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="pcNumber" title="Computer" [width]="300"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="ipAddress" title="IP Address" [width]="130"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="deviceId" title="Device ID" [width]="220"></kendo-excelexport-column>
|
||||
</kendo-grid-excel>
|
||||
|
||||
<kendo-grid-pdf [fileName]="fileName('UserAuditTrail', userFromDate, userToDate, '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>
|
||||
<kendo-grid-pdf [fileName]="fileName('UserAuditTrail', userFromDate, userToDate, '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>
|
||||
</ng-template>
|
||||
</kendo-tabstrip-tab>
|
||||
|
||||
<!-- ── Tab 2: Bad Login Attempt (dbo.BadLoginAttemptInfo) ── -->
|
||||
<kendo-tabstrip-tab>
|
||||
<ng-template kendoTabTitle><i class="pi pi-ban"></i><span>Bad Login Attempt</span></ng-template>
|
||||
<kendo-tabstrip-tab title="Bad Login Attempt">
|
||||
<ng-template kendoTabContent>
|
||||
<section class="sal-card sal-body">
|
||||
<div class="sal-filter">
|
||||
<div class="sal-field">
|
||||
<label for="dtBadFrom">From Date</label>
|
||||
<kendo-datepicker id="dtBadFrom" [(ngModel)]="badFromDate" [format]="'dd-MMM-yyyy'" [max]="badToDate"></kendo-datepicker>
|
||||
</div>
|
||||
<div class="sal-field">
|
||||
<label for="dtBadTo">To Date</label>
|
||||
<kendo-datepicker id="dtBadTo" [(ngModel)]="badToDate" [format]="'dd-MMM-yyyy'" [min]="badFromDate"></kendo-datepicker>
|
||||
</div>
|
||||
<button kendoButton themeColor="primary" class="sal-load" [svgIcon]="apiService.KendoSVGIcon['search']"
|
||||
(click)="loadBadLoginAttempts()">Load</button>
|
||||
<div class="grid audit-trail-filter">
|
||||
<div class="col-12 md:col-1 audit-trail-label">
|
||||
<label for="dtBadFrom">From Date</label>
|
||||
</div>
|
||||
<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>
|
||||
</div>
|
||||
<div class="col-12 md:col-3">
|
||||
<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>
|
||||
|
||||
<kendo-grid #badGridRef class="sal-grid"
|
||||
[data]="badGrid.view"
|
||||
[skip]="badGrid.state.skip"
|
||||
[pageSize]="pageSize"
|
||||
[sort]="badGrid.state.sort"
|
||||
[filter]="badGrid.state.filter"
|
||||
[sortable]="true"
|
||||
filterable="menu"
|
||||
scrollable="virtual"
|
||||
[rowHeight]="36"
|
||||
[height]="520"
|
||||
[navigable]="true"
|
||||
(dataStateChange)="badGrid.onStateChange($event)">
|
||||
<kendo-grid #badGridRef
|
||||
[data]="badGrid.view"
|
||||
[skip]="badGrid.state.skip"
|
||||
[pageSize]="pageSize"
|
||||
[sort]="badGrid.state.sort"
|
||||
[filter]="badGrid.state.filter"
|
||||
[sortable]="true"
|
||||
filterable="menu"
|
||||
scrollable="virtual"
|
||||
[rowHeight]="36"
|
||||
[height]="520"
|
||||
[navigable]="true"
|
||||
(dataStateChange)="badGrid.onStateChange($event)">
|
||||
|
||||
<ng-template kendoGridToolbarTemplate>
|
||||
<span class="sal-search">
|
||||
<i class="pi pi-search"></i>
|
||||
<input kendoTextBox placeholder="Search in all columns..."
|
||||
[value]="badGrid.searchText" (input)="badGrid.onSearch($any($event.target).value)" />
|
||||
</span>
|
||||
<span class="sal-count">
|
||||
<strong>{{ badGrid.filteredCount | number }}</strong> of {{ badGrid.rows.length | number }} records
|
||||
</span>
|
||||
<kendo-grid-spacer></kendo-grid-spacer>
|
||||
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']"
|
||||
(click)="exportExcel(badGridRef, badGrid)">Export to Excel</button>
|
||||
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['filePdf']"
|
||||
(click)="exportPdf(badGridRef, badGrid)">Export to PDF</button>
|
||||
</ng-template>
|
||||
<ng-template kendoGridToolbarTemplate>
|
||||
<input kendoTextBox class="audit-trail-search" placeholder="Search in all columns..."
|
||||
[value]="badGrid.searchText" (input)="badGrid.onSearch($any($event.target).value)" />
|
||||
<span class="audit-trail-count">
|
||||
{{ badGrid.filteredCount | number }} of {{ badGrid.rows.length | number }} records
|
||||
</span>
|
||||
<kendo-grid-spacer></kendo-grid-spacer>
|
||||
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['fileExcel']"
|
||||
(click)="exportExcel(badGridRef, badGrid)">Export to Excel</button>
|
||||
<button kendoButton type="button" [svgIcon]="apiService.KendoSVGIcon['filePdf']"
|
||||
(click)="exportPdf(badGridRef, badGrid)">Export to PDF</button>
|
||||
</ng-template>
|
||||
|
||||
<kendo-grid-column field="loginID" title="Login ID" [width]="200"></kendo-grid-column>
|
||||
<kendo-grid-column field="punchTime" title="Punch Time" [width]="220" filter="date"
|
||||
[format]="gridDateFormat"></kendo-grid-column>
|
||||
<kendo-grid-column field="pcNumber" title="Computer" [width]="280"></kendo-grid-column>
|
||||
<kendo-grid-column field="ipAddress" title="IP Address" [width]="150"></kendo-grid-column>
|
||||
<kendo-grid-column field="deviceId" title="Device ID" [width]="220"></kendo-grid-column>
|
||||
<kendo-grid-column field="loginID" title="Login ID" [width]="200"></kendo-grid-column>
|
||||
<kendo-grid-column field="punchTime" title="Punch Time" [width]="220" filter="date"
|
||||
[format]="gridDateFormat"></kendo-grid-column>
|
||||
<kendo-grid-column field="pcNumber" title="Computer" [width]="280"></kendo-grid-column>
|
||||
<kendo-grid-column field="ipAddress" title="IP Address" [width]="150"></kendo-grid-column>
|
||||
<kendo-grid-column field="deviceId" title="Device ID" [width]="220"></kendo-grid-column>
|
||||
|
||||
<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.' }}
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template kendoGridNoRecordsTemplate>
|
||||
{{ badGrid.loaded ? 'No bad login attempt found for this date range.' : 'Select a date range and press Load.' }}
|
||||
</ng-template>
|
||||
|
||||
<kendo-grid-excel [fileName]="fileName('BadLoginAttempt', badFromDate, badToDate, 'xlsx')"
|
||||
[fetchData]="badGrid.allData">
|
||||
<kendo-excelexport-column field="loginID" title="Login ID" [width]="160"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="punchTime" title="Punch Time" [width]="180"
|
||||
[cellOptions]="{ format: excelDateFormat }"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="pcNumber" title="Computer" [width]="300"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="ipAddress" title="IP Address" [width]="130"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="deviceId" title="Device ID" [width]="220"></kendo-excelexport-column>
|
||||
</kendo-grid-excel>
|
||||
<kendo-grid-excel [fileName]="fileName('BadLoginAttempt', badFromDate, badToDate, 'xlsx')"
|
||||
[fetchData]="badGrid.allData">
|
||||
<kendo-excelexport-column field="loginID" title="Login ID" [width]="160"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="punchTime" title="Punch Time" [width]="180"
|
||||
[cellOptions]="{ format: excelDateFormat }"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="pcNumber" title="Computer" [width]="300"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="ipAddress" title="IP Address" [width]="130"></kendo-excelexport-column>
|
||||
<kendo-excelexport-column field="deviceId" title="Device ID" [width]="220"></kendo-excelexport-column>
|
||||
</kendo-grid-excel>
|
||||
|
||||
<kendo-grid-pdf [fileName]="fileName('BadLoginAttempt', badFromDate, badToDate, '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>
|
||||
<kendo-grid-pdf [fileName]="fileName('BadLoginAttempt', badFromDate, badToDate, '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>
|
||||
</ng-template>
|
||||
</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> 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>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,252 +1,18 @@
|
|||
@use '../../../styles/abstracts/tokens' as *;
|
||||
|
||||
// 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;
|
||||
.audit-trail-filter {
|
||||
margin: 0.5rem 0 0.75rem;
|
||||
align-items: center;
|
||||
gap: 14px;
|
||||
}
|
||||
|
||||
.sal-header-ico {
|
||||
flex: 0 0 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;
|
||||
}
|
||||
.audit-trail-label {
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.sal-header-text {
|
||||
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;
|
||||
.audit-trail-search {
|
||||
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 {
|
||||
width: 100%;
|
||||
padding-left: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
.audit-trail-count {
|
||||
margin-left: 0.5rem;
|
||||
font-size: 0.875rem;
|
||||
opacity: 0.75;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import { ApiService } from '../../app.api.service';
|
|||
import { AuthService } from '../../_services/auth/auth.service';
|
||||
import { HRMNotificationService } from '../../app.notification.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. */
|
||||
const PAGE_SIZE = 60;
|
||||
|
|
@ -24,48 +24,22 @@ export interface AuditTrailRow {
|
|||
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
|
||||
* grid's sort / filter / virtual-scroll state. Everything is done client side over
|
||||
* the rows of the selected date range.
|
||||
*/
|
||||
export class AuditTrailGrid<T = AuditTrailRow> {
|
||||
rows: T[] = [];
|
||||
private searched: T[] = [];
|
||||
export class AuditTrailGrid {
|
||||
rows: AuditTrailRow[] = [];
|
||||
private searched: AuditTrailRow[] = [];
|
||||
searchText = '';
|
||||
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 };
|
||||
|
||||
constructor(private searchFields: (keyof T)[], sortField: string = 'punchTime') {
|
||||
this.state = { skip: 0, take: PAGE_SIZE, sort: [{ field: sortField, dir: 'desc' }], filter: { logic: 'and', filters: [] } };
|
||||
}
|
||||
constructor(private searchFields: (keyof AuditTrailRow)[]) { }
|
||||
|
||||
setRows(rows: T[]): void {
|
||||
setRows(rows: AuditTrailRow[]): void {
|
||||
this.rows = rows;
|
||||
this.loaded = true;
|
||||
this.state = { ...this.state, skip: 0 };
|
||||
|
|
@ -106,8 +80,8 @@ export class AuditTrailGrid<T = AuditTrailRow> {
|
|||
this.view = process(this.searched, this.state);
|
||||
}
|
||||
|
||||
private static searchValue<R>(row: R, field: keyof R): string {
|
||||
const value: unknown = row[field];
|
||||
private static searchValue(row: AuditTrailRow, field: keyof AuditTrailRow): string {
|
||||
const value = row[field];
|
||||
if (value === undefined || value === null) {
|
||||
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({
|
||||
selector: 'app-system-audittrail',
|
||||
templateUrl: './system.audittrail.component.html',
|
||||
|
|
@ -173,33 +122,6 @@ export class SystemAuditTrailComponent implements OnInit {
|
|||
badToDate: Date;
|
||||
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,
|
||||
public authService: AuthService,
|
||||
public notificationService: HRMNotificationService,
|
||||
|
|
@ -217,10 +139,6 @@ export class SystemAuditTrailComponent implements OnInit {
|
|||
this.userToDate = new Date(today);
|
||||
this.badFromDate = new Date(weekAgo);
|
||||
this.badToDate = new Date(today);
|
||||
this.historyTabs.forEach(tab => {
|
||||
tab.fromDate = new Date(weekAgo);
|
||||
tab.toDate = new Date(today);
|
||||
});
|
||||
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 ----------------------------------------------------------------
|
||||
|
||||
/** 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) {
|
||||
this.notificationService.showError('There is no data to export.');
|
||||
return;
|
||||
|
|
@ -326,7 +210,7 @@ export class SystemAuditTrailComponent implements OnInit {
|
|||
grid.saveAsPDF();
|
||||
}
|
||||
|
||||
exportExcel(grid: GridComponent, auditGrid: { filteredCount: number }): void {
|
||||
exportExcel(grid: GridComponent, auditGrid: AuditTrailGrid): void {
|
||||
if (auditGrid.filteredCount === 0) {
|
||||
this.notificationService.showError('There is no data to export.');
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,118 +1,36 @@
|
|||
<app-loading-panel></app-loading-panel>
|
||||
|
||||
<div class="sc-page">
|
||||
|
||||
<!-- Page header -->
|
||||
<div class="sc-header">
|
||||
<div class="sc-header-icon">
|
||||
<i class="pi pi-cog"></i>
|
||||
</div>
|
||||
<div>
|
||||
<h2 class="sc-title">System Configuration</h2>
|
||||
<p class="sc-subtitle">Upload or download XML configuration files</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 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"
|
||||
[data]="configtypes"
|
||||
[defaultItem]="{ name: 'Select a configuration type', value: null }"
|
||||
[textField]="'name'"
|
||||
[valueField]="'value'"
|
||||
[valuePrimitive]="true"
|
||||
id="configTypeSelect" style="width: 100%;">
|
||||
</kendo-dropdownlist>
|
||||
</div>
|
||||
|
||||
<!-- File upload drop zone -->
|
||||
<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">
|
||||
<app-loading-panel> </app-loading-panel>
|
||||
<div class="card card-w-title">
|
||||
<div class="col-12">
|
||||
<div class="col-12" style="font-weight: bold;color: red;">
|
||||
<label>Please select respective Configuration Type from the dropboox & choose file to upload the configuration type</label>
|
||||
</div>
|
||||
|
||||
<!-- File selected state -->
|
||||
<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 class="col-12">
|
||||
<div class="grid">
|
||||
<div class="col-12">
|
||||
<div class="example-wrapper">
|
||||
<p>Configuration Type:</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-3" style="margin: auto;">
|
||||
<kendo-dropdownlist [(ngModel)]="fileTypeid"
|
||||
[data]="configtypes"
|
||||
[defaultItem]="{ name: 'Select a configuration type', value: null }"
|
||||
[textField]="'name'"
|
||||
[valueField]="'value'"
|
||||
[valuePrimitive]="true"
|
||||
id="itemid" style="width: 100%;">
|
||||
</kendo-dropdownlist>
|
||||
</div>
|
||||
<div class="col-7">
|
||||
<input id="fupEmpPhoto" kendoTextBox (change)="selectFile($event)" type="file" style="width: 100%;">
|
||||
</div>
|
||||
<div class="col-1" style="margin: auto;">
|
||||
<button kendoButton themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['upload']" (click)="upload()" style="width: 100%;">upload</button>
|
||||
</div>
|
||||
<div class="col-1" style="margin: auto;">
|
||||
<button kendoButton themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['download']" (click)="download()" style="width: 100%;">Download</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="sc-file-details">
|
||||
<span class="sc-file-name">{{ selectedFileName }}</span>
|
||||
<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>
|
||||
|
||||
<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>
|
||||
|
|
@ -59,13 +59,6 @@ export class SystemConfigurationComponent implements OnInit {
|
|||
_fromValidator: FormGroup;
|
||||
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);
|
||||
|
||||
constructor(public systemConfigService: SystemConfigurationService,
|
||||
|
|
@ -167,14 +160,10 @@ export class SystemConfigurationComponent implements OnInit {
|
|||
(err) => {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
this.notificationService.showError(err.error);
|
||||
this.statusType = 'error';
|
||||
this.statusMessage = err.error;
|
||||
},
|
||||
() => {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
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 {
|
||||
|
||||
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) {
|
||||
// const file: File | null = this.selectedFiles.item(0);
|
||||
// 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 {
|
||||
const temporiginalName = '';
|
||||
let tempName = '';
|
||||
|
|
|
|||
|
|
@ -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%;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
<div class="uat-header">
|
||||
<div class="uat-header__icon"><i class="pi pi-id-card"></i></div>
|
||||
<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>
|
||||
<kendo-dropdownlist [data]="_users"
|
||||
id="idUser"
|
||||
[defaultItem]="{ name: 'select a User', id: null }"
|
||||
[textField]="'userName'"
|
||||
[valueField]="'id'"
|
||||
[valuePrimitive]="true"
|
||||
[(ngModel)]="_selectedUserID"
|
||||
(valueChange)="RefreshGrid($event)"
|
||||
class="form-control form-control-sm input-sm">
|
||||
</kendo-dropdownlist>
|
||||
</div>
|
||||
<div class="col-12 md:col-6">
|
||||
</div>
|
||||
</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'"
|
||||
[valueField]="'id'"
|
||||
[valuePrimitive]="true"
|
||||
[(ngModel)]="_selectedUserID"
|
||||
(valueChange)="RefreshGrid($event)"
|
||||
class="uat-user__select">
|
||||
<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>
|
||||
|
||||
@if (selectedUser) {
|
||||
<div class="uat-user__summary">
|
||||
<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 class="uat-stats">
|
||||
<div class="uat-stat">
|
||||
<span class="uat-stat__value">{{ liveCount }}</span>
|
||||
<span class="uat-stat__label">payroll types in use</span>
|
||||
</div>
|
||||
<div class="uat-stat">
|
||||
@if (hasPending) {
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
</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>
|
||||
<div class="card card-w-title">
|
||||
<div class="grid">
|
||||
<div class="col-12">
|
||||
<kendo-grid [kendoGridBinding]="_payrollTypes"
|
||||
kendoGridSelectBy="id"
|
||||
[selectable]="selectableSettings"
|
||||
[(selectedKeys)]="_selectedPayrollTypes"
|
||||
|
||||
@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> }
|
||||
>
|
||||
<kendo-grid-checkbox-column [width]="40"
|
||||
[headerClass]="{'text-center': true}"
|
||||
[class]="{'text-center': true}"
|
||||
[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>
|
||||
}
|
||||
@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 class="col-12">
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['save']" class="k-button k-primary" (click)="onSave()">Save</button>
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import {EnumUserType, EnumAuthStatus} from '../../_models/enums';
|
|||
import {SelectableSettings} from '@progress/kendo-angular-grid';
|
||||
import {ApiService} from '../../app.api.service';
|
||||
import {HRMNotificationService} from '../../app.notification.service';
|
||||
import {loadingPanelService} from '../../hrm-loding panel/loding.panel.service';
|
||||
|
||||
import { ButtonModule } from '@progress/kendo-angular-buttons';
|
||||
import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
|
||||
|
|
@ -39,30 +38,18 @@ export class UserAccessTypeComponent implements OnInit {
|
|||
_selectedUserID: number;
|
||||
_selectedPayrollTypes: number[]=[];
|
||||
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,
|
||||
public loadingPanel: loadingPanelService) {
|
||||
constructor(public notificationService: HRMNotificationService, public useService: AuthService, public apiService: ApiService) {
|
||||
this.apiService.selectedMenuName = ' User Access-Type Entry';
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this._selectedUserID = undefined;
|
||||
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)
|
||||
.subscribe(
|
||||
(resp: any) => {
|
||||
this._users = resp;
|
||||
this.filteredUsers = (resp ?? []).slice();
|
||||
},
|
||||
(err: any) => {
|
||||
//ON ERROR
|
||||
|
|
@ -91,153 +78,6 @@ export class UserAccessTypeComponent implements OnInit {
|
|||
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 {
|
||||
this.selectableSettings = {
|
||||
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) {
|
||||
this._selectedPayrollTypes = [];
|
||||
this._userAcessTypes = [];
|
||||
this.setSelectableSettings();
|
||||
if (selectedUser == undefined || selectedUser == null) {
|
||||
return;
|
||||
}
|
||||
this.useService.GetUserAccessType(selectedUser)
|
||||
.subscribe(
|
||||
(resp: any) => {
|
||||
this._userAcessTypes = resp ?? [];
|
||||
this._userAcessTypes = resp;
|
||||
},
|
||||
(err: any) => {
|
||||
//ON ERROR
|
||||
|
|
@ -455,17 +98,13 @@ export class UserAccessTypeComponent implements OnInit {
|
|||
() => {
|
||||
|
||||
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);
|
||||
if (ptype != undefined) {
|
||||
this._selectedPayrollTypes.push(ptype.id);
|
||||
}
|
||||
});
|
||||
this._selectedPayrollTypes = [... this._selectedPayrollTypes];
|
||||
this.setSelectableSettings();
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -480,49 +119,57 @@ export class UserAccessTypeComponent implements OnInit {
|
|||
public onSave(): void {
|
||||
|
||||
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) {
|
||||
this.notificationService.showWarning('Select at least one payroll type.');
|
||||
return;
|
||||
}
|
||||
// The ticked payroll types are sent as they are; the server works out what is new
|
||||
// (New - Not Yet Approved) and what was unticked (Removal - Not Yet Approved).
|
||||
// New Item
|
||||
this._selectedPayrollTypes.forEach(x => {
|
||||
var ptype: UserAccessType = new UserAccessType();
|
||||
ptype.userID = this._selectedUserID;
|
||||
ptype.payrollTypeID = x;
|
||||
let payrollType = this._payrollTypes.find(p => p.id === x);
|
||||
if (payrollType) {
|
||||
ptype.description = payrollType.description;
|
||||
|
||||
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.payrollTypeID = x;
|
||||
}
|
||||
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)
|
||||
.subscribe(
|
||||
(resp: any) => {
|
||||
|
||||
},
|
||||
(err: any) => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showError(err?.error ?? err);
|
||||
this.notificationService.showError(err);
|
||||
//ON ERROR
|
||||
},
|
||||
() => {
|
||||
//ON Success
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showSuccess('Saved. The change is waiting for approval.');
|
||||
this.notificationService.showSuccess('Saved Successfully.');
|
||||
// this.loadGrid();
|
||||
this.RefreshGrid(this._userAcessTypesforSave[0].userID);
|
||||
this.loadPending();
|
||||
}
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -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%;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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="col-12 md:col-2" style="margin: auto;">
|
||||
<label for="idRoleType">Role Type</label>
|
||||
</div>
|
||||
<div class="col-12 md:col-2">
|
||||
|
||||
<div class="ura">
|
||||
<div class="ura-layout">
|
||||
|
||||
<!-- 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>
|
||||
|
||||
@if (roleType == roletypeEnum.Admin) {
|
||||
<label class="ura-label ura-label--gap" for="uraUser">User</label>
|
||||
<kendo-dropdownlist id="uraUser" class="ura-select"
|
||||
[data]="filteredUsers"
|
||||
[filterable]="true"
|
||||
(filterChange)="onUserFilter($event)"
|
||||
[defaultItem]="{ userName: 'Select a user', id: null }"
|
||||
[textField]="'userName'"
|
||||
[valueField]="'id'"
|
||||
[valuePrimitive]="true"
|
||||
[disabled]="!!openFor"
|
||||
[(ngModel)]="selectedUserID"
|
||||
(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>
|
||||
}
|
||||
|
||||
@if (roleType == roletypeEnum.Self_Service) {
|
||||
<label class="ura-label ura-label--gap" for="uraPayroll">Payroll type</label>
|
||||
<kendo-dropdownlist id="uraPayroll" class="ura-select"
|
||||
[data]="payrollTypes"
|
||||
[defaultItem]="{ description: 'Select a payroll type', id: null }"
|
||||
[textField]="'description'"
|
||||
[valueField]="'id'"
|
||||
[valuePrimitive]="true"
|
||||
[disabled]="!!openFor"
|
||||
[(ngModel)]="selectedPayrollTypeID"
|
||||
(valueChange)="onPayrollTypeChange()">
|
||||
</kendo-dropdownlist>
|
||||
|
||||
@if (!openFor) {
|
||||
<label class="ura-label ura-label--gap">Employee</label>
|
||||
@if (selectedPayrollTypeID) {
|
||||
<app-employee-picker (ItemSelected)="onEmployeeSelected($event)"
|
||||
[payrollTypeID]="selectedPayrollTypeID"
|
||||
[isActive]="true"
|
||||
[MultiSelect]="false"></app-employee-picker>
|
||||
} @else {
|
||||
<p class="ura-muted">Select a payroll type first.</p>
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@if (state) {
|
||||
<div class="ura-person">
|
||||
<div class="ura-avatar">{{ (state.personName || '?').charAt(0) | uppercase }}</div>
|
||||
<div class="ura-person__info">
|
||||
<span class="ura-person__name">{{ state.personName }}</span>
|
||||
<span class="ura-muted">{{ state.loginID }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ura-stats">
|
||||
<div class="ura-stat">
|
||||
<span class="ura-stat__value">{{ state.liveRoleIDs.length }}</span>
|
||||
<span class="ura-stat__label">{{ state.liveRoleIDs.length == 1 ? 'role' : 'roles' }} now</span>
|
||||
</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>
|
||||
}
|
||||
}
|
||||
<kendo-dropdownlist [data]="roleTypes"
|
||||
id="idRoleType"
|
||||
[defaultItem]="{ name: 'select a Type', value: null }"
|
||||
[textField]="'name'"
|
||||
[valueField]="'value'"
|
||||
[valuePrimitive]="true"
|
||||
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>
|
||||
|
||||
<!-- A change waiting for approval -->
|
||||
@if (state && hasPending) {
|
||||
<div class="ura-card ura-pending">
|
||||
<div class="ura-pending__head">
|
||||
<i class="pi pi-clock"></i>
|
||||
<div>
|
||||
<p class="ura-pending__title">Change waiting for approval</p>
|
||||
<p class="ura-pending__text">
|
||||
Requested by <b>{{ pendingMaker || '-' }}</b>
|
||||
@if (pendingDate) { on {{ pendingDate | date: 'dd MMM yyyy, h:mm a' }} }.
|
||||
Until it is approved, {{ state.personName }} keeps the current roles.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
@if (pendingAddNames.length > 0) {
|
||||
<span class="ura-change__label">Will get</span>
|
||||
<div class="ura-chips">
|
||||
@for (n of pendingAddNames; track n) { <span class="ura-chip ura-chip--add"><i class="pi pi-plus"></i>{{ n }}</span> }
|
||||
</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 -->
|
||||
<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 class="col-12 md:col-2">
|
||||
<kendo-dropdownlist [data]="_users"
|
||||
id="idUser"
|
||||
[defaultItem]="{ name: 'select a Type', value: null }"
|
||||
[textField]="'userName'"
|
||||
[valueField]="'id'"
|
||||
[valuePrimitive]="true"
|
||||
[(ngModel)]="_selectedUserID"
|
||||
class="form-control form-control-sm input-sm">
|
||||
</kendo-dropdownlist>
|
||||
</div>
|
||||
|
||||
<div class="ura-list" [class.ura-list--locked]="locked">
|
||||
@for (r of visibleRoles; track r.id) {
|
||||
<label class="ura-row" [class.is-ticked]="state && isTicked(r.id)">
|
||||
<input type="checkbox" kendoCheckBox [checked]="state && isTicked(r.id)" [disabled]="locked" (change)="toggle(r.id)" />
|
||||
<span class="ura-row__name">{{ r.name }}</span>
|
||||
@if (state) {
|
||||
<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 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) {
|
||||
<div >
|
||||
<div class="grid form-group" style="margin: auto;">
|
||||
<div class="col-12 md:col-2" style="margin: auto;">
|
||||
<label for="idpayrollType">Payroll Type</label>
|
||||
</div>
|
||||
<div class="col-12 md:col-4">
|
||||
<kendo-dropdownlist [data]="_payrollTypes"
|
||||
id="idpayrollType"
|
||||
[defaultItem]="{ description: 'select a Type', id: null }"
|
||||
[textField]="'description'"
|
||||
[valueField]="'id'"
|
||||
[valuePrimitive]="true"
|
||||
class="form-control form-control-sm input-sm"
|
||||
[(ngModel)]="_selectedPayrollTypeid">
|
||||
</kendo-dropdownlist>
|
||||
</div>
|
||||
<div class="col-12 md:col-2" style="margin: auto;">
|
||||
<label for="idemployeeselection">Select Employee:</label>
|
||||
</div>
|
||||
<div class="col-12 md:col-4">
|
||||
<app-employee-picker id="idemployeeselection" (ItemSelected)="GetSelectedEmployee($event)"
|
||||
[payrollTypeID]="_selectedPayrollTypeid"
|
||||
[isActive]="_selectedPayrollTypeid != undefined"
|
||||
[MultiSelect]="true"></app-employee-picker>
|
||||
</div>
|
||||
<!--<div class="col-12 md:col-4">
|
||||
<button class="k-button" (click)="SearchUnAssingedEmp()">Find all un-Assinged Employees</button>
|
||||
</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 class="card">
|
||||
<div class="grid ">
|
||||
<div class="col-12 lg:col-3">
|
||||
<kendo-grid [data]="_gridRoles" style="height: 300px; width: 100%;"
|
||||
[(selectedKeys)]="_selectedRoles"
|
||||
[selectable]="selectableSettings"
|
||||
[kendoGridSelectBy]="'id'"
|
||||
(selectionChange)="onSelectionRoleChange($event)">
|
||||
<kendo-grid-checkbox-column width="25%" [headerClass]="{'text-center': true}" [class]="{'text-center': true}"></kendo-grid-checkbox-column>
|
||||
<kendo-grid-column field="name" title="Role-Name" width="75%">
|
||||
</kendo-grid-column>
|
||||
</kendo-grid>
|
||||
</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 class="col-12 lg:col-9">
|
||||
<kendo-grid [data]="_gridUsers" style="height: 300px; width: 100%;"
|
||||
[selectedKeys]="_selectedLoginIDs"
|
||||
[selectable]="selectableSettings"
|
||||
[kendoGridSelectBy]="'loginID'">
|
||||
<kendo-grid-column field="loginID" title="Login-ID" width="15%">
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="userName" title="Name" width="15%">
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="roleNames" title="Role-Name" width="35%">
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column title="Status" width="15%">
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-command-column title="Edit/Delete" width="20%" [style]="{'text-align':'center'}">
|
||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||
<button kendoGridRemoveCommand [svgIcon]="apiService.KendoSVGIcon['delete']" class="kt-delete" (click)="Remove( rowIndex )"></button>
|
||||
</ng-template>
|
||||
</kendo-grid-command-column>
|
||||
|
||||
</kendo-grid>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid">
|
||||
<div class="col-12" align="right">
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['cross']" class="k-button k-primary" (click)="onCancel($event)" style="margin-right: 5px;">Cancel</button>
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['save']" class="k-button k-primary" (click)="onSave()">Save</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,27 @@
|
|||
import {Component, EventEmitter, OnInit, Output, Input, ChangeDetectionStrategy} from '@angular/core';
|
||||
import {FormControl, FormGroup} from '@angular/forms';
|
||||
import {Role} from '../../../_models/Authentication/role';
|
||||
import {User} from '../../../_models/Authentication/user';
|
||||
import {AuthService} from '../../../_services/auth/auth.service';
|
||||
import {HRMNotificationService} from '../../../app.notification.service';
|
||||
import {EnumAuthStatus, EnumRoleType, EnumUserType} from '../../../_models/enums';
|
||||
import {
|
||||
EnumUserRoleRequestType, UserRoleChangeRequest, UserRoleState, UserRoleSubject,
|
||||
} from '../../../_models/Authentication/UserRole';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {EnumExtension, EnumRoleType, EnumUserType, EnumAuthStatus} from '../../../_models/enums';
|
||||
import {SelectableSettings} from '@progress/kendo-angular-grid';
|
||||
import {UserRole} from '../../../_models/Authentication/UserRole';
|
||||
import { SearchEmployee } from '../../../_models/Employee/searchEmployee';
|
||||
import { PayrollType } from '../../../_models/Authentication/payrollType';
|
||||
import { ApiService } from 'src/app/app.api.service';
|
||||
import { loadingPanelService } from '../../../hrm-loding panel/loding.panel.service';
|
||||
import { EmployeeServices } from '../../../_services/employee/employee.service';
|
||||
import { UntilityHandlerService } from '../../../utility.hanldler.service';
|
||||
|
||||
/**
|
||||
* User-Role Assignment dialog (Authentication > User Role Permission).
|
||||
* Pick whose roles (an Admin user, or a Self Service employee), tick the roles they should have and
|
||||
* send the change for approval; a change waiting for approval is shown, and another administrator
|
||||
* approves or rejects it here. Nothing is live until it is approved (server-side maker-checker).
|
||||
*/
|
||||
import { LoadingPanelComponent } from 'src/app/hrm-loding panel/loading-panel.component';
|
||||
import { ButtonModule } from '@progress/kendo-angular-buttons';
|
||||
import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
|
||||
import { ReactiveFormsModule } from '@angular/forms';
|
||||
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({
|
||||
selector: 'app-user-role-entry',
|
||||
templateUrl: './user-role-entry.component.html',
|
||||
|
|
@ -25,342 +29,342 @@ import { loadingPanelService } from '../../../hrm-loding panel/loding.panel.serv
|
|||
changeDetection: ChangeDetectionStrategy.Eager,
|
||||
standalone: false,
|
||||
})
|
||||
|
||||
export class UserRoleEntryComponent implements OnInit {
|
||||
readonly roletypeEnum: typeof EnumRoleType = EnumRoleType;
|
||||
|
||||
/** Emits true when something changed (sent, approved or rejected), false on cancel. */
|
||||
userRolePermissionForm: FormGroup;
|
||||
public active = false;
|
||||
_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();
|
||||
_selectedEmployees: SearchEmployee[];
|
||||
_selectedLoginIDs: string[];
|
||||
_initializeValue : boolean;
|
||||
constructor(public userService: AuthService,
|
||||
public apiService: ApiService,
|
||||
public notificationService: HRMNotificationService,
|
||||
public router: Router,
|
||||
public route: ActivatedRoute, public employeeService: EmployeeServices,
|
||||
public utilityService: UntilityHandlerService) {
|
||||
|
||||
/** Kept for the list page: true when the dialog is opened. */
|
||||
@Input() public set InitializeForm(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,
|
||||
public apiService: ApiService,
|
||||
public notificationService: HRMNotificationService,
|
||||
public loadingPanel: loadingPanelService) {
|
||||
@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() {
|
||||
this.userService.GetCurrentUser().subscribe((resp: any) => {
|
||||
this.currentUserID = resp?.userID;
|
||||
});
|
||||
this.userService.GetUsers(EnumUserType.User).subscribe((resp: any) => {
|
||||
this.users = resp ?? [];
|
||||
this.filteredUsers = this.users.slice();
|
||||
});
|
||||
this.userService.GetAllPayrollTypes().subscribe((resp: any) => {
|
||||
this.payrollTypes = resp ?? [];
|
||||
});
|
||||
this.userService.getAllRoles().subscribe((resp: any) => {
|
||||
this.allRoles = resp ?? [];
|
||||
this.utilityService.ShowLoadingPanel = true;
|
||||
this._selectedRoleType = null;
|
||||
this._gridUsers = [];
|
||||
this._gridRoles = [];
|
||||
this._selectedUserID = 0;
|
||||
this._selectedLoginIDs = [];
|
||||
this.userRolePermissionForm = new FormGroup({
|
||||
selectedUsers: new FormControl()
|
||||
});
|
||||
|
||||
if (this.openFor) {
|
||||
this.roleType = this.openFor.roleType;
|
||||
if (this.roleType == EnumRoleType.Self_Service) {
|
||||
this.selectedPayrollTypeID = this.openFor.payrollTypeID;
|
||||
} 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.userService.GetUsers(EnumUserType.User)
|
||||
.subscribe(
|
||||
(resp: any) => {
|
||||
this._users = resp;
|
||||
},
|
||||
(err: any) => {
|
||||
// ON ERROR
|
||||
},
|
||||
() => {
|
||||
// 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)
|
||||
});
|
||||
}
|
||||
this.resetSelection();
|
||||
},
|
||||
(err: any) => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showError(err?.error ?? err);
|
||||
},
|
||||
() => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
// ---------- roles ----------
|
||||
|
||||
private isApprovedRole(r: Role): boolean {
|
||||
return r.roleStatus == EnumAuthStatus.Approved || r.roleStatus == EnumAuthStatus.Active;
|
||||
public onSelectionRoleChange(event: any): void {
|
||||
// this._selectedRoles = event.selectedRows.map(r => r.dataItem.id);
|
||||
}
|
||||
|
||||
/** Roles of the selected role type: approved ones, plus any the person has or has asked for. */
|
||||
get rolesForType(): Role[] {
|
||||
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 ?? ''));
|
||||
public Remove(nIndex:number) {
|
||||
this._gridUsers.splice(nIndex, 1);
|
||||
}
|
||||
|
||||
get visibleRoles(): Role[] {
|
||||
const t = this.roleSearch.trim().toLowerCase();
|
||||
return this.rolesForType.filter(r => !t || (r.name ?? '').toLowerCase().includes(t)
|
||||
|| ((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) {
|
||||
public onSave(): void {
|
||||
if (this._gridUsers.length == 0) {
|
||||
this.notificationService.showError("There is no user/employee selected");
|
||||
return;
|
||||
}
|
||||
this.selectedRoleIDs = this.isTicked(roleID)
|
||||
? this.selectedRoleIDs.filter(x => x != roleID)
|
||||
: [...this.selectedRoleIDs, roleID];
|
||||
}
|
||||
|
||||
selectAllVisible(): void {
|
||||
if (this.locked) {
|
||||
if (this._selectedRoles.length == 0) {
|
||||
this.notificationService.showError("please select a role");
|
||||
return;
|
||||
|
||||
}
|
||||
const ids = this.visibleRoles.map(r => r.id).filter(id => !this.isTicked(id));
|
||||
this.selectedRoleIDs = [...this.selectedRoleIDs, ...ids];
|
||||
}
|
||||
|
||||
clearAllVisible(): void {
|
||||
if (this.locked) {
|
||||
return;
|
||||
let userRoles: UserRole[] = [];
|
||||
this._gridUsers.forEach(u => {
|
||||
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;
|
||||
}
|
||||
if (this._selectedRoleType == EnumRoleType.Admin)
|
||||
{
|
||||
userRole.userID = u.id;
|
||||
userRole.roleType = EnumRoleType.Admin;
|
||||
}
|
||||
userRole.loginIDView = u.loginID;
|
||||
userRole.roleID = r;
|
||||
userRoles.push(userRole);
|
||||
});
|
||||
|
||||
});
|
||||
this.utilityService.ShowLoadingPanel = true;
|
||||
if(userRoles && userRoles.length > 0)
|
||||
{
|
||||
userRoles.forEach(x=> {
|
||||
let isFind = this._previousRoles.some(y => y === x.roleID);
|
||||
if(!isFind){
|
||||
x.isOld = false;
|
||||
let role = this._gridRoles.find(z => z.id === x.roleID);
|
||||
if(role && role.id > 0){
|
||||
x.newRoleName = role.name;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
const ids = this.visibleRoles.map(r => r.id);
|
||||
this.selectedRoleIDs = this.selectedRoleIDs.filter(x => !ids.includes(x));
|
||||
}
|
||||
|
||||
/** Ticks show what the person has now, or what is asked for while a change waits for approval. */
|
||||
resetSelection(): void {
|
||||
const live = this.state?.liveRoleIDs ?? [];
|
||||
const pending = this.state?.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.selectedRoleIDs = [...live.filter(id => !removing.includes(id)), ...adding.filter(id => !live.includes(id))];
|
||||
}
|
||||
|
||||
roleName(roleID: number): string {
|
||||
return this.allRoles.find(r => r.id == roleID)?.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' };
|
||||
}
|
||||
|
||||
// ---------- maker-checker ----------
|
||||
|
||||
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) => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showError(err?.error ?? err);
|
||||
},
|
||||
() => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showSuccess('Sent for approval. Nothing changes until another administrator approves it.');
|
||||
this.saveCompleted.emit(true);
|
||||
}
|
||||
this.userService.saveUserRole(userRoles)
|
||||
.subscribe(
|
||||
(resp: any) => {
|
||||
},
|
||||
(err: any) => {
|
||||
//ON ERROR
|
||||
this.notificationService.showSuccess(err.error);
|
||||
this.utilityService.ShowLoadingPanel = false;
|
||||
},
|
||||
() => {
|
||||
this.saveCompleted.emit(true);
|
||||
this.utilityService.ShowLoadingPanel = false;
|
||||
this.notificationService.showSuccess("Data Saved Successfully.");
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
}
|
||||
|
||||
onApprove(): void {
|
||||
this.decide(true);
|
||||
}
|
||||
|
||||
onReject(): void {
|
||||
this.decide(false);
|
||||
}
|
||||
|
||||
private decide(approve: boolean): void {
|
||||
if (!this.hasPending) {
|
||||
public GetSelectedEmployee(childData) {
|
||||
this._selectedEmployees = childData;
|
||||
if (this._selectedEmployees == undefined) {
|
||||
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);
|
||||
|
||||
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);
|
||||
|
||||
|
||||
|
||||
});
|
||||
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) => {
|
||||
// ON ERROR
|
||||
},
|
||||
() => {
|
||||
|
||||
const Users: User[] = [];
|
||||
Users.push(oUser);
|
||||
var uRole: UserRole = new UserRole();
|
||||
|
||||
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];
|
||||
}
|
||||
|
||||
private sendDecision(approve: boolean): void {
|
||||
const call = approve ? this.userService.ApproveUserRole(this.subject()) : this.userService.RejectUserRole(this.subject());
|
||||
this.loadingPanel.ShowLoadingPanel = true;
|
||||
call.subscribe(
|
||||
() => { },
|
||||
AddEmployeeAsUser() {
|
||||
this.userService.GetEmpUserRole(this._selectedEmployees).subscribe(
|
||||
(resp: any) => {
|
||||
this._userRoles = resp;
|
||||
|
||||
},
|
||||
(err: any) => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showError(err?.error ?? err);
|
||||
},
|
||||
() => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showSuccess(approve
|
||||
? 'Approved. The roles are now live; the person sees the new menu from their next sign-in.'
|
||||
: 'Rejected. The roles stay as they were.');
|
||||
this.saveCompleted.emit(true);
|
||||
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);
|
||||
}
|
||||
|
||||
private closeForm(): void {
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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%;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
||||
<!-- Page header -->
|
||||
<div class="url-header">
|
||||
<div class="url-header__icon"><i class="pi pi-key"></i></div>
|
||||
<div>
|
||||
<h2 class="url-title">User Role Permission</h2>
|
||||
<p class="url-subtitle">Give users and employees their roles. Every change is approved by another administrator before it takes effect.</p>
|
||||
<kendo-dropdownlist [data]="roleTypes"
|
||||
id="idRoleType"
|
||||
[defaultItem]="{ name: 'select a Type', value: null }"
|
||||
[textField]="'name'"
|
||||
[valueField]="'value'"
|
||||
[valuePrimitive]="true"
|
||||
class="form-control form-control-sm input-sm"
|
||||
[(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 class="card card-w-title">
|
||||
<kendo-grid [data]="userRoles"
|
||||
(add)="addHandler()">
|
||||
<ng-template kendoGridToolbarTemplate>
|
||||
<button themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['plus']" kendoGridAddCommand>Add new</button>
|
||||
<input placeholder="Search in all columns..." kendoTextBox (input)="onFilter($event.target.value)" />
|
||||
<button kendoButton themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['save']">Approve All</button>
|
||||
<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>
|
||||
</ng-template>
|
||||
|
||||
<!-- 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>
|
||||
|
||||
<!-- All assignments -->
|
||||
@if (activeView === 'assignments') {
|
||||
<kendo-grid #urlGrid class="url-grid"
|
||||
[kendoGridBinding]="gridView"
|
||||
[pageSize]="20"
|
||||
[pageable]="true"
|
||||
[sortable]="true"
|
||||
[filterable]="true"
|
||||
[resizable]="true">
|
||||
<ng-template kendoGridToolbarTemplate>
|
||||
<div class="url-toolbar">
|
||||
<div class="url-toolbar__filters">
|
||||
<div class="url-switch" role="tablist" aria-label="Role type">
|
||||
<button type="button" class="url-switch__btn" [class.is-active]="listRoleType == roletypeEnum.Admin"
|
||||
(click)="setListRoleType(roletypeEnum.Admin)">Admin</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>
|
||||
<kendo-grid-column field="loginIDView" title="Login Id">
|
||||
</kendo-grid-column>
|
||||
<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>
|
||||
</kendo-grid-column>
|
||||
</kendo-grid-column>-->
|
||||
</kendo-grid>
|
||||
|
||||
<kendo-grid-column field="loginID" title="Login ID" [width]="170">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
<span class="url-login">{{ dataItem.loginID }}</span>
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="userName" title="Name" [width]="220"></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>
|
||||
}
|
||||
|
||||
<!-- 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>
|
||||
|
||||
@if (pendingGroups.length === 0) {
|
||||
<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) {
|
||||
<div class="blur-background">
|
||||
<kendo-dialog title="User-Role Assignment" [width]="1080" maxHeight="92vh"
|
||||
(close)="onPopUpClose()" (keydown.escape)="$event.stopPropagation()">
|
||||
<app-user-role-entry [InitializeForm]="initializeEntryFrom" [openFor]="openFor" (saveCompleted)="saveCompleted($event)">
|
||||
<div class="card card-w-title">
|
||||
|
||||
|
||||
@if (showModal) {
|
||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="750"
|
||||
[width]="850">
|
||||
<kendo-dialog-titlebar>
|
||||
User-Role Assignment
|
||||
</kendo-dialog-titlebar>
|
||||
<app-user-role-entry [InitializeForm]="initializeEntryFrom" (saveCompleted)="saveCompleted($event)">
|
||||
</app-user-role-entry>
|
||||
</kendo-dialog>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,373 +1,122 @@
|
|||
import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/core';
|
||||
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 { EnumAuthStatus, EnumRoleType } from '../../../_models/enums';
|
||||
import { ExcelExportData } from '@progress/kendo-angular-excel-export';
|
||||
import { process } from '@progress/kendo-data-query';
|
||||
import { EnumRoleType, EnumUserType, EnumExtension, EnumAuthStatus } from '../../../_models/enums';
|
||||
import { User } from '../../../_models/Authentication/user';
|
||||
import { DataStateChangeEvent, GridDataResult } from '@progress/kendo-angular-grid';
|
||||
import { process, State } from '@progress/kendo-data-query';
|
||||
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). */
|
||||
interface AssignmentRow {
|
||||
key: string;
|
||||
userID: number;
|
||||
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;
|
||||
}
|
||||
import { ButtonModule } from '@progress/kendo-angular-buttons';
|
||||
import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
|
||||
import { ReactiveFormsModule } from '@angular/forms';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
/** One person with a role change waiting for approval. */
|
||||
interface PendingGroup {
|
||||
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;
|
||||
}
|
||||
import { KENDO_GRID } from '@progress/kendo-angular-grid';
|
||||
import { DatePickerModule } from '@progress/kendo-angular-dateinputs';
|
||||
|
||||
/**
|
||||
* 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({
|
||||
selector: 'app-user-role-list',
|
||||
templateUrl: './user-role-list.component.html',
|
||||
styleUrls: ['./user-role-list.component.css'],
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
changeDetection: ChangeDetectionStrategy.Eager,
|
||||
standalone: false,
|
||||
|
||||
})
|
||||
/** user-role-list component*/
|
||||
export class UserRoleListComponent implements OnInit {
|
||||
readonly roletypeEnum: typeof EnumRoleType = EnumRoleType;
|
||||
|
||||
activeView: 'assignments' | 'pending' = 'assignments';
|
||||
listRoleType: EnumRoleType = EnumRoleType.Admin;
|
||||
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
|
||||
public isNew: boolean;
|
||||
userRole: any;
|
||||
users: User[];
|
||||
userRoles: any[];
|
||||
showModal = false;
|
||||
initializeEntryFrom = false;
|
||||
openFor: UserRoleSubject;
|
||||
_selectedRoleType: EnumRoleType;
|
||||
roleTypes: any = EnumExtension.getNamesAndValues(EnumRoleType);
|
||||
initializeEntryFrom: boolean;
|
||||
gridView: GridDataResult;
|
||||
public state: State = {
|
||||
skip: 0,
|
||||
take: 10
|
||||
};
|
||||
|
||||
/** user-role-list ctor */
|
||||
constructor(public userService: AuthService,
|
||||
public notificationService: HRMNotificationService,
|
||||
public apiService: ApiService,
|
||||
public loadingPanel: loadingPanelService) {
|
||||
this.apiService.selectedMenuName = 'User Role Permission Entry';
|
||||
this.allData = this.allData.bind(this);
|
||||
public notificationService: HRMNotificationService,
|
||||
public datatransferservice: DataTransferService,
|
||||
public utilityHandlerService: UntilityHandlerService, public apiService: ApiService,) {
|
||||
this.apiService.selectedMenuName="User Role Permission Entry"
|
||||
}
|
||||
|
||||
public ngOnInit(): void {
|
||||
this.userService.GetCurrentUser().subscribe((resp: any) => {
|
||||
this.currentUserID = resp?.userID;
|
||||
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();
|
||||
this.showModal = false;
|
||||
this.initializeEntryFrom = false;
|
||||
}
|
||||
|
||||
// ---------- All assignments ----------
|
||||
|
||||
setListRoleType(type: EnumRoleType): void {
|
||||
if (this.listRoleType == type) {
|
||||
return;
|
||||
}
|
||||
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) => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showError(err?.error ?? err);
|
||||
},
|
||||
() => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
private payrollTypeName(row: AssignmentRow): string {
|
||||
const id = row.payrollTypeID;
|
||||
return id ? (this.payrollTypeNames.get(id) ?? '') : '';
|
||||
}
|
||||
|
||||
private pendingFor(row: AssignmentRow): PendingGroup {
|
||||
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.' : ''));
|
||||
public RefreshControl() {
|
||||
this.userService.getUserRoles(this._selectedRoleType)
|
||||
.subscribe(
|
||||
(resp: any) => {
|
||||
this.userRoles = resp;
|
||||
},
|
||||
(err: any) => {
|
||||
//ON ERROR
|
||||
},
|
||||
() => {
|
||||
this.gridView = process(this.userRoles, this.state);
|
||||
}
|
||||
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();
|
||||
}
|
||||
);
|
||||
);
|
||||
}
|
||||
public dataStateChange(state: DataStateChangeEvent): void {
|
||||
this.state = state;
|
||||
this.gridView = process(this.userRoles, this.state);
|
||||
}
|
||||
public onFilter(inputValue: string): void {
|
||||
}
|
||||
onRoleChange() {
|
||||
this.userRoles = [];
|
||||
}
|
||||
|
||||
// ---------- 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 {
|
||||
public addHandler() {
|
||||
this.initializeEntryFrom = true;
|
||||
this.showModal = true;
|
||||
}
|
||||
|
||||
onPopUpClose(): void {
|
||||
this.initializeEntryFrom = false;
|
||||
this.showModal = false;
|
||||
public editHandler({ dataItem }) {
|
||||
}
|
||||
|
||||
saveCompleted(changed: boolean): void {
|
||||
this.onPopUpClose();
|
||||
if (changed === true) {
|
||||
this.loadPending();
|
||||
this.RefreshControl();
|
||||
onPopUpClose() {
|
||||
this.initializeEntryFrom = false;
|
||||
this.showModal = false;
|
||||
|
||||
}
|
||||
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.showModal = false;
|
||||
this.initializeEntryFrom = false;
|
||||
}
|
||||
|
||||
cancelHandler() {
|
||||
}
|
||||
|
||||
saveHandler(userRole: any) {
|
||||
}
|
||||
|
||||
removeHandler({ dataItem }) {
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
<app-user-role-list></app-user-role-list>
|
||||
|
||||
<div class="card">
|
||||
<app-user-role-list></app-user-role-list>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -30,8 +30,13 @@
|
|||
</ng-template>
|
||||
</kendo-dropdownlist>
|
||||
|
||||
<input kendoTextBox class="ul-search" placeholder="Search login ID or name"
|
||||
[value]="searchText" (input)="onSearch($event.target.value)" />
|
||||
<kendo-textbox
|
||||
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">
|
||||
<button type="button" class="ul-chip" [class.is-selected]="statusFilter === 'all'" (click)="setStatusFilter('all')">
|
||||
|
|
@ -52,10 +57,13 @@
|
|||
<div class="ul-toolbar__actions">
|
||||
<button kendoButton type="button" fillMode="flat" [svgIcon]="icons.refresh"
|
||||
title="Reload list" aria-label="Reload list" (click)="RefreshControl()"></button>
|
||||
<!-- Plain buttons, not kendoGridExcelCommand/kendoGridPDFCommand: grid toolbar commands take the
|
||||
focus on any toolbar click, which closed the User type dropdown before it could open. -->
|
||||
<button kendoButton type="button" fillMode="outline" [svgIcon]="icons.excel" (click)="grid.saveAsExcel()">Export to Excel</button>
|
||||
<button kendoButton type="button" fillMode="outline" [svgIcon]="icons.pdf" (click)="grid.saveAsPDF()">Export to PDF</button>
|
||||
<kendo-dropdownbutton
|
||||
[data]="exportItems"
|
||||
[svgIcon]="icons.export"
|
||||
fillMode="outline"
|
||||
(itemClick)="onExport($event)">
|
||||
Export
|
||||
</kendo-dropdownbutton>
|
||||
<button kendoButton type="button" themeColor="primary" [svgIcon]="icons.add" (click)="addHandler()">Add user</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -84,19 +92,22 @@
|
|||
<span>{{ dataItem.createdDate | date: 'dd MMM yyyy' }}</span>
|
||||
}
|
||||
@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>
|
||||
</kendo-grid-column>
|
||||
|
||||
<!-- Same look as the Role page's last column: one button per action. Which actions a row gets
|
||||
is still decided by actionsFor() (dataItem.actions), and a click still runs onRowAction(). -->
|
||||
<kendo-grid-column title="Actions" [width]="180" [filterable]="false" [sortable]="false">
|
||||
<kendo-grid-column title="" [width]="64" [filterable]="false" [sortable]="false" class="ul-actions-cell" headerClass="ul-actions-cell">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
@for (a of dataItem.actions; track a.action) {
|
||||
<button class="k-button k-primary ul-row-action" kendoButton [svgIcon]="a.svgIcon"
|
||||
(click)="onRowAction(a, dataItem)">{{ a.text }}</button>
|
||||
}
|
||||
<kendo-dropdownbutton
|
||||
[data]="dataItem.actions"
|
||||
[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>
|
||||
</kendo-grid-column>
|
||||
|
||||
|
|
@ -128,14 +139,12 @@
|
|||
</div>
|
||||
|
||||
@if (showModal) {
|
||||
<div class="blur-background">
|
||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="750" [width]="650">
|
||||
<kendo-dialog-titlebar>
|
||||
Add/Edit User
|
||||
</kendo-dialog-titlebar>
|
||||
<app-users-entry [inputObject]="_user" (saveCompleted)="saveCompleted($event)"></app-users-entry>
|
||||
</kendo-dialog>
|
||||
</div>
|
||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="750" [width]="650">
|
||||
<kendo-dialog-titlebar>
|
||||
Add/Edit User
|
||||
</kendo-dialog-titlebar>
|
||||
<app-users-entry [inputObject]="_user" (saveCompleted)="saveCompleted($event)"></app-users-entry>
|
||||
</kendo-dialog>
|
||||
}
|
||||
|
||||
@if (showReason) {
|
||||
|
|
|
|||
|
|
@ -103,15 +103,9 @@
|
|||
// ---------- 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
|
||||
.k-grid-table td {
|
||||
height: 44px;
|
||||
padding-top: 4px;
|
||||
padding-bottom: 4px;
|
||||
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 {
|
||||
font-weight: 600;
|
||||
color: $gray-700;
|
||||
|
|
@ -171,12 +160,6 @@
|
|||
.ul-badge--warning { background: $userlist-warning-bg; color: $userlist-warning; }
|
||||
.ul-badge--neutral { background: $userlist-neutral-bg; color: $userlist-neutral; }
|
||||
.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 {
|
||||
padding: 32px 16px;
|
||||
|
|
@ -211,8 +194,4 @@
|
|||
.ul-search {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
:host ::ng-deep .ul-grid .ul-type.k-dropdownlist {
|
||||
width: 100% !important;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -373,30 +373,22 @@ export class UsersListComponent implements OnInit {
|
|||
ouser.modifiedBy = oselecteduser.userID;
|
||||
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.userService.ApproveUser(ouser).subscribe(
|
||||
(x: User) => {
|
||||
const index = this.users.findIndex(u => u.id === id);
|
||||
if (index >= 0) {
|
||||
this.users[index] = x ?? ouser;
|
||||
}
|
||||
this.rebuildRows();
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showSuccess('Approved successfully.');
|
||||
},
|
||||
(x) => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showError(x.error);
|
||||
},
|
||||
);
|
||||
});
|
||||
this.loadingPanel.ShowLoadingPanel = true;
|
||||
this.userService.ApproveUser(ouser).subscribe(
|
||||
(x: User) => {
|
||||
const index = this.users.findIndex(u => u.id === id);
|
||||
if (index >= 0) {
|
||||
this.users[index] = x ?? ouser;
|
||||
}
|
||||
this.rebuildRows();
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showSuccess('Approved successfully.');
|
||||
},
|
||||
(x) => {
|
||||
this.loadingPanel.ShowLoadingPanel = false;
|
||||
this.notificationService.showError(x.error);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
// ---------- deactivate ----------
|
||||
|
|
@ -450,19 +442,7 @@ export class UsersListComponent implements OnInit {
|
|||
changed.modifiedBy = target.userID;
|
||||
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.userService.DoActiveAndIntacive(changed).subscribe(
|
||||
() => {
|
||||
|
|
|
|||
|
|
@ -673,25 +673,23 @@
|
|||
</div>
|
||||
|
||||
@if (showModal) {
|
||||
<div class="card" class="blur-background">
|
||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="390">
|
||||
<kendo-dialog-titlebar>Access Types</kendo-dialog-titlebar>
|
||||
<div class="grid">
|
||||
<div class="col-12">
|
||||
<fieldset>
|
||||
<div class="button-container1">
|
||||
@for (type of payrollTypes; track type) {
|
||||
<button kendoButton class="access-type-button" (click)="selectAccessType(type.id)">
|
||||
<img [src]="getImagePath(type.id)" alt="{{ type.description }}" class="access-type-image" />
|
||||
<span class="button-text">{{ type.description }}</span>
|
||||
</button>
|
||||
}
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="390">
|
||||
<kendo-dialog-titlebar>Access Types</kendo-dialog-titlebar>
|
||||
<div class="grid">
|
||||
<div class="col-12">
|
||||
<fieldset>
|
||||
<div class="button-container1">
|
||||
@for (type of payrollTypes; track type) {
|
||||
<button kendoButton class="access-type-button" (click)="selectAccessType(type.id)">
|
||||
<img [src]="getImagePath(type.id)" alt="{{ type.description }}" class="access-type-image" />
|
||||
<span class="button-text">{{ type.description }}</span>
|
||||
</button>
|
||||
}
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</kendo-dialog>
|
||||
</div>
|
||||
</div>
|
||||
</kendo-dialog>
|
||||
}
|
||||
|
||||
@if (showAttachment) {
|
||||
|
|
|
|||
|
|
@ -44,9 +44,7 @@ import {
|
|||
imageIcon,
|
||||
shareIcon,
|
||||
zoomInIcon,
|
||||
zoomOutIcon,
|
||||
copyIcon,
|
||||
forwardIcon
|
||||
zoomOutIcon
|
||||
} from '@progress/kendo-svg-icons';
|
||||
|
||||
@NgModule({})
|
||||
|
|
@ -95,8 +93,6 @@ export class KendoIconsModule {
|
|||
image: imageIcon,
|
||||
share: shareIcon,
|
||||
zoomIn: zoomInIcon,
|
||||
zoomOut: zoomOutIcon,
|
||||
copy : copyIcon,
|
||||
forward : forwardIcon
|
||||
zoomOut: zoomOutIcon
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ export class GradeListComponent implements OnInit {
|
|||
this.msv.entryFrom.iDColumnName = 'id';
|
||||
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;
|
||||
|
||||
//var Item: BasicEntryFormControl = this.msv.entryFrom.AddControl('Code', 'Code', EnumDynamicControlType.TextBox, '', true, EnumDefaultValidatorType.Custom, 256, 1);
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
position: absolute;
|
||||
}
|
||||
.customGrid{
|
||||
margin: 0px 80px 0px 80px !important;
|
||||
margin: 0px 100px 0px 100px !important;
|
||||
}
|
||||
@media (max-width: 768px) {
|
||||
.customGrid {
|
||||
|
|
|
|||
|
|
@ -32,13 +32,13 @@
|
|||
</kendo-grid-column>
|
||||
}
|
||||
@if (isWorkflowRequired) {
|
||||
<kendo-grid-column field="count" title="Add Attachment" width="15%">
|
||||
<kendo-grid-column field="count" title="Add Attachment" width="20%">
|
||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||
<button kendoButton (click)="showAddApprovalAttachment(dataItem)" [svgIcon]="apiService.KendoSVGIcon['clip']">Attachment</button>
|
||||
<button kendoButton (click)="showAddApprovalAttachment(dataItem)" [svgIcon]="apiService.KendoSVGIcon['add']">Approve</button>
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
}
|
||||
<kendo-grid-command-column title="Action" width="15%">
|
||||
<kendo-grid-command-column title="Action" width="10%">
|
||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||
@if (!isWorkflowRequired) {
|
||||
<button kendoButton (click)="ApproveBonus(dataItem.bonusid)" [svgIcon]="apiService.KendoSVGIcon['delete']">Approve</button>
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
/* Bonus Process: the input panels at the top (colors are the app's $brand-* / $gray-* tokens as literals) */
|
||||
.bp-panel {
|
||||
background: #ffffff;
|
||||
border: 1px solid #E4E4EE;
|
||||
border-radius: 8px;
|
||||
padding: 12px 16px 6px 16px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.bp-panel-title {
|
||||
font-weight: 600;
|
||||
font-size: 14px;
|
||||
color: #414278;
|
||||
padding-bottom: 8px;
|
||||
margin-bottom: 6px;
|
||||
border-bottom: 1px solid #DEDEFF;
|
||||
}
|
||||
|
||||
.bp-field {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.bp-label {
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
color: #666666;
|
||||
}
|
||||
|
||||
.bp-required {
|
||||
color: #d9534f;
|
||||
}
|
||||
|
||||
.bp-options {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 24px;
|
||||
min-height: 30px;
|
||||
}
|
||||
|
||||
.bp-option {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.bp-option label {
|
||||
cursor: pointer;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* Process / Clear Tax / Upload Data: pushed to the far right of the options row */
|
||||
.bp-actions {
|
||||
display: inline-flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px;
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
.bp-message {
|
||||
padding: 6px 2px 8px 2px;
|
||||
color: #414278;
|
||||
}
|
||||
|
||||
/* in the grid toolbar: no extra height, kept on the far right */
|
||||
span.bp-message {
|
||||
padding: 0 4px;
|
||||
}
|
||||
|
|
@ -3,110 +3,140 @@
|
|||
|
||||
<div class="grid">
|
||||
|
||||
<!-- Inputs grouped in two panels; every control keeps its bindings (ngModel, formControlName, events) -->
|
||||
<div class="col-12">
|
||||
<div class="bp-panel">
|
||||
<div class="bp-panel-title">Bonus Information</div>
|
||||
<div class="grid">
|
||||
<div class="col-12 md:col-6 lg:col-4 bp-field">
|
||||
<label class="bp-label">Bonus Type <span class="bp-required">*</span></label>
|
||||
<kendo-dropdownlist [(ngModel)]="selectedbonusID"
|
||||
[data]="bonuses"
|
||||
[defaultItem]="{ name: 'Select Bonus Type..', id: null }"
|
||||
[textField]="'name'"
|
||||
[valueField]="'id'"
|
||||
[valuePrimitive]="true"
|
||||
class="form-control form-control-sm input-sm"
|
||||
formControlName="bonusType"
|
||||
(valueChange)="BonusvalueChange($event)"
|
||||
style="width:100%">
|
||||
</kendo-dropdownlist>
|
||||
</div>
|
||||
<div class="col-12 md:col-6 lg:col-4 bp-field">
|
||||
<label class="bp-label">Consider Basic Of <span class="bp-required">*</span></label>
|
||||
<kendo-datepicker [format]="'dd-MMM-yyyy'"
|
||||
[(ngModel)]="basicDate"
|
||||
formControlName="basicDate"
|
||||
style="width:100%"></kendo-datepicker>
|
||||
</div>
|
||||
<div class="col-12 md:col-6 lg:col-4 bp-field">
|
||||
<label class="bp-label">Currently Process For Basic <span class="bp-required">*</span></label>
|
||||
<kendo-numerictextbox
|
||||
[(ngModel)]="processFor"
|
||||
style="width:100%"
|
||||
formControlName="processFor">
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
<div class="col-12 md:col-6 lg:col-4 bp-field">
|
||||
<label class="bp-label">Pay Date <span class="bp-required">*</span></label>
|
||||
<kendo-datepicker [format]="'dd-MMM-yyyy'"
|
||||
[(ngModel)]="payDate"
|
||||
formControlName="payDate"
|
||||
style="width:100%"></kendo-datepicker>
|
||||
</div>
|
||||
<div class="col-12 md:col-6 lg:col-4 bp-field">
|
||||
<label class="bp-label">Bonus Cut Off Date <span class="bp-required">*</span></label>
|
||||
<kendo-datepicker [format]="'dd-MMM-yyyy'"
|
||||
[(ngModel)]="cuttofDate"
|
||||
formControlName="cutOffDate"
|
||||
style="width:100%"></kendo-datepicker>
|
||||
</div>
|
||||
<div class="md:col-6 col-12">
|
||||
<div class="grid">
|
||||
<div class="col-5" style="margin: auto;">
|
||||
<label>Bonus Type</label>
|
||||
</div>
|
||||
<div class="col-7">
|
||||
<kendo-dropdownlist [(ngModel)]="selectedbonusID"
|
||||
[data]="bonuses"
|
||||
[defaultItem]="{ name: 'Select Bonus Type..', id: null }"
|
||||
[textField]="'name'"
|
||||
[valueField]="'id'"
|
||||
[valuePrimitive]="true"
|
||||
class="form-control form-control-sm input-sm"
|
||||
formControlName="bonusType"
|
||||
(valueChange)="BonusvalueChange($event)"
|
||||
style="width:100%">
|
||||
</kendo-dropdownlist>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="md:col-6 col-12">
|
||||
<div class="grid">
|
||||
<div class="col-5" style="margin: auto;">
|
||||
<label>Consider Basic Of</label>
|
||||
</div>
|
||||
<div class="col-7">
|
||||
<kendo-datepicker [format]="'dd-MMM-yyyy'"
|
||||
[(ngModel)]="basicDate"
|
||||
formControlName="basicDate"
|
||||
style="width:100%"></kendo-datepicker>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="md:col-6 col-12">
|
||||
<div class="grid">
|
||||
<div class="col-5" style="margin: auto;">
|
||||
<label>Pay Date</label>
|
||||
</div>
|
||||
<div class="col-7">
|
||||
<kendo-datepicker [format]="'dd-MMM-yyyy'"
|
||||
[(ngModel)]="payDate"
|
||||
formControlName="payDate"
|
||||
style="width:100%"></kendo-datepicker>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="md:col-6 col-12">
|
||||
<div class="grid">
|
||||
<div class="col-5" style="margin: auto;">
|
||||
<label>Bonus Cut Off Date</label>
|
||||
</div>
|
||||
<div class="col-7">
|
||||
<kendo-datepicker [format]="'dd-MMM-yyyy'"
|
||||
[(ngModel)]="cuttofDate"
|
||||
formControlName="cutOffDate"
|
||||
style="width:100%"></kendo-datepicker>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="md:col-6 col-12">
|
||||
<div class="grid">
|
||||
<div class="col-5" style="margin: auto;">
|
||||
<label>Currently Process For Basic</label>
|
||||
</div>
|
||||
<div class="col-7">
|
||||
<kendo-numerictextbox
|
||||
[(ngModel)]="processFor"
|
||||
style="width:100%"
|
||||
formControlName="processFor">
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
|
||||
<div class="bp-panel" style="margin-bottom: 0px !important;">
|
||||
<div class="bp-panel-title">Employees & Options</div>
|
||||
<div class="grid">
|
||||
<div class="col-12 md:col-6 lg:col-4 bp-field">
|
||||
<label class="bp-label">Select Employee</label>
|
||||
<app-employee-picker [MultiSelect]="true" (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
|
||||
</div>
|
||||
</div>
|
||||
<div class="md:col-6 col-12">
|
||||
<div class="grid">
|
||||
<div class="col-5" style="margin: auto;">
|
||||
<label>Select Employee: </label>
|
||||
</div>
|
||||
<div class="col-7">
|
||||
<app-employee-picker [MultiSelect]="true" (ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker>
|
||||
<b> {{returnMessage}}</b>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="md:col-6 col-12">
|
||||
<div class="grid" style="margin-top: 8px;">
|
||||
<div class="col-5">
|
||||
<div class="p-field-checkbox">
|
||||
<input formControlName="disburseWithSalary" kendoCheckBox
|
||||
[(ngModel)]="disburseWithSalary" (change)="checkWithOrTax(1, disburseWithSalary)" style="margin-right: 10px"
|
||||
type="checkbox" />
|
||||
<label>Disburse With Salary</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 md:col-6 lg:col-8 bp-field">
|
||||
<label class="bp-label">Options</label>
|
||||
<div class="bp-options">
|
||||
<span class="bp-option">
|
||||
<input id="bpDisburseWithSalary" formControlName="disburseWithSalary" kendoCheckBox
|
||||
[(ngModel)]="disburseWithSalary" (change)="checkWithOrTax(1, disburseWithSalary)"
|
||||
type="checkbox" />
|
||||
<label for="bpDisburseWithSalary">Disburse With Salary</label>
|
||||
</span>
|
||||
<span class="bp-option">
|
||||
<input id="bpCalculateTax" formControlName="calculateTax" kendoCheckBox (change)="checkWithOrTax(2, isTaxProcess)"
|
||||
[(ngModel)]="isTaxProcess"
|
||||
type="checkbox" />
|
||||
<label for="bpCalculateTax">Calculate Tax</label>
|
||||
</span>
|
||||
<!-- Process, Clear Tax and Upload Data on the right of the same row (moved here from the row under the panel) -->
|
||||
<span class="bp-actions">
|
||||
<button type="button" kendoButton [svgIcon]="apiService.KendoSVGIcon['gear']" themeColor="primary" (click)="process()">Process</button>
|
||||
<!-- Clear Tax now saves at once (clearTaxAndSave); the old browser-only clearTax() is kept in the .ts -->
|
||||
<button type="button" kendoButton [svgIcon]="apiService.KendoSVGIcon['cross']" themeColor="primary" (click)="clearTaxAndSave()">Clear Tax</button>
|
||||
<button type="button" kendoButton [svgIcon]="apiService.KendoSVGIcon['upload']" themeColor="primary" (click)="showBonusUploadPopUp()">Upload Data</button>
|
||||
</span>
|
||||
<div class="col-7">
|
||||
<div class="p-field-checkbox">
|
||||
<input formControlName="calculateTax" kendoCheckBox (change)="checkWithOrTax(2, isTaxProcess)"
|
||||
[(ngModel)]="isTaxProcess" style="margin-right: 10px"
|
||||
type="checkbox" />
|
||||
<label>Calculate Tax</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- the message now shows on the right of the grid toolbar (next to Export to Excel). Kept for reference.
|
||||
@if (returnMessage) {
|
||||
<div class="bp-message"><b>{{returnMessage}}</b></div>
|
||||
}
|
||||
-->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="md:col-12 col-12">
|
||||
<div class="grid" style="margin-left: 5px; margin-right: 5px;">
|
||||
<div class="col-12" align="right">
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['gear']" themeColor="primary" (click)="process()" style="margin-right:5px;">Process</button>
|
||||
<!--<button kendoButton [svgIcon]="apiService.KendoSVGIcon['upload']" themeColor="primary" (click)="uploadData()" style="margin-right:5px; float:right;">Upload</button>-->
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['upload']" themeColor="primary" (click)="showBonusUploadPopUp()" style="margin-right:5px;">Upload Data</button>
|
||||
<!--<button kendoButton [svgIcon]="apiService.KendoSVGIcon['upload']" themeColor="primary" (click)="uploadData()" style="margin-right:5px; float:right;">Upload</button>-->
|
||||
</div>
|
||||
<div class="col-6" align="right">
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['cross']" themeColor="primary" (click)="clearTax()" style="margin-right:5px;">Clear Tax</button>
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['gear']" themeColor="primary" (click)="TaxRecalculate()" style="margin-right:5px;">Tax Re-calculate</button>
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['save']" themeColor="primary" (click)="save()" style="margin-right:5px;">Save</button>
|
||||
<!--<button kendoButton [svgIcon]="apiService.KendoSVGIcon['upload']" themeColor="primary" (click)="uploadData()" style="margin-right:5px; float:right;">Upload</button>-->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<!-- virtual scrolling: only the rows on screen are rendered, so 10k+ employees (two numeric
|
||||
textboxes per row) do not freeze the page. kendoGridBinding pages the array itself. -->
|
||||
<kendo-grid [kendoGridBinding]="$safeNavigationMigration(bonusProcess?.bonusProcessDetails)"
|
||||
scrollable="virtual" [pageSize]="50" [rowHeight]="40" [height]="500">
|
||||
<kendo-grid [data]="$safeNavigationMigration(bonusProcess?.bonusProcessDetails)">
|
||||
<ng-template kendoGridToolbarTemplate>
|
||||
<button type="button" kendoGridExcelCommand [svgIcon]="apiService.KendoSVGIcon['fileExcel']">
|
||||
Export to Excel
|
||||
</button>
|
||||
Count: {{ bonusProcess?.bonusProcessDetails.length}}
|
||||
@if (returnMessage) {
|
||||
<kendo-grid-spacer></kendo-grid-spacer>
|
||||
<span class="bp-message"><b>{{returnMessage}}</b></span>
|
||||
}
|
||||
</ng-template>
|
||||
<kendo-grid-column field="employee.employeeNo" title="Emp. ID" width="10%">
|
||||
</kendo-grid-column>
|
||||
|
|
@ -134,8 +164,6 @@
|
|||
{{dataItem.employee.basicSalary | number:'1.2-2'}}
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
<!-- Bonus Amount and Bonus Tax are read-only: they are changed one employee at a time in the Modify dialog.
|
||||
The old editable cells are kept below for reference.
|
||||
<kendo-grid-column field="bonusAmount" title="Bonus Amount" width="10%">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
<kendo-numerictextbox [(ngModel)]="dataItem.changeBonusAmount"
|
||||
|
|
@ -156,46 +184,30 @@
|
|||
</ng-template>
|
||||
|
||||
</kendo-grid-column>
|
||||
-->
|
||||
<kendo-grid-column field="changeBonusAmount" title="Bonus Amount" width="10%">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
{{dataItem.changeBonusAmount | number:'1.2-2'}}
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="changeTaxAmount" title="Bonus Tax" width="10%">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
{{dataItem.changeTaxAmount | number:'1.2-2'}}
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="totalAmount" title="Total Amount" width="10%">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
{{(dataItem.changeBonusAmount - dataItem.changeTaxAmount) | number:'1.2-2'}}
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
<!-- Modify is for the bonus tax: hidden when the process was saved with Disburse With Salary (no bonus tax then) -->
|
||||
<kendo-grid-command-column title="Modify" width="8%" [hidden]="bonusProcess?.isDisburseWithSalary == true"
|
||||
[style]="{ 'text-align': 'center' }" [headerStyle]="{ 'text-align': 'center' }">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
<!-- only saved rows (after Process) can be modified -->
|
||||
@if (dataItem.bonusProcessDetailID) {
|
||||
<button type="button" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']" themeColor="primary"
|
||||
title="Modify" (click)="openModify(dataItem)">Modify</button>
|
||||
}
|
||||
</ng-template>
|
||||
</kendo-grid-command-column>
|
||||
<kendo-grid-command-column title="Remove" width="8%"
|
||||
[style]="{ 'text-align': 'center' }" [headerStyle]="{ 'text-align': 'center' }">
|
||||
<kendo-grid-command-column title="Remove" width="8%" style="height:98%;">
|
||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||
<!-- old: (click)="removefromList(rowIndex)". removeRow keeps that for unsaved rows and deletes saved rows in the DB -->
|
||||
<button type="button" (click)="removeRow(dataItem, rowIndex)" class="kt-delete" kendoButton [svgIcon]="apiService.KendoSVGIcon['delete']">
|
||||
<button (click)="removefromList(rowIndex)" class="kt-delete" kendoButton [svgIcon]="apiService.KendoSVGIcon['delete']">
|
||||
</button>
|
||||
</ng-template>
|
||||
</kendo-grid-command-column>
|
||||
<kendo-grid-excel fileName="BonusProcess.xlsx" [fetchData]="allBonusRows"></kendo-grid-excel>
|
||||
<kendo-grid-excel fileName="BonusProcess.xlsx"></kendo-grid-excel>
|
||||
</kendo-grid>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
|
||||
@if (showModal) {
|
||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650"
|
||||
[width]="650">
|
||||
|
|
@ -220,6 +232,8 @@
|
|||
</div>
|
||||
</kendo-dialog>
|
||||
}
|
||||
|
||||
|
||||
@if (showBonusUpload) {
|
||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650"
|
||||
[width]="650">
|
||||
|
|
@ -238,9 +252,8 @@
|
|||
<div class="grid">
|
||||
<div class="col-12" align="right">
|
||||
<app-loading-panel></app-loading-panel>
|
||||
<!-- the file is checked, read and saved on the server in one go (old handler uploadBonusFile kept) -->
|
||||
<input id="fupEmpPhoto" kendoTextBox title="Upload" accept=".xlsx,.xls"
|
||||
(change)="uploadBonusFileAndSave($event)" type="file">
|
||||
<input id="fupEmpPhoto" kendoTextBox title="Upload"
|
||||
(change)="uploadBonusFile($event)" type="file">
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid">
|
||||
|
|
@ -250,61 +263,3 @@
|
|||
</div>
|
||||
</kendo-dialog>
|
||||
}
|
||||
|
||||
<!-- Modify dialog: one employee's bonus and tax, saved on its own (api/Bonus/calculateRowTax, api/Bonus/saveRow) -->
|
||||
@if (showModify && modifyRow) {
|
||||
<div class="blur-background">
|
||||
<kendo-dialog title="Modify Bonus" [width]="520" maxHeight="90vh" (close)="closeModify()"
|
||||
(keydown.escape)="$event.stopPropagation()">
|
||||
<app-loading-panel></app-loading-panel>
|
||||
<div class="grid">
|
||||
<div class="col-4"><label>Employee</label></div>
|
||||
<div class="col-8"><b>{{modifyRow.employee?.employeeNo}} - {{modifyRow.employee?.name}}</b></div>
|
||||
<div class="col-4" style="margin: auto;"><label>Bonus Amount</label></div>
|
||||
<div class="col-8">
|
||||
<kendo-numerictextbox [(ngModel)]="modifyBonusAmount" [ngModelOptions]="{standalone: true}"
|
||||
[min]="0" [autoCorrect]="true" [spinners]="false" [format]="'n2'"
|
||||
(valueChange)="onModifyBonusChange()" style="width: 100%;">
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
<div class="col-4" style="margin: auto;"><label>Calculated tax</label></div>
|
||||
<div class="col-8">
|
||||
<input type="checkbox" kendoCheckBox [(ngModel)]="modifyCalculateTax" [ngModelOptions]="{standalone: true}"
|
||||
(ngModelChange)="onModifyCalculateTaxChange()" />
|
||||
<button type="button" kendoButton themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['check']"
|
||||
[disabled]="!modifyCalculateTax || modifyBusy" (click)="calculateModifyTax()" style="margin-left: 10px;">
|
||||
Calculate
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="col-4" style="margin: auto;"><label>Tax Amount</label></div>
|
||||
<div class="col-8">
|
||||
<kendo-numerictextbox [(ngModel)]="modifyTaxAmount" [ngModelOptions]="{standalone: true}"
|
||||
[min]="0" [autoCorrect]="true" [spinners]="false" [format]="'n2'"
|
||||
[readonly]="modifyCalculateTax" style="width: 100%;">
|
||||
</kendo-numerictextbox>
|
||||
@if (modifyCalculateTax && !modifyTaxCalculated) {
|
||||
<small>Press Calculate to see the tax. On Save the tax is calculated again for this bonus.</small>
|
||||
}
|
||||
</div>
|
||||
<!-- Edited Tax Amount: the calculated tax lands here, the user may change it; this one is saved (changeTaxAmount) -->
|
||||
@if (modifyCalculateTax) {
|
||||
<div class="col-4" style="margin: auto;"><label>Edited Tax Amount</label></div>
|
||||
<div class="col-8">
|
||||
<kendo-numerictextbox [(ngModel)]="modifyEditedTaxAmount" [ngModelOptions]="{standalone: true}"
|
||||
[min]="0" [autoCorrect]="true" [spinners]="false" [format]="'n2'"
|
||||
[readonly]="!modifyTaxCalculated" style="width: 100%;">
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
}
|
||||
<div class="col-4"><label>Total</label></div>
|
||||
<div class="col-8"><b>{{ ((modifyBonusAmount || 0) - ((modifyCalculateTax ? modifyEditedTaxAmount : modifyTaxAmount) || 0)) | number:'1.2-2' }}</b></div>
|
||||
</div>
|
||||
<kendo-dialog-actions>
|
||||
<button type="button" kendoButton [svgIcon]="apiService.KendoSVGIcon['cancel']" (click)="closeModify()">Cancel</button>
|
||||
<button type="button" kendoButton themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['save']"
|
||||
[disabled]="modifyBusy" (click)="saveModify()">Save</button>
|
||||
</kendo-dialog-actions>
|
||||
</kendo-dialog>
|
||||
</div>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,9 @@ import {loadingPanelService} from '../../hrm-loding panel/loding.panel.service';
|
|||
import {PayrollType} from '../../_models/Authentication/payrollType';
|
||||
import {Bonus} from '../../_models/Basic/bonus';
|
||||
import {Employee} from '../../_models/Employee/employee';
|
||||
import {EmployeeLite} from '../../_models/Employee/employeeLite';
|
||||
import {SearchEmployee} from '../../_models/Employee/searchEmployee';
|
||||
import {EnumIncomeTaxItemGroup, EnumStatus, EnumTaxMergeType} from '../../_models/enums';
|
||||
import {BonusProcess, BonusProcessDetail} from '../../_models/Payroll/bonusProcess';
|
||||
import {BonusProcessAndSaveRequest, BonusProcessAndSaveResult, BonusProcessGridRow, BonusProcessRowTaxResult, BonusProcessRowRemoveResult} from '../../_models/Payroll/bonusProcessAndSave';
|
||||
import {TaxMergeMaster} from '../../_models/Payroll/Tax/taxMergeMaster';
|
||||
import {AuthService} from '../../_services/auth/auth.service';
|
||||
import {BasicService} from '../../_services/Basic/basic.service';
|
||||
|
|
@ -67,17 +65,6 @@ export class BonusProcessComponent implements OnInit {
|
|||
processCompleted: boolean = false;
|
||||
showBonusUpload: boolean = false;
|
||||
|
||||
// Modify dialog (one saved row at a time)
|
||||
showModify: boolean = false;
|
||||
modifyRow: BonusProcessDetail;
|
||||
modifyBonusAmount: number = 0;
|
||||
modifyTaxAmount: number = 0;
|
||||
// "Edited Tax Amount" (with Calculated tax): starts as the calculated tax, the user may change it; saved as changeTaxAmount
|
||||
modifyEditedTaxAmount: number = 0;
|
||||
modifyCalculateTax: boolean = false;
|
||||
modifyTaxCalculated: boolean = false; // the tax shown was calculated for the bonus shown
|
||||
modifyBusy: boolean = false;
|
||||
|
||||
constructor(public basicService: BasicService, public notificationService: HRMNotificationService,
|
||||
public loadingPanelService: loadingPanelService, public empService: EmployeeServices,
|
||||
public datatransferservice: DataTransferService,
|
||||
|
|
@ -109,6 +96,7 @@ export class BonusProcessComponent implements OnInit {
|
|||
() => {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
});
|
||||
|
||||
this.authSerivce.GetPayrollTypeByLoginID().subscribe(
|
||||
(x) => {
|
||||
this.payrollType = x;
|
||||
|
|
@ -122,14 +110,8 @@ export class BonusProcessComponent implements OnInit {
|
|||
this.cuttofDate = new Date(this.payrollType.nextPayProcessDate);
|
||||
});
|
||||
}
|
||||
|
||||
public GetSelectedEmployee(searchEmp: SearchEmployee[]) {
|
||||
// the already-processed check needs the bonus: stop here (nothing added to the grid) until one is chosen
|
||||
if (this.selectedbonusID == undefined || this.selectedbonusID <= 0) {
|
||||
const message = 'Please select a Bonus Type first, then select the employees.';
|
||||
this.notificationService.showWarning(message);
|
||||
this.returnMessage = message;
|
||||
return;
|
||||
}
|
||||
this.processCompleted = false;
|
||||
this.selectedEmps = searchEmp;
|
||||
if (this.bonusProcessDetails == undefined) {
|
||||
|
|
@ -152,6 +134,7 @@ export class BonusProcessComponent implements OnInit {
|
|||
this.RefreshDefaultGrid();
|
||||
}
|
||||
}
|
||||
|
||||
RefreshDefaultGrid() {
|
||||
if (this.selectedEmps != undefined && this.bonusProcessDetails != undefined) {
|
||||
if (this.bonusProcess == undefined) {
|
||||
|
|
@ -176,7 +159,6 @@ export class BonusProcessComponent implements OnInit {
|
|||
}
|
||||
}
|
||||
});
|
||||
this.bonusProcess.bonusProcessDetails = [...this.bonusProcess.bonusProcessDetails];
|
||||
this.RefreshEmployees();
|
||||
if (this.alreadyProcessesList.length > 0) {
|
||||
this.showModal = true;
|
||||
|
|
@ -185,29 +167,37 @@ export class BonusProcessComponent implements OnInit {
|
|||
}
|
||||
RefreshEmployees() {
|
||||
if (this.selectedEmps == undefined) return;
|
||||
const empIds: number[] = this.selectedEmps.map(e => e.employeeID);
|
||||
var emps: EmployeeLite[];
|
||||
var ids = SearchEmployee.getEmpIds(this.selectedEmps);
|
||||
|
||||
const data = {
|
||||
dataList: ids,
|
||||
};
|
||||
var emps: Employee[];
|
||||
|
||||
this.loadingPanelService.ShowLoadingPanel = true;
|
||||
this.empService.getEmployeeLiteByEmpIDs(empIds).subscribe(
|
||||
this.empService.getEmployeesByEmpIDs(data).subscribe(
|
||||
(resp: any) => {
|
||||
emps = resp;
|
||||
},
|
||||
(err: any) => {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
this.notificationService.showWarning(err.error);
|
||||
|
||||
},
|
||||
() => {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
emps.forEach(x => {
|
||||
let bindex = this.bonusProcess.bonusProcessDetails.findIndex(b => b.employeeID == x.employeeID);
|
||||
let bindex = this.bonusProcess.bonusProcessDetails.findIndex(b => b.employeeID == x.id);
|
||||
if (bindex != -1) {
|
||||
this.bonusProcess.bonusProcessDetails[bindex].employee.isConfirmed = x.isConfirmed;
|
||||
this.bonusProcess.bonusProcessDetails[bindex].employee.joiningDate = x.joiningDate;
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
checkWithOrTax(from: number, value: boolean) {
|
||||
debugger;
|
||||
if (from == 1) {
|
||||
if (value == true) {
|
||||
this.isTaxProcess = false;
|
||||
|
|
@ -218,38 +208,35 @@ export class BonusProcessComponent implements OnInit {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
onPopUpClose() {
|
||||
this.showModal = false;
|
||||
this.showBonusUpload = false;
|
||||
}
|
||||
|
||||
showBonusUploadPopUp() {
|
||||
this.showBonusUpload = true;
|
||||
}
|
||||
|
||||
currentlyProcess($event) {
|
||||
|
||||
}
|
||||
|
||||
remainingBasic($event) {
|
||||
|
||||
}
|
||||
|
||||
search() {
|
||||
|
||||
}
|
||||
|
||||
process() {
|
||||
if (this.bonusProcess == undefined || this.bonusProcess.bonusProcessDetails.length == 0) {
|
||||
this.notificationService.showWarning('Please select employee for the proces');
|
||||
return;
|
||||
}
|
||||
// Process saves straight to the database, so ask first
|
||||
// tell the user which option the process runs with (the two checkboxes can't both be ticked)
|
||||
const option = this.disburseWithSalary ? 'with Disburse With Salary'
|
||||
: this.isTaxProcess ? 'with Calculate Tax'
|
||||
: 'without Disburse With Salary and Calculate Tax';
|
||||
this.notificationService.showActiveConfirm('Confirmation', 'Are you sure you want to process the bonus ' + option + '?').then((isConfirmed) => {
|
||||
if (isConfirmed)
|
||||
{
|
||||
this.processConfirmed();
|
||||
}
|
||||
});
|
||||
}
|
||||
// the rest of Process, run only after the user confirmed
|
||||
private processConfirmed() {
|
||||
|
||||
|
||||
var isApproved = false;
|
||||
this.loadingPanelService.ShowLoadingPanel = true;
|
||||
this.bonusService.IsBonusApproved(this.selectedbonusID, this.payrollType.nextPayProcessDate).subscribe(
|
||||
|
|
@ -268,289 +255,58 @@ export class BonusProcessComponent implements OnInit {
|
|||
this.returnMessage = 'selected Bonus is already process and Approved';
|
||||
return;
|
||||
}
|
||||
// Process = calculate + save on the server in one request (no separate Save step).
|
||||
// Only the header and the employee IDs are sent; the saved rows come back from the database.
|
||||
const request: BonusProcessAndSaveRequest = {
|
||||
bonusID: this.selectedbonusID,
|
||||
basicMonth: this.basicDate,
|
||||
payDate: this.payDate,
|
||||
cuttOfDate: this.cuttofDate,
|
||||
currProcess: this.processFor,
|
||||
isDisburseWithSalary: this.disburseWithSalary,
|
||||
isTaxProcess: this.isTaxProcess,
|
||||
employeeIDs: this.bonusProcess.bonusProcessDetails.map(x => x.employeeID),
|
||||
};
|
||||
var result: BonusProcessAndSaveResult;
|
||||
|
||||
|
||||
var returnID: number;
|
||||
this.processRequest = [];
|
||||
var index: number = 0;
|
||||
this.bonusProcess.bonusProcessDetails.forEach(x => {
|
||||
|
||||
this.processRequest.push({
|
||||
'bonusid': this.selectedbonusID,
|
||||
'basicMonth': this.basicDate,
|
||||
'payDate': this.payDate,
|
||||
'cuttOfDate': this.cuttofDate,
|
||||
'currProcess': this.processFor,
|
||||
'isDisburseWithSalary': this.disburseWithSalary,
|
||||
'isTaxProcess': this.isTaxProcess,
|
||||
'empid': x.employeeID
|
||||
});
|
||||
|
||||
});
|
||||
this.errorOrSucessList = [];
|
||||
this.bonusService.processAndSave(request).subscribe(
|
||||
(resp: BonusProcessAndSaveResult) => {
|
||||
result = resp;
|
||||
this.bonusService.BonusProcess(this.processRequest).subscribe(
|
||||
(resp: any) => {
|
||||
this.bonusProcess = resp;
|
||||
},
|
||||
(err: any) => {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
const message = (typeof err?.error === 'string' && err.error) ? err.error
|
||||
: 'Bonus process failed. Please check the connection and try again.';
|
||||
this.notificationService.showWarning(message);
|
||||
this.returnMessage = message;
|
||||
this.notificationService.showWarning(err.error);
|
||||
this.returnMessage = err.error;
|
||||
},
|
||||
() => {
|
||||
this.bonusProcess = new BonusProcess();
|
||||
this.bonusProcess.id = result?.bonusProcessID;
|
||||
// kept so the grid knows how this process was saved (Modify is hidden for Disburse With Salary)
|
||||
this.bonusProcess.isDisburseWithSalary = request.isDisburseWithSalary;
|
||||
this.bonusProcess.bonusProcessDetails = (result?.rows ?? []).map(r => this.toGridDetail(r));
|
||||
// the already-processed list changed: read it again on the next employee selection
|
||||
this.bonusProcessDetails = undefined;
|
||||
this.alreadyProcessesList = [];
|
||||
this.processCompleted = true;
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
this.pbuttonEnalble = false;
|
||||
const skipped = result?.alreadyProcessedEmployeeIDs?.length ?? 0;
|
||||
const message = 'Bonus processed and saved successfully'
|
||||
+ (skipped > 0 ? ' (' + skipped + ' already processed employee(s) left out)' : '');
|
||||
this.notificationService.showSuccess(message);
|
||||
this.returnMessage = message;
|
||||
this.notificationService.showSuccess('Bonus processed successfully');
|
||||
this.returnMessage = 'Bonus processed successfully';
|
||||
});
|
||||
|
||||
}
|
||||
);
|
||||
}
|
||||
// ---- Upload Data: check every input, then the server reads the file, calculates the tax (when asked)
|
||||
// and saves, in one request (api/dataUpload/uploadBonusFileAndSave). The old uploadBonusFile is kept. ----
|
||||
uploadBonusFileAndSave(event: any): void {
|
||||
const input: HTMLInputElement = event?.target;
|
||||
const file: File | null = input?.files && input.files.length > 0 ? input.files.item(0) : null;
|
||||
const clearInput = () => { if (input) input.value = ''; }; // so the same file can be chosen again
|
||||
|
||||
const problems: string[] = [];
|
||||
if (this.selectedbonusID == undefined || this.selectedbonusID <= 0) problems.push('Bonus Type');
|
||||
if (this.basicDate == undefined) problems.push('Consider Basic Of');
|
||||
if (this.payDate == undefined) problems.push('Pay Date');
|
||||
if (this.cuttofDate == undefined) problems.push('Bonus Cut Off Date');
|
||||
if (this.processFor == undefined || this.processFor <= 0) problems.push('Currently Process For Basic (must be greater than 0)');
|
||||
if (this.payrollType == undefined) problems.push('Payroll type (please reload the page)');
|
||||
if (problems.length > 0) {
|
||||
this.notificationService.showWarning('Please give: ' + problems.join(', '));
|
||||
clearInput();
|
||||
return;
|
||||
}
|
||||
if (file == null) {
|
||||
this.notificationService.showWarning('please select a file');
|
||||
return;
|
||||
}
|
||||
const name = (file.name || '').toLowerCase();
|
||||
if (!name.endsWith('.xlsx') && !name.endsWith('.xls')) {
|
||||
this.notificationService.showWarning('Please select an Excel file (.xlsx or .xls)');
|
||||
clearInput();
|
||||
return;
|
||||
}
|
||||
const header: BonusProcessAndSaveRequest = {
|
||||
bonusID: this.selectedbonusID,
|
||||
basicMonth: this.basicDate,
|
||||
payDate: this.payDate,
|
||||
cuttOfDate: this.cuttofDate,
|
||||
currProcess: this.processFor,
|
||||
isDisburseWithSalary: this.disburseWithSalary,
|
||||
isTaxProcess: this.isTaxProcess,
|
||||
employeeIDs: [],
|
||||
};
|
||||
var isApproved = false;
|
||||
this.loadingPanelService.ShowLoadingPanel = true;
|
||||
this.bonusService.IsBonusApproved(this.selectedbonusID, this.payrollType.nextPayProcessDate).subscribe(
|
||||
(resp: any) => {
|
||||
isApproved = resp;
|
||||
},
|
||||
(err: any) => {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
this.notificationService.showWarning(this.errorText(err, 'Could not check the bonus. Please try again.'));
|
||||
clearInput();
|
||||
},
|
||||
() => {
|
||||
if (isApproved == true) {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
this.notificationService.showWarning('selected Bonus is already process and Approved');
|
||||
this.returnMessage = 'selected Bonus is already process and Approved';
|
||||
clearInput();
|
||||
return;
|
||||
}
|
||||
var result: BonusProcessAndSaveResult;
|
||||
this.dataUploadService.uploadBonusFileAndSave(file, header).subscribe(
|
||||
(resp: BonusProcessAndSaveResult) => {
|
||||
result = resp;
|
||||
},
|
||||
(err: any) => {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
const message = this.errorText(err, 'Upload failed. Please check the connection and try again.');
|
||||
this.notificationService.showWarning(message);
|
||||
this.returnMessage = message;
|
||||
clearInput();
|
||||
},
|
||||
() => {
|
||||
this.bonusProcess = new BonusProcess();
|
||||
this.bonusProcess.id = result?.bonusProcessID;
|
||||
// kept so the grid knows how this process was saved (Modify is hidden for Disburse With Salary)
|
||||
this.bonusProcess.isDisburseWithSalary = header.isDisburseWithSalary;
|
||||
this.bonusProcess.bonusProcessDetails = (result?.rows ?? []).map(r => this.toGridDetail(r));
|
||||
// the already-processed list changed: read it again on the next employee selection
|
||||
this.bonusProcessDetails = undefined;
|
||||
this.alreadyProcessesList = [];
|
||||
this.processCompleted = true;
|
||||
this.showBonusUpload = false;
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
const skipped = result?.alreadyProcessedEmployeeIDs?.length ?? 0;
|
||||
const message = 'Bonus uploaded and saved successfully (' + (result?.rows?.length ?? 0) + ' employee(s))'
|
||||
+ (skipped > 0 ? '; ' + skipped + ' already processed employee(s) left out' : '');
|
||||
this.notificationService.showSuccess(message);
|
||||
this.returnMessage = message;
|
||||
clearInput();
|
||||
});
|
||||
});
|
||||
}
|
||||
// ---- Modify dialog: one saved row at a time (api/Bonus/calculateRowTax, api/Bonus/saveRow) ----
|
||||
openModify(row: BonusProcessDetail) {
|
||||
if (row == undefined || !row.bonusProcessDetailID) {
|
||||
this.notificationService.showWarning('Please process the Bonus first');
|
||||
return;
|
||||
}
|
||||
this.modifyRow = row;
|
||||
this.modifyBonusAmount = row.changeBonusAmount ?? 0;
|
||||
this.modifyCalculateTax = this.isTaxProcess == true;
|
||||
// with Calculated tax: Tax Amount = the system's tax (taxAmount), Edited Tax Amount = the saved one (changeTaxAmount);
|
||||
// without it the Tax Amount field is typed in as before and starts at the saved tax
|
||||
this.modifyTaxAmount = this.modifyCalculateTax ? (row.taxAmount ?? 0) : (row.changeTaxAmount ?? 0);
|
||||
this.modifyEditedTaxAmount = row.changeTaxAmount ?? 0;
|
||||
this.modifyTaxCalculated = true; // the saved tax belongs to the saved bonus
|
||||
this.modifyBusy = false;
|
||||
this.showModify = true;
|
||||
}
|
||||
closeModify() {
|
||||
this.showModify = false;
|
||||
this.modifyRow = undefined;
|
||||
this.modifyBusy = false;
|
||||
}
|
||||
onModifyBonusChange() {
|
||||
// the tax shown no longer matches the bonus until Calculate is pressed again
|
||||
if (this.modifyCalculateTax) this.modifyTaxCalculated = false;
|
||||
}
|
||||
onModifyCalculateTaxChange() {
|
||||
if (this.modifyCalculateTax) this.modifyTaxCalculated = false;
|
||||
}
|
||||
private errorText(err: any, fallback: string): string {
|
||||
return (typeof err?.error === 'string' && err.error) ? err.error : fallback;
|
||||
}
|
||||
calculateModifyTax() {
|
||||
if (this.modifyRow == undefined) return;
|
||||
if (this.modifyBonusAmount == undefined || this.modifyBonusAmount < 0) {
|
||||
this.notificationService.showWarning('Please enter a valid bonus amount');
|
||||
return;
|
||||
}
|
||||
this.modifyBusy = true;
|
||||
this.loadingPanelService.ShowLoadingPanel = true;
|
||||
this.bonusService.calculateRowTax({
|
||||
bonusProcessDetailID: this.modifyRow.bonusProcessDetailID,
|
||||
bonusAmount: this.modifyBonusAmount,
|
||||
}).subscribe(
|
||||
(resp: BonusProcessRowTaxResult) => {
|
||||
this.modifyTaxAmount = resp?.taxAmount ?? 0;
|
||||
// the user sees the new tax in Edited Tax Amount and may change it before Save
|
||||
this.modifyEditedTaxAmount = this.modifyTaxAmount;
|
||||
this.modifyTaxCalculated = true;
|
||||
},
|
||||
(err: any) => {
|
||||
this.modifyBusy = false;
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
this.notificationService.showWarning(this.errorText(err, 'Tax calculation failed. Please try again.'));
|
||||
},
|
||||
() => {
|
||||
this.modifyBusy = false;
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
});
|
||||
}
|
||||
saveModify() {
|
||||
if (this.modifyRow == undefined) return;
|
||||
if (this.modifyBonusAmount == undefined || this.modifyBonusAmount < 0) {
|
||||
this.notificationService.showWarning('Please enter a valid bonus amount');
|
||||
return;
|
||||
}
|
||||
if (!this.modifyCalculateTax && (this.modifyTaxAmount == undefined || this.modifyTaxAmount < 0)) {
|
||||
this.notificationService.showWarning('Please enter a valid tax amount');
|
||||
return;
|
||||
}
|
||||
if (this.modifyCalculateTax && !this.modifyTaxCalculated) {
|
||||
// the Edited Tax Amount must be chosen against the tax of THIS bonus amount
|
||||
this.notificationService.showWarning('Please press Calculate first, then check the Edited Tax Amount');
|
||||
return;
|
||||
}
|
||||
if (this.modifyCalculateTax && (this.modifyEditedTaxAmount == undefined || this.modifyEditedTaxAmount < 0)) {
|
||||
this.notificationService.showWarning('Please enter a valid edited tax amount');
|
||||
return;
|
||||
}
|
||||
const row = this.modifyRow;
|
||||
var saved: BonusProcessGridRow;
|
||||
this.modifyBusy = true;
|
||||
this.loadingPanelService.ShowLoadingPanel = true;
|
||||
this.bonusService.saveRow({
|
||||
bonusProcessDetailID: row.bonusProcessDetailID,
|
||||
bonusAmount: this.modifyBonusAmount,
|
||||
taxAmount: this.modifyTaxAmount ?? 0,
|
||||
calculateTax: this.modifyCalculateTax == true,
|
||||
editedTaxAmount: this.modifyCalculateTax == true ? (this.modifyEditedTaxAmount ?? 0) : undefined,
|
||||
}).subscribe(
|
||||
(resp: BonusProcessGridRow) => {
|
||||
saved = resp;
|
||||
},
|
||||
(err: any) => {
|
||||
this.modifyBusy = false;
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
this.notificationService.showWarning(this.errorText(err, 'Save failed. Please try again.'));
|
||||
},
|
||||
() => {
|
||||
this.modifyBusy = false;
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
if (saved != undefined) {
|
||||
// only this row changes in the grid, with what the database now holds
|
||||
const updated = this.toGridDetail(saved);
|
||||
row.changeBonusAmount = updated.changeBonusAmount;
|
||||
row.changeTaxAmount = updated.changeTaxAmount;
|
||||
row.taxAmount = updated.taxAmount;
|
||||
row.bonusAmount = updated.bonusAmount;
|
||||
row.basicSalary = updated.basicSalary;
|
||||
row.employee = updated.employee;
|
||||
}
|
||||
this.notificationService.showSuccess('Bonus saved for ' + (row.employee?.employeeNo ?? 'the employee'));
|
||||
this.closeModify();
|
||||
});
|
||||
}
|
||||
// a saved row from processAndSave, in the shape the grid binds to (dataItem.employee.*, changeBonusAmount, ...)
|
||||
private toGridDetail(r: BonusProcessGridRow): BonusProcessDetail {
|
||||
const item: BonusProcessDetail = new BonusProcessDetail();
|
||||
item.bonusProcessDetailID = r.bonusProcessDetailID;
|
||||
item.bonusProcessID = r.bonusProcessID;
|
||||
item.bonusID = r.bonusID;
|
||||
item.employeeID = r.employeeID;
|
||||
item.basicSalary = r.basicSalary;
|
||||
item.bonusAmount = r.bonusAmount;
|
||||
item.changeBonusAmount = r.changeBonusAmount;
|
||||
item.taxAmount = r.taxAmount;
|
||||
item.changeTaxAmount = r.changeTaxAmount;
|
||||
item.employee = new Employee();
|
||||
item.employee.id = r.employeeID;
|
||||
item.employee.employeeID = r.employeeID;
|
||||
item.employee.employeeNo = r.employeeNo;
|
||||
item.employee.name = r.name;
|
||||
item.employee.joiningDate = r.joiningDate;
|
||||
item.employee.isConfirmed = r.isConfirmed;
|
||||
item.employee.grossSalary = r.grossSalary;
|
||||
item.employee.basicSalary = r.basicSalary;
|
||||
return item;
|
||||
}
|
||||
|
||||
public BonusvalueChange(value: any): void {
|
||||
this.alreadyProcessesList = [];
|
||||
this.bonusProcess = new BonusProcess();
|
||||
this.bonusProcess.bonusProcessDetails = [];
|
||||
this.selectedEmps = [];
|
||||
this.processCompleted = false;
|
||||
this.pbuttonEnalble = false;
|
||||
}
|
||||
this.bonusProcess = new BonusProcess();
|
||||
this.bonusProcess.bonusProcessDetails = [];
|
||||
this.selectedEmps = [];
|
||||
this.processCompleted = false;
|
||||
this.pbuttonEnalble = false;
|
||||
|
||||
}
|
||||
|
||||
TaxRecalculate() {
|
||||
this.loadingPanelService.ShowLoadingPanel = true;
|
||||
|
||||
|
|
@ -573,9 +329,13 @@ export class BonusProcessComponent implements OnInit {
|
|||
this.pbuttonEnalble = false;
|
||||
this.notificationService.showSuccess('Tax Recalculated processed successfully');
|
||||
this.returnMessage = 'Tax Recalculated processed successfully';
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
uploadBonusFile(event: any): void {
|
||||
debugger;
|
||||
let tempResponse: any;
|
||||
this.selectedFiles = event.target.files;
|
||||
if (this.selectedFiles.length > 0) {
|
||||
|
|
@ -621,28 +381,41 @@ export class BonusProcessComponent implements OnInit {
|
|||
this.notificationService.showWarning('please select a file');
|
||||
}
|
||||
}
|
||||
|
||||
refresh() {
|
||||
|
||||
}
|
||||
|
||||
edit() {
|
||||
|
||||
}
|
||||
|
||||
clearAll() {
|
||||
|
||||
}
|
||||
|
||||
remove() {
|
||||
|
||||
}
|
||||
|
||||
save() {
|
||||
if (this.processCompleted == false) {
|
||||
this.notificationService.showWarning('Please process the Bonus first');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (this.bonusProcess == undefined || this.bonusProcess?.bonusProcessDetails.length == 0) {
|
||||
this.notificationService.showWarning('There are no data to save');
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.isTaxProcess == true && (this.bonusProcess.bonusProcessDetails[0].incomeTaxcoll == undefined
|
||||
|| this.bonusProcess.bonusProcessDetails[0].incomeTaxcoll.length == 0)) {
|
||||
this.notificationService.showWarning('Tax Calculation not yet done');
|
||||
return;
|
||||
}
|
||||
|
||||
if (this.isTaxProcess == true) {
|
||||
var mitem: TaxMergeMaster = undefined;
|
||||
this.taxService.getTaxMergeMaster(EnumTaxMergeType.Bonus, this.selectedbonusID).subscribe(
|
||||
|
|
@ -656,14 +429,18 @@ export class BonusProcessComponent implements OnInit {
|
|||
() => {
|
||||
if (mitem != undefined) {
|
||||
console.log(mitem);
|
||||
|
||||
this.bonusProcess.bonusProcessDetails.every(x => {
|
||||
//console.log(x.incomeTaxcoll);
|
||||
var item = x.incomeTaxcoll.find(y => y.itemGroup == mitem.itemGroup && y.itemID == mitem.itemID);
|
||||
if (item != undefined) {
|
||||
item.thisMonthAmount = x.changeBonusAmount;
|
||||
} else {
|
||||
this.notificationService.showWarning('Income tax amount not found in the collection');
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
item = x.incomeTaxcoll.find(y => y.itemGroup == EnumIncomeTaxItemGroup.Tax_Deducted);
|
||||
if (item != undefined) {
|
||||
item.thisMonthAmount = x.changeTaxAmount;
|
||||
|
|
@ -676,116 +453,17 @@ export class BonusProcessComponent implements OnInit {
|
|||
}
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
} else {
|
||||
this.saveData();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
private logSavePayloadSize() {
|
||||
try {
|
||||
const enc = new TextEncoder();
|
||||
const bytes = (v: any): number => { const s = JSON.stringify(v); return s === undefined ? 0 : enc.encode(s).length; };
|
||||
const MB = (b: number) => (b / 1024 / 1024).toFixed(2) + ' MB';
|
||||
const KB = (b: number) => (b / 1024).toFixed(2) + ' KB';
|
||||
const LIMIT = 30000000; // IIS / ASP.NET Core default request body limit (bytes)
|
||||
|
||||
// size of every field over a list of objects (bytes of "key":value, per field), biggest first
|
||||
const fieldTable = (objs: any[], total: number, top = 999) => {
|
||||
const sum: { [k: string]: { b: number, nulls: number, objs: number } } = {};
|
||||
objs.forEach(o => {
|
||||
if (o == null || typeof o !== 'object') return;
|
||||
Object.keys(o).forEach(k => {
|
||||
const v = o[k];
|
||||
const e = sum[k] || (sum[k] = { b: 0, nulls: 0, objs: 0 });
|
||||
if (v === undefined) return;
|
||||
e.b += enc.encode(JSON.stringify(k)).length + 2 + bytes(v);
|
||||
if (v === null) e.nulls++;
|
||||
else if (typeof v === 'object') e.objs++;
|
||||
});
|
||||
});
|
||||
return Object.keys(sum)
|
||||
.map(k => ({ field: k, size: MB(sum[k].b), percent: (total ? (sum[k].b * 100 / total) : 0).toFixed(1) + '%', nullRows: sum[k].nulls, objectRows: sum[k].objs, _b: sum[k].b }))
|
||||
.sort((a, b) => b._b - a._b)
|
||||
.slice(0, top)
|
||||
.map(({ _b, ...r }) => r);
|
||||
};
|
||||
const stats = (counts: number[]) => {
|
||||
if (counts.length == 0) return { total: 0, min: 0, max: 0, avg: '0' };
|
||||
let total = 0, min = counts[0], max = counts[0];
|
||||
counts.forEach(c => { total += c; if (c < min) min = c; if (c > max) max = c; });
|
||||
return { total, min, max, avg: (total / counts.length).toFixed(1) };
|
||||
};
|
||||
|
||||
const d: any[] = this.bonusProcess?.bonusProcessDetails ?? [];
|
||||
|
||||
// 1. Overview
|
||||
const t0 = performance.now();
|
||||
const totalBytes = bytes(this.bonusProcess);
|
||||
const stringifyMs = Math.round(performance.now() - t0);
|
||||
const header = { ...this.bonusProcess, bonusProcessDetails: undefined };
|
||||
console.log('%c[SAVE SIZE] 1. Overview', 'font-weight:bold');
|
||||
console.table({
|
||||
rows: d.length,
|
||||
totalRequest: MB(totalBytes),
|
||||
serverLimit: MB(LIMIT),
|
||||
overLimitBy: totalBytes > LIMIT ? MB(totalBytes - LIMIT) + ' (' + (totalBytes / LIMIT).toFixed(1) + 'x the limit)' : 'within the limit',
|
||||
header_withoutDetails: KB(bytes(header)),
|
||||
averagePerRow: d.length ? KB(totalBytes / d.length) : '0',
|
||||
jsonStringifyTime: stringifyMs + ' ms',
|
||||
});
|
||||
|
||||
// 2. Every field of a BonusProcessDetail (employee / bonus / incomeTaxcoll are fields too)
|
||||
console.log('%c[SAVE SIZE] 2. Fields of each detail row (all rows together)', 'font-weight:bold');
|
||||
console.table(fieldTable(d, totalBytes));
|
||||
|
||||
// 3. employee
|
||||
const emps = d.map(x => x.employee).filter(x => x != null);
|
||||
const empBytes = bytes(emps);
|
||||
console.log('%c[SAVE SIZE] 3. employee — ' + MB(empBytes) + ', ' + emps.length + ' objects, ' + new Set(emps).size + ' distinct; top 25 fields', 'font-weight:bold');
|
||||
console.table(fieldTable(emps, empBytes, 25));
|
||||
|
||||
// 4. bonus
|
||||
const bonuses = d.map(x => x.bonus).filter(x => x != null);
|
||||
const bonusBytes = bytes(bonuses);
|
||||
console.log('%c[SAVE SIZE] 4. bonus — ' + MB(bonusBytes) + ', ' + bonuses.length + ' objects, ' + new Set(bonuses).size
|
||||
+ ' distinct (' + new Set(bonuses.map(b => b?.id)).size + ' distinct ids); one copy = ' + KB(bytes(bonuses[0])), 'font-weight:bold');
|
||||
if (bonuses.length) console.table(fieldTable(bonuses, bonusBytes, 25));
|
||||
|
||||
// 5. incomeTaxcoll
|
||||
const taxCounts = d.map(x => (x.incomeTaxcoll ?? []).length);
|
||||
const taxItems = ([] as any[]).concat(...d.map(x => x.incomeTaxcoll ?? []));
|
||||
const taxBytes = bytes(taxItems);
|
||||
console.log('%c[SAVE SIZE] 5. incomeTaxcoll — ' + MB(taxBytes) + '; items per row:', 'font-weight:bold', stats(taxCounts),
|
||||
'; rows with no items:', taxCounts.filter(c => c == 0).length, '; one item ≈', taxItems.length ? (taxBytes / taxItems.length).toFixed(0) + ' bytes' : '-');
|
||||
if (taxItems.length) console.table(fieldTable(taxItems, taxBytes));
|
||||
|
||||
// 6. bonusEmpCostCenters
|
||||
const ccCounts = d.map(x => (x.bonusEmpCostCenters ?? []).length);
|
||||
const ccItems = ([] as any[]).concat(...d.map(x => x.bonusEmpCostCenters ?? []));
|
||||
console.log('%c[SAVE SIZE] 6. bonusEmpCostCenters — ' + MB(bytes(ccItems)) + '; items per row:', 'font-weight:bold', stats(ccCounts));
|
||||
|
||||
// 7. What the server actually saves: BonusProcessDA.Insert (detail) + IncomeTaxService.SaveBulk (tax)
|
||||
const pick = (o: any, keys: string[]) => { const r: any = {}; keys.forEach(k => { if (o?.[k] !== undefined) r[k] = o[k]; }); return r; };
|
||||
const detailKeys = ['employeeID', 'bonusID', 'bonusMonth', 'bonusAmount', 'grossSalary', 'basicSalary', 'changeBonusAmount', 'changeTaxAmount',
|
||||
'changeAdjustAmount', 'changeSalaryItemAmount', 'calculatedAdjustAmount', 'calculatedSalaryItemAmount', 'taxAmount'];
|
||||
const taxKeys = ['employeeID', 'itemGroup', 'itemID', 'description', 'totalAmount', 'previousAmount', 'thisMonthAmount', 'projectedAmount',
|
||||
'side', 'position', 'isChanged', 'taxParameterID'];
|
||||
const minimal = {
|
||||
...header,
|
||||
bonusProcessDetails: d.map(x => ({ ...pick(x, detailKeys), incomeTaxcoll: (x.incomeTaxcoll ?? []).map((t: any) => pick(t, taxKeys)) })),
|
||||
};
|
||||
const minimalBytes = bytes(minimal);
|
||||
console.log('%c[SAVE SIZE] 7. Only the fields the server saves', 'font-weight:bold');
|
||||
console.table({
|
||||
minimalRequest: MB(minimalBytes),
|
||||
ofWhichTax: MB(bytes(minimal.bonusProcessDetails.map(x => x.incomeTaxcoll))),
|
||||
smallerBy: minimalBytes ? (totalBytes / minimalBytes).toFixed(1) + 'x' : '-',
|
||||
fitsInLimit: minimalBytes <= LIMIT ? 'yes' : 'NO',
|
||||
});
|
||||
} catch (e) {
|
||||
console.log('[SAVE SIZE] could not measure:', e);
|
||||
}
|
||||
}
|
||||
saveData() {
|
||||
debugger;
|
||||
this.loadingPanelService.ShowLoadingPanel = true;
|
||||
this.bonusProcess.disburseDate = this.payDate;
|
||||
this.bonusProcess.isTaxProcess = this.isTaxProcess;
|
||||
|
|
@ -810,52 +488,8 @@ export class BonusProcessComponent implements OnInit {
|
|||
}
|
||||
);
|
||||
}
|
||||
|
||||
clearTax() {
|
||||
this.notificationService.showActiveConfirm('Confirmation', "Are you sure you want to clear the tax?").then((isConfirmed) => {
|
||||
if (isConfirmed)
|
||||
{
|
||||
this.clearTaxConfirmed();
|
||||
}
|
||||
});
|
||||
}
|
||||
clearTaxAndSave() {
|
||||
const bonusProcessID = this.bonusProcess?.id;
|
||||
if (bonusProcessID == undefined || bonusProcessID <= 0
|
||||
|| !(this.bonusProcess.bonusProcessDetails ?? []).some(x => x.bonusProcessDetailID)) {
|
||||
this.notificationService.showWarning('Please process the bonus first, then clear the tax.');
|
||||
return;
|
||||
}
|
||||
this.notificationService.showActiveConfirm('Confirmation', "Are you sure you want to clear the tax?").then((isConfirmed) => {
|
||||
if (isConfirmed)
|
||||
{
|
||||
this.clearTaxAndSaveConfirmed(bonusProcessID);
|
||||
}
|
||||
});
|
||||
}
|
||||
private clearTaxAndSaveConfirmed(bonusProcessID: number) {
|
||||
var rows: BonusProcessGridRow[];
|
||||
this.loadingPanelService.ShowLoadingPanel = true;
|
||||
this.bonusService.clearTaxAndSave(bonusProcessID).subscribe(
|
||||
(resp: BonusProcessGridRow[]) => {
|
||||
rows = resp;
|
||||
},
|
||||
(err: any) => {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
const message = this.errorText(err, 'Clear tax failed. Please check the connection and try again.');
|
||||
this.notificationService.showWarning(message);
|
||||
this.returnMessage = message;
|
||||
},
|
||||
() => {
|
||||
// the saved rows, read back from the database (new array, so the virtual grid re-reads it)
|
||||
this.bonusProcess.bonusProcessDetails = (rows ?? []).map(r => this.toGridDetail(r));
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
const message = 'Tax cleared and saved successfully';
|
||||
this.notificationService.showSuccess(message);
|
||||
this.returnMessage = message;
|
||||
});
|
||||
}
|
||||
// the old Clear Tax body, run only after the user confirmed
|
||||
private clearTaxConfirmed() {
|
||||
|
||||
this.loadingPanelService.ShowLoadingPanel = true;
|
||||
|
||||
|
|
@ -864,72 +498,28 @@ export class BonusProcessComponent implements OnInit {
|
|||
});
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
}
|
||||
|
||||
undo() {
|
||||
|
||||
}
|
||||
|
||||
uploadData() {
|
||||
|
||||
}
|
||||
|
||||
removefromList(rowIndex: number) {
|
||||
this.bonusProcess.bonusProcessDetails.splice(rowIndex, 1);
|
||||
// new array reference so the (virtual) grid re-reads it
|
||||
this.bonusProcess.bonusProcessDetails = [...this.bonusProcess.bonusProcessDetails];
|
||||
}
|
||||
// ---- Remove button: a row not saved yet is only taken off the grid (removefromList, as before); a saved
|
||||
// row (after Process / Upload) is deleted from the database at once (api/Bonus/removeRow). ----
|
||||
removeRow(dataItem: BonusProcessDetail, rowIndex: number) {
|
||||
if (!dataItem?.bonusProcessDetailID) {
|
||||
this.removefromList(rowIndex);
|
||||
return;
|
||||
}
|
||||
const who = (dataItem.employee?.employeeNo ? dataItem.employee.employeeNo + ' - ' : '') + (dataItem.employee?.name ?? '');
|
||||
this.notificationService.showActiveConfirm('Confirmation',
|
||||
'Are you sure you want to remove ' + who + '? The saved bonus of this employee will be deleted.').then((isConfirmed) => {
|
||||
if (isConfirmed)
|
||||
{
|
||||
this.removeRowConfirmed(dataItem);
|
||||
}
|
||||
});
|
||||
}
|
||||
private removeRowConfirmed(dataItem: BonusProcessDetail) {
|
||||
var result: BonusProcessRowRemoveResult;
|
||||
this.loadingPanelService.ShowLoadingPanel = true;
|
||||
this.bonusService.removeRow(dataItem.bonusProcessDetailID).subscribe(
|
||||
(resp: BonusProcessRowRemoveResult) => {
|
||||
result = resp;
|
||||
},
|
||||
(err: any) => {
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
const message = this.errorText(err, 'Remove failed. Please check the connection and try again.');
|
||||
this.notificationService.showWarning(message);
|
||||
this.returnMessage = message;
|
||||
},
|
||||
() => {
|
||||
// take that row off the grid (new array, so the virtual grid re-reads it)
|
||||
this.bonusProcess.bonusProcessDetails = this.bonusProcess.bonusProcessDetails
|
||||
.filter(x => x.bonusProcessDetailID !== dataItem.bonusProcessDetailID);
|
||||
// the already-processed list changed: read it again on the next employee selection
|
||||
this.bonusProcessDetails = undefined;
|
||||
let message = 'Employee removed successfully';
|
||||
if (result?.processDeleted) {
|
||||
// that was the last employee: the bonus process itself is gone
|
||||
this.bonusProcess.id = undefined;
|
||||
message = 'Last employee removed, so the bonus process was deleted too';
|
||||
}
|
||||
this.loadingPanelService.ShowLoadingPanel = false;
|
||||
this.notificationService.showSuccess(message);
|
||||
this.returnMessage = message;
|
||||
});
|
||||
}
|
||||
// Excel export: every row, not only the rows the virtual grid has on screen
|
||||
public allBonusRows = (): any => {
|
||||
const rows = this.bonusProcess?.bonusProcessDetails ?? [];
|
||||
return { data: rows, total: rows.length };
|
||||
};
|
||||
|
||||
removeHandler({dataItem}) {
|
||||
console.log(dataItem);
|
||||
}
|
||||
|
||||
editHandler({dataItem}) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
addHandler() {
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<app-loading-panel></app-loading-panel>
|
||||
<div class="col-12">
|
||||
<kendo-grid [data]="adparameters" class="grid-header-nowrap grid-cell-wrap"
|
||||
<kendo-grid [data]="adparameters"
|
||||
(add)="addHandler()"
|
||||
|
||||
(edit)="editHandler($event)">
|
||||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
<kendo-grid-column field="allowDeductName" title="Allowance/Deduction" width="20%">
|
||||
</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 field="periodicity" title="Periodicity" width="10%">
|
||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||
{{preodicityString(rowIndex)}}
|
||||
</ng-template>
|
||||
</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>
|
||||
{{dataItem.isTaxable ? 'Yes' : 'No'}}
|
||||
</ng-template>
|
||||
|
|
|
|||
|
|
@ -2,196 +2,8 @@ kendo-numerictextbox{
|
|||
width: 100%;
|
||||
}
|
||||
|
||||
/* .checkBoxGrid.grid {
|
||||
.checkBoxGrid.grid {
|
||||
justify-content: space-evenly;
|
||||
} */
|
||||
|
||||
/* ---- Layout only (alignment / spacing); no behaviour depends on these classes ---- */
|
||||
.adp-card {
|
||||
padding: 14px 16px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.adp-section-title {
|
||||
font-weight: 600;
|
||||
font-size: 13px;
|
||||
color: #495057;
|
||||
padding-bottom: 6px;
|
||||
margin-bottom: 10px;
|
||||
border-bottom: 1px solid #e9ecef;
|
||||
}
|
||||
|
||||
.adp-required {
|
||||
color: #dc3545;
|
||||
}
|
||||
|
||||
/* label + control on one line, labels the same width so the controls line up */
|
||||
.adp-field {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.adp-label {
|
||||
flex: 0 0 110px;
|
||||
margin: 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.adp-control {
|
||||
flex: 1 1 auto;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
/* every input on the page the same height, so the rows line up */
|
||||
.adp-page kendo-dropdownlist,
|
||||
.adp-page kendo-numerictextbox,
|
||||
.adp-page kendo-datepicker {
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
.adp-page kendo-dropdownlist.form-control {
|
||||
padding: 0;
|
||||
font-size: inherit;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
/* the four check boxes in two even columns, starting under the inputs (label width + gap) */
|
||||
.adp-checks {
|
||||
display: grid;
|
||||
/* two columns while they fit, one column when the section gets narrow */
|
||||
grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
|
||||
gap: 8px 12px;
|
||||
margin: 4px 0 0 120px;
|
||||
padding: 10px 12px;
|
||||
border: 1px solid #dee2e6;
|
||||
border-radius: 6px;
|
||||
background: #fafbfc;
|
||||
}
|
||||
|
||||
/* a long label wraps inside its own column instead of running out of the box */
|
||||
.adp-check {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 6px;
|
||||
margin: 0;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.adp-check input {
|
||||
flex: 0 0 auto;
|
||||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.adp-check .k-checkbox-label {
|
||||
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 */
|
||||
:host ::ng-deep .adp-card .tab-view-compat-panels {
|
||||
padding: 0 !important;
|
||||
}
|
||||
|
||||
.adp-detail-text {
|
||||
margin: 12px 0 8px;
|
||||
}
|
||||
|
||||
/* employee entry: label above each control, all on one row */
|
||||
.adp-entry-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: flex-start;
|
||||
gap: 12px 16px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.adp-entry-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
flex: 0 1 200px;
|
||||
min-width: 160px;
|
||||
}
|
||||
|
||||
.adp-entry-emp {
|
||||
flex-basis: 140px;
|
||||
min-width: 120px;
|
||||
}
|
||||
|
||||
/* the picker (icon + count) sits in a 32px box like the inputs */
|
||||
.adp-entry-emp app-employee-picker {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 32px;
|
||||
}
|
||||
|
||||
/* the picker sizes its search button and count as 15% of its box; on this page give them a fixed size
|
||||
(this page only — the picker component itself is unchanged) */
|
||||
/* direct path only, so the buttons inside the picker's pop-up dialog are not touched */
|
||||
:host ::ng-deep .adp-entry-emp app-employee-picker > div > div > div > button {
|
||||
width: 32px !important;
|
||||
max-width: none !important;
|
||||
height: 32px;
|
||||
flex: 0 0 32px;
|
||||
}
|
||||
|
||||
:host ::ng-deep .adp-entry-emp app-employee-picker > div > div > div > label {
|
||||
width: auto !important;
|
||||
max-width: none !important;
|
||||
margin: 0 0 0 8px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
:host ::ng-deep .adp-entry-emp app-employee-picker > div > div > div {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
/* every label the same height (the To Date one has a check box), so all inputs start on one line */
|
||||
.adp-entry-label {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
height: 22px;
|
||||
margin: 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.adp-entry-label .k-checkbox-label {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* Sum on the left, buttons on the right */
|
||||
.adp-action-bar {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 8px;
|
||||
padding: 8px 0;
|
||||
margin-bottom: 8px;
|
||||
border-top: 1px solid #e9ecef;
|
||||
}
|
||||
|
||||
/* virtual scrolling needs every row the same height ([rowHeight]="40"): 32px inputs + 4px padding */
|
||||
:host ::ng-deep .adp-emp-grid .k-grid-content td {
|
||||
height: 40px;
|
||||
padding-top: 4px;
|
||||
padding-bottom: 4px;
|
||||
}
|
||||
|
||||
.adp-sum {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.adp-actions {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 400px) {
|
||||
|
|
@ -205,11 +17,4 @@ kendo-numerictextbox{
|
|||
flex-flow: column wrap;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
.adp-checks {
|
||||
grid-template-columns: 1fr;
|
||||
margin-left: 0;
|
||||
}
|
||||
.adp-entry-item {
|
||||
flex: 1 1 100%;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
<app-loading-panel></app-loading-panel>
|
||||
<form [formGroup]="_fromValidator" class="adp-page">
|
||||
<!-- Setup: layout only was tidied; every control, binding and event is the same as before. -->
|
||||
<div class="card adp-card">
|
||||
<form [formGroup]="_fromValidator">
|
||||
<div class="card" style="padding: 1%">
|
||||
<div class="topGrid grid">
|
||||
<!-- General -->
|
||||
<div class="col-12 lg:col-5 adp-section">
|
||||
<div class="adp-section-title">General</div>
|
||||
<div class="adp-field">
|
||||
<label class="adp-label form-control-label" for="ddlAllowance">Allowance <span class="adp-required">*</span></label>
|
||||
<div class="adp-control">
|
||||
<div class="col-5">
|
||||
<div class="grid">
|
||||
<div class="col-4" style="margin: auto;">
|
||||
<label class="form-control-label" for="ddlAllowance">Allowance *</label>
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<kendo-dropdownlist
|
||||
style="width: 100%"
|
||||
class="form-control form-control-sm input-sm"
|
||||
|
|
@ -16,14 +15,14 @@
|
|||
[(ngModel)]="_adPram.allowDeductID"
|
||||
id="ddlAllowance"
|
||||
[data]="_allowDeducts"
|
||||
[defaultItem]="{
|
||||
name: 'Select Allowance',
|
||||
id: null
|
||||
}"
|
||||
[defaultItem]="{
|
||||
name: 'Select Allowance',
|
||||
id: null
|
||||
}"
|
||||
[textField]="'name'"
|
||||
(selectionChange)="
|
||||
AllowDeductselectionChange($event)
|
||||
"
|
||||
(selectionChange)="
|
||||
AllowDeductselectionChange($event)
|
||||
"
|
||||
[valueField]="'id'"
|
||||
[valuePrimitive]="true"
|
||||
required
|
||||
|
|
@ -31,18 +30,20 @@
|
|||
</kendo-dropdownlist>
|
||||
</div>
|
||||
</div>
|
||||
<div class="adp-field">
|
||||
<label class="adp-label" for="ddlPeriodicity">Periodicity <span class="adp-required">*</span></label>
|
||||
<div class="adp-control">
|
||||
<div class="grid">
|
||||
<div class="col-4" style="margin: auto;">
|
||||
<label for="ddlPeriodicity">Periodicity *</label>
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<kendo-dropdownlist
|
||||
class="form-control form-control-sm input-sm"
|
||||
style="width: 100%"
|
||||
id="ddlPeriodicity"
|
||||
[data]="_periodicity"
|
||||
[defaultItem]="{
|
||||
name: 'Select Periodicity',
|
||||
value: null
|
||||
}"
|
||||
[defaultItem]="{
|
||||
name: 'Select Periodicity',
|
||||
value: null
|
||||
}"
|
||||
[textField]="'name'"
|
||||
[valueField]="'value'"
|
||||
[valuePrimitive]="true"
|
||||
|
|
@ -53,18 +54,20 @@
|
|||
</kendo-dropdownlist>
|
||||
</div>
|
||||
</div>
|
||||
<div class="adp-field">
|
||||
<label class="adp-label" for="ddlGender">Gender</label>
|
||||
<div class="adp-control">
|
||||
<div class="grid">
|
||||
<div class="col-4" style="margin: auto;">
|
||||
<label for="ddlGender">Gender</label>
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<kendo-dropdownlist
|
||||
class="form-control form-control-sm input-sm"
|
||||
style="width: 100%"
|
||||
id="ddlGender"
|
||||
[data]="_gender"
|
||||
[defaultItem]="{
|
||||
name: 'Select Gender',
|
||||
value: null
|
||||
}"
|
||||
[defaultItem]="{
|
||||
name: 'Select Gender',
|
||||
value: null
|
||||
}"
|
||||
[textField]="'name'"
|
||||
[valueField]="'value'"
|
||||
[valuePrimitive]="true"
|
||||
|
|
@ -73,133 +76,145 @@
|
|||
</kendo-dropdownlist>
|
||||
</div>
|
||||
</div>
|
||||
<div class="checkBoxGrid adp-checks">
|
||||
<label class="k-form-field right adp-check">
|
||||
<input
|
||||
type="checkbox"
|
||||
formControlName="isForConfirmOnly"
|
||||
id="enableConfirmCheck"
|
||||
[(ngModel)]="_adPram.isForConfirmOnly"
|
||||
kendoCheckBox/>
|
||||
<label class="k-checkbox-label" for="enableConfirmCheck">Confirmation Required</label>
|
||||
</label>
|
||||
<label class="k-form-field right adp-check">
|
||||
<input
|
||||
type="checkbox"
|
||||
formControlName="isDependsOnAttendance"
|
||||
id="enableDepandentCheck"
|
||||
[(ngModel)]="_adPram.isDependsOnAttendance"
|
||||
kendoCheckBox/>
|
||||
<label class="k-checkbox-label" for="enableDepandentCheck">Is Dependence on Attendance</label>
|
||||
</label>
|
||||
<label class="k-form-field right adp-check">
|
||||
<input
|
||||
type="checkbox"
|
||||
formControlName="isFractionateApplicable"
|
||||
id="enableFractionateCheck"
|
||||
[(ngModel)]="_adPram.isFractionateApplicable"
|
||||
kendoCheckBox/>
|
||||
<label class="k-checkbox-label" for="enableFractionateCheck">Is fractionate Available</label>
|
||||
</label>
|
||||
<label class="k-form-field right adp-check">
|
||||
<input
|
||||
type="checkbox"
|
||||
formControlName="isTaxable"
|
||||
id="enabletaxableCheck"
|
||||
[(ngModel)]="_adPram.isTaxable"
|
||||
kendoCheckBox/>
|
||||
<label class="k-checkbox-label" for="enabletaxableCheck">Taxable</label>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Amount -->
|
||||
<div class="col-12 md:col-6 lg:col-3 adp-section">
|
||||
<div class="adp-section-title">Amount</div>
|
||||
<div class="adp-field">
|
||||
<label class="adp-label" for="txtFlatAmount">Flat Amount</label>
|
||||
<div class="adp-control">
|
||||
<kendo-numerictextbox
|
||||
[min]="-10000000"
|
||||
[max]="10000000"
|
||||
[(ngModel)]="_adPram.flatAmount"
|
||||
formControlName="flatAmount"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="adp-field">
|
||||
<label class="adp-label" for="txtBasic">% of Basic</label>
|
||||
<div class="adp-control">
|
||||
<kendo-numerictextbox
|
||||
[min]="-1000"
|
||||
[max]="1000"
|
||||
[(ngModel)]="_adPram.percentOfBasic"
|
||||
formControlName="percentOfBasic"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="adp-field">
|
||||
<label class="adp-label" for="txtGross">% of Gross</label>
|
||||
<div class="adp-control">
|
||||
<kendo-numerictextbox
|
||||
[min]="-1000"
|
||||
[max]="1000"
|
||||
[(ngModel)]="_adPram.percentOfGross"
|
||||
formControlName="percentOfGross"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="adp-field">
|
||||
<label class="adp-label" for="txtMininmum">Mininmum</label>
|
||||
<div class="adp-control">
|
||||
<kendo-numerictextbox
|
||||
[min]="-10000000"
|
||||
[max]="10000000"
|
||||
[(ngModel)]="_adPram.minAmount"
|
||||
formControlName="minAmount"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="adp-field">
|
||||
<label class="adp-label" for="txtMaximum">Maximum</label>
|
||||
<div class="adp-control">
|
||||
<kendo-numerictextbox
|
||||
[min]="-10000000"
|
||||
[max]="10000000"
|
||||
[(ngModel)]="_adPram.maxAmount"
|
||||
formControlName="maxAmount"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Grades -->
|
||||
<div class="col-12 md:col-6 lg:col-4 adp-section">
|
||||
<div class="adp-section-title">Grade <span class="adp-required">*</span></div>
|
||||
<kendo-grid
|
||||
[data]="_grades"
|
||||
height="220"
|
||||
[(selectedKeys)]="_selectedgrades"
|
||||
[kendoGridSelectBy]="'id'"
|
||||
>
|
||||
<kendo-grid-checkbox-column
|
||||
showSelectAll="true"
|
||||
[width]="50"
|
||||
[headerClass]="{ 'text-center': true }"
|
||||
[class]="{ 'text-center': true }"
|
||||
></kendo-grid-checkbox-column>
|
||||
<kendo-grid-column field="code" title="Code">
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="name" title="Description">
|
||||
</kendo-grid-column>
|
||||
</kendo-grid>
|
||||
</div>
|
||||
</div>
|
||||
<div class="checkBoxGrid" class="grid" style="margin-top: 0px;">
|
||||
<div class="col-6" style="margin: auto;">
|
||||
<label class="k-form-field right">
|
||||
<input
|
||||
type="checkbox"
|
||||
formControlName="isForConfirmOnly"
|
||||
id="enableConfirmCheck"
|
||||
[(ngModel)]="_adPram.isForConfirmOnly"
|
||||
kendoCheckBox/>
|
||||
<label class="k-checkbox-label" for="enableConfirmCheck">Confirmation Required</label>
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-6" style="margin: auto;">
|
||||
<label class="k-form-field right">
|
||||
<input
|
||||
type="checkbox"
|
||||
formControlName="isDependsOnAttendance"
|
||||
id="enableDepandentCheck"
|
||||
[(ngModel)]="_adPram.isDependsOnAttendance"
|
||||
kendoCheckBox/>
|
||||
<label class="k-checkbox-label" for="enableDepandentCheck">Is Dependence on Attendance</label>
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-6" style="margin: auto;">
|
||||
<label class="k-form-field right">
|
||||
<input
|
||||
type="checkbox"
|
||||
formControlName="isFractionateApplicable"
|
||||
id="enableFractionateCheck"
|
||||
[(ngModel)]="_adPram.isFractionateApplicable"
|
||||
kendoCheckBox/>
|
||||
<label class="k-checkbox-label" for="enableFractionateCheck">Is fractionate Available</label>
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-6" style="margin: auto;">
|
||||
<label class="k-form-field right">
|
||||
<input
|
||||
type="checkbox"
|
||||
formControlName="isTaxable"
|
||||
id="enabletaxableCheck"
|
||||
[(ngModel)]="_adPram.isTaxable"
|
||||
kendoCheckBox/>
|
||||
<label class="k-checkbox-label" for="enabletaxableCheck">Taxable</label>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<div class="grid">
|
||||
<div class="col-4" style="margin: auto;">
|
||||
<label for="txtFlatAmount">Flat Amount</label>
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<kendo-numerictextbox
|
||||
[min]="-10000000"
|
||||
[max]="10000000"
|
||||
[(ngModel)]="_adPram.flatAmount"
|
||||
formControlName="flatAmount"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid">
|
||||
<div class="col-4" style="margin: auto;">
|
||||
<label for="txtBasic">% of Basic</label>
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<kendo-numerictextbox
|
||||
[min]="-1000"
|
||||
[max]="1000"
|
||||
[(ngModel)]="_adPram.percentOfBasic"
|
||||
formControlName="percentOfBasic"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid">
|
||||
<div class="col-4" style="margin: auto;">
|
||||
<label for="txtGross">% of Gross</label>
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<kendo-numerictextbox
|
||||
[min]="-1000"
|
||||
[max]="1000"
|
||||
[(ngModel)]="_adPram.percentOfGross"
|
||||
formControlName="percentOfGross"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid">
|
||||
<div class="col-4" style="margin: auto;">
|
||||
<label for="txtMininmum" style="margin: auto;">Mininmum</label>
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<kendo-numerictextbox
|
||||
[min]="-10000000"
|
||||
[max]="10000000"
|
||||
[(ngModel)]="_adPram.minAmount"
|
||||
formControlName="minAmount"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid">
|
||||
<div class="col-4" style="margin: auto;">
|
||||
<label for="txtMaximum" style="margin: auto;">Maximum</label>
|
||||
</div>
|
||||
<div class="col-8">
|
||||
<kendo-numerictextbox
|
||||
[min]="-10000000"
|
||||
[max]="10000000"
|
||||
[(ngModel)]="_adPram.maxAmount"
|
||||
formControlName="maxAmount"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<kendo-grid
|
||||
[data]="_grades"
|
||||
height="180"
|
||||
[(selectedKeys)]="_selectedgrades"
|
||||
[kendoGridSelectBy]="'id'"
|
||||
>
|
||||
<kendo-grid-checkbox-column
|
||||
showSelectAll="true"
|
||||
[width]="50"
|
||||
[headerClass]="{ 'text-center': true }"
|
||||
[class]="{ 'text-center': true }"
|
||||
></kendo-grid-checkbox-column>
|
||||
<kendo-grid-column field="code" title="Code">
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="name" title="Description">
|
||||
</kendo-grid-column>
|
||||
</kendo-grid>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <hr>
|
||||
<div class="checkBoxGrid grid">
|
||||
|
|
@ -263,7 +278,7 @@
|
|||
</label>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="card" style="padding: 1%;">
|
||||
<div class="middleGrid grid">
|
||||
<div class="col-6">
|
||||
|
|
@ -340,187 +355,203 @@
|
|||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="card" style="padding: 1%">
|
||||
<div class="grid">
|
||||
<div class="col-12">
|
||||
<app-tab-view (onChange)="IndividualChecked($event)">
|
||||
@if (_selectedPeriodicity == 1) {
|
||||
<app-tab-panel
|
||||
header="Exception ( {{
|
||||
this._adPram.exception?.length
|
||||
}} )"
|
||||
leftIcon="pi pi-user"
|
||||
>
|
||||
</app-tab-panel>
|
||||
}
|
||||
@if (_selectedPeriodicity == 1) {
|
||||
<app-tab-panel
|
||||
header="Not Applicable ( {{
|
||||
this._adPram.notApplicable?.length
|
||||
}} )"
|
||||
leftIcon="pi pi-user"
|
||||
>
|
||||
</app-tab-panel>
|
||||
}
|
||||
@if (_selectedPeriodicity != 1) {
|
||||
<app-tab-panel
|
||||
header="Individual ( {{
|
||||
this._adPram.adParameterEmployees?.length
|
||||
}} )"
|
||||
leftIcon="pi pi-user"
|
||||
>
|
||||
</app-tab-panel>
|
||||
}
|
||||
</app-tab-view>
|
||||
<div class="grid">
|
||||
<div class="col-12">
|
||||
<b> {{ _detailLevelText }}</b>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Employees -->
|
||||
<div class="card adp-card">
|
||||
<app-tab-view (onChange)="IndividualChecked($event)">
|
||||
@if (_selectedPeriodicity == 1) {
|
||||
<app-tab-panel
|
||||
header="Exception ( {{
|
||||
this._adPram.exception?.length
|
||||
}} )"
|
||||
leftIcon="pi pi-user"
|
||||
>
|
||||
</app-tab-panel>
|
||||
}
|
||||
@if (_selectedPeriodicity == 1) {
|
||||
<app-tab-panel
|
||||
header="Not Applicable ( {{
|
||||
this._adPram.notApplicable?.length
|
||||
}} )"
|
||||
leftIcon="pi pi-user"
|
||||
>
|
||||
</app-tab-panel>
|
||||
}
|
||||
@if (_selectedPeriodicity != 1) {
|
||||
<app-tab-panel
|
||||
header="Individual ( {{
|
||||
this._adPram.adParameterEmployees?.length
|
||||
}} )"
|
||||
leftIcon="pi pi-user"
|
||||
>
|
||||
</app-tab-panel>
|
||||
}
|
||||
</app-tab-view>
|
||||
<div class="grid" style="margin-top: 5px;">
|
||||
<div class="col-2">
|
||||
<div class="grid">
|
||||
<div class="col-5" style="margin: auto;">
|
||||
<label for="txtEmp"> Select Emp</label>
|
||||
</div>
|
||||
<div class="col-7" align="left">
|
||||
<app-employee-picker [MultiSelect]="true"
|
||||
[fixedGrades]="_selectedgrades"
|
||||
(ItemSelected)="GetSelectedEmployee($event)"
|
||||
style="width: 80%;"></app-employee-picker>
|
||||
<!-- <app-employee-picker for="chkIsnew" id="idself" [isActive]="!newEmployee" [setSelectedEmp]="selectedEmployee"
|
||||
(ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@if (!_ischecknotapplicable) {
|
||||
<div class="col-10">
|
||||
<div class="grid">
|
||||
<div class="col-1" style="margin: auto;" align="right">
|
||||
<label for="txtEmp">Amount</label>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<kendo-numerictextbox
|
||||
[min]="-10000000"
|
||||
[max]="10000000"
|
||||
[(ngModel)]="_individualAmount"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
@if (!_ischeckException) {
|
||||
<div class="col-1" style="margin: auto;" align="right">
|
||||
<label for="dtpFromDate">From Date</label>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<kendo-datepicker
|
||||
id="dtpFromDate"
|
||||
[format]="'dd-MMM-yyyy'"
|
||||
[readonly]="this._adPram.periodicity == 2"
|
||||
[(ngModel)]="_individualFromDate"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
style="width: 100%"
|
||||
></kendo-datepicker>
|
||||
</div>
|
||||
<div class="col-1" style="margin: auto;" align="right">
|
||||
<label class="k-form-field right">
|
||||
<input
|
||||
type="checkbox"
|
||||
[(ngModel)]="_checkedToDate"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
[disabled]="this._adPram.periodicity == 2"
|
||||
(click)="todateclicked()" kendoCheckBox/>
|
||||
<label
|
||||
class="k-checkbox-label"
|
||||
for="isIndividualEmployee"
|
||||
>
|
||||
To Date
|
||||
</label>
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<kendo-datepicker
|
||||
id="dtpToDate"
|
||||
[format]="'dd-MMM-yyyy'"
|
||||
[(ngModel)]="_individualToDate"
|
||||
[readonly]="
|
||||
this._adPram.periodicity == 2 ||
|
||||
_checkedToDate == false
|
||||
"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
style="width: 100%"
|
||||
></kendo-datepicker>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
<div class="grid">
|
||||
<div class="col-2" style="font-weight: bold;">
|
||||
Sum: {{get2FloatingPoint(sumofIndividualAmount())}}
|
||||
</div>
|
||||
<div class="col-10" align="right">
|
||||
<button kendoButton
|
||||
[svgIcon]="apiService.KendoSVGIcon['plus']"
|
||||
class="k-button k-primary"
|
||||
(click)="AddEmployee()">
|
||||
Add
|
||||
</button>
|
||||
<button kendoButton style="margin-left:3px" [svgIcon]="apiService.KendoSVGIcon['delete']" class="kt-delete" (click)="RemoveAll()">Remove All</button>
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['save']" themeColor="primary" style="margin-left:3px" (click)="Save()" >Save</button>
|
||||
|
||||
<div class="adp-detail-text">
|
||||
<b> {{ _detailLevelText }}</b>
|
||||
</div>
|
||||
|
||||
<div class="adp-entry-row">
|
||||
<div class="adp-entry-item adp-entry-emp">
|
||||
<label class="adp-entry-label" for="txtEmp">Select Emp</label>
|
||||
<app-employee-picker [MultiSelect]="true"
|
||||
[fixedGrades]="_selectedgrades"
|
||||
(ItemSelected)="GetSelectedEmployee($event)"
|
||||
></app-employee-picker>
|
||||
<!-- <app-employee-picker for="chkIsnew" id="idself" [isActive]="!newEmployee" [setSelectedEmp]="selectedEmployee"
|
||||
(ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker> -->
|
||||
</div>
|
||||
@if (!_ischecknotapplicable) {
|
||||
<div class="adp-entry-item">
|
||||
<label class="adp-entry-label" for="txtEmp">Amount</label>
|
||||
<kendo-numerictextbox
|
||||
[min]="-10000000"
|
||||
[max]="10000000"
|
||||
[(ngModel)]="_individualAmount"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
>
|
||||
</kendo-numerictextbox>
|
||||
</div>
|
||||
@if (!_ischeckException) {
|
||||
<div class="adp-entry-item">
|
||||
<label class="adp-entry-label" for="dtpFromDate">From Date</label>
|
||||
<kendo-datepicker
|
||||
id="dtpFromDate"
|
||||
[format]="'dd-MMM-yyyy'"
|
||||
[readonly]="this._adPram.periodicity == 2"
|
||||
[(ngModel)]="_individualFromDate"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
style="width: 100%"
|
||||
></kendo-datepicker>
|
||||
</div>
|
||||
<div class="adp-entry-item">
|
||||
<label class="k-form-field right adp-entry-label">
|
||||
<input
|
||||
type="checkbox"
|
||||
[(ngModel)]="_checkedToDate"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
[disabled]="this._adPram.periodicity == 2"
|
||||
(click)="todateclicked()" kendoCheckBox/>
|
||||
<label
|
||||
class="k-checkbox-label"
|
||||
for="isIndividualEmployee"
|
||||
>
|
||||
To Date
|
||||
</label>
|
||||
</label>
|
||||
<kendo-datepicker
|
||||
id="dtpToDate"
|
||||
[format]="'dd-MMM-yyyy'"
|
||||
[(ngModel)]="_individualToDate"
|
||||
[readonly]="
|
||||
this._adPram.periodicity == 2 ||
|
||||
_checkedToDate == false
|
||||
"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
style="width: 100%"
|
||||
></kendo-datepicker>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="adp-action-bar">
|
||||
<div class="adp-sum">
|
||||
Sum: {{get2FloatingPoint(sumofIndividualAmount())}}
|
||||
</div>
|
||||
<div class="adp-actions">
|
||||
<button kendoButton
|
||||
[svgIcon]="apiService.KendoSVGIcon['plus']"
|
||||
class="k-button k-primary"
|
||||
(click)="AddEmployee()">
|
||||
Add
|
||||
</button>
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['delete']" class="kt-delete" (click)="RemoveAll()">Remove All</button>
|
||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['save']" themeColor="primary" (click)="Save()" >Save</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <kendo-grid [data]="_individualEmplyees"
|
||||
height="300"
|
||||
(remove)="removeHandler($event)"> -->
|
||||
<!-- virtual scrolling: only the rows on screen are built (empGridView = a window of _individualEmplyees) -->
|
||||
<kendo-grid [data]="empGridView"
|
||||
class="adp-emp-grid"
|
||||
[height]="360"
|
||||
scrollable="virtual"
|
||||
[rowHeight]="40"
|
||||
[skip]="empGridSkip"
|
||||
[pageSize]="empGridPageSize"
|
||||
(pageChange)="onEmpGridPageChange($event)"
|
||||
(remove)="removeHandler($event)">
|
||||
<kendo-grid-column field="employeeNo" title="Emp ID">
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="employeeName" title="Name">
|
||||
</kendo-grid-column>
|
||||
@if (_ischeckappliedtoInvididual) {
|
||||
<kendo-grid-column field="formDate" title="From Month">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
<kendo-datepicker id="idformDate"
|
||||
[(ngModel)]="dataItem.formDate"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
[format]="'dd MMM yyyy'"
|
||||
name="formDate">
|
||||
</kendo-datepicker>
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="tillDate"
|
||||
title="Till Month">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
<kendo-datepicker id="idtilldate"
|
||||
[(ngModel)]="dataItem.tillDate"
|
||||
[format]="'dd MMM yyyy'"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
name="tillstartDate">
|
||||
</kendo-datepicker>
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
}
|
||||
@if (!_ischecknotapplicable) {
|
||||
<kendo-grid-command-column title="Amount">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
<kendo-numerictextbox [(ngModel)]="dataItem.monthlyAmount"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
[autoCorrect]="true"
|
||||
[spinners]="false">
|
||||
</kendo-numerictextbox>
|
||||
</ng-template>
|
||||
</kendo-grid-command-column>
|
||||
}
|
||||
<kendo-grid-column field="approvalStatus"
|
||||
title="Approval Status">
|
||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||
{{ statusString(dataItem.approvalStatus)}}
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-command-column title="Action" width="120">
|
||||
<ng-template kendoGridCellTemplate
|
||||
let-dataItem
|
||||
let-rowIndex="rowIndex">
|
||||
<button kendoGridRemoveCommand [svgIcon]="apiService.KendoSVGIcon['delete']" class="kt-delete"></button>
|
||||
</ng-template>
|
||||
</kendo-grid-command-column>
|
||||
</kendo-grid>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid">
|
||||
<div class="col-12">
|
||||
<kendo-grid [data]="_individualEmplyees"
|
||||
height="300"
|
||||
(remove)="removeHandler($event)">
|
||||
<kendo-grid-column field="employeeNo" title="Emp ID">
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="employeeName" title="Name">
|
||||
</kendo-grid-column>
|
||||
@if (_ischeckappliedtoInvididual) {
|
||||
<kendo-grid-column field="formDate" title="From Month">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
<kendo-datepicker id="idformDate"
|
||||
[(ngModel)]="dataItem.formDate"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
[format]="'dd MMM yyyy'"
|
||||
name="formDate">
|
||||
</kendo-datepicker>
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-column field="tillDate"
|
||||
title="Till Month">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
<kendo-datepicker id="idtilldate"
|
||||
[(ngModel)]="dataItem.tillDate"
|
||||
[format]="'dd MMM yyyy'"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
name="tillstartDate">
|
||||
</kendo-datepicker>
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
}
|
||||
@if (!_ischecknotapplicable) {
|
||||
<kendo-grid-command-column title="Amount">
|
||||
<ng-template kendoGridCellTemplate let-dataItem>
|
||||
<kendo-numerictextbox [(ngModel)]="dataItem.monthlyAmount"
|
||||
[ngModelOptions]="{ standalone: true }"
|
||||
[autoCorrect]="true"
|
||||
[spinners]="false">
|
||||
</kendo-numerictextbox>
|
||||
</ng-template>
|
||||
</kendo-grid-command-column>
|
||||
}
|
||||
<kendo-grid-column field="approvalStatus"
|
||||
title="Approval Status">
|
||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||
{{ statusString(dataItem.approvalStatus)}}
|
||||
</ng-template>
|
||||
</kendo-grid-column>
|
||||
<kendo-grid-command-column title="Action" width="220">
|
||||
<ng-template kendoGridCellTemplate
|
||||
let-dataItem
|
||||
let-rowIndex="rowIndex">
|
||||
<button kendoGridRemoveCommand [svgIcon]="apiService.KendoSVGIcon['delete']" class="kt-delete"></button>
|
||||
</ng-template>
|
||||
</kendo-grid-command-column>
|
||||
</kendo-grid>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid">
|
||||
<div class="col-12" align="right">
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import {Component, OnInit, ChangeDetectionStrategy, DoCheck} from '@angular/core';
|
||||
import { GridDataResult, PageChangeEvent } from '@progress/kendo-angular-grid';
|
||||
import {Component, OnInit, ChangeDetectionStrategy} from '@angular/core';
|
||||
import {FormGroup, FormControl, FormBuilder, Validators} from '@angular/forms';
|
||||
import {SearchEmployee} from '../../../../_models/Employee/searchEmployee';
|
||||
import {AdparameterService} from '../../../../_services/payroll/adparameter.service';
|
||||
|
|
@ -35,7 +34,7 @@ import { EmployeePickerComponent } from 'src/app/picker/employee-picker.componen
|
|||
standalone: false,
|
||||
})
|
||||
|
||||
export class AllowanceDeductionParameterizationEntryComponent implements OnInit, DoCheck {
|
||||
export class AllowanceDeductionParameterizationEntryComponent implements OnInit {
|
||||
_adPram: ADParameter;
|
||||
_allowDeducts: AllowanceDeduction[];
|
||||
_grades: Grade[];
|
||||
|
|
@ -263,16 +262,10 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit,
|
|||
}
|
||||
|
||||
RemoveAll() {
|
||||
// if (!confirm("Are you sure to delete all employees allowance entry")) {
|
||||
// return;
|
||||
// }
|
||||
// this._individualEmplyees.splice(0, this._individualEmplyees.length);
|
||||
this.notificationService.showActiveConfirm('Confirmation', "Are you sure to delete all employees allowance entry?").then((isConfirmed) => {
|
||||
if (isConfirmed)
|
||||
{
|
||||
this._individualEmplyees.splice(0, this._individualEmplyees.length);
|
||||
}
|
||||
});
|
||||
if (!confirm("Are you sure to delete all employees allowance entry")) {
|
||||
return;
|
||||
}
|
||||
this._individualEmplyees.splice(0, this._individualEmplyees.length);
|
||||
|
||||
}
|
||||
AddEmployee() {
|
||||
|
|
@ -284,6 +277,7 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit,
|
|||
this.notificationService.showWarning("Please enter an Amount");
|
||||
return;
|
||||
}
|
||||
|
||||
if (this._selectedEmps == undefined) return;
|
||||
this._selectedEmps.forEach(x => {
|
||||
let newItem: ADParameterEmployee = this._individualEmplyees.find(e => e.employeeID == x.employeeID);
|
||||
|
|
@ -307,14 +301,19 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit,
|
|||
newItem.tillDate = this._individualToDate;
|
||||
newItem.monthlyAmount = this._individualAmount;
|
||||
newItem.adEmpType = this._adEmpType;
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
public GetSelectedEmployee(searchEmp: SearchEmployee[]) {
|
||||
|
||||
if (searchEmp != null) {
|
||||
this._selectedEmps = [];
|
||||
searchEmp.forEach(x => { this._selectedEmps.push(x); });
|
||||
searchEmp.forEach(x => {
|
||||
this._selectedEmps.push(x);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
PrepareGradeData(usedGrades: ADParameterGrade[]) {
|
||||
|
|
@ -364,6 +363,7 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit,
|
|||
}
|
||||
|
||||
public Save() {
|
||||
debugger;
|
||||
if (this._fromValidator.invalid) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -389,6 +389,7 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit,
|
|||
}
|
||||
if (this._adPram.adParameterEmployees.length > 0) {
|
||||
this._adPram.adParameterEmployees.forEach(x => {
|
||||
debugger;
|
||||
let adParamEmpItem: ADParameterEmployee = this.prADParameterEmployees.find(y => y.id === x.id);
|
||||
let oPayrollType: PayrollType = new PayrollType();
|
||||
if (adParamEmpItem) {
|
||||
|
|
@ -401,6 +402,8 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit,
|
|||
x.oldTillDate = adParamEmpItem.tillDate;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
debugger;
|
||||
|
|
@ -448,49 +451,6 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit,
|
|||
return parseFloat((value).toFixed(2));
|
||||
}
|
||||
|
||||
//#region Employee grid: virtual scrolling (display only)
|
||||
// The employee grid shows only the rows on screen (a window of empGridPageSize rows), so 12k-20k
|
||||
// employees load at once. _individualEmplyees stays the one full list that every existing function
|
||||
// (Add, Remove, Remove All, Sum, Save, tabs) works on; each window holds the same row objects, so an
|
||||
// amount or date typed in the grid lands in that list exactly as before.
|
||||
empGridView: GridDataResult = { data: [], total: 0 };
|
||||
empGridSkip = 0;
|
||||
empGridPageSize = 50;
|
||||
private empGridSource: ADParameterEmployee[];
|
||||
private empGridLength = -1;
|
||||
|
||||
/** Rebuilds the window when the list is replaced (tab change, load) or grows / shrinks (Add, Remove, Remove All). */
|
||||
ngDoCheck(): void {
|
||||
const list = this._individualEmplyees;
|
||||
const length = list ? list.length : 0;
|
||||
if (list !== this.empGridSource || length !== this.empGridLength) {
|
||||
if (list !== this.empGridSource) {
|
||||
this.empGridSkip = 0; // another list (tab): start from the top
|
||||
}
|
||||
this.empGridSource = list;
|
||||
this.empGridLength = length;
|
||||
this.loadEmpGridView();
|
||||
}
|
||||
}
|
||||
|
||||
/** The grid scrolled: show the rows of the new window. */
|
||||
onEmpGridPageChange(event: PageChangeEvent): void {
|
||||
this.empGridSkip = event.skip;
|
||||
this.loadEmpGridView();
|
||||
}
|
||||
|
||||
private loadEmpGridView(): void {
|
||||
const list = this._individualEmplyees || [];
|
||||
if (this.empGridSkip >= list.length) { // rows were removed below the current window
|
||||
this.empGridSkip = Math.max(0, list.length - this.empGridPageSize);
|
||||
}
|
||||
this.empGridView = {
|
||||
data: list.slice(this.empGridSkip, this.empGridSkip + this.empGridPageSize),
|
||||
total: list.length
|
||||
};
|
||||
}
|
||||
//#endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@
|
|||
<div class="grid">
|
||||
<div class="col-12">
|
||||
<kendo-grid [data]="gridView" (pageChange)="onDataChange($event)" [pageSize]="pageSize"
|
||||
[pageable]="false" scrollable="virtual" [skip]="skip" [rowHeight]="36"
|
||||
[pageable]="true" scrollable="virtual" [skip]="skip" [rowHeight]="36"
|
||||
[(selectedKeys)]="selectedItems" [state]="selectAllState" [style.height.px]="gridHeight"
|
||||
(selectedKeysChange)="onSelectedKeysChange($event)" [selectable]="selectableSettings"
|
||||
[kendoGridSelectBy]="'employeeID'">
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ export class DiscontinueEmployeeDetailsComponent implements OnInit {
|
|||
this.notificationService.showWarning('From Date cannot be after To Date.', 'Warning');
|
||||
return;
|
||||
}
|
||||
// debugger;
|
||||
debugger;
|
||||
this.grid.load({ fromDate: this.fromDate, toDate: this.toDate });
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,18 +9,6 @@
|
|||
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
|
||||
// so it doesn't change the app-wide default .k-grid-header color set in styles.scss.
|
||||
.dashboard-card .k-grid-header {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"version": "20261118-02",
|
||||
"buildTime": "2026-11-18T08:51:48.7258631Z"
|
||||
"version": "20261108-01",
|
||||
"buildTime": "2026-11-08T05:31:24.9714459Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ namespace HRM.UI.Configuration.DI
|
|||
services.AddTransient<IUserService, UserService>();
|
||||
services.AddTransient<IUserLogInInfoService, UserLogInInfoService>();
|
||||
services.AddTransient<IBadLoginAttemptInfoService, BadLoginAttemptInfoService>();
|
||||
services.AddTransient<ISystemAuditHistoryService, SystemAuditHistoryService>();
|
||||
services.AddTransient<IPasswordHistoryService, PasswordHistoryService>();
|
||||
services.AddTransient<ISearchEmployeeService, SearchEmployeeService>();
|
||||
services.AddTransient<IHREmployeeService, HREmployeeService>();
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ namespace HRM.UI.Controllers
|
|||
private readonly IMemoryCache _cache;
|
||||
private readonly IUserLogInInfoService _userLogInInfoService;
|
||||
private readonly IBadLoginAttemptInfoService _badLoginAttemptInfoService;
|
||||
private readonly ISystemAuditHistoryService _systemAuditHistoryService;
|
||||
|
||||
public AuthController(IConfiguration config,
|
||||
IUserService userService,
|
||||
|
|
@ -74,8 +73,7 @@ namespace HRM.UI.Controllers
|
|||
ISmsService smsService,
|
||||
IMemoryCache cache,
|
||||
IUserLogInInfoService userLogInInfoService,
|
||||
IBadLoginAttemptInfoService badLoginAttemptInfoService,
|
||||
ISystemAuditHistoryService systemAuditHistoryService)
|
||||
IBadLoginAttemptInfoService badLoginAttemptInfoService)
|
||||
{
|
||||
_config = config;
|
||||
_jwt = jwtOptions.Value;
|
||||
|
|
@ -96,7 +94,6 @@ namespace HRM.UI.Controllers
|
|||
_cache = cache;
|
||||
_userLogInInfoService = userLogInInfoService;
|
||||
_badLoginAttemptInfoService = badLoginAttemptInfoService;
|
||||
_systemAuditHistoryService = systemAuditHistoryService;
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
|
|
@ -297,14 +294,6 @@ namespace HRM.UI.Controllers
|
|||
if (userForLoginDto.IsSSO)
|
||||
{
|
||||
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)
|
||||
{
|
||||
List<PayrollType> payrollTypes = new List<PayrollType>();
|
||||
|
|
@ -435,12 +424,6 @@ namespace HRM.UI.Controllers
|
|||
{
|
||||
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)
|
||||
{
|
||||
DateTime eocd= _userService.GetEndofContractDate(userForLoginDto.Username);
|
||||
|
|
@ -756,26 +739,6 @@ namespace HRM.UI.Controllers
|
|||
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
|
||||
// session really ends on logout. Anonymous so an invalid/expired cookie can still be removed.
|
||||
[HttpPost("logOut")]
|
||||
|
|
@ -864,11 +827,6 @@ namespace HRM.UI.Controllers
|
|||
{
|
||||
PayrollType optype = new PayrollTypeService().Get(payrollTypeId);
|
||||
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);
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
@ -939,21 +897,6 @@ namespace HRM.UI.Controllers
|
|||
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
|
||||
if (guser != null)
|
||||
{
|
||||
|
|
@ -1300,72 +1243,30 @@ namespace HRM.UI.Controllers
|
|||
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
|
||||
{
|
||||
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)
|
||||
{
|
||||
role.CreatedBy = currentUser.UserID;
|
||||
role.CreatedDate = DateTime.Now;
|
||||
role.RoleStatus = EnumAuthStatus.NewNotYetApprove;
|
||||
}
|
||||
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.ApproveBy = null;
|
||||
if (role.RoleStatus == EnumAuthStatus.Approved)
|
||||
{
|
||||
role.ModifiedBy = existingRole.ModifiedBy;
|
||||
role.ModifiedDate = existingRole.ModifiedDate;
|
||||
}
|
||||
else
|
||||
{
|
||||
role.ModifiedBy = currentUser.UserID;
|
||||
role.ModifiedDate = DateTime.Now;
|
||||
}
|
||||
}
|
||||
if (role.RoleStatus == EnumAuthStatus.Approved)
|
||||
{
|
||||
role.ApproveDate = DateTime.Today;
|
||||
role.ApproveBy = currentUser.UserID;
|
||||
}
|
||||
id = this._roleService.Save(role);
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
@ -1375,43 +1276,6 @@ namespace HRM.UI.Controllers
|
|||
|
||||
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")]
|
||||
public ActionResult GetEmpUserRole(List<SearchEmployee> searchEmps)
|
||||
|
|
@ -1420,12 +1284,6 @@ namespace HRM.UI.Controllers
|
|||
|
||||
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);
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
@ -1444,12 +1302,6 @@ namespace HRM.UI.Controllers
|
|||
int? nroleid = GlobalFunctions.GetApiDefaultIntData(roleid);
|
||||
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);
|
||||
|
||||
// employee Name, Login-Status, status1, statu2, statu3
|
||||
|
|
@ -1559,291 +1411,6 @@ namespace HRM.UI.Controllers
|
|||
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);
|
||||
}
|
||||
|
||||
// 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 (!CanManageUserRole(currentUser))
|
||||
{
|
||||
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);
|
||||
if (!CanManageUserRole(currentUser))
|
||||
{
|
||||
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, currentUser.UserID);
|
||||
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}")]
|
||||
public ActionResult GetUserAccessType(int userid)
|
||||
{
|
||||
|
|
@ -1860,65 +1427,20 @@ namespace HRM.UI.Controllers
|
|||
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")]
|
||||
public ActionResult SaveUserAccessType(List<UserAccessType> userAccessTypes)
|
||||
{
|
||||
try
|
||||
{
|
||||
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.");
|
||||
}
|
||||
if (userAccessTypes == null || userAccessTypes.Count == 0)
|
||||
{
|
||||
return BadRequest("Select at least one payroll type.");
|
||||
}
|
||||
|
||||
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.");
|
||||
}
|
||||
x.CreatedBy = currentUser.UserID;
|
||||
x.CreatedDate = DateTime.Today;
|
||||
x.ApprovedBy = currentUser.UserID;
|
||||
x.ApprovedDate = DateTime.Today;
|
||||
});
|
||||
this._userAccessTypeService.Save(userAccessTypes);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
@ -1928,156 +1450,6 @@ namespace HRM.UI.Controllers
|
|||
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
|
||||
//[HttpGet]
|
||||
//[Route("getPasswordHistoryList")]
|
||||
|
|
@ -2460,38 +1832,6 @@ namespace HRM.UI.Controllers
|
|||
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
|
||||
|
||||
[HttpGet]
|
||||
|
|
|
|||
|
|
@ -24,21 +24,18 @@ namespace HRM.UI.Controllers.Payroll
|
|||
private readonly ISalaryMasterBulkUploadService _salaryMasterBulkUploadService;
|
||||
private readonly IEmployeePhotoBulkUploadService _employeePhotoBulkUploadService;
|
||||
private readonly ICacheManager _cashManager;
|
||||
private readonly IBonusProcessService _bonusProcessService;
|
||||
|
||||
public DataUploadController(IDataUploadColumnDefinition columnDefination,
|
||||
IEmployeeBulkUploadService employeeBulkUploadService,
|
||||
ISalaryMasterBulkUploadService salaryMasterBulkUploadService,
|
||||
IEmployeePhotoBulkUploadService employeePhotoBulkUploadService,
|
||||
ICacheManager cashManager,
|
||||
IBonusProcessService bonusProcessService)
|
||||
ICacheManager cashManager)
|
||||
{
|
||||
this._columnDefination = columnDefination;
|
||||
this._employeeBulkUploadService = employeeBulkUploadService;
|
||||
this._salaryMasterBulkUploadService = salaryMasterBulkUploadService;
|
||||
this._employeePhotoBulkUploadService = employeePhotoBulkUploadService;
|
||||
this._cashManager = cashManager;
|
||||
this._bonusProcessService = bonusProcessService;
|
||||
}
|
||||
|
||||
// loan
|
||||
|
|
@ -159,53 +156,6 @@ namespace HRM.UI.Controllers.Payroll
|
|||
return Ok(items);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Bonus Process screen, "Upload Data": reads the bonus file (sheet EmpBonus: Employee No, Amount — the
|
||||
/// same reader as uploadBonusFile) and saves it in the same request, with the tax when the header asks
|
||||
/// for it (BonusProcessService.UploadAndSave). Form fields: excelfile, and header = the JSON of a
|
||||
/// BonusProcessAndSaveRequest (bonus, dates, flags). Returns the saved rows.
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
[Route("uploadBonusFileAndSave")]
|
||||
public ActionResult uploadBonusFileAndSave()
|
||||
{
|
||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||
BonusProcessAndSaveResult result = null;
|
||||
try
|
||||
{
|
||||
int payrolltypeid = (int)currentUser.PayrollTypeID;
|
||||
string headerJson = Convert.ToString(Request.Form["header"]);
|
||||
if (string.IsNullOrWhiteSpace(headerJson))
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, "Bonus information not found.");
|
||||
// same JSON reading as the Process button's request (Newtonsoft defaults), so dates arrive the same way
|
||||
BonusProcessAndSaveRequest request = JsonConvert.DeserializeObject<BonusProcessAndSaveRequest>(headerJson);
|
||||
|
||||
IFormFile formFile = Request.Form.Files.FirstOrDefault();
|
||||
if (formFile == null || formFile.Length == 0)
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, "Please select a file.");
|
||||
string extension = Path.GetExtension(formFile.FileName ?? string.Empty).ToLowerInvariant();
|
||||
if (extension != ".xlsx" && extension != ".xls")
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, "Please select an Excel file (.xlsx or .xls).");
|
||||
|
||||
DataUploadColumnDefinition oColumnDefination = this._columnDefination.GetColumnDefinition(
|
||||
(int)EnumRegularDataUpload.Bonus, null, payrolltypeid);
|
||||
List<BonusProcess.BonusProcessDetail> items;
|
||||
using (Stream stream = formFile.OpenReadStream())
|
||||
{
|
||||
items = new RegularDataUploadService().GetBonusData((int)EnumRegularDataUpload.Bonus, oColumnDefination,
|
||||
stream, payrolltypeid);
|
||||
}
|
||||
|
||||
result = _bonusProcessService.UploadAndSave(items, request, payrolltypeid, currentUser.UserID);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, ex.Message);
|
||||
}
|
||||
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The Employee Bulk Upload layout — groups, sub-groups and columns — that the page shows
|
||||
/// as section checkboxes and in its template guide.
|
||||
|
|
|
|||
|
|
@ -2313,27 +2313,6 @@ namespace HRM.UI.Controllers
|
|||
|
||||
return Ok(employeeList);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A light Employee (EmployeeLite) for each posted employee ID (body: [1, 2, 3]).
|
||||
/// For screens that pick 10k+ employees and need only a few fields (Bonus Process);
|
||||
/// getEmployeesByEmpIDs returns the whole Employee row and is too heavy for that.
|
||||
/// </summary>
|
||||
[HttpPost("getEmployeeLiteByEmpIDs")]
|
||||
public ActionResult GetEmployeeLiteByEmpIDs([FromBody] List<int> empIds)
|
||||
{
|
||||
List<EmployeeLite> items = new List<EmployeeLite>();
|
||||
try
|
||||
{
|
||||
items = _EmployeeService.GetLiteByEmpIDs(empIds);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, ex.Message);
|
||||
}
|
||||
|
||||
return Ok(items);
|
||||
}
|
||||
[HttpPost("updateBanglaInformation")]
|
||||
public ActionResult updateBanglaInformation(dynamic data)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -239,105 +239,6 @@ namespace HRM.UI.Controllers.Payroll
|
|||
return Ok(true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Bonus Process screen, "Process" button: calculates the bonus (and tax) of the posted employees and
|
||||
/// saves it in the same request — there is no separate Save step. Body: the header and the employee
|
||||
/// IDs only. Returns the saved rows read back from the database. See BonusProcessService.ProcessAndSave.
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
[Route("processAndSave")]
|
||||
public ActionResult ProcessAndSave([FromBody] BonusProcessAndSaveRequest request)
|
||||
{
|
||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||
BonusProcessAndSaveResult result = null;
|
||||
try
|
||||
{
|
||||
result = _bonusProcessService.ProcessAndSave(request, (int)currentUser.PayrollTypeID, currentUser.UserID);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, ex.Message);
|
||||
}
|
||||
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
/// <summary>Modify dialog, "Calculate": the tax of one saved row for a bonus amount. Nothing is saved.</summary>
|
||||
[HttpPost]
|
||||
[Route("calculateRowTax")]
|
||||
public ActionResult CalculateRowTax([FromBody] BonusProcessRowTaxRequest request)
|
||||
{
|
||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||
BonusProcessRowTaxResult result = null;
|
||||
try
|
||||
{
|
||||
result = _bonusProcessService.CalculateRowTax(request, (int)currentUser.PayrollTypeID);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, ex.Message);
|
||||
}
|
||||
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
/// <summary>Modify dialog, "Save": saves one row (amounts + that employee's bonus tax data); returns the saved row.</summary>
|
||||
[HttpPost]
|
||||
[Route("saveRow")]
|
||||
public ActionResult SaveRow([FromBody] BonusProcessRowSaveRequest request)
|
||||
{
|
||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||
BonusProcessGridRow row = null;
|
||||
try
|
||||
{
|
||||
row = _bonusProcessService.SaveRow(request, (int)currentUser.PayrollTypeID, currentUser.UserID);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, ex.Message);
|
||||
}
|
||||
|
||||
return Ok(row);
|
||||
}
|
||||
|
||||
/// <summary>"Clear Tax": the tax of every row of the process becomes 0 and is saved at once; returns the saved rows.</summary>
|
||||
[HttpPost]
|
||||
[Route("clearTaxAndSave/{bonusProcessID}")]
|
||||
public ActionResult ClearTaxAndSave(int bonusProcessID)
|
||||
{
|
||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||
List<BonusProcessGridRow> rows = null;
|
||||
try
|
||||
{
|
||||
rows = _bonusProcessService.ClearTaxAndSave(bonusProcessID, (int)currentUser.PayrollTypeID, currentUser.UserID);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, ex.Message);
|
||||
}
|
||||
|
||||
return Ok(rows);
|
||||
}
|
||||
|
||||
/// <summary>Remove button on a saved row: deletes that employee's saved bonus data (and the header when it was the last).</summary>
|
||||
[HttpPost]
|
||||
[Route("removeRow/{bonusProcessDetailID}")]
|
||||
public ActionResult RemoveRow(int bonusProcessDetailID)
|
||||
{
|
||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||
BonusProcessRowRemoveResult result = null;
|
||||
try
|
||||
{
|
||||
result = _bonusProcessService.RemoveRow(bonusProcessDetailID, (int)currentUser.PayrollTypeID);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return StatusCode(StatusCodes.Status500InternalServerError, ex.Message);
|
||||
}
|
||||
|
||||
return Ok(result);
|
||||
}
|
||||
|
||||
[HttpPost]
|
||||
[Route("CalculateBonusTax")]
|
||||
public ActionResult CalculateBonusTax(List<BonusProcess.BonusProcessDetail> items)
|
||||
|
|
|
|||
|
|
@ -217,5 +217,3 @@
|
|||
[10-Sep-2026 11:02:56 AM] - Mail Sent to rashedul@celimited.com, From: gtlm@celimited.com, CC: . Subject: D1250-Jamal Hossain, has applied Casual Leave from 10 Sep 2026 to 10 Sep 2026 days:1. Your Approval is required. Body: Dear Shikdar Mamun,<br/><br/>D1250-Jamal Hossain, has applied Casual Leave from 10 Sep 2026 to 10 Sep 2026 days:1. Your Approval is required. To accept the reliever request during the mentioned period, please click on this http://37.61.216.162/sanofi/.<br/><br/>This is a system generated mail, Please do not reply.
|
||||
[10-Sep-2026 12:28:14 PM] - Mail Sent to rashedul@celimited.com, From: gtlm@celimited.com, CC: . Subject: D1250-Jamal Hossain, has applied Sick Leave from 11 Sep 2026 to 11 Sep 2026 days:1. Your Approval is required. Body: Dear Shikdar Mamun,<br/><br/>D1250-Jamal Hossain, has applied Sick Leave from 11 Sep 2026 to 11 Sep 2026 days:1. Your Approval is required. To accept the reliever request during the mentioned period, please click on this http://37.61.216.162/sanofi/.<br/><br/>This is a system generated mail, Please do not reply.
|
||||
[13-Sep-2026 04:52:45 PM] - Mail Sent to salauddin.shamim@celimited.com, From: gtlm@celimited.com, CC: . Subject: D1265-Shikdar Mamun, has approved your Casual Leave from 10 Sep 2026 to 10 Sep 2026 days:1.. Body: Dear Jamal Hossain,<br/><br/>D1265-Shikdar Mamun, has approved your Casual Leave from 10 Sep 2026 to 10 Sep 2026 days:1. Please click on this http://37.61.216.162/sanofi/ to access.<br/><br/>This is a system generated mail, Please do not reply.
|
||||
[12-Nov-2026 03:10:27 PM] - Mail Sent to rashedul@celimited.com, From: gtlm@celimited.com, CC: . Subject: Bonus process (Festival Bonus) for month - October 2025. Your Approval is required.. Body: Dear Shikdar Mamun,<br/><br/>Bonus process (Festival Bonus) for month - October 2025. Your Approval is required. To accept the reliever request during the mentioned period, please click on this http://37.61.216.162/sanofi/.<br/><br/>This is a system generated mail, Please do not reply.
|
||||
[12-Nov-2026 03:24:45 PM] - Mail Sent to rashedul@celimited.com, From: gtlm@celimited.com, CC: . Subject: Bonus process (Festival Bonus) for month - October 2025. Your Approval is required.. Body: Dear Shikdar Mamun,<br/><br/>Bonus process (Festival Bonus) for month - October 2025. Your Approval is required. To accept the reliever request during the mentioned period, please click on this http://37.61.216.162/sanofi/.<br/><br/>This is a system generated mail, Please do not reply.
|
||||
|
|
|
|||
|
|
@ -1,143 +0,0 @@
|
|||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Warning"
|
||||
}
|
||||
},
|
||||
"Jwt": {
|
||||
"Secret": "6A2609257D581456601B1F5367702414311F0C2E1B31110F4B383B0C3D2226043F1D7E5B170D255C3245",
|
||||
"Issuer": "492609050A061C37055E31",
|
||||
"Audience": "4C2629050A061C37055B250D28270D26",
|
||||
"TokenLifetimeMinutes": 86400
|
||||
},
|
||||
"LDAPSettings": {
|
||||
"ADServer": "100.100.100.40", // Ad Server
|
||||
"ADServerPort": 389, //636 for LDAPS (SSL)
|
||||
"MasterDomain": "celimited.com",
|
||||
"Domain": "ease.local",
|
||||
"isADLogin": "false", // only true or false
|
||||
"isMFA": "false", // only true or false
|
||||
"MFATimer": "2"
|
||||
},
|
||||
"AppSettings": {
|
||||
"DefaultDB": "spadb3",
|
||||
"AttendanceDataLocation": "C:\\Local\\",
|
||||
"AttendanceDataPassword": "1235",
|
||||
"AttendanceCollectionType": 5,
|
||||
//"Secret": "Computer ease limited, dhaka, bangladesh",
|
||||
"Secret": "fB5fx0XD0nu7Xw7DJy7fLctn+Uq7haV8wngouK3/TuZM9HDoj0ksFimbVGlF+eJI",
|
||||
// JWT signing key (HS512). Must be 64+ ASCII chars since the .NET 10 upgrade (IdentityModel 8 rejects shorter HS512 keys, IDX10720; Ease.Core.Utility.JwtSigningKey stretches a shorter one). Random, one per client/server, never commit it. Changing it signs everyone out once.
|
||||
"downloadFolder": "D:\\Local\\ionic\\Ease.ERP.Api\\Ease.ERP.Api\\DownloadedFiles",
|
||||
"API": {
|
||||
"Title": "FSIE API",
|
||||
"Description": "REST API"
|
||||
},
|
||||
"Swagger": {
|
||||
"Enabled": true
|
||||
},
|
||||
"DbConfig": [
|
||||
{
|
||||
"ConnectionNode": {
|
||||
"ConnectionString": "server=CEL70;Database=EFT;User ID=sa;Password=;",
|
||||
"Key": "spadb",
|
||||
"Provider": "sql",
|
||||
"SqlSyntax": "SQL"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"dbSettings": {
|
||||
//master project DB
|
||||
|
||||
//"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
|
||||
|
||||
"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=MasterProjectDBUATBRAC;Persist Security Info=True; User ID=DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;" // Development
|
||||
|
||||
},
|
||||
"Calendar": {
|
||||
"RemindersEnabled": true,
|
||||
"SendMail": true,
|
||||
"RedirectAllMailTo": "",
|
||||
"ReminderGraceMinutes": 60,
|
||||
"TimeZoneId": "",
|
||||
"IcsDomain": "",
|
||||
"OutlookSync": "Ics", // None | Ics | Graph
|
||||
"MaxAttendees": 500,
|
||||
"ScheduleJobsEnabled": true,
|
||||
"ScheduleEmailsEnabled": true
|
||||
},
|
||||
"EmailSettings": {
|
||||
//"WebAddress": "https://celclouds.com/synoviahr/",
|
||||
// live
|
||||
"WebAddress": "http://37.61.216.162/sanofi/", // UAT
|
||||
"SendMethod": "SMTP",
|
||||
"EmailServer": "celimited.com",
|
||||
"FromAddress": "gtlm@celimited.com",
|
||||
"UserID": "gtlm@celimited.com",
|
||||
"Password": "4A2218420C245F295C76",
|
||||
"isSSO": "false",
|
||||
"isNewDashboard": "true",
|
||||
"PortNumber": "587",
|
||||
"EnableSSL": "YES",
|
||||
"SingleSignOn": "NO",
|
||||
"LDAP": "CEL14"
|
||||
|
||||
},
|
||||
"OpenAI": {
|
||||
"ApiKey": "E71627443D1B3B0F6917242B7A2D213648250712000B17165C0E2D1F7E2F6E21022D24253E5D025E0D53607B5D0C5023007536330C307A73203938316E5D09393F1F3154284411121E7C1A7B08740D193E3B55101D03082F222809170911203F1F1F0F4319081E222B04071A10202F2E152F4724223D223D021F794420062354351C06343A000A31537438203037100C631E1508713637232733345A1C1F224D0323222E2F",
|
||||
"Model": "gpt-5"
|
||||
},
|
||||
"Approver": {
|
||||
"ApproverOneId": "1",
|
||||
"ApproverTwoId": "2",
|
||||
"Balance": "1120000"
|
||||
},
|
||||
"EmployeeApiInfo": {
|
||||
"UserId": "sanofi",
|
||||
"Password": "x"
|
||||
},
|
||||
"AdminPendingJob": {
|
||||
"Profile": "Admin",
|
||||
"MedicalClaim": "x"
|
||||
},
|
||||
"RDLCLocation": "",
|
||||
"AllowedHosts": "*",
|
||||
|
||||
// for Synovia only
|
||||
// the emails has to be comma separated (,) not comma
|
||||
// subordinates of first one and others will be just CC
|
||||
//"SalesEmpEmail": "raq@synoviapharma.com;mtamiz.uddin@synoviapharma.com;ashraful.sharif@synoviapharma.com" // Live
|
||||
"SalesEmpEmail": "", // test
|
||||
|
||||
"BankHead": "22010105",
|
||||
"BergerHead": "11010101",
|
||||
"EPFHead": "21020103",
|
||||
"EPFInterestHead": "21020101",
|
||||
"CPFHead": "21020104",
|
||||
"CPFInterestHead": "21020102",
|
||||
"CPFForfittedHead": "22010102",
|
||||
"EPFPerInterest": "41030101",
|
||||
"CPFPerInterest": "41030102",
|
||||
"EPFFractionYearInterest": "41030103",
|
||||
"LoanHead": "11014101",
|
||||
"LoanInterestHead": "31030102",
|
||||
|
||||
"TrainingSettings": {
|
||||
"InProduction": "NO",
|
||||
"ProjectPath": "\\\\100.100.100.164\\c$\\inetpub\\wwwroot\\SGSRevamp",
|
||||
"ServerIP": "100.100.100.164",
|
||||
"UserID": "EASE\\EaseOne",
|
||||
"Password": "cel1@3$5"
|
||||
|
||||
},
|
||||
|
||||
"SAPSettings": {
|
||||
//"URL": "http://s4dev.bergerbd.com:8001/hrapipossrv/prfbpos?sap-client=900",
|
||||
"URL": "http://bpblecchq.bergerbd.com:8000/hrapipossrvn/prfbpos?sap-client=900",
|
||||
"UserID": "dev_odata",
|
||||
"Password": "Missi@n2020"
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -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.
|
||||
|
||||
|
|
@ -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
|
||||
38
deploy.ps1
38
deploy.ps1
|
|
@ -11,7 +11,7 @@
|
|||
# Update these values for each client/environment before running
|
||||
|
||||
$baseHref = "/CELHRM_Master/"
|
||||
$outputFolder = "publish\CELHRM_Master" # relative to this script's folder (repo root); the version is added: CELHRM_Master_<version>
|
||||
$outputFolder = "publish\CELHRM_Master" # relative to this script's folder (repo root)
|
||||
|
||||
# These never change
|
||||
$repoRoot = $PSScriptRoot
|
||||
|
|
@ -48,10 +48,6 @@ $newCounter = $lastCounter + 1
|
|||
$version = "$today-" + $newCounter.ToString("D2") # D2 = always 2 digits (01, 02, 03...)
|
||||
$buildTime = (Get-Date).ToUniversalTime().ToString("o")
|
||||
|
||||
# Output folder carries the version: e.g. publish\CELHRM_Master_20260517-01
|
||||
$destinationPath = Join-Path $repoRoot ($outputFolder + "_" + $version)
|
||||
$wwwrootPath = Join-Path $destinationPath "wwwroot"
|
||||
|
||||
Write-Host ""
|
||||
Write-Host "============================================" -ForegroundColor Cyan
|
||||
Write-Host " CEL HRM - Full Build & Deploy Script" -ForegroundColor Cyan
|
||||
|
|
@ -136,26 +132,6 @@ Copy-Item -Path $distPath -Destination $wwwrootPath -Recurse -Force
|
|||
Write-Host "[OK] Angular files copied to: $wwwrootPath" -ForegroundColor Green
|
||||
|
||||
|
||||
# ---- STEP 5b: Copy everything in HRM.UI\RDLC into the published RDLC folder ---- #
|
||||
# dotnet publish only copies the RDLC files the csproj lists, so a report (or an
|
||||
# image it uses) can be missing on the server. Copy the whole folder as it is in
|
||||
# the repo, overwriting what publish already put there.
|
||||
|
||||
$rdlcSourcePath = Join-Path $repoRoot "HRM.UI\RDLC"
|
||||
$rdlcDestinationPath = Join-Path $destinationPath "RDLC"
|
||||
|
||||
if (Test-Path $rdlcSourcePath) {
|
||||
if (-not (Test-Path $rdlcDestinationPath)) {
|
||||
New-Item -ItemType Directory -Path $rdlcDestinationPath -Force | Out-Null
|
||||
}
|
||||
Copy-Item -Path (Join-Path $rdlcSourcePath "*") -Destination $rdlcDestinationPath -Recurse -Force
|
||||
$rdlcCount = (Get-ChildItem -Path $rdlcDestinationPath -Recurse -File).Count
|
||||
Write-Host "[OK] RDLC folder copied to: $rdlcDestinationPath ($rdlcCount files)" -ForegroundColor Green
|
||||
} else {
|
||||
Write-Host "[WARN] RDLC folder not found: $rdlcSourcePath (skipped)" -ForegroundColor Yellow
|
||||
}
|
||||
|
||||
|
||||
# ---- STEP 6: Write Angular web.config to wwwroot ---- #
|
||||
# This is separate from the backend web.config that dotnet publish
|
||||
# already generated at the root of $destinationPath (for the IIS
|
||||
|
|
@ -224,18 +200,6 @@ $angularWebConfig | Out-File -FilePath "$wwwrootPath\web.config" -Encoding utf8
|
|||
Write-Host "[OK] Angular web.config written to: $wwwrootPath\web.config" -ForegroundColor Green
|
||||
|
||||
|
||||
# ---- STEP 7: Remove the backend web.config from the version folder ---- #
|
||||
# The server keeps its own web.config (hosting settings per client), so the one
|
||||
# dotnet publish generated at the folder root must not overwrite it on deploy.
|
||||
# Only the root file is removed; wwwroot\web.config (Angular, STEP 6) stays.
|
||||
|
||||
$rootWebConfig = Join-Path $destinationPath "web.config"
|
||||
if (Test-Path $rootWebConfig) {
|
||||
Remove-Item -Path $rootWebConfig -Force
|
||||
Write-Host "[OK] Removed web.config from: $destinationPath" -ForegroundColor Green
|
||||
}
|
||||
|
||||
|
||||
# ---- DONE ---- #
|
||||
Write-Host ""
|
||||
Write-Host "============================================" -ForegroundColor Cyan
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user