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

Merge pull request 'Production bonus break time for ramadan' (#36) from dev_chapal into devqc

Browse Source 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/36
This commit is contained in:
chapal 2025-03-25 11:11:39 +06:00
commit 63253ff06d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
HRM.DA/Service/Bonus/ProdBonusProcessService.cs
View File

@ -728,11 +728,11 @@ namespace HRM.DA
if (ts.Minutes < 16 && ts.Hours < 5)
wh = ts.Hours;
else if (ts.Minutes < 16)
wh = ts.Hours - oProductionBonusSetup.BreakHour;
wh = ts.Hours - ((tAtt.InTime.Date >= new DateTime(2025, 3, 1) && tAtt.InTime.Date <= new DateTime(2025, 3, 28)) ? 0.5 : oProductionBonusSetup.BreakHour);
else if (ts.TotalHours < 5)
wh = ts.TotalHours;
else
wh = ts.TotalHours - oProductionBonusSetup.BreakHour;
wh = ts.TotalHours - ((tAtt.InTime.Date >= new DateTime(2025, 3, 1) && tAtt.InTime.Date <= new DateTime(2025, 3, 28)) ? 0.5 : oProductionBonusSetup.BreakHour);
hour += wh < 0 ? 0 : wh;
}
@ -791,11 +791,11 @@ namespace HRM.DA
if (ts.Minutes < 16 && ts.Hours < 5)
wh = ts.Hours;
else if (ts.Minutes < 16)
wh = ts.Hours - oProductionBonusSetup.BreakHour;
wh = ts.Hours - ((tAtt.InTime.Date>=new DateTime(2025,3,1) && tAtt.InTime.Date <= new DateTime(2025, 3, 28))?0.5: oProductionBonusSetup.BreakHour);
else if (ts.TotalHours < 5)
wh = ts.TotalHours;
else
wh = ts.TotalHours - oProductionBonusSetup.BreakHour;
wh = ts.TotalHours - ((tAtt.InTime.Date >= new DateTime(2025, 3, 1) && tAtt.InTime.Date <= new DateTime(2025, 3, 28)) ? 0.5 : oProductionBonusSetup.BreakHour);
// hour += ts.Hours < 0 ? 0 : ts.Hours;
hour += wh < 0 ? 0 : wh;

4
HRM.Report/Class/rptBonus.cs
View File

@ -411,11 +411,11 @@ namespace HRM.Report
if (ts.Minutes < 16 && ts.Hours < 5)
wh = ts.Hours;
else if (ts.Minutes < 16)
wh = ts.Hours - design.BreakHour;
wh = ts.Hours - ((tAtt.InTime.Date >= new DateTime(2025, 3, 1) && tAtt.InTime.Date <= new DateTime(2025, 3, 28)) ? 0.5 : design.BreakHour);
else if (ts.TotalHours < 5)
wh = ts.TotalHours;
else
wh = ts.TotalHours - design.BreakHour;
wh = ts.TotalHours - ((tAtt.InTime.Date >= new DateTime(2025, 3, 1) && tAtt.InTime.Date <= new DateTime(2025, 3, 28)) ? 0.5 : design.BreakHour);
// hour += ts.Hours < 0 ? 0 : ts.Hours;
hour = wh < 0 ? 0 : wh;