review de code

src/app/components/agence/agence-add/agence-add.component.html

@@ -4,22 +4,22 @@
 
   <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3 mb-2">
     <label class="form-label">Nom</label>
-    <input [ngClass]="{ 'is-invalid': submitted && f.name.errors }" class="form-control" formControlName="name">
-    <div *ngIf="submitted && f.name.errors" class="invalid-feedback">
-      <div *ngIf="f.name.errors.required">Le nom d'une agence est obligatoire</div>
+    <input [ngClass]="{ 'is-invalid': submitted && form.name.errors }" class="form-control" formControlName="name">
+    <div *ngIf="submitted && form.name.errors" class="invalid-feedback">
+      <div *ngIf="form.name.errors.required">Le nom d'une agence est obligatoire</div>
     </div>
   </div>
 
   <div class="form-group col-12 col-md-6">
     <label class="form-label">Business Unit</label>
-    <select [ngClass]="{ 'is-invalid': submitted && f.businessUnitId.errors }" class="form-select"
+    <select [ngClass]="{ 'is-invalid': submitted && form.businessUnitId.errors }" class="form-select"
             formControlName="businessUnitId"
             id="businessUnit-select">
       <option disabled selected value="">Choisissez la business unit de cette agence</option>
       <option *ngFor="let businessUnit of businessUnits" [ngValue]="businessUnit.id">{{businessUnit.name}}</option>
     </select>
-    <div *ngIf="submitted && f.businessUnitId.errors" class="invalid-feedback">
-      <div *ngIf="f.businessUnitId.errors.required">Vous devez choisir la business unit à laquelle appartient
+    <div *ngIf="submitted && form.businessUnitId.errors" class="invalid-feedback">
+      <div *ngIf="form.businessUnitId.errors.required">Vous devez choisir la business unit à laquelle appartient
         l'agence
       </div>
     </div>

src/app/components/agence/agence-add/agence-add.component.ts

@@ -28,19 +28,19 @@ export class AgenceAddComponent implements OnInit {
   ) {
   }
 
-  get f() {
+  get form() {
     return this.registerForm.controls;
   }
 
   ngOnInit(): void {
-    this.getBusinessUnits();
+    this.initBusinessUnits();
     this.registerForm = this.formBuilder.group({
       name: ['', Validators.required],
       businessUnitId: ['', Validators.required]
     });
   }
 
-  getBusinessUnits() {
+  initBusinessUnits() {
     this.businessUnitService.getBusinessunits()
       .subscribe(businessunits => this.businessUnits = businessunits);
   }

src/app/components/agence/agence-edit/agence-edit.component.html

@@ -8,23 +8,23 @@
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3 mb-2">
       <label class="form-label">Nom</label>
-      <input [ngClass]="{ 'is-invalid': submitted && f.name.errors }" [value]="agence.name" class="form-control"
+      <input [ngClass]="{ 'is-invalid': submitted && form.name.errors }" [value]="agence.name" class="form-control"
              formControlName="name">
-      <div *ngIf="submitted && f.name.errors" class="invalid-feedback">
-        <div *ngIf="f.name.errors.required">Le nom d'une agence est obligatoire</div>
+      <div *ngIf="submitted && form.name.errors" class="invalid-feedback">
+        <div *ngIf="form.name.errors.required">Le nom d'une agence est obligatoire</div>
       </div>
     </div>
 
     <div class="form-group col-12 col-md-6">
       <label class="form-label">Business Unit</label>
-      <select [ngClass]="{ 'is-invalid': submitted && f.businessUnitId.errors }" class="form-select"
+      <select [ngClass]="{ 'is-invalid': submitted && form.businessUnitId.errors }" class="form-select"
               formControlName="businessUnitId"
               id="businessUnit-select">
         <option disabled selected value="">Choisissez la business unit de cette agence</option>
         <option *ngFor="let businessUnit of businessUnits" [ngValue]="businessUnit.id">{{businessUnit.name}}</option>
       </select>
-      <div *ngIf="submitted && f.businessUnitId.errors" class="invalid-feedback">
-        <div *ngIf="f.businessUnitId.errors.required">Vous devez choisir la business unit à laquelle appartient
+      <div *ngIf="submitted && form.businessUnitId.errors" class="invalid-feedback">
+        <div *ngIf="form.businessUnitId.errors.required">Vous devez choisir la business unit à laquelle appartient
           l'agence
         </div>
       </div>

src/app/components/agence/agence-edit/agence-edit.component.ts

@@ -36,12 +36,12 @@ export class AgenceEditComponent implements OnInit {
     this.id = Number(this.route.snapshot.paramMap.get('id'))
   }
 
-  get f() {
+  get form() {
     return this.registerForm.controls;
   }
 
   async ngOnInit() {
-    this.getBusinessUnits()
+    this.initBusinessUnits()
     this.registerForm = this.formBuilder.group({
       name: ['', Validators.required],
       businessUnitId: ['', Validators.required]
@@ -50,7 +50,7 @@ export class AgenceEditComponent implements OnInit {
     this.agence = await this.agenceObservable.pipe(take(1)).toPromise()
   }
 
-  getBusinessUnits() {
+  initBusinessUnits() {
     this.businessUnitService.getBusinessunits()
       .subscribe(businessunits => this.businessUnits = businessunits);
   }

src/app/components/agence/agence.component.ts

@@ -24,16 +24,16 @@ export class AgenceComponent implements OnInit {
 
 
   ngOnInit(): void {
-    this.getAgences();
-    this.getBusinessUnits();
+    this.initAgences();
+    this.initBusinessUnits();
   }
 
-  getAgences(): void {
+  initAgences(): void {
     this.agenceService.getAgences()
       .subscribe(agences => this.agences = agences);
   }
 
-  getBusinessUnits(): void {
+  initBusinessUnits(): void {
     this.businessUnitService.getBusinessunits()
       .subscribe(bus => this.businessUnits = bus);
   }
@@ -41,7 +41,7 @@ export class AgenceComponent implements OnInit {
   getBusinessUnitById(id: number): Businessunit {
     let bu = {} as Businessunit;
     this.businessUnits.forEach(c => {
-      if (c.id == id) {
+      if (c.id === id) {
         bu = c;
         return;
       }

src/app/components/businessunit/businessunit-add/businessunit-add.component.html

@@ -4,9 +4,9 @@
 
   <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3 mb-2">
     <label class="form-label">Nom</label>
-    <input [ngClass]="{ 'is-invalid': submitted && f.name.errors }" class="form-control" formControlName="name">
-    <div *ngIf="submitted && f.name.errors" class="invalid-feedback">
-      <div *ngIf="f.name.errors.required">Le nom d'une business unit est obligatoire</div>
+    <input [ngClass]="{ 'is-invalid': submitted && form.name.errors }" class="form-control" formControlName="name">
+    <div *ngIf="submitted && form.name.errors" class="invalid-feedback">
+      <div *ngIf="form.name.errors.required">Le nom d'une business unit est obligatoire</div>
     </div>
   </div>
 

src/app/components/businessunit/businessunit-add/businessunit-add.component.ts

@@ -25,7 +25,7 @@ export class BusinessunitAddComponent implements OnInit {
   ) {
   }
 
-  get f() {
+  get form() {
     return this.registerForm.controls;
   }
 

src/app/components/businessunit/businessunit-edit/businessunit-edit.component.html

@@ -8,9 +8,9 @@
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3 mb-2">
       <label class="form-label">Nom</label>
-      <input [ngClass]="{ 'is-invalid': submitted && f.name.errors }" class="form-control" formControlName="name">
-      <div *ngIf="submitted && f.name.errors" class="invalid-feedback">
-        <div *ngIf="f.name.errors.required">Le nom d'une business unit est obligatoire</div>
+      <input [ngClass]="{ 'is-invalid': submitted && form.name.errors }" class="form-control" formControlName="name">
+      <div *ngIf="submitted && form.name.errors" class="invalid-feedback">
+        <div *ngIf="form.name.errors.required">Le nom d'une business unit est obligatoire</div>
       </div>
     </div>
 

src/app/components/businessunit/businessunit-edit/businessunit-edit.component.ts

@@ -32,7 +32,7 @@ export class BusinessunitEditComponent implements OnInit {
     this.id = Number(this.route.snapshot.paramMap.get('id'))
   }
 
-  get f() {
+  get form() {
     return this.registerForm.controls;
   }
 

src/app/components/businessunit/businessunit.component.ts

@@ -25,10 +25,10 @@ export class BusinessunitComponent implements OnInit {
 
 
   ngOnInit(): void {
-    this.getBusinessunits();
+    this.initBusinessunits();
   }
 
-  getBusinessunits(): void {
+  initBusinessunits(): void {
     this.businessunitService.getBusinessunits()
       .subscribe(businessunits => this.businessunits = businessunits);
   }

src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts

@@ -22,7 +22,7 @@ export class CollaborateurAddComponent implements OnInit {
   errorValue: number = 0;
 
   registerForm!: FormGroup;
-  submitted = false;
+  submitted : boolean = false;
 
   constructor(private http: HttpClient,
               private businessunitService: BusinessunitService,
@@ -37,8 +37,8 @@ export class CollaborateurAddComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.getCollaborateurs();
-    this.getBusinessunits();
+    this.initCollaborateurs();
+    this.initBusinessunits();
     this.registerForm = this.formBuilder.group({
       name: ['', Validators.required],
       firstName: ['', Validators.required],
@@ -55,17 +55,17 @@ export class CollaborateurAddComponent implements OnInit {
     });
   }
 
-  getCollaborateurs(): void {
+  initCollaborateurs(): void {
     this.collaborateurService.getCollaborateurs()
       .subscribe(collaborateurs => this.collaborateurs = collaborateurs);
   }
 
-  getBusinessunits(): void {
+  initBusinessunits(): void {
     this.businessunitService.getBusinessunits()
       .subscribe(businessunits => this.businessUnits = businessunits);
   }
 
-  onSubmit() {
+  onSubmit(): void {
     this.submitted = true;
     if (this.registerForm.invalid) {
       return;
@@ -84,7 +84,7 @@ export class CollaborateurAddComponent implements OnInit {
     }
   }
 
-  onReset() {
+  onReset():void {
     this.submitted = false;
     this.registerForm.reset();
   }

src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html

@@ -9,37 +9,37 @@
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Nom</label>
-        <input [ngClass]="{ 'is-invalid': submitted && f.name.errors }" [value]="collaborateur.name"
+        <input [ngClass]="{ 'is-invalid': submitted && form.name.errors }" [value]="collaborateur.name"
                class="form-control"
                formControlName="name">
-        <div *ngIf="submitted && f.name.errors" class="invalid-feedback">
-          <div *ngIf="f.name.errors.required">Le nom d'un collaborateur est obligatoire</div>
+        <div *ngIf="submitted && form.name.errors" class="invalid-feedback">
+          <div *ngIf="form.name.errors.required">Le nom d'un collaborateur est obligatoire</div>
         </div>
       </div>
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Prénom</label>
-        <input [ngClass]="{ 'is-invalid': submitted && f.firstName.errors }" [value]="collaborateur.firstName"
+        <input [ngClass]="{ 'is-invalid': submitted && form.firstName.errors }" [value]="collaborateur.firstName"
                class="form-control" formControlName="firstName">
-        <div *ngIf="submitted && f.firstName.errors" class="invalid-feedback">
-          <div *ngIf="f.firstName.errors.required">Le prénom d'un collaborateur est obligatoire</div>
+        <div *ngIf="submitted && form.firstName.errors" class="invalid-feedback">
+          <div *ngIf="form.firstName.errors.required">Le prénom d'un collaborateur est obligatoire</div>
         </div>
       </div>
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Date de naissance</label>
-        <input (change)="onBirthDateChange($event)" [ngClass]="{ 'is-invalid': submitted && f.birthDate.errors }"
+        <input (change)="onBirthDateChange($event)" [ngClass]="{ 'is-invalid': submitted && form.birthDate.errors }"
                [value]="collaborateur.birthDate | date:'yyyy-MM-dd'"
                class="form-control" formControlName="birthDate"
                type="date">
-        <div *ngIf="submitted && f.birthDate.errors" class="invalid-feedback">
-          <div *ngIf="f.birthDate.errors.required">La date de naissance d'un collaborateur est obligatoire</div>
+        <div *ngIf="submitted && form.birthDate.errors" class="invalid-feedback">
+          <div *ngIf="form.birthDate.errors.required">La date de naissance d'un collaborateur est obligatoire</div>
         </div>
       </div>
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Genre</label>
-        <select [ngClass]="{ 'is-invalid': submitted && f.gender.errors }" [value]="collaborateur.gender"
+        <select [ngClass]="{ 'is-invalid': submitted && form.gender.errors }" [value]="collaborateur.gender"
                 class="form-select"
                 formControlName="gender">
           <option disabled selected value="">Genre</option>
@@ -47,8 +47,8 @@
           <option value="FEMININ">Féminin</option>
           <option value="AUTRE">Autre</option>
         </select>
-        <div *ngIf="submitted && f.gender.errors" class="invalid-feedback">
-          <div *ngIf="f.gender.errors.required">Vous devez préciser le genre du collaborateur</div>
+        <div *ngIf="submitted && form.gender.errors" class="invalid-feedback">
+          <div *ngIf="form.gender.errors.required">Vous devez préciser le genre du collaborateur</div>
         </div>
       </div>
 
@@ -58,7 +58,7 @@
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Statut</label>
-        <select [ngClass]="{ 'is-invalid': submitted && f.status.errors }" [value]="collaborateur.status"
+        <select [ngClass]="{ 'is-invalid': submitted && form.status.errors }" [value]="collaborateur.status"
                 class="form-select"
                 formControlName="status">
           <option disabled selected value="">Statut</option>
@@ -67,36 +67,36 @@
           <option value="ALTERNANT">Alternant</option>
           <option value="STAGIAIRE">Stagiaire</option>
         </select>
-        <div *ngIf="submitted && f.status.errors" class="invalid-feedback">
-          <div *ngIf="f.status.errors.required">Vous devez préciser le statut du collaborateur</div>
+        <div *ngIf="submitted && form.status.errors" class="invalid-feedback">
+          <div *ngIf="form.status.errors.required">Vous devez préciser le statut du collaborateur</div>
         </div>
       </div>
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Nombre d'enfants</label>
-        <input [ngClass]="{ 'is-invalid': submitted && f.childrenNumber.errors }" [value]="collaborateur.childrenNumber"
+        <input [ngClass]="{ 'is-invalid': submitted && form.childrenNumber.errors }" [value]="collaborateur.childrenNumber"
                class="form-control" formControlName="childrenNumber" min="0"
                onkeyup="if(this.value<0){this.value= this.value * -1}" type="number">
-        <div *ngIf="submitted && f.childrenNumber.errors" class="invalid-feedback">
-          <div *ngIf="f.childrenNumber.errors.required">Le nombre d'enfant d'un collaborateur est obligatoire</div>
+        <div *ngIf="submitted && form.childrenNumber.errors" class="invalid-feedback">
+          <div *ngIf="form.childrenNumber.errors.required">Le nombre d'enfant d'un collaborateur est obligatoire</div>
         </div>
       </div>
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Adresse</label>
-        <input [ngClass]="{ 'is-invalid': submitted && f.address.errors }" [value]="collaborateur.address"
+        <input [ngClass]="{ 'is-invalid': submitted && form.address.errors }" [value]="collaborateur.address"
                class="form-control" formControlName="address">
-        <div *ngIf="submitted && f.address.errors" class="invalid-feedback">
-          <div *ngIf="f.address.errors.required">L'adresse d'un collaborateur est obligatoire</div>
+        <div *ngIf="submitted && form.address.errors" class="invalid-feedback">
+          <div *ngIf="form.address.errors.required">L'adresse d'un collaborateur est obligatoire</div>
         </div>
       </div>
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Téléphone</label>
-        <input [ngClass]="{ 'is-invalid': submitted && f.telephone.errors }" [value]="collaborateur.telephone"
+        <input [ngClass]="{ 'is-invalid': submitted && form.telephone.errors }" [value]="collaborateur.telephone"
                class="form-control" formControlName="telephone">
-        <div *ngIf="submitted && f.telephone.errors" class="invalid-feedback">
-          <div *ngIf="f.telephone.errors.required">Le numéro de téléphone d'un collaborateur est obligatoire</div>
+        <div *ngIf="submitted && form.telephone.errors" class="invalid-feedback">
+          <div *ngIf="form.telephone.errors.required">Le numéro de téléphone d'un collaborateur est obligatoire</div>
         </div>
       </div>
     </div>
@@ -108,13 +108,13 @@
           <label class="form-label" style="padding-right: 5px">Mail personnel</label>
           <small>(pas Apside)</small>
         </div>
-        <input [ngClass]="{ 'is-invalid': submitted && f.personalMail.errors }" [value]="collaborateur.personalMail"
+        <input [ngClass]="{ 'is-invalid': submitted && form.personalMail.errors }" [value]="collaborateur.personalMail"
                class="form-control"
                formControlName="personalMail" placeholder="prenom.nom@example.com"
                type="email">
-        <div *ngIf="submitted && f.personalMail.errors" class="invalid-feedback">
-          <div *ngIf="f.personalMail.errors.required">Le mail personnel d'un collaborateur est obligatoire</div>
-          <div *ngIf="f.personalMail.errors.pattern">Le mail personnel d'un collaborateur doit être au format
+        <div *ngIf="submitted && form.personalMail.errors" class="invalid-feedback">
+          <div *ngIf="form.personalMail.errors.required">Le mail personnel d'un collaborateur est obligatoire</div>
+          <div *ngIf="form.personalMail.errors.pattern">Le mail personnel d'un collaborateur doit être au format
             "exemple@nom.de.domaine"
           </div>
         </div>
@@ -122,13 +122,13 @@
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Mail Apside</label>
-        <input [ngClass]="{ 'is-invalid': (submitted && f.apsideMail.errors) || errorValue==1 }"
+        <input [ngClass]="{ 'is-invalid': (submitted && form.apsideMail.errors) || errorValue==1 }"
                [value]="collaborateur.apsideMail" class="form-control"
                formControlName="apsideMail"
                placeholder="prenom.nom@apside-groupe.com" type="email">
-        <div *ngIf="submitted && f.apsideMail.errors" class="invalid-feedback">
-          <div *ngIf="f.apsideMail.errors.required">Le mail Apside d'un collaborateur est obligatoire</div>
-          <div *ngIf="f.apsideMail.errors.pattern">Le mail Apside d'un collaborateur doit être au format
+        <div *ngIf="submitted && form.apsideMail.errors" class="invalid-feedback">
+          <div *ngIf="form.apsideMail.errors.required">Le mail Apside d'un collaborateur est obligatoire</div>
+          <div *ngIf="form.apsideMail.errors.pattern">Le mail Apside d'un collaborateur doit être au format
             "exemple@apside-groupe.com" ou "exemple@apside.fr"
           </div>
         </div>
@@ -141,7 +141,7 @@
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Date de départ</label>
         <input (change)="onResignationDateChange($event)"
-               [ngClass]="{ 'is-invalid': submitted && f.resignationDate.errors }"
+               [ngClass]="{ 'is-invalid': submitted && form.resignationDate.errors }"
                [value]="collaborateur.resignationDate | date:'yyyy-MM-dd'"
                class="form-control" formControlName="resignationDate"
                type="date">
@@ -153,13 +153,13 @@
 
       <div class="form-group col-12 col-md-6">
         <label class="form-label">Business Unit</label>
-        <select [ngClass]="{ 'is-invalid': submitted && f.businessUnitId.errors }" class="form-select"
+        <select [ngClass]="{ 'is-invalid': submitted && form.businessUnitId.errors }" class="form-select"
                 formControlName="businessUnitId">
           <option disabled selected value="">Choisissez une Business Unit pour le collaborateur</option>
           <option *ngFor="let businessUnit of businessUnits" [ngValue]="businessUnit.id">{{businessUnit.name}} </option>
         </select>
-        <div *ngIf="submitted && f.businessUnitId.errors" class="invalid-feedback">
-          <div *ngIf="f.businessUnitId.errors.required">Vous devez préciser la Business Unit du collaborateur</div>
+        <div *ngIf="submitted && form.businessUnitId.errors" class="invalid-feedback">
+          <div *ngIf="form.businessUnitId.errors.required">Vous devez préciser la Business Unit du collaborateur</div>
         </div>
       </div>
 

src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts

@@ -39,13 +39,13 @@ export class CollaborateurEditComponent implements OnInit {
     this.id = Number(this.route.snapshot.paramMap.get('id'))
   }
 
-  get f() {
+  get form() {
     return this.registerForm.controls;
   }
 
   async ngOnInit() {
-    this.getCollaborateurs()
-    this.getBusinessunits();
+    this.initCollaborateurs()
+    this.initBusinessunits();
     this.registerForm = this.formBuilder.group({
       name: ['', Validators.required],
       firstName: ['', Validators.required],
@@ -64,12 +64,12 @@ export class CollaborateurEditComponent implements OnInit {
     this.collaborateur = await this.collaborateurObservable.pipe(take(1)).toPromise()
   }
 
-  getCollaborateurs(): void {
+  initCollaborateurs(): void {
     this.collaborateurService.getCollaborateurs()
       .subscribe(collaborateurs => this.collaborateurs = collaborateurs);
   }
 
-  getBusinessunits(): void {
+  initBusinessunits(): void {
     this.businessunitService.getBusinessunits()
       .subscribe(businessunits => this.businessUnits = businessunits);
   }

src/app/components/collaborateur/collaborateur.component.html

@@ -1,33 +1,28 @@
-<div>
+<h2 class=mb-4>Collaborateurs</h2>
 
-  <h2 class=mb-4>Collaborateurs</h2>
-
-  <div style="display: flex">
-    <p style="margin: 10px 0 10px 0">Pour ajouter un nouveau collaborateur, cliquez ici : </p>
-    <button routerLink="/collaborateurs/add">Ajouter</button>
-  </div>
-
-
-  <div class="mb-5 col-12" style="overflow-x:auto;">
-    <table class="table">
-      <thead>
-      <tr>
-        <th scope="col">Nom</th>
-        <th scope="col">Prénom</th>
-        <th scope="col">Mail Apside</th>
-      </tr>
-      </thead>
+<div style="display: flex">
+  <p style="margin: 10px 0 10px 0">Pour ajouter un nouveau collaborateur, cliquez ici : </p>
+  <button routerLink="/collaborateurs/add">Ajouter</button>
+</div>
 
-      <tbody>
-      <tr *ngFor="let collaborateur of collaborateurs">
-        <th scope="row">{{collaborateur.name}}</th>
-        <td> {{collaborateur.firstName}} </td>
-        <td> {{collaborateur.apsideMail}} </td>
-        <td><a routerLink="{{collaborateur.id}}"> Modifier </a></td>
-      </tr>
-      </tbody>
-    </table>
-  </div>
 
+<div class="mb-5 col-12" style="overflow-x:auto;">
+  <table class="table">
+    <thead>
+    <tr>
+      <th scope="col">Nom</th>
+      <th scope="col">Prénom</th>
+      <th scope="col">Mail Apside</th>
+    </tr>
+    </thead>
 
+    <tbody>
+    <tr *ngFor="let collaborateur of collaborateurs">
+      <th scope="row">{{collaborateur.name}}</th>
+      <td> {{collaborateur.firstName}} </td>
+      <td> {{collaborateur.apsideMail}} </td>
+      <td><a routerLink="{{collaborateur.id}}"> Modifier </a></td>
+    </tr>
+    </tbody>
+  </table>
 </div>

src/app/components/collaborateur/collaborateur.component.ts

@@ -20,11 +20,10 @@ export class CollaborateurComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.getCollaborateurs();
-
+    this.initCollaborateurs();
   }
 
-  getCollaborateurs(): void {
+  initCollaborateurs(): void {
     this.collaborateurService.getCollaborateurs()
       .subscribe(collaborateurs => this.collaborateurs = collaborateurs);
   }

src/app/components/home/home.component.scss

@@ -1,5 +1,4 @@
 .home-card {
-  //width: 25%;
   margin-right: 20px;
   margin-left: 20px;
   height: fit-content;

src/app/components/home/home.component.ts

@@ -44,7 +44,7 @@ export class HomeComponent implements OnInit {
   ) {
   }
 
-  getDateJoursRestant() {
+  getDateJoursRestant(): Date {
     let result = new Date();
     result.setDate(new Date().getDate() + this.joursRestant);
     return result;
@@ -71,7 +71,7 @@ export class HomeComponent implements OnInit {
             })
           });
       });
-    this.getPeriodeEssais();
+    this.initPeriodeEssais();
     this.businessUnitService.getBusinessunits().subscribe(
       businessUnits => {
         this.businessUnits = businessUnits
@@ -87,7 +87,7 @@ export class HomeComponent implements OnInit {
   getCollaborateurById(id: number): Collaborateur {
     let collab = {} as Collaborateur;
     this.collaborateurs.forEach(c => {
-      if (c.id == id) {
+      if (c.id === id) {
         collab = c;
         return;
       }
@@ -96,7 +96,7 @@ export class HomeComponent implements OnInit {
     return collab;
   }
 
-  getPeriodeEssais() {
+  initPeriodeEssais():void {
     this.periodeEssaisEnCours = []
     this.periodeEssaiService.getPeriodeEssais()
       .subscribe(periodeEssais => {
@@ -119,13 +119,13 @@ export class HomeComponent implements OnInit {
 
   incrementJoursRestant() {
     this.joursRestant += 7;
-    this.getPeriodeEssais();
+    this.initPeriodeEssais();
   }
 
   decrementJoursRestant() {
     if (this.joursRestant >= 7) {
       this.joursRestant -= 7;
-      this.getPeriodeEssais();
+      this.initPeriodeEssais();
     }
   }
 }

src/app/components/periode-essai/periode-essai-add/periode-essai-add.component.html

@@ -4,14 +4,14 @@
 
   <div class="form-group col-12 col-md-6">
     <label class="form-label">Collaborateur</label>
-    <select [ngClass]="{ 'is-invalid': submitted && f.collaborateurId.errors }" class="form-select"
+    <select [ngClass]="{ 'is-invalid': submitted && form.collaborateurId.errors }" class="form-select"
             formControlName="collaborateurId"
             id="collaborateur-select">
       <option *ngFor="let collaborateur of collaborateurs"
               [ngValue]="collaborateur.id">{{collaborateur.name}} {{collaborateur.firstName}}</option>
     </select>
-    <div *ngIf="submitted && f.collaborateurId.errors" class="invalid-feedback">
-      <div *ngIf="f.collaborateurId.errors.required">Vous devez choisir le collaborateur concerné par cette période
+    <div *ngIf="submitted && form.collaborateurId.errors" class="invalid-feedback">
+      <div *ngIf="form.collaborateurId.errors.required">Vous devez choisir le collaborateur concerné par cette période
         d'essai
       </div>
     </div>
@@ -20,22 +20,22 @@
   <div class="row mb-2">
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
       <label class="form-label">Date de début</label>
-      <input (change)="onStartingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && f.startingDate.errors }"
+      <input (change)="onStartingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && form.startingDate.errors }"
              class="form-control" formControlName="startingDate"
              type="date">
-      <div *ngIf="submitted && f.startingDate.errors" class="invalid-feedback">
-        <div *ngIf="f.startingDate.errors.required">La date de début d'une période d'essai est obligatoire</div>
+      <div *ngIf="submitted && form.startingDate.errors" class="invalid-feedback">
+        <div *ngIf="form.startingDate.errors.required">La date de début d'une période d'essai est obligatoire</div>
       </div>
     </div>
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
       <label class="form-label">Date de fin prévue</label>
       <input (change)="onPlannedEndingDateChange($event)"
-             [ngClass]="{ 'is-invalid': submitted && f.plannedEndingDate.errors }" class="form-control"
+             [ngClass]="{ 'is-invalid': submitted && form.plannedEndingDate.errors }" class="form-control"
              formControlName="plannedEndingDate"
              type="date">
-      <div *ngIf="submitted && f.plannedEndingDate.errors" class="invalid-feedback">
-        <div *ngIf="f.plannedEndingDate.errors.required">La date de fin prévue d'une période d'essai est obligatoire
+      <div *ngIf="submitted && form.plannedEndingDate.errors" class="invalid-feedback">
+        <div *ngIf="form.plannedEndingDate.errors.required">La date de fin prévue d'une période d'essai est obligatoire
         </div>
       </div>
     </div>
@@ -51,7 +51,7 @@
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3 mb-2">
       <label class="form-label">Commentaire</label>
-      <input [ngClass]="{ 'is-invalid': submitted && f.comment.errors }" class="form-control" formControlName="comment">
+      <input [ngClass]="{ 'is-invalid': submitted && form.comment.errors }" class="form-control" formControlName="comment">
     </div>
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3 mb-2">

src/app/components/periode-essai/periode-essai-add/periode-essai-add.component.ts

@@ -35,7 +35,7 @@ export class PeriodeEssaiAddComponent implements OnInit {
   ) {
   }
 
-  get f() {
+  get form() {
     return this.registerForm.controls;
   }
 
@@ -50,17 +50,17 @@ export class PeriodeEssaiAddComponent implements OnInit {
       startingDate: ['', Validators.required]
     });
 
-    this.getCollaborateurs();
+    this.initCollaborateurs();
 
   }
 
-  getCollaborateurs(): void {
+  initCollaborateurs(): void {
     this.collaborateurService.getCollaborateurs()
       .subscribe(collaborateurs => {
         this.collaborateurs = collaborateurs;
         if (this.apsideMail != undefined) {
           this.collaborateurs.forEach(collab => {
-            if (this.apsideMail == collab.apsideMail) {
+            if (this.apsideMail === collab.apsideMail) {
               this.registerForm.get("collaborateurId")?.setValue(collab.id)
               this.collaborateur = collab
             }

src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.html

@@ -7,15 +7,15 @@
 
     <div class="form-group col-12 col-md-6">
       <label class="form-label">Collaborateur</label>
-      <select [ngClass]="{ 'is-invalid': submitted && f.collaborateurId.errors }" class="form-select"
+      <select [ngClass]="{ 'is-invalid': submitted && form.collaborateurId.errors }" class="form-select"
               formControlName="collaborateurId"
               id="collaborateur-select">
         <option disabled selected value="">Choisissez le collaborateur concerné par cette période d'essai</option>
         <option *ngFor="let collaborateur of collaborateurs"
                 [ngValue]="collaborateur.id">{{collaborateur.name}} {{collaborateur.firstName}}</option>
       </select>
-      <div *ngIf="submitted && f.collaborateurId.errors" class="invalid-feedback">
-        <div *ngIf="f.collaborateurId.errors.required">Vous devez choisir le collaborateur concerné par cette période
+      <div *ngIf="submitted && form.collaborateurId.errors" class="invalid-feedback">
+        <div *ngIf="form.collaborateurId.errors.required">Vous devez choisir le collaborateur concerné par cette période
           d'essai
         </div>
       </div>
@@ -25,12 +25,12 @@
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Date de début</label>
-        <input (change)="onStartingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && f.startingDate.errors }"
+        <input (change)="onStartingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && form.startingDate.errors }"
                [value]="periodeEssai.startingDate | date:'yyyy-MM-dd'"
                class="form-control" formControlName="startingDate"
                type="date">
-        <div *ngIf="submitted && f.startingDate.errors" class="invalid-feedback">
-          <div *ngIf="f.startingDate.errors.required">La date de début d'une période d'essai est obligatoire</div>
+        <div *ngIf="submitted && form.startingDate.errors" class="invalid-feedback">
+          <div *ngIf="form.startingDate.errors.required">La date de début d'une période d'essai est obligatoire</div>
         </div>
       </div>
 
@@ -38,13 +38,13 @@
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
         <label class="form-label">Date de fin prévue</label>
         <input (change)="onPlannedEndingDateChange($event)"
-               [ngClass]="{ 'is-invalid': submitted && f.plannedEndingDate.errors }"
+               [ngClass]="{ 'is-invalid': submitted && form.plannedEndingDate.errors }"
                [value]="periodeEssai.plannedEndingDate | date:'yyyy-MM-dd'"
                class="form-control"
                formControlName="plannedEndingDate"
                type="date">
-        <div *ngIf="submitted && f.plannedEndingDate.errors" class="invalid-feedback">
-          <div *ngIf="f.plannedEndingDate.errors.required">La date de fin prévue d'une période d'essai est obligatoire
+        <div *ngIf="submitted && form.plannedEndingDate.errors" class="invalid-feedback">
+          <div *ngIf="form.plannedEndingDate.errors.required">La date de fin prévue d'une période d'essai est obligatoire
           </div>
         </div>
       </div>

src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.ts

@@ -40,13 +40,13 @@ export class PeriodeEssaiEditComponent implements OnInit {
     this.id = Number(this.route.snapshot.paramMap.get('id'))
   }
 
-  get f() {
+  get form() {
     return this.registerForm.controls;
   }
 
   async ngOnInit() {
-    this.getCollaborateurs();
-    this.getPeriodeEssais();
+    this.initCollaborateurs();
+    this.initPeriodeEssais();
     this.registerForm = this.formBuilder.group({
       comment: [],
       collaborateurId: ['', Validators.required],
@@ -59,12 +59,12 @@ export class PeriodeEssaiEditComponent implements OnInit {
     this.periodeEssai = await this.periodeEssaiObservable.pipe(take(1)).toPromise()
   }
 
-  getCollaborateurs(): void {
+  initCollaborateurs(): void {
     this.collaborateurService.getCollaborateurs()
       .subscribe(collaborateurs => this.collaborateurs = collaborateurs);
   }
 
-  getPeriodeEssais() {
+  initPeriodeEssais() {
     this.periodeEssaiService.getPeriodeEssais()
       .subscribe(periodeEssais => this.periodeEssais = periodeEssais);
   }
@@ -94,7 +94,7 @@ export class PeriodeEssaiEditComponent implements OnInit {
     } else {
       this.periodeEssai.issue = this.registerForm.value.issue;
     }
-    if (this.registerForm.value.realEndingDate == undefined || this.registerForm.value.realEndingDate == '') {
+    if (this.registerForm.value.realEndingDate == undefined || this.registerForm.value.realEndingDate === '') {
       this.periodeEssai.realEndingDate = null;
     } else {
       this.periodeEssai.realEndingDate = this.registerForm.value.realEndingDate;

src/app/components/periode-essai/periode-essai.component.ts

@@ -28,17 +28,17 @@ export class PeriodeEssaiComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.getCollaborateurs();
-    this.getPeriodeEssais();
+    this.initCollaborateurs();
+    this.initPeriodeEssais();
 
   }
 
   onIsOldChange() {
     this.isOld = !this.isOld;
-    this.initPeriodeEssai();
+    this.definePeriodeEssais();
   }
 
-  initPeriodeEssai() {
+  definePeriodeEssais() {
     if (this.isOld) {
       this.periodeEssais = this.periodeEssaisPassees;
     } else {
@@ -46,7 +46,7 @@ export class PeriodeEssaiComponent implements OnInit {
     }
   }
 
-  getCollaborateurs(): void {
+  initCollaborateurs(): void {
     this.collaborateurService.getCollaborateurs()
       .subscribe(collaborateurs => this.collaborateurs = collaborateurs);
   }
@@ -54,7 +54,7 @@ export class PeriodeEssaiComponent implements OnInit {
   getCollaborateurById(id: number): Collaborateur {
     let collab = {} as Collaborateur;
     this.collaborateurs.forEach(c => {
-      if (c.id == id) {
+      if (c.id === id) {
         collab = c;
         return;
       }
@@ -63,7 +63,7 @@ export class PeriodeEssaiComponent implements OnInit {
     return collab;
   }
 
-  getPeriodeEssais() {
+  initPeriodeEssais() {
     this.periodeEssaiService.getPeriodeEssais()
       .subscribe(periodeEssais => {
         periodeEssais.forEach(pe => {
@@ -75,7 +75,7 @@ export class PeriodeEssaiComponent implements OnInit {
         })
         this.periodeEssaisEnCours.sort((b, a) => new Date(b.plannedEndingDate).getTime() - new Date(a.plannedEndingDate).getTime());
         this.periodeEssaisPassees.sort((a, b) => new Date(b.plannedEndingDate).getTime() - new Date(a.plannedEndingDate).getTime());
-        this.initPeriodeEssai();
+        this.definePeriodeEssais();
       });
   }
 

src/app/components/referencement/referencement-add/referencement-add.component.ts

@@ -37,7 +37,7 @@ export class ReferencementAddComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.getCollaborateurs();
+    this.initCollaborateurs();
     this.registerForm = this.formBuilder.group({
       referredId: ['', Validators.required],
       referrerId: ['', Validators.required],
@@ -52,7 +52,7 @@ export class ReferencementAddComponent implements OnInit {
     }
   }
 
-  getCollaborateurs(): void {
+  initCollaborateurs(): void {
     this.collaborateurService.getCollaborateurs()
       .subscribe(collaborateurs => this.collaborateurs = collaborateurs);
   }

src/app/components/referencement/referencement-edit/referencement-edit.component.ts

@@ -45,7 +45,7 @@ export class ReferencementEditComponent implements OnInit {
   }
 
   async ngOnInit() {
-    this.getCollaborateurs();
+    this.initCollaborateurs();
     this.registerForm = this.formBuilder.group({
       referredId: ['', Validators.required],
       referrerId: ['', Validators.required],
@@ -58,7 +58,7 @@ export class ReferencementEditComponent implements OnInit {
 
   }
 
-  getCollaborateurs(): void {
+  initCollaborateurs(): void {
     this.collaborateurService.getCollaborateurs()
       .subscribe(collaborateurs => this.collaborateurs = collaborateurs);
   }
@@ -73,7 +73,7 @@ export class ReferencementEditComponent implements OnInit {
     this.referencement.referrerId = this.registerForm.value.referrerId;
     this.referencement.startingDate = this.registerForm.value.startingDate;
 
-    if (this.registerForm.value.endingDate == undefined || this.registerForm.value.endingDate == '') {
+    if (this.registerForm.value.endingDate == undefined || this.registerForm.value.endingDate === '') {
       this.referencement.endingDate = null;
     } else {
       this.referencement.endingDate = this.registerForm.value.endingDate;

src/app/components/referencement/referencement.component.ts

@@ -37,14 +37,14 @@ export class ReferencementComponent implements OnInit {
             this.referencements = referencements;
             this.referencements.forEach(ref => {
 
-              if (this.idReferredTab.find(id => ref.id == id) == undefined) {
+              if (this.idReferredTab.find(id => ref.id === id) == undefined) {
                 this.idReferredTab.push(ref.referredId);
               }
 
             });
 
             this.collaborateurs.forEach(collab => {
-              if (this.idReferredTab.find(id => collab.id == id) == undefined) {
+              if (this.idReferredTab.find(id => collab.id === id) == undefined) {
                 this.collaborateursSansRef.push(collab);
               }
             })
@@ -60,7 +60,7 @@ export class ReferencementComponent implements OnInit {
   getCollaborateurById(id: number): Collaborateur {
     let collab = {} as Collaborateur;
     this.collaborateurs.forEach(c => {
-      if (c.id == id) {
+      if (c.id === id) {
         collab = c;
         return;
       }

src/app/services/collaborateur.service.ts

@@ -28,7 +28,6 @@ export class CollaborateurService {
   updateCollaborateur(collaborateur: Collaborateur): Observable<Collaborateur> {
     let body = JSON.stringify(collaborateur);
     return this.http.put<Collaborateur>(this.collaborateursUrl + "/" + collaborateur.id, body, this.httpOptions);
-
   }
 
   deleteCollaborateur(collaborateur: Collaborateur) {