diff --git a/HRM.BO/HREmployee/EmpLifeCycle.cs b/HRM.BO/HREmployee/EmpLifeCycle.cs index bd955c6..7e2c99d 100644 --- a/HRM.BO/HREmployee/EmpLifeCycle.cs +++ b/HRM.BO/HREmployee/EmpLifeCycle.cs @@ -281,16 +281,16 @@ namespace HRM.BO set { _incrementNo = value; } } #endregion - #region payrollTypeID : int + #region payrollTypeID : int - private int _payrollTypeID; - public int PayrollTypeID - { + private int _payrollTypeID; + public int PayrollTypeID + { get { return _payrollTypeID; } set { _payrollTypeID = value; } } #endregion - #region payrollTypeID : int + #region punishmentID : int private int _punishmentID; public int PunishmentID @@ -299,7 +299,7 @@ namespace HRM.BO set { _punishmentID = value; } } #endregion - #region payrollTypeID : int + #region complainID : int private int _complainID; public int ComplainID @@ -320,27 +320,27 @@ namespace HRM.BO #endregion -#region IsTransferReceived : bool - private bool _isTransferReceived; - public bool IsTransferReceived - { - get { return _isTransferReceived; } - set { _isTransferReceived = value; } - } - -#endregion - - -#region Employee : Employee -public Employee Employee { get; set; } - public HREmployee HREmployee { get; set; } - public List EmployeeCostCenters { get; set; } - - public EmployeeGradeSalary EmployeeGradeSalary { get; set; } - public List Orgemployees { get; set; } + #region IsTransferReceived : bool + private bool _isTransferReceived; + public bool IsTransferReceived + { + get { return _isTransferReceived; } + set { _isTransferReceived = value; } + } #endregion + + #region Employee : Employee + public Employee Employee { get; set; } + public HREmployee HREmployee { get; set; } + public List EmployeeCostCenters { get; set; } + + public EmployeeGradeSalary EmployeeGradeSalary { get; set; } + public List Orgemployees { get; set; } + + #endregion + #region HREmployee : HREmployee //private HREmployee _hremployee; @@ -554,6 +554,7 @@ public Employee Employee { get; set; } #endregion + public string CreatedByUser { get; set; } } diff --git a/HRM.UI/ClientApp/src/app/_models/Employee/empLifeCycle.ts b/HRM.UI/ClientApp/src/app/_models/Employee/empLifeCycle.ts index 3aa53ca..1374e0b 100644 --- a/HRM.UI/ClientApp/src/app/_models/Employee/empLifeCycle.ts +++ b/HRM.UI/ClientApp/src/app/_models/Employee/empLifeCycle.ts @@ -40,6 +40,7 @@ export class EmpLifeCycle extends BaseObject { punishmentID: number; isPayrollTypeChanged: boolean; isTransferReceived: boolean; + createdByUser: string; constructor() { super(); diff --git a/HRM.UI/ClientApp/src/app/payroll/career-and-profile/life-cycle-entry/life-cycle-entry.component.html b/HRM.UI/ClientApp/src/app/payroll/career-and-profile/life-cycle-entry/life-cycle-entry.component.html index 535e63e..a92a9ed 100644 --- a/HRM.UI/ClientApp/src/app/payroll/career-and-profile/life-cycle-entry/life-cycle-entry.component.html +++ b/HRM.UI/ClientApp/src/app/payroll/career-and-profile/life-cycle-entry/life-cycle-entry.component.html @@ -79,7 +79,10 @@
:
-
{{ _statusString }}
+
+ {{ _statusString }} +
@@ -102,6 +105,12 @@
:
{{ _employee.categoryName }}
+ +
+ +
+
:
+
{{ _employee.joiningDate | date: 'dd MMM yyyy'}}
@@ -509,7 +518,7 @@ + + + + {{ dataItem.createdByUser }} +
+ +
+
+ 0) - if(item == this._employeeStatus.find(x => x.description.toLowerCase() == 'joining') ){ + if (this._employeeStatus != undefined && this._employeeStatus.length > 0) + if (item == this._employeeStatus.find(x => x.description.toLowerCase() == 'joining')) { this._effectDate = new Date(this._employee.joiningDate); - } + } else { debugger; // let currentDate: Date = new Date(); @@ -329,6 +331,7 @@ export class LifeCycleEntryComponent implements OnInit { var emp: Employee = new Employee(); str = emp.getStatusString(this._employee.status); } + debugger this._statusString = str; return str; } @@ -353,6 +356,8 @@ export class LifeCycleEntryComponent implements OnInit { this._empLifeCycle = new EmpLifeCycle(); this._lifecycleHistory = []; this._employee = new Employee(); + this._employee.joiningDate = undefined; + this._statusString = undefined; return; } this.loadingPanelService.ShowLoadingPanel = true; diff --git a/HRM.UI/Controllers/Employee/empLifeCycleController.cs b/HRM.UI/Controllers/Employee/empLifeCycleController.cs index f3d3c3a..fd4c81b 100644 --- a/HRM.UI/Controllers/Employee/empLifeCycleController.cs +++ b/HRM.UI/Controllers/Employee/empLifeCycleController.cs @@ -119,7 +119,13 @@ namespace HRM.UI.Controllers { try { - return Ok(this._lifeCycleService.GetEmpID(EmpID)); + List empLifeCycles = this._lifeCycleService.GetEmpID(EmpID); + List users = _userService.GetAll(); + foreach (var empLifeCycle in empLifeCycles) + { + empLifeCycle.CreatedByUser = users.Find(u=> u.ID == empLifeCycle.CreatedBy)?.UserName; + } + return Ok(empLifeCycles); } catch (Exception ex) {