From 72631c3b5d276be3bf0661a299ac844704f6d68e Mon Sep 17 00:00:00 2001
From: Clement FERRERE <clement.ferrere@apside-groupe.com>
Date: Tue, 28 Jun 2022 14:41:25 +0200
Subject: [PATCH 1/2] =?UTF-8?q?gestion=20des=20retours=20de=20l'api=20via?=
 =?UTF-8?q?=20les=20toasts=20partie=202,=20pour=20les=20=C3=A9ditions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collaborateur-add/collaborateur-add.component.ts           | 3 ++-
 .../collaborateur-edit/collaborateur-edit.component.ts         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts b/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts
index 0316260..53a3357 100644
--- a/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts
+++ b/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts
@@ -45,7 +45,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],
     });
@@ -76,6 +76,7 @@ export class CollaborateurAddComponent implements OnInit {
     if (this.collaborateur) {
       this.collaborateurService.addCollaborateur(this.collaborateur).subscribe({
         next: () => {
+          this.errorValue = 0;
         },
         error: () => {
           this.errorValue = 1;
diff --git a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
index a03d7f7..8deae57 100644
--- a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
+++ b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
@@ -55,7 +55,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],
     });
-- 
2.36.3


From a5f85de9f35f4d81062f02c1c1bd373bd75a20de Mon Sep 17 00:00:00 2001
From: Clement FERRERE <clement.ferrere@apside-groupe.com>
Date: Tue, 28 Jun 2022 15:37:28 +0200
Subject: [PATCH 2/2] =?UTF-8?q?date=20de=20d=C3=A9part=20non=20obligatoire?=
 =?UTF-8?q?=20pour=20les=20collabs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collaborateur-add/collaborateur-add.component.html          | 2 +-
 .../collaborateur-edit/collaborateur-edit.component.html        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.html b/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.html
index 8f306ad..e0a5a82 100644
--- a/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.html
+++ b/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>
diff --git a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html
index d345c5a..417976e 100644
--- a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html
+++ b/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>
-- 
2.36.3