diff --git a/HRM.UI/ClientApp/src/app/app.api.service.ts b/HRM.UI/ClientApp/src/app/app.api.service.ts index c6a1e4c..c7c3109 100644 --- a/HRM.UI/ClientApp/src/app/app.api.service.ts +++ b/HRM.UI/ClientApp/src/app/app.api.service.ts @@ -13,7 +13,7 @@ export class ApiService { public isSSO = false; public versionDeployement = false; - public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2024, 10, 3))}-`+"01"; + public versionNumber = `V-${GlobalfunctionExtension.generateVersionNumber(new Date(2024, 11, 29))}-`+"01"; public static BASE_URL = ''; public base_url = ''; // public currentLink = ''; diff --git a/HRM.UI/ClientApp/src/app/authentication/user-role/user-role-entry/user-role-entry.component.ts b/HRM.UI/ClientApp/src/app/authentication/user-role/user-role-entry/user-role-entry.component.ts index 7ce49f9..83c16e4 100644 --- a/HRM.UI/ClientApp/src/app/authentication/user-role/user-role-entry/user-role-entry.component.ts +++ b/HRM.UI/ClientApp/src/app/authentication/user-role/user-role-entry/user-role-entry.component.ts @@ -184,8 +184,10 @@ export class UserRoleEntryComponent implements OnInit { userRole.payrollTypeID = this._selectedPayrollTypeid; userRole.employeeID = u.employeeID; } - if (this._selectedRoleType == EnumRoleType.Admin) + if (this._selectedRoleType == EnumRoleType.Admin){ userRole.userID = u.id; + userRole.userRoleStatus = EnumAuthStatus.Active; + } userRole.loginIDView = u.loginID; userRole.roleID = r;