-
La date de fin prévue d'une période d'essai est obligatoire
+
+
La date de fin prévue d'une période d'essai est obligatoire
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
index 4421e23..eeb1650 100644
--- 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
@@ -40,13 +40,13 @@ export class PeriodeEssaiEditComponent implements OnInit {
this.id = Number(this.route.snapshot.paramMap.get('id'))
}
- get f() {
+ get form() {
return this.registerForm.controls;
}
async ngOnInit() {
- this.getCollaborateurs();
- this.getPeriodeEssais();
+ this.initCollaborateurs();
+ this.initPeriodeEssais();
this.registerForm = this.formBuilder.group({
comment: [],
collaborateurId: ['', Validators.required],
@@ -59,12 +59,12 @@ export class PeriodeEssaiEditComponent implements OnInit {
this.periodeEssai = await this.periodeEssaiObservable.pipe(take(1)).toPromise()
}
- getCollaborateurs(): void {
+ initCollaborateurs(): void {
this.collaborateurService.getCollaborateurs()
.subscribe(collaborateurs => this.collaborateurs = collaborateurs);
}
- getPeriodeEssais() {
+ initPeriodeEssais() {
this.periodeEssaiService.getPeriodeEssais()
.subscribe(periodeEssais => this.periodeEssais = periodeEssais);
}
@@ -94,7 +94,7 @@ export class PeriodeEssaiEditComponent implements OnInit {
} else {
this.periodeEssai.issue = this.registerForm.value.issue;
}
- if (this.registerForm.value.realEndingDate == undefined || this.registerForm.value.realEndingDate == '') {
+ if (this.registerForm.value.realEndingDate == undefined || this.registerForm.value.realEndingDate === '') {
this.periodeEssai.realEndingDate = null;
} else {
this.periodeEssai.realEndingDate = this.registerForm.value.realEndingDate;
diff --git a/src/app/components/periode-essai/periode-essai.component.ts b/src/app/components/periode-essai/periode-essai.component.ts
index a051674..5e7a811 100644
--- a/src/app/components/periode-essai/periode-essai.component.ts
+++ b/src/app/components/periode-essai/periode-essai.component.ts
@@ -28,17 +28,17 @@ export class PeriodeEssaiComponent implements OnInit {
}
ngOnInit(): void {
- this.getCollaborateurs();
- this.getPeriodeEssais();
+ this.initCollaborateurs();
+ this.initPeriodeEssais();
}
onIsOldChange() {
this.isOld = !this.isOld;
- this.initPeriodeEssai();
+ this.definePeriodeEssais();
}
- initPeriodeEssai() {
+ definePeriodeEssais() {
if (this.isOld) {
this.periodeEssais = this.periodeEssaisPassees;
} else {
@@ -46,7 +46,7 @@ export class PeriodeEssaiComponent implements OnInit {
}
}
- getCollaborateurs(): void {
+ initCollaborateurs(): void {
this.collaborateurService.getCollaborateurs()
.subscribe(collaborateurs => this.collaborateurs = collaborateurs);
}
@@ -54,7 +54,7 @@ export class PeriodeEssaiComponent implements OnInit {
getCollaborateurById(id: number): Collaborateur {
let collab = {} as Collaborateur;
this.collaborateurs.forEach(c => {
- if (c.id == id) {
+ if (c.id === id) {
collab = c;
return;
}
@@ -63,7 +63,7 @@ export class PeriodeEssaiComponent implements OnInit {
return collab;
}
- getPeriodeEssais() {
+ initPeriodeEssais() {
this.periodeEssaiService.getPeriodeEssais()
.subscribe(periodeEssais => {
periodeEssais.forEach(pe => {
@@ -75,7 +75,7 @@ export class PeriodeEssaiComponent implements OnInit {
})
this.periodeEssaisEnCours.sort((b, a) => new Date(b.plannedEndingDate).getTime() - new Date(a.plannedEndingDate).getTime());
this.periodeEssaisPassees.sort((a, b) => new Date(b.plannedEndingDate).getTime() - new Date(a.plannedEndingDate).getTime());
- this.initPeriodeEssai();
+ this.definePeriodeEssais();
});
}
diff --git a/src/app/components/referencement/referencement-add/referencement-add.component.ts b/src/app/components/referencement/referencement-add/referencement-add.component.ts
index ad1ce68..1ccb3d1 100644
--- a/src/app/components/referencement/referencement-add/referencement-add.component.ts
+++ b/src/app/components/referencement/referencement-add/referencement-add.component.ts
@@ -37,7 +37,7 @@ export class ReferencementAddComponent implements OnInit {
}
ngOnInit(): void {
- this.getCollaborateurs();
+ this.initCollaborateurs();
this.registerForm = this.formBuilder.group({
referredId: ['', Validators.required],
referrerId: ['', Validators.required],
@@ -52,7 +52,7 @@ export class ReferencementAddComponent implements OnInit {
}
}
- getCollaborateurs(): void {
+ initCollaborateurs(): void {
this.collaborateurService.getCollaborateurs()
.subscribe(collaborateurs => this.collaborateurs = collaborateurs);
}
diff --git a/src/app/components/referencement/referencement-edit/referencement-edit.component.ts b/src/app/components/referencement/referencement-edit/referencement-edit.component.ts
index 8edcb6f..bc455d7 100644
--- a/src/app/components/referencement/referencement-edit/referencement-edit.component.ts
+++ b/src/app/components/referencement/referencement-edit/referencement-edit.component.ts
@@ -45,7 +45,7 @@ export class ReferencementEditComponent implements OnInit {
}
async ngOnInit() {
- this.getCollaborateurs();
+ this.initCollaborateurs();
this.registerForm = this.formBuilder.group({
referredId: ['', Validators.required],
referrerId: ['', Validators.required],
@@ -58,7 +58,7 @@ export class ReferencementEditComponent implements OnInit {
}
- getCollaborateurs(): void {
+ initCollaborateurs(): void {
this.collaborateurService.getCollaborateurs()
.subscribe(collaborateurs => this.collaborateurs = collaborateurs);
}
@@ -73,7 +73,7 @@ export class ReferencementEditComponent implements OnInit {
this.referencement.referrerId = this.registerForm.value.referrerId;
this.referencement.startingDate = this.registerForm.value.startingDate;
- if (this.registerForm.value.endingDate == undefined || this.registerForm.value.endingDate == '') {
+ if (this.registerForm.value.endingDate == undefined || this.registerForm.value.endingDate === '') {
this.referencement.endingDate = null;
} else {
this.referencement.endingDate = this.registerForm.value.endingDate;
diff --git a/src/app/components/referencement/referencement.component.ts b/src/app/components/referencement/referencement.component.ts
index 7831b2d..f37b0f4 100644
--- a/src/app/components/referencement/referencement.component.ts
+++ b/src/app/components/referencement/referencement.component.ts
@@ -37,14 +37,14 @@ export class ReferencementComponent implements OnInit {
this.referencements = referencements;
this.referencements.forEach(ref => {
- if (this.idReferredTab.find(id => ref.id == id) == undefined) {
+ if (this.idReferredTab.find(id => ref.id === id) == undefined) {
this.idReferredTab.push(ref.referredId);
}
});
this.collaborateurs.forEach(collab => {
- if (this.idReferredTab.find(id => collab.id == id) == undefined) {
+ if (this.idReferredTab.find(id => collab.id === id) == undefined) {
this.collaborateursSansRef.push(collab);
}
})
@@ -60,7 +60,7 @@ export class ReferencementComponent implements OnInit {
getCollaborateurById(id: number): Collaborateur {
let collab = {} as Collaborateur;
this.collaborateurs.forEach(c => {
- if (c.id == id) {
+ if (c.id === id) {
collab = c;
return;
}
diff --git a/src/app/services/collaborateur.service.ts b/src/app/services/collaborateur.service.ts
index 4e4d0f7..d9ba5c6 100644
--- a/src/app/services/collaborateur.service.ts
+++ b/src/app/services/collaborateur.service.ts
@@ -28,7 +28,6 @@ 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) {