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

Compare commits

base: CelHRTeam:ec89ce82854212231cc1e7089e89ff76bbc0dd25
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_mashfiq
CelHRTeam:dev_chapal
CelHRTeam:main
..
compare: CelHRTeam:9bbd802127f83e5cf405e1df1084e81bd4b6286e
Branches Tags
CelHRTeam:dev_mashfiq
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:main

No commits in common. "ec89ce82854212231cc1e7089e89ff76bbc0dd25" and "9bbd802127f83e5cf405e1df1084e81bd4b6286e" have entirely different histories.
ec89ce8285 ... 9bbd802127

1 changed files with 5 additions and 27 deletions
Show Stats Expand all files Collapse all files

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

@ -45,8 +45,8 @@ export class ProductionBonusAttendanceComponent implements OnInit {
selectedDate: Date = new Date; selectedDate: Date = new Date;
startTime: Date = new Date(); startTime: Date;
endTime: Date = new Date(); endTime: Date;
selectedSalaryDate: Date = new Date(); selectedSalaryDate: Date = new Date();
@ -76,16 +76,6 @@ export class ProductionBonusAttendanceComponent implements OnInit {
// this.Loadlayout(); // this.Loadlayout();
this.productionBonusSetup = new ProductionBonusSetup(); this.productionBonusSetup = new ProductionBonusSetup();
this.showScheduleDate = false; this.showScheduleDate = false;
// this.startTime.setHours(6);
// this.startTime.setMinutes(0);
// this.startTime.setSeconds(0);
this.startTime = this.setTime(this.startTime, 6, 0, 0)
// this.endTime.setHours(23);
// this.endTime.setMinutes(0);
// this.endTime.setSeconds(0);
this.endTime = this.setTime(this.endTime, 23, 59, 0)
} }
employeeList: Employee[] = []; employeeList: Employee[] = [];
@ -172,7 +162,7 @@ export class ProductionBonusAttendanceComponent implements OnInit {
} }
onClickRefresh() { onClickRefresh() {
// debugger; debugger;
const fromDate = new Date(this.productionBonusSetup.fromDate.setHours(0, 0, 0, 0)); const fromDate = new Date(this.productionBonusSetup.fromDate.setHours(0, 0, 0, 0));
const toDate = new Date(this.productionBonusSetup.toDate.setHours(0, 0, 0, 0)); const toDate = new Date(this.productionBonusSetup.toDate.setHours(0, 0, 0, 0));
const selectedDate = new Date(this.selectedDate.setHours(0, 0, 0, 0)); const selectedDate = new Date(this.selectedDate.setHours(0, 0, 0, 0));
@ -196,11 +186,11 @@ export class ProductionBonusAttendanceComponent implements OnInit {
() => { () => {
this.loadingPanelService.ShowLoadingPanel = false; this.loadingPanelService.ShowLoadingPanel = false;
this.employeeList = []; this.employeeList = [];
debugger; debugger;
if (this.prodBonusAttn.length <= 0 && (this.productionBonusSetup.productionBonusType == EnumProductionBonusType.Cutting || if (this.prodBonusAttn.length <= 0 && (this.productionBonusSetup.productionBonusType == EnumProductionBonusType.Cutting ||
this.productionBonusSetup.productionBonusType == EnumProductionBonusType.Finishing)) { this.productionBonusSetup.productionBonusType == EnumProductionBonusType.Finishing)) {
let data = { let data = {
prodLine: this.selectedLine, prodLine: this.prodBonusLine,
date: this.selectedDate date: this.selectedDate
} }
this.loadingPanelService.ShowLoadingPanel = true; this.loadingPanelService.ShowLoadingPanel = true;
@ -233,10 +223,6 @@ export class ProductionBonusAttendanceComponent implements OnInit {
for (let i = 0; i < this.prodBonusAttn.length; i++) { for (let i = 0; i < this.prodBonusAttn.length; i++) {
this.AddEmployeebyId(this.prodBonusAttn[i].employeeID); this.AddEmployeebyId(this.prodBonusAttn[i].employeeID);
} }
let inTime = new Date(this.prodBonusAttn[0].inTime);
let outTime = new Date(this.prodBonusAttn[0].outTime);
this.startTime = this.setTime(inTime, inTime.getHours(), inTime.getMinutes(), inTime.getSeconds());
this.endTime = this.setTime(outTime, outTime.getHours(), outTime.getMinutes(), outTime.getSeconds());
} }
} }
); );
@ -442,12 +428,4 @@ export class ProductionBonusAttendanceComponent implements OnInit {
scrollToBottom(): void { scrollToBottom(): void {
this.gridScrollableElement.scrollTop = this.gridScrollableElement.scrollHeight; this.gridScrollableElement.scrollTop = this.gridScrollableElement.scrollHeight;
} }
public setTime(date: Date, hour: number, min: number, sec: number): Date{
date.setHours(hour);
date.setMinutes(min);
date.setSeconds(sec);
return date;
}
} }