Merge pull request 'mandatory_resignation_date + fix non cadre' (#16) from mandatory_resignation_date into develop

Reviewed-on: Clement.Ferrere/Collaborateur_Epa_Front#16

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

@@ -54,7 +54,7 @@
               [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>
+        <option value="NONCADRE">Non-cadre</option>
         <option value="ALTERNANT">Alternant</option>
         <option value="STAGIAIRE">Stagiaire</option>
       </select>

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

@@ -47,7 +47,7 @@ export class CollaborateurAddComponent implements OnInit {
       telephone: ['', Validators.required],
       personalMail: ['', Validators.compose([Validators.required, Validators.pattern(".*@[a-z]*\.[a-z]*")])],
       apsideMail: ['', Validators.compose([Validators.required, Validators.pattern(".*@apside-groupe\.com|.*@apside\.fr")])],
-      resignationDate: ['', Validators.required],
+      resignationDate: [],
       referrerId: ['', Validators.required],
       businessUnitId: ['', Validators.required],
     });

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

@@ -57,7 +57,7 @@
         <select class="form-select" formControlName="status" [ngClass]="{ 'is-invalid': submitted && f.status.errors }" [value]="collaborateur.status">
           <option value="" disabled selected>Statut</option>
           <option value="CADRE">Cadre</option>
-          <option value="NON-CADRE">Non-cadre</option>
+          <option value="NONCADRE">Non-cadre</option>
           <option value="ALTERNANT">Alternant</option>
           <option value="STAGIAIRE">Stagiaire</option>
         </select>

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

@@ -57,7 +57,7 @@ export class CollaborateurEditComponent implements OnInit {
       telephone: ['', Validators.required],
       personalMail: ['',Validators.compose([Validators.required,Validators.pattern(".+@[a-z]*\.[a-z]*")])],
       apsideMail: ['', Validators.compose([Validators.required,Validators.pattern(".+@apside-groupe\.com|.*@apside\.fr")])],
-      resignationDate: ['', Validators.required],
+      resignationDate: [''],
       referrerId: ['', Validators.required],
       businessUnitId: ['', Validators.required],
     });