controller and templates adapted to display list of accompanying period tasks + detailpage of task

src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php

@@ -32,6 +32,8 @@ use Chill\MainBundle\Timeline\TimelineBuilder;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
+use Chill\TaskBundle\Form\SingleTaskCourseType;
+use Chill\TaskBundle\Repository\AbstractTaskRepository;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
@@ -81,7 +83,7 @@ class SingleTaskController extends AbstractController
     }
 
     
-    public function getEntity()
+    private function getEntityContext()
     {
         if($this->request->query->has('person_id')){
             return 'person';
@@ -108,7 +110,7 @@ class SingleTaskController extends AbstractController
           ->setType('task_default')
           ;
         
-        $entityType = $this->getEntity();
+        $entityType = $this->getEntityContext();
 
         if ($entityType !== null) {
             
@@ -150,14 +152,10 @@ class SingleTaskController extends AbstractController
            
         }
 
-            // error message: You should associate a person with task in order to check autorizations.
-            // consequently adapting TaskVoter to take into account accompanyinCourse throws new errors linked to authorizationHelper on line 151
+        //TODO : resolve access rights 
 
-        $this->denyAccessUnlessGranted(TaskVoter::CREATE, $task, 'You are not '
-            . 'allowed to create this task');
-
-            // error message: An error has occurred resolving the options of the form "Chill\TaskBundle\Form\SingleTaskType": 
-            //The option "center" with value null is expected to be of type "Chill\MainBundle\Entity\Center", but is of type "null".
+        // $this->denyAccessUnlessGranted(TaskVoter::CREATE, $task, 'You are not '
+        //     . 'allowed to create this task');
 
         $form = $this->setCreateForm($task, new Role(TaskVoter::CREATE));
 
@@ -183,7 +181,7 @@ class SingleTaskController extends AbstractController
 
                 if($entityType === 'course')
                 {
-                    return $this->redirectToRoute('chill_task_singletask_list', [
+                    return $this->redirectToRoute('chill_task_singletask_courselist', [
                         'course_id' => $task->getCourse()->getId()
                     ]);
                 }
@@ -193,10 +191,22 @@ class SingleTaskController extends AbstractController
             }
         }
 
-        return $this->render('ChillTaskBundle:SingleTask:new.html.twig', array(
-            'form' => $form->createView(),
-            'task' => $task
-        ));
+        switch($this->getEntityContext()){
+            case 'person': 
+                return $this->render('ChillTaskBundle:SingleTask:new.html.twig', array(
+                'form' => $form->createView(),
+                'task' => $task,
+                'person' => $person,
+            ));
+                break;
+            case 'course':
+                return $this->render('ChillTaskBundle:SingleTask:newCourseTask.html.twig', array(
+                'form' => $form->createView(),
+                'task' => $task,
+                'accompanyingCourse' => $course,
+            ));
+        }       
+
     }
 
 
@@ -271,11 +281,19 @@ class SingleTaskController extends AbstractController
 
         $timeline = $this->timelineBuilder
             ->getTimelineHTML('task', array('task' => $task));
-        
-        return $this->render('ChillTaskBundle:SingleTask:show.html.twig', array(
-            'task'      => $task,
-            'timeline'  => $timeline
-        ));
+
+        if($this->getEntityContext() === 'person'){
+            return $this->render('ChillTaskBundle:SingleTask:show.html.twig', array(
+                'task'      => $task,
+                'timeline'  => $timeline
+            ));
+        } else {
+            return $this->render('ChillTaskBundle:SingleTask:showCourseTask.html.twig', array(
+                'task'      => $task,
+                'timeline'  => $timeline
+            ));
+        }
+
     }
 
 
@@ -457,10 +475,18 @@ class SingleTaskController extends AbstractController
      */
     protected function setCreateForm(SingleTask $task, Role $role)
     {
-        $form = $this->createForm(SingleTaskType::class, $task, [
-            'center' => $task->getCenter(),
-            'role'   => $role
-        ]);
+        if($this->getEntityContext() === 'person'){
+            $form = $this->createForm(SingleTaskType::class, $task, [
+                'center' => $task->getCenter(),
+                'role'   => $role,
+            ]);
+        }
+
+        if($this->getEntityContext() === 'course'){
+            $form = $this->createForm(SingleTaskCourseType::class, $task, [
+                'center' => $task->getCenter(),
+            ]);
+        }
 
         $form->add('submit', SubmitType::class);
 
@@ -517,6 +543,7 @@ class SingleTaskController extends AbstractController
         $viewParams['center'] = null;
         $params['types'] = null;
         $viewParams['accompanyingCourse'] = null;
+        $params['accompanyingCourse'] = null;
 
         
         // Get parameters from url
@@ -658,12 +685,23 @@ class SingleTaskController extends AbstractController
         }
 
         // Form for filtering tasks
-        $form = $formFactory->createNamed(null, SingleTaskListType::class, null, [
-            'person' => $viewParams['person'],
-            'method' => Request::METHOD_GET,
-            'csrf_protection' => false,
-            'add_type' => true
-        ]);
+        if($this->getEntityContext() === 'person'){
+            $form = $formFactory->createNamed(null, SingleTaskListType::class, null, [
+                'person' => $viewParams['person'],
+                'method' => Request::METHOD_GET,
+                'csrf_protection' => false,
+                'add_type' => true
+            ]);
+        }
+
+        if($this->getEntityContext() === 'course'){
+            $form = $formFactory->createNamed(null, SingleTaskListType::class, null, [
+                'accompanyingCourse' => $viewParams['accompanyingCourse'],
+                'method' => Request::METHOD_GET,
+                'csrf_protection' => false,
+                'add_type' => true
+            ]);
+        }
 
         $form->handleRequest($this->request);
     
@@ -728,4 +766,58 @@ class SingleTaskController extends AbstractController
         ;
     }
 
+    /**
+     * @Route(
+     *  "/{_locale}/task/singletask/courselist",
+     *  name="chill_task_singletask_courselist")
+     */
+
+    public function listCourseTasks(
+        AccompanyingPeriodRepository $courseRepository, 
+        SingleTaskRepository $taskRepository,
+        FormFactoryInterface $formFactory,
+        TranslatorInterface $translator
+        ): Response
+    {
+
+        if (!empty($this->request->query->get('course_id', NULL))) {
+            
+            $courseId = $this->request->query->getInt('course_id', 0);
+            $course = $courseRepository->find($courseId);
+
+            if ($course === null) {
+                 throw $this->createNotFoundException("This accompanying course ' $courseId ' does not exist.");
+            }
+
+        }
+
+        $em = $this->getDoctrine()->getManager();
+
+        if($course === NULL) {
+            throw $this->createNotFoundException('Accompanying course not found');
+        }
+
+        $tasks = $taskRepository
+        ->findBy(
+            array('course' => $course)
+        );
+
+        $form = $formFactory->createNamed(null, SingleTaskListType::class, null, [
+                'accompanyingCourse' => $course,
+                'method' => Request::METHOD_GET,
+                'csrf_protection' => false,
+                'add_type' => true
+            ]);
+        
+        return $this->render(
+            'ChillTaskBundle:SingleTask:index.html.twig', 
+            [
+                'tasks' => $tasks,
+                'accompanyingCourse' => $course,
+                'layout' => '@ChillPerson/AccompanyingCourse/layout.html.twig',
+                'form' => $form->createView(),
+                'title' => $translator->trans('Tasks for this accompanying period')
+            ]);
+    }
+
 }

src/Bundle/ChillTaskBundle/Menu/PersonMenuBuilder.php

@@ -89,10 +89,12 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
         //var $person \Chill\PersonBundle\Entity\Person */
         $course = $parameters['accompanyingCourse'];
         
+        //TODO: implement voter again?
+
         // if ($this->authorizationChecker->isGranted(TaskVoter::SHOW, $course)) {
             $menu->addChild(
                 $this->translator->trans('Tasks'), [
-                    'route' => 'chill_task_singletask_list',
+                    'route' => 'chill_task_singletask_courselist',
                     'routeParameters' => 
                         [ 'course_id' => $course->getId() ]
                         ])

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_listCourse.html.twig

@@ -0,0 +1,107 @@
+{% if tasks|length > 0 %}
+	<h3>{{ title|trans }}</h3>
+
+	<table class="table table-bordered border-dark chill-task-list">
+		<tbody>
+			{% for task in tasks %}
+				<tr>
+					<td>
+						<div>
+							<span class="chill-task-list__row__title">{{ task.title }}</span>
+						</div>
+
+						<div>
+							<span class="chill-task-list__row__type">{{ task_workflow_metadata(task, 'definition.name')|trans }}</span>
+						</div>
+
+						<div>
+							{% for place in workflow_marked_places(task) %}
+								<span class="task-status box type-{{ task.type }} place-{{ place }}">{{ place|trans }}</span>
+							{% endfor %}
+							{% if task.assignee is not null %}
+								<div class="chill-task-list__row__assignee">
+									<span class="chill_task-list__row__assignee_by">{{ 'By'|trans }}&nbsp;:</span>
+									{{ task.assignee.username }}</div>
+							{% endif %}
+						</div>
+
+						{% if task.startDate is not null or task.warningDate is not null or task.endDate is not null %}
+							<div class="chill-task-list__row__dates">
+								<ul class="record_actions column">
+									{% if task.startDate is not null %}
+										<li title="{{ 'Start'|trans|escape('html_attr') }}">
+											<i class="fa fa-play"></i>
+											{{ task.startDate|format_date('medium') }}
+										</li>
+									{% endif %}
+									{% if task.warningDate is not null %}
+										<li title="{{ 'Warning'|trans|escape('html_attr') }}">
+											<i class="fa fa-exclamation-triangle"></i>
+											{{ task.warningDate|format_date('medium') }}
+										</li>
+									{% endif %}
+									{% if task.endDate is not null %}
+										<li title="{{ 'End'|trans|escape('html_attr') }}">
+											<i class="fa fa-hourglass-end"></i>
+											{{ task.endDate|format_date('medium') }}
+										</li>
+									{% endif %}
+								</ul>
+							</div>
+						{% endif %}
+
+					</td>
+					<td>
+						<ul
+							class="record_actions">
+							{# {% if workflow_transitions(task)|length > 0 %}
+																					<li>
+																						<div class="btn-group">
+																							<a class="btn btn-task-exchange dropdown-toggle" href="#" role="button" id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
+																								{{'Change task status'|trans}}
+																							</a>
+																							<ul class="dropdown-menu" aria-labelledby="taskExchange">
+																								{% for transition in workflow_transitions(task) %}
+																									<li>
+																										<a class="dropdown-item" href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'list_params': app.request.query.all }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
+																											{{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
+																										</a>
+																									</li>
+																								{% endfor %}
+																							</ul>
+																						</div>
+																					</li>
+																					{% endif %} #}
+
+							<li>
+								<a href="{{ path('chill_task_single_task_show', { 'id': task.id, 'list_params': app.request.query.all }) }}" class="btn btn-show "></a>
+							</li>
+
+							{# {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %} #}
+							<li>
+								<a href="{{ path('chill_task_single_task_edit', { 'id': task.id, 'list_params': app.request.query.all }) }}" class="btn btn-update "></a>
+							</li>
+							{# {% endif %} #}
+
+							{# {% if is_granted('CHILL_TASK_TASK_DELETE', task) %} #}
+							<li>
+								<a href="{{ path('chill_task_single_task_delete', { 'id': task.id, 'list_params': app.request.query.all } ) }}" class="btn btn-delete "></a>
+							</li>
+							{# {% endif %} #}
+						</ul>
+					</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+{% endif %}
+
+<ul class="record_actions">
+	<li>
+		{% if accompanyingCourse is not null %}
+			<a href="{{ path('chill_task_single_task_new', {'course_id': accompanyingCourse.id}) }}" class="btn btn-create">
+				{{ 'Add a new task' | trans }}
+			</a>
+		{% endif %}
+	</li>
+</ul>

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_show.html.twig

@@ -0,0 +1,110 @@
+<div class="task-show">
+
+	<h1>{{ 'Task'|trans }}</h1>
+
+	<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">{{ 'Description'|trans }}</dt>
+		<dd>
+			{% if task.description is empty %}
+				<span class="chill-no-data-statement">{{"No description"|trans}}</span>
+			{% else %}
+				<blockquote class="chill-user-quote">
+					{{ task.description|chill_markdown_to_html }}
+				</blockquote>
+			{% endif %}
+		</dd>
+
+		<dt class="inline">{{ 'Assignee'|trans }}</dt>
+		<dd>
+			{% if task.assignee is null %}
+				<span class="chill-no-data-statement">{{"No one assignee"|trans}}</span>
+			{% else %}
+				{{ task.assignee }}
+			{% endif %}
+		</dd>
+
+		<dt class="inline">{{ 'Scope'|trans }}</dt>
+		<dd>
+			<span class="scope">{{ task.scope.name|localize_translatable_string }}</span>
+		</dd>
+
+		<h3>{{"Dates"|trans}}</h3>
+		{% if task.startDate is null and task.endDate is null and task.warningDate is null %}
+			<dt></dt>
+			<dd>
+				<span class="chill-no-data-statement">{{"No dates specified"|trans}}</span>
+			</dd>
+		</dt>
+	{% else %}
+		{% if task.startDate is not null %}
+			<dt class="inline">{{ 'Start'|trans }}</dt>
+			<dd>{{ task.startDate|format_date('long') }}</dd>
+		{% endif %}
+
+		{% if task.endDate is not null %}
+			<dt class="inline">{{ 'End'|trans }}</dt>
+			<dd>{{ task.endDate|format_date('long') }}</dd>
+		{% endif %}
+
+		{% if task.warningDate is not null %}
+			<dt class="inline">{{ 'Warning'|trans }}</dt>
+			<dd>{{ task.warningDate|format_date('long') }}</dd>
+		{% endif %}
+
+	{% endif %}
+</dl>
+
+{% if timeline is not null %}
+	<h3>{{"Timeline"|trans}}</h3>
+	{{ timeline|raw }}
+{% endif %}
+
+<ul class="record_actions sticky-form-buttons">
+	<li class="cancel">
+		<a class="btn btn-cancel" href="{%- if app.request.query.has('returnPath') -%} {{ app.request.query.get('returnPath')|escape('html_attr') }} {%- else -%} {{ path('chill_task_singletask_list', app.request.query.get('list_params', {}) ) }} {%- endif -%}">
+			{{ app.request.query.get('returnLabel')|default('Back to the list'|trans) }}
+		</a>
+	</li>
+
+	{% if workflow_transitions(task)|length > 0 %}
+		<li>
+			<div class="btn-group">
+				<a class="btn btn-task-exchange dropdown-toggle" href="#" role="button" id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
+					{{'Change task status'|trans}}
+				</a>
+				<ul class="dropdown-menu" aria-labelledby="taskExchange">
+					{% for transition in workflow_transitions(task) %}
+						<li>
+							<a class="dropdown-item" href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'return_path': app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
+								{{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
+							</a>
+						</li>
+					{% endfor %}
+				</ul>
+			</div>
+		</li>
+	{% endif %}
+
+	{% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
+		<li>
+			<a class="btn btn-update" href="{{ path('chill_task_single_task_edit', { 'id': task.id }) }}">
+				{{ 'Edit the task'|trans }}
+			</a>
+		</li>
+	{% endif %}
+
+	{% if is_granted('CHILL_TASK_TASK_CREATE', task) %}
+		<li>
+			<a href="{{ path('chill_task_single_task_delete', { 'id': task.id } ) }}" class="btn btn-delete">
+				{{ 'Delete'|trans }}
+			</a>
+		</li>
+	{% endif %}
+</ul></div>

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig

@@ -37,7 +37,7 @@
 	{% else %}
 		{% block content %}
 			<div class="col-md-10 col-xxl tasks">
-				{% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
+				{% include 'ChillTaskBundle:SingleTask:_listCourse.html.twig' %}
 			</div>
 		{% endblock %}
 	{% endif %}

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig

@@ -16,124 +16,17 @@
 #}
 {% extends "@ChillPerson/Person/layout.html.twig"  %}
 
+
 {% set activeRouteKey = 'chill_task_single_task_show' %}
 {% set person = task.person %}
 
-{% block title %}{{ 'Task'|trans }}{% endblock %}
+{% block title %}
+	{{ 'Task'|trans }}
+{% endblock %}
 
 
 {% block personcontent %}
-<div class="task-show">
-            
-            <h1>{{ 'Task'|trans }}</h1>
-            
-            <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">{{ 'Description'|trans }}</dt>
-                <dd>
-                    {% if task.description is empty %}
-                    <span class="chill-no-data-statement">{{"No description"|trans}}</span>
-                    {% else %}
-                    <blockquote class="chill-user-quote">
-                        {{ task.description|chill_markdown_to_html }}
-                    </blockquote>
-                    {% endif %}
-                </dd>
-                
-                <dt class="inline">{{ 'Assignee'|trans }}</dt>
-                <dd>
-                    {% if task.assignee is null %}
-                    <span class="chill-no-data-statement">{{"No one assignee"|trans}}</span>
-                    {% else %}
-                    {{ task.assignee }}
-                    {% endif %}
-                </dd>
-                
-                <dt class="inline">{{ 'Scope'|trans }}</dt>
-                <dd><span class="scope">{{ task.scope.name|localize_translatable_string }}</span></dd>
-                
-                <h3>{{"Dates"|trans}}</h3>
-                {% if task.startDate is null and task.endDate is null and task.warningDate is null %}
-                <dt>
-                    <dd><span class="chill-no-data-statement">{{"No dates specified"|trans}}</span></dd>
-                </dt>
-                {% else %}
-                {% if task.startDate is not null %}
-                <dt class="inline">{{ 'Start'|trans }}</dt>
-                <dd>{{ task.startDate|format_date('long') }}</dd>
-                {% endif %}
-                
-                {% if task.endDate is not null %}
-                <dt class="inline">{{ 'End'|trans }}</dt>
-                <dd>{{ task.endDate|format_date('long') }}</dd>
-                {% endif %}
-                
-                {% if task.warningDate is not null %}
-                <dt class="inline">{{ 'Warning'|trans }}</dt>
-                <dd>{{ task.warningDate|format_date('long') }}</dd>
-                {% endif %}
-                
-                {% endif %}
-            </dl>
-            
-            {% if timeline is not null %}
-                <h3>{{"Timeline"|trans}}</h3>
-                {{ timeline|raw }}
-            {% endif %}
-            
-            <ul class="record_actions sticky-form-buttons">
-                <li class="cancel">
-                    <a class="btn btn-cancel" href="{%- if app.request.query.has('returnPath') -%}
-                        {{ app.request.query.get('returnPath')|escape('html_attr') }}
-                        {%- else -%}
-                        {{ path('chill_task_singletask_list', app.request.query.get('list_params', {}) ) }}
-                        {%- endif -%}">
-                        {{ app.request.query.get('returnLabel')|default('Back to the list'|trans) }}
-                    </a>
-                </li>
-                
-                {% if workflow_transitions(task)|length > 0 %}
-                <li>
-                    <div class="btn-group">
-                        <a class="btn btn-task-exchange dropdown-toggle" href="#" role="button" 
-                            id="taskExchange" data-bs-toggle="dropdown" aria-expanded="false">
-                            {{'Change task status'|trans}}
-                        </a>
-                        <ul class="dropdown-menu" aria-labelledby="taskExchange">
-                            {% for transition in workflow_transitions(task) %}
-                            <li>
-                                <a class="dropdown-item"
-                                    href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name, 'kind': 'single-task', 'return_path':  app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">
-                                    {{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}
-                                </a>
-                            </li>
-                            {% endfor %}
-                        </ul>
-                    </div>
-                </li>
-                {% endif %}
-                
-                {% if is_granted('CHILL_TASK_TASK_UPDATE', task) %}
-                <li>
-                    <a class="btn btn-update" href="{{ path('chill_task_single_task_edit', { 'id': task.id }) }}">
-                        {{ 'Edit the task'|trans }}
-                    </a>
-                </li>
-                {% endif %}
-                
-                {% if is_granted('CHILL_TASK_TASK_CREATE', task) %}
-                <li>
-                    <a href="{{ path('chill_task_single_task_delete', { 'id': task.id } ) }}" class="btn btn-delete">
-                        {{ 'Delete'|trans }}
-                    </a>
-                </li>
-                {% endif %}
-            </ul>
-            
-</div>
+
+	{% include 'ChillTaskBundle:SingleTask:_show.html.twig' %}
 
 {% endblock %}

src/Bundle/ChillTaskBundle/Resources/views/SingleTask/showCourseTask.html.twig

@@ -0,0 +1,16 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+
+{% set activeRouteKey = 'chill_task_single_task_show' %}
+{% set accompanyingCourse = task.course %}
+
+{% block title %}
+	{{ 'Task'|trans }}
+{% endblock %}
+
+
+{% block content %}
+
+	{% include 'ChillTaskBundle:SingleTask:_show.html.twig' %}
+
+{% endblock %}

src/Bundle/ChillTaskBundle/translations/messages.fr.yml

@@ -1,53 +1,54 @@
-Tasks: 'Tâches'
-'New task': 'Nouvelle tâche'
-'Add a new task': 'Ajouter une nouvelle tâche'
+Tasks: "Tâches"
+"New task": "Nouvelle tâche"
+"Add a new task": "Ajouter une nouvelle tâche"
 Title: Titre
 Description: Description
-Assignee: 'Personne assignée'
+Assignee: "Personne assignée"
 Scope: Cercle
-'Start date': 'Date de début'
-'End date': "Date d'échéance"
-'Warning date': "Date d'avertissement"
-'Warning interval': "Délai d'avertissement avant la date d'échéance"
-'Unknown dates': 'Dates non spécifiées'
-'N': ''
-'Unit': ''
+"Start date": "Date de début"
+"End date": "Date d'échéance"
+"Warning date": "Date d'avertissement"
+"Warning interval": "Délai d'avertissement avant la date d'échéance"
+"Unknown dates": "Dates non spécifiées"
+"N": ""
+"Unit": ""
 Task: Tâche
 Details: Détails
 Person: Personne
 Date: Date
 Dates: Dates
 User: Utilisateur
-'Task list': 'Liste des tâches'
-'Tasks with expired deadline': "Tâches avec une date d'échéance dépassée"
-'Tasks with warning deadline reached': "Tâches avec une date d'avertissement atteinte"
-'Current tasks': 'Tâches en cours'
-'Closed tasks': Tâches terminées
-'Tasks not started': 'Tâches non commencées'
-'Task start date': 'Date de début'
-'Task warning date': "Date d'avertissement"
-'Task end date': "Date d'échéance"
-'Start': 'Début'
-'Warning': 'Avertissement'
-'End': 'Échéance'
-'Task type': 'Type'
-'Task status': 'Statut'
-'Edit the task': 'Modifier la tâche'
-'Edit task': 'Modifier la tâche'
-'Save task': 'Enregistrer la tâche'
-'View the task': 'Voir la tâche'
-'Update the task': 'Mettre à jour la tâche'
-'Remove task': 'Supprimer la tâche'
-'Delete': 'Supprimer'
-'Change task status': 'Changer le statut'
+"Task list": "Liste des tâches"
+"Tasks with expired deadline": "Tâches avec une date d'échéance dépassée"
+"Tasks with warning deadline reached": "Tâches avec une date d'avertissement atteinte"
+"Current tasks": "Tâches en cours"
+"Closed tasks": Tâches terminées
+"Tasks not started": "Tâches non commencées"
+"Task start date": "Date de début"
+"Task warning date": "Date d'avertissement"
+"Task end date": "Date d'échéance"
+"Start": "Début"
+"Warning": "Avertissement"
+"End": "Échéance"
+"Task type": "Type"
+"Task status": "Statut"
+"Edit the task": "Modifier la tâche"
+"Edit task": "Modifier la tâche"
+"Save task": "Enregistrer la tâche"
+"View the task": "Voir la tâche"
+"Update the task": "Mettre à jour la tâche"
+"Remove task": "Supprimer la tâche"
+"Delete": "Supprimer"
+"Change task status": "Changer le statut"
 'Are you sure you want to remove the task about "%name%" ?': 'Êtes-vous sûr·e de vouloir supprimer la tâche de "%name%"?'
-'See more': 'Voir plus'
-'Associated tasks': 'Tâches associées'
-'My tasks': 'Mes tâches'
-'No description': 'Pas de description'
-'No dates specified': 'Dates non spécifiées'
-'No one assignee': 'Aucune personne assignée'
-'Task types': Types de tâches
+"See more": "Voir plus"
+"Associated tasks": "Tâches associées"
+"My tasks": "Mes tâches"
+"Tasks for this accompanying period": "Tâches pour ce parcours d'accompagnement"
+"No description": "Pas de description"
+"No dates specified": "Dates non spécifiées"
+"No one assignee": "Aucune personne assignée"
+"Task types": Types de tâches
 Days: Jour(s)
 Weeks: Semaine(s)
 Months: Mois
@@ -63,36 +64,36 @@ For person: Pour
 By: Par
 
 # transitions - default task definition
-'new': 'nouvelle'
-'in_progress': 'en cours'
-'closed': 'fermée'
-'canceled': 'supprimée'
+"new": "nouvelle"
+"in_progress": "en cours"
+"closed": "fermée"
+"canceled": "supprimée"
 start: démarrer
 close: clotûrer
 cancel: annuler
 Start_verb: Démarrer
 Close_verb: Clotûrer
 Set this task to cancel state: Marquer cette tâche comme annulée
-'%user% has closed the task': '%user% a fermé la tâche'
-'%user% has canceled the task': '%user% a annulé la tâche'
-'%user% has started the task': '%user% a commencé la tâche'
-'%user% has created the task': '%user% a introduit la tâche'
+"%user% has closed the task": "%user% a fermé la tâche"
+"%user% has canceled the task": "%user% a annulé la tâche"
+"%user% has started the task": "%user% a commencé la tâche"
+"%user% has created the task": "%user% a introduit la tâche"
 Are you sure you want to close this task ?: Êtes-vous sûrs de vouloir clotûrer cette tâche ?
 Are you sure you want to cancel this task ?: Êtes-vous sûrs de vouloir annuler cette tâche ?
 Are you sure you want to start this task ?: Êtes-vous sûrs de vouloir démarrer cette tâche ?
 
 #Flash messages
-'The task is created': 'La tâche a été créée'
-'There is no tasks.': Aucune tâche.
-'The task has been successfully removed.': 'La tâche a bien été supprimée'
-'This form contains errors': 'Ce formulaire contient des erreurs'
-'The task has been updated': 'La tâche a été mise à jour'
-'The transition is successfully applied': 'La transition a bien été effectuée'
-'The transition could not be applied': "La transition n'a pas pu être appliquée"
+"The task is created": "La tâche a été créée"
+"There is no tasks.": Aucune tâche.
+"The task has been successfully removed.": "La tâche a bien été supprimée"
+"This form contains errors": "Ce formulaire contient des erreurs"
+"The task has been updated": "La tâche a été mise à jour"
+"The transition is successfully applied": "La transition a bien été effectuée"
+"The transition could not be applied": "La transition n'a pas pu être appliquée"
 
 #widget
-'%number% tasks over deadline': '{0} Aucune tâche dépassée|{1} Une tâche dépassée | ]1,Inf[ %count% tâches dépassées'
-'%number% tasks near deadline': '{0} Aucune tâche en rappel|{1} Une tâche en rappel | ]1,Inf[ %count% tâches en rappel'
+"%number% tasks over deadline": "{0} Aucune tâche dépassée|{1} Une tâche dépassée | ]1,Inf[ %count% tâches dépassées"
+"%number% tasks near deadline": "{0} Aucune tâche en rappel|{1} Une tâche en rappel | ]1,Inf[ %count% tâches en rappel"
 
 #title
 My tasks near deadline: Mes tâches à échéance proche
@@ -107,4 +108,4 @@ All centers: Tous les centres
 CHILL_TASK_TASK_CREATE: Ajouter une tâche
 CHILL_TASK_TASK_DELETE: Supprimer une tâche
 CHILL_TASK_TASK_SHOW: Voir une tâche
-CHILL_TASK_TASK_UPDATE: Modifier une tâche
+CHILL_TASK_TASK_UPDATE: Modifier une tâche