From 7021598146045fe5f99e611b4ee71c9b16931112 Mon Sep 17 00:00:00 2001
From: Clement FERRERE <clement.ferrere@apside-groupe.com>
Date: Wed, 27 Apr 2022 17:04:15 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20des=20mails=20-=20ajout=20d'une=20regex?=
 =?UTF-8?q?=20de=20v=C3=A9rification?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collaborateur-edit/collaborateur-edit.component.html      | 2 ++
 .../collaborateur-edit/collaborateur-edit.component.ts        | 4 ++--
 src/app/components/collaborateur/collaborateur.component.html | 2 ++
 src/app/components/collaborateur/collaborateur.component.ts   | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

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 182d526..4aa8ae7 100644
--- a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html
+++ b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html
@@ -98,6 +98,7 @@
         <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>
+          <div *ngIf="f.personalMail.errors.pattern">Le mail personnel d'un collaborateur doit être au format "exemple@nom.de.domaine"</div>
         </div>
       </div>
 
@@ -106,6 +107,7 @@
         <input type="email" class="form-control" formControlName="apsideMail" [ngClass]="{ 'is-invalid': submitted && f.apsideMail.errors }" placeholder="prenom.nom@apside-groupe.com" [value]="collaborateur.apsideMail">
         <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 "exemple@apside-groupe.com" ou "exemple@apside.fr"</div>
         </div>
       </div>
 
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 8cc87b9..e19ca82 100644
--- a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
+++ b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
@@ -52,8 +52,8 @@ export class CollaborateurEditComponent implements OnInit {
       childrenNumber: ['', Validators.required],
       address: ['', Validators.required],
       telephone: ['', Validators.required],
-      personalMail: ['', Validators.required],
-      apsideMail: ['', 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],
       referrerId: ['', Validators.required],
       businessUnitId: ['', Validators.required],
diff --git a/src/app/components/collaborateur/collaborateur.component.html b/src/app/components/collaborateur/collaborateur.component.html
index eb08cda..00dc7af 100644
--- a/src/app/components/collaborateur/collaborateur.component.html
+++ b/src/app/components/collaborateur/collaborateur.component.html
@@ -93,6 +93,7 @@
         <input type="email" class="form-control" formControlName="personalMail" [ngClass]="{ 'is-invalid': submitted && f.personalMail.errors }" placeholder="prenom.nom@example.com">
         <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 "exemple@nom.de.domaine"</div>
         </div>
       </div>
 
@@ -101,6 +102,7 @@
         <input type="email" class="form-control" formControlName="apsideMail" [ngClass]="{ 'is-invalid': submitted && f.apsideMail.errors }" placeholder="prenom.nom@apside-groupe.com">
         <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 "exemple@apside-groupe.com" ou "exemple@apside.fr"</div>
         </div>
       </div>
 
diff --git a/src/app/components/collaborateur/collaborateur.component.ts b/src/app/components/collaborateur/collaborateur.component.ts
index 6cb4eb6..17d9df6 100644
--- a/src/app/components/collaborateur/collaborateur.component.ts
+++ b/src/app/components/collaborateur/collaborateur.component.ts
@@ -42,8 +42,8 @@ export class CollaborateurComponent implements OnInit {
       childrenNumber: ['', Validators.required],
       address: ['', Validators.required],
       telephone: ['', Validators.required],
-      personalMail: ['', Validators.required],
-      apsideMail: ['', 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],
       referrerId: ['', Validators.required],
       businessUnitId: ['', Validators.required],