Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

notation modifications

Browse Source
This commit is contained in:
Julie Lenaerts 2021-09-28 11:53:19 +02:00
parent 41fc41b1da
commit 8411c909ff
8 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
View File

@ -2,6 +2,7 @@
namespace Chill\TaskBundle\Controller;
use Chill\MainBundle\Entity\Scope;
use Chill\PersonBundle\Privacy\PrivacyEvent;
use Psr\Log\LoggerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@ -281,12 +282,12 @@ class SingleTaskController extends AbstractController
if($task->getContext() instanceof Person){
return $this->render('ChillTaskBundle:SingleTask:show.html.twig', array(
return $this->render('@ChillTask/SingleTask/show.html.twig', array(
'task' => $task,
'timeline' => $timeline
));
} else {
return $this->render('ChillTaskBundle:SingleTask:showCourseTask.html.twig', array(
return $this->render('@ChillTask/SingleTask/showCourseTask.html.twig', array(
'task' => $task,
'timeline' => $timeline
));
@ -401,12 +402,12 @@ class SingleTaskController extends AbstractController
));
$this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
return $this->render('ChillTaskBundle:SingleTask:edit.html.twig', array(
return $this->render('@ChillTask/SingleTask/edit.html.twig', array(
'task' => $task,
'form' => $form->createView()
));
} else {
return $this->render('ChillTaskBundle:SingleTask:editCourseTask.html.twig', array(
return $this->render('@ChillTask/SingleTask/editCourseTask.html.twig', array(
'task' => $task,
'form' => $form->createView(),
'accompanyingCourse' => $course
@ -510,12 +511,12 @@ class SingleTaskController extends AbstractController
}
if($task->getContext() instanceof Person){
return $this->render('ChillTaskBundle:SingleTask:confirm_delete.html.twig', array(
return $this->render('@ChillTask/SingleTask/confirm_delete.html.twig', array(
'task' => $task,
'delete_form' => $form->createView()
));
} else {
return $this->render('ChillTaskBundle:SingleTask:confirm_deleteCourseTask.html.twig', array(
return $this->render('@ChillTask/SingleTask/confirm_deleteCourseTask.html.twig', array(
'task' => $task,
'delete_form' => $form->createView(),
'accompanyingCourse' => $course
@ -646,7 +647,7 @@ class SingleTaskController extends AbstractController
$userId = $this->request->query->getInt('user_id', 0);
$user = $this->getDoctrine()->getManager()
->getRepository('ChillMainBundle:User')
->getRepository(User::class)
->find($userId);
if ($user === null) {
@ -663,7 +664,7 @@ class SingleTaskController extends AbstractController
$scopeId = $this->request->query->getInt('scope_id', 0);
$scope = $this->getDoctrine()->getManager()
->getRepository('ChillMainBundle:Scope')
->getRepository(Scope::class)
->find($scopeId);
if ($scope === null) {
@ -762,7 +763,7 @@ class SingleTaskController extends AbstractController
$this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
}
return $this->render('ChillTaskBundle:SingleTask:index.html.twig',
return $this->render('@ChillTask/SingleTask/index.html.twig',
array_merge($viewParams, [ 'form' => $form->createView() ]));
}
@ -859,7 +860,7 @@ class SingleTaskController extends AbstractController
]);
return $this->render(
'ChillTaskBundle:SingleTask:index.html.twig',
'@ChillTask/SingleTask/index.html.twig',
[
'tasks' => $tasks,
'accompanyingCourse' => $course,

3
src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig
View File

@ -25,6 +25,7 @@
{% block personcontent %}
{% include 'ChillTaskBundle:SingleTask:_edit.html.twig' %}
{% include '@ChillTask/SingleTask/_edit.html.twig' %}
{% endblock %}

3
src/Bundle/ChillTaskBundle/Resources/views/SingleTask/editCourseTask.html.twig
View File

@ -9,6 +9,7 @@
{% block content %}
{% include 'ChillTaskBundle:SingleTask:_edit.html.twig' %}
{% include '@ChillTask/SingleTask/_edit.html.twig' %}
{% endblock %}

6
src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
View File

@ -31,13 +31,15 @@
{% if person is not null %}
{% block personcontent %}
<div class="tasks">
{% include 'ChillTaskBundle:SingleTask:_list.html.twig' %}
{% include '@ChillTask/SingleTask/_list.html.twig' %}
</div>
{% endblock %}
{% else %}
{% block content %}
<div class="col-md-10 col-xxl tasks">
{% include 'ChillTaskBundle:SingleTask:_listCourse.html.twig' %}
{% include '@ChillTask/SingleTask/_listCourse.html.twig' %}
</div>
{% endblock %}
{% endif %}

3
src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig
View File

@ -25,5 +25,6 @@
{% block personcontent %}
{% include 'ChillTaskBundle:SingleTask:_new.html.twig' %}
{% include '@ChillTask/SingleTask/_new.html.twig' %}
{% endblock %}

3
src/Bundle/ChillTaskBundle/Resources/views/SingleTask/newCourseTask.html.twig
View File

@ -8,5 +8,6 @@
{% endblock %}
{% block content %}
{% include 'ChillTaskBundle:SingleTask:_new.html.twig' %}
{% include '@ChillTask/SingleTask/_new.html.twig' %}
{% endblock %}

3
src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
View File

@ -27,6 +27,7 @@
{% block personcontent %}
{% include 'ChillTaskBundle:SingleTask:_show.html.twig' %}
{% include '@ChillTask/SingleTask/_show.html.twig' %}
{% endblock %}

3
src/Bundle/ChillTaskBundle/Resources/views/SingleTask/showCourseTask.html.twig
View File

@ -11,6 +11,7 @@
{% block content %}
{% include 'ChillTaskBundle:SingleTask:_show.html.twig' %}
{% include '@ChillTask/SingleTask/_show.html.twig' %}
{% endblock %}