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

Compare commits

base: CelHRTeam:1558e175e819f3360f51186f8e351e3427cfe262
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main
..
compare: CelHRTeam:491b56cc0f0d7d823591508ac733708f91db42c5
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main

No commits in common. "1558e175e819f3360f51186f8e351e3427cfe262" and "491b56cc0f0d7d823591508ac733708f91db42c5" have entirely different histories.
1558e175e8 ... 491b56cc0f

2 changed files with 3 additions and 35 deletions
Show Stats Expand all files Collapse all files

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

@ -232,7 +232,7 @@
</button>
</div>
<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>

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

@ -546,24 +546,11 @@ 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;
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.prodBonusSupervisors.push(newlineSupervisor);
// this.prodBonusLine.prodBonusParameters.push(newlineParameter);
@ -596,26 +583,7 @@ 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();
}