fix misc in activity (WIP)

src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig

@@ -1,48 +1,102 @@
-<h1 >{{ "Activity"|trans }}</h1>
+{%- set t = entity.type -%}
+{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
+
+<h1>
+  {{ "Activity"|trans }}
+  {%- if t.emergencyVisible and entity.emergency -%}
+  <span class="badge badge-secondary">
+    {{- 'Emergency'|trans -}}
+  </span>
+{%- endif -%}
+</h1>
+
 <dl class="chill_view_data">
-    <dt class="inline">{{ 'User'|trans }}</dt>
+
+    <dt class="inline">{{ 'by'|trans|capitalize }}</dt>
     <dd>{{ entity.user }}</dd>
 
+    <dt class="inline">{{ 'Type'|trans }}</dt>
+    <dd>{{ entity.type.name | localize_translatable_string }}</dd>
+
     {%- if entity.scope -%}
         <dt class="inline">{{ 'Scope'|trans }}</dt>
         <dd><span class="scope">{{ entity.scope.name|localize_translatable_string }}</span></dd>
     {% endif %}
-</dl>
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}
-
-<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
-<dl class="chill_view_data">
-
-    {%- if entity.person is defined -%}
-        <dt class="inline">{{ 'Person'|trans }}</dt>
-        <dd>{{ entity.person }}</dd>
+    {% if t.socialIssuesVisible %}
+      <dt class="inline">{{ 'Social issues'|trans }}</dt>
+      <dd>
+        {% if entity.socialIssues|length == 0 %}
+          <p class="chill-no-data-statement">{{ 'Any social issues'|trans }}</p>
+        {% else %}
+          {% for si in entity.socialIssues %}{{ si|chill_entity_render_box }}{% endfor %}
+        {% endif %}
+      </dd>
     {% endif %}
 
-    <dt class="inline">{{ 'Date'|trans }}</dt>
-    <dd>{{ entity.date|format_date('long') }}</dd>
-    <dt class="inline">{{ 'Duration Time'|trans }}</dt>
-    <dd>{{ entity.durationTime|date('H:i') }}</dd>
-    <dt class="inline">{{ 'Type'|trans }}</dt>
-    <dd>{{ entity.type.name | localize_translatable_string }}</dd>
-
-    <dt class="inline">{{ 'Attendee'|trans }}</dt>
-    <dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>
+    {% if t.socialActionsVisible %}
+      <dt class="inline">{{ 'Social actions'|trans }}</dt>
+      <dd>
+        {% if entity.socialActions|length == 0 %}
+          <p class="chill-no-data-statement">{{ 'Any social actions'|trans }}</p>
+        {% else %}
+          {% for sa in entity.socialActions %}{{ sa|chill_entity_render_box }}{% endfor %}
+        {% endif %}
+      </dd>
+    {% endif %}
 
+    {% if t.reasonsVisible %}
     <dt class="inline">{{ 'Reasons'|trans }}</dt>
     {%- if entity.reasons is empty -%}
     <dd><span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span></dd>
     {%- else -%}
     <dd>{% for r in entity.reasons %}{{ r|chill_entity_render_box }} {% endfor %}</dd>
     {%- endif -%}
+    {% endif %}
 
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}
+
+<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+
+    <dt class="inline">{{ 'Date'|trans }}</dt>
+    <dd>{{ entity.date|format_date('long') }}</dd>
+
+    {% if t.durationTimeVisible %}
+    <dt class="inline">{{ 'Duration Time'|trans }}</dt>
+    <dd>{{ entity.durationTime|date('H:i') }}</dd>
+    {% endif %}
+
+    {% if t.travelTimeVisible %}
+    <dt class="inline">{{ 'Travel Time'|trans }}</dt>
+    <dd>{{ entity.travelTime|date('H:i') }}</dd>
+    {% endif %}
+
+    {% if t.commentVisible %}
     <dt class="inline">{{ 'Comment'|trans }}</dt>
-    {%- if entity.comment is empty -%}
-        <dd><span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span></dd>
-    {%- else -%}
-        <dd>{{ entity.comment|chill_entity_render_box }}</dd>
-    {%- endif -%}
+      {%- if entity.comment.empty -%}
+          <dd><span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span></dd>
+      {%- else -%}
+          <dd>{{ entity.comment|chill_entity_render_box }}</dd>
+      {%- endif -%}
+    {% endif %}
+
+    {% if t.documentsVisible and entity.documents|length > 0 %}
+      <dt>{{ 'Documents'|trans }}</dt>
+      <dd>
+        <ul>
+        {% for d in entity.documents %}
+          <li>{{ m.download_button(d) }}</li>
+        {% endfor %}
+        </ul>
+      </dd>
+    {% endif %}
+
+    {% if t.attendeeVisible %}
+    <dt class="inline">{{ 'Attendee'|trans }}</dt>
+    <dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>
+    {% endif %}
+
 </dl>
 
 {% set person_id = null %}