Commit d8a77b5f authored by Mat's avatar Mat

Merge branch 'master' into privacyEvent

parents 32d5d448 fe45ce54
Branch master
=============
- fix bug in filter task form: allow to show the list of users, which was hidden when the user had access to multiple centers;
- add assignee in task list;
- fix some translation;
- add a filtering by center on list;
- add color in boxes for task statuses;
......@@ -26,6 +26,7 @@ use Chill\TaskBundle\Event\TaskEvent;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\Translation\TranslatorInterface;
use Chill\TaskBundle\Event\UI\UIEvent;
use Chill\MainBundle\Repository\CenterRepository;
class SingleTaskController extends Controller
......@@ -382,6 +383,7 @@ class SingleTaskController extends Controller
PaginatorFactory $paginatorFactory,
SingleTaskRepository $taskRepository,
PersonRepository $personRepository,
CenterRepository $centerRepository,
FormFactoryInterface $formFactory
) {
/* @var $viewParams array The parameters for the view */
......@@ -392,7 +394,6 @@ class SingleTaskController extends Controller
$viewParams['user'] = null;
$params['user'] = null;
$viewParams['center'] = null;
$params['center'] = null;
$params['types'] = null;
// Get parameters from url
......@@ -408,6 +409,14 @@ class SingleTaskController extends Controller
$viewParams['person'] = $person;
$params['person'] = $person;
} elseif (!empty($request->query->get('center_id', NULL))) {
$center = $centerRepository->find($request->query->getInt('center_id'));
dump($center);
if ($center === null) {
throw $this->createNotFoundException('center not found');
}
$params['center'] = $center;
}
if(!empty($request->query->get('types', []))) {
......
......@@ -136,6 +136,17 @@ class SingleTaskListType extends AbstractType
'label' => 'Associated person'
])
;
$reachablesCenters = $this->getReachablesCenters();
if (count($reachablesCenters) > 1) {
$builder
->add('center_id', EntityType::class, [
'class' => \Chill\MainBundle\Entity\Center::class,
'choices' => $reachablesCenters,
'label' => 'Center',
'required' => false,
'placeholder' => 'All centers'
]);
}
} else {
// add a hidden field
$builder
......@@ -144,6 +155,7 @@ class SingleTaskListType extends AbstractType
->addModelTransformer(new PersonToIdTransformer($this->em))
;
}
}
protected function getUserChoices($options)
......@@ -237,10 +249,11 @@ class SingleTaskListType extends AbstractType
}
$i = 0;
$circleCenterCond = $qb->expr()->orX();
foreach ($centers as $center) {
$circles = $this->authorizationHelper->getReachableCircles($user, $role, $center);
// add condition about person and circle
$qb->andWhere(
$circleCenterCond->add(
$qb->expr()->andX()
->add($qb->expr()->eq('person.center', ':center_'.$i))
->add($qb->expr()->in('task.circle', ':circles_'.$i))
......@@ -252,9 +265,18 @@ class SingleTaskListType extends AbstractType
// increase counter
$i++;
}
$qb->andWhere($circleCenterCond);
return $qb->getQuery()->getResult();
}
protected function getReachablesCenters()
{
$user = $this->tokenStorage->getToken()->getUser();
$role = new Role(TaskVoter::SHOW);
return $this->authorizationHelper->getReachableCenters($user, $role);
}
public function configureOptions(OptionsResolver $resolver)
{
......
......@@ -8,6 +8,7 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
use Symfony\Component\Security\Core\Role\Role;
use Chill\TaskBundle\Security\Authorization\TaskVoter;
use Doctrine\DBAL\Types\Type;
use Chill\MainBundle\Entity\Center;
/**
* SingleTaskRepository
......@@ -107,6 +108,14 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
if (\array_key_exists('person', $params) and !empty($params['person'])) {
$qb->andWhere($qb->expr()->eq('st.person', ':person'));
$qb->setParameter('person', $params['person']);
} elseif (\array_key_exists('center', $params)) {
if ($params['center'] instanceof Center) {
$qb->join('st.person', 'person');
$qb->andWhere($qb->expr()->eq('person.center', ':center'));
$qb->setParameter('center', $params['center']);
} else {
throw new \UnexpectedValueException("params 'center' should be an instance of ".Center::class);
}
}
if (\array_key_exists('unassigned', $params) and $params['unassigned'] === true) {
......@@ -142,7 +151,7 @@ class SingleTaskRepository extends \Doctrine\ORM\EntityRepository
if (\array_key_exists('is_closed', $params)) {
$qb->andWhere($this->buildIsClosed($qb, !$params['is_closed']));
}
}
protected function addTypeFilter(QueryBuilder $qb, $params)
......
.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);
}
}
}
@import '../../../../main/Resources/public/sass/custom/config/colors';
@import "_task-statuses.scss";
div#single_task_warningInterval {
display: flex;
......
......@@ -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
......@@ -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>
......
......@@ -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 %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment