Employee Short profile and long profile issues

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; }

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]

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

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;
     }

HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.html

@@ -32,10 +32,10 @@
                         pInputText style="width:100%" />
                 </div>
 
-                <div class="p-col-12 p-md-6 p-lg-2" >
+                <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
                     <label>Relation</label>
                 </div>
-                <div class="p-col-12 p-md-6 p-lg-4" style="margin: auto;">
+                <div class="p-col-12 p-md-6 p-lg-4">
                     <kendo-dropdownlist [(ngModel)]="nominee.relationID" [data]="relations"
                         [defaultItem]="{ description: 'Select Relations..', value: null }" [textField]="'description'"
                         [valueField]="'id'" [valuePrimitive]="true" class="form-control form-control-sm input-sm"
@@ -51,10 +51,10 @@
                         type="number" pInputText style="width:100%" />
                 </div>
 
-                <div class="p-col-12 p-md-6 p-lg-2" >
+                <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
                     <label for="dtpDateOfBirth">Birth Date</label>
                 </div>
-                <div class="p-col-12 p-md-6 p-lg-4" style="margin: auto;">
+                <div class="p-col-12 p-md-6 p-lg-4">
                     <kendo-datepicker [(ngModel)]="nominee.birthDate" [format]="'dd-MMM-yyyy'"
                         formControlName="dateOfBirth" id="dtpDateOfBirth" style="width:100%"></kendo-datepicker>
                 </div>
@@ -70,10 +70,10 @@
                     </kendo-dropdownlist>
                 </div>
 
-                <div class="p-col-12 p-md-6 p-lg-2" >
+                <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
                     <label for="txtAddress">Address</label>
                 </div>
-                <div class="p-col-12 p-md-6 p-lg-4" style="margin: auto;">
+                <div class="p-col-12 p-md-6 p-lg-4">
                     <input id="txtAddress" formControlName="address" [(ngModel)]="nominee.address" type="text"
                         pInputText style="width:100%" />
                 </div>
@@ -86,10 +86,18 @@
                         pInputText style="width:100%" />
                 </div>
 
-                <div class="p-col-12 p-md-6 p-lg-2" >
+                <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
+                    <label for="txtNomineeMobileNo">Mobile</label>
+                </div>
+                <div class="p-col-12 p-md-6 p-lg-4">
+                    <input id="txtNnomineeMobileNo" formControlName="mobile" [(ngModel)]="nominee.nomineeMobileNo" type="text"
+                        pInputText style="width:100%" />
+                </div>
+
+                <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
                     <label for="txtEmail">Email</label>
                 </div>
-                <div class="p-col-12 p-md-6 p-lg-4" style="margin: auto;">
+                <div class="p-col-12 p-md-6 p-lg-4">
                     <input id="txtEmail" formControlName="email" [(ngModel)]="nominee.emailAddress" type="text"
                         pInputText style="width:100%" />
                 </div>
@@ -102,14 +110,16 @@
                         type="file">
                 </div>
 
-                <div class="p-col-12 p-md-6 p-lg-2" >
+                <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
                     <label for="fupSignature">Signature</label>
                 </div>
-                <div class="p-col-12 p-md-6 p-lg-4" style="margin: auto;">
+                <div class="p-col-12 p-md-6 p-lg-4">
                     <input formControlName="signaturePath" pInputText (change)="selectSignature($event)" type="file"
                         style="width:100%">
                 </div>
 
+                <div class="p-col-12 p-md-6 p-lg-6" ></div>
+
             </div>
         </div>
     </fieldset>

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: [''],
         });
     }
 

HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-list/nominee-list.component.html

@@ -67,12 +67,12 @@
         </ng-template>
     </kendo-grid-command-column>
     <kendo-grid-command-column title="Action" width="100">
-        <ng-template kendoGridCellTemplate let-dataItem>
+        <ng-template kendoGridCellTemplate let-dataItem let-rowIndex="rowIndex">
             <button
                 kendoGridEditCommand
                 icon="pencil"
                 [primary]="true"
-                (click)="editHandler(dataItem)"
+                (click)="editHandler(rowIndex)"
                 [style.width.%]="49"
             ></button>
             <button

HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-list/nominee-list.component.ts

@@ -89,6 +89,7 @@ export class NomineeListComponent implements OnInit {
         this.isDisplay = true;
     }
     public editHandler(rowIndex: any) {
+        debugger
         this.editIndex = rowIndex;
         this.nominee = this.nominees[this.editIndex];
         this.isDisplay = true;

HRM.UI/ClientApp/src/app/payroll/career-and-profile/employee-payroll-profile/employee-payroll-profile.component.html

@@ -73,10 +73,26 @@
                                 style="width:100%"></kendo-datepicker>
                         </div>
 
+                        <div class="p-col-12 p-md-6 p-lg-4" style="margin:auto">
+                            <label for="txtfatherName">Father's Name</label>
+                        </div>
+                        <div class="p-col-12 p-md-6 p-lg-8 form-control-lg">
+                            <input id="txtfatherName" formControlName="fatherName" [(ngModel)]="employee.fatherName" type="text"
+                                style="width:100%" pInputText>
+                        </div>
+
+                        <div class="p-col-12 p-md-6 p-lg-4" style="margin:auto">
+                            <label for="txttinNo">TIN</label>
+                        </div>
+                        <div class="p-col-12 p-md-6 p-lg-8 form-control-lg">
+                            <input id="txttinNo" formControlName="tinNo" [(ngModel)]="employee.tinNo" type="text"
+                                style="width:100%" pInputText>
+                        </div>
+
                         <div class="p-col-12 p-md-6 p-lg-4" style="height: 43px;">
                             <label for="chkIsOTEligible">Eligible for OT</label>
                         </div>
-                        <div class="p-col-12 p-md-6 p-lg-8 form-control-lg">
+                        <div class="p-col-12 p-md-6 p-lg-2 form-control-lg">
                             <input type="checkbox" formControlName="isOTEligible" [(ngModel)]="employee.isEligibleOT"
                                 id="chkIsOTEligible" kendoCheckBox />
 
@@ -85,7 +101,7 @@
                             <label for="chkIsFixedLocation">Fixed Location /
                                 Nearby</label>
                         </div>
-                        <div class="p-col-12 p-md-6 p-lg-8 form-control-lg">
+                        <div class="p-col-12 p-md-6 p-lg-2 form-control-lg">
                             <input type="checkbox" formControlName="IsFixedLocation"
                                 [(ngModel)]="employee.isFixedLocation" id="chkIsFixedLocation" kendoCheckBox />
                         </div>
@@ -188,6 +204,15 @@
                                 [(ngModel)]="employee.joiningDate" [format]="'dd-MMM-yyyy'"
                                 style="width:100%"></kendo-datepicker>
                         </div>
+
+                        <div class="p-col-12 p-md-6 p-lg-4" style="margin:auto">
+                            <label for="dtpEndofContract">End of Contract</label>
+                        </div>
+                        <div class="p-col-12 p-md-6 p-lg-8 form-control-lg">
+                            <kendo-datepicker id="dtpEndofContract" formControlName="endOfContractDate"
+                                [(ngModel)]="employee.endOfContractDate" [format]="'dd-MMM-yyyy'"
+                                style="width:100%"></kendo-datepicker>
+                        </div>
                     </div>
                 </div>
 

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: [''],
         });
     }