From fb9dea14ed9b1c1ec784cf3a286c5a4cf56cddef Mon Sep 17 00:00:00 2001 From: Clement FERRERE Date: Mon, 4 Jul 2022 14:51:45 +0200 Subject: [PATCH] =?UTF-8?q?On=20peut=20maintenant=20passer=20=C3=A0=20"nul?= =?UTF-8?q?l"=20une=20date=20qui=20avait=20d=C3=A9j=C3=A0=20une=20valeur.?= =?UTF-8?q?=20Ceci=20s'applique=20uniquement=20aux=20dates=20possiblement?= =?UTF-8?q?=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collaborateur-edit/collaborateur-edit.component.ts | 4 ++-- .../periode-essai-edit/periode-essai-edit.component.ts | 5 ++++- .../referencement-edit/referencement-edit.component.ts | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) 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 cf9976b..1065404 100644 --- a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts +++ b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts @@ -103,8 +103,8 @@ export class CollaborateurEditComponent implements OnInit { this.collaborateur.childrenNumber = this.registerForm.value.childrenNumber this.collaborateur.status = this.registerForm.value.status - if (this.registerForm.value.resignationDate != undefined) { - this.collaborateur.resignationDate = this.registerForm.value.resignationDate + if (this.registerForm.value.resignationDate == undefined) { + this.collaborateur.resignationDate = new Date(); } console.log(this.collaborateur) 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 5e87f99..c540b68 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 @@ -85,10 +85,13 @@ export class PeriodeEssaiEditComponent implements OnInit { 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.registerForm.value.plannedEndingDate == undefined) { + this.periodeEssai.plannedEndingDate = new Date(); + } + if (this.periodeEssai){ this.periodeEssaiService.updatePeriodeEssai(this.periodeEssai) .subscribe(() => { 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 bc510d5..3326d4c 100644 --- a/src/app/components/referencement/referencement-edit/referencement-edit.component.ts +++ b/src/app/components/referencement/referencement-edit/referencement-edit.component.ts @@ -71,8 +71,8 @@ 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.referencement.endingDate = this.registerForm.value.endingDate + if (this.registerForm.value.endingDate == undefined) { + this.referencement.endingDate = new Date() } console.log(this.referencement)