Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Procuration] slots administration #10517

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Procuration] slots administration #10517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f9ee12
[Procuration] slots administration
Remg Jul 12, 2024
2fd7f7c
Use Doctrine query builder type
Remg Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/packages/security.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,8 @@ security:
ROLE_ADMIN_TERRITOIRES_PROCURATION_V2_MANAGERS:
- ROLE_APP_ADMIN_PROCURATION_V2_REQUEST_ALL
- ROLE_APP_ADMIN_PROCURATION_V2_PROXY_ALL
- ROLE_APP_ADMIN_PROCURATION_V2_REQUEST_SLOT_ALL
- ROLE_APP_ADMIN_PROCURATION_V2_PROXY_SLOT_ALL
- ROLE_APP_ADMIN_PROCURATION_V2_PROCURATION_REQUEST_ALL

## Application Mobile
Expand Down
16 changes: 16 additions & 0 deletions config/services/admin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,22 @@
<argument />
</service>

<service id="app.admin.procuration_v2.request_slot" class="App\Admin\Procuration\RequestSlotAdmin">
<tag name="sonata.admin" manager-type="orm" label="Procurations » Slots Mandants" group="Élections" />

<argument />
<argument>App\Entity\ProcurationV2\RequestSlot</argument>
<argument />
</service>

<service id="app.admin.procuration_v2.proxy_slot" class="App\Admin\Procuration\ProxySlotAdmin">
<tag name="sonata.admin" manager-type="orm" label="Procurations » Slots Mandataires" group="Élections" />

<argument />
<argument>App\Entity\ProcurationV2\ProxySlot</argument>
<argument />
</service>

<service id="app.admin.vote_place_admin" class="App\Admin\VotePlaceAdmin">
<tag name="sonata.admin" manager-type="orm" label="Assesseur(e)s » Bureaux de vote" group="Élections" />

Expand Down
137 changes: 137 additions & 0 deletions src/Admin/Procuration/ProxySlotAdmin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?php

namespace App\Admin\Procuration;

use App\Query\Utils\MultiColumnsSearchHelper;
use Sonata\AdminBundle\Admin\AbstractAdmin;
use Sonata\AdminBundle\Datagrid\DatagridMapper;
use Sonata\AdminBundle\Datagrid\ListMapper;
use Sonata\AdminBundle\Filter\Model\FilterData;
use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Form\Type\ModelAutocompleteType;
use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery;
use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQueryInterface;
use Sonata\DoctrineORMAdminBundle\Filter\BooleanFilter;
use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter;
use Symfony\Component\Form\Extension\Core\Type\TextType;

class ProxySlotAdmin extends AbstractAdmin
{
protected function configureRoutes(RouteCollectionInterface $collection): void
{
$collection->clearExcept(['list', 'edit']);
}

protected function configureFormFields(FormMapper $form): void
{
$form
->with('Matching')
->add('requestSlot', ModelAutocompleteType::class, [
'label' => 'Mandant',
'required' => false,
'multiple' => false,
'minimum_input_length' => 1,
'items_per_page' => 20,
'property' => [],
'callback' => static function (
AbstractAdmin $admin,
array $properties,
string $value
): void {
/** @var ProxyQueryInterface $qb */
$qb = $admin->getDatagrid()->getQuery();
$alias = $qb->getRootAliases()[0];

$qb->join("$alias.request", 'request');

MultiColumnsSearchHelper::updateQueryBuilderForMultiColumnsSearch(
$qb->getQueryBuilder(),
$value,
[
['request.firstNames', 'request.lastName'],
['request.lastName', 'request.firstNames'],
['request.email', 'request.email'],
],
[
'request.phone',
],
[
'request.id',
'request.uuid',
]
);
},
'btn_add' => false,
])
->end()
;
}

protected function configureDatagridFilters(DatagridMapper $filter): void
{
$filter
->add('search', CallbackFilter::class, [
'label' => 'Recherche',
'show_filter' => true,
'field_type' => TextType::class,
'callback' => function (ProxyQuery $qb, string $alias, string $field, FilterData $value) {
if (!$value->hasValue()) {
return false;
}

MultiColumnsSearchHelper::updateQueryBuilderForMultiColumnsSearch(
$qb->getQueryBuilder(),
$value->getValue(),
[
["$alias.firstNames", "$alias.lastName"],
["$alias.lastName", "$alias.firstNames"],
["$alias.email", "$alias.email"],
],
[
"$alias.phone",
],
[
"$alias.id",
"$alias.uuid",
]
);

return true;
},
])
->add('round', null, [
'label' => 'Tour',
'show_filter' => true,
])
->add('manual', BooleanFilter::class, [
'label' => 'Traitement manuel',
'show_filter' => true,
])
;
}

protected function configureListFields(ListMapper $list): void
{
$list
->addIdentifier('id', null, [
'label' => 'ID',
])
->add('proxy', null, [
'label' => 'Mandataire',
])
->add('round', null, [
'label' => 'Tour',
])
->add('createdAt', null, [
'label' => 'Créé le',
])
->add(ListMapper::NAME_ACTIONS, null, [
'virtual_field' => true,
'actions' => [
'edit' => [],
],
])
;
}
}
137 changes: 137 additions & 0 deletions src/Admin/Procuration/RequestSlotAdmin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?php

namespace App\Admin\Procuration;

use App\Query\Utils\MultiColumnsSearchHelper;
use Sonata\AdminBundle\Admin\AbstractAdmin;
use Sonata\AdminBundle\Datagrid\DatagridMapper;
use Sonata\AdminBundle\Datagrid\ListMapper;
use Sonata\AdminBundle\Filter\Model\FilterData;
use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Form\Type\ModelAutocompleteType;
use Sonata\AdminBundle\Route\RouteCollectionInterface;
use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQuery;
use Sonata\DoctrineORMAdminBundle\Datagrid\ProxyQueryInterface;
use Sonata\DoctrineORMAdminBundle\Filter\BooleanFilter;
use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter;
use Symfony\Component\Form\Extension\Core\Type\TextType;

class RequestSlotAdmin extends AbstractAdmin
{
protected function configureRoutes(RouteCollectionInterface $collection): void
{
$collection->clearExcept(['list', 'edit']);
}

protected function configureFormFields(FormMapper $form): void
{
$form
->with('Matching')
->add('proxySlot', ModelAutocompleteType::class, [
'label' => 'Mandataire',
'required' => false,
'multiple' => false,
'minimum_input_length' => 1,
'items_per_page' => 20,
'property' => [],
'callback' => static function (
AbstractAdmin $admin,
array $properties,
string $value
): void {
/** @var ProxyQueryInterface $qb */
$qb = $admin->getDatagrid()->getQuery();
$alias = $qb->getRootAliases()[0];

$qb->join("$alias.proxy", 'proxy');

MultiColumnsSearchHelper::updateQueryBuilderForMultiColumnsSearch(
$qb->getQueryBuilder(),
$value,
[
['proxy.firstNames', 'proxy.lastName'],
['proxy.lastName', 'proxy.firstNames'],
['proxy.email', 'proxy.email'],
],
[
'proxy.phone',
],
[
'proxy.id',
'proxy.uuid',
]
);
},
'btn_add' => false,
])
->end()
;
}

protected function configureDatagridFilters(DatagridMapper $filter): void
{
$filter
->add('search', CallbackFilter::class, [
'label' => 'Recherche',
'show_filter' => true,
'field_type' => TextType::class,
'callback' => function (ProxyQuery $qb, string $alias, string $field, FilterData $value) {
if (!$value->hasValue()) {
return false;
}

MultiColumnsSearchHelper::updateQueryBuilderForMultiColumnsSearch(
$qb->getQueryBuilder(),
$value->getValue(),
[
["$alias.firstNames", "$alias.lastName"],
["$alias.lastName", "$alias.firstNames"],
["$alias.email", "$alias.email"],
],
[
"$alias.phone",
],
[
"$alias.id",
"$alias.uuid",
]
);

return true;
},
])
->add('round', null, [
'label' => 'Tour',
'show_filter' => true,
])
->add('manual', BooleanFilter::class, [
'label' => 'Traitement manuel',
'show_filter' => true,
])
;
}

protected function configureListFields(ListMapper $list): void
{
$list
->addIdentifier('id', null, [
'label' => 'ID',
])
->add('request', null, [
'label' => 'Mandant',
])
->add('round', null, [
'label' => 'Tour',
])
->add('createdAt', null, [
'label' => 'Créé le',
])
->add(ListMapper::NAME_ACTIONS, null, [
'virtual_field' => true,
'actions' => [
'edit' => [],
],
])
;
}
}
22 changes: 22 additions & 0 deletions src/Entity/ProcurationV2/ProxySlot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,28 @@ public function __construct(Round $round, Proxy $proxy, ?UuidInterface $uuid = n
$this->actions = new ArrayCollection();
}

public function __toString(): string
{
return sprintf(
'%s [%s]',
$this->proxy,
$this->round
);
}

public function setRequestSlot(?RequestSlot $requestSlot): void
{
if ($this->requestSlot && $requestSlot !== $this->requestSlot) {
$this->requestSlot->proxySlot = null;
}

if ($requestSlot) {
$requestSlot->proxySlot = $this;
}

$this->requestSlot = $requestSlot;
}

#[Groups(['procuration_matched_proxy', 'procuration_proxy_list', 'procuration_proxy_slot_read'])]
public function getRequest(): ?Request
{
Expand Down
9 changes: 9 additions & 0 deletions src/Entity/ProcurationV2/RequestSlot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,15 @@ public function __construct(Round $round, Request $request, ?UuidInterface $uuid
$this->actions = new ArrayCollection();
}

public function __toString(): string
{
return sprintf(
'%s [%s]',
$this->request,
$this->round
);
}

#[Groups(['procuration_request_read', 'procuration_request_list', 'procuration_request_slot_read'])]
public function getProxy(): ?Proxy
{
Expand Down
Loading