Le mail personnel d'un collaborateur est obligatoire
+
Le mail personnel d'un collaborateur doit être au format "exemple@nom.de.domaine"
diff --git a/src/app/components/collaborateur/collaborateur.component.ts b/src/app/components/collaborateur/collaborateur.component.ts
index 6cb4eb6..259bc51 100644
--- a/src/app/components/collaborateur/collaborateur.component.ts
+++ b/src/app/components/collaborateur/collaborateur.component.ts
@@ -17,6 +17,7 @@ export class CollaborateurComponent implements OnInit {
businessUnits : Businessunit[] = [];
businessUnit = {} as Businessunit ;
+ errorValue : number = 0;
rDate : String = "";
bDate : String = "";
@@ -42,8 +43,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],
@@ -66,13 +67,6 @@ export class CollaborateurComponent implements OnInit {
.subscribe(businessunits => this.businessUnits = businessunits);
}
- add(collaborateur: Collaborateur): void {
- this.collaborateurService.addCollaborateur(collaborateur)
- .subscribe(collaborateur => {
- this.collaborateurs.push(collaborateur);
- });
- }
-
onSubmit() {
this.submitted = true;
@@ -80,7 +74,16 @@ export class CollaborateurComponent implements OnInit {
return;
}
this.collaborateur = this.registerForm.value
- this.add(this.collaborateur)
+ if (this.collaborateur) {
+ this.collaborateurService.addCollaborateur(this.collaborateur).subscribe({
+ next: () => {
+ },
+ error: () => {
+ this.errorValue = 1;
+ }
+ })
+
+ }
}
get f() { return this.registerForm.controls; }
diff --git a/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.html b/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.html
new file mode 100644
index 0000000..f0729e8
--- /dev/null
+++ b/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.html
@@ -0,0 +1,69 @@
+
+
+
Ajouter une Période d'Essai :
+
+
+
+
diff --git a/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.scss b/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.ts b/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.ts
new file mode 100644
index 0000000..39ec86a
--- /dev/null
+++ b/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.ts
@@ -0,0 +1,124 @@
+import { Component, OnInit } from '@angular/core';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {PeriodeEssai} from "../../../interfaces/periode-essai";
+import {Collaborateur} from "../../../interfaces/collaborateur";
+import {CollaborateurService} from "../../../services/collaborateur.service";
+import {PeriodeEssaiService} from "../../../services/periode-essai.service";
+import {Observable} from "rxjs";
+import {ActivatedRoute} from "@angular/router";
+import {take, tap} from "rxjs/operators";
+import {Location} from "@angular/common";
+
+@Component({
+ selector: 'app-periode-essai-edit',
+ templateUrl: './periode-essai-edit.component.html',
+ styleUrls: ['./periode-essai-edit.component.scss']
+})
+export class PeriodeEssaiEditComponent implements OnInit {
+
+ periodeEssaiObservable! : Observable
;
+ id: number;
+
+ collaborateurs : Collaborateur[] = [];
+ collaborateur = {} as Collaborateur;
+
+ periodeEssais : PeriodeEssai[] = [];
+ periodeEssai = {} as PeriodeEssai;
+
+ registerForm!: FormGroup;
+ submitted = false;
+
+ startingDate : String = "";
+ plannedEndingDate : String = "";
+ realEndingDate : String = "";
+
+ constructor(
+ private route: ActivatedRoute,
+ private location: Location,
+ private collaborateurService: CollaborateurService,
+ private periodeEssaiService: PeriodeEssaiService,
+ private formBuilder: FormBuilder
+ ) {
+ this.id = Number(this.route.snapshot.paramMap.get('id'))
+ }
+
+ async ngOnInit() {
+ this.getCollaborateurs();
+ this.registerForm = this.formBuilder.group({
+ comment: ['', Validators.required],
+ collaborateurId: ['',Validators.required],
+ issue: ['',Validators.required],
+ plannedEndingDate: ['',Validators.required],
+ realEndingDate: ['',Validators.required],
+ startingDate: ['',Validators.required]
+ });
+ this.periodeEssaiObservable = this.periodeEssaiService.getPeriodeEssai(this.id).pipe(tap(periodeEssai => this.registerForm.patchValue(periodeEssai)))
+ this.periodeEssai = await this.periodeEssaiObservable.pipe(take(1)).toPromise()
+ if (this.periodeEssai.startingDate) {
+ this.startingDate = new Date(this.periodeEssai.startingDate).toISOString().split('T')[0];
+ }
+ if (this.periodeEssai.plannedEndingDate) {
+ this.plannedEndingDate = new Date(this.periodeEssai.plannedEndingDate).toISOString().split('T')[0];
+ }
+ if (this.periodeEssai.realEndingDate) {
+ this.realEndingDate = new Date(this.periodeEssai.realEndingDate).toISOString().split('T')[0];
+ }
+ }
+
+ getCollaborateurs():void {
+ this.collaborateurService.getCollaborateurs()
+ .subscribe(collaborateurs => this.collaborateurs = collaborateurs);
+ }
+
+ goBack(): void {
+ this.location.back();
+ }
+
+ delete():void {
+ if (this.periodeEssai){
+ this.periodeEssaiService.deletePeriodeEssai(this.periodeEssai)
+ .subscribe(()=>this.goBack());
+ }
+ }
+
+ onSubmit() {
+ this.submitted = true;
+
+ if (this.registerForm.invalid) {
+ return;
+ }
+ this.periodeEssai.comment = this.registerForm.value.comment
+ this.periodeEssai.collaborateurId = this.registerForm.value.collaborateurId
+ this.periodeEssai.issue = this.registerForm.value.issue
+ this.periodeEssai.plannedEndingDate = this.registerForm.value.plannedEndingDate
+ this.periodeEssai.realEndingDate = this.registerForm.value.realEndingDate
+ this.periodeEssai.startingDate = this.registerForm.value.startingDate
+
+ if (this.periodeEssai){
+ this.periodeEssaiService.updatePeriodeEssai(this.periodeEssai)
+ .subscribe(()=>this.goBack());
+ }
+ }
+
+ get f() { return this.registerForm.controls; }
+
+ onReset() {
+ this.submitted = false;
+ this.registerForm.reset();
+ }
+
+ onStartingDateChange($event: any):void {
+ this.periodeEssai.startingDate = new Date($event.target.value);
+ }
+
+ onPlannedEndingDateChange($event: any):void {
+ this.periodeEssai.plannedEndingDate = new Date($event.target.value);
+ }
+
+ onRealEndingDateChange($event: any):void {
+ this.periodeEssai.realEndingDate = new Date($event.target.value);
+ }
+
+}
+
+
diff --git a/src/app/components/periode-essai/periode-essai.component.html b/src/app/components/periode-essai/periode-essai.component.html
new file mode 100644
index 0000000..ab4f869
--- /dev/null
+++ b/src/app/components/periode-essai/periode-essai.component.html
@@ -0,0 +1,92 @@
+
+
+
Ajouter une Période d'Essai :
+
+
+
+
Périodes d'essai
+
+
+
+
+
+ | ID |
+ Collaborateur ID |
+ Issue |
+
+
+
+
+ | {{periodeEssai.id}} |
+ {{periodeEssai.collaborateurId}} |
+ {{periodeEssai.issue}} |
+ Modifier |
+
+
+
+
+
+
+
+
+