diff --git a/templates/_includes/html/arrays/activity.html.twig b/templates/_includes/html/arrays/activity.html.twig index 414b5d1..2fbf08b 100644 --- a/templates/_includes/html/arrays/activity.html.twig +++ b/templates/_includes/html/arrays/activity.html.twig @@ -8,8 +8,8 @@ Status Acteur Début planifié - Début réél Fin planifiée + Début réél Fin réele Actions @@ -19,15 +19,14 @@ {{ activity.name }} {{ statusTools.statusName(activity.status) }} - {% if activity.actor is not null %} - {{ activity.actor.displayName }} + {% if activity.actor is not null %} {{ activity.actor.displayName }} {% endif %} {% if activity.startDate is not null %} {{ dateTools.euro(activity.startDate) }} {% endif %} - {% if activity.realStartDate is not null %} {{ dateTools.euro(activity.realStartDate) }} - {% endif %} {% if activity.endDate is not null %} {{ dateTools.euro(activity.endDate) }} {% endif %} + {% if activity.realStartDate is not null %} {{ dateTools.euro(activity.realStartDate) }} + {% endif %} {% if activity.realEndDate is not null %} {{ dateTools.euro(activity.realEndDate) }} {% endif %}