From 00ad7a74d68fad95afde440ae6cf5e857ed414a5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Oct 2021 10:59:19 +0200
Subject: [PATCH 1/2] correct formatting of birth- and deathdate

---
 .../vuejs/_components/Entity/PersonRenderBox.vue    | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 530a14e95..128d6ed1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -35,7 +35,7 @@
                     </time>
 
                     <time v-else-if="person.birthdate && person.deathdate" :datetime="person.deathdate" :title="person.deathdate">
-                        {{ birthdate }} - {{ deathdate }}
+                        {{ $d(birthdate) }} - {{ $d(deathdate) }}
                     </time>
 
                     <time v-else-if="person.deathdate" :datetime="person.deathdate" :title="person.deathdate">
@@ -164,21 +164,14 @@ export default {
         },
         birthdate: function(){
             if(this.person.birthdate !== null){
-            const date = new Date(this.person.birthdate.datetime);
-            return dateToISO(date)
+            return new Date(this.person.birthdate.datetime);
             } else {
                 return "";
             }
         },
         deathdate: function(){
-           // TODO FIX edition conflict:  if null or undefined ?
-           // if (typeof this.person.deathdate !== 'undefined') {
-           //   var date = new Date(this.person.deathdate.datetime);
-           //   return dateToISO(date);
-           //}
             if(this.person.deathdate !== null){
-               const date = new Date(this.person.deathdate.datetime);
-               return date.toLocaleDateString("fr-FR");
+               return new Date(this.person.deathdate.datetime);
             } else {
                 return "";
             }

From 4096e0d4dfe3f0f8e14b1cc54bbc4363095d5b7b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 26 Oct 2021 11:05:13 +0200
Subject: [PATCH 2/2] undefined condition added

---
 .../public/vuejs/_components/Entity/PersonRenderBox.vue       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 128d6ed1d..f5fe283be 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -163,14 +163,14 @@ export default {
             return this.person.gender === 'woman' ? 'person.gender.woman' : this.person.gender === 'man' ? 'person.gender.man' : 'person.gender.neuter';
         },
         birthdate: function(){
-            if(this.person.birthdate !== null){
+            if(this.person.birthdate !== null || this.person.birthdate === "undefined"){
             return new Date(this.person.birthdate.datetime);
             } else {
                 return "";
             }
         },
         deathdate: function(){
-            if(this.person.deathdate !== null){
+            if(this.person.deathdate !== null || this.person.birthdate === "undefined"){
                return new Date(this.person.deathdate.datetime);
             } else {
                 return "";