From 4677fadf6fd63b523c16cd018984860778149cc9 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Fri, 15 Oct 2021 13:11:14 +0200
Subject: [PATCH] adding activity location in show template + translations

---
 .../Resources/views/Activity/show.html.twig       | 15 +++++++++++++++
 .../translations/messages.fr.yml                  |  1 +
 2 files changed, 16 insertions(+)

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
index eba074e07..e11ab863b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -62,6 +62,21 @@
     <dt class="inline">{{ 'Date'|trans }}</dt>
     <dd>{{ entity.date|format_date('long') }}</dd>
 
+    {% if t.locationVisible %}
+        <dt class="inline">{{ 'Activity location'|trans }}</dt>
+        <dd>
+            {% if entity.location is not null %}
+                <p>
+                    <span>{{ entity.location.locationType.title|localize_translatable_string }}</span>
+                    {{ entity.location.name }}
+                </p>
+                {{ entity.location.address|chill_entity_render_box }}
+            {% else %}
+                <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+            {% endif %}
+        </dd>
+    {% endif %}
+
     {% if t.durationTimeVisible %}
     <dt class="inline">{{ 'Duration Time'|trans }}</dt>
     <dd>{% if entity.durationTime is not null %}
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index fd7dc64f8..03ae21fdb 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -23,6 +23,7 @@ Update: Mettre à jour
 Update activity: Modifier l'activité
 Scope: Cercle
 Activity data: Données de l'activité
+Activity location: Localisation de l'activité
 No reason associated: Aucun sujet
 No social issues associated: Aucune problématique sociale
 No social actions associated: Aucune action d'accompagnement