From a8b0c5bf9ce6ba700bd2fc5701769ab4a00a0451 Mon Sep 17 00:00:00 2001 From: mashfiq Date: Wed, 30 Oct 2024 13:17:23 +0600 Subject: [PATCH 1/2] Prod Bonus setup --- HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs | 2 +- HRM.UI/ClientApp/src/app/app.api.service.ts | 2 +- .../production-bonus-setup.component.ts | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs b/HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs index 27f8686..23e1b3f 100644 --- a/HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs +++ b/HRM.DA/DA/Bonus/ProductionBonusSetupDA.cs @@ -24,7 +24,7 @@ namespace HRM.DA { string sql = SQLParser.MakeSQL( "INSERT INTO ProductionBonusSetup(ProductionBonusSetupID, ProgramName, AchivedPercent, OTHour, SalaryMonth, DesignNo, FromDate, ToDate, MaxPerson, CreatedBy, CreationDate, Status)" + - " VALUES(%n, %s, %n, %n, %d, %s, %d, %d, %n, %d, %n)", item.ID, item.ProgramName, item.AchivedPercent, item.OTHour, + " VALUES(%n, %s, %n, %n, %d, %s, %d, %d, %n, %n, %d, %n)", item.ID, item.ProgramName, item.AchivedPercent, item.OTHour, item.SalaryMonth, item.DesignNo, item.FromDate, item.ToDate, item.MaxPerson, item.CreatedBy, item.CreatedDate, item.Status); tc.ExecuteNonQuery(sql); diff --git a/HRM.UI/ClientApp/src/app/app.api.service.ts b/HRM.UI/ClientApp/src/app/app.api.service.ts index 542181a..4638e72 100644 --- a/HRM.UI/ClientApp/src/app/app.api.service.ts +++ b/HRM.UI/ClientApp/src/app/app.api.service.ts @@ -13,7 +13,7 @@ export class ApiService { public isSSO = false; public versionDeployement = false; - public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2024, 7, 18))}-`+"01"; + public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2024, 9, 29))}-`+"01"; public static BASE_URL = ''; public base_url = ''; // public currentLink = ''; 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 b66f876..22fcca8 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 @@ -498,6 +498,10 @@ export class ProductionBonusSetupComponent implements OnInit { onClickOk() { debugger; if (this.isNewLine) { + if(this._departmentPicker.selectedID == undefined){ + this.notificationService.showWarning('Please Select a Line'); return; + } + this.prodBonusLine.lineName = this._departmentPicker.selectedObjects[0]['name']; this.productionBonusSetup.productionBonusLines.push(this.prodBonusLine); // for new this.notificationService.showSuccess('New Line added'); } -- 2.40.0.windows.1 From 5aec24eeab09c1c090a22132c69a0da6869ab283 Mon Sep 17 00:00:00 2001 From: mashfiq Date: Thu, 31 Oct 2024 14:47:44 +0600 Subject: [PATCH 2/2] Prod Bonus Attn --- ...production-bonus-attendance.component.html | 14 ++-- .../production-bonus-attendance.component.ts | 66 +++++++++++-------- 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.html b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.html index 6aab005..b9f9fb4 100644 --- a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.html +++ b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.html @@ -90,7 +90,7 @@
- @@ -114,19 +114,19 @@
- +
- +
- + [MultiSelect]="employeeSelection==='commonEmployee'" (keydown)="onKeyDown($event)" > +
diff --git a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts index 40389e2..09f9f63 100644 --- a/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts +++ b/HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts @@ -179,6 +179,10 @@ export class ProductionBonusAttendanceComponent implements OnInit { this.productionBonusSetup.fromDate = new Date(this.productionBonusSetup.fromDate); this.productionBonusSetup.toDate = new Date(this.productionBonusSetup.toDate); this.loadingPanelService.ShowLoadingPanel = false; + + this.startTime = this.setTime(this.startTime, 6, 0, 0); + this.endTime = this.setTime(this.endTime, 23, 59, 0); + this.selectedLine = undefined; } ) } @@ -265,31 +269,31 @@ export class ProductionBonusAttendanceComponent implements OnInit { this.notificationService.showWarning('Please Select an Employee'); return; } - // if (this.employeeSelection === 'commonEmployee') { - // if (this.selectedEmps !== null || this.selectedEmps !== undefined) { - // // console.log(this.selectedEmps); - // // console.log(this.employeeList); - // // for (let i = 0; i < this.selectedEmps.length; i++) { - // // this.AddEmployeebyId(this.selectedEmps[i].employeeID); - // // } - // for (let i = 0, isNew = true; i < this.selectedEmps.length; i++, isNew = true) { - // for (let j = 0; j < this.employeeList.length; j++) { - // if (this.selectedEmps[i].employeeID == this.employeeList[j].id) { - // this.notificationService.showWarning("EmployeeNo " + this.employeeList[j].employeeNo + " Already Exists"); - // isNew = false; - // break; - // } - // } - // if (isNew) { - // this.AddEmployeebyId(this.selectedEmps[i].employeeID); - // this.AddEmployeeGridData(this.selectedEmps[i].employeeID, true); - // } + if (this.employeeSelection === 'commonEmployee') { + if (this.selectedEmps !== null || this.selectedEmps !== undefined) { + // console.log(this.selectedEmps); + // console.log(this.employeeList); + // for (let i = 0; i < this.selectedEmps.length; i++) { + // this.AddEmployeebyId(this.selectedEmps[i].employeeID); + // } + for (let i = 0, isNew = true; i < this.selectedEmps.length; i++, isNew = true) { + for (let j = 0; j < this.employeeList.length; j++) { + if (this.selectedEmps[i].employeeID == this.employeeList[j].id) { + this.notificationService.showWarning("EmployeeNo " + this.employeeList[j].employeeNo + " Already Exists"); + isNew = false; + break; + } + } + if (isNew) { + this.AddEmployeebyId(this.selectedEmps[i].employeeID); + this.AddEmployeeGridData(this.selectedEmps[i].employeeID, true); + } - // debugger; - // } - // } - // } - // else { + debugger; + } + } + } + else { let sid: number; const emp = this.employeeList.find((e1) => e1.id === this.selectedEmps['employeeID']); const att = this.prodBonusAttn.find((e1) => e1.employeeID === this.selectedEmps['employeeID']); @@ -317,7 +321,7 @@ export class ProductionBonusAttendanceComponent implements OnInit { else { this.notificationService.showWarning('Employee already exist ! Can\'t Add'); } - // } + } } AddEmployeebyId(empId: number) { // this.loadingPanelService.ShowLoadingPanel = true; @@ -348,11 +352,11 @@ export class ProductionBonusAttendanceComponent implements OnInit { outTime: this.selectedDate, bonusHour: 0, employeeID: empId, - isCommon: isCommonValue + isCommon: false }; this.prodBonusAttn.push(newProdBonusAttn); // console.log('emplist ' + this.employeeList.length + '\n PbAttn ' + this.prodBonusAttn.length); - this.selectedEmps = undefined; + // this.selectedEmps = undefined; } // GetSelectedEmployee(sremployee: SearchEmployee) { // if (sremployee === undefined) { @@ -427,18 +431,24 @@ export class ProductionBonusAttendanceComponent implements OnInit { this.prodBonusAttn.splice(index, 1); } } + public onClickRemoveAll(){ + this.employeeList = []; + this.prodBonusAttn = []; + } - clear() { + public clear() { this.productionBonusSetup = new ProductionBonusSetup(); this.employeeList = []; this.selectedLine = undefined; } public onKeyDown(pressedKey) { + debugger; if (pressedKey.key === "Enter") { // this.onSave(pressedKey); this.onClickAdd(); this.scrollToBottom(); + this.selectedEmps = undefined; } } -- 2.40.0.windows.1