Compare commits
No commits in common. "c0aade8e9dbeaf1b8b3be1b350a97cd2f2b7b9d2" and "3e8b0e26780444a86b1cc095c47e54040095af94" have entirely different histories.
c0aade8e9d
...
3e8b0e2678
|
@ -13,7 +13,7 @@ export class ApiService {
|
|||
|
||||
public isSSO = false;
|
||||
public versionDeployement = false;
|
||||
public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2024, 9, 31))}-`+"01";
|
||||
public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2024, 9, 29))}-`+"01";
|
||||
public static BASE_URL = '';
|
||||
public base_url = '';
|
||||
// public currentLink = '';
|
||||
|
|
|
@ -224,7 +224,6 @@ 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) => {
|
||||
|
|
|
@ -547,8 +547,7 @@ namespace HRM.UI.Controllers.Payroll
|
|||
DateTime date = (DateTime)item["date"].ToObject<DateTime>();
|
||||
ProdBonusLine _oProdBonusLine = (ProdBonusLine)item["prodLine"].ToObject<ProdBonusLine>();
|
||||
|
||||
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
|
||||
List<Employee> _oEmployees = new EmployeeService().Get(EnumEmployeeStatus.Live, (int)currentUser.PayrollTypeID);
|
||||
List<Employee> _oEmployees = new List<Employee>();
|
||||
List<Employee> _oFinalEmployees = new List<Employee>();
|
||||
List<ProdBonusParameter> _oProdBonusParameters = new List<ProdBonusParameter>();
|
||||
List<ProdBonusSupervisor> _oProdBonusSupervisors = new List<ProdBonusSupervisor>();
|
||||
|
|
Loading…
Reference in New Issue
Block a user