diff --git a/HRM.UI/ClientApp/src/app/app.api.service.ts b/HRM.UI/ClientApp/src/app/app.api.service.ts index 4e30b20..54ffb9e 100644 --- a/HRM.UI/ClientApp/src/app/app.api.service.ts +++ b/HRM.UI/ClientApp/src/app/app.api.service.ts @@ -14,7 +14,7 @@ export class ApiService { public isSSO = false; public versionDeployement = false; // public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2025, 1, 25))}-`+"01"; - public versionNumber = `V-20250721-`+"01"; + public versionNumber = `V-20250724-`+"01"; public static BASE_URL = ''; public base_url = ''; // public currentLink = ''; diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.ts b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.ts index 1b7d1b5..18bd524 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.ts +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/employee-profile.component.ts @@ -200,6 +200,7 @@ export class EmployeeProfileComponent implements OnInit { checkValue(value: any) { + debugger if (value === true) { this.hrEmployeeProfile = new HrEmployee(); @@ -221,6 +222,7 @@ export class EmployeeProfileComponent implements OnInit { } else { this.employeeService.hrEmployee.employeeNo = undefined; + this.employeeService.Employee_Get_Completed.next(new HrEmployee()); } } diff --git a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.html b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.html index 2cc4192..92474f2 100644 --- a/HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.html +++ b/HRM.UI/ClientApp/src/app/core-hr/employee-profile/general/general.component.html @@ -10,26 +10,38 @@
-
- + style="height: 60px; width: 180px; border-radius: 10px; border: 1px solid #52527A;" /> +
- +
- + + +
- +
@@ -179,8 +191,7 @@
- @@ -209,16 +220,12 @@ - + -
@@ -248,18 +255,14 @@
- - - + - +
@@ -274,10 +277,10 @@
- + id="txtNationalId" pInputText type="text" style="width:100%"> + - + @@ -285,23 +288,18 @@ - - - +
@@ -310,18 +308,13 @@
- + - - + +
@@ -349,7 +342,8 @@
-
@@ -365,21 +359,16 @@
- - + - - - + + +
@@ -420,16 +409,15 @@ formControlName="motherOccupation" id="txtreligion">
-
-
- +
+
+
- @@ -523,8 +511,8 @@ - +
Attcahment
@@ -567,7 +555,7 @@
-
@@ -575,23 +563,23 @@
- +
- +
- +