295 resume retouches

src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig

@@ -26,23 +26,45 @@
 
         {{ activity.type.name | localize_translatable_string }}
 
-        <ul class="small_in_title">
-            {% if activity.location and t.locationVisible %}
-            <li>
-                <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
-                <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
-                {{ activity.location.name }}
-            </li>
+        {% if activity.emergency %}
+            <span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
+        {% endif %}
+
+        <ul class="small_in_title mt-3">
+
+            {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
+                <li>
+                    <span class="item-key">{{ 'Sent received'|trans ~ ' : ' }}</span>
+                    <b>{{ activity.sentReceived|capitalize|trans }}</b>
+                </li>
             {% endif %}
+
+            {% if activity.location and t.locationVisible %}
+                <li>
+                    <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
+                    <b>
+                        <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+                        {{ activity.location.name }}
+                    </b>
+                </li>
+            {% endif %}
+
             {% if activity.user and t.userVisible %}
                 <li>
                     <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                    {{ activity.user.usernameCanonical }}
+                    <b>{{ activity.user.usernameCanonical }}</b>
                 </li>
             {% endif %}
+
+            <li class="associated-persons">
+                <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
+                {% for p in activity.personsAssociated %}
+                    <span class="badge-person">{{ p|chill_entity_render_box }}</span>
+                {% endfor %}
+            </li>
         </ul>
 
-        <ul class="list-content">
+        <ul class="list-content my-3">
             {%- if t.reasonsVisible -%}
                 {%- if activity.reasons is not empty -%}
                     <li class="reasons">
@@ -71,11 +93,9 @@
                 {%- endif -%}
             {% endif %}
         </ul>
-
     </span>
 </h2>
 
-{#
 {% if context == 'person' and activity.accompanyingPeriod is not empty %}
     <div class="mt-3">
         <a class="btn btn-sm btn-outline-primary"
@@ -87,4 +107,4 @@
         </a>
     </div>
 {% endif %}
-#}
+

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

@@ -3,89 +3,93 @@
     {{ path(pathname, parms) }}
 {% endmacro %}
 
-{% if context == 'person' %}
-    {% set blocs = [
-        {   'title': 'Others persons'|trans,
+{% macro computeWidth(nbBlocks) %}
+    {{ 'flex-basis: ' ~ (100 / nbBlocks)|round(1) ~ '%;' }}
+{% endmacro %}
+
+{% set blocks = [] %}
+{% if entity.activityType.personsVisible %}
+    {% if context == 'person' %}
+        {% set blocks = blocks|merge([{
+            'title': 'Others persons'|trans,
             'items': entity.persons,
             'path' : 'chill_person_view',
             'key'  : 'person_id'
-        },
-        {   'title': 'Third parties'|trans,
-            'items': entity.thirdParties,
-            'path' : 'chill_crud_3party_3party_view',
-            'key'  : 'id'
-        },
-        {   'title': 'Users concerned'|trans,
-            'items': entity.users,
-            'key'  : 'id'
-        },
-    ] %}
-{% else %}
-    {% set blocs = [
-        {   'title': 'Persons in accompanying course'|trans,
+        }]) %}
+    {% else %}
+        {% set blocks = blocks|merge([{
+            'title': 'Persons in accompanying course'|trans,
             'items': entity.personsAssociated,
             'path' : 'chill_person_view',
             'key'  : 'person_id'
-        },
-        {   'title': 'Third persons'|trans,
+        },{
+            'title': 'Third persons'|trans,
             'items': entity.personsNotAssociated,
             'path' : 'chill_person_view',
-            'key'  : 'person_id'
-        },
-        {   'title': 'Third parties'|trans,
-            'items': entity.thirdParties,
-            'path' : 'chill_crud_3party_3party_view',
-            'key'  : 'id'
-        },
-        {   'title': 'Users concerned'|trans,
-            'items': entity.users,
-            'key'  : 'id'
-        },
-    ] %}
+            'key'  : 'person_id',
+        }]) %}
+    {% endif %}
+{% endif %}
+{% if entity.activityType.thirdPartiesVisible %}
+    {% set blocks = blocks|merge([{
+        'title': 'Third parties'|trans,
+        'items': entity.thirdParties,
+        'path' : 'chill_crud_3party_3party_view',
+        'key'  : 'id',
+    }]) %}
+{% endif %}
+{% if entity.activityType.usersVisible %}
+    {% set blocks = blocks|merge([{
+        'title': 'Users concerned'|trans,
+        'items': entity.users,
+        'key'  : 'id',
+    }]) %}
 {% endif %}
 
 {% if (with_display == 'bloc') %}
 <div class="{{ context }} flex-bloc concerned-groups">
-    {% for bloc in blocs %}
-    <div class="item-bloc">
-        <div class="item-row">
-            <div class="item-col">
-                <h4>{{ bloc.title }}</h4>
-            </div>
-            <div class="item-col">
-                <ul class="list-content">
-                    {% for item in bloc.items %}
-                    <li>
-                        {% if bloc.path is defined %}
-                        <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                            <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
-                                {{ item|chill_entity_render_box({
-                                    'render': 'raw',
-                                    'addAltNames': false
-                                }) }}
-                            </span>
-                        </a>
-                    {% else %}
-                        <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
-                            {{ item|chill_entity_render_box({
-                                'render': 'raw',
-                                'addAltNames': false
-                            }) }}
-                        </span>
-                    {% endif %}
-                    </li>
-                    {% endfor %}
-                </ul>
+    {% for bloc in blocks %}
+
+        <div class="item-bloc" style="{{ _self.computeWidth(loop.length) }}">
+            <div class="item-row">
+                <div class="item-col">
+                    <h4>{{ bloc.title }}</h4>
+                </div>
+                <div class="item-col">
+                    <ul class="list-content">
+                        {% for item in bloc.items %}
+                            <li>
+                                {% if bloc.path is defined %}
+                                    <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
+                                    <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                                        {{ item|chill_entity_render_box({
+                                            'render': 'raw',
+                                            'addAltNames': false
+                                        }) }}
+                                    </span>
+                                    </a>
+                                {% else %}
+                                    <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                                        {{ item|chill_entity_render_box({
+                                            'render': 'raw',
+                                            'addAltNames': false
+                                        }) }}
+                                    </span>
+                                {% endif %}
+                            </li>
+                        {% endfor %}
+                    </ul>
+                </div>
             </div>
         </div>
-    </div>
+
     {% endfor %}
 </div>
 {% endif %}
 
 {% if (with_display == 'row') %}
 <div class="concerned-groups">
-    {% for bloc in blocs %}
+    {% for bloc in blocks %}
     <div class="group">
         {% if bloc.items|length > 0 %}
             <h4>{{ bloc.title }}</h4>
@@ -118,7 +122,7 @@
 
 {% if (with_display == 'wrap-list') %}
 <div class="concerned-groups wrap-list">
-    {% for bloc in blocs %}
+    {% for bloc in blocks %}
         <div class="wl-row">
             {% if bloc.items|length > 0 %}
                 <div class="wl-col title">

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

@@ -2,9 +2,11 @@
     {% for activity in activities | slice(0,5) %}
         {% set t = activity.type %}
 
-        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"></a>
+        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+            class="badge-link" title="{{ 'Show the activity'|trans }}">
 
-        {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
+            {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
+        </a>
 
     {% endfor %}
 </div>

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

@@ -9,7 +9,7 @@
 {% block content -%}
 <div class="activity-show">
 
-            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
+    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
 
 </div>
 {% endblock content %}