Merge branch 'fix/display-job-employer-in-profile' into 'V2.0'

Fix/display job employer in profile

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!270

src/app/profile/profile.component.html

@@ -36,7 +36,7 @@
       ></app-svg-icon>
       <div class="information">
         <div class="name">{{ userProfile.name }} {{ userProfile.surname }}</div>
-        <div class="job">{{ userProfile.job.name }}, {{ userProfile.employer.name }}</div>
+        <div *ngIf="utils.getJobEmployer(userProfile)" class="job">{{ utils.getJobEmployer(userProfile) }}</div>
         <div class="phone">{{ userProfile.phone | phone }}</div>
         <a class="email" href="mailto:{{ userProfile.email }}">{{ userProfile.email }}</a>
         <div class="description" *ngIf="userProfile.description">{{ userProfile.description }}</div>

src/app/profile/profile.component.ts

@@ -5,6 +5,7 @@ import { User } from '../models/user.model';
 import { StructureService } from '../services/structure.service';
 import { ButtonType } from '../shared/components/button/buttonType.enum';
 import { ProfileService } from './services/profile.service';
+import { Utils } from '../utils/utils';
 
 @Component({
   selector: 'app-profile',
@@ -19,7 +20,8 @@ export class ProfileComponent implements OnInit {
   constructor(
     private profileService: ProfileService,
     private structureService: StructureService,
-    private router: Router
+    private router: Router,
+    public utils: Utils
   ) {}
 
   ngOnInit(): void {

src/app/utils/utils.ts

 import { Injectable } from '@angular/core';
 import { FormGroup } from '@angular/forms';
+import { User } from '../models/user.model';
 
 @Injectable({
   providedIn: 'root',
@@ -25,4 +26,13 @@ export class Utils {
     }
     return phoneNumber;
   }
+
+  public getJobEmployer(userProfile: User): string {
+    const jobName = userProfile.job?.name;
+    const employerName = userProfile.employer?.name;
+    if (!jobName && !employerName) return '';
+    if (!jobName && employerName) return employerName;
+    if (jobName && !employerName) return jobName;
+    if (jobName && employerName) return `${jobName}, ${employerName}`;
+  }
 }