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

dev_chapal #29

Merged
chapal merged 2 commits from dev_chapal into devqc 2025-01-15 16:54:05 +06:00
Conversation 0 Commits 2 Files Changed 3 +5 -4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be93060dea - Show all commits

9
HRM.Report/Attendence/Class/AttendanceReport.cs
View File

@ -1242,6 +1242,7 @@ namespace HRM.Report
string shortAttnType = "";
if (!(dAttnProcessess == null || dAttnProcessess.Count <= 0))
{
dAttnProcessess= dAttnProcessess.OrderBy(x => x.AttnDate).ToList();
foreach (DailyAttnProcess dAttnProcess in dAttnProcessess)
{
sLeaveName = string.Empty;
@ -1413,10 +1414,10 @@ namespace HRM.Report
dTable.Rows.Add(Rowbody);
}
}
DataView dv = dTable.DefaultView;
dv.Sort = "Date ASC";
DataTable sortedDT = dv.ToTable();
return sortedDT;
//DataView dv = dTable.DefaultView;
//dv.Sort = "Date ASC";
//DataTable sortedDT = dv.ToTable();
return dTable;
}
public DataTable GetEmpDailyAttn(int EmpID, DateTime dFromDate, DateTime dToDate, int PayrollTypeID)