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

Prod Bonus Setup Modified Edit in supervisor #32

Merged
chapal merged 1 commits from dev_mashfiq into devqc 2025-01-26 17:27:19 +06:00
Conversation 0 Commits 1 Files Changed 2 +35 -3
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 38e1917a33 - Show all commits

2
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html
View File

@ -232,7 +232,7 @@
</button> </button>
</div> </div>
<div class="p-col-12 p-lg-5 label-ailgn"> <div class="p-col-12 p-lg-5 label-ailgn">
this will take around 30 Second or more. This will take around 30 Second or more.
</div> </div>
</div> </div>

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

@ -546,11 +546,24 @@ export class ProductionBonusSetupComponent implements OnInit {
} }
else { else {
debugger; debugger;
let supervisorIDs: number[] = [];
this.prodBonusLine.prodBonusSupervisors.forEach(item => {
supervisorIDs.push(item.employeeID);
});
newlineSupervisor.prodBonusLineID = this.selectedRow.id; newlineSupervisor.prodBonusLineID = this.selectedRow.id;
this.prodBonusLine.id = this.selectedRow.id; this.prodBonusLine.id = this.selectedRow.id;
this.prodBonusLine.lineName = this.selectedRow.lineName; this.prodBonusLine.lineName = this.selectedRow.lineName;
this.prodBonusLine.scheduledHour = this.selectedRow.scheduledHours; 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); // this.prodBonusLine.prodBonusParameters.push(newlineParameter);
@ -583,7 +596,26 @@ export class ProductionBonusSetupComponent implements OnInit {
} }
// console.log(this.prodBonusLine); // console.log(this.prodBonusLine);
// console.log(this.productionBonusSetup); // 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(); this.close();
} }