Compare commits
20 Commits
main
...
dev_mohaim
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1853718cbd | ||
|
|
e3fd97be95 | ||
|
|
17ffe30ae8 | ||
|
|
8b452c2bbd | ||
|
|
83b5935846 | ||
|
|
77321b60ff | ||
|
|
18510679bb | ||
|
|
ab7fc93b14 | ||
|
|
5498b79851 | ||
|
|
ad8031c3a4 | ||
|
|
75e94ddc94 | ||
|
|
7f1dcadd0c | ||
|
|
df0680fecf | ||
|
|
4eb1990286 | ||
|
|
e6931518df | ||
|
|
aa35c40142 | ||
|
|
a458cdba4c | ||
|
|
9944262dd1 | ||
|
|
73523abd37 | ||
|
|
072b0a63c4 |
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -749,11 +749,6 @@ FodyWeavers.xsd
|
||||||
# Additional files built by Visual Studio
|
# Additional files built by Visual Studio
|
||||||
|
|
||||||
# End of https://www.toptal.com/developers/gitignore/api/csharp,angular,aspnetcore,visualstudio,visualstudiocode
|
# 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).
|
# Employee photos written at runtime (approved thumbnails + photos awaiting approval).
|
||||||
# Not source; regenerated/repopulated by the app.
|
# Not source; regenerated/repopulated by the app.
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,9 @@ 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.
|
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`
|
- `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. There is no ESLint config.
|
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.
|
||||||
- `npm test` works, but coverage is nominal — 18 `.spec.ts` files across the whole app. Single spec:
|
- `npm test` works, but coverage is nominal — 18 `.spec.ts` files across the whole app. Single spec:
|
||||||
`ng test --include='**/some.component.spec.ts'`.
|
`ng test --include='**/some.component.spec.ts'`.
|
||||||
- There are no `*.Tests.csproj` anywhere in the solution.
|
- There are no `*.Tests.csproj` anywhere in the solution.
|
||||||
|
|
@ -474,7 +476,9 @@ When behavior differs between clients, look for or add a Logic key rather than b
|
||||||
## Branches: one product, many client deployments
|
## 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`),
|
**This checkout is not that repo.** It is `HRM-10` (`origin` = `103.197.204.162:3025/CelHRTeam/HRM-10`),
|
||||||
a fresh import with a single branch `main` and a single squashed commit (`838b8d4` "first commit").
|
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.
|
||||||
None of the older history exists here: every commit hash quoted elsewhere in this file (`c8588ce67`,
|
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
|
`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.
|
`git show`/`git log` recovery commands only work in a clone of that repo, not here.
|
||||||
|
|
|
||||||
|
|
@ -949,6 +949,13 @@ namespace HRM.BO
|
||||||
DataSet GetBonusBankAdvice(int BonusID, DateTime dBonusMonth, string sEmpID);
|
DataSet GetBonusBankAdvice(int BonusID, DateTime dBonusMonth, string sEmpID);
|
||||||
DataSet GetBonusPaySlip(int BonusID, DateTime dBonusMonth, string sEmpID);
|
DataSet GetBonusPaySlip(int BonusID, DateTime dBonusMonth, string sEmpID);
|
||||||
int Save(BonusProcess item);
|
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);
|
void Delete(BonusProcess oBonusProcess);
|
||||||
List<BonusProcess> GetProcess(int bonusID, DateTime bonusMonth);
|
List<BonusProcess> GetProcess(int bonusID, DateTime bonusMonth);
|
||||||
List<BonusProcess> GetProcess(DateTime bonusMonth);
|
List<BonusProcess> GetProcess(DateTime bonusMonth);
|
||||||
|
|
|
||||||
96
HRM.BO/Bonus/BonusProcessAndSave.cs
Normal file
96
HRM.BO/Bonus/BonusProcessAndSave.cs
Normal file
|
|
@ -0,0 +1,96 @@
|
||||||
|
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,6 +563,7 @@ namespace HRM.BO
|
||||||
//void SaveBasicInfo(Employee item);
|
//void SaveBasicInfo(Employee item);
|
||||||
List<Employee> GetByEmpIDs(string empIDs, int payrollTypeID);
|
List<Employee> GetByEmpIDs(string empIDs, int payrollTypeID);
|
||||||
List<Employee> GetByEmpIDs(string empIDs);
|
List<Employee> GetByEmpIDs(string empIDs);
|
||||||
|
List<EmployeeLite> GetLiteByEmpIDs(List<int> empIDs);
|
||||||
List<Employee> GetFssEmp(string empIDs, int payrollTypeID);
|
List<Employee> GetFssEmp(string empIDs, int payrollTypeID);
|
||||||
List<Employee> GetEmpsWithDiscontinue(string empIDs, int payrollTypeID);
|
List<Employee> GetEmpsWithDiscontinue(string empIDs, int payrollTypeID);
|
||||||
DataSet GetEmpJoining4Novartis(DateTime dEffectDate, int payrollTypeID);
|
DataSet GetEmpJoining4Novartis(DateTime dEffectDate, int payrollTypeID);
|
||||||
|
|
|
||||||
17
HRM.BO/Employee/EmployeeLite.cs
Normal file
17
HRM.BO/Employee/EmployeeLite.cs
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
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,6 +401,13 @@ namespace HRM.BO
|
||||||
routerLink = "/authentication/system-auditlog",
|
routerLink = "/authentication/system-auditlog",
|
||||||
icon = "pi pi-fw pi-database",
|
icon = "pi pi-fw pi-database",
|
||||||
},
|
},
|
||||||
|
new WebMenuItem()
|
||||||
|
{
|
||||||
|
uniqueName = "WEB.01.09",
|
||||||
|
label = "Cipher Engine",
|
||||||
|
routerLink = "/authentication/cipher-engine",
|
||||||
|
icon = "pi pi-fw pi-code",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,8 @@ namespace HRM.BO
|
||||||
PayrollTypeID = 0;
|
PayrollTypeID = 0;
|
||||||
UserID = 0;
|
UserID = 0;
|
||||||
UserObj = null;
|
UserObj = null;
|
||||||
|
// A row nobody approved yet is never live access (see UserAccessTypeMakerChecker_DB_Changes.sql).
|
||||||
|
AccessTypeStatus = EnumAuthStatus.NewNotYetApprove;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
@ -23,9 +25,22 @@ namespace HRM.BO
|
||||||
public string Description { get; set; }
|
public string Description { get; set; }
|
||||||
public int UserID { get; set; }
|
public int UserID { get; set; }
|
||||||
public User UserObj { get; set; }
|
public User UserObj { get; set; }
|
||||||
public EnumAuthStatus accessTypeStatus;
|
/// <summary>
|
||||||
public int? ApprovedBy;
|
/// UserAccessType.Status: Approved (5) = live; NewNotYetApprove (2) = requested, not live yet;
|
||||||
public DateTime? ApprovedDate;
|
/// 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; }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
@ -41,6 +56,16 @@ namespace HRM.BO
|
||||||
int Save(UserAccessType item);
|
int Save(UserAccessType item);
|
||||||
void Save(List<UserAccessType> userAccessTypes);
|
void Save(List<UserAccessType> userAccessTypes);
|
||||||
void Delete(int id);
|
void Delete(int id);
|
||||||
|
|
||||||
|
// Maker-checker (Authentication > User Access Type)
|
||||||
|
/// <summary>Maker: records the wanted payroll types of a user as pending changes. Returns how many rows changed.</summary>
|
||||||
|
int RequestChange(int userID, List<int> payrollTypeIDs, int makerID);
|
||||||
|
/// <summary>Checker: makes every pending change of the user live.</summary>
|
||||||
|
void Approve(int userID, int approverID);
|
||||||
|
/// <summary>Checker: drops every pending change of the user; access stays as it was.</summary>
|
||||||
|
void Reject(int userID);
|
||||||
|
/// <summary>Every row waiting for approval, of every user, with user, payroll type and maker for display.</summary>
|
||||||
|
List<UserAccessType> GetPending();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
|
||||||
|
|
@ -56,8 +56,11 @@ namespace HRM.DA
|
||||||
|
|
||||||
internal static IDataReader GetUserPayrollType(TransactionContext tc, string loginID)
|
internal static IDataReader GetUserPayrollType(TransactionContext tc, string loginID)
|
||||||
{
|
{
|
||||||
string sql = SQLParser.MakeSQL(@"SELECT p.* FROM PayrollType p, UserAccessType ua,Users u
|
// Live access only: a requested access (Status 2) is not live until approved; a requested
|
||||||
where p.PayrollTypeID==ua.PayrollTypeID and u.UserID =ua.UserID and u.LoginID=%s", loginID);
|
// 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);
|
||||||
return tc.ExecuteReader(sql);
|
return tc.ExecuteReader(sql);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -68,7 +71,8 @@ namespace HRM.DA
|
||||||
string sql = SQLParser.MakeSQL(@"SELECT * FROM PAYROLLTYPE WHERE PAYROLLTYPEID IN
|
string sql = SQLParser.MakeSQL(@"SELECT * FROM PAYROLLTYPE WHERE PAYROLLTYPEID IN
|
||||||
(SELECT DISTINCT ua.PAYROLLTYPEID FROM USERS u
|
(SELECT DISTINCT ua.PAYROLLTYPEID FROM USERS u
|
||||||
JOIN USERACCESSTYPE ua ON u.USERID = ua.UserId
|
JOIN USERACCESSTYPE ua ON u.USERID = ua.UserId
|
||||||
WHERE u.EMPLOYEEID=%n AND u.USERTYPE=%n)", employeeId, userType);
|
WHERE u.EMPLOYEEID=%n AND u.USERTYPE=%n AND ua.Status<>%n)",
|
||||||
|
employeeId, userType, (int)EnumAuthStatus.NewNotYetApprove);
|
||||||
return tc.ExecuteReader(sql);
|
return tc.ExecuteReader(sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
using Ease.Core.DataAccess;
|
using Ease.Core.DataAccess;
|
||||||
using Ease.Core.Utility;
|
using Ease.Core.Utility;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -32,6 +33,176 @@ namespace HRM.DA
|
||||||
item.UsedProcess, item.PayrollTypeID, item.IsApprove, item.wfstatus);
|
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)
|
internal static void Insert(TransactionContext tc, BonusProcess.BonusProcessDetail item)
|
||||||
{
|
{
|
||||||
string sql = SQLParser.MakeSQL(
|
string sql = SQLParser.MakeSQL(
|
||||||
|
|
@ -487,6 +658,19 @@ AND BP.PayrollTypeID=%n", emps, FromDate, ToDate, payrollTypeID);
|
||||||
|
|
||||||
return approved;
|
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
|
#endregion
|
||||||
|
|
||||||
internal static DataSet GetMontlyProdBonus(TransactionContext tc, DateTime dBonusMonth)
|
internal static DataSet GetMontlyProdBonus(TransactionContext tc, DateTime dBonusMonth)
|
||||||
|
|
|
||||||
|
|
@ -785,6 +785,32 @@ 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]);
|
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)
|
internal static IDataReader GetByEmpIDs(TransactionContext tc, string empIDs)
|
||||||
{
|
{
|
||||||
string sTableName;
|
string sTableName;
|
||||||
|
|
@ -798,6 +824,34 @@ namespace HRM.DA
|
||||||
return dr;
|
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)
|
internal static IDataReader GetFssEmp(TransactionContext tc, string empIDs, int payrollTypeID)
|
||||||
{
|
{
|
||||||
string sTableName;
|
string sTableName;
|
||||||
|
|
|
||||||
|
|
@ -160,6 +160,19 @@ namespace HRM.DA
|
||||||
else return true;
|
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)
|
internal static EnumIncomeTaxDataFrom TaxDataFrom(TransactionContext tc, int employeeId)
|
||||||
{
|
{
|
||||||
object isprocessed = tc.ExecuteScalar(@"if exists(select * from SALARYTEMPIT where EmployeeID =%n ) select 3
|
object isprocessed = tc.ExecuteScalar(@"if exists(select * from SALARYTEMPIT where EmployeeID =%n ) select 3
|
||||||
|
|
@ -212,17 +225,54 @@ namespace HRM.DA
|
||||||
DataSet oIncomeTaxs = new DataSet();
|
DataSet oIncomeTaxs = new DataSet();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
string sql = SQLParser.MakeSQL(@"select salarytax.EMPLOYEENO,salarytax.Name,salarytax.EMPLOYEEID, salarytax.TaxAmount SalaryData, st.thisyeartotal TaxData from
|
// 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
|
||||||
(Select tab.EMPLOYEENO,tab.Name,tab.EMPLOYEEID,sum(tab.TaxAmount) TaxAmount 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
|
(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)
|
between %d and %d and ITEMCODE=-129 and ITEMID=-129 and s.EMPLOYEEID in (SELECT ID FROM #tdrEmpIds)
|
||||||
union
|
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)
|
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)
|
||||||
) tab group by tab.EMPLOYEENO,tab.Name,tab.EMPLOYEEID) salarytax
|
) tab group by tab.EMPLOYEENO,tab.Name,tab.EMPLOYEEID) salarytax
|
||||||
left join
|
left join
|
||||||
%q st on salarytax.Employeeid=st.employeeid and st.itemcode=-212 and st.itemid=-212",
|
%q st on salarytax.Employeeid=st.employeeid and st.itemcode=-212 and st.itemid=-212;
|
||||||
fromdate, toDate, empids, fromdate, toDate, empids, GetTableName(dataFrom));
|
DROP TABLE #tdrEmpIds;",
|
||||||
oIncomeTaxs = tc.ExecuteDataSet(sql);
|
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);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
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);
|
//" WHERE RoleID = %n", item.Code, item.Name, item.ModifiedBy, item.ModifiedDate, item.Sequence, (int)item.RoleStatus, item.ApproveBy, item.ApproveDate, (int)item.RoleStatus, item.Description, item.ID);
|
||||||
|
|
||||||
tc.ExecuteNonQuery(
|
tc.ExecuteNonQuery(
|
||||||
"UPDATE Role SET Code=%s, name = %s, Sequence = %n, ApproveBy = %n,ApproveDate=%D,Status=%n , AUTHORIZEDBY=%n, AUTHORIZEDDATE=%D" +
|
"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.Sequence, item.ApproveBy, item.ApproveDate,
|
" WHERE RoleID = %n", item.Code, item.Name, item.Description, (int)item.RoleType, item.Sequence, item.ApproveBy, item.ApproveDate,
|
||||||
(int)item.RoleStatus, item.ModifiedBy, item.ModifiedDate, item.ID);
|
(int)item.RoleStatus, item.ModifiedBy, item.ModifiedDate, item.ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,14 @@ namespace HRM.DA
|
||||||
|
|
||||||
internal static void Insert(TransactionContext tc, UserAccessType item)
|
internal static void Insert(TransactionContext tc, UserAccessType item)
|
||||||
{
|
{
|
||||||
tc.ExecuteNonQuery("INSERT INTO UserAccessType(UserAccessTypeID, PayrollTypeID, UserID)" +
|
tc.ExecuteNonQuery("INSERT INTO UserAccessType(UserAccessTypeID, PayrollTypeID, UserID, Status," +
|
||||||
" VALUES(%n, %n, %n)", item.ID, item.PayrollTypeID, item.UserID);
|
" 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
@ -32,6 +38,33 @@ namespace HRM.DA
|
||||||
" WHERE UserAccessTypeID=%n", item.PayrollTypeID, item.UserID, item.ID);
|
" WHERE UserAccessTypeID=%n", item.PayrollTypeID, item.UserID, item.ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Maker asks to take a live access away: it stays live (Status 3) until approved.
|
||||||
|
internal static void RequestRemoval(TransactionContext tc, int userAccessTypeID, int makerID, System.DateTime requestDate)
|
||||||
|
{
|
||||||
|
tc.ExecuteNonQuery("UPDATE UserAccessType SET Status=%n, ModifiedBy=%n, ModifiedDate=%D" +
|
||||||
|
" WHERE UserAccessTypeID=%n",
|
||||||
|
(int)EnumAuthStatus.DeletedNotYetApprove, makerID, requestDate, userAccessTypeID);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Checker approves: requested removals go, requested accesses become live.
|
||||||
|
internal static void Approve(TransactionContext tc, int userID, int approverID, System.DateTime approveDate)
|
||||||
|
{
|
||||||
|
tc.ExecuteNonQuery("DELETE FROM UserAccessType WHERE UserID=%n AND Status=%n",
|
||||||
|
userID, (int)EnumAuthStatus.DeletedNotYetApprove);
|
||||||
|
tc.ExecuteNonQuery("UPDATE UserAccessType SET Status=%n, ApprovedBy=%n, ApprovedDate=%D" +
|
||||||
|
" WHERE UserID=%n AND Status=%n",
|
||||||
|
(int)EnumAuthStatus.Approved, approverID, approveDate, userID, (int)EnumAuthStatus.NewNotYetApprove);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Checker rejects: requested accesses go, requested removals stay live as before.
|
||||||
|
internal static void Reject(TransactionContext tc, int userID)
|
||||||
|
{
|
||||||
|
tc.ExecuteNonQuery("DELETE FROM UserAccessType WHERE UserID=%n AND Status=%n",
|
||||||
|
userID, (int)EnumAuthStatus.NewNotYetApprove);
|
||||||
|
tc.ExecuteNonQuery("UPDATE UserAccessType SET Status=%n WHERE UserID=%n AND Status=%n",
|
||||||
|
(int)EnumAuthStatus.Approved, userID, (int)EnumAuthStatus.DeletedNotYetApprove);
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Get Function
|
#region Get Function
|
||||||
|
|
@ -46,14 +79,36 @@ namespace HRM.DA
|
||||||
return tc.ExecuteReader("SELECT * FROM UserAccessType WHERE UserAccessTypeID=%n", id);
|
return tc.ExecuteReader("SELECT * FROM UserAccessType WHERE UserAccessTypeID=%n", id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Get
|
// Get
|
||||||
internal static IDataReader GetByUserID(TransactionContext tc, int UserID)
|
internal static IDataReader GetByUserID(TransactionContext tc, int UserID)
|
||||||
{
|
{
|
||||||
return tc.ExecuteReader("SELECT * FROM UserAccessType WHERE UserID=%n", UserID);
|
return tc.ExecuteReader("SELECT * FROM UserAccessType WHERE UserID=%n", UserID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Every row waiting for approval, of every user (Pending approvals list).
|
||||||
|
internal static IDataReader GetPending(TransactionContext tc)
|
||||||
|
{
|
||||||
|
return tc.ExecuteReader(@"SELECT ua.*, p.Description PayrollTypeName, u.LoginID UserLoginID, u.UserName UserFullName,
|
||||||
|
mk.LoginID MakerLoginID
|
||||||
|
FROM UserAccessType ua
|
||||||
|
JOIN PayrollType p ON p.PayrollTypeID = ua.PayrollTypeID
|
||||||
|
JOIN Users u ON u.UserID = ua.UserID
|
||||||
|
LEFT JOIN Users mk ON mk.UserID = CASE WHEN ua.Status=%n THEN ua.ModifiedBy ELSE ua.CreatedBy END
|
||||||
|
WHERE ua.Status IN (%n, %n)
|
||||||
|
ORDER BY u.UserName, p.Description",
|
||||||
|
(int)EnumAuthStatus.DeletedNotYetApprove,
|
||||||
|
(int)EnumAuthStatus.NewNotYetApprove, (int)EnumAuthStatus.DeletedNotYetApprove);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Names of the payroll types a pending approval of this user will newly give access to.
|
||||||
|
internal static IDataReader GetPendingNewDescriptions(TransactionContext tc, int userID)
|
||||||
|
{
|
||||||
|
return tc.ExecuteReader(@"SELECT p.Description FROM UserAccessType ua
|
||||||
|
JOIN PayrollType p ON p.PayrollTypeID = ua.PayrollTypeID
|
||||||
|
WHERE ua.UserID=%n AND ua.Status=%n",
|
||||||
|
userID, (int)EnumAuthStatus.NewNotYetApprove);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
@ -67,4 +122,4 @@ namespace HRM.DA
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -243,8 +243,8 @@ namespace HRM.DA
|
||||||
{
|
{
|
||||||
return tc.ExecuteReader(@"SELECT u.* FROM Users u
|
return tc.ExecuteReader(@"SELECT u.* FROM Users u
|
||||||
WHERE u.UserType=%n AND u.UserID IN
|
WHERE u.UserType=%n AND u.UserID IN
|
||||||
(SELECT ua.UserID FROM UserAccessType ua WHERE ua.PayrollTypeID=%n)",
|
(SELECT ua.UserID FROM UserAccessType ua WHERE ua.PayrollTypeID=%n AND ua.Status<>%n)",
|
||||||
type, payrollTypeID);
|
type, payrollTypeID, (int)EnumAuthStatus.NewNotYetApprove);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static IDataReader GetAll(TransactionContext tc)
|
internal static IDataReader GetAll(TransactionContext tc)
|
||||||
|
|
|
||||||
|
|
@ -495,6 +495,60 @@ 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)
|
public void UndoTax(BonusProcess oProcessedItems, List<Employee> oEmployees, Bonus oBonus)
|
||||||
{
|
{
|
||||||
if (_payrolltype.TaxParamID == null) throw new ServiceException("Current year Tax paramter setup not found.");
|
if (_payrolltype.TaxParamID == null) throw new ServiceException("Current year Tax paramter setup not found.");
|
||||||
|
|
|
||||||
|
|
@ -860,8 +860,7 @@ namespace HRM.DA
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
BonusProcessDA.Update(tc, oBonusProcess);
|
BonusProcessDA.Update(tc, oBonusProcess);
|
||||||
BonusProcessDA.DeleteProcessDetailByProcessID(tc, oBonusProcess.BonusID, oBonusProcess.ID,
|
BonusProcessDA.DeleteProcessDetailByProcessID(tc, oBonusProcess.BonusID, oBonusProcess.ID, oBonusProcess.PayrollTypeID);
|
||||||
oBonusProcess.PayrollTypeID);
|
|
||||||
BonusProcessDA.DeleteEmpCostCenter(tc, oBonusProcess.ID);
|
BonusProcessDA.DeleteEmpCostCenter(tc, oBonusProcess.ID);
|
||||||
}
|
}
|
||||||
List<IncomeTax> incometaxes = new List<IncomeTax>();
|
List<IncomeTax> incometaxes = new List<IncomeTax>();
|
||||||
|
|
@ -904,6 +903,694 @@ 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>
|
/// <summary>
|
||||||
/// Builds the employee cost-center split for every employee in the bonus process and
|
/// Builds the employee cost-center split for every employee in the bonus process and
|
||||||
/// bulk-inserts it into BonusEmpCostCenter (mirrors the SalaryEmpCostCenter handling in
|
/// bulk-inserts it into BonusEmpCostCenter (mirrors the SalaryEmpCostCenter handling in
|
||||||
|
|
@ -1157,6 +1844,36 @@ namespace HRM.DA
|
||||||
return isApproved;
|
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)
|
public DataTable GetUnApprovedBonuses(DateTime dMonthDate, int payrollTypeID)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1860,6 +1860,43 @@ namespace HRM.DA
|
||||||
return employees;
|
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)
|
public List<Employee> GetByEmpIDs(string empIDs)
|
||||||
{
|
{
|
||||||
List<Employee> employees = new List<Employee>();
|
List<Employee> employees = new List<Employee>();
|
||||||
|
|
@ -1890,6 +1927,51 @@ namespace HRM.DA
|
||||||
|
|
||||||
return employees;
|
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)
|
public void UpdateBanglaInformation(List<object> employeBanglaInfo)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -316,6 +316,36 @@ namespace HRM.DA
|
||||||
return DataExist;
|
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)
|
public EnumIncomeTaxDataFrom currentYeardataSource(int employeeID)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -329,11 +329,12 @@ namespace HRM.DA
|
||||||
public int Save(Role oRole)
|
public int Save(Role oRole)
|
||||||
{
|
{
|
||||||
TransactionContext tc = null;
|
TransactionContext tc = null;
|
||||||
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
tc = TransactionContext.Begin(true);
|
tc = TransactionContext.Begin(true);
|
||||||
|
// Audit of the permission rows, by PermissionCode, read before they are deleted and
|
||||||
|
// re-inserted below, so each kept menu keeps who/when it was created and approved.
|
||||||
|
Dictionary<string, Role.RolePermission> existingPermissions = new Dictionary<string, Role.RolePermission>();
|
||||||
if (oRole.IsNew)
|
if (oRole.IsNew)
|
||||||
{
|
{
|
||||||
int id = tc.GenerateID("Role", "RoleID");
|
int id = tc.GenerateID("Role", "RoleID");
|
||||||
|
|
@ -344,14 +345,22 @@ namespace HRM.DA
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
DataReader existingReader = new DataReader(RoleDA.GetRolePermissionByRoleID(tc, oRole.ID));
|
||||||
|
while (existingReader.Read())
|
||||||
|
{
|
||||||
|
Role.RolePermission existingPermission = this.CreateRolePermissionObject(existingReader);
|
||||||
|
if (existingPermission.PermissionCode != null && !existingPermissions.ContainsKey(existingPermission.PermissionCode))
|
||||||
|
existingPermissions.Add(existingPermission.PermissionCode, existingPermission);
|
||||||
|
}
|
||||||
|
existingReader.Close();
|
||||||
|
|
||||||
RoleDA.Update(tc, oRole);
|
RoleDA.Update(tc, oRole);
|
||||||
#region Delete Children
|
#region Delete Children
|
||||||
RoleDA.Delete(tc, "RolePermission", "RoleID", oRole.ID);
|
RoleDA.Delete(tc, "RolePermission", "RoleID", oRole.ID);
|
||||||
// RoleDA.Delete(tc, "Role.RoleActionPermission", "RoleID", oRole.ID);
|
//RoleDA.Delete(tc, "Role.RoleActionPermission", "RoleID", oRole.ID);
|
||||||
// RoleDA.Delete(tc, "RoleDesignation", "RoleID", oRole.ID);
|
//RoleDA.Delete(tc, "RoleDesignation", "RoleID", oRole.ID);
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
if (oRole.RolePermissions != null & oRole.RolePermissions.Count > 0)
|
if (oRole.RolePermissions != null & oRole.RolePermissions.Count > 0)
|
||||||
{
|
{
|
||||||
int maxID = oRole.RolePermissions.Max(x => x.ID);
|
int maxID = oRole.RolePermissions.Max(x => x.ID);
|
||||||
|
|
@ -372,11 +381,31 @@ namespace HRM.DA
|
||||||
|
|
||||||
newid = newid + 1;
|
newid = newid + 1;
|
||||||
}
|
}
|
||||||
|
// Whoever made this change: the editor, or the creator for a new role. On approval
|
||||||
|
// the controller keeps the maker in ModifiedBy, so this is still the maker.
|
||||||
|
int makerID = (oRole.ModifiedBy ?? 0) > 0 ? oRole.ModifiedBy.Value : oRole.CreatedBy;
|
||||||
foreach (Role.RolePermission rolePermission in oRole.RolePermissions)
|
foreach (Role.RolePermission rolePermission in oRole.RolePermissions)
|
||||||
{
|
{
|
||||||
rolePermission.RoleID = oRole.ID;
|
rolePermission.RoleID = oRole.ID;
|
||||||
rolePermission.CreatedBy = oRole.CreatedBy;
|
Role.RolePermission existingPermission = null;
|
||||||
rolePermission.CreatedDate = oRole.CreatedDate;
|
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;
|
||||||
|
}
|
||||||
//if (oRole.RoleStatus == EnumAuthStatus.Approved )
|
//if (oRole.RoleStatus == EnumAuthStatus.Approved )
|
||||||
//{
|
//{
|
||||||
// if (rolePermission.Status == EnumAuthStatus.DeletedNotYetApprove)
|
// if (rolePermission.Status == EnumAuthStatus.DeletedNotYetApprove)
|
||||||
|
|
@ -391,6 +420,17 @@ namespace HRM.DA
|
||||||
rolePermission.Status = EnumAuthStatus.Approved;
|
rolePermission.Status = EnumAuthStatus.Approved;
|
||||||
else
|
else
|
||||||
rolePermission.Status = EnumAuthStatus.None;
|
rolePermission.Status = EnumAuthStatus.None;
|
||||||
|
|
||||||
|
// A menu approved by this approval (new, or still pending before it) gets this
|
||||||
|
// approver; a menu that was already approved keeps its earlier approver.
|
||||||
|
bool approvedNow = existingPermission == null
|
||||||
|
|| existingPermission.Status == EnumAuthStatus.NewNotYetApprove
|
||||||
|
|| existingPermission.Status == EnumAuthStatus.EditedNotYetApprove;
|
||||||
|
if (rolePermission.Status == EnumAuthStatus.Approved && approvedNow)
|
||||||
|
{
|
||||||
|
rolePermission.ApproveBy = oRole.ApproveBy;
|
||||||
|
rolePermission.ApproveDate = oRole.ApproveDate;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,13 @@ namespace HRM.DA
|
||||||
base.SetObjectID(oUserAccessType, oReader.GetInt32("UserAccessTypeID").Value);
|
base.SetObjectID(oUserAccessType, oReader.GetInt32("UserAccessTypeID").Value);
|
||||||
oUserAccessType.PayrollTypeID = oReader.GetInt32("PayrollTypeID").Value;
|
oUserAccessType.PayrollTypeID = oReader.GetInt32("PayrollTypeID").Value;
|
||||||
oUserAccessType.UserID = oReader.GetInt32("UserID", 0);
|
oUserAccessType.UserID = oReader.GetInt32("UserID", 0);
|
||||||
|
oUserAccessType.AccessTypeStatus = (EnumAuthStatus)oReader.GetInt32("Status", (int)EnumAuthStatus.Approved);
|
||||||
|
oUserAccessType.CreatedBy = oReader.GetInt32("CreatedBy", 0);
|
||||||
|
oUserAccessType.CreatedDate = oReader.GetDateTime("CreatedDate", DateTime.MinValue);
|
||||||
|
oUserAccessType.ModifiedBy = oReader.GetInt32("ModifiedBy");
|
||||||
|
oUserAccessType.ModifiedDate = oReader.GetDateTime("ModifiedDate");
|
||||||
|
oUserAccessType.ApprovedBy = oReader.GetInt32("ApprovedBy");
|
||||||
|
oUserAccessType.ApprovedDate = oReader.GetDateTime("ApprovedDate");
|
||||||
this.SetObjectState(oUserAccessType, Ease.Core.ObjectState.Saved);
|
this.SetObjectState(oUserAccessType, Ease.Core.ObjectState.Saved);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -212,6 +219,175 @@ 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();
|
||||||
|
|
||||||
|
// 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.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)
|
||||||
|
{
|
||||||
|
TransactionContext tc = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
tc = TransactionContext.Begin(true);
|
||||||
|
UserAccessTypeDA.Reject(tc, userID);
|
||||||
|
tc.End();
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
#region Handle Exception
|
||||||
|
if (tc != null)
|
||||||
|
tc.HandleError();
|
||||||
|
ExceptionLog.Write(e);
|
||||||
|
throw new ServiceException(e.Message, e);
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
internal int Save(TransactionContext tc, UserAccessType oUserAccessType)
|
internal int Save(TransactionContext tc, UserAccessType oUserAccessType)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|
|
||||||
|
|
@ -14,5 +14,8 @@ export class UserAccessType extends BaseObject
|
||||||
public description: string = "";
|
public description: string = "";
|
||||||
public userID: number;
|
public userID: number;
|
||||||
public payrollTypeNameview: string;
|
public payrollTypeNameview: string;
|
||||||
|
/** Approved (5) = live; New_Not_Yet_Approve (2) = requested, not live yet; Deleted_Not_Yet_Approve (3) = removal requested, still live. */
|
||||||
public accessTypeStatus: EnumAuthStatus;
|
public accessTypeStatus: EnumAuthStatus;
|
||||||
|
public approvedBy?: number;
|
||||||
|
public approvedDate?: Date;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
// 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,6 +31,8 @@ export class BonusProcess extends BaseObject {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class BonusProcessDetail {
|
export class BonusProcessDetail {
|
||||||
|
// the saved row's BONUSPROCESSDETAILID (set on rows that came back from api/Bonus/processAndSave)
|
||||||
|
bonusProcessDetailID?: number;
|
||||||
isProjectedBonus: boolean;
|
isProjectedBonus: boolean;
|
||||||
bonusProcessID: number;
|
bonusProcessID: number;
|
||||||
bonusID: number;
|
bonusID: number;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,66 @@
|
||||||
|
// 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,6 +2,7 @@ import {Injectable} from '@angular/core';
|
||||||
import {ApiService} from '../../app.api.service';
|
import {ApiService} from '../../app.api.service';
|
||||||
import {HttpClient, HttpEvent, HttpRequest} from '@angular/common/http';
|
import {HttpClient, HttpEvent, HttpRequest} from '@angular/common/http';
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
|
import { BonusProcessAndSaveRequest, BonusProcessAndSaveResult } from '../../_models/Payroll/bonusProcessAndSave';
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
|
|
@ -35,6 +36,15 @@ export class DataUploadService {
|
||||||
return this.http.request<any>(req);
|
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):
|
public uploadBonusFile(selectedFile: File, payrolltypeid: number):
|
||||||
Observable<HttpEvent<any>> {
|
Observable<HttpEvent<any>> {
|
||||||
const formData: FormData = new FormData();
|
const formData: FormData = new FormData();
|
||||||
|
|
|
||||||
|
|
@ -231,6 +231,23 @@ export class AuthService {
|
||||||
return this.apiService.httpPost<boolean>('/Authentication/SaveUserAccessType', acesssTypes);
|
return this.apiService.httpPost<boolean>('/Authentication/SaveUserAccessType', acesssTypes);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
ApproveUserAccessType(userID: number) {
|
||||||
|
return this.apiService.httpPost<boolean>('/Authentication/ApproveUserAccessType/' + userID, {});
|
||||||
|
}
|
||||||
|
RejectUserAccessType(userID: number) {
|
||||||
|
return this.apiService.httpPost<boolean>('/Authentication/RejectUserAccessType/' + userID, {});
|
||||||
|
}
|
||||||
|
GetPendingUserAccessTypes() {
|
||||||
|
return this.apiService.httpGet<UserAccessType[]>('/Authentication/GetPendingUserAccessTypes');
|
||||||
|
}
|
||||||
|
/** Returns { done: number, failed: { userID, message }[] }. */
|
||||||
|
ApproveUserAccessTypes(userIDs: number[]) {
|
||||||
|
return this.apiService.httpPost<any>('/Authentication/ApproveUserAccessTypes', userIDs);
|
||||||
|
}
|
||||||
|
/** Returns { done: number, failed: { userID, message }[] }. */
|
||||||
|
RejectUserAccessTypes(userIDs: number[]) {
|
||||||
|
return this.apiService.httpPost<any>('/Authentication/RejectUserAccessTypes', userIDs);
|
||||||
|
}
|
||||||
changePassword(userData: any) {
|
changePassword(userData: any) {
|
||||||
return this.apiService.httpPost<any>('/Authentication/changePassword', userData);
|
return this.apiService.httpPost<any>('/Authentication/changePassword', userData);
|
||||||
}
|
}
|
||||||
|
|
@ -297,4 +314,7 @@ export class AuthService {
|
||||||
getIsFromUser(): boolean {
|
getIsFromUser(): boolean {
|
||||||
return this.isFromUserSubject.value;
|
return this.isFromUserSubject.value;
|
||||||
}
|
}
|
||||||
|
CipherMechanism(userData: any) {
|
||||||
|
return this.apiService.httpPost<any>('/Authentication/CipherMechanism', userData);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@ import {TrainingType} from '../../_models/Basic/trainingType';
|
||||||
import {EducationType} from '../../_models/HRBasic/education-type';
|
import {EducationType} from '../../_models/HRBasic/education-type';
|
||||||
import {NominationPurpose} from '../../_models/HRBasic/nomination-purpose';
|
import {NominationPurpose} from '../../_models/HRBasic/nomination-purpose';
|
||||||
import {Employee} from '../../_models/Employee/employee';
|
import {Employee} from '../../_models/Employee/employee';
|
||||||
|
import {EmployeeLite} from '../../_models/Employee/employeeLite';
|
||||||
import {EmployeeBankAccount} from '../../_models/Employee/employeeBankAccount';
|
import {EmployeeBankAccount} from '../../_models/Employee/employeeBankAccount';
|
||||||
import {EmployeeCostCenter} from '../../_models/Employee/employeeCostCenter';
|
import {EmployeeCostCenter} from '../../_models/Employee/employeeCostCenter';
|
||||||
import {Relation} from '../../_models/HRBasic/relation';
|
import {Relation} from '../../_models/HRBasic/relation';
|
||||||
|
|
@ -138,6 +139,11 @@ export class EmployeeServices {
|
||||||
getEmployeesByEmpIDs(data: any) {
|
getEmployeesByEmpIDs(data: any) {
|
||||||
return this.apiService.httpPost<Employee[]>('/Employee/getEmployeesByEmpIDs', data);
|
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) {
|
getEmployeeDetailByEmpIDs(data: any) {
|
||||||
return this.apiService.httpPost<Employee[]>('/Employee/getEmployeeDetailByEmpIDs', data);
|
return this.apiService.httpPost<Employee[]>('/Employee/getEmployeeDetailByEmpIDs', data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@ import { ProductionBonusSetup } from '../../_models/Payroll/ProductionBonus/prod
|
||||||
import { ProductionBonusSetupComponent } from 'src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component';
|
import { ProductionBonusSetupComponent } from 'src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component';
|
||||||
import { ProdBonusLine } from 'src/app/_models/Payroll/ProductionBonus/prodBonusLine';
|
import { ProdBonusLine } from 'src/app/_models/Payroll/ProductionBonus/prodBonusLine';
|
||||||
import { Employee } from 'src/app/_models/Employee/employee';
|
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 { ProdBonusAttn } from 'src/app/_models/Payroll/ProductionBonus/prodBonusAttn';
|
||||||
import { ProdBonusProcess } from 'src/app/_models/Payroll/ProductionBonus/prodBonusProcess';
|
import { ProdBonusProcess } from 'src/app/_models/Payroll/ProductionBonus/prodBonusProcess';
|
||||||
import { PRBCalculation, PRBCalculationReport, PRBKpi } from '../../_models/Payroll/prbCalculation';
|
import { PRBCalculation, PRBCalculationReport, PRBKpi } from '../../_models/Payroll/prbCalculation';
|
||||||
|
|
@ -44,6 +46,23 @@ export class BonusService {
|
||||||
saveBonusProcess(param: any) {
|
saveBonusProcess(param: any) {
|
||||||
return this.apiService.httpPost<any>('/Bonus/saveBonusProcess/', param);
|
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() {
|
GetUnApprovedBonusses() {
|
||||||
return this.apiService.httpGet<any>('/Bonus/GetUnApprovedBonusses' );
|
return this.apiService.httpGet<any>('/Bonus/GetUnApprovedBonusses' );
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ import { UserAccessTypeComponent } from './user-access-type/user-access-type.com
|
||||||
import {ChangePasswordComponent} from './change-password/change-password.component';
|
import {ChangePasswordComponent} from './change-password/change-password.component';
|
||||||
import { DataPermssionComponent } from './data-permssion/data-permssion.component';
|
import { DataPermssionComponent } from './data-permssion/data-permssion.component';
|
||||||
import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component';
|
import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component';
|
||||||
|
import { CipherEngineComponent } from './cipher-engine/cipher-engine.component';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -22,6 +23,7 @@ export const routes: Routes = [
|
||||||
{ path: 'change-password', component: ChangePasswordComponent, canActivate: [AuthGuard] },
|
{ path: 'change-password', component: ChangePasswordComponent, canActivate: [AuthGuard] },
|
||||||
{ path: 'data-permssion', component: DataPermssionComponent, canActivate: [AuthGuard] },
|
{ path: 'data-permssion', component: DataPermssionComponent, canActivate: [AuthGuard] },
|
||||||
{ path: 'system-auditlog', component: SystemAuditTrailComponent, canActivate: [AuthGuard] },
|
{ path: 'system-auditlog', component: SystemAuditTrailComponent, canActivate: [AuthGuard] },
|
||||||
|
{ path: 'cipher-engine', component: CipherEngineComponent, canActivate: [AuthGuard] },
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -110,6 +110,7 @@ import { KENDO_TREEVIEW } from '@progress/kendo-angular-treeview';
|
||||||
import { LayoutModule } from '@progress/kendo-angular-layout';
|
import { LayoutModule } from '@progress/kendo-angular-layout';
|
||||||
import { ExcelExportModule } from '@progress/kendo-angular-excel-export';
|
import { ExcelExportModule } from '@progress/kendo-angular-excel-export';
|
||||||
import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component';
|
import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail.component';
|
||||||
|
import { CipherEngineComponent } from './cipher-engine/cipher-engine.component';
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
|
@ -225,7 +226,8 @@ import { SystemAuditTrailComponent } from './system-audittrail/system.audittrail
|
||||||
ChangePasswordComponent,
|
ChangePasswordComponent,
|
||||||
UserComponent,
|
UserComponent,
|
||||||
DataPermssionComponent,
|
DataPermssionComponent,
|
||||||
SystemAuditTrailComponent
|
SystemAuditTrailComponent,
|
||||||
|
CipherEngineComponent
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
AppWindowPopUp,
|
AppWindowPopUp,
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,34 @@
|
||||||
|
<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>
|
||||||
|
|
@ -0,0 +1,61 @@
|
||||||
|
.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;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,61 @@
|
||||||
|
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) => {
|
(err: any) => {
|
||||||
//ON ERROR
|
//ON ERROR
|
||||||
this.loadingpanelService.ShowLoadingPanel = true;
|
this.loadingpanelService.ShowLoadingPanel = false;
|
||||||
|
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
|
|
@ -378,7 +378,7 @@ export class RolePermissionEntryComponent implements OnInit {
|
||||||
(err: any) => {
|
(err: any) => {
|
||||||
//ON ERROR
|
//ON ERROR
|
||||||
this.loadingpanelService.ShowLoadingPanel = false;
|
this.loadingpanelService.ShowLoadingPanel = false;
|
||||||
this.notificationService.showSuccess(err.error);
|
this.notificationService.showError(err.error);
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
this.loadingpanelService.ShowLoadingPanel = false;
|
this.loadingpanelService.ShowLoadingPanel = false;
|
||||||
|
|
|
||||||
|
|
@ -1 +1,45 @@
|
||||||
|
/* 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 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,8 +1,11 @@
|
||||||
|
<app-loading-panel></app-loading-panel>
|
||||||
<kendo-grid [data]="roles"
|
<kendo-grid [kendoGridBinding]="gridView"
|
||||||
|
class="rl-grid"
|
||||||
kendoGridSelectBy="id"
|
kendoGridSelectBy="id"
|
||||||
|
[pageSize]="20"
|
||||||
[pageable]="true"
|
[pageable]="true"
|
||||||
[sortable]="true"
|
[sortable]="true"
|
||||||
|
[filterable]="true"
|
||||||
[reorderable]="true"
|
[reorderable]="true"
|
||||||
[resizable]="true"
|
[resizable]="true"
|
||||||
[scrollable]="true"
|
[scrollable]="true"
|
||||||
|
|
@ -20,21 +23,56 @@
|
||||||
</kendo-grid-column>
|
</kendo-grid-column>
|
||||||
<kendo-grid-column field="description" title="Description">
|
<kendo-grid-column field="description" title="Description">
|
||||||
</kendo-grid-column>
|
</kendo-grid-column>
|
||||||
|
<kendo-grid-column field="roleType" title="Role Type">
|
||||||
|
<ng-template kendoGridCellTemplate let-dataItem>
|
||||||
|
<span class="rl-badge"
|
||||||
|
[class.rl-badge--admin]="dataItem.roleType == 1"
|
||||||
|
[class.rl-badge--ess]="dataItem.roleType == 2"
|
||||||
|
[class.rl-badge--mobile]="dataItem.roleType == 3"
|
||||||
|
[class.rl-badge--neutral]="dataItem.roleType != 1 && dataItem.roleType != 2 && dataItem.roleType != 3">
|
||||||
|
<span class="rl-badge__dot"></span>{{ roleTypeString(dataItem.roleType) }}
|
||||||
|
</span>
|
||||||
|
</ng-template>
|
||||||
|
</kendo-grid-column>
|
||||||
<kendo-grid-column field="roleStatus" title="Status">
|
<kendo-grid-column field="roleStatus" title="Status">
|
||||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||||
{{ statusString(dataItem.roleStatus)}}
|
<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>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</kendo-grid-column>
|
</kendo-grid-column>
|
||||||
<kendo-grid-command-column title="Edit/Approve" width="220">
|
<kendo-grid-command-column title="Edit/Approve" width="220">
|
||||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||||
@if (dataItem.roleStatus ==1 || dataItem.roleStatus ==5) {
|
@if (dataItem.roleStatus ==1 || dataItem.roleStatus ==5) {
|
||||||
<button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']" (click)="ViewPermission(rowIndex);">Edit</button>
|
<button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']" (click)="ViewPermission(roles.indexOf(dataItem));">Edit</button>
|
||||||
}
|
}
|
||||||
@if (dataItem.roleStatus !=1 && dataItem.roleStatus !=5) {
|
@if (dataItem.roleStatus !=1 && dataItem.roleStatus !=5) {
|
||||||
<button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']" (click)="Approve(rowIndex);">Approve</button>
|
<button class="k-button k-primary" kendoButton [svgIcon]="apiService.KendoSVGIcon['edit']" (click)="Approve(roles.indexOf(dataItem));">Approve</button>
|
||||||
}
|
}
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</kendo-grid-command-column>
|
</kendo-grid-command-column>
|
||||||
|
|
||||||
|
<kendo-grid-excel fileName="Roles.xlsx" [fetchData]="allData">
|
||||||
|
<kendo-excelexport-column field="code" title="Code" [width]="120"></kendo-excelexport-column>
|
||||||
|
<kendo-excelexport-column field="name" title="Name" [width]="200"></kendo-excelexport-column>
|
||||||
|
<kendo-excelexport-column field="description" title="Description" [width]="260"></kendo-excelexport-column>
|
||||||
|
<kendo-excelexport-column field="roleTypeText" title="Role Type" [width]="130"></kendo-excelexport-column>
|
||||||
|
<kendo-excelexport-column field="statusText" title="Status" [width]="110"></kendo-excelexport-column>
|
||||||
|
</kendo-grid-excel>
|
||||||
|
<kendo-grid-pdf fileName="Roles.pdf" [allPages]="true" [repeatHeaders]="true" paperSize="A4" [landscape]="true" [scale]="0.7">
|
||||||
|
<kendo-grid-column field="code" title="Code"></kendo-grid-column>
|
||||||
|
<kendo-grid-column field="name" title="Name"></kendo-grid-column>
|
||||||
|
<kendo-grid-column field="description" title="Description"></kendo-grid-column>
|
||||||
|
<kendo-grid-column field="roleType" title="Role Type">
|
||||||
|
<ng-template kendoGridCellTemplate let-dataItem>{{ roleTypeString(dataItem.roleType) }}</ng-template>
|
||||||
|
</kendo-grid-column>
|
||||||
|
<kendo-grid-column field="roleStatus" title="Status">
|
||||||
|
<ng-template kendoGridCellTemplate let-dataItem>{{ statusString(dataItem.roleStatus) }}</ng-template>
|
||||||
|
</kendo-grid-column>
|
||||||
|
</kendo-grid-pdf>
|
||||||
</kendo-grid>
|
</kendo-grid>
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -42,14 +80,15 @@
|
||||||
|
|
||||||
|
|
||||||
@if (showModal) {
|
@if (showModal) {
|
||||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650"
|
<div class="blur-background">
|
||||||
>
|
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650">
|
||||||
<kendo-dialog-titlebar>
|
<kendo-dialog-titlebar>
|
||||||
Role Permission
|
Role Permission
|
||||||
</kendo-dialog-titlebar>
|
</kendo-dialog-titlebar>
|
||||||
<app-role-permission-entry [setviewMode]="viewMode" [setRole]="selectedRole" (saveCompleted)="saveCompleted($event)">
|
<app-role-permission-entry [setviewMode]="viewMode" [setRole]="selectedRole" (saveCompleted)="saveCompleted($event)">
|
||||||
</app-role-permission-entry>
|
</app-role-permission-entry>
|
||||||
</kendo-dialog>
|
</kendo-dialog>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
<!--<p-dialog [(visible)]="showModal" [style]="{width: '700px',height:'800px', position: 'absolute'}" header="Role Information"
|
<!--<p-dialog [(visible)]="showModal" [style]="{width: '700px',height:'800px', position: 'absolute'}" header="Role Information"
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,15 @@
|
||||||
import {Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';
|
import {Component, OnInit, ViewChild, ViewEncapsulation, ChangeDetectionStrategy} from '@angular/core';
|
||||||
import {State} from '@progress/kendo-data-query';
|
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 {Router} from '@angular/router';
|
||||||
import {AuthService} from '../../../_services/auth/auth.service';
|
import {AuthService} from '../../../_services/auth/auth.service';
|
||||||
import {Role} from '../../../_models/Authentication/role';
|
import {Role} from '../../../_models/Authentication/role';
|
||||||
import { HRMNotificationService } from '../../../app.notification.service';
|
import { HRMNotificationService } from '../../../app.notification.service';
|
||||||
import { UntilityHandlerService } from '../../../utility.hanldler.service';
|
import { UntilityHandlerService } from '../../../utility.hanldler.service';
|
||||||
import { ApiService } from '../../../app.api.service';
|
import { ApiService } from '../../../app.api.service';
|
||||||
import { EnumAuthStatus } from '../../../_models/enums';
|
import { EnumAuthStatus, EnumExtension, EnumRoleType } from '../../../_models/enums';
|
||||||
|
import { loadingPanelService } from '../../../hrm-loding panel/loding.panel.service';
|
||||||
|
|
||||||
import { ButtonModule } from '@progress/kendo-angular-buttons';
|
import { ButtonModule } from '@progress/kendo-angular-buttons';
|
||||||
import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
|
import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
|
||||||
|
|
@ -26,16 +29,23 @@ import { DatePickerModule } from '@progress/kendo-angular-dateinputs';
|
||||||
// This blocks global css to this component
|
// This blocks global css to this component
|
||||||
})
|
})
|
||||||
export class RolePermissionListComponent implements OnInit {
|
export class RolePermissionListComponent implements OnInit {
|
||||||
|
@ViewChild(DataBindingDirective) dataBinding: DataBindingDirective;
|
||||||
|
@ViewChild(GridComponent) grid: GridComponent;
|
||||||
|
/** Rows the grid binds to: `roles` narrowed by the toolbar search box. Column filters, sort and paging are done by kendoGridBinding. */
|
||||||
|
gridView: Role[] = [];
|
||||||
|
searchText = '';
|
||||||
showModal: boolean;
|
showModal: boolean;
|
||||||
IsNew = true;
|
IsNew = true;
|
||||||
roles: Role[];
|
roles: Role[];
|
||||||
selectedRole: Role;
|
selectedRole: Role;
|
||||||
viewMode: number =1; //1 new, 2 edit ,3 approve
|
viewMode: number =1; //1 new, 2 edit ,3 approve
|
||||||
constructor(public useService: AuthService,public apiService: ApiService,
|
constructor(public useService: AuthService,public apiService: ApiService,
|
||||||
public router: Router, public utilityService: UntilityHandlerService, public apiservice: ApiService) {
|
public router: Router, public utilityService: UntilityHandlerService, public apiservice: ApiService,
|
||||||
|
public loadingPanel: loadingPanelService) {
|
||||||
this.setSelectableSettings();
|
this.setSelectableSettings();
|
||||||
this.utilityService.ShowLoadingPanel = true;
|
this.loadingPanel.ShowLoadingPanel = true;
|
||||||
this.apiservice.selectedMenuName="Role Entry"
|
this.apiservice.selectedMenuName="Role Entry"
|
||||||
|
this.allData = this.allData.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ngOnInit(): void {
|
public ngOnInit(): void {
|
||||||
|
|
@ -49,15 +59,17 @@ export class RolePermissionListComponent implements OnInit {
|
||||||
this.useService.getAllRoles()
|
this.useService.getAllRoles()
|
||||||
.subscribe(
|
.subscribe(
|
||||||
(resp: any) => {
|
(resp: any) => {
|
||||||
|
debugger;
|
||||||
this.roles = resp;
|
this.roles = resp;
|
||||||
|
this.refreshGridView();
|
||||||
},
|
},
|
||||||
(err: any) => {
|
(err: any) => {
|
||||||
//ON ERROR
|
//ON ERROR
|
||||||
console.log(err);
|
console.log(err);
|
||||||
this.utilityService.ShowLoadingPanel = false;
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
this.utilityService.ShowLoadingPanel = false;
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
@ -77,6 +89,9 @@ export class RolePermissionListComponent implements OnInit {
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case EnumAuthStatus.Active: { str = "Active"; break };
|
case EnumAuthStatus.Active: { str = "Active"; break };
|
||||||
case EnumAuthStatus.Approved: { str = "Active"; break };
|
case EnumAuthStatus.Approved: { str = "Active"; break };
|
||||||
|
case EnumAuthStatus.New_Not_Yet_Approve: { str = "New - Not Yet Approved"; break };
|
||||||
|
case EnumAuthStatus.Edited_Not_Yet_Approve: { str = "Edited - Not Yet Approved"; break };
|
||||||
|
case EnumAuthStatus.Deleted_Not_Yet_Approve: { str = "Deleted - Not Yet Approved"; break };
|
||||||
|
|
||||||
default: str="In-Active"
|
default: str="In-Active"
|
||||||
}
|
}
|
||||||
|
|
@ -102,14 +117,67 @@ export class RolePermissionListComponent implements OnInit {
|
||||||
|
|
||||||
var index = this.roles.findIndex(x => x.id == role.id);
|
var index = this.roles.findIndex(x => x.id == role.id);
|
||||||
this.roles[index] = role;
|
this.roles[index] = role;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
this.refreshGridView();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.showModal = false;
|
this.showModal = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Excel export: every row the grid currently shows across all pages (not just the visible page),
|
||||||
|
* with Role Type and Status as text.
|
||||||
|
*/
|
||||||
|
public allData(): ExcelExportData {
|
||||||
|
const rows = process(this.gridView ?? [], {
|
||||||
|
filter: this.grid?.filter,
|
||||||
|
sort: this.grid?.sort,
|
||||||
|
}).data;
|
||||||
|
return {
|
||||||
|
data: rows.map((r: Role) => ({
|
||||||
|
code: r.code,
|
||||||
|
name: r.name,
|
||||||
|
description: r.description,
|
||||||
|
roleTypeText: this.roleTypeString(r.roleType),
|
||||||
|
statusText: this.statusString(r.roleStatus),
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Role Type column text, the same names the entry dialog's Role Type dropdown shows. */
|
||||||
|
roleTypeString(roleType: number): string {
|
||||||
|
return EnumExtension.getName(EnumRoleType, roleType);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Toolbar search box: keeps the roles whose code, name or description contain the text. */
|
||||||
|
public onFilter(value: string): void {
|
||||||
|
this.searchText = value ?? '';
|
||||||
|
this.refreshGridView();
|
||||||
|
if (this.dataBinding) {
|
||||||
|
this.dataBinding.skip = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private refreshGridView(): void {
|
||||||
|
const term = this.searchText.trim();
|
||||||
|
if (!term) {
|
||||||
|
this.gridView = (this.roles ?? []).slice();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.gridView = process(this.roles ?? [], {
|
||||||
|
filter: {
|
||||||
|
logic: 'or',
|
||||||
|
filters: [
|
||||||
|
{field: 'code', operator: 'contains', value: term},
|
||||||
|
{field: 'name', operator: 'contains', value: term},
|
||||||
|
{field: 'description', operator: 'contains', value: term},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
}).data;
|
||||||
|
}
|
||||||
|
|
||||||
public editHandler(rowIndex: any) {
|
public editHandler(rowIndex: any) {
|
||||||
this.viewMode = 2;
|
this.viewMode = 2;
|
||||||
this.selectedRole = this.roles[rowIndex];
|
this.selectedRole = this.roles[rowIndex];
|
||||||
|
|
|
||||||
|
|
@ -1 +1,233 @@
|
||||||
|
.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,36 +1,118 @@
|
||||||
<app-loading-panel> </app-loading-panel>
|
<app-loading-panel></app-loading-panel>
|
||||||
<div class="card card-w-title">
|
|
||||||
<div class="col-12">
|
<div class="sc-page">
|
||||||
<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>
|
<!-- Page header -->
|
||||||
</div>
|
<div class="sc-header">
|
||||||
<div class="col-12">
|
<div class="sc-header-icon">
|
||||||
<div class="grid">
|
<i class="pi pi-cog"></i>
|
||||||
<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>
|
|
||||||
</div>
|
</div>
|
||||||
</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">
|
||||||
|
</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>
|
||||||
|
<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,6 +59,13 @@ export class SystemConfigurationComponent implements OnInit {
|
||||||
_fromValidator: FormGroup;
|
_fromValidator: FormGroup;
|
||||||
selectedFiles?: FileList;
|
selectedFiles?: FileList;
|
||||||
|
|
||||||
|
// UI state for the redesigned template
|
||||||
|
public isDragging = false;
|
||||||
|
public selectedFileName = '';
|
||||||
|
public selectedFileSize = '';
|
||||||
|
public statusType: 'success' | 'error' | '' = '';
|
||||||
|
public statusMessage = '';
|
||||||
|
|
||||||
configtypes: any = EnumExtension.getNamesAndValues(EnumConfigurationType);
|
configtypes: any = EnumExtension.getNamesAndValues(EnumConfigurationType);
|
||||||
|
|
||||||
constructor(public systemConfigService: SystemConfigurationService,
|
constructor(public systemConfigService: SystemConfigurationService,
|
||||||
|
|
@ -160,10 +167,14 @@ export class SystemConfigurationComponent implements OnInit {
|
||||||
(err) => {
|
(err) => {
|
||||||
this.loadingPanelService.ShowLoadingPanel = false;
|
this.loadingPanelService.ShowLoadingPanel = false;
|
||||||
this.notificationService.showError(err.error);
|
this.notificationService.showError(err.error);
|
||||||
|
this.statusType = 'error';
|
||||||
|
this.statusMessage = err.error;
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
this.loadingPanelService.ShowLoadingPanel = false;
|
this.loadingPanelService.ShowLoadingPanel = false;
|
||||||
this.notificationService.showSuccess("Data uploaded successfully.")
|
this.notificationService.showSuccess("Data uploaded successfully.")
|
||||||
|
this.statusType = 'success';
|
||||||
|
this.statusMessage = 'File uploaded successfully.';
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -279,12 +290,63 @@ export class SystemConfigurationComponent implements OnInit {
|
||||||
selectFile(event: any): void {
|
selectFile(event: any): void {
|
||||||
|
|
||||||
this.selectedFiles = event.target.files;
|
this.selectedFiles = event.target.files;
|
||||||
|
if (this.selectedFiles && this.selectedFiles.length > 0) {
|
||||||
|
const file = this.selectedFiles.item(0);
|
||||||
|
this.selectedFileName = file.name;
|
||||||
|
this.selectedFileSize = this.formatFileSize(file.size);
|
||||||
|
this.statusType = '';
|
||||||
|
this.statusMessage = '';
|
||||||
|
}
|
||||||
|
|
||||||
//if (this.selectedFiles.length > 0) {
|
//if (this.selectedFiles.length > 0) {
|
||||||
// const file: File | null = this.selectedFiles.item(0);
|
// const file: File | null = this.selectedFiles.item(0);
|
||||||
// this.selectedFiles = file;
|
// this.selectedFiles = file;
|
||||||
//}
|
//}
|
||||||
}
|
}
|
||||||
|
onDragOver(event: DragEvent): void {
|
||||||
|
event.preventDefault();
|
||||||
|
this.isDragging = true;
|
||||||
|
}
|
||||||
|
onDragLeave(): void {
|
||||||
|
this.isDragging = false;
|
||||||
|
}
|
||||||
|
onDrop(event: DragEvent): void {
|
||||||
|
event.preventDefault();
|
||||||
|
this.isDragging = false;
|
||||||
|
const files = event.dataTransfer?.files;
|
||||||
|
if (files && files.length > 0) {
|
||||||
|
const file = files[0];
|
||||||
|
if (!file.name.endsWith('.xml')) {
|
||||||
|
this.notificationService.showWarning('Only .xml files are accepted.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const dt = new DataTransfer();
|
||||||
|
dt.items.add(file);
|
||||||
|
this.selectedFiles = dt.files;
|
||||||
|
this.selectedFileName = file.name;
|
||||||
|
this.selectedFileSize = this.formatFileSize(file.size);
|
||||||
|
this.statusType = '';
|
||||||
|
this.statusMessage = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
clearFile(): void {
|
||||||
|
this.selectedFiles = null;
|
||||||
|
this.selectedFileName = '';
|
||||||
|
this.selectedFileSize = '';
|
||||||
|
this.statusType = '';
|
||||||
|
this.statusMessage = '';
|
||||||
|
}
|
||||||
|
formatFileSize(bytes: number): string {
|
||||||
|
if (bytes < 1024) return bytes + ' B';
|
||||||
|
if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(1) + ' KB';
|
||||||
|
return (bytes / (1024 * 1024)).toFixed(1) + ' MB';
|
||||||
|
}
|
||||||
|
get canUpload(): boolean {
|
||||||
|
return !!this.fileTypeid && !!this.selectedFiles && this.selectedFiles.length > 0;
|
||||||
|
}
|
||||||
|
get canDownload(): boolean {
|
||||||
|
return !!this.fileTypeid;
|
||||||
|
}
|
||||||
public downloadFile(uid: string): void {
|
public downloadFile(uid: string): void {
|
||||||
const temporiginalName = '';
|
const temporiginalName = '';
|
||||||
let tempName = '';
|
let tempName = '';
|
||||||
|
|
|
||||||
|
|
@ -1 +1,598 @@
|
||||||
|
/* 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,50 +1,287 @@
|
||||||
|
<app-loading-panel></app-loading-panel>
|
||||||
|
|
||||||
<div class="card">
|
<div class="uat-page">
|
||||||
<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">
|
|
||||||
|
|
||||||
<kendo-dropdownlist [data]="_users"
|
<!-- Page header -->
|
||||||
id="idUser"
|
<div class="uat-header">
|
||||||
[defaultItem]="{ name: 'select a User', id: null }"
|
<div class="uat-header__icon"><i class="pi pi-id-card"></i></div>
|
||||||
[textField]="'userName'"
|
<div>
|
||||||
[valueField]="'id'"
|
<h2 class="uat-title">User Access Type</h2>
|
||||||
[valuePrimitive]="true"
|
<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>
|
||||||
[(ngModel)]="_selectedUserID"
|
</div>
|
||||||
(valueChange)="RefreshGrid($event)"
|
</div>
|
||||||
class="form-control form-control-sm input-sm">
|
|
||||||
</kendo-dropdownlist>
|
<!-- View switch -->
|
||||||
</div>
|
<div class="uat-views" role="tablist">
|
||||||
<div class="col-12 md:col-6">
|
<button type="button" role="tab" class="uat-view" [class.is-active]="activeView === 'manage'" (click)="activeView = 'manage'">
|
||||||
</div>
|
<i class="pi pi-user-edit"></i> Manage access
|
||||||
|
</button>
|
||||||
|
<button type="button" role="tab" class="uat-view" [class.is-active]="activeView === 'pending'" (click)="activeView = 'pending'; loadPending()">
|
||||||
|
<i class="pi pi-clock"></i> Pending approvals
|
||||||
|
<span class="uat-view__count" [class.has-items]="pendingGroups.length > 0">{{ pendingGroups.length }}</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if (activeView === 'pending') {
|
||||||
|
<div class="uat-card">
|
||||||
|
<div class="uat-list__head">
|
||||||
|
<div>
|
||||||
|
<p class="uat-card__title">Pending approvals</p>
|
||||||
|
<p class="uat-muted">Every user whose payroll access change is waiting for approval. Select several and approve or reject them at once.</p>
|
||||||
</div>
|
</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>
|
</div>
|
||||||
|
|
||||||
<div class="card card-w-title">
|
<!-- A change waiting for approval -->
|
||||||
<div class="grid">
|
@if (selectedUser && hasPending) {
|
||||||
<div class="col-12">
|
<div class="uat-card uat-pending">
|
||||||
<kendo-grid [kendoGridBinding]="_payrollTypes"
|
<div class="uat-pending__head">
|
||||||
kendoGridSelectBy="id"
|
<i class="pi pi-clock"></i>
|
||||||
[selectable]="selectableSettings"
|
<div>
|
||||||
[(selectedKeys)]="_selectedPayrollTypes"
|
<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>
|
||||||
<kendo-grid-checkbox-column [width]="40"
|
</div>
|
||||||
[headerClass]="{'text-center': true}"
|
|
||||||
[class]="{'text-center': true}"
|
@if (pendingAddNames.length > 0) {
|
||||||
[resizable]="false"
|
<div class="uat-change">
|
||||||
[columnMenu]="false"
|
<span class="uat-change__label">Will get access to</span>
|
||||||
showSelectAll="true"></kendo-grid-checkbox-column>
|
<div class="uat-chips">
|
||||||
<kendo-grid-column field="description" title="Access Type" [width]="220">
|
@for (n of pendingAddNames; track n) { <span class="uat-chip uat-chip--add"><i class="pi pi-plus"></i>{{ n }}</span> }
|
||||||
</kendo-grid-column>
|
|
||||||
</kendo-grid>
|
|
||||||
</div>
|
</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">
|
</div>
|
||||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['save']" class="k-button k-primary" (click)="onSave()">Save</button>
|
}
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Right: the access -->
|
||||||
|
<div class="uat-main">
|
||||||
|
|
||||||
|
@if (!selectedUser) {
|
||||||
|
<div class="uat-card uat-empty">
|
||||||
|
<i class="pi pi-user uat-empty__icon"></i>
|
||||||
|
<p class="uat-empty__title">Select a user</p>
|
||||||
|
<p class="uat-muted">Their payroll access and any change waiting for approval will show here.</p>
|
||||||
|
</div>
|
||||||
|
} @else {
|
||||||
|
|
||||||
|
<!-- Payroll types -->
|
||||||
|
<div class="uat-card">
|
||||||
|
<div class="uat-list__head">
|
||||||
|
<div>
|
||||||
|
<p class="uat-card__title">
|
||||||
|
Payroll access
|
||||||
|
<span class="uat-count">{{ _selectedPayrollTypes.length }} of {{ _payrollTypes?.length || 0 }} selected</span>
|
||||||
|
</p>
|
||||||
|
<p class="uat-muted">{{ hasPending ? 'Locked while the change waits for approval.' : 'Tick the payroll types this user should have.' }}</p>
|
||||||
|
</div>
|
||||||
|
<div class="uat-list__tools">
|
||||||
|
<kendo-textbox class="uat-search" placeholder="Search payroll type" [clearButton]="true"
|
||||||
|
[value]="payrollSearch" (valueChange)="payrollSearch = $event ?? ''"></kendo-textbox>
|
||||||
|
@if (!hasPending) {
|
||||||
|
<button kendoButton type="button" fillMode="flat" (click)="selectAllVisible()">Select all</button>
|
||||||
|
<button kendoButton type="button" fillMode="flat" (click)="clearAllVisible()">Clear</button>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="uat-list" [class.uat-list--locked]="hasPending">
|
||||||
|
@for (p of visiblePayrollTypes; track p.id) {
|
||||||
|
<label class="uat-row" [class.is-ticked]="isTicked(p.id)">
|
||||||
|
<input type="checkbox" kendoCheckBox [checked]="isTicked(p.id)" [disabled]="hasPending" (change)="toggle(p.id)" />
|
||||||
|
<span class="uat-row__name">{{ p.description }}</span>
|
||||||
|
<span class="uat-badge uat-badge--{{ rowBadge(p.id).tone }}">
|
||||||
|
<span class="uat-badge__dot"></span>{{ rowBadge(p.id).text }}
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
} @empty {
|
||||||
|
<div class="uat-list__empty uat-muted">No payroll type matches the search.</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Save bar -->
|
||||||
|
@if (!hasPending) {
|
||||||
|
<div class="uat-savebar">
|
||||||
|
<div class="uat-savebar__summary">
|
||||||
|
@if (hasDraftChanges) {
|
||||||
|
@if (draftAddNames.length > 0) { <span class="uat-chip uat-chip--add"><i class="pi pi-plus"></i>{{ draftAddNames.length }} to add</span> }
|
||||||
|
@if (draftRemoveNames.length > 0) { <span class="uat-chip uat-chip--remove"><i class="pi pi-minus"></i>{{ draftRemoveNames.length }} to remove</span> }
|
||||||
|
} @else {
|
||||||
|
<span class="uat-muted">No changes yet.</span>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
<div class="uat-btns">
|
||||||
|
<button kendoButton type="button" fillMode="flat" [disabled]="!hasDraftChanges" (click)="resetSelection()">Reset</button>
|
||||||
|
<button kendoButton type="button" themeColor="primary" [svgIcon]="apiService.KendoSVGIcon['paperPlane']"
|
||||||
|
[disabled]="!hasDraftChanges" (click)="onSave()">Send for approval</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ import {EnumUserType, EnumAuthStatus} from '../../_models/enums';
|
||||||
import {SelectableSettings} from '@progress/kendo-angular-grid';
|
import {SelectableSettings} from '@progress/kendo-angular-grid';
|
||||||
import {ApiService} from '../../app.api.service';
|
import {ApiService} from '../../app.api.service';
|
||||||
import {HRMNotificationService} from '../../app.notification.service';
|
import {HRMNotificationService} from '../../app.notification.service';
|
||||||
|
import {loadingPanelService} from '../../hrm-loding panel/loding.panel.service';
|
||||||
|
|
||||||
import { ButtonModule } from '@progress/kendo-angular-buttons';
|
import { ButtonModule } from '@progress/kendo-angular-buttons';
|
||||||
import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
|
import { DropDownListModule } from '@progress/kendo-angular-dropdowns';
|
||||||
|
|
@ -38,18 +39,30 @@ export class UserAccessTypeComponent implements OnInit {
|
||||||
_selectedUserID: number;
|
_selectedUserID: number;
|
||||||
_selectedPayrollTypes: number[]=[];
|
_selectedPayrollTypes: number[]=[];
|
||||||
public selectableSettings: SelectableSettings;
|
public selectableSettings: SelectableSettings;
|
||||||
|
/** Logged-in user's ID: the maker of a pending change cannot approve or reject it. */
|
||||||
|
currentUserID: number;
|
||||||
|
|
||||||
constructor(public notificationService: HRMNotificationService, public useService: AuthService, public apiService: ApiService) {
|
constructor(public notificationService: HRMNotificationService, public useService: AuthService, public apiService: ApiService,
|
||||||
|
public loadingPanel: loadingPanelService) {
|
||||||
this.apiService.selectedMenuName = ' User Access-Type Entry';
|
this.apiService.selectedMenuName = ' User Access-Type Entry';
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this._selectedUserID = undefined;
|
this._selectedUserID = undefined;
|
||||||
this._selectedPayrollTypes = [];
|
this._selectedPayrollTypes = [];
|
||||||
|
this._userAcessTypes = [];
|
||||||
|
this.useService.GetCurrentUser().subscribe(
|
||||||
|
(resp: any) => {
|
||||||
|
this.currentUserID = resp?.userID;
|
||||||
|
// After the current user is known, so "your own change" can be marked.
|
||||||
|
this.loadPending();
|
||||||
|
},
|
||||||
|
);
|
||||||
this.useService.GetUsers(EnumUserType.User)
|
this.useService.GetUsers(EnumUserType.User)
|
||||||
.subscribe(
|
.subscribe(
|
||||||
(resp: any) => {
|
(resp: any) => {
|
||||||
this._users = resp;
|
this._users = resp;
|
||||||
|
this.filteredUsers = (resp ?? []).slice();
|
||||||
},
|
},
|
||||||
(err: any) => {
|
(err: any) => {
|
||||||
//ON ERROR
|
//ON ERROR
|
||||||
|
|
@ -78,6 +91,141 @@ export class UserAccessTypeComponent implements OnInit {
|
||||||
this.setSelectableSettings();
|
this.setSelectableSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------- Pending approvals (many users at once) ----------
|
||||||
|
|
||||||
|
/** Which view the page shows. */
|
||||||
|
activeView: 'manage' | 'pending' = 'manage';
|
||||||
|
/** One entry per user with a change waiting for approval. */
|
||||||
|
pendingGroups: {
|
||||||
|
userID: number, userName: string, loginID: string,
|
||||||
|
adds: string[], removes: string[], makers: string[], requestDate: Date, isMine: boolean,
|
||||||
|
}[] = [];
|
||||||
|
selectedPendingIDs: number[] = [];
|
||||||
|
|
||||||
|
loadPending(): void {
|
||||||
|
this.useService.GetPendingUserAccessTypes().subscribe(
|
||||||
|
(rows: any[]) => {
|
||||||
|
const groups = new Map<number, any>();
|
||||||
|
(rows ?? []).forEach(r => {
|
||||||
|
let g = groups.get(r.userID);
|
||||||
|
if (!g) {
|
||||||
|
g = { userID: r.userID, userName: r.userName, loginID: r.loginID,
|
||||||
|
adds: [], removes: [], makers: [], makerIDs: [], requestDate: null, isMine: false };
|
||||||
|
groups.set(r.userID, g);
|
||||||
|
}
|
||||||
|
if (r.accessTypeStatus == EnumAuthStatus.Deleted_Not_Yet_Approve) {
|
||||||
|
g.removes.push(r.description);
|
||||||
|
} else {
|
||||||
|
g.adds.push(r.description);
|
||||||
|
}
|
||||||
|
const maker = r.makerLoginID || (r.makerID ? '#' + r.makerID : '');
|
||||||
|
if (maker && !g.makers.includes(maker)) {
|
||||||
|
g.makers.push(maker);
|
||||||
|
}
|
||||||
|
if (r.makerID && !g.makerIDs.includes(r.makerID)) {
|
||||||
|
g.makerIDs.push(r.makerID);
|
||||||
|
}
|
||||||
|
const d = r.requestDate ? new Date(r.requestDate) : null;
|
||||||
|
if (d && (!g.requestDate || d > g.requestDate)) {
|
||||||
|
g.requestDate = d;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this.pendingGroups = Array.from(groups.values()).map(g => ({
|
||||||
|
...g, isMine: g.makerIDs.includes(this.currentUserID),
|
||||||
|
}));
|
||||||
|
// Keep only selections that are still pending and selectable.
|
||||||
|
this.selectedPendingIDs = this.selectedPendingIDs.filter(id =>
|
||||||
|
this.pendingGroups.some(g => g.userID == id && !g.isMine));
|
||||||
|
},
|
||||||
|
(err: any) => {
|
||||||
|
this.pendingGroups = [];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Pending users the logged-in user may decide (not their own changes). */
|
||||||
|
get selectablePending() {
|
||||||
|
return this.pendingGroups.filter(g => !g.isMine);
|
||||||
|
}
|
||||||
|
|
||||||
|
isPendingSelected(userID: number): boolean {
|
||||||
|
return this.selectedPendingIDs.includes(userID);
|
||||||
|
}
|
||||||
|
|
||||||
|
togglePendingSelection(userID: number): void {
|
||||||
|
const g = this.pendingGroups.find(x => x.userID == userID);
|
||||||
|
if (!g || g.isMine) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.selectedPendingIDs = this.isPendingSelected(userID)
|
||||||
|
? this.selectedPendingIDs.filter(x => x != userID)
|
||||||
|
: [...this.selectedPendingIDs, userID];
|
||||||
|
}
|
||||||
|
|
||||||
|
get allPendingSelected(): boolean {
|
||||||
|
return this.selectablePending.length > 0 && this.selectablePending.every(g => this.isPendingSelected(g.userID));
|
||||||
|
}
|
||||||
|
|
||||||
|
toggleAllPending(): void {
|
||||||
|
this.selectedPendingIDs = this.allPendingSelected ? [] : this.selectablePending.map(g => g.userID);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Opens one pending user in the Manage access view. */
|
||||||
|
openPendingUser(userID: number): void {
|
||||||
|
this.activeView = 'manage';
|
||||||
|
this._selectedUserID = userID;
|
||||||
|
this.RefreshGrid(userID);
|
||||||
|
}
|
||||||
|
|
||||||
|
bulkApprove(): void {
|
||||||
|
this.bulkDecide(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
bulkReject(): void {
|
||||||
|
this.bulkDecide(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private bulkDecide(approve: boolean): void {
|
||||||
|
const ids = this.selectedPendingIDs.slice();
|
||||||
|
if (ids.length == 0) {
|
||||||
|
this.notificationService.showWarning('Select at least one user.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const call = approve ? this.useService.ApproveUserAccessTypes(ids) : this.useService.RejectUserAccessTypes(ids);
|
||||||
|
let result: any;
|
||||||
|
this.loadingPanel.ShowLoadingPanel = true;
|
||||||
|
call.subscribe(
|
||||||
|
(resp: any) => {
|
||||||
|
result = resp;
|
||||||
|
},
|
||||||
|
(err: any) => {
|
||||||
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
|
this.notificationService.showError(err?.error ?? err);
|
||||||
|
},
|
||||||
|
() => {
|
||||||
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
|
const done = result?.done ?? 0;
|
||||||
|
const failed: any[] = result?.failed ?? [];
|
||||||
|
if (done > 0) {
|
||||||
|
this.notificationService.showSuccess(
|
||||||
|
(approve ? 'Approved' : 'Rejected') + ' for ' + done + (done == 1 ? ' user.' : ' users.'));
|
||||||
|
}
|
||||||
|
if (failed.length > 0) {
|
||||||
|
const names = failed.map(f => {
|
||||||
|
const g = this.pendingGroups.find(x => x.userID == f.userID);
|
||||||
|
return (g?.userName ?? ('User ' + f.userID)) + ': ' + f.message;
|
||||||
|
});
|
||||||
|
this.notificationService.showError(names.join(' | '));
|
||||||
|
}
|
||||||
|
this.selectedPendingIDs = [];
|
||||||
|
this.loadPending();
|
||||||
|
if (this._selectedUserID && ids.includes(this._selectedUserID)) {
|
||||||
|
this.RefreshGrid(this._selectedUserID);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
setSelectableSettings(): void {
|
setSelectableSettings(): void {
|
||||||
this.selectableSettings = {
|
this.selectableSettings = {
|
||||||
checkboxOnly: true,
|
checkboxOnly: true,
|
||||||
|
|
@ -85,12 +233,197 @@ 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 call = approve ? this.useService.ApproveUserAccessType(userID) : this.useService.RejectUserAccessType(userID);
|
||||||
|
this.loadingPanel.ShowLoadingPanel = true;
|
||||||
|
call.subscribe(
|
||||||
|
() => { },
|
||||||
|
(err: any) => {
|
||||||
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
|
this.notificationService.showError(err?.error ?? err);
|
||||||
|
},
|
||||||
|
() => {
|
||||||
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
|
this.notificationService.showSuccess(approve ? 'Approved Successfully.' : 'Rejected Successfully.');
|
||||||
|
this.RefreshGrid(userID);
|
||||||
|
this.loadPending();
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
RefreshGrid(selectedUser: any) {
|
RefreshGrid(selectedUser: any) {
|
||||||
this._selectedPayrollTypes = [];
|
this._selectedPayrollTypes = [];
|
||||||
|
this._userAcessTypes = [];
|
||||||
|
this.setSelectableSettings();
|
||||||
|
if (selectedUser == undefined || selectedUser == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.useService.GetUserAccessType(selectedUser)
|
this.useService.GetUserAccessType(selectedUser)
|
||||||
.subscribe(
|
.subscribe(
|
||||||
(resp: any) => {
|
(resp: any) => {
|
||||||
this._userAcessTypes = resp;
|
this._userAcessTypes = resp ?? [];
|
||||||
},
|
},
|
||||||
(err: any) => {
|
(err: any) => {
|
||||||
//ON ERROR
|
//ON ERROR
|
||||||
|
|
@ -98,16 +431,20 @@ export class UserAccessTypeComponent implements OnInit {
|
||||||
() => {
|
() => {
|
||||||
|
|
||||||
this._userAcessTypes.forEach(x => {
|
this._userAcessTypes.forEach(x => {
|
||||||
|
// A removal waiting for approval shows unticked: the ticks show the requested state.
|
||||||
|
if (x.accessTypeStatus == EnumAuthStatus.Deleted_Not_Yet_Approve) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
var ptype: PayrollType = this._payrollTypes.find(y => y.id == x.payrollTypeID);
|
var ptype: PayrollType = this._payrollTypes.find(y => y.id == x.payrollTypeID);
|
||||||
if (ptype != undefined) {
|
if (ptype != undefined) {
|
||||||
this._selectedPayrollTypes.push(ptype.id);
|
this._selectedPayrollTypes.push(ptype.id);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this._selectedPayrollTypes = [... this._selectedPayrollTypes];
|
this._selectedPayrollTypes = [... this._selectedPayrollTypes];
|
||||||
|
this.setSelectableSettings();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public onSelectionPayrollChange(event: any): void {
|
public onSelectionPayrollChange(event: any): void {
|
||||||
|
|
@ -119,57 +456,49 @@ export class UserAccessTypeComponent implements OnInit {
|
||||||
public onSave(): void {
|
public onSave(): void {
|
||||||
|
|
||||||
this._userAcessTypesforSave= [];
|
this._userAcessTypesforSave= [];
|
||||||
if (this._selectedPayrollTypes.length <= 0) {
|
if (this._selectedUserID == undefined || this._selectedUserID == null) {
|
||||||
|
this.notificationService.showWarning('Select a user.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// New Item
|
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).
|
||||||
this._selectedPayrollTypes.forEach(x => {
|
this._selectedPayrollTypes.forEach(x => {
|
||||||
|
var ptype: UserAccessType = new UserAccessType();
|
||||||
var ptype: UserAccessType = this._userAcessTypes.find(y => x == y.payrollTypeID);
|
ptype.userID = this._selectedUserID;
|
||||||
if (ptype == undefined) {
|
ptype.payrollTypeID = x;
|
||||||
var newItem: UserAccessType = new UserAccessType();
|
let payrollType = this._payrollTypes.find(p => p.id === x);
|
||||||
newItem.userID = this._selectedUserID;
|
if (payrollType) {
|
||||||
newItem.payrollTypeID = x;
|
ptype.description = payrollType.description;
|
||||||
this._userAcessTypes.push(newItem);
|
|
||||||
|
|
||||||
ptype = new UserAccessType();
|
|
||||||
ptype.userID = this._selectedUserID;
|
|
||||||
ptype.payrollTypeID = x;
|
|
||||||
}
|
}
|
||||||
this._userAcessTypesforSave.push(ptype);
|
this._userAcessTypesforSave.push(ptype);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.loadingPanel.ShowLoadingPanel = true;
|
||||||
|
|
||||||
|
|
||||||
// Modify Existing which unchecked
|
|
||||||
this._userAcessTypes.forEach(x => {
|
|
||||||
|
|
||||||
var ptype: number = this._selectedPayrollTypes.find(y => x.payrollTypeID == y);
|
|
||||||
if (ptype == undefined) {
|
|
||||||
x.accessTypeStatus = EnumAuthStatus.Deleted_Not_Yet_Approve;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
this._userAcessTypesforSave.forEach(x =>{
|
|
||||||
let payrollType = this._payrollTypes.find(p => p.id === x.payrollTypeID);
|
|
||||||
if(payrollType){
|
|
||||||
x.description = payrollType.description;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
this.useService.SaveUserAccessType(this._userAcessTypesforSave)
|
this.useService.SaveUserAccessType(this._userAcessTypesforSave)
|
||||||
.subscribe(
|
.subscribe(
|
||||||
(resp: any) => {
|
(resp: any) => {
|
||||||
|
|
||||||
},
|
},
|
||||||
(err: any) => {
|
(err: any) => {
|
||||||
this.notificationService.showError(err);
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
|
this.notificationService.showError(err?.error ?? err);
|
||||||
//ON ERROR
|
//ON ERROR
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
//ON Success
|
//ON Success
|
||||||
this.notificationService.showSuccess('Saved Successfully.');
|
this.loadingPanel.ShowLoadingPanel = false;
|
||||||
|
this.notificationService.showSuccess('Saved. The change is waiting for approval.');
|
||||||
// this.loadGrid();
|
// this.loadGrid();
|
||||||
this.RefreshGrid(this._userAcessTypesforSave[0].userID);
|
this.RefreshGrid(this._userAcessTypesforSave[0].userID);
|
||||||
|
this.loadPending();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -673,23 +673,25 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@if (showModal) {
|
@if (showModal) {
|
||||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="390">
|
<div class="card" class="blur-background">
|
||||||
<kendo-dialog-titlebar>Access Types</kendo-dialog-titlebar>
|
<kendo-dialog (close)="onPopUpClose()" [minWidth]="390">
|
||||||
<div class="grid">
|
<kendo-dialog-titlebar>Access Types</kendo-dialog-titlebar>
|
||||||
<div class="col-12">
|
<div class="grid">
|
||||||
<fieldset>
|
<div class="col-12">
|
||||||
<div class="button-container1">
|
<fieldset>
|
||||||
@for (type of payrollTypes; track type) {
|
<div class="button-container1">
|
||||||
<button kendoButton class="access-type-button" (click)="selectAccessType(type.id)">
|
@for (type of payrollTypes; track type) {
|
||||||
<img [src]="getImagePath(type.id)" alt="{{ type.description }}" class="access-type-image" />
|
<button kendoButton class="access-type-button" (click)="selectAccessType(type.id)">
|
||||||
<span class="button-text">{{ type.description }}</span>
|
<img [src]="getImagePath(type.id)" alt="{{ type.description }}" class="access-type-image" />
|
||||||
</button>
|
<span class="button-text">{{ type.description }}</span>
|
||||||
}
|
</button>
|
||||||
</div>
|
}
|
||||||
</fieldset>
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</kendo-dialog>
|
||||||
</kendo-dialog>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
@if (showAttachment) {
|
@if (showAttachment) {
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,9 @@ import {
|
||||||
imageIcon,
|
imageIcon,
|
||||||
shareIcon,
|
shareIcon,
|
||||||
zoomInIcon,
|
zoomInIcon,
|
||||||
zoomOutIcon
|
zoomOutIcon,
|
||||||
|
copyIcon,
|
||||||
|
forwardIcon
|
||||||
} from '@progress/kendo-svg-icons';
|
} from '@progress/kendo-svg-icons';
|
||||||
|
|
||||||
@NgModule({})
|
@NgModule({})
|
||||||
|
|
@ -93,6 +95,8 @@ export class KendoIconsModule {
|
||||||
image: imageIcon,
|
image: imageIcon,
|
||||||
share: shareIcon,
|
share: shareIcon,
|
||||||
zoomIn: zoomInIcon,
|
zoomIn: zoomInIcon,
|
||||||
zoomOut: zoomOutIcon
|
zoomOut: zoomOutIcon,
|
||||||
|
copy : copyIcon,
|
||||||
|
forward : forwardIcon
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@
|
||||||
position: absolute;
|
position: absolute;
|
||||||
}
|
}
|
||||||
.customGrid{
|
.customGrid{
|
||||||
margin: 0px 100px 0px 100px !important;
|
margin: 0px 80px 0px 80px !important;
|
||||||
}
|
}
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.customGrid {
|
.customGrid {
|
||||||
|
|
|
||||||
|
|
@ -32,13 +32,13 @@
|
||||||
</kendo-grid-column>
|
</kendo-grid-column>
|
||||||
}
|
}
|
||||||
@if (isWorkflowRequired) {
|
@if (isWorkflowRequired) {
|
||||||
<kendo-grid-column field="count" title="Add Attachment" width="20%">
|
<kendo-grid-column field="count" title="Add Attachment" width="15%">
|
||||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||||
<button kendoButton (click)="showAddApprovalAttachment(dataItem)" [svgIcon]="apiService.KendoSVGIcon['add']">Approve</button>
|
<button kendoButton (click)="showAddApprovalAttachment(dataItem)" [svgIcon]="apiService.KendoSVGIcon['clip']">Attachment</button>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</kendo-grid-column>
|
</kendo-grid-column>
|
||||||
}
|
}
|
||||||
<kendo-grid-command-column title="Action" width="10%">
|
<kendo-grid-command-column title="Action" width="15%">
|
||||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||||
@if (!isWorkflowRequired) {
|
@if (!isWorkflowRequired) {
|
||||||
<button kendoButton (click)="ApproveBonus(dataItem.bonusid)" [svgIcon]="apiService.KendoSVGIcon['delete']">Approve</button>
|
<button kendoButton (click)="ApproveBonus(dataItem.bonusid)" [svgIcon]="apiService.KendoSVGIcon['delete']">Approve</button>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,70 @@
|
||||||
|
/* 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,140 +3,110 @@
|
||||||
|
|
||||||
<div class="grid">
|
<div class="grid">
|
||||||
|
|
||||||
<div class="md:col-6 col-12">
|
<!-- Inputs grouped in two panels; every control keeps its bindings (ngModel, formControlName, events) -->
|
||||||
<div class="grid">
|
<div class="col-12">
|
||||||
<div class="col-5" style="margin: auto;">
|
<div class="bp-panel">
|
||||||
<label>Bonus Type</label>
|
<div class="bp-panel-title">Bonus Information</div>
|
||||||
</div>
|
<div class="grid">
|
||||||
<div class="col-7">
|
<div class="col-12 md:col-6 lg:col-4 bp-field">
|
||||||
<kendo-dropdownlist [(ngModel)]="selectedbonusID"
|
<label class="bp-label">Bonus Type <span class="bp-required">*</span></label>
|
||||||
[data]="bonuses"
|
<kendo-dropdownlist [(ngModel)]="selectedbonusID"
|
||||||
[defaultItem]="{ name: 'Select Bonus Type..', id: null }"
|
[data]="bonuses"
|
||||||
[textField]="'name'"
|
[defaultItem]="{ name: 'Select Bonus Type..', id: null }"
|
||||||
[valueField]="'id'"
|
[textField]="'name'"
|
||||||
[valuePrimitive]="true"
|
[valueField]="'id'"
|
||||||
class="form-control form-control-sm input-sm"
|
[valuePrimitive]="true"
|
||||||
formControlName="bonusType"
|
class="form-control form-control-sm input-sm"
|
||||||
(valueChange)="BonusvalueChange($event)"
|
formControlName="bonusType"
|
||||||
style="width:100%">
|
(valueChange)="BonusvalueChange($event)"
|
||||||
</kendo-dropdownlist>
|
style="width:100%">
|
||||||
</div>
|
</kendo-dropdownlist>
|
||||||
</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>
|
|
||||||
</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>
|
||||||
<div class="col-7">
|
<div class="col-12 md:col-6 lg:col-4 bp-field">
|
||||||
<div class="p-field-checkbox">
|
<label class="bp-label">Consider Basic Of <span class="bp-required">*</span></label>
|
||||||
<input formControlName="calculateTax" kendoCheckBox (change)="checkWithOrTax(2, isTaxProcess)"
|
<kendo-datepicker [format]="'dd-MMM-yyyy'"
|
||||||
[(ngModel)]="isTaxProcess" style="margin-right: 10px"
|
[(ngModel)]="basicDate"
|
||||||
type="checkbox" />
|
formControlName="basicDate"
|
||||||
<label>Calculate Tax</label>
|
style="width:100%"></kendo-datepicker>
|
||||||
</div>
|
</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>
|
||||||
|
</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 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>
|
</div>
|
||||||
</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 class="md:col-12 col-12">
|
}
|
||||||
<div class="grid" style="margin-left: 5px; margin-right: 5px;">
|
-->
|
||||||
<div class="col-12" align="right">
|
</div>
|
||||||
<button kendoButton [svgIcon]="apiService.KendoSVGIcon['gear']" themeColor="primary" (click)="process()" style="margin-right:5px;">Process</button>
|
</div>
|
||||||
<!--<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">
|
<div class="col-12">
|
||||||
<kendo-grid [data]="$safeNavigationMigration(bonusProcess?.bonusProcessDetails)">
|
<!-- 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">
|
||||||
<ng-template kendoGridToolbarTemplate>
|
<ng-template kendoGridToolbarTemplate>
|
||||||
<button type="button" kendoGridExcelCommand [svgIcon]="apiService.KendoSVGIcon['fileExcel']">
|
<button type="button" kendoGridExcelCommand [svgIcon]="apiService.KendoSVGIcon['fileExcel']">
|
||||||
Export to Excel
|
Export to Excel
|
||||||
</button>
|
</button>
|
||||||
Count: {{ bonusProcess?.bonusProcessDetails.length}}
|
Count: {{ bonusProcess?.bonusProcessDetails.length}}
|
||||||
|
@if (returnMessage) {
|
||||||
|
<kendo-grid-spacer></kendo-grid-spacer>
|
||||||
|
<span class="bp-message"><b>{{returnMessage}}</b></span>
|
||||||
|
}
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<kendo-grid-column field="employee.employeeNo" title="Emp. ID" width="10%">
|
<kendo-grid-column field="employee.employeeNo" title="Emp. ID" width="10%">
|
||||||
</kendo-grid-column>
|
</kendo-grid-column>
|
||||||
|
|
@ -164,6 +134,8 @@
|
||||||
{{dataItem.employee.basicSalary | number:'1.2-2'}}
|
{{dataItem.employee.basicSalary | number:'1.2-2'}}
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</kendo-grid-column>
|
</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%">
|
<kendo-grid-column field="bonusAmount" title="Bonus Amount" width="10%">
|
||||||
<ng-template kendoGridCellTemplate let-dataItem>
|
<ng-template kendoGridCellTemplate let-dataItem>
|
||||||
<kendo-numerictextbox [(ngModel)]="dataItem.changeBonusAmount"
|
<kendo-numerictextbox [(ngModel)]="dataItem.changeBonusAmount"
|
||||||
|
|
@ -184,30 +156,46 @@
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
||||||
</kendo-grid-column>
|
</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%">
|
<kendo-grid-column field="totalAmount" title="Total Amount" width="10%">
|
||||||
<ng-template kendoGridCellTemplate let-dataItem>
|
<ng-template kendoGridCellTemplate let-dataItem>
|
||||||
{{(dataItem.changeBonusAmount - dataItem.changeTaxAmount) | number:'1.2-2'}}
|
{{(dataItem.changeBonusAmount - dataItem.changeTaxAmount) | number:'1.2-2'}}
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</kendo-grid-column>
|
</kendo-grid-column>
|
||||||
<kendo-grid-command-column title="Remove" width="8%" style="height:98%;">
|
<!-- 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' }">
|
||||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
||||||
<button (click)="removefromList(rowIndex)" class="kt-delete" kendoButton [svgIcon]="apiService.KendoSVGIcon['delete']">
|
<!-- 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>
|
</button>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</kendo-grid-command-column>
|
</kendo-grid-command-column>
|
||||||
<kendo-grid-excel fileName="BonusProcess.xlsx"></kendo-grid-excel>
|
<kendo-grid-excel fileName="BonusProcess.xlsx" [fetchData]="allBonusRows"></kendo-grid-excel>
|
||||||
</kendo-grid>
|
</kendo-grid>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@if (showModal) {
|
@if (showModal) {
|
||||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650"
|
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650"
|
||||||
[width]="650">
|
[width]="650">
|
||||||
|
|
@ -232,8 +220,6 @@
|
||||||
</div>
|
</div>
|
||||||
</kendo-dialog>
|
</kendo-dialog>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@if (showBonusUpload) {
|
@if (showBonusUpload) {
|
||||||
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650"
|
<kendo-dialog (close)="onPopUpClose()" [minWidth]="650"
|
||||||
[width]="650">
|
[width]="650">
|
||||||
|
|
@ -252,8 +238,9 @@
|
||||||
<div class="grid">
|
<div class="grid">
|
||||||
<div class="col-12" align="right">
|
<div class="col-12" align="right">
|
||||||
<app-loading-panel></app-loading-panel>
|
<app-loading-panel></app-loading-panel>
|
||||||
<input id="fupEmpPhoto" kendoTextBox title="Upload"
|
<!-- the file is checked, read and saved on the server in one go (old handler uploadBonusFile kept) -->
|
||||||
(change)="uploadBonusFile($event)" type="file">
|
<input id="fupEmpPhoto" kendoTextBox title="Upload" accept=".xlsx,.xls"
|
||||||
|
(change)="uploadBonusFileAndSave($event)" type="file">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="grid">
|
<div class="grid">
|
||||||
|
|
@ -263,3 +250,61 @@
|
||||||
</div>
|
</div>
|
||||||
</kendo-dialog>
|
</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,9 +8,11 @@ import {loadingPanelService} from '../../hrm-loding panel/loding.panel.service';
|
||||||
import {PayrollType} from '../../_models/Authentication/payrollType';
|
import {PayrollType} from '../../_models/Authentication/payrollType';
|
||||||
import {Bonus} from '../../_models/Basic/bonus';
|
import {Bonus} from '../../_models/Basic/bonus';
|
||||||
import {Employee} from '../../_models/Employee/employee';
|
import {Employee} from '../../_models/Employee/employee';
|
||||||
|
import {EmployeeLite} from '../../_models/Employee/employeeLite';
|
||||||
import {SearchEmployee} from '../../_models/Employee/searchEmployee';
|
import {SearchEmployee} from '../../_models/Employee/searchEmployee';
|
||||||
import {EnumIncomeTaxItemGroup, EnumStatus, EnumTaxMergeType} from '../../_models/enums';
|
import {EnumIncomeTaxItemGroup, EnumStatus, EnumTaxMergeType} from '../../_models/enums';
|
||||||
import {BonusProcess, BonusProcessDetail} from '../../_models/Payroll/bonusProcess';
|
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 {TaxMergeMaster} from '../../_models/Payroll/Tax/taxMergeMaster';
|
||||||
import {AuthService} from '../../_services/auth/auth.service';
|
import {AuthService} from '../../_services/auth/auth.service';
|
||||||
import {BasicService} from '../../_services/Basic/basic.service';
|
import {BasicService} from '../../_services/Basic/basic.service';
|
||||||
|
|
@ -65,6 +67,17 @@ export class BonusProcessComponent implements OnInit {
|
||||||
processCompleted: boolean = false;
|
processCompleted: boolean = false;
|
||||||
showBonusUpload: 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,
|
constructor(public basicService: BasicService, public notificationService: HRMNotificationService,
|
||||||
public loadingPanelService: loadingPanelService, public empService: EmployeeServices,
|
public loadingPanelService: loadingPanelService, public empService: EmployeeServices,
|
||||||
public datatransferservice: DataTransferService,
|
public datatransferservice: DataTransferService,
|
||||||
|
|
@ -96,7 +109,6 @@ export class BonusProcessComponent implements OnInit {
|
||||||
() => {
|
() => {
|
||||||
this.loadingPanelService.ShowLoadingPanel = false;
|
this.loadingPanelService.ShowLoadingPanel = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.authSerivce.GetPayrollTypeByLoginID().subscribe(
|
this.authSerivce.GetPayrollTypeByLoginID().subscribe(
|
||||||
(x) => {
|
(x) => {
|
||||||
this.payrollType = x;
|
this.payrollType = x;
|
||||||
|
|
@ -110,8 +122,14 @@ export class BonusProcessComponent implements OnInit {
|
||||||
this.cuttofDate = new Date(this.payrollType.nextPayProcessDate);
|
this.cuttofDate = new Date(this.payrollType.nextPayProcessDate);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public GetSelectedEmployee(searchEmp: SearchEmployee[]) {
|
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.processCompleted = false;
|
||||||
this.selectedEmps = searchEmp;
|
this.selectedEmps = searchEmp;
|
||||||
if (this.bonusProcessDetails == undefined) {
|
if (this.bonusProcessDetails == undefined) {
|
||||||
|
|
@ -134,7 +152,6 @@ export class BonusProcessComponent implements OnInit {
|
||||||
this.RefreshDefaultGrid();
|
this.RefreshDefaultGrid();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
RefreshDefaultGrid() {
|
RefreshDefaultGrid() {
|
||||||
if (this.selectedEmps != undefined && this.bonusProcessDetails != undefined) {
|
if (this.selectedEmps != undefined && this.bonusProcessDetails != undefined) {
|
||||||
if (this.bonusProcess == undefined) {
|
if (this.bonusProcess == undefined) {
|
||||||
|
|
@ -159,6 +176,7 @@ export class BonusProcessComponent implements OnInit {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
this.bonusProcess.bonusProcessDetails = [...this.bonusProcess.bonusProcessDetails];
|
||||||
this.RefreshEmployees();
|
this.RefreshEmployees();
|
||||||
if (this.alreadyProcessesList.length > 0) {
|
if (this.alreadyProcessesList.length > 0) {
|
||||||
this.showModal = true;
|
this.showModal = true;
|
||||||
|
|
@ -167,37 +185,29 @@ export class BonusProcessComponent implements OnInit {
|
||||||
}
|
}
|
||||||
RefreshEmployees() {
|
RefreshEmployees() {
|
||||||
if (this.selectedEmps == undefined) return;
|
if (this.selectedEmps == undefined) return;
|
||||||
var ids = SearchEmployee.getEmpIds(this.selectedEmps);
|
const empIds: number[] = this.selectedEmps.map(e => e.employeeID);
|
||||||
|
var emps: EmployeeLite[];
|
||||||
const data = {
|
|
||||||
dataList: ids,
|
|
||||||
};
|
|
||||||
var emps: Employee[];
|
|
||||||
|
|
||||||
this.loadingPanelService.ShowLoadingPanel = true;
|
this.loadingPanelService.ShowLoadingPanel = true;
|
||||||
this.empService.getEmployeesByEmpIDs(data).subscribe(
|
this.empService.getEmployeeLiteByEmpIDs(empIds).subscribe(
|
||||||
(resp: any) => {
|
(resp: any) => {
|
||||||
emps = resp;
|
emps = resp;
|
||||||
},
|
},
|
||||||
(err: any) => {
|
(err: any) => {
|
||||||
this.loadingPanelService.ShowLoadingPanel = false;
|
this.loadingPanelService.ShowLoadingPanel = false;
|
||||||
this.notificationService.showWarning(err.error);
|
this.notificationService.showWarning(err.error);
|
||||||
|
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
this.loadingPanelService.ShowLoadingPanel = false;
|
this.loadingPanelService.ShowLoadingPanel = false;
|
||||||
emps.forEach(x => {
|
emps.forEach(x => {
|
||||||
let bindex = this.bonusProcess.bonusProcessDetails.findIndex(b => b.employeeID == x.id);
|
let bindex = this.bonusProcess.bonusProcessDetails.findIndex(b => b.employeeID == x.employeeID);
|
||||||
if (bindex != -1) {
|
if (bindex != -1) {
|
||||||
this.bonusProcess.bonusProcessDetails[bindex].employee.isConfirmed = x.isConfirmed;
|
this.bonusProcess.bonusProcessDetails[bindex].employee.isConfirmed = x.isConfirmed;
|
||||||
this.bonusProcess.bonusProcessDetails[bindex].employee.joiningDate = x.joiningDate;
|
this.bonusProcess.bonusProcessDetails[bindex].employee.joiningDate = x.joiningDate;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
checkWithOrTax(from: number, value: boolean) {
|
checkWithOrTax(from: number, value: boolean) {
|
||||||
debugger;
|
|
||||||
if (from == 1) {
|
if (from == 1) {
|
||||||
if (value == true) {
|
if (value == true) {
|
||||||
this.isTaxProcess = false;
|
this.isTaxProcess = false;
|
||||||
|
|
@ -208,35 +218,38 @@ export class BonusProcessComponent implements OnInit {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onPopUpClose() {
|
onPopUpClose() {
|
||||||
this.showModal = false;
|
this.showModal = false;
|
||||||
this.showBonusUpload = false;
|
this.showBonusUpload = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
showBonusUploadPopUp() {
|
showBonusUploadPopUp() {
|
||||||
this.showBonusUpload = true;
|
this.showBonusUpload = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
currentlyProcess($event) {
|
currentlyProcess($event) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
remainingBasic($event) {
|
remainingBasic($event) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
search() {
|
search() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
process() {
|
process() {
|
||||||
if (this.bonusProcess == undefined || this.bonusProcess.bonusProcessDetails.length == 0) {
|
if (this.bonusProcess == undefined || this.bonusProcess.bonusProcessDetails.length == 0) {
|
||||||
this.notificationService.showWarning('Please select employee for the proces');
|
this.notificationService.showWarning('Please select employee for the proces');
|
||||||
return;
|
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;
|
var isApproved = false;
|
||||||
this.loadingPanelService.ShowLoadingPanel = true;
|
this.loadingPanelService.ShowLoadingPanel = true;
|
||||||
this.bonusService.IsBonusApproved(this.selectedbonusID, this.payrollType.nextPayProcessDate).subscribe(
|
this.bonusService.IsBonusApproved(this.selectedbonusID, this.payrollType.nextPayProcessDate).subscribe(
|
||||||
|
|
@ -255,58 +268,289 @@ export class BonusProcessComponent implements OnInit {
|
||||||
this.returnMessage = 'selected Bonus is already process and Approved';
|
this.returnMessage = 'selected Bonus is already process and Approved';
|
||||||
return;
|
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.
|
||||||
var returnID: number;
|
const request: BonusProcessAndSaveRequest = {
|
||||||
this.processRequest = [];
|
bonusID: this.selectedbonusID,
|
||||||
var index: number = 0;
|
basicMonth: this.basicDate,
|
||||||
this.bonusProcess.bonusProcessDetails.forEach(x => {
|
payDate: this.payDate,
|
||||||
|
cuttOfDate: this.cuttofDate,
|
||||||
this.processRequest.push({
|
currProcess: this.processFor,
|
||||||
'bonusid': this.selectedbonusID,
|
isDisburseWithSalary: this.disburseWithSalary,
|
||||||
'basicMonth': this.basicDate,
|
isTaxProcess: this.isTaxProcess,
|
||||||
'payDate': this.payDate,
|
employeeIDs: this.bonusProcess.bonusProcessDetails.map(x => x.employeeID),
|
||||||
'cuttOfDate': this.cuttofDate,
|
};
|
||||||
'currProcess': this.processFor,
|
var result: BonusProcessAndSaveResult;
|
||||||
'isDisburseWithSalary': this.disburseWithSalary,
|
|
||||||
'isTaxProcess': this.isTaxProcess,
|
|
||||||
'empid': x.employeeID
|
|
||||||
});
|
|
||||||
|
|
||||||
});
|
|
||||||
this.errorOrSucessList = [];
|
this.errorOrSucessList = [];
|
||||||
this.bonusService.BonusProcess(this.processRequest).subscribe(
|
this.bonusService.processAndSave(request).subscribe(
|
||||||
(resp: any) => {
|
(resp: BonusProcessAndSaveResult) => {
|
||||||
this.bonusProcess = resp;
|
result = resp;
|
||||||
},
|
},
|
||||||
(err: any) => {
|
(err: any) => {
|
||||||
this.loadingPanelService.ShowLoadingPanel = false;
|
this.loadingPanelService.ShowLoadingPanel = false;
|
||||||
this.notificationService.showWarning(err.error);
|
const message = (typeof err?.error === 'string' && err.error) ? err.error
|
||||||
this.returnMessage = err.error;
|
: 'Bonus process failed. Please check the connection and try again.';
|
||||||
|
this.notificationService.showWarning(message);
|
||||||
|
this.returnMessage = message;
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
|
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.processCompleted = true;
|
||||||
this.loadingPanelService.ShowLoadingPanel = false;
|
this.loadingPanelService.ShowLoadingPanel = false;
|
||||||
this.pbuttonEnalble = false;
|
this.pbuttonEnalble = false;
|
||||||
this.notificationService.showSuccess('Bonus processed successfully');
|
const skipped = result?.alreadyProcessedEmployeeIDs?.length ?? 0;
|
||||||
this.returnMessage = 'Bonus processed successfully';
|
const message = 'Bonus processed and saved successfully'
|
||||||
|
+ (skipped > 0 ? ' (' + skipped + ' already processed employee(s) left out)' : '');
|
||||||
|
this.notificationService.showSuccess(message);
|
||||||
|
this.returnMessage = message;
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
// ---- 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 {
|
public BonusvalueChange(value: any): void {
|
||||||
this.alreadyProcessesList = [];
|
this.alreadyProcessesList = [];
|
||||||
this.bonusProcess = new BonusProcess();
|
this.bonusProcess = new BonusProcess();
|
||||||
this.bonusProcess.bonusProcessDetails = [];
|
this.bonusProcess.bonusProcessDetails = [];
|
||||||
this.selectedEmps = [];
|
this.selectedEmps = [];
|
||||||
this.processCompleted = false;
|
this.processCompleted = false;
|
||||||
this.pbuttonEnalble = false;
|
this.pbuttonEnalble = false;
|
||||||
|
}
|
||||||
}
|
|
||||||
|
|
||||||
TaxRecalculate() {
|
TaxRecalculate() {
|
||||||
this.loadingPanelService.ShowLoadingPanel = true;
|
this.loadingPanelService.ShowLoadingPanel = true;
|
||||||
|
|
||||||
|
|
@ -329,13 +573,9 @@ export class BonusProcessComponent implements OnInit {
|
||||||
this.pbuttonEnalble = false;
|
this.pbuttonEnalble = false;
|
||||||
this.notificationService.showSuccess('Tax Recalculated processed successfully');
|
this.notificationService.showSuccess('Tax Recalculated processed successfully');
|
||||||
this.returnMessage = 'Tax Recalculated processed successfully';
|
this.returnMessage = 'Tax Recalculated processed successfully';
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
uploadBonusFile(event: any): void {
|
uploadBonusFile(event: any): void {
|
||||||
debugger;
|
|
||||||
let tempResponse: any;
|
let tempResponse: any;
|
||||||
this.selectedFiles = event.target.files;
|
this.selectedFiles = event.target.files;
|
||||||
if (this.selectedFiles.length > 0) {
|
if (this.selectedFiles.length > 0) {
|
||||||
|
|
@ -381,41 +621,28 @@ export class BonusProcessComponent implements OnInit {
|
||||||
this.notificationService.showWarning('please select a file');
|
this.notificationService.showWarning('please select a file');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
refresh() {
|
refresh() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
edit() {
|
edit() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
clearAll() {
|
clearAll() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
remove() {
|
remove() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
save() {
|
save() {
|
||||||
if (this.processCompleted == false) {
|
if (this.processCompleted == false) {
|
||||||
this.notificationService.showWarning('Please process the Bonus first');
|
this.notificationService.showWarning('Please process the Bonus first');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (this.bonusProcess == undefined || this.bonusProcess?.bonusProcessDetails.length == 0) {
|
if (this.bonusProcess == undefined || this.bonusProcess?.bonusProcessDetails.length == 0) {
|
||||||
this.notificationService.showWarning('There are no data to save');
|
this.notificationService.showWarning('There are no data to save');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.isTaxProcess == true && (this.bonusProcess.bonusProcessDetails[0].incomeTaxcoll == undefined
|
if (this.isTaxProcess == true && (this.bonusProcess.bonusProcessDetails[0].incomeTaxcoll == undefined
|
||||||
|| this.bonusProcess.bonusProcessDetails[0].incomeTaxcoll.length == 0)) {
|
|| this.bonusProcess.bonusProcessDetails[0].incomeTaxcoll.length == 0)) {
|
||||||
this.notificationService.showWarning('Tax Calculation not yet done');
|
this.notificationService.showWarning('Tax Calculation not yet done');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.isTaxProcess == true) {
|
if (this.isTaxProcess == true) {
|
||||||
var mitem: TaxMergeMaster = undefined;
|
var mitem: TaxMergeMaster = undefined;
|
||||||
this.taxService.getTaxMergeMaster(EnumTaxMergeType.Bonus, this.selectedbonusID).subscribe(
|
this.taxService.getTaxMergeMaster(EnumTaxMergeType.Bonus, this.selectedbonusID).subscribe(
|
||||||
|
|
@ -429,18 +656,14 @@ export class BonusProcessComponent implements OnInit {
|
||||||
() => {
|
() => {
|
||||||
if (mitem != undefined) {
|
if (mitem != undefined) {
|
||||||
console.log(mitem);
|
console.log(mitem);
|
||||||
|
|
||||||
this.bonusProcess.bonusProcessDetails.every(x => {
|
this.bonusProcess.bonusProcessDetails.every(x => {
|
||||||
//console.log(x.incomeTaxcoll);
|
|
||||||
var item = x.incomeTaxcoll.find(y => y.itemGroup == mitem.itemGroup && y.itemID == mitem.itemID);
|
var item = x.incomeTaxcoll.find(y => y.itemGroup == mitem.itemGroup && y.itemID == mitem.itemID);
|
||||||
if (item != undefined) {
|
if (item != undefined) {
|
||||||
item.thisMonthAmount = x.changeBonusAmount;
|
item.thisMonthAmount = x.changeBonusAmount;
|
||||||
} else {
|
} else {
|
||||||
this.notificationService.showWarning('Income tax amount not found in the collection');
|
this.notificationService.showWarning('Income tax amount not found in the collection');
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
item = x.incomeTaxcoll.find(y => y.itemGroup == EnumIncomeTaxItemGroup.Tax_Deducted);
|
item = x.incomeTaxcoll.find(y => y.itemGroup == EnumIncomeTaxItemGroup.Tax_Deducted);
|
||||||
if (item != undefined) {
|
if (item != undefined) {
|
||||||
item.thisMonthAmount = x.changeTaxAmount;
|
item.thisMonthAmount = x.changeTaxAmount;
|
||||||
|
|
@ -453,17 +676,116 @@ export class BonusProcessComponent implements OnInit {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
this.saveData();
|
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() {
|
saveData() {
|
||||||
debugger;
|
|
||||||
this.loadingPanelService.ShowLoadingPanel = true;
|
this.loadingPanelService.ShowLoadingPanel = true;
|
||||||
this.bonusProcess.disburseDate = this.payDate;
|
this.bonusProcess.disburseDate = this.payDate;
|
||||||
this.bonusProcess.isTaxProcess = this.isTaxProcess;
|
this.bonusProcess.isTaxProcess = this.isTaxProcess;
|
||||||
|
|
@ -488,8 +810,52 @@ export class BonusProcessComponent implements OnInit {
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
clearTax() {
|
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;
|
this.loadingPanelService.ShowLoadingPanel = true;
|
||||||
|
|
||||||
|
|
@ -498,28 +864,72 @@ export class BonusProcessComponent implements OnInit {
|
||||||
});
|
});
|
||||||
this.loadingPanelService.ShowLoadingPanel = false;
|
this.loadingPanelService.ShowLoadingPanel = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
undo() {
|
undo() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uploadData() {
|
uploadData() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
removefromList(rowIndex: number) {
|
removefromList(rowIndex: number) {
|
||||||
this.bonusProcess.bonusProcessDetails.splice(rowIndex, 1);
|
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}) {
|
removeHandler({dataItem}) {
|
||||||
console.log(dataItem);
|
console.log(dataItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
editHandler({dataItem}) {
|
editHandler({dataItem}) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
addHandler() {
|
addHandler() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,186 @@ kendo-numerictextbox{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.checkBoxGrid.grid {
|
/* .checkBoxGrid.grid {
|
||||||
justify-content: space-evenly;
|
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;
|
||||||
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
gap: 8px 12px;
|
||||||
|
margin: 4px 0 0 120px;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border: 1px solid #dee2e6;
|
||||||
|
border-radius: 6px;
|
||||||
|
background: #fafbfc;
|
||||||
|
}
|
||||||
|
|
||||||
|
.adp-check {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
margin: 0;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.adp-check .k-checkbox-label {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 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) {
|
@media screen and (max-width: 400px) {
|
||||||
|
|
@ -17,4 +195,11 @@ kendo-numerictextbox{
|
||||||
flex-flow: column wrap;
|
flex-flow: column wrap;
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
|
.adp-checks {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
margin-left: 0;
|
||||||
|
}
|
||||||
|
.adp-entry-item {
|
||||||
|
flex: 1 1 100%;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,14 @@
|
||||||
<app-loading-panel></app-loading-panel>
|
<app-loading-panel></app-loading-panel>
|
||||||
<form [formGroup]="_fromValidator">
|
<form [formGroup]="_fromValidator" class="adp-page">
|
||||||
<div class="card" style="padding: 1%">
|
<!-- Setup: layout only was tidied; every control, binding and event is the same as before. -->
|
||||||
|
<div class="card adp-card">
|
||||||
<div class="topGrid grid">
|
<div class="topGrid grid">
|
||||||
<div class="col-5">
|
<!-- General -->
|
||||||
<div class="grid">
|
<div class="col-12 lg:col-5 adp-section">
|
||||||
<div class="col-4" style="margin: auto;">
|
<div class="adp-section-title">General</div>
|
||||||
<label class="form-control-label" for="ddlAllowance">Allowance *</label>
|
<div class="adp-field">
|
||||||
</div>
|
<label class="adp-label form-control-label" for="ddlAllowance">Allowance <span class="adp-required">*</span></label>
|
||||||
<div class="col-8">
|
<div class="adp-control">
|
||||||
<kendo-dropdownlist
|
<kendo-dropdownlist
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
class="form-control form-control-sm input-sm"
|
class="form-control form-control-sm input-sm"
|
||||||
|
|
@ -15,14 +16,14 @@
|
||||||
[(ngModel)]="_adPram.allowDeductID"
|
[(ngModel)]="_adPram.allowDeductID"
|
||||||
id="ddlAllowance"
|
id="ddlAllowance"
|
||||||
[data]="_allowDeducts"
|
[data]="_allowDeducts"
|
||||||
[defaultItem]="{
|
[defaultItem]="{
|
||||||
name: 'Select Allowance',
|
name: 'Select Allowance',
|
||||||
id: null
|
id: null
|
||||||
}"
|
}"
|
||||||
[textField]="'name'"
|
[textField]="'name'"
|
||||||
(selectionChange)="
|
(selectionChange)="
|
||||||
AllowDeductselectionChange($event)
|
AllowDeductselectionChange($event)
|
||||||
"
|
"
|
||||||
[valueField]="'id'"
|
[valueField]="'id'"
|
||||||
[valuePrimitive]="true"
|
[valuePrimitive]="true"
|
||||||
required
|
required
|
||||||
|
|
@ -30,20 +31,18 @@
|
||||||
</kendo-dropdownlist>
|
</kendo-dropdownlist>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="grid">
|
<div class="adp-field">
|
||||||
<div class="col-4" style="margin: auto;">
|
<label class="adp-label" for="ddlPeriodicity">Periodicity <span class="adp-required">*</span></label>
|
||||||
<label for="ddlPeriodicity">Periodicity *</label>
|
<div class="adp-control">
|
||||||
</div>
|
|
||||||
<div class="col-8">
|
|
||||||
<kendo-dropdownlist
|
<kendo-dropdownlist
|
||||||
class="form-control form-control-sm input-sm"
|
class="form-control form-control-sm input-sm"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
id="ddlPeriodicity"
|
id="ddlPeriodicity"
|
||||||
[data]="_periodicity"
|
[data]="_periodicity"
|
||||||
[defaultItem]="{
|
[defaultItem]="{
|
||||||
name: 'Select Periodicity',
|
name: 'Select Periodicity',
|
||||||
value: null
|
value: null
|
||||||
}"
|
}"
|
||||||
[textField]="'name'"
|
[textField]="'name'"
|
||||||
[valueField]="'value'"
|
[valueField]="'value'"
|
||||||
[valuePrimitive]="true"
|
[valuePrimitive]="true"
|
||||||
|
|
@ -54,20 +53,18 @@
|
||||||
</kendo-dropdownlist>
|
</kendo-dropdownlist>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="grid">
|
<div class="adp-field">
|
||||||
<div class="col-4" style="margin: auto;">
|
<label class="adp-label" for="ddlGender">Gender</label>
|
||||||
<label for="ddlGender">Gender</label>
|
<div class="adp-control">
|
||||||
</div>
|
|
||||||
<div class="col-8">
|
|
||||||
<kendo-dropdownlist
|
<kendo-dropdownlist
|
||||||
class="form-control form-control-sm input-sm"
|
class="form-control form-control-sm input-sm"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
id="ddlGender"
|
id="ddlGender"
|
||||||
[data]="_gender"
|
[data]="_gender"
|
||||||
[defaultItem]="{
|
[defaultItem]="{
|
||||||
name: 'Select Gender',
|
name: 'Select Gender',
|
||||||
value: null
|
value: null
|
||||||
}"
|
}"
|
||||||
[textField]="'name'"
|
[textField]="'name'"
|
||||||
[valueField]="'value'"
|
[valueField]="'value'"
|
||||||
[valuePrimitive]="true"
|
[valuePrimitive]="true"
|
||||||
|
|
@ -76,145 +73,133 @@
|
||||||
</kendo-dropdownlist>
|
</kendo-dropdownlist>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="checkBoxGrid" class="grid" style="margin-top: 0px;">
|
<div class="checkBoxGrid adp-checks">
|
||||||
<div class="col-6" style="margin: auto;">
|
<label class="k-form-field right adp-check">
|
||||||
<label class="k-form-field right">
|
<input
|
||||||
<input
|
type="checkbox"
|
||||||
type="checkbox"
|
formControlName="isForConfirmOnly"
|
||||||
formControlName="isForConfirmOnly"
|
id="enableConfirmCheck"
|
||||||
id="enableConfirmCheck"
|
[(ngModel)]="_adPram.isForConfirmOnly"
|
||||||
[(ngModel)]="_adPram.isForConfirmOnly"
|
kendoCheckBox/>
|
||||||
kendoCheckBox/>
|
<label class="k-checkbox-label" for="enableConfirmCheck">Confirmation Required</label>
|
||||||
<label class="k-checkbox-label" for="enableConfirmCheck">Confirmation Required</label>
|
</label>
|
||||||
</label>
|
<label class="k-form-field right adp-check">
|
||||||
</div>
|
<input
|
||||||
<div class="col-6" style="margin: auto;">
|
type="checkbox"
|
||||||
<label class="k-form-field right">
|
formControlName="isDependsOnAttendance"
|
||||||
<input
|
id="enableDepandentCheck"
|
||||||
type="checkbox"
|
[(ngModel)]="_adPram.isDependsOnAttendance"
|
||||||
formControlName="isDependsOnAttendance"
|
kendoCheckBox/>
|
||||||
id="enableDepandentCheck"
|
<label class="k-checkbox-label" for="enableDepandentCheck">Is Dependence on Attendance</label>
|
||||||
[(ngModel)]="_adPram.isDependsOnAttendance"
|
</label>
|
||||||
kendoCheckBox/>
|
<label class="k-form-field right adp-check">
|
||||||
<label class="k-checkbox-label" for="enableDepandentCheck">Is Dependence on Attendance</label>
|
<input
|
||||||
</label>
|
type="checkbox"
|
||||||
</div>
|
formControlName="isFractionateApplicable"
|
||||||
<div class="col-6" style="margin: auto;">
|
id="enableFractionateCheck"
|
||||||
<label class="k-form-field right">
|
[(ngModel)]="_adPram.isFractionateApplicable"
|
||||||
<input
|
kendoCheckBox/>
|
||||||
type="checkbox"
|
<label class="k-checkbox-label" for="enableFractionateCheck">Is fractionate Available</label>
|
||||||
formControlName="isFractionateApplicable"
|
</label>
|
||||||
id="enableFractionateCheck"
|
<label class="k-form-field right adp-check">
|
||||||
[(ngModel)]="_adPram.isFractionateApplicable"
|
<input
|
||||||
kendoCheckBox/>
|
type="checkbox"
|
||||||
<label class="k-checkbox-label" for="enableFractionateCheck">Is fractionate Available</label>
|
formControlName="isTaxable"
|
||||||
</label>
|
id="enabletaxableCheck"
|
||||||
</div>
|
[(ngModel)]="_adPram.isTaxable"
|
||||||
<div class="col-6" style="margin: auto;">
|
kendoCheckBox/>
|
||||||
<label class="k-form-field right">
|
<label class="k-checkbox-label" for="enabletaxableCheck">Taxable</label>
|
||||||
<input
|
</label>
|
||||||
type="checkbox"
|
</div>
|
||||||
formControlName="isTaxable"
|
</div>
|
||||||
id="enabletaxableCheck"
|
|
||||||
[(ngModel)]="_adPram.isTaxable"
|
<!-- Amount -->
|
||||||
kendoCheckBox/>
|
<div class="col-12 md:col-6 lg:col-3 adp-section">
|
||||||
<label class="k-checkbox-label" for="enabletaxableCheck">Taxable</label>
|
<div class="adp-section-title">Amount</div>
|
||||||
</label>
|
<div class="adp-field">
|
||||||
</div>
|
<label class="adp-label" for="txtFlatAmount">Flat Amount</label>
|
||||||
</div>
|
<div class="adp-control">
|
||||||
</div>
|
<kendo-numerictextbox
|
||||||
<div class="col-3">
|
[min]="-10000000"
|
||||||
<div class="grid">
|
[max]="10000000"
|
||||||
<div class="col-4" style="margin: auto;">
|
[(ngModel)]="_adPram.flatAmount"
|
||||||
<label for="txtFlatAmount">Flat Amount</label>
|
formControlName="flatAmount"
|
||||||
</div>
|
>
|
||||||
<div class="col-8">
|
</kendo-numerictextbox>
|
||||||
<kendo-numerictextbox
|
</div>
|
||||||
[min]="-10000000"
|
</div>
|
||||||
[max]="10000000"
|
<div class="adp-field">
|
||||||
[(ngModel)]="_adPram.flatAmount"
|
<label class="adp-label" for="txtBasic">% of Basic</label>
|
||||||
formControlName="flatAmount"
|
<div class="adp-control">
|
||||||
>
|
<kendo-numerictextbox
|
||||||
</kendo-numerictextbox>
|
[min]="-1000"
|
||||||
</div>
|
[max]="1000"
|
||||||
</div>
|
[(ngModel)]="_adPram.percentOfBasic"
|
||||||
<div class="grid">
|
formControlName="percentOfBasic"
|
||||||
<div class="col-4" style="margin: auto;">
|
>
|
||||||
<label for="txtBasic">% of Basic</label>
|
</kendo-numerictextbox>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-8">
|
</div>
|
||||||
<kendo-numerictextbox
|
<div class="adp-field">
|
||||||
[min]="-1000"
|
<label class="adp-label" for="txtGross">% of Gross</label>
|
||||||
[max]="1000"
|
<div class="adp-control">
|
||||||
[(ngModel)]="_adPram.percentOfBasic"
|
<kendo-numerictextbox
|
||||||
formControlName="percentOfBasic"
|
[min]="-1000"
|
||||||
>
|
[max]="1000"
|
||||||
</kendo-numerictextbox>
|
[(ngModel)]="_adPram.percentOfGross"
|
||||||
</div>
|
formControlName="percentOfGross"
|
||||||
</div>
|
>
|
||||||
<div class="grid">
|
</kendo-numerictextbox>
|
||||||
<div class="col-4" style="margin: auto;">
|
</div>
|
||||||
<label for="txtGross">% of Gross</label>
|
</div>
|
||||||
</div>
|
<div class="adp-field">
|
||||||
<div class="col-8">
|
<label class="adp-label" for="txtMininmum">Mininmum</label>
|
||||||
<kendo-numerictextbox
|
<div class="adp-control">
|
||||||
[min]="-1000"
|
<kendo-numerictextbox
|
||||||
[max]="1000"
|
[min]="-10000000"
|
||||||
[(ngModel)]="_adPram.percentOfGross"
|
[max]="10000000"
|
||||||
formControlName="percentOfGross"
|
[(ngModel)]="_adPram.minAmount"
|
||||||
>
|
formControlName="minAmount"
|
||||||
</kendo-numerictextbox>
|
>
|
||||||
</div>
|
</kendo-numerictextbox>
|
||||||
</div>
|
</div>
|
||||||
<div class="grid">
|
</div>
|
||||||
<div class="col-4" style="margin: auto;">
|
<div class="adp-field">
|
||||||
<label for="txtMininmum" style="margin: auto;">Mininmum</label>
|
<label class="adp-label" for="txtMaximum">Maximum</label>
|
||||||
</div>
|
<div class="adp-control">
|
||||||
<div class="col-8">
|
<kendo-numerictextbox
|
||||||
<kendo-numerictextbox
|
[min]="-10000000"
|
||||||
[min]="-10000000"
|
[max]="10000000"
|
||||||
[max]="10000000"
|
[(ngModel)]="_adPram.maxAmount"
|
||||||
[(ngModel)]="_adPram.minAmount"
|
formControlName="maxAmount"
|
||||||
formControlName="minAmount"
|
>
|
||||||
>
|
</kendo-numerictextbox>
|
||||||
</kendo-numerictextbox>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="grid">
|
|
||||||
<div class="col-4" style="margin: auto;">
|
<!-- Grades -->
|
||||||
<label for="txtMaximum" style="margin: auto;">Maximum</label>
|
<div class="col-12 md:col-6 lg:col-4 adp-section">
|
||||||
</div>
|
<div class="adp-section-title">Grade <span class="adp-required">*</span></div>
|
||||||
<div class="col-8">
|
<kendo-grid
|
||||||
<kendo-numerictextbox
|
[data]="_grades"
|
||||||
[min]="-10000000"
|
height="220"
|
||||||
[max]="10000000"
|
[(selectedKeys)]="_selectedgrades"
|
||||||
[(ngModel)]="_adPram.maxAmount"
|
[kendoGridSelectBy]="'id'"
|
||||||
formControlName="maxAmount"
|
>
|
||||||
>
|
<kendo-grid-checkbox-column
|
||||||
</kendo-numerictextbox>
|
showSelectAll="true"
|
||||||
</div>
|
[width]="50"
|
||||||
</div>
|
[headerClass]="{ 'text-center': true }"
|
||||||
</div>
|
[class]="{ 'text-center': true }"
|
||||||
<div class="col-4">
|
></kendo-grid-checkbox-column>
|
||||||
<kendo-grid
|
<kendo-grid-column field="code" title="Code">
|
||||||
[data]="_grades"
|
</kendo-grid-column>
|
||||||
height="180"
|
<kendo-grid-column field="name" title="Description">
|
||||||
[(selectedKeys)]="_selectedgrades"
|
</kendo-grid-column>
|
||||||
[kendoGridSelectBy]="'id'"
|
</kendo-grid>
|
||||||
>
|
</div>
|
||||||
<kendo-grid-checkbox-column
|
</div>
|
||||||
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>
|
<!-- <hr>
|
||||||
<div class="checkBoxGrid grid">
|
<div class="checkBoxGrid grid">
|
||||||
|
|
@ -278,7 +263,7 @@
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div> -->
|
</div> -->
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="card" style="padding: 1%;">
|
<!-- <div class="card" style="padding: 1%;">
|
||||||
<div class="middleGrid grid">
|
<div class="middleGrid grid">
|
||||||
<div class="col-6">
|
<div class="col-6">
|
||||||
|
|
@ -355,203 +340,187 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</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>
|
|
||||||
|
|
||||||
<div class="grid" style="margin-top: 5px;">
|
<!-- Employees -->
|
||||||
<div class="col-2">
|
<div class="card adp-card">
|
||||||
<div class="grid">
|
<app-tab-view (onChange)="IndividualChecked($event)">
|
||||||
<div class="col-5" style="margin: auto;">
|
@if (_selectedPeriodicity == 1) {
|
||||||
<label for="txtEmp"> Select Emp</label>
|
<app-tab-panel
|
||||||
</div>
|
header="Exception ( {{
|
||||||
<div class="col-7" align="left">
|
this._adPram.exception?.length
|
||||||
<app-employee-picker [MultiSelect]="true"
|
}} )"
|
||||||
[fixedGrades]="_selectedgrades"
|
leftIcon="pi pi-user"
|
||||||
(ItemSelected)="GetSelectedEmployee($event)"
|
>
|
||||||
style="width: 80%;"></app-employee-picker>
|
</app-tab-panel>
|
||||||
<!-- <app-employee-picker for="chkIsnew" id="idself" [isActive]="!newEmployee" [setSelectedEmp]="selectedEmployee"
|
}
|
||||||
(ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker> -->
|
@if (_selectedPeriodicity == 1) {
|
||||||
</div>
|
<app-tab-panel
|
||||||
</div>
|
header="Not Applicable ( {{
|
||||||
</div>
|
this._adPram.notApplicable?.length
|
||||||
@if (!_ischecknotapplicable) {
|
}} )"
|
||||||
<div class="col-10">
|
leftIcon="pi pi-user"
|
||||||
<div class="grid">
|
>
|
||||||
<div class="col-1" style="margin: auto;" align="right">
|
</app-tab-panel>
|
||||||
<label for="txtEmp">Amount</label>
|
}
|
||||||
</div>
|
@if (_selectedPeriodicity != 1) {
|
||||||
<div class="col-3">
|
<app-tab-panel
|
||||||
<kendo-numerictextbox
|
header="Individual ( {{
|
||||||
[min]="-10000000"
|
this._adPram.adParameterEmployees?.length
|
||||||
[max]="10000000"
|
}} )"
|
||||||
[(ngModel)]="_individualAmount"
|
leftIcon="pi pi-user"
|
||||||
[ngModelOptions]="{ standalone: true }"
|
>
|
||||||
>
|
</app-tab-panel>
|
||||||
</kendo-numerictextbox>
|
}
|
||||||
</div>
|
</app-tab-view>
|
||||||
@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>
|
<div class="adp-detail-text">
|
||||||
</div>
|
<b> {{ _detailLevelText }}</b>
|
||||||
</div>
|
</div>
|
||||||
<div class="grid">
|
|
||||||
<div class="col-12">
|
<div class="adp-entry-row">
|
||||||
<kendo-grid [data]="_individualEmplyees"
|
<div class="adp-entry-item adp-entry-emp">
|
||||||
height="300"
|
<label class="adp-entry-label" for="txtEmp">Select Emp</label>
|
||||||
(remove)="removeHandler($event)">
|
<app-employee-picker [MultiSelect]="true"
|
||||||
<kendo-grid-column field="employeeNo" title="Emp ID">
|
[fixedGrades]="_selectedgrades"
|
||||||
</kendo-grid-column>
|
(ItemSelected)="GetSelectedEmployee($event)"
|
||||||
<kendo-grid-column field="employeeName" title="Name">
|
></app-employee-picker>
|
||||||
</kendo-grid-column>
|
<!-- <app-employee-picker for="chkIsnew" id="idself" [isActive]="!newEmployee" [setSelectedEmp]="selectedEmployee"
|
||||||
@if (_ischeckappliedtoInvididual) {
|
(ItemSelected)="GetSelectedEmployee($event)"></app-employee-picker> -->
|
||||||
<kendo-grid-column field="formDate" title="From Month">
|
</div>
|
||||||
<ng-template kendoGridCellTemplate let-dataItem>
|
@if (!_ischecknotapplicable) {
|
||||||
<kendo-datepicker id="idformDate"
|
<div class="adp-entry-item">
|
||||||
[(ngModel)]="dataItem.formDate"
|
<label class="adp-entry-label" for="txtEmp">Amount</label>
|
||||||
[ngModelOptions]="{ standalone: true }"
|
<kendo-numerictextbox
|
||||||
[format]="'dd MMM yyyy'"
|
[min]="-10000000"
|
||||||
name="formDate">
|
[max]="10000000"
|
||||||
</kendo-datepicker>
|
[(ngModel)]="_individualAmount"
|
||||||
</ng-template>
|
[ngModelOptions]="{ standalone: true }"
|
||||||
</kendo-grid-column>
|
>
|
||||||
<kendo-grid-column field="tillDate"
|
</kendo-numerictextbox>
|
||||||
title="Till Month">
|
</div>
|
||||||
<ng-template kendoGridCellTemplate let-dataItem>
|
@if (!_ischeckException) {
|
||||||
<kendo-datepicker id="idtilldate"
|
<div class="adp-entry-item">
|
||||||
[(ngModel)]="dataItem.tillDate"
|
<label class="adp-entry-label" for="dtpFromDate">From Date</label>
|
||||||
[format]="'dd MMM yyyy'"
|
<kendo-datepicker
|
||||||
[ngModelOptions]="{ standalone: true }"
|
id="dtpFromDate"
|
||||||
name="tillstartDate">
|
[format]="'dd-MMM-yyyy'"
|
||||||
</kendo-datepicker>
|
[readonly]="this._adPram.periodicity == 2"
|
||||||
</ng-template>
|
[(ngModel)]="_individualFromDate"
|
||||||
</kendo-grid-column>
|
[ngModelOptions]="{ standalone: true }"
|
||||||
}
|
style="width: 100%"
|
||||||
@if (!_ischecknotapplicable) {
|
></kendo-datepicker>
|
||||||
<kendo-grid-command-column title="Amount">
|
</div>
|
||||||
<ng-template kendoGridCellTemplate let-dataItem>
|
<div class="adp-entry-item">
|
||||||
<kendo-numerictextbox [(ngModel)]="dataItem.monthlyAmount"
|
<label class="k-form-field right adp-entry-label">
|
||||||
[ngModelOptions]="{ standalone: true }"
|
<input
|
||||||
[autoCorrect]="true"
|
type="checkbox"
|
||||||
[spinners]="false">
|
[(ngModel)]="_checkedToDate"
|
||||||
</kendo-numerictextbox>
|
[ngModelOptions]="{ standalone: true }"
|
||||||
</ng-template>
|
[disabled]="this._adPram.periodicity == 2"
|
||||||
</kendo-grid-command-column>
|
(click)="todateclicked()" kendoCheckBox/>
|
||||||
}
|
<label
|
||||||
<kendo-grid-column field="approvalStatus"
|
class="k-checkbox-label"
|
||||||
title="Approval Status">
|
for="isIndividualEmployee"
|
||||||
<ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
|
>
|
||||||
{{ statusString(dataItem.approvalStatus)}}
|
To Date
|
||||||
</ng-template>
|
</label>
|
||||||
</kendo-grid-column>
|
</label>
|
||||||
<kendo-grid-command-column title="Action" width="220">
|
<kendo-datepicker
|
||||||
<ng-template kendoGridCellTemplate
|
id="dtpToDate"
|
||||||
let-dataItem
|
[format]="'dd-MMM-yyyy'"
|
||||||
let-rowIndex="rowIndex">
|
[(ngModel)]="_individualToDate"
|
||||||
<button kendoGridRemoveCommand [svgIcon]="apiService.KendoSVGIcon['delete']" class="kt-delete"></button>
|
[readonly]="
|
||||||
</ng-template>
|
this._adPram.periodicity == 2 ||
|
||||||
</kendo-grid-command-column>
|
_checkedToDate == false
|
||||||
</kendo-grid>
|
"
|
||||||
</div>
|
[ngModelOptions]="{ standalone: true }"
|
||||||
</div>
|
style="width: 100%"
|
||||||
</div>
|
></kendo-datepicker>
|
||||||
</div>
|
</div>
|
||||||
<div class="grid">
|
}
|
||||||
<div class="col-12" align="right">
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</form>
|
<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>
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
import {Component, OnInit, ChangeDetectionStrategy} from '@angular/core';
|
import {Component, OnInit, ChangeDetectionStrategy, DoCheck} from '@angular/core';
|
||||||
|
import { GridDataResult, PageChangeEvent } from '@progress/kendo-angular-grid';
|
||||||
import {FormGroup, FormControl, FormBuilder, Validators} from '@angular/forms';
|
import {FormGroup, FormControl, FormBuilder, Validators} from '@angular/forms';
|
||||||
import {SearchEmployee} from '../../../../_models/Employee/searchEmployee';
|
import {SearchEmployee} from '../../../../_models/Employee/searchEmployee';
|
||||||
import {AdparameterService} from '../../../../_services/payroll/adparameter.service';
|
import {AdparameterService} from '../../../../_services/payroll/adparameter.service';
|
||||||
|
|
@ -34,7 +35,7 @@ import { EmployeePickerComponent } from 'src/app/picker/employee-picker.componen
|
||||||
standalone: false,
|
standalone: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
export class AllowanceDeductionParameterizationEntryComponent implements OnInit {
|
export class AllowanceDeductionParameterizationEntryComponent implements OnInit, DoCheck {
|
||||||
_adPram: ADParameter;
|
_adPram: ADParameter;
|
||||||
_allowDeducts: AllowanceDeduction[];
|
_allowDeducts: AllowanceDeduction[];
|
||||||
_grades: Grade[];
|
_grades: Grade[];
|
||||||
|
|
@ -262,10 +263,16 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit
|
||||||
}
|
}
|
||||||
|
|
||||||
RemoveAll() {
|
RemoveAll() {
|
||||||
if (!confirm("Are you sure to delete all employees allowance entry")) {
|
// if (!confirm("Are you sure to delete all employees allowance entry")) {
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
this._individualEmplyees.splice(0, this._individualEmplyees.length);
|
// 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);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
AddEmployee() {
|
AddEmployee() {
|
||||||
|
|
@ -277,7 +284,6 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit
|
||||||
this.notificationService.showWarning("Please enter an Amount");
|
this.notificationService.showWarning("Please enter an Amount");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this._selectedEmps == undefined) return;
|
if (this._selectedEmps == undefined) return;
|
||||||
this._selectedEmps.forEach(x => {
|
this._selectedEmps.forEach(x => {
|
||||||
let newItem: ADParameterEmployee = this._individualEmplyees.find(e => e.employeeID == x.employeeID);
|
let newItem: ADParameterEmployee = this._individualEmplyees.find(e => e.employeeID == x.employeeID);
|
||||||
|
|
@ -301,19 +307,14 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit
|
||||||
newItem.tillDate = this._individualToDate;
|
newItem.tillDate = this._individualToDate;
|
||||||
newItem.monthlyAmount = this._individualAmount;
|
newItem.monthlyAmount = this._individualAmount;
|
||||||
newItem.adEmpType = this._adEmpType;
|
newItem.adEmpType = this._adEmpType;
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
public GetSelectedEmployee(searchEmp: SearchEmployee[]) {
|
public GetSelectedEmployee(searchEmp: SearchEmployee[]) {
|
||||||
|
|
||||||
if (searchEmp != null) {
|
if (searchEmp != null) {
|
||||||
this._selectedEmps = [];
|
this._selectedEmps = [];
|
||||||
searchEmp.forEach(x => {
|
searchEmp.forEach(x => { this._selectedEmps.push(x); });
|
||||||
this._selectedEmps.push(x);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
PrepareGradeData(usedGrades: ADParameterGrade[]) {
|
PrepareGradeData(usedGrades: ADParameterGrade[]) {
|
||||||
|
|
@ -363,7 +364,6 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit
|
||||||
}
|
}
|
||||||
|
|
||||||
public Save() {
|
public Save() {
|
||||||
debugger;
|
|
||||||
if (this._fromValidator.invalid) {
|
if (this._fromValidator.invalid) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -389,7 +389,6 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit
|
||||||
}
|
}
|
||||||
if (this._adPram.adParameterEmployees.length > 0) {
|
if (this._adPram.adParameterEmployees.length > 0) {
|
||||||
this._adPram.adParameterEmployees.forEach(x => {
|
this._adPram.adParameterEmployees.forEach(x => {
|
||||||
debugger;
|
|
||||||
let adParamEmpItem: ADParameterEmployee = this.prADParameterEmployees.find(y => y.id === x.id);
|
let adParamEmpItem: ADParameterEmployee = this.prADParameterEmployees.find(y => y.id === x.id);
|
||||||
let oPayrollType: PayrollType = new PayrollType();
|
let oPayrollType: PayrollType = new PayrollType();
|
||||||
if (adParamEmpItem) {
|
if (adParamEmpItem) {
|
||||||
|
|
@ -402,8 +401,6 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit
|
||||||
x.oldTillDate = adParamEmpItem.tillDate;
|
x.oldTillDate = adParamEmpItem.tillDate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
debugger;
|
debugger;
|
||||||
|
|
@ -451,6 +448,49 @@ export class AllowanceDeductionParameterizationEntryComponent implements OnInit
|
||||||
return parseFloat((value).toFixed(2));
|
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="grid">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<kendo-grid [data]="gridView" (pageChange)="onDataChange($event)" [pageSize]="pageSize"
|
<kendo-grid [data]="gridView" (pageChange)="onDataChange($event)" [pageSize]="pageSize"
|
||||||
[pageable]="true" scrollable="virtual" [skip]="skip" [rowHeight]="36"
|
[pageable]="false" scrollable="virtual" [skip]="skip" [rowHeight]="36"
|
||||||
[(selectedKeys)]="selectedItems" [state]="selectAllState" [style.height.px]="gridHeight"
|
[(selectedKeys)]="selectedItems" [state]="selectAllState" [style.height.px]="gridHeight"
|
||||||
(selectedKeysChange)="onSelectedKeysChange($event)" [selectable]="selectableSettings"
|
(selectedKeysChange)="onSelectedKeysChange($event)" [selectable]="selectableSettings"
|
||||||
[kendoGridSelectBy]="'employeeID'">
|
[kendoGridSelectBy]="'employeeID'">
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ export class DiscontinueEmployeeDetailsComponent implements OnInit {
|
||||||
this.notificationService.showWarning('From Date cannot be after To Date.', 'Warning');
|
this.notificationService.showWarning('From Date cannot be after To Date.', 'Warning');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
debugger;
|
// debugger;
|
||||||
this.grid.load({ fromDate: this.fromDate, toDate: this.toDate });
|
this.grid.load({ fromDate: this.fromDate, toDate: this.toDate });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"version": "20261108-01",
|
"version": "20261115-03",
|
||||||
"buildTime": "2026-11-08T05:31:24.9714459Z"
|
"buildTime": "2026-11-15T08:30:42.0805569Z"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -424,6 +424,12 @@ namespace HRM.UI.Controllers
|
||||||
{
|
{
|
||||||
return BadRequest("Access Type and process date is not valid.");
|
return BadRequest("Access Type and process date is not valid.");
|
||||||
}
|
}
|
||||||
|
else if (userFromRepo.UserType == EnumUserType.User
|
||||||
|
&& !this._payrollTypeService.GetPayrollTypes(userFromRepo.LoginID).Any(p => p.ID == userForLoginDto.payrollTypeid))
|
||||||
|
{
|
||||||
|
// Only an approved (live) access type may be used to sign in; a requested one is not live yet.
|
||||||
|
return BadRequest("You do not have approved access to the selected Access Type.");
|
||||||
|
}
|
||||||
else if (userFromRepo.UserType == EnumUserType.Employee)
|
else if (userFromRepo.UserType == EnumUserType.Employee)
|
||||||
{
|
{
|
||||||
DateTime eocd= _userService.GetEndofContractDate(userForLoginDto.Username);
|
DateTime eocd= _userService.GetEndofContractDate(userForLoginDto.Username);
|
||||||
|
|
@ -739,6 +745,26 @@ namespace HRM.UI.Controllers
|
||||||
return Ok(new { userToken });
|
return Ok(new { userToken });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpPost("CipherMechanism")]
|
||||||
|
public ActionResult CipherMechanism(dynamic data)
|
||||||
|
{
|
||||||
|
var item = Newtonsoft.Json.JsonConvert.DeserializeObject(Convert.ToString(data));
|
||||||
|
string decryptedvalue = (string)item["decryptedvalue"].ToObject<string>();
|
||||||
|
var encryptedValue = "";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(decryptedvalue))
|
||||||
|
{
|
||||||
|
encryptedValue = Ease.NetCore.Utility.Global.CipherFunctions.Encrypt("CeLiMiTeD.AdMIn", decryptedvalue.Trim());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
|
||||||
|
}
|
||||||
|
return Ok(encryptedValue);
|
||||||
|
}
|
||||||
|
|
||||||
// Clears the HttpOnly "JWToken" cookie the API authenticates from (see Startup), so the
|
// Clears the HttpOnly "JWToken" cookie the API authenticates from (see Startup), so the
|
||||||
// session really ends on logout. Anonymous so an invalid/expired cookie can still be removed.
|
// session really ends on logout. Anonymous so an invalid/expired cookie can still be removed.
|
||||||
[HttpPost("logOut")]
|
[HttpPost("logOut")]
|
||||||
|
|
@ -827,6 +853,11 @@ namespace HRM.UI.Controllers
|
||||||
{
|
{
|
||||||
PayrollType optype = new PayrollTypeService().Get(payrollTypeId);
|
PayrollType optype = new PayrollTypeService().Get(payrollTypeId);
|
||||||
User oempUser = new UserService().Get(ouser.ID);
|
User oempUser = new UserService().Get(ouser.ID);
|
||||||
|
// Only an approved (live) access type may be switched to.
|
||||||
|
if (oempUser == null || !this._payrollTypeService.GetPayrollTypes(oempUser.LoginID).Any(p => p.ID == payrollTypeId))
|
||||||
|
{
|
||||||
|
return BadRequest("You do not have approved access to this Access Type.");
|
||||||
|
}
|
||||||
token = this.CreateToten(oempUser, optype.ID, optype.NextPayProcessDate);
|
token = this.CreateToten(oempUser, optype.ID, optype.NextPayProcessDate);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
|
@ -897,6 +928,21 @@ namespace HRM.UI.Controllers
|
||||||
return BadRequest("Your account is now locked. Please contact with your Line Manager.");
|
return BadRequest("Your account is now locked. Please contact with your Line Manager.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only an approved (live) access type may be switched to: the same list the ESS
|
||||||
|
// switch shows (getAdminPayrollTypes).
|
||||||
|
List<PayrollType> liveAccessTypes = this._payrollTypeService.GetUsersAdminPayrollTypes((int)currentUser.EmployeeID);
|
||||||
|
if (!liveAccessTypes.Any(p => p.ID == payrollTypeId))
|
||||||
|
{
|
||||||
|
if (item["payrollTypeId"] != null || liveAccessTypes.Count == 0)
|
||||||
|
{
|
||||||
|
return BadRequest("You do not have approved access to this Access Type.");
|
||||||
|
}
|
||||||
|
// No type was chosen and the employee's own one is not an approved access:
|
||||||
|
// use the first approved one instead.
|
||||||
|
payrollTypeId = liveAccessTypes[0].ID;
|
||||||
|
optype = new PayrollTypeService().Get(payrollTypeId);
|
||||||
|
}
|
||||||
|
|
||||||
#region Save User Login History
|
#region Save User Login History
|
||||||
if (guser != null)
|
if (guser != null)
|
||||||
{
|
{
|
||||||
|
|
@ -1243,30 +1289,72 @@ namespace HRM.UI.Controllers
|
||||||
public ActionResult SaveRole(Role role)
|
public ActionResult SaveRole(Role role)
|
||||||
{
|
{
|
||||||
int id = 0;
|
int id = 0;
|
||||||
|
|
||||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||||
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
|
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);
|
id = this._roleService.Save(role);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
|
@ -1276,6 +1364,43 @@ namespace HRM.UI.Controllers
|
||||||
|
|
||||||
return Ok(id);
|
return Ok(id);
|
||||||
}
|
}
|
||||||
|
//[HttpPost("saveRole")]
|
||||||
|
//public ActionResult SaveRole(Role role)
|
||||||
|
//{
|
||||||
|
// int id = 0;
|
||||||
|
|
||||||
|
// CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||||
|
// if (role.IsNew == true)
|
||||||
|
// {
|
||||||
|
// role.CreatedBy = currentUser.UserID;
|
||||||
|
// role.CreatedDate = DateTime.Now;
|
||||||
|
// role.RoleStatus = EnumAuthStatus.NewNotYetApprove;
|
||||||
|
// }
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// role.ApproveDate = null;
|
||||||
|
// role.ApproveBy = null;
|
||||||
|
// role.ModifiedBy = currentUser.UserID;
|
||||||
|
// role.ModifiedDate = DateTime.Now;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// if (role.RoleStatus == EnumAuthStatus.Approved)
|
||||||
|
// {
|
||||||
|
// role.ApproveDate = DateTime.Today;
|
||||||
|
// role.ApproveBy = currentUser.UserID;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// try
|
||||||
|
// {
|
||||||
|
// id = this._roleService.Save(role);
|
||||||
|
// }
|
||||||
|
// catch (Exception e)
|
||||||
|
// {
|
||||||
|
// return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// return Ok(id);
|
||||||
|
//}
|
||||||
|
|
||||||
[HttpPost("GetEmpUserRole")]
|
[HttpPost("GetEmpUserRole")]
|
||||||
public ActionResult GetEmpUserRole(List<SearchEmployee> searchEmps)
|
public ActionResult GetEmpUserRole(List<SearchEmployee> searchEmps)
|
||||||
|
|
@ -1427,20 +1552,65 @@ namespace HRM.UI.Controllers
|
||||||
return Ok(items);
|
return Ok(items);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Maker-checker for User Access Type. The page is in the super-user menu only
|
||||||
|
// (WebMenu.AdminMenus, given to SuperUser / SISU users), so only they may request or decide.
|
||||||
|
private bool CanManageUserAccessType(CurrentUser currentUser)
|
||||||
|
{
|
||||||
|
User actingUser = this._userService.Get(currentUser.UserID);
|
||||||
|
return actingUser != null && (actingUser.UserType == EnumUserType.SuperUser || actingUser.SISU == true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool IsPendingAccess(UserAccessType x)
|
||||||
|
{
|
||||||
|
return x.AccessTypeStatus == EnumAuthStatus.NewNotYetApprove
|
||||||
|
|| x.AccessTypeStatus == EnumAuthStatus.DeletedNotYetApprove;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Who made a pending row: the requester of a new access, or of a removal.
|
||||||
|
private static int AccessMakerID(UserAccessType x)
|
||||||
|
{
|
||||||
|
return x.AccessTypeStatus == EnumAuthStatus.DeletedNotYetApprove ? (x.ModifiedBy ?? 0) : x.CreatedBy;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Maker: the ticked payroll types become pending changes; nothing is live until approved.
|
||||||
[HttpPost("SaveUserAccessType")]
|
[HttpPost("SaveUserAccessType")]
|
||||||
public ActionResult SaveUserAccessType(List<UserAccessType> userAccessTypes)
|
public ActionResult SaveUserAccessType(List<UserAccessType> userAccessTypes)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||||
userAccessTypes.ForEach(x =>
|
if (!CanManageUserAccessType(currentUser))
|
||||||
{
|
{
|
||||||
x.CreatedBy = currentUser.UserID;
|
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to change user access types.");
|
||||||
x.CreatedDate = DateTime.Today;
|
}
|
||||||
x.ApprovedBy = currentUser.UserID;
|
if (userAccessTypes == null || userAccessTypes.Count == 0)
|
||||||
x.ApprovedDate = DateTime.Today;
|
{
|
||||||
});
|
return BadRequest("Select at least one payroll type.");
|
||||||
this._userAccessTypeService.Save(userAccessTypes);
|
}
|
||||||
|
|
||||||
|
int userID = userAccessTypes[0].UserID;
|
||||||
|
if (userID <= 0 || userAccessTypes.Any(x => x.UserID != userID))
|
||||||
|
{
|
||||||
|
return BadRequest("Select a user.");
|
||||||
|
}
|
||||||
|
|
||||||
|
List<int> payrollTypeIDs = userAccessTypes.Select(x => x.PayrollTypeID).Distinct().ToList();
|
||||||
|
List<PayrollType> allPayrollTypes = this._payrollTypeService.Get();
|
||||||
|
if (payrollTypeIDs.Any(id => !allPayrollTypes.Any(p => p.ID == id)))
|
||||||
|
{
|
||||||
|
return BadRequest("Invalid payroll type.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this._userAccessTypeService.GetByUserID(userID).Any(IsPendingAccess))
|
||||||
|
{
|
||||||
|
return BadRequest("This user already has an access change waiting for approval. Approve or reject it first.");
|
||||||
|
}
|
||||||
|
|
||||||
|
int changed = this._userAccessTypeService.RequestChange(userID, payrollTypeIDs, currentUser.UserID);
|
||||||
|
if (changed == 0)
|
||||||
|
{
|
||||||
|
return BadRequest("Nothing changed.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|
@ -1450,6 +1620,156 @@ namespace HRM.UI.Controllers
|
||||||
return Ok(true);
|
return Ok(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Checker: makes the user's pending access changes live. The maker cannot approve.
|
||||||
|
[HttpPost("ApproveUserAccessType/{userID}")]
|
||||||
|
public ActionResult ApproveUserAccessType(int userID)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||||
|
if (!CanManageUserAccessType(currentUser))
|
||||||
|
{
|
||||||
|
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to approve user access types.");
|
||||||
|
}
|
||||||
|
|
||||||
|
List<UserAccessType> pending = this._userAccessTypeService.GetByUserID(userID).Where(IsPendingAccess).ToList();
|
||||||
|
if (pending.Count == 0)
|
||||||
|
{
|
||||||
|
return BadRequest("This user has no access change waiting for approval.");
|
||||||
|
}
|
||||||
|
if (pending.Any(x => AccessMakerID(x) == currentUser.UserID))
|
||||||
|
{
|
||||||
|
return BadRequest("You cannot approve a change you made yourself. Another user must approve it.");
|
||||||
|
}
|
||||||
|
|
||||||
|
this._userAccessTypeService.Approve(userID, currentUser.UserID);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Checker: drops the user's pending access changes; access stays as it was. The maker cannot reject.
|
||||||
|
[HttpPost("RejectUserAccessType/{userID}")]
|
||||||
|
public ActionResult RejectUserAccessType(int userID)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||||
|
if (!CanManageUserAccessType(currentUser))
|
||||||
|
{
|
||||||
|
return StatusCode(StatusCodes.Status403Forbidden, "You are not allowed to reject user access types.");
|
||||||
|
}
|
||||||
|
|
||||||
|
List<UserAccessType> pending = this._userAccessTypeService.GetByUserID(userID).Where(IsPendingAccess).ToList();
|
||||||
|
if (pending.Count == 0)
|
||||||
|
{
|
||||||
|
return BadRequest("This user has no access change waiting for approval.");
|
||||||
|
}
|
||||||
|
if (pending.Any(x => AccessMakerID(x) == currentUser.UserID))
|
||||||
|
{
|
||||||
|
return BadRequest("You cannot reject a change you made yourself. Another user must reject it.");
|
||||||
|
}
|
||||||
|
|
||||||
|
this._userAccessTypeService.Reject(userID);
|
||||||
|
}
|
||||||
|
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);
|
||||||
|
done++;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
failed.Add(new { userID, message = e.Message });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Ok(new { done, failed });
|
||||||
|
}
|
||||||
|
|
||||||
// password history
|
// password history
|
||||||
//[HttpGet]
|
//[HttpGet]
|
||||||
//[Route("getPasswordHistoryList")]
|
//[Route("getPasswordHistoryList")]
|
||||||
|
|
|
||||||
|
|
@ -24,18 +24,21 @@ namespace HRM.UI.Controllers.Payroll
|
||||||
private readonly ISalaryMasterBulkUploadService _salaryMasterBulkUploadService;
|
private readonly ISalaryMasterBulkUploadService _salaryMasterBulkUploadService;
|
||||||
private readonly IEmployeePhotoBulkUploadService _employeePhotoBulkUploadService;
|
private readonly IEmployeePhotoBulkUploadService _employeePhotoBulkUploadService;
|
||||||
private readonly ICacheManager _cashManager;
|
private readonly ICacheManager _cashManager;
|
||||||
|
private readonly IBonusProcessService _bonusProcessService;
|
||||||
|
|
||||||
public DataUploadController(IDataUploadColumnDefinition columnDefination,
|
public DataUploadController(IDataUploadColumnDefinition columnDefination,
|
||||||
IEmployeeBulkUploadService employeeBulkUploadService,
|
IEmployeeBulkUploadService employeeBulkUploadService,
|
||||||
ISalaryMasterBulkUploadService salaryMasterBulkUploadService,
|
ISalaryMasterBulkUploadService salaryMasterBulkUploadService,
|
||||||
IEmployeePhotoBulkUploadService employeePhotoBulkUploadService,
|
IEmployeePhotoBulkUploadService employeePhotoBulkUploadService,
|
||||||
ICacheManager cashManager)
|
ICacheManager cashManager,
|
||||||
|
IBonusProcessService bonusProcessService)
|
||||||
{
|
{
|
||||||
this._columnDefination = columnDefination;
|
this._columnDefination = columnDefination;
|
||||||
this._employeeBulkUploadService = employeeBulkUploadService;
|
this._employeeBulkUploadService = employeeBulkUploadService;
|
||||||
this._salaryMasterBulkUploadService = salaryMasterBulkUploadService;
|
this._salaryMasterBulkUploadService = salaryMasterBulkUploadService;
|
||||||
this._employeePhotoBulkUploadService = employeePhotoBulkUploadService;
|
this._employeePhotoBulkUploadService = employeePhotoBulkUploadService;
|
||||||
this._cashManager = cashManager;
|
this._cashManager = cashManager;
|
||||||
|
this._bonusProcessService = bonusProcessService;
|
||||||
}
|
}
|
||||||
|
|
||||||
// loan
|
// loan
|
||||||
|
|
@ -156,6 +159,53 @@ namespace HRM.UI.Controllers.Payroll
|
||||||
return Ok(items);
|
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>
|
/// <summary>
|
||||||
/// The Employee Bulk Upload layout — groups, sub-groups and columns — that the page shows
|
/// The Employee Bulk Upload layout — groups, sub-groups and columns — that the page shows
|
||||||
/// as section checkboxes and in its template guide.
|
/// as section checkboxes and in its template guide.
|
||||||
|
|
|
||||||
|
|
@ -2313,6 +2313,27 @@ namespace HRM.UI.Controllers
|
||||||
|
|
||||||
return Ok(employeeList);
|
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")]
|
[HttpPost("updateBanglaInformation")]
|
||||||
public ActionResult updateBanglaInformation(dynamic data)
|
public ActionResult updateBanglaInformation(dynamic data)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -239,6 +239,105 @@ namespace HRM.UI.Controllers.Payroll
|
||||||
return Ok(true);
|
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]
|
[HttpPost]
|
||||||
[Route("CalculateBonusTax")]
|
[Route("CalculateBonusTax")]
|
||||||
public ActionResult CalculateBonusTax(List<BonusProcess.BonusProcessDetail> items)
|
public ActionResult CalculateBonusTax(List<BonusProcess.BonusProcessDetail> items)
|
||||||
|
|
|
||||||
|
|
@ -217,3 +217,5 @@
|
||||||
[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 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.
|
[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.
|
[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.
|
||||||
|
|
|
||||||
143
HRM.UI/appsettings.json
Normal file
143
HRM.UI/appsettings.json
Normal file
|
|
@ -0,0 +1,143 @@
|
||||||
|
{
|
||||||
|
"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=MasterProjectDBBRAC;User Id= DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;",
|
||||||
|
"SqlCommandConnection": "Data Source=103.197.204.164,1718;Initial Catalog=MasterProjectDBBRAC;Persist Security Info=True; User ID=DBuser;Password=ceLEa&e2025;TrustServerCertificate=True;" // Development
|
||||||
|
|
||||||
|
},
|
||||||
|
"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"
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
38
deploy.ps1
38
deploy.ps1
|
|
@ -11,7 +11,7 @@
|
||||||
# Update these values for each client/environment before running
|
# Update these values for each client/environment before running
|
||||||
|
|
||||||
$baseHref = "/CELHRM_Master/"
|
$baseHref = "/CELHRM_Master/"
|
||||||
$outputFolder = "publish\CELHRM_Master" # relative to this script's folder (repo root)
|
$outputFolder = "publish\CELHRM_Master" # relative to this script's folder (repo root); the version is added: CELHRM_Master_<version>
|
||||||
|
|
||||||
# These never change
|
# These never change
|
||||||
$repoRoot = $PSScriptRoot
|
$repoRoot = $PSScriptRoot
|
||||||
|
|
@ -48,6 +48,10 @@ $newCounter = $lastCounter + 1
|
||||||
$version = "$today-" + $newCounter.ToString("D2") # D2 = always 2 digits (01, 02, 03...)
|
$version = "$today-" + $newCounter.ToString("D2") # D2 = always 2 digits (01, 02, 03...)
|
||||||
$buildTime = (Get-Date).ToUniversalTime().ToString("o")
|
$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 ""
|
||||||
Write-Host "============================================" -ForegroundColor Cyan
|
Write-Host "============================================" -ForegroundColor Cyan
|
||||||
Write-Host " CEL HRM - Full Build & Deploy Script" -ForegroundColor Cyan
|
Write-Host " CEL HRM - Full Build & Deploy Script" -ForegroundColor Cyan
|
||||||
|
|
@ -132,6 +136,26 @@ Copy-Item -Path $distPath -Destination $wwwrootPath -Recurse -Force
|
||||||
Write-Host "[OK] Angular files copied to: $wwwrootPath" -ForegroundColor Green
|
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 ---- #
|
# ---- STEP 6: Write Angular web.config to wwwroot ---- #
|
||||||
# This is separate from the backend web.config that dotnet publish
|
# This is separate from the backend web.config that dotnet publish
|
||||||
# already generated at the root of $destinationPath (for the IIS
|
# already generated at the root of $destinationPath (for the IIS
|
||||||
|
|
@ -200,6 +224,18 @@ $angularWebConfig | Out-File -FilePath "$wwwrootPath\web.config" -Encoding utf8
|
||||||
Write-Host "[OK] Angular web.config written to: $wwwrootPath\web.config" -ForegroundColor Green
|
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 ---- #
|
# ---- DONE ---- #
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
Write-Host "============================================" -ForegroundColor Cyan
|
Write-Host "============================================" -ForegroundColor Cyan
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user