{{userInfo.EMPLOYEE_DISPLAY_NAME}}
-{{userInfo.JOB_NAME}}
+{{userJobName}}
{{userInfo.JOB_NAME}}
+{{userJobName}}
{{EmpEmail}}
-{{ts.trPK('userProfile','role')}}
- {{EmpJob}} + {{EmpPosition}}{{EmpJob}}
+{{EmpPosition}}
{{ts.trPK('userProfile','role')}}
- {{employee.JOB_NAME}} + {{jobName}}{{ts.trPK('userProfile','empNo')}}
@@ -505,7 +504,7 @@{{employee.JOB_NAME}}
+{{jobName}}
{{employee.POSITION_NAME}}
+{{jobName}}
{{ts.trPK('userProfile','role')}}
- {{personalInfo.JOB_NAME}} + {{jobName}}{{ts.trPK('userProfile','empNo')}}
diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 626c7b98..36520a84 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -50,6 +50,8 @@ export class HomeComponent implements OnInit { public postalCode: any; public country: any; public employeeAdress: any = []; + public jobName: any; + constructor( public ts: TranslatorService, public cs: CommonService, @@ -143,6 +145,12 @@ export class HomeComponent implements OnInit { if (user) { console.log(user); this.personalInfo = user; + + let jobTitle = user.POSITION_NAME.split('.'); + if (jobTitle && jobTitle.length > 1) { + this.jobName = jobTitle[0] + " " + jobTitle[1]; + } + if (this.cs.getUpdateImage().status) { this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + this.cs.getUpdateImage().img); } else {