Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 106_tasks_to_parcours

Browse Source
This commit is contained in:
Julien Fastré 2021-10-27 13:45:02 +02:00
commit 8e0a22974b
5 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -12,7 +12,7 @@ and this project adheres to
<!-- write down unreleased development here --> <!-- 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 ## Test releases

1
src/Bundle/ChillActivityBundle/translations/messages.fr.yml
View File

@ -6,7 +6,6 @@ Duration time: Durée
Duration Time: Durée Duration Time: Durée
durationTime: durée durationTime: durée
Travel time: Durée de déplacement Travel time: Durée de déplacement
Reasons: Sujets
Attendee: Présence de la personne Attendee: Présence de la personne
attendee: présence de la personne attendee: présence de la personne
list_reasons: liste des sujets list_reasons: liste des sujets

3
src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
View File

@ -37,6 +37,9 @@ div.accompanying_course_work-list {
border-radius: 12px; border-radius: 12px;
border: 2px solid $chill-green; border: 2px solid $chill-green;
} }
&.no-label:before {
display: none;
}
} }
} }
} }

17
src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
View File

@ -35,7 +35,7 @@
</time> </time>
<time v-else-if="person.birthdate && person.deathdate" :datetime="person.deathdate" :title="person.deathdate"> <time v-else-if="person.birthdate && person.deathdate" :datetime="person.deathdate" :title="person.deathdate">
{{ birthdate }} - {{ deathdate }} {{ $d(birthdate) }} - {{ $d(deathdate) }}
</time> </time>
<time v-else-if="person.deathdate" :datetime="person.deathdate" :title="person.deathdate"> <time v-else-if="person.deathdate" :datetime="person.deathdate" :title="person.deathdate">
@ -163,22 +163,15 @@ export default {
return this.person.gender === 'woman' ? 'person.gender.woman' : this.person.gender === 'man' ? 'person.gender.man' : 'person.gender.neuter'; return this.person.gender === 'woman' ? 'person.gender.woman' : this.person.gender === 'man' ? 'person.gender.man' : 'person.gender.neuter';
}, },
birthdate: function(){ birthdate: function(){
if(this.person.birthdate !== null){ if(this.person.birthdate !== null || this.person.birthdate === "undefined"){
const date = new Date(this.person.birthdate.datetime); return new Date(this.person.birthdate.datetime);
return dateToISO(date)
} else { } else {
return ""; return "";
} }
}, },
deathdate: function(){ deathdate: function(){
// TODO FIX edition conflict: if null or undefined ? if(this.person.deathdate !== null || this.person.birthdate === "undefined"){
// if (typeof this.person.deathdate !== 'undefined') { return new Date(this.person.deathdate.datetime);
// 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");
} else { } else {
return ""; return "";
} }

14
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig
View File

@ -20,14 +20,6 @@
<div class="timeline"> <div class="timeline">
<ul> <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"> <li class="completed">
<div class="date"> <div class="date">
<span>{{ w.startDate|format_date('long') }}</span> <span>{{ w.startDate|format_date('long') }}</span>
@ -36,6 +28,11 @@
<span>{{ 'accompanying_course_work.start_date'|trans }}</span> <span>{{ 'accompanying_course_work.start_date'|trans }}</span>
</div> </div>
</li> </li>
{% if w.endDate == null %}
<li>
<div class="label no-label"></div>
</li>
{% else %}
<li class="{%if date(w.endDate) < date('now') %}completed{% endif %}"> <li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
<div class="date"> <div class="date">
<span>{{ w.endDate|format_date('long') }}</span> <span>{{ w.endDate|format_date('long') }}</span>
@ -44,6 +41,7 @@
<span>{{ 'accompanying_course_work.end_date'|trans }}</span> <span>{{ 'accompanying_course_work.end_date'|trans }}</span>
</div> </div>
</li> </li>
{% endif %}
</ul> </ul>
</div> </div>