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

Compare commits

base: CelHRTeam:d3a7d1be861e4821e041a8291098745531dc32ac
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main
..
compare: CelHRTeam:185f9f11554409e99d43d84a637f30d1e69e47ba
Branches Tags
CelHRTeam:devqc
CelHRTeam:dev_chapal
CelHRTeam:dev_mashfiq
CelHRTeam:dev_sojib
CelHRTeam:main

No commits in common. "d3a7d1be861e4821e041a8291098745531dc32ac" and "185f9f11554409e99d43d84a637f30d1e69e47ba" have entirely different histories.
d3a7d1be86 ... 185f9f1155

2 changed files with 14 additions and 19 deletions
Show Stats Expand all files Collapse all files

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

@ -710,7 +710,7 @@ namespace HRM.DA
{ {
bonusIntime = dailyAtt.InTime; bonusIntime = dailyAtt.InTime;
bonusOuttime = dailyAtt.OutTime; bonusOuttime = dailyAtt.OutTime;
if (dailyAtt.OutTime != null && dailyAtt.InTime != null && dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue) if (dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
{ {
// oShift = oShifts.FirstOrDefault(x => x.ID == dailyAtt.ShiftID); // oShift = oShifts.FirstOrDefault(x => x.ID == dailyAtt.ShiftID);
if (oProductionBonusSetup.FromDate.Date == dailyAtt.AttnDate.Date) if (oProductionBonusSetup.FromDate.Date == dailyAtt.AttnDate.Date)
@ -770,7 +770,7 @@ namespace HRM.DA
double wh = 0; double wh = 0;
if (dailyAtt != null) if (dailyAtt != null)
{ {
if (dailyAtt.OutTime != null && dailyAtt.InTime != null && dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue) if (dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
{ {
bonusIntime = dailyAtt.InTime; bonusIntime = dailyAtt.InTime;
bonusOuttime = dailyAtt.OutTime; bonusOuttime = dailyAtt.OutTime;

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

@ -358,17 +358,14 @@ namespace HRM.Report
} }
if (prodAttn != null && prodAttn.Count > 0) if (prodAttn != null && prodAttn.Count > 0)
{ {
foreach (Employee item in attnEmp) foreach (Employee item in attnEmp)
{ {
List<ProdBonusAttn> tempAttn = prodAttn.Where(o => o.EmployeeID == item.ID).ToList();//.Sum(x => x.BonusHour); List<ProdBonusAttn> tempAttn = prodAttn.Where(o => o.EmployeeID == item.ID).ToList();//.Sum(x => x.BonusHour);
double hour = 0; double hour = 0;
foreach (ProdBonusAttn tAtt in tempAttn) foreach (ProdBonusAttn tAtt in tempAttn)
{ {
DailyAttnProcess dailyAtt = oDailyAttnProsess.FirstOrDefault(o => o.AttnDate.Date == tAtt.InTime.Date && DailyAttnProcess dailyAtt = oDailyAttnProsess.FirstOrDefault(o => o.AttnDate.Date == tAtt.InTime.Date &&
o.EmployeeID == item.ID && o.EmployeeID == item.ID &&
(o.AttenType == EnumAttendanceType.Present || (o.AttenType == EnumAttendanceType.Present ||
@ -382,7 +379,7 @@ namespace HRM.Report
if (dailyAtt != null) if (dailyAtt != null)
{ {
if (dailyAtt.OutTime != null && dailyAtt.InTime != null && dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue) if (dailyAtt.OutTime != DateTime.MinValue && dailyAtt.InTime != DateTime.MinValue)
{ {
bonusIntime = dailyAtt.InTime; bonusIntime = dailyAtt.InTime;
bonusOuttime = dailyAtt.OutTime; bonusOuttime = dailyAtt.OutTime;
@ -433,7 +430,6 @@ namespace HRM.Report
} }
} }
if (dTable.Rows.Count > 0) if (dTable.Rows.Count > 0)
@ -457,7 +453,6 @@ namespace HRM.Report
//form.CommonReportViewer(null, RDLC, dSet, _reportParameters, true); //form.CommonReportViewer(null, RDLC, dSet, _reportParameters, true);
ReportProcessor reportProcessor = new ReportProcessor(); ReportProcessor reportProcessor = new ReportProcessor();
return reportProcessor.CommonReportViewForReports(null, dSet, null, RDLC, _reportParameters, true, payrollTypeId, reportType); return reportProcessor.CommonReportViewForReports(null, dSet, null, RDLC, _reportParameters, true, payrollTypeId, reportType);
} }
#endregion Production Bonus #endregion Production Bonus