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

dev_mashfiq #26

Merged
chapal merged 4 commits from dev_mashfiq into devqc 2025-01-09 10:53:38 +06:00
Conversation 0 Commits 4 Files Changed 22 +4 -2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ceb4fa8fb1 - Show all commits

2
HRM.UI/ClientApp/src/app/app.api.service.ts
View File

@ -13,7 +13,7 @@ export class ApiService {
public isSSO = false; public isSSO = false;
public versionDeployement = 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 static BASE_URL = '';
public base_url = ''; public base_url = '';
// public currentLink = ''; // public currentLink = '';

4
HRM.UI/ClientApp/src/app/authentication/user-role/user-role-entry/user-role-entry.component.ts
View File

@ -184,8 +184,10 @@ export class UserRoleEntryComponent implements OnInit {
userRole.payrollTypeID = this._selectedPayrollTypeid; userRole.payrollTypeID = this._selectedPayrollTypeid;
userRole.employeeID = u.employeeID; userRole.employeeID = u.employeeID;
} }
if (this._selectedRoleType == EnumRoleType.Admin) if (this._selectedRoleType == EnumRoleType.Admin){
userRole.userID = u.id; userRole.userID = u.id;
userRole.userRoleStatus = EnumAuthStatus.Active;
}
userRole.loginIDView = u.loginID; userRole.loginIDView = u.loginID;
userRole.roleID = r; userRole.roleID = r;