From cc258ba1648371897acb7a2eb081617afc18d07e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 30 Sep 2021 14:22:55 +0200
Subject: [PATCH] templates added for transition of course task and
 taskcontroller adapted to show correct template

---
 .../Controller/TaskController.php             |  2 +-
 .../views/SingleTask/_transition.html.twig    | 23 ++++++++++++++++++
 .../views/SingleTask/transition.html.twig     | 24 +------------------
 .../SingleTask/transitionCourseTask.html.twig | 12 ++++++++++
 4 files changed, 37 insertions(+), 24 deletions(-)
 create mode 100644 src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_transition.html.twig
 create mode 100644 src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transitionCourseTask.html.twig

diff --git a/src/Bundle/ChillTaskBundle/Controller/TaskController.php b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
index 0c2b1f8d2..23f4ba51f 100644
--- a/src/Bundle/ChillTaskBundle/Controller/TaskController.php
+++ b/src/Bundle/ChillTaskBundle/Controller/TaskController.php
@@ -64,7 +64,7 @@ class TaskController extends AbstractController
                         'id' => $task->getId(),
                         'list_params' => $request->query->get('list_params', [])
                     ]);
-                $defaultTemplate = '@ChillTask/SingleTask/transition.html.twig';
+                $task->getCourse() === null ? $defaultTemplate = '@ChillTask/SingleTask/transition.html.twig' : $defaultTemplate = '@ChillTask/SingleTask/transitionCourseTask.html.twig';
                 break;
             default:
                 return new Response("The type '$kind' is not implemented",
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_transition.html.twig
new file mode 100644
index 000000000..8f6345352
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/_transition.html.twig
@@ -0,0 +1,23 @@
+<h2>{{ 'Apply transition on task <em>%title%</em>'|trans({ '%title%': task.title } )|raw }}</h2>
+
+
+{% if task_workflow_metadata(task, 'transition.sentence_confirmation', transition) is not empty %}
+	<p class="message-confirm">{{ task_workflow_metadata(task, 'transition.sentence_confirmation', transition)|trans }}</p>
+{% else %}
+	<p>{{ 'Are you sure to apply the transition %name% on this task ?'|trans({ '%name%': task_workflow_metadata(task, 'transition.name', transition)|default(transition.name)|trans }) }}</p>
+{% endif %}
+
+{{ form_start(form) }}
+
+<ul class="record_actions">
+	<li class="cancel">
+		<a href="{{ path('chill_task_singletask_list', app.request.query.get('list_params', { }) ) }}" class="btn btn-cancel">
+			{{ 'Back to the list'|trans }}
+		</a>
+	</li>
+	<li>
+		{{ form_widget(form.submit, { 'attr' : { 'class' : "btn btn-task-exchange green" }, 'label': task_workflow_metadata(task, 'transition.apply_transition_submit_label', transition)|default('apply')|trans } ) }}
+	</li>
+</ul>
+
+{{ form_end(form) }}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
index 617816e4c..05009a2f0 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transition.html.twig
@@ -7,28 +7,6 @@
 
 {% block personcontent %}
 
-<h2>{{ 'Apply transition on task <em>%title%</em>'|trans({ '%title%': task.title } )|raw }}</h2>
-
-
-{% if task_workflow_metadata(task, 'transition.sentence_confirmation', transition) is not empty %}
-    <p class="message-confirm">{{ task_workflow_metadata(task, 'transition.sentence_confirmation', transition)|trans }}</p>
-{% else %}
-    <p>{{ 'Are you sure to apply the transition %name% on this task ?'|trans({ '%name%': task_workflow_metadata(task, 'transition.name', transition)|default(transition.name)|trans }) }}</p>
-{% endif %}
-
-{{ form_start(form) }}
-
-<ul class="record_actions">
-    <li class="cancel">
-        <a href="{{ path('chill_task_singletask_list', app.request.query.get('list_params', { }) ) }}" class="btn btn-cancel">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        {{ form_widget(form.submit, { 'attr' : { 'class' : "btn btn-task-exchange green" }, 'label': task_workflow_metadata(task, 'transition.apply_transition_submit_label', transition)|default('apply')|trans } ) }}
-    </li>
-</ul>
-        
-{{ form_end(form) }}
+{% include '@ChillTask/SingleTask/_transition.html.twig' %}
 
 {% endblock %}
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transitionCourseTask.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transitionCourseTask.html.twig
new file mode 100644
index 000000000..08bedd31c
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/transitionCourseTask.html.twig
@@ -0,0 +1,12 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_task_task_list' %}
+{% set accompanyingCourse = task.course %}
+
+{% block title  'Remove task'|trans %}
+
+{% block content %}
+
+	{% include '@ChillTask/SingleTask/_transition.html.twig' %}
+
+{% endblock %}