From 38e1917a33662c2353d19f6b81028a0c0d8db0cd Mon Sep 17 00:00:00 2001 From: mashfiq Date: Sun, 26 Jan 2025 15:00:26 +0600 Subject: [PATCH] Prod Bonus Setup Modified Edit in supervisor --- .../production-bonus-setup.component.html | 2 +- .../production-bonus-setup.component.ts | 36 +++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html index 00388a4..3ade5dc 100644 --- a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html +++ b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html @@ -232,7 +232,7 @@
- this will take around 30 Second or more. + This will take around 30 Second or more.
diff --git a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.ts b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.ts index c0d0ed0..b8733f9 100644 --- a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.ts +++ b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.ts @@ -546,11 +546,24 @@ export class ProductionBonusSetupComponent implements OnInit { } else { debugger; + + let supervisorIDs: number[] = []; + this.prodBonusLine.prodBonusSupervisors.forEach(item => { + supervisorIDs.push(item.employeeID); + }); newlineSupervisor.prodBonusLineID = this.selectedRow.id; this.prodBonusLine.id = this.selectedRow.id; this.prodBonusLine.lineName = this.selectedRow.lineName; this.prodBonusLine.scheduledHour = this.selectedRow.scheduledHours; - this.prodBonusLine.prodBonusSupervisors.push(newlineSupervisor); + + if (!supervisorIDs.includes(newlineSupervisor.employeeID)) + this.prodBonusLine.prodBonusSupervisors.push(newlineSupervisor); + else{ + this.prodBonusLine.prodBonusSupervisors.forEach(element => { + if(element.employeeID == newlineSupervisor.employeeID) + element.bonusPercent = newlineSupervisor.bonusPercent; + }); + } // this.prodBonusLine.prodBonusParameters.push(newlineParameter); @@ -583,7 +596,26 @@ export class ProductionBonusSetupComponent implements OnInit { } // console.log(this.prodBonusLine); // console.log(this.productionBonusSetup); - + else { + let supervisorIDs: number[] = []; + this.productionBonusSetup.productionBonusLines.forEach(element => { + if(element.id == this.prodBonusLine.id){ + element.prodBonusSupervisors.forEach(item => { + supervisorIDs.push(item.employeeID); + }); + } + }); + + this.productionBonusSetup.productionBonusLines.forEach(element => { + if(element.id == this.prodBonusLine.id){ + this.prodBonusLine.prodBonusSupervisors.forEach(item => { + if (!supervisorIDs.includes(item.employeeID)) { + element.prodBonusSupervisors.push(item); + } + }); + } + }); + } this.close(); } -- 2.40.0.windows.1