diff --git a/changelog.md b/changelog.md index cd48baf..30f0304 100644 --- a/changelog.md +++ b/changelog.md @@ -15,15 +15,18 @@ ### Release v1.0.0 First viable version + ### Hotfix v1.0.1 #### Fix - README update - update.bat + ### Hotfix v1.0.2 #### Fix - InvalidEnumKeyException namespace + ### Release v1.0.3 #### Feature - Filter in activity view @@ -33,6 +36,7 @@ - Activity form - Typo on nav + ### Release v1.0.4 #### Feature - Add date filter to activity view @@ -45,6 +49,7 @@ - Cache clear in update.bat - Cache clear in README + ### Release v1.0.5 #### Feature - Add licencing @@ -54,4 +59,9 @@ #### Fix - Doctrine deprecation -- Activity filter does not shows unassigned activities \ No newline at end of file +- Activity filter does not shows unassigned activities + + +### Next +#### Improve +- Move columns in activity table \ No newline at end of file diff --git a/templates/_includes/html/arrays/activity.html.twig b/templates/_includes/html/arrays/activity.html.twig index 92ae911..0ae30a9 100644 --- a/templates/_includes/html/arrays/activity.html.twig +++ b/templates/_includes/html/arrays/activity.html.twig @@ -11,8 +11,8 @@ Acteur {% endif %} Début planifié - Fin planifiée Début réél + Fin planifiée Fin réele Actions @@ -20,22 +20,22 @@ {% for activity in activities %} - {{ activity.name }} + {{ activity.name }} {{ statusTools.statusName(activity.status) }} {% if not hideActor %} {% if activity.actor is not null %} {{ activity.actor.displayName }} - - {% endif %} + href="{{ url('actor_actor', {id: activity.actor.id}, false) }}" + title="Editer">{{ activity.actor.displayName }} {% endif %} {% endif %} - {% if activity.startDate is not null %} {{ dateTools.euro(activity.startDate) }} - {% 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 %} + {% if activity.realEndDate is not null %} + {{ dateTools.euro(activity.realEndDate) }} {% endif %}