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

dev_chapal #51

Merged
chapal merged 4 commits from dev_chapal into devqc 2026-01-20 09:26:16 +06:00
Conversation 0 Commits 4 Files Changed 2 +73 -68
1 changed files with 73 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bf228388bb - Show all commits

141
HRM.UI/Controllers/Employee/EmployeeController.cs
View File

@ -1814,12 +1814,12 @@ namespace HRM.UI.Controllers
foreach (var row in ds.Tables[0].AsEnumerable()) foreach (var row in ds.Tables[0].AsEnumerable())
{ {
EmployeeDetailInfo temp = new EmployeeDetailInfo (); EmployeeDetailInfo temp = new EmployeeDetailInfo ();
Employee emp = new EmployeeService().GetFromAll(row["EMPLOYEENO"].ToString(), (int)currentUser.PayrollTypeID); //Employee emp = new EmployeeService().GetFromAll(row["EMPLOYEENO"].ToString(), (int)currentUser.PayrollTypeID);
Department tempDepartment = null; //Department tempDepartment = null;
if (emp!= null) //if (emp!= null)
{ //{
tempDepartment = emp.DepartmentID != null ? oDepartment.Find(item => item.ID == emp.DepartmentID) : null; // tempDepartment = emp.DepartmentID != null ? oDepartment.Find(item => item.ID == emp.DepartmentID) : null;
} //}
temp.EmployeeNo = row["EmployeeNo"] == null ? "" : row.Field<string>("EmployeeNo"); temp.EmployeeNo = row["EmployeeNo"] == null ? "" : row.Field<string>("EmployeeNo");
temp.Name = row["Name"] == null ? "" : row.Field<string>("Name"); temp.Name = row["Name"] == null ? "" : row.Field<string>("Name");
@ -1858,70 +1858,75 @@ namespace HRM.UI.Controllers
Department tire2 = null; Department tire2 = null;
Department tire1 = null; Department tire1 = null;
if (tempDepartment != null) //if (tempDepartment != null)
{ //{
if (tempDepartment.ParentID != null) // if (tempDepartment.ParentID != null)
{ // {
for (int i = (int)tempDepartment.Tier; i > 0; i--) // for (int i = (int)tempDepartment.Tier; i > 0; i--)
{ // {
if (i == 5) // if (i == 5)
{ // {
tire5 = oDepartment.Find(x => x.ID == tempDepartment.ID); // tire5 = oDepartment.Find(x => x.ID == tempDepartment.ID);
} // }
if (i == 4) // if (i == 4)
{ // {
if (tire5 != null) // if (tire5 != null)
{ // {
tire4 = oDepartment.Find(x => x.ID == tire5.ParentID); // tire4 = oDepartment.Find(x => x.ID == tire5.ParentID);
} // }
else // else
{ // {
tire4 = oDepartment.Find(x => x.ID == tempDepartment.ID); // tire4 = oDepartment.Find(x => x.ID == tempDepartment.ID);
} // }
} // }
if (i == 3) // if (i == 3)
{ // {
if (tire4 != null) // if (tire4 != null)
{ // {
tire3 = oDepartment.Find(x => x.ID == tire4.ParentID); // tire3 = oDepartment.Find(x => x.ID == tire4.ParentID);
} // }
else // else
{ // {
tire3 = oDepartment.Find(x => x.ID == tempDepartment.ID); // tire3 = oDepartment.Find(x => x.ID == tempDepartment.ID);
} // }
} // }
if (i == 2) // if (i == 2)
{ // {
if (tire3 != null) // if (tire3 != null)
{ // {
tire2 = oDepartment.Find(x => x.ID == tire3.ParentID); // tire2 = oDepartment.Find(x => x.ID == tire3.ParentID);
} // }
else // else
{ // {
tire2 = oDepartment.Find(x => x.ID == tempDepartment.ID); // tire2 = oDepartment.Find(x => x.ID == tempDepartment.ID);
} // }
} // }
if (i == 1) // if (i == 1)
{ // {
if (tire2 != null) // if (tire2 != null)
{ // {
tire1 = oDepartment.Find(x => x.ID == tire2.ParentID); // tire1 = oDepartment.Find(x => x.ID == tire2.ParentID);
} // }
else // else
{ // {
tire1 = oDepartment.Find(x => x.ID == tempDepartment.ID); // tire1 = oDepartment.Find(x => x.ID == tempDepartment.ID);
} // }
} // }
} // }
} // }
temp.deptireOne = (tire1 == null) ? "" : tire1.Name; // temp.deptireOne = (tire1 == null) ? "" : tire1.Name;
temp.deptireTwo = (tire2 == null) ? "" : tire2.Name; // temp.deptireTwo = (tire2 == null) ? "" : tire2.Name;
temp.deptireThree = (tire3 == null) ? "" : tire3.Name; // temp.deptireThree = (tire3 == null) ? "" : tire3.Name;
temp.deptireFour = (tire4 == null) ? "" : tire4.Name; // temp.deptireFour = (tire4 == null) ? "" : tire4.Name;
temp.deptireFive = (tire5 == null) ? "" : tire5.Name; // temp.deptireFive = (tire5 == null) ? "" : tire5.Name;
} //}
temp.deptireOne = (tire1 == null) ? "" : tire1.Name;
temp.deptireTwo = (tire2 == null) ? "" : tire2.Name;
temp.deptireThree = (tire3 == null) ? "" : tire3.Name;
temp.deptireFour = (tire4 == null) ? "" : tire4.Name;
temp.deptireFive = (tire5 == null) ? "" : tire5.Name;
temp.Designation = row["DESIGNATION"] == null ? "" : row.Field<string>("DESIGNATION"); temp.Designation = row["DESIGNATION"] == null ? "" : row.Field<string>("DESIGNATION");
temp.Grade = row["GRADE"] == null ? "" : row.Field<string>("GRADE"); temp.Grade = row["GRADE"] == null ? "" : row.Field<string>("GRADE");