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 4aa8ae7..f023ee9 100644
--- a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html
+++ b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html
@@ -104,11 +104,15 @@
@@ -148,10 +152,10 @@
-
+
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 e19ca82..a03d7f7 100644
--- a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
+++ b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts
@@ -24,6 +24,7 @@ export class CollaborateurEditComponent implements OnInit {
collaborateurs : Collaborateur[] = [];
businessUnits : Businessunit[] = [];
+ errorValue : number = 0;
rDate : String = "";
bDate : String = "";
@@ -52,8 +53,8 @@ export class CollaborateurEditComponent implements OnInit {
childrenNumber: ['', Validators.required],
address: ['', Validators.required],
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")])],
+ 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],
@@ -110,12 +111,20 @@ export class CollaborateurEditComponent implements OnInit {
this.collaborateur.childrenNumber = this.registerForm.value.childrenNumber
this.collaborateur.status = this.registerForm.value.status
- if (this.collaborateur){
- this.collaborateurService.updateCollaborateur(this.collaborateur)
- .subscribe(()=>this.goBack());
+ if (this.collaborateur) {
+ this.collaborateurService.updateCollaborateur(this.collaborateur).subscribe({
+ next: () => {
+ this.goBack();
+ },
+ error: () => {
+ this.errorValue = 1;
+ }
+ })
+
}
}
+
get f() { return this.registerForm.controls; }
onReset() {
diff --git a/src/app/services/collaborateur.service.ts b/src/app/services/collaborateur.service.ts
index 2b58b98..41b2c21 100644
--- a/src/app/services/collaborateur.service.ts
+++ b/src/app/services/collaborateur.service.ts
@@ -28,6 +28,7 @@ export class CollaborateurService {
updateCollaborateur(collaborateur : Collaborateur):Observable{
let body = JSON.stringify(collaborateur);
return this.http.put(this.collaborateursUrl + "/" + collaborateur.id, body, this.httpOptions);
+
}
deleteCollaborateur(collaborateur: Collaborateur) {
@@ -36,6 +37,15 @@ export class CollaborateurService {
addCollaborateur(collaborateur: Collaborateur): Observable {
let body = JSON.stringify(collaborateur);
- return this.http.post(this.collaborateursUrl, body, this.httpOptions);
+ let result = this.http.post(this.collaborateursUrl, body, this.httpOptions);
+
+ result.subscribe({error:error => {
+ console.log("passage par l'erreur : ");
+ console.log(error);
+
+ }
+ })
+
+ return result;
}
}