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

Employee Short profile and long profile issues

Browse Source
This commit is contained in:
mashfiq 2024-11-27 12:55:13 +06:00
parent bfd2b38e58
commit ca8befd8cb
10 changed files with 75 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
HRM.BO/HREmployee/HREmployee.cs
View File

@ -1128,7 +1128,16 @@ namespace HRM.BO
} }
#endregion #endregion
#region Property NomineeMobileNo : string
private string _nomineeMobileNo;
public string NomineeMobileNo
{
get { return _nomineeMobileNo; }
set { _nomineeMobileNo = value; }
}
#endregion
public EnumProfileStatus ProfileStatus { get; set; } public EnumProfileStatus ProfileStatus { get; set; }
public string NomineeStatus { get; set; } public string NomineeStatus { get; set; }
public bool HasPicture { get; set; } public bool HasPicture { get; set; }

10
HRM.DA/DA/HREmployee/HREmployeeDA.cs
View File

@ -676,16 +676,16 @@ namespace HRM.DA
tc.ExecuteNonQuery("INSERT INTO EmpNominee(" + tc.ExecuteNonQuery("INSERT INTO EmpNominee(" +
"EmployeeID, NomineeID, NominationPurposeID, NominationDate, Name, RelationID, " + "EmployeeID, NomineeID, NominationPurposeID, NominationDate, Name, RelationID, " +
" Percentage, BirthDate, OccupationID, Address, TelePhone," + " Percentage, BirthDate, OccupationID, Address, TelePhone," +
" EmailAddress)" + " EmailAddress, NomineeMobileNo)" +
" VALUES(" + " VALUES(" +
" %n, %n, %n, %d, %s, %n," + " %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, nominee.EmployeeID, nominee.ID, nominee.NominationPurposeID,
DataReader.GetNullValue(nominee.NominationDate), nominee.Name, DataReader.GetNullValue(nominee.NominationDate), nominee.Name,
DataReader.GetNullValue(nominee.RelationID, 0), DataReader.GetNullValue(nominee.RelationID, 0),
nominee.Percentage, DataReader.GetNullValue(nominee.BirthDate), nominee.Percentage, DataReader.GetNullValue(nominee.BirthDate),
DataReader.GetNullValue(nominee.OccupationID, 0), nominee.Address, nominee.TelePhone, DataReader.GetNullValue(nominee.OccupationID, 0), nominee.Address, nominee.TelePhone,
nominee.EmailAddress); nominee.EmailAddress, nominee.NomineeMobileNo);
} }
public static void Update(TransactionContext tc, EmpNominee nominee) public static void Update(TransactionContext tc, EmpNominee nominee)
@ -700,8 +700,9 @@ namespace HRM.DA
,[ADDRESS] = %s ,[ADDRESS] = %s
,[TELEPHONE] = %s ,[TELEPHONE] = %s
,[EMAILADDRESS] = %s ,[EMAILADDRESS] = %s
,[NomineeMobileNo] = %s
WHERE NOMINEEID = %n", nominee.ID, nominee.NominationPurposeID, nominee.Name, nominee.RelationID, 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); nominee.ID);
} }
@ -943,6 +944,7 @@ namespace HRM.DA
,[PHOTOPATH] ,[PHOTOPATH]
,[TELEPHONE] ,[TELEPHONE]
,[EMAILADDRESS] ,[EMAILADDRESS]
,[NomineeMobileNo]
,[SIGNATURE] ,[SIGNATURE]
,[EMPLOYEEID] ,[EMPLOYEEID]
,[NOMINEENAME] ,[NOMINEENAME]

1
HRM.DA/Service/HREmployee/HREmployeeService.cs
View File

@ -551,6 +551,7 @@ namespace HRM.DA
oEmpNominee.TelePhone = oReader.GetString("TelePhone"); oEmpNominee.TelePhone = oReader.GetString("TelePhone");
oEmpNominee.EmailAddress = oReader.GetString("EmailAddress"); oEmpNominee.EmailAddress = oReader.GetString("EmailAddress");
oEmpNominee.NomineeMobileNo = oReader.GetString("NomineeMobileNo", true, string.Empty);
oEmpNominee.ProfileStatus = (EnumProfileStatus)oReader.GetInt32("ProfileStatus", true, 0); oEmpNominee.ProfileStatus = (EnumProfileStatus)oReader.GetInt32("ProfileStatus", true, 0);
oEmpNominee.HasPicture = oReader.GetBoolean("HasPicture", true, false); oEmpNominee.HasPicture = oReader.GetBoolean("HasPicture", true, false);
oEmpNominee.HasSignature = oReader.GetBoolean("HasSignature", true, false); oEmpNominee.HasSignature = oReader.GetBoolean("HasSignature", true, false);

2
HRM.UI/ClientApp/src/app/_models/HREmployee/empNominee.ts
View File

@ -19,6 +19,7 @@ export class EmpNominee extends BaseObject {
occupation: Occupation; occupation: Occupation;
address: string; address: string;
telePhone: string; telePhone: string;
nomineeMobileNo: string;
photograph: empFileuploads; photograph: empFileuploads;
signature: empFileuploads; signature: empFileuploads;
emailAddress: string; emailAddress: string;
@ -40,6 +41,7 @@ export class EmpNominee extends BaseObject {
this.photograph = new empFileuploads(); this.photograph = new empFileuploads();
this.signature = new empFileuploads(); this.signature = new empFileuploads();
this.emailAddress = ''; this.emailAddress = '';
this.nomineeMobileNo = '';
this.hasSignature = false; this.hasSignature = false;
this.hasPicture = false; this.hasPicture = false;
} }

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

@ -32,10 +32,10 @@
pInputText style="width:100%" /> pInputText style="width:100%" />
</div> </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> <label>Relation</label>
</div> </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" <kendo-dropdownlist [(ngModel)]="nominee.relationID" [data]="relations"
[defaultItem]="{ description: 'Select Relations..', value: null }" [textField]="'description'" [defaultItem]="{ description: 'Select Relations..', value: null }" [textField]="'description'"
[valueField]="'id'" [valuePrimitive]="true" class="form-control form-control-sm input-sm" [valueField]="'id'" [valuePrimitive]="true" class="form-control form-control-sm input-sm"
@ -46,15 +46,15 @@
<div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;"> <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
<label for="txtPercentage">Percentage</label> <label for="txtPercentage">Percentage</label>
</div> </div>
<div class="p-col-12 p-md-6 p-lg-4" > <div class="p-col-12 p-md-6 p-lg-4">
<input id="txtPercentage" formControlName="percentage" [(ngModel)]="nominee.percentage" <input id="txtPercentage" formControlName="percentage" [(ngModel)]="nominee.percentage"
type="number" pInputText style="width:100%" /> type="number" pInputText style="width:100%" />
</div> </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> <label for="dtpDateOfBirth">Birth Date</label>
</div> </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'" <kendo-datepicker [(ngModel)]="nominee.birthDate" [format]="'dd-MMM-yyyy'"
formControlName="dateOfBirth" id="dtpDateOfBirth" style="width:100%"></kendo-datepicker> formControlName="dateOfBirth" id="dtpDateOfBirth" style="width:100%"></kendo-datepicker>
</div> </div>
@ -62,7 +62,7 @@
<div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;"> <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
<label>Occupation</label> <label>Occupation</label>
</div> </div>
<div class="p-col-12 p-md-6 p-lg-4" > <div class="p-col-12 p-md-6 p-lg-4">
<kendo-dropdownlist [(ngModel)]="nominee.occupationID" [data]="occupations" <kendo-dropdownlist [(ngModel)]="nominee.occupationID" [data]="occupations"
[defaultItem]="{ description: 'Select Occupations..', value: null }" [textField]="'description'" [defaultItem]="{ description: 'Select Occupations..', value: null }" [textField]="'description'"
[valueField]="'id'" [valuePrimitive]="true" class="form-control form-control-sm input-sm" [valueField]="'id'" [valuePrimitive]="true" class="form-control form-control-sm input-sm"
@ -70,10 +70,10 @@
</kendo-dropdownlist> </kendo-dropdownlist>
</div> </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> <label for="txtAddress">Address</label>
</div> </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" <input id="txtAddress" formControlName="address" [(ngModel)]="nominee.address" type="text"
pInputText style="width:100%" /> pInputText style="width:100%" />
</div> </div>
@ -86,10 +86,18 @@
pInputText style="width:100%" /> pInputText style="width:100%" />
</div> </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> <label for="txtEmail">Email</label>
</div> </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" <input id="txtEmail" formControlName="email" [(ngModel)]="nominee.emailAddress" type="text"
pInputText style="width:100%" /> pInputText style="width:100%" />
</div> </div>
@ -97,19 +105,21 @@
<div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;"> <div class="p-col-12 p-md-6 p-lg-2" style="margin: auto;">
<label for="fupPicture">Picture</label> <label for="fupPicture">Picture</label>
</div> </div>
<div class="p-col-12 p-md-6 p-lg-4" > <div class="p-col-12 p-md-6 p-lg-4">
<input formControlName="picturePath" pInputText style="width:100%" (change)="selectPicture($event)" <input formControlName="picturePath" pInputText style="width:100%" (change)="selectPicture($event)"
type="file"> type="file">
</div> </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> <label for="fupSignature">Signature</label>
</div> </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" <input formControlName="signaturePath" pInputText (change)="selectSignature($event)" type="file"
style="width:100%"> style="width:100%">
</div> </div>
<div class="p-col-12 p-md-6 p-lg-6" ></div>
</div> </div>
</div> </div>
</fieldset> </fieldset>

1
HRM.UI/ClientApp/src/app/core-hr/employee-profile/nominee/nominee-entry/nominee-entry.component.ts
View File

@ -90,6 +90,7 @@ export class NomineeEntryComponent implements OnInit {
email: [''], email: [''],
picturePath: [''], picturePath: [''],
signaturePath: [''], signaturePath: [''],
mobile: [''],
}); });
} }

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

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

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

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

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

@ -73,10 +73,26 @@
style="width:100%"></kendo-datepicker> style="width:100%"></kendo-datepicker>
</div> </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;"> <div class="p-col-12 p-md-6 p-lg-4" style="height: 43px;">
<label for="chkIsOTEligible">Eligible for OT</label> <label for="chkIsOTEligible">Eligible for OT</label>
</div> </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" <input type="checkbox" formControlName="isOTEligible" [(ngModel)]="employee.isEligibleOT"
id="chkIsOTEligible" kendoCheckBox /> id="chkIsOTEligible" kendoCheckBox />
@ -85,7 +101,7 @@
<label for="chkIsFixedLocation">Fixed Location / <label for="chkIsFixedLocation">Fixed Location /
Nearby</label> Nearby</label>
</div> </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" <input type="checkbox" formControlName="IsFixedLocation"
[(ngModel)]="employee.isFixedLocation" id="chkIsFixedLocation" kendoCheckBox /> [(ngModel)]="employee.isFixedLocation" id="chkIsFixedLocation" kendoCheckBox />
</div> </div>
@ -188,6 +204,15 @@
[(ngModel)]="employee.joiningDate" [format]="'dd-MMM-yyyy'" [(ngModel)]="employee.joiningDate" [format]="'dd-MMM-yyyy'"
style="width:100%"></kendo-datepicker> style="width:100%"></kendo-datepicker>
</div> </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>
</div> </div>

3
HRM.UI/ClientApp/src/app/payroll/career-and-profile/employee-payroll-profile/employee-payroll-profile.component.ts
View File

@ -250,6 +250,9 @@ export class EmployeePayrollProfileComponent implements OnInit {
isShownInTaxSheet: [''], isShownInTaxSheet: [''],
isConfirmed: [''], isConfirmed: [''],
foreignExpatriate: [''], foreignExpatriate: [''],
fatherName: [''],
tinNo: [''],
endOfContractDate: [''],
}); });
} }