Merge pull request 'creation_collab_into_pe à faire en 4ème' (#23) from creation_collab_into_pe into develop

Reviewed-on: Clement.Ferrere/Collaborateur_Epa_Front#23

src/app/app.module.ts

@@ -22,8 +22,8 @@ import {ReferencementComponent} from './components/referencement/referencement.c
 import {ReferencementAddComponent} from './components/referencement/referencement-add/referencement-add.component';
 import {ReferencementEditComponent} from './components/referencement/referencement-edit/referencement-edit.component';
 import {PeriodeEssaiAddComponent} from './components/periode-essai/periode-essai-add/periode-essai-add.component';
-import { BusinessunitAddComponent } from './components/businessunit/businessunit-add/businessunit-add.component';
+import {BusinessunitAddComponent} from './components/businessunit/businessunit-add/businessunit-add.component';
-import { AgenceAddComponent } from './components/agence/agence-add/agence-add.component';
+import {AgenceAddComponent} from './components/agence/agence-add/agence-add.component';
 
 @NgModule({
   declarations: [

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

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {Agence} from "../../../interfaces/agence";
 import {Businessunit} from "../../../interfaces/businessunit";
 import {FormBuilder, FormGroup, Validators} from "@angular/forms";

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

@@ -52,5 +52,4 @@ export class AgenceComponent implements OnInit {
   }
 
 
-
 }

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

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {Businessunit} from "../../../interfaces/businessunit";
 import {FormBuilder, FormGroup, Validators} from "@angular/forms";
 import {HttpClient} from "@angular/common/http";

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

@@ -35,5 +35,4 @@ export class BusinessunitComponent implements OnInit {
   }
 
 
-
 }

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

@@ -6,6 +6,7 @@ import {HttpClient} from "@angular/common/http";
 import {BusinessunitService} from "../../../services/businessunit.service";
 import {CollaborateurService} from "../../../services/collaborateur.service";
 import {ToastrService} from "ngx-toastr";
+import {Router} from '@angular/router';
 
 @Component({
   selector: 'app-collaborateur-add',
@@ -30,7 +31,8 @@ export class CollaborateurAddComponent implements OnInit {
               private businessunitService: BusinessunitService,
               private collaborateurService: CollaborateurService,
               private formBuilder: FormBuilder,
-              private toastr: ToastrService) {
+              private toastr: ToastrService,
+              private router: Router) {
   }
 
   get form() {
@@ -82,6 +84,7 @@ export class CollaborateurAddComponent implements OnInit {
       this.collaborateurService.addCollaborateur(this.collaborateur).subscribe(collaborateur => {
           this.collaborateurs.push(collaborateur);
           this.showSuccess();
+          this.router.navigateByUrl('/periodeessais/add?apsideMail=' + this.registerForm.value.apsideMail);
         },
         () => {
           this.showError()

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

@@ -4,9 +4,11 @@
 
   <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" formControlName="collaborateurId"
+    <select [ngClass]="{ 'is-invalid': submitted && f.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 [defaultSelected]="collaborateur"
+              [ngValue]="collaborateur.id">{{collaborateur.name}} {{collaborateur.firstName}}</option>-->
       <option *ngFor="let collaborateur of collaborateurs"
               [ngValue]="collaborateur.id">{{collaborateur.name}} {{collaborateur.firstName}}</option>
     </select>
@@ -20,7 +22,8 @@
   <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 }" class="form-control" formControlName="startingDate"
+      <input (change)="onStartingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && f.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>
@@ -29,7 +32,8 @@
 
     <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"
+      <input (change)="onPlannedEndingDateChange($event)"
+             [ngClass]="{ 'is-invalid': submitted && f.plannedEndingDate.errors }" class="form-control"
              formControlName="plannedEndingDate"
              type="date">
       <div *ngIf="submitted && f.plannedEndingDate.errors" class="invalid-feedback">

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

@@ -6,6 +6,7 @@ import {HttpClient} from "@angular/common/http";
 import {CollaborateurService} from "../../../services/collaborateur.service";
 import {PeriodeEssaiService} from "../../../services/periode-essai.service";
 import {ToastrService} from "ngx-toastr";
+import {ActivatedRoute} from "@angular/router";
 
 @Component({
   selector: 'app-periode-essai-add',
@@ -21,12 +22,16 @@ export class PeriodeEssaiAddComponent implements OnInit {
   registerForm!: FormGroup;
   submitted = false;
 
+  apsideMail?: string | null;
+  id?: number;
+
   constructor(
     private http: HttpClient,
     private collaborateurService: CollaborateurService,
     private periodeEssaiService: PeriodeEssaiService,
     private formBuilder: FormBuilder,
-    private toastr: ToastrService
+    private toastr: ToastrService,
+    private route: ActivatedRoute
   ) {
   }
 
@@ -35,7 +40,7 @@ export class PeriodeEssaiAddComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.getCollaborateurs();
+    this.apsideMail = this.route.snapshot.queryParamMap.get('apsideMail');
     this.registerForm = this.formBuilder.group({
       comment: [],
       collaborateurId: ['', Validators.required],
@@ -44,11 +49,24 @@ export class PeriodeEssaiAddComponent implements OnInit {
       realEndingDate: [],
       startingDate: ['', Validators.required]
     });
+
+    this.getCollaborateurs();
+
   }
 
   getCollaborateurs(): void {
     this.collaborateurService.getCollaborateurs()
-      .subscribe(collaborateurs => this.collaborateurs = collaborateurs);
+      .subscribe(collaborateurs => {
+        this.collaborateurs = collaborateurs;
+        if (this.apsideMail != undefined) {
+          this.collaborateurs.forEach(collab => {
+            if (this.apsideMail == collab.apsideMail) {
+              this.registerForm.get("collaborateurId")?.setValue(collab.id)
+              this.collaborateur = collab
+            }
+          })
+        }
+      });
   }
 
   onSubmit() {

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

@@ -27,7 +27,8 @@
       </thead>
       <tbody>
       <tr *ngFor="let periodeEssai of periodeEssais">
-        <th scope="row">{{getCollaborateurById(periodeEssai.collaborateurId).name}} {{getCollaborateurById(periodeEssai.collaborateurId).firstName}}</th>
+        <th
+          scope="row">{{getCollaborateurById(periodeEssai.collaborateurId).name}} {{getCollaborateurById(periodeEssai.collaborateurId).firstName}}</th>
         <td> {{getSplitDate(periodeEssai.startingDate.toString())}}</td>
         <th> {{getSplitDate(periodeEssai.plannedEndingDate.toString())}}</th>
         <td> {{periodeEssai.issue}}</td>

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

@@ -38,11 +38,10 @@ export class PeriodeEssaiComponent implements OnInit {
     this.initPeriodeEssai();
   }
 
-  initPeriodeEssai(){
+  initPeriodeEssai() {
     if (this.isOld) {
       this.periodeEssais = this.periodeEssaisPassees;
-    }
+    } else {
-    else{
       this.periodeEssais = this.periodeEssaisEnCours;
     }
   }

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

@@ -6,14 +6,16 @@
 
     <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 && form.startingDate.errors }" class="form-control"
+      <input (change)="onStartingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && form.startingDate.errors }"
+             class="form-control"
              formControlName="startingDate"
              type="date">
     </div>
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
       <label class="form-label">Date de fin</label>
-      <input (change)="onEndingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && form.endingDate.errors }" class="form-control"
+      <input (change)="onEndingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && form.endingDate.errors }"
+             class="form-control"
              formControlName="endingDate"
              type="date">
     </div>

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

@@ -6,7 +6,8 @@
 
     <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 && form.startingDate.errors }" [value]="referencement.startingDate | date:'yyyy-MM-dd'"
+      <input (change)="onStartingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && form.startingDate.errors }"
+             [value]="referencement.startingDate | date:'yyyy-MM-dd'"
              class="form-control"
              formControlName="startingDate"
              type="date">
@@ -14,7 +15,8 @@
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
       <label class="form-label">Date de fin</label>
-      <input (change)="onEndingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && form.endingDate.errors }" [value]="referencement.endingDate | date:'yyyy-MM-dd'"
+      <input (change)="onEndingDateChange($event)" [ngClass]="{ 'is-invalid': submitted && form.endingDate.errors }"
+             [value]="referencement.endingDate | date:'yyyy-MM-dd'"
              class="form-control"
              formControlName="endingDate"
              type="date">