Merge branch 'master' into privacyEvent

Resources/public/sass/_task-statuses.scss

@@ -0,0 +1,34 @@
+.task-status {
+    &.box {
+        font-variant: small-caps;
+        display: inline;
+        padding: .2em .6em .3em;
+        font-size: 0.88rem;
+        font-weight: bold;
+        line-height: 1;
+        text-align: center;
+        white-space: nowrap;
+        vertical-align: baseline;
+        border-radius: .25em;
+        color: white;
+    }
+    
+    &.type-task_default {
+        //  'new', 'in_progress', 'closed', 'canceled'
+            &.place-new {
+                background-color: var(--chill-yellow);
+            }
+
+            &.place-in_progress {
+                background-color: var(--chill-green);
+            }
+
+            &.place-closed {
+                background-color: var(--chill-blue);
+            }
+
+            &.place-canceled {
+                background-color: var(--chill-beige);
+            }
+    }
+}

Resources/public/sass/_task.scss

@@ -1,4 +1,5 @@
 @import '../../../../main/Resources/public/sass/custom/config/colors';
+@import "_task-statuses.scss";
 
 div#single_task_warningInterval {
     display: flex;

Resources/translations/messages.fr.yml

@@ -59,7 +59,7 @@ Any user: Tous les utilisateurs
 Unassigned: Non assigné
 Associated person: Personne associée
 Default task: Tâche par défaut
-
+Not assigned: Aucun utilisateur assigné
 
 # transitions - default task definition
 'new': 'nouvelle'
@@ -99,3 +99,5 @@ My tasks over deadline: Mes tâches à échéance dépassée
 
 #transition page
 Apply transition on task <em>%title%</em>: Appliquer la transition sur la tâche <em>%title%</em>
+
+All centers: Tous les centres

Resources/views/SingleTask/_list.html.twig

@@ -24,8 +24,16 @@
                             {% endif %}
                             <td>
                                 {% for place in workflow_marked_places(task) %}
-                                    <span class="">{{ place|trans }}</span>
+                                    <span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
                                 {% endfor %}
+                                
+                                {% if task.assignee is not null %}
+                                <dl>
+                                    <dt>{{ 'Assignee'|trans }}</dt>
+                                    <dd>{{ task.assignee.username }}</dd>
+                                </dl>
+                                {% endif %}
+                                    
                             </td>
                             <td>
                                 {% if task.startDate is null and task.warningDate is null and task.endDate is null %}
@@ -160,6 +168,10 @@
     {{ form_row(form.person_id) }}
     {% endif %}
     
+    {% if form.center_id is defined %}
+    {{ form_row(form.center_id) }}
+    {% endif %}
+    
     <ul class="record_actions">
         <li>
             <button type="submit" class="sc-button">{{ 'Filter'|trans }}</button>

Resources/views/SingleTask/show.html.twig

@@ -25,17 +25,12 @@
 {% block personcontent %}
 <h1 class="chill-red">{{ 'Task'|trans }}</h1>
 
-<h2>{{ task.title }}</h2>
+<h2>{{ task.title }} {% for place in workflow_marked_places(task) %}
+                <span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
+            {% endfor %}</h2>
 
     <dl class="chill_view_data">
 
-        <dt class="inline">{{ 'Task status'|trans }}</dt>
-        <dd>
-            {% for place in workflow_marked_places(task) %}
-                <span class="">{{ place|trans }}</span>
-            {% endfor %}
-        </dd>
-
         <dt class="inline">{{ 'Description'|trans }}</dt>
         <dd>
             {% if task.description is empty %}