From eecb11436e9a101987c07609313f801a630eefef Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 18 Oct 2021 15:33:26 +0200
Subject: [PATCH 1/7] field label for duration of activity

---
 src/Bundle/ChillActivityBundle/translations/messages.fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 679004e2e..cca86c883 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -5,7 +5,7 @@ Activity: Activité
 Duration time: Durée
 Duration Time: Durée
 durationTime:  durée
-Travel time: Durée de déplacement
+Travel time: Durée du trajet (aller/retour)
 Reasons: Sujets
 Attendee: Présence de la personne
 attendee: présence de la personne

From 2227d5c66f6245748a02268df3a3604d0c3f2748 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 18 Oct 2021 16:56:33 +0200
Subject: [PATCH 2/7] translation fixed in master vendee branch

---
 src/Bundle/ChillActivityBundle/translations/messages.fr.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index cca86c883..dafd80428 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -5,8 +5,7 @@ Activity: Activité
 Duration time: Durée
 Duration Time: Durée
 durationTime:  durée
-Travel time: Durée du trajet (aller/retour)
-Reasons: Sujets
+Travel time: Durée de déplacement
 Attendee: Présence de la personne
 attendee: présence de la personne
 list_reasons: liste des sujets

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 3/7] 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 4/7] 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 "";

From d2eb7b471e3bb53afe5c6522d45d7dcc0c37f1d1 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 26 Oct 2021 16:24:45 +0200
Subject: [PATCH 5/7] accompanying course work: remove display of creation date

---
 .../list_by_accompanying_period.html.twig                 | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
index f0f0a051e..a4f959b81 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
@@ -20,14 +20,6 @@
 
           <div class="timeline">
             <ul>
-              <li class="completed">
-                <div class="date">
-                  <span>{{ w.createdAt|format_date('long') }}</span>
-                </div>
-                <div class="label">
-                  <span>{{ 'accompanying_course_work.create_date'|trans }}</span>
-                </div>
-              </li>
               <li class="completed">
                 <div class="date">
                   <span>{{ w.startDate|format_date('long') }}</span>

From 0fa3ff4c16a555923d644f64190003e0b4fdd457 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 26 Oct 2021 17:13:41 +0200
Subject: [PATCH 6/7] accompanying course work: handle case end date is null

---
 .../public/chill/scss/accompanying_period_work.scss         | 3 +++
 .../list_by_accompanying_period.html.twig                   | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
index e6bdb174b..cc56fcbda 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
@@ -37,6 +37,9 @@ div.accompanying_course_work-list {
                             border-radius: 12px;
                             border: 2px solid $chill-green;
                         }
+                        &.no-label:before {
+                            display: none;
+                        }
                     }
                 }
             }
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
index a4f959b81..dd8beded5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
@@ -28,6 +28,11 @@
                   <span>{{ 'accompanying_course_work.start_date'|trans }}</span>
                 </div>
               </li>
+              {% if w.endDate == null %}
+              <li>
+                <div class="label no-label"></div>
+              </li>
+              {% else %}
               <li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
                 <div class="date">
                   <span>{{ w.endDate|format_date('long') }}</span>
@@ -36,6 +41,7 @@
                   <span>{{ 'accompanying_course_work.end_date'|trans }}</span>
                 </div>
               </li>
+              {% endif %}
             </ul>
           </div>
 

From 532efb1787f36ea207cbd9489ceaba2006e3d0b8 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 26 Oct 2021 17:17:04 +0200
Subject: [PATCH 7/7] accompanying course work: changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fb7d4680..6182b4d0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ and this project adheres to
 
 <!-- write down unreleased development here -->
 
-
+* [person]: accompanying course work: remove creation date display the list of work + handle case when end date is null
 
 
 ## Test releases