diff --git a/HRM.BO/HREmployee/HREmployee.cs b/HRM.BO/HREmployee/HREmployee.cs index 8d70d3e..3dc58e1 100644 --- a/HRM.BO/HREmployee/HREmployee.cs +++ b/HRM.BO/HREmployee/HREmployee.cs @@ -1128,7 +1128,16 @@ namespace HRM.BO } #endregion + #region Property NomineeMobileNo : string + private string _nomineeMobileNo; + public string NomineeMobileNo + { + get { return _nomineeMobileNo; } + set { _nomineeMobileNo = value; } + } + + #endregion public EnumProfileStatus ProfileStatus { get; set; } public string NomineeStatus { get; set; } public bool HasPicture { get; set; } diff --git a/HRM.DA/DA/HREmployee/HREmployeeDA.cs b/HRM.DA/DA/HREmployee/HREmployeeDA.cs index aab7ee3..53c5f6c 100644 --- a/HRM.DA/DA/HREmployee/HREmployeeDA.cs +++ b/HRM.DA/DA/HREmployee/HREmployeeDA.cs @@ -676,16 +676,16 @@ namespace HRM.DA tc.ExecuteNonQuery("INSERT INTO EmpNominee(" + "EmployeeID, NomineeID, NominationPurposeID, NominationDate, Name, RelationID, " + " Percentage, BirthDate, OccupationID, Address, TelePhone," + - " EmailAddress)" + + " EmailAddress, NomineeMobileNo)" + " VALUES(" + " %n, %n, %n, %d, %s, %n," + - " %n, %d, %n, %s, %s, %s)", + " %n, %d, %n, %s, %s, %s, %s)", nominee.EmployeeID, nominee.ID, nominee.NominationPurposeID, DataReader.GetNullValue(nominee.NominationDate), nominee.Name, DataReader.GetNullValue(nominee.RelationID, 0), nominee.Percentage, DataReader.GetNullValue(nominee.BirthDate), DataReader.GetNullValue(nominee.OccupationID, 0), nominee.Address, nominee.TelePhone, - nominee.EmailAddress); + nominee.EmailAddress, nominee.NomineeMobileNo); } public static void Update(TransactionContext tc, EmpNominee nominee) @@ -700,8 +700,9 @@ namespace HRM.DA ,[ADDRESS] = %s ,[TELEPHONE] = %s ,[EMAILADDRESS] = %s + ,[NomineeMobileNo] = %s WHERE NOMINEEID = %n", nominee.ID, nominee.NominationPurposeID, nominee.Name, nominee.RelationID, - nominee.Percentage, nominee.OccupationID, nominee.Address, nominee.TelePhone, nominee.EmailAddress, + nominee.Percentage, nominee.OccupationID, nominee.Address, nominee.TelePhone, nominee.EmailAddress, nominee.NomineeMobileNo, nominee.ID); } @@ -943,6 +944,7 @@ namespace HRM.DA ,[PHOTOPATH] ,[TELEPHONE] ,[EMAILADDRESS] + ,[NomineeMobileNo] ,[SIGNATURE] ,[EMPLOYEEID] ,[NOMINEENAME] diff --git a/HRM.DA/Service/HREmployee/HREmployeeService.cs b/HRM.DA/Service/HREmployee/HREmployeeService.cs index 42353fb..0194551 100644 --- a/HRM.DA/Service/HREmployee/HREmployeeService.cs +++ b/HRM.DA/Service/HREmployee/HREmployeeService.cs @@ -551,6 +551,7 @@ namespace HRM.DA oEmpNominee.TelePhone = oReader.GetString("TelePhone"); oEmpNominee.EmailAddress = oReader.GetString("EmailAddress"); + oEmpNominee.NomineeMobileNo = oReader.GetString("NomineeMobileNo", true, string.Empty); oEmpNominee.ProfileStatus = (EnumProfileStatus)oReader.GetInt32("ProfileStatus", true, 0); oEmpNominee.HasPicture = oReader.GetBoolean("HasPicture", true, false); oEmpNominee.HasSignature = oReader.GetBoolean("HasSignature", true, false); diff --git a/HRM.UI/ClientApp/src/app/_models/HREmployee/empNominee.ts b/HRM.UI/ClientApp/src/app/_models/HREmployee/empNominee.ts index a64495e..129f272 100644 --- a/HRM.UI/ClientApp/src/app/_models/HREmployee/empNominee.ts +++ b/HRM.UI/ClientApp/src/app/_models/HREmployee/empNominee.ts @@ -19,6 +19,7 @@ export class EmpNominee extends BaseObject { occupation: Occupation; address: string; telePhone: string; + nomineeMobileNo: string; photograph: empFileuploads; signature: empFileuploads; emailAddress: string; @@ -40,6 +41,7 @@ export class EmpNominee extends BaseObject { this.photograph = new empFileuploads(); this.signature = new empFileuploads(); this.emailAddress = ''; + this.nomineeMobileNo = ''; this.hasSignature = false; this.hasPicture = false; } diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.html b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.html index 154301e..61a0e4a 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.html +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.html @@ -32,10 +32,10 @@ pInputText style="width:100%" /> -
+
-
+
-
+
-
+
-
+
@@ -62,7 +62,7 @@
-
+
-
+
-
+
@@ -86,10 +86,18 @@ pInputText style="width:100%" />
-
+
+ +
+
+ +
+ +
-
+
@@ -97,19 +105,21 @@
-
+
-
+
-
+
+
+
diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.ts b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.ts index 62120c0..c70a21c 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.ts +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.ts @@ -90,6 +90,7 @@ export class NomineeEntryComponent implements OnInit { email: [''], picturePath: [''], signaturePath: [''], + mobile: [''], }); } diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-list/nominee-list.component.html b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-list/nominee-list.component.html index 80bd978..af37a64 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-list/nominee-list.component.html +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-list/nominee-list.component.html @@ -67,12 +67,12 @@ - +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
-
+
@@ -85,7 +101,7 @@
-
+
@@ -188,6 +204,15 @@ [(ngModel)]="employee.joiningDate" [format]="'dd-MMM-yyyy'" style="width:100%">
+ +
+ +
+
+ +
diff --git a/HRM.UI/ClientApp/src/app/payroll/career-and-profile/employee-payroll-profile/employee-payroll-profile.component.ts b/HRM.UI/ClientApp/src/app/payroll/career-and-profile/employee-payroll-profile/employee-payroll-profile.component.ts index 9461c45..e7279ed 100644 --- a/HRM.UI/ClientApp/src/app/payroll/career-and-profile/employee-payroll-profile/employee-payroll-profile.component.ts +++ b/HRM.UI/ClientApp/src/app/payroll/career-and-profile/employee-payroll-profile/employee-payroll-profile.component.ts @@ -250,6 +250,9 @@ export class EmployeePayrollProfileComponent implements OnInit { isShownInTaxSheet: [''], isConfirmed: [''], foreignExpatriate: [''], + fatherName: [''], + tinNo: [''], + endOfContractDate: [''], }); }