CelHRTeam/EchoTex_Payroll
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: CelHRTeam:5aec24eeab09c1c090a22132c69a0da6869ab283
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_mashfiq
CelHRTeam:dev_chapal
CelHRTeam:main
...
compare: CelHRTeam:c0aade8e9dbeaf1b8b3be1b350a97cd2f2b7b9d2
Branches Tags
CelHRTeam:dev_mashfiq
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:main

4 Commits
5aec24eeab ... c0aade8e9d

Author SHA1 Message Date
chapal
c0aade8e9d Merge pull request 'Prod Attn' (#10) from dev_chapal into devqc 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/10
 2024-10-31 17:41:35 +06:00
chapal
7ee1818e68 Prod Attn 2024-10-31 17:39:54 +06:00
chapal
3e8b0e2678 Merge pull request 'dev_mashfiq' (#9) from dev_mashfiq into devqc 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/9
 2024-10-31 15:38:08 +06:00
chapal
11587f47a1 Merge pull request 'Prod bonus' (#7) from dev_mashfiq into devqc 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/7
 2024-10-29 15:00:40 +06:00
3 changed files with 5 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
HRM.UI/ClientApp/src/app/app.api.service.ts
View File

@ -13,7 +13,7 @@ export class ApiService {
public isSSO = false;
public versionDeployement = false;
public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2024, 9, 29))}-`+"01";
public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2024, 9, 31))}-`+"01";
public static BASE_URL = '';
public base_url = '';
// public currentLink = '';

1
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts
View File

@ -224,6 +224,7 @@ export class ProductionBonusAttendanceComponent implements OnInit {
(resp) => {
debugger
this.employeeList = resp;
this.employeeList.forEach(x => this.AddEmployeeGridData(x.id, false));
// console.log('employee List', this.employeeList);
},
(err) => {

3
HRM.UI/Controllers/Payroll/BonusController.cs
View File

@ -547,7 +547,8 @@ namespace HRM.UI.Controllers.Payroll
DateTime date = (DateTime)item["date"].ToObject<DateTime>();
ProdBonusLine _oProdBonusLine = (ProdBonusLine)item["prodLine"].ToObject<ProdBonusLine>();
List<Employee> _oEmployees = new List<Employee>();
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
List<Employee> _oEmployees = new EmployeeService().Get(EnumEmployeeStatus.Live, (int)currentUser.PayrollTypeID);
List<Employee> _oFinalEmployees = new List<Employee>();
List<ProdBonusParameter> _oProdBonusParameters = new List<ProdBonusParameter>();
List<ProdBonusSupervisor> _oProdBonusSupervisors = new List<ProdBonusSupervisor>();