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

Compare commits

base: CelHRTeam:a87a593549cf334912318cf0376922827e4370a2
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_mashfiq
CelHRTeam:dev_chapal
CelHRTeam:main
...
compare: CelHRTeam:f0f32b5cc12ffb9986c6d8531525c83886e55f40
Branches Tags
CelHRTeam:dev_mashfiq
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:main

4 Commits
a87a593549 ... f0f32b5cc1

Author SHA1 Message Date
chapal
f0f32b5cc1 Merge pull request 'dev_chapal' (#5) from dev_chapal into devqc 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/5
 2024-10-17 12:57:39 +06:00
chapal
5b985339a1 Prod Undo 2024-10-17 12:56:12 +06:00
chapal
ec89ce8285 Prod B Process 2024-10-17 12:50:06 +06:00
chapal
a71a188f72 Merge pull request 'dev_mashfiq' (#4) from dev_mashfiq into devqc 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/4
 2024-10-17 10:15:17 +06:00
2 changed files with 7 additions and 6 deletions
Show Stats Expand all files Collapse all files

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

@ -85,7 +85,7 @@ export class ProductionBonusAttendanceComponent implements OnInit {
// this.endTime.setHours(23); // this.endTime.setHours(23);
// this.endTime.setMinutes(0); // this.endTime.setMinutes(0);
// this.endTime.setSeconds(0); // this.endTime.setSeconds(0);
this.endTime = this.setTime(this.endTime, 23, 0, 0) this.endTime = this.setTime(this.endTime, 23, 59, 0)
} }
employeeList: Employee[] = []; employeeList: Employee[] = [];
@ -196,11 +196,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.prodBonusLine, prodLine: this.selectedLine,
date: this.selectedDate date: this.selectedDate
} }
this.loadingPanelService.ShowLoadingPanel = true; this.loadingPanelService.ShowLoadingPanel = true;
@ -234,7 +234,7 @@ export class ProductionBonusAttendanceComponent implements OnInit {
this.AddEmployeebyId(this.prodBonusAttn[i].employeeID); this.AddEmployeebyId(this.prodBonusAttn[i].employeeID);
} }
let inTime = new Date(this.prodBonusAttn[0].inTime); let inTime = new Date(this.prodBonusAttn[0].inTime);
let outTime = 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.startTime = this.setTime(inTime, inTime.getHours(), inTime.getMinutes(), inTime.getSeconds());
this.endTime = this.setTime(outTime, outTime.getHours(), outTime.getMinutes(), outTime.getSeconds()); this.endTime = this.setTime(outTime, outTime.getHours(), outTime.getMinutes(), outTime.getSeconds());
} }

5
HRM.UI/Controllers/Payroll/BonusController.cs
View File

@ -745,6 +745,7 @@ namespace HRM.UI.Controllers.Payroll
DateTime dtpSalaryMonth = (DateTime)pItem["salaryMonthDate"].ToObject<DateTime>(); DateTime dtpSalaryMonth = (DateTime)pItem["salaryMonthDate"].ToObject<DateTime>();
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User); CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
int payrollTypeId = currentUser.PayrollTypeID.GetValueOrDefault(); int payrollTypeId = currentUser.PayrollTypeID.GetValueOrDefault();
//int setupID = ConfigurationManager.GetIntValue("bonus", "productionbonussetupid", EnumConfigurationType.Logic); //int setupID = ConfigurationManager.GetIntValue("bonus", "productionbonussetupid", EnumConfigurationType.Logic);
@ -780,7 +781,7 @@ namespace HRM.UI.Controllers.Payroll
//DateTime nextPayProcessDate = new SystemInformationService().Get().NextPayProcessDate; //DateTime nextPayProcessDate = new SystemInformationService().Get().NextPayProcessDate;
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User); CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
DateTime nextPayProcessDate = currentUser.NextPayProcessDate.GetValueOrDefault(); DateTime nextPayProcessDate = currentUser.NextPayProcessDate.GetValueOrDefault();
int payrollTypeId = currentUser.PayrollTypeID.GetValueOrDefault();
if (dtpSalaryMonth.Month == nextPayProcessDate.Month && dtpSalaryMonth.Year == nextPayProcessDate.Year) if (dtpSalaryMonth.Month == nextPayProcessDate.Month && dtpSalaryMonth.Year == nextPayProcessDate.Year)
{ {
List<ProdBonusProcess> oProdBonusProsses = _prodBonusProcessService.Get(GlobalFunctions.LastDateOfMonth(dtpSalaryMonth)); List<ProdBonusProcess> oProdBonusProsses = _prodBonusProcessService.Get(GlobalFunctions.LastDateOfMonth(dtpSalaryMonth));
@ -790,7 +791,7 @@ namespace HRM.UI.Controllers.Payroll
{ {
//int setupID = ConfigurationManager.GetIntValue("bonus", "productionbonussetupid", EnumConfigurationType.Logic); //int setupID = ConfigurationManager.GetIntValue("bonus", "productionbonussetupid", EnumConfigurationType.Logic);
int setupID = 21; int setupID = 21;
ADParameter _ADParam = new ADParameterService().Get(setupID); ADParameter _ADParam = new ADParameterService().Get(setupID, payrollTypeId);
_prodBonusProcessService.UndoProcess(oProdBonusProsses, _ADParam, GlobalFunctions.LastDateOfMonth(dtpSalaryMonth)); _prodBonusProcessService.UndoProcess(oProdBonusProsses, _ADParam, GlobalFunctions.LastDateOfMonth(dtpSalaryMonth));
//MessageBox.Show("Bonus process deleted successfully.", "Undo Bonus Process", MessageBoxButtons.OK, MessageBoxIcon.Information); //MessageBox.Show("Bonus process deleted successfully.", "Undo Bonus Process", MessageBoxButtons.OK, MessageBoxIcon.Information);