Merge branch 'develop' into code_retour_api

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

@@ -32,7 +32,8 @@
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
       <label class="form-label">Genre</label>
-      <select class="form-select" formControlName="gender" [ngClass]="{ 'is-invalid': submitted && form.gender.errors }">
+      <select class="form-select" formControlName="gender"
+              [ngClass]="{ 'is-invalid': submitted && form.gender.errors }">
         <option value="" disabled selected>Genre</option>
         <option value="MASCULIN">Masculin</option>
         <option value="FEMININ">Féminin</option>
@@ -49,7 +50,8 @@
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
       <label class="form-label">Statut</label>
-      <select class="form-select" formControlName="status" [ngClass]="{ 'is-invalid': submitted && form.status.errors }">
+      <select class="form-select" formControlName="status"
+              [ngClass]="{ 'is-invalid': submitted && form.status.errors }">
         <option value="" disabled selected>Statut</option>
         <option value="CADRE">Cadre</option>
         <option value="NON-CADRE">Non-cadre</option>
@@ -73,7 +75,8 @@
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
       <label class="form-label">Adresse</label>
-      <input class="form-control" formControlName="address" [ngClass]="{ 'is-invalid': submitted && form.address.errors }">
+      <input class="form-control" formControlName="address"
+             [ngClass]="{ 'is-invalid': submitted && form.address.errors }">
       <div *ngIf="submitted && form.address.errors" class="invalid-feedback">
         <div *ngIf="form.address.errors.required">L'adresse d'un collaborateur est obligatoire</div>
       </div>
@@ -92,7 +95,10 @@
   <div class="row mb-2">
 
     <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
-      <label class="form-label">Mail personnel</label>
+      <div style="display: flex">
+        <label class="form-label" style="padding-right: 5px">Mail personnel</label>
+        <small>(pas Apside)</small>
+      </div>
       <input type="email" class="form-control" formControlName="personalMail"
              [ngClass]="{ 'is-invalid': submitted && form.personalMail.errors }" placeholder="prenom.nom@example.com">
       <div *ngIf="submitted && form.personalMail.errors" class="invalid-feedback">

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

@@ -94,7 +94,10 @@
     <div class="row mb-2">
 
       <div class="form-group col-12 col-sm-6 col-md-4 col-lg-3">
-        <label class="form-label">Mail personnel</label>
+        <div style="display: flex">
+          <label class="form-label" style="padding-right: 5px">Mail personnel</label>
+          <small>(pas Apside)</small>
+        </div>
         <input type="email" class="form-control" formControlName="personalMail" [ngClass]="{ 'is-invalid': submitted && f.personalMail.errors }" placeholder="prenom.nom@example.com" [value]="collaborateur.personalMail">
         <div *ngIf="submitted && f.personalMail.errors" class="invalid-feedback">
           <div *ngIf="f.personalMail.errors.required">Le mail personnel d'un collaborateur est obligatoire</div>