From 7ee1818e68c51d2e630c94666da428a73987f4c6 Mon Sep 17 00:00:00 2001 From: chapal Date: Thu, 31 Oct 2024 17:39:54 +0600 Subject: [PATCH] Prod Attn --- HRM.UI/ClientApp/src/app/app.api.service.ts | 2 +- .../production-bonus-attendance.component.ts | 3 ++- HRM.UI/Controllers/Payroll/BonusController.cs | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/HRM.UI/ClientApp/src/app/app.api.service.ts b/HRM.UI/ClientApp/src/app/app.api.service.ts index 4638e72..81a10fd 100644 --- a/HRM.UI/ClientApp/src/app/app.api.service.ts +++ b/HRM.UI/ClientApp/src/app/app.api.service.ts @@ -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 = ''; diff --git a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts index 09f9f63..41bd1f4 100644 --- a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts +++ b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts @@ -223,7 +223,8 @@ export class ProductionBonusAttendanceComponent implements OnInit { this.bonusService.getProdBonusAttnEmployeeList(data).subscribe( (resp) => { debugger - this.employeeList = resp; + this.employeeList = resp; + this.employeeList.forEach(x => this.AddEmployeeGridData(x.id, false)); // console.log('employee List', this.employeeList); }, (err) => { diff --git a/HRM.UI/Controllers/Payroll/BonusController.cs b/HRM.UI/Controllers/Payroll/BonusController.cs index 9591922..386fac8 100644 --- a/HRM.UI/Controllers/Payroll/BonusController.cs +++ b/HRM.UI/Controllers/Payroll/BonusController.cs @@ -547,7 +547,8 @@ namespace HRM.UI.Controllers.Payroll DateTime date = (DateTime)item["date"].ToObject(); ProdBonusLine _oProdBonusLine = (ProdBonusLine)item["prodLine"].ToObject(); - List _oEmployees = new List(); + CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User); + List _oEmployees = new EmployeeService().Get(EnumEmployeeStatus.Live, (int)currentUser.PayrollTypeID); List _oFinalEmployees = new List(); List _oProdBonusParameters = new List(); List _oProdBonusSupervisors = new List(); -- 2.40.0.windows.1