lifecycle

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;
+        private int _payrollTypeID;
-       public 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
+        #region IsTransferReceived : bool
-        private bool _isTransferReceived;
+                private bool _isTransferReceived;
-        public bool IsTransferReceived
+                public bool IsTransferReceived
-        {
+                {
-   get { return _isTransferReceived; }
+           get { return _isTransferReceived; }
-   set { _isTransferReceived = value; }
+           set { _isTransferReceived = value; }
-           }
+                   }
-
-#endregion
-
-
-#region Employee : Employee 
-public Employee Employee { get; set; }
-        public HREmployee HREmployee { get; set; }
-        public List<EmployeeCostCenter> EmployeeCostCenters { get; set; }
-
-        public EmployeeGradeSalary EmployeeGradeSalary { get; set; }
-        public List<OrganogramEmployee> Orgemployees { get; set; }
 
         #endregion
 
+
+        #region Employee : Employee 
+        public Employee Employee { get; set; }
+                public HREmployee HREmployee { get; set; }
+                public List<EmployeeCostCenter> EmployeeCostCenters { get; set; }
+
+                public EmployeeGradeSalary EmployeeGradeSalary { get; set; }
+                public List<OrganogramEmployee> 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; }
 
 
     }

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();

HRM.UI/ClientApp/src/app/payroll/career-and-profile/life-cycle-entry/life-cycle-entry.component.html

@@ -79,7 +79,10 @@
                     <label for="txtGrade">Status</label>
                 </div>
                 <div class="p-col-12 p-lg-1" align="center">:</div>
-                <div class="p-col-12 p-lg-4">{{ _statusString }}</div>
+                <div class="p-col-12 p-lg-4"
+                    [ngStyle]="{ 'color': _statusString === 'Discontinued' ? 'red' : 'inherit' }">
+                    {{ _statusString }}
+                </div>
 
                 <div class="p-col-12 p-lg-1">
                     <label for="txtBasicSalary">Basic Salary</label>
@@ -102,6 +105,12 @@
                 </div>
                 <div class="p-col-12 p-lg-1" align="center">:</div>
                 <div class="p-col-12 p-lg-4">{{ _employee.categoryName }}</div>
+
+                <div class="p-col-12 p-lg-1">
+                    <label for="txtCategory">Joining Date</label>
+                </div>
+                <div class="p-col-12 p-lg-1" align="center">:</div>
+                <div class="p-col-12 p-lg-4">{{ _employee.joiningDate | date: 'dd MMM yyyy'}}</div>
             </div>
         </fieldset>
     </div>
@@ -509,7 +518,7 @@
                             <kendo-grid-column
                                 field="effectDate"
                                 title="Effect Date"
-                                width="15%"
+                                width="13%"
                             >
                                 <ng-template
                                     kendoGridCellTemplate
@@ -525,12 +534,29 @@
                             <kendo-grid-column
                                 field="description"
                                 title="Description"
-                                width="77%"
+                                width="70%"
                             >
                             </kendo-grid-column>
+                            
+                            <kendo-grid-column
+                                field=""
+                                title="Created by"
+                                width="10%"
+                            >
+                                <ng-template
+                                    kendoGridCellTemplate
+                                    let-dataItem
+                                    let-rowIndex="rowIndex"
+                                >
+                                    {{ dataItem.createdByUser }} 
+                                    <br>
+                                    <label style="font-size: 12px; color: darkgray;">On {{ dataItem.createdDate | date : "dd-MMM-yyyy" }}</label>
+                                </ng-template>
+                            </kendo-grid-column>
+
                             <kendo-grid-command-column
                                 title="Action"
-                                width="8%"
+                                width="7%"
                             >
                                 <ng-template
                                     kendoGridCellTemplate

HRM.UI/ClientApp/src/app/payroll/career-and-profile/life-cycle-entry/life-cycle-entry.component.ts

@@ -127,6 +127,7 @@ export class LifeCycleEntryComponent implements OnInit {
 
     ngOnInit() {
         this._employee = new Employee();
+        this._employee.joiningDate = undefined;
         this._empLifeCycle = new EmpLifeCycle();
         this._CurrentEmpgranogram = new OrganogramBasic();
         this.lifecycleService.GetByUserID().subscribe(
@@ -174,6 +175,7 @@ export class LifeCycleEntryComponent implements OnInit {
     private CreateFormValidator(): void {
 
         this._employee = new Employee();
+        this._employee.joiningDate = undefined;
         this._fromValidator = new FormBuilder().group({
             loginId: ['', Validators.required],
             name: ['', Validators.required],
@@ -305,10 +307,10 @@ export class LifeCycleEntryComponent implements OnInit {
 
                 });
                 this._sDescription = item.description;
-                if(this._employeeStatus != undefined && this._employeeStatus.length > 0)
+                if (this._employeeStatus != undefined && this._employeeStatus.length > 0)
-                    if(item == this._employeeStatus.find(x => x.description.toLowerCase() == 'joining') ){
+                    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;

HRM.UI/Controllers/Employee/empLifeCycleController.cs

@@ -119,7 +119,13 @@ namespace HRM.UI.Controllers
         {
             try
             {
-                return Ok(this._lifeCycleService.GetEmpID(EmpID));
+                List<EmpLifeCycle> empLifeCycles = this._lifeCycleService.GetEmpID(EmpID);
+                List<User> users = _userService.GetAll();
+                foreach (var empLifeCycle in empLifeCycles)
+                {
+                    empLifeCycle.CreatedByUser = users.Find(u=> u.ID == empLifeCycle.CreatedBy)?.UserName;
+                }
+                return Ok(empLifeCycles);
             }
             catch (Exception ex)
             {