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

dev_mashfiq #34

Merged
chapal merged 9 commits from dev_mashfiq into devqc 2025-02-27 11:42:04 +06:00
Conversation 0 Commits 9 Files Changed 35 +4 -1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a3c8a22703 - Show all commits

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

@ -92,6 +92,9 @@ export class NomineeListComponent implements OnInit {
notApli = this.occupations.find(o => o.description.toUpperCase() == 'N/A'); notApli = this.occupations.find(o => o.description.toUpperCase() == 'N/A');
if (notApli != null) if (notApli != null)
this.nominee.occupationID = notApli.id; this.nominee.occupationID = notApli.id;
let np = this.nominationPurposes.find(n => n.id == 8);
if(this.nominationPurposes != null && np != null)
this.nominee.nominationPurposeID = np.id;
this.isDisplay = true; this.isDisplay = true;
} }
public editHandler(rowIndex: any) { public editHandler(rowIndex: any) {

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

@ -419,7 +419,7 @@ export class EmployeePayrollProfileComponent implements OnInit {
this.selectedEmployee.categoryID = this.employee.categoryID; this.selectedEmployee.categoryID = this.employee.categoryID;
this.selectedEmployee.name = this.employee.name; this.selectedEmployee.name = this.employee.name;
this.selectedEmployee.employeeNo = this.employee.employeeNo; this.selectedEmployee.employeeNo = this.employee.employeeNo;
this.showBankAccount = true; // this.showBankAccount = true;
} else { } else {
this.employee = new Employee(); this.employee = new Employee();