Fix the button text

Actions with a closing date in the future should be considered as 'still open'.

.changes/unreleased/Fixed-20251218-102405.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the condition to display concerned persons in calendar list items.
+time: 2025-12-18T10:24:05.885090777+01:00
+custom:
+    Issue: "480"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251218-110722.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Fix ordering of social actions: actions with a closing date in the future should be considered as ''still open''.'
+time: 2025-12-18T11:07:22.699897317+01:00
+custom:
+    Issue: "481"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251230-125728.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix export group by center for persons without a center in CenterAggregator.php
+time: 2025-12-30T12:57:28.773521385+01:00
+custom:
+    Issue: "477"
+    SchemaChange: No schema change

.changes/unreleased/UX-20260106-142813.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Improve the ux of the address field in the person creation form
+time: 2026-01-06T14:28:13.033420033+01:00
+custom:
+    Issue: "487"
+    SchemaChange: No schema change

.changes/v4.11.0.md

@@ -0,0 +1,9 @@
+## v4.11.0 - 2025-12-17
+### Feature
+* ([#478](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/478)) Add filtering to admin lists: social actions, social issues, goals, results, and evaluations   
+### Fixed
+* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Fix migration query after previous fix
+   
+* Fix translation key/value
+
+Cannot start with % and should be wrapped in "".   

CHANGELOG.md

@@ -6,6 +6,16 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.11.0 - 2025-12-17
+### Feature
+* ([#478](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/478)) Add filtering to admin lists: social actions, social issues, goals, results, and evaluations   
+### Fixed
+* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Fix migration query after previous fix
+   
+* Fix translation key/value
+
+Cannot start with % and should be wrapped in "".   
+
 ## v4.10.1 - 2025-12-11
 ### Fixed
 * Fix missing translation variable in NewLocation component

src/Bundle/ChillActivityBundle/migrations/Version20251118124241.php

@@ -39,7 +39,7 @@ final class Version20251118124241 extends AbstractMigration
         $this->addSql("COMMENT ON COLUMN activity_user.by_migration IS 'For backup purpose - can be safely deleted after a while. See migration \\Chill\\Migrations\\Activity\\Version20251118124241'");
 
         $this->addSql('INSERT INTO activity_user (activity_id, user_id, by_migration)
-            SELECT id, user_id, true FROM activity
+            SELECT id, user_id, true FROM activity WHERE user_id is not null
             ON CONFLICT DO NOTHING');
     }
 

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig

@@ -75,7 +75,7 @@
     </div>
 
     {% if calendar.comment.comment is not empty
-                    or calendar.users|length > 0
+                    or calendar.persons|length > 0
                     or calendar.thirdParties|length > 0
                     or calendar.users|length > 0 %}
                     <div class="item-row details separator">

src/Bundle/ChillJobBundle/src/Resources/translations/messages.nl.yml

@@ -189,14 +189,14 @@ crud:
         title_edit: Rapport "belemmering" bewerken
         title_delete: Belemmering verwijderen
         button_delete: Verwijderen
-        confirm_message_delete: %as_string% verwijderen?
+        confirm_message_delete: "%as_string% verwijderen?"
     cscv:
         title_new: Nieuw CV voor %person%
         title_view: CV voor %person%
         title_edit: CV bewerken
         title_delete: CV verwijderen
         button_delete: Verwijderen
-        confirm_message_delete: %as_string% verwijderen?
+        confirm_message_delete: "%as_string% verwijderen?"
         no_date: Geen datum aangegeven
         no_end_date: einddatum onbekend
         no_start_date: startdatum onbekend
@@ -206,7 +206,7 @@ crud:
         title_edit: Immersie bewerken
         title_delete: Immersie verwijderen
         button_delete: Verwijderen
-        confirm_message_delete: %as_string% verwijderen?
+        confirm_message_delete: "%as_string% verwijderen?"
     projet_prof:
         title_new: Nieuw professioneel project voor %person%
         title_view: Professioneel project voor %person%

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue

@@ -45,10 +45,10 @@
                             :class="getClassButton"
                             type="button"
                             name="button"
-                            :title="trans(getTextButton)"
+                            :title="getTextButton"
                         >
                             <span v-if="displayTextButton">{{
-                                trans(getTextButton)
+                                getTextButton
                             }}</span>
                         </button>
                     </template>
@@ -73,10 +73,10 @@
                         :class="getClassButton"
                         type="button"
                         name="button"
-                        :title="trans(getTextButton)"
+                        :title="getTextButton"
                     >
                         <span v-if="displayTextButton">{{
-                            trans(getTextButton)
+                            getTextButton
                         }}</span>
                     </button>
                 </template>
@@ -97,11 +97,9 @@
                     :class="getClassButton"
                     type="button"
                     name="button"
-                    :title="trans(getTextButton)"
+                    :title="getTextButton"
                 >
-                    <span v-if="displayTextButton">{{
-                        trans(getTextButton)
-                    }}</span>
+                    <span v-if="displayTextButton">{{ getTextButton }}</span>
                 </button>
             </template>
         </action-buttons>
@@ -177,16 +175,18 @@ export default {
         },
         getTextButton() {
             if (
-                typeof this.options.button.text !== "undefined" &&
-                (this.options.button.text.edit !== null ||
-                    this.options.button.text.create !== null)
+                typeof this.options.button !== "undefined" &&
+                typeof this.options.button.text !== "undefined"
             ) {
-                // console.log('this.options.button.text', this.options.button.text)
-                return this.context.edit
-                    ? ACTIVITY_CREATE_ADDRESS
-                    : ACTIVITY_EDIT_ADDRESS;
+                const customText = this.context.edit
+                    ? this.options.button.text.edit
+                    : this.options.button.text.create;
+
+                if (customText !== null) {
+                    return customText;
+                }
             }
-            console.log("defaultz", this.defaultz);
+
             return this.context.edit
                 ? this.defaultz.button.text.edit
                 : this.defaultz.button.text.create;

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -135,15 +135,13 @@ final class PersonController extends AbstractController
                 $this->lastPostDataReset();
 
                 $address = $form->get('address')->getData();
-                $addressForm = (bool) $form->get('addressForm')->getData();
 
-                if (null !== $address && $addressForm) {
+                if (null !== $address) {
                     $household = new Household();
 
                     $member = new HouseholdMember();
                     $member->setPerson($person);
                     $member->setStartDate(new \DateTimeImmutable());
-
                     $household->addMember($member);
                     $household->setForceAddress($address);
 

src/Bundle/ChillPersonBundle/Controller/SocialWork/EvaluationController.php

@@ -13,14 +13,63 @@ namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
 use Symfony\Component\HttpFoundation\Request;
 
 class EvaluationController extends CRUDController
 {
+    public function __construct(private readonly EvaluationRepository $repository) {}
+
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
         $query->addOrderBy('e.id', 'ASC');
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
+
+    protected function getQueryResult(
+        string $action,
+        Request $request,
+        int $totalItems,
+        PaginatorInterface $paginator,
+        ?FilterOrderHelper $filterOrder = null,
+    ) {
+        if (0 === $totalItems) {
+            return [];
+        }
+
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
+        }
+
+        $queryString = $filterOrder->getQueryString();
+        $activeFilter = $filterOrder->getCheckboxData('activeFilter');
+        $nb = $this->repository->countFilteredEvaluations($queryString, $activeFilter);
+
+        $paginator = $this->getPaginatorFactory()->create($nb);
+
+        return $this->repository->findFilteredEvaluations($queryString, $activeFilter, $paginator->getCurrentPageFirstItemNumber(), $paginator->getItemsPerPage());
+    }
+
+    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    {
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::countEntities($action, $request, $filterOrder);
+        }
+
+        return $this->repository->countFilteredEvaluations(
+            $filterOrder->getQueryString(),
+            $filterOrder->getCheckboxData('activeFilter')
+        );
+    }
+
+    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+    {
+        return $this->getFilterOrderHelperFactory()
+            ->create(self::class)
+            ->addSearchBox(['label'])
+            ->addCheckbox('activeFilter', [true => 'Active', false => 'Inactive'], ['Active'])
+            ->build();
+    }
 }

src/Bundle/ChillPersonBundle/Controller/SocialWork/GoalController.php

@@ -13,14 +13,68 @@ namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
 use Symfony\Component\HttpFoundation\Request;
 
 class GoalController extends CRUDController
 {
+    public function __construct(private readonly GoalRepository $repository) {}
+
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
         $query->addOrderBy('e.id', 'ASC');
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
+
+    protected function getQueryResult(
+        string $action,
+        Request $request,
+        int $totalItems,
+        PaginatorInterface $paginator,
+        ?FilterOrderHelper $filterOrder = null,
+    ) {
+        if (0 === $totalItems) {
+            return [];
+        }
+
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
+        }
+
+        $queryString = $filterOrder->getQueryString();
+        $activeFilter = $filterOrder->getCheckboxData('activeFilter');
+        $nb = $this->repository->countFilteredGoals($queryString, $activeFilter);
+
+        $paginator = $this->getPaginatorFactory()->create($nb);
+
+        return $this->repository->findFilteredGoals(
+            $queryString,
+            $activeFilter,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
+    }
+
+    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    {
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::countEntities($action, $request, $filterOrder);
+        }
+
+        return $this->repository->countFilteredGoals(
+            $filterOrder->getQueryString(),
+            $filterOrder->getCheckboxData('activeFilter')
+        );
+    }
+
+    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+    {
+        return $this->getFilterOrderHelperFactory()
+            ->create(self::class)
+            ->addSearchBox(['label'])
+            ->addCheckbox('activeFilter', [true => 'Active', false => 'Inactive'], ['Active'])
+            ->build();
+    }
 }

src/Bundle/ChillPersonBundle/Controller/SocialWork/ResultController.php

@@ -13,14 +13,68 @@ namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
 use Symfony\Component\HttpFoundation\Request;
 
 class ResultController extends CRUDController
 {
+    public function __construct(private readonly ResultRepository $repository) {}
+
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
         $query->addOrderBy('e.id', 'ASC');
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
+
+    protected function getQueryResult(
+        string $action,
+        Request $request,
+        int $totalItems,
+        PaginatorInterface $paginator,
+        ?FilterOrderHelper $filterOrder = null,
+    ) {
+        if (0 === $totalItems) {
+            return [];
+        }
+
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
+        }
+
+        $queryString = $filterOrder->getQueryString();
+        $activeFilter = $filterOrder->getCheckboxData('activeFilter');
+        $nb = $this->repository->countFilteredResults($queryString, $activeFilter);
+
+        $paginator = $this->getPaginatorFactory()->create($nb);
+
+        return $this->repository->findFilteredResults(
+            $queryString,
+            $activeFilter,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
+    }
+
+    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    {
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::countEntities($action, $request, $filterOrder);
+        }
+
+        return $this->repository->countFilteredResults(
+            $filterOrder->getQueryString(),
+            $filterOrder->getCheckboxData('activeFilter')
+        );
+    }
+
+    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+    {
+        return $this->getFilterOrderHelperFactory()
+            ->create(self::class)
+            ->addSearchBox(['label'])
+            ->addCheckbox('activeFilter', [true => 'Active', false => 'Inactive'], ['Active'])
+            ->build();
+    }
 }

src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php

@@ -13,14 +13,68 @@ namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
 use Symfony\Component\HttpFoundation\Request;
 
 class SocialActionController extends CRUDController
 {
+    public function __construct(private readonly SocialActionRepository $repository) {}
+
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
         $query->addOrderBy('e.ordering', 'ASC');
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
+
+    protected function getQueryResult(
+        string $action,
+        Request $request,
+        int $totalItems,
+        PaginatorInterface $paginator,
+        ?FilterOrderHelper $filterOrder = null,
+    ) {
+        if (0 === $totalItems) {
+            return [];
+        }
+
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
+        }
+
+        $queryString = $filterOrder->getQueryString();
+        $activeFilter = $filterOrder->getCheckboxData('activeFilter');
+        $nb = $this->repository->countFilteredSocialActions($queryString, $activeFilter);
+
+        $paginator = $this->getPaginatorFactory()->create($nb);
+
+        return $this->repository->findFilteredSocialActions(
+            $queryString,
+            $activeFilter,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
+    }
+
+    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    {
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::countEntities($action, $request, $filterOrder);
+        }
+
+        return $this->repository->countFilteredSocialActions(
+            $filterOrder->getQueryString(),
+            $filterOrder->getCheckboxData('activeFilter')
+        );
+    }
+
+    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+    {
+        return $this->getFilterOrderHelperFactory()
+            ->create(self::class)
+            ->addSearchBox(['label'])
+            ->addCheckbox('activeFilter', [true => 'Active', false => 'Inactive'], ['Active'])
+            ->build();
+    }
 }

src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php

@@ -13,11 +13,15 @@ namespace Chill\PersonBundle\Controller\SocialWork;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 class SocialIssueController extends CRUDController
 {
+    public function __construct(private readonly SocialIssueRepository $repository) {}
+
     protected function createFormFor(string $action, $entity, ?string $formClass = null, array $formOptions = []): FormInterface
     {
         if ('new' === $action) {
@@ -37,4 +41,54 @@ class SocialIssueController extends CRUDController
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
+
+    protected function getQueryResult(
+        string $action,
+        Request $request,
+        int $totalItems,
+        PaginatorInterface $paginator,
+        ?FilterOrderHelper $filterOrder = null,
+    ) {
+        if (0 === $totalItems) {
+            return [];
+        }
+
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::getQueryResult($action, $request, $totalItems, $paginator, $filterOrder);
+        }
+
+        $queryString = $filterOrder->getQueryString();
+        $activeFilter = $filterOrder->getCheckboxData('activeFilter');
+        $nb = $this->repository->countFilteredSocialIssues($queryString, $activeFilter);
+
+        $paginator = $this->getPaginatorFactory()->create($nb);
+
+        return $this->repository->findFilteredSocialIssues(
+            $queryString,
+            $activeFilter,
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
+    }
+
+    protected function countEntities(string $action, Request $request, ?FilterOrderHelper $filterOrder = null): int
+    {
+        if (!$filterOrder instanceof FilterOrderHelper) {
+            return parent::countEntities($action, $request, $filterOrder);
+        }
+
+        return $this->repository->countFilteredSocialIssues(
+            $filterOrder->getQueryString(),
+            $filterOrder->getCheckboxData('activeFilter')
+        );
+    }
+
+    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
+    {
+        return $this->getFilterOrderHelperFactory()
+            ->create(self::class)
+            ->addSearchBox(['label'])
+            ->addCheckbox('activeFilter', [true => 'Active', false => 'Inactive'], ['Active'])
+            ->build();
+    }
 }

src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/CenterAggregator.php

@@ -19,6 +19,7 @@ use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 final readonly class CenterAggregator implements AggregatorInterface
 {
@@ -27,6 +28,7 @@ final readonly class CenterAggregator implements AggregatorInterface
     public function __construct(
         private CenterRepositoryInterface $centerRepository,
         private RollingDateConverterInterface $rollingDateConverter,
+        private TranslatorInterface $translator,
     ) {}
 
     public function buildForm(FormBuilderInterface $builder): void
@@ -62,7 +64,7 @@ final readonly class CenterAggregator implements AggregatorInterface
     {
         return function (int|string|null $value) {
             if (null === $value || '' === $value) {
-                return '';
+                return $this->translator->trans('person.export.aggregator.by_center.no_center');
             }
 
             if ('_header' === $value) {
@@ -94,15 +96,18 @@ final readonly class CenterAggregator implements AggregatorInterface
         $atDate = 'pers_center_agg_at_date';
 
         $qb->leftJoin('person.centerHistory', $alias);
-        $qb
-            ->andWhere(
-                $qb->expr()->lte($alias.'.startDate', ':'.$atDate),
-            )->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->isNull($alias.'.endDate'),
-                    $qb->expr()->gt($alias.'.endDate', ':'.$atDate)
+        $qb->andWhere(
+            $qb->expr()->orX(
+                $qb->expr()->isNull($alias.'.id'),
+                $qb->expr()->andX(
+                    $qb->expr()->lte($alias.'.startDate', ':'.$atDate),
+                    $qb->expr()->orX(
+                        $qb->expr()->isNull($alias.'.endDate'),
+                        $qb->expr()->gt($alias.'.endDate', ':'.$atDate)
+                    )
                 )
-            );
+            )
+        );
         $qb->setParameter($atDate, $this->rollingDateConverter->convert($data['at_date']));
 
         $qb->addSelect("IDENTITY({$alias}.center) AS ".self::COLUMN_NAME);

src/Bundle/ChillPersonBundle/Form/CreationPersonType.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form;
 
-use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
@@ -27,12 +26,9 @@ use libphonenumber\PhoneNumberType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Validator\Constraints\Callback;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 final class CreationPersonType extends AbstractType
 {
@@ -77,16 +73,10 @@ final class CreationPersonType extends AbstractType
             ->add('email', EmailType::class, [
                 'required' => false,
             ])
-            ->add('addressForm', CheckboxType::class, [
-                'label' => 'Create a household and add an address',
-                'required' => false,
-                'mapped' => false,
-                'help' => 'A new household will be created. The person will be member of this household.',
-            ])
             ->add('address', PickAddressType::class, [
                 'required' => false,
                 'mapped' => false,
-                'label' => false,
+                'label' => 'Address',
             ]);
 
         if ($this->askCenters) {
@@ -113,9 +103,6 @@ final class CreationPersonType extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => Person::class,
-            'constraints' => [
-                new Callback($this->validateCheckedAddress(...)),
-            ],
         ]);
     }
 
@@ -126,18 +113,4 @@ final class CreationPersonType extends AbstractType
     {
         return self::NAME;
     }
-
-    public function validateCheckedAddress($data, ExecutionContextInterface $context, $payload): void
-    {
-        /** @var bool $addressFrom */
-        $addressFrom = $context->getObject()->get('addressForm')->getData();
-        /** @var ?Address $address */
-        $address = $context->getObject()->get('address')->getData();
-
-        if ($addressFrom && null === $address) {
-            $context->buildViolation('person_creation.If you want to create an household, an address is required')
-                ->atPath('addressForm')
-                ->addViolation();
-        }
-    }
 }

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php

@@ -100,9 +100,9 @@ class AccompanyingPeriodWorkRepository implements ObjectRepository
         $rsm->addRootEntityFromClassMetadata(AccompanyingPeriodWork::class, 'w');
 
         $sql = "SELECT {$rsm} FROM chill_person_accompanying_period_work w
-                    LEFT JOIN chill_person_accompanying_period_work_referrer AS rw ON accompanyingperiodwork_id = w.id
-                    AND (rw.enddate IS NULL OR rw.enddate > CURRENT_DATE)
-                    WHERE accompanyingPeriod_id = :periodId";
+                LEFT JOIN chill_person_accompanying_period_work_referrer AS rw ON accompanyingperiodwork_id = w.id
+                AND (rw.enddate IS NULL OR rw.enddate > CURRENT_DATE)
+                WHERE accompanyingPeriod_id = :periodId";
 
         // implement filters
 
@@ -136,11 +136,14 @@ class AccompanyingPeriodWorkRepository implements ObjectRepository
         }
 
         // set limit and offset
-        $sql .= " ORDER BY
-                     CASE WHEN w.enddate IS NULL THEN '-infinity'::timestamp ELSE 'infinity'::timestamp END ASC,
-                     w.startdate DESC,
-                     w.enddate DESC,
-                     w.id DESC";
+        $sql .= ' ORDER BY
+                 CASE
+                     WHEN w.enddate IS NULL OR w.enddate > CURRENT_DATE THEN 0
+                     ELSE 1
+                 END ASC,
+                 w.startdate DESC,
+                 w.enddate DESC,
+                 w.id DESC';
 
         $sql .= ' LIMIT :limit OFFSET :offset';
 

src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php

@@ -14,12 +14,16 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 final readonly class EvaluationRepository implements EvaluationRepositoryInterface
 {
     private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(private EntityManagerInterface $entityManager, private RequestStack $requestStack)
     {
         $this->repository = $entityManager->getRepository(Evaluation::class);
     }
@@ -65,4 +69,86 @@ final readonly class EvaluationRepository implements EvaluationRepositoryInterfa
     {
         return Evaluation::class;
     }
+
+    private function getLang(): string
+    {
+        return $this->requestStack->getCurrentRequest()?->getLocale() ?? 'fr';
+    }
+
+    public function getResult(
+        QueryBuilder $qb,
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = [],
+    ): array {
+        $qb->select('e');
+
+        $qb
+            ->setFirstResult($start)
+            ->setMaxResults($limit);
+
+        foreach ($orderBy as $field => $direction) {
+            $qb->addOrderBy('e.'.$field, $direction);
+        }
+
+        return $qb->getQuery()->getResult();
+    }
+
+    private function queryByTitle(string $pattern): QueryBuilder
+    {
+        $qb = $this->entityManager->createQueryBuilder()->from(Evaluation::class, 'e');
+
+        // Extract the current locale's value from the JSON `title` and search on it
+        $qb
+            ->where($qb->expr()->like('LOWER(UNACCENT(JSON_EXTRACT(e.title, :lang)))', "CONCAT('%', LOWER(UNACCENT(:pattern)), '%')"))
+            ->setParameter('pattern', $pattern)
+            ->setParameter('lang', $this->getLang());
+
+        return $qb;
+    }
+
+    public function buildFilterBaseQuery(?string $queryString, array $isActive): QueryBuilder
+    {
+        if (null !== $queryString) {
+            $qb = $this->queryByTitle($queryString);
+        } else {
+            $qb = $this->entityManager->createQueryBuilder()->from(Evaluation::class, 'e');
+        }
+
+        // Add condition based on active/inactive status
+        if (in_array('Active', $isActive, true) && !in_array('Inactive', $isActive, true)) {
+            $qb->andWhere('e.active = true');
+        } elseif (in_array('Inactive', $isActive, true) && !in_array('Active', $isActive, true)) {
+            $qb->andWhere('e.active = false');
+        }
+
+        return $qb;
+    }
+
+    public function findFilteredEvaluations(
+        ?string $queryString = null,
+        array $isActive = ['active'],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = ['title' => 'ASC'],
+    ): array {
+        $qb = $this->buildFilterBaseQuery($queryString, $isActive);
+
+        return $this->getResult($qb, $start, $limit, $orderBy);
+    }
+
+    public function countFilteredEvaluations(
+        ?string $queryString = null,
+        array $isActive = ['active'],
+    ): int {
+        $qb = $this->buildFilterBaseQuery($queryString, $isActive);
+
+        try {
+            return $qb
+                ->select('COUNT(e)')
+                ->getQuery()->getSingleScalarResult();
+        } catch (NoResultException|NonUniqueResultException $e) {
+            throw new \LogicException('a count query should return one result', previous: $e);
+        }
+    }
 }

src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php

@@ -15,14 +15,17 @@ use Chill\PersonBundle\Entity\SocialWork\Goal;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 final readonly class GoalRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(private EntityManagerInterface $entityManager, private RequestStack $requestStack)
     {
         $this->repository = $entityManager->getRepository(Goal::class);
     }
@@ -101,6 +104,102 @@ final readonly class GoalRepository implements ObjectRepository
         return Goal::class;
     }
 
+    private function getLang(): string
+    {
+        return $this->requestStack->getCurrentRequest()?->getLocale() ?? 'fr';
+    }
+
+    public function getResult(
+        QueryBuilder $qb,
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = [],
+    ): array {
+        $qb->select('g');
+
+        $qb
+            ->setFirstResult($start)
+            ->setMaxResults($limit);
+
+        foreach ($orderBy as $field => $direction) {
+            $qb->addOrderBy('g.'.$field, $direction);
+        }
+
+        return $qb->getQuery()->getResult();
+    }
+
+    private function queryByTitle(string $pattern): QueryBuilder
+    {
+        $qb = $this->entityManager->createQueryBuilder()->from(Goal::class, 'g');
+
+        // search across locales by extracting the localized value
+        $qb
+            ->where($qb->expr()->like('LOWER(UNACCENT(JSON_EXTRACT(g.title, :lang)))', "CONCAT('%', LOWER(UNACCENT(:pattern)), '%')"))
+            ->setParameter('pattern', $pattern)
+            ->setParameter('lang', $this->getLang());
+
+        return $qb;
+    }
+
+    public function buildFilterBaseQuery(?string $queryString, array $isActive): QueryBuilder
+    {
+        if (null !== $queryString) {
+            $qb = $this->queryByTitle($queryString);
+        } else {
+            $qb = $this->entityManager->createQueryBuilder()->from(Goal::class, 'g');
+        }
+
+        // Active when desactivationDate is null or in the future
+        $now = new \DateTime('now');
+        if (in_array('Active', $isActive, true) && !in_array('Inactive', $isActive, true)) {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('g.desactivationDate'),
+                    $qb->expr()->gt('g.desactivationDate', ':now')
+                )
+            )->setParameter('now', $now);
+        } elseif (in_array('Inactive', $isActive, true) && !in_array('Active', $isActive, true)) {
+            $qb->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->isNotNull('g.desactivationDate'),
+                    $qb->expr()->lte('g.desactivationDate', ':now')
+                )
+            )->setParameter('now', $now);
+        }
+
+        return $qb;
+    }
+
+    /**
+     * @return array<int, Goal>
+     */
+    public function findFilteredGoals(
+        ?string $queryString = null,
+        array $isActive = ['active'],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = ['id' => 'ASC'],
+    ): array {
+        $qb = $this->buildFilterBaseQuery($queryString, $isActive);
+
+        return $this->getResult($qb, $start, $limit, $orderBy);
+    }
+
+    public function countFilteredGoals(
+        ?string $queryString = null,
+        array $isActive = ['active'],
+    ): int {
+        $qb = $this->buildFilterBaseQuery($queryString, $isActive);
+
+        try {
+            return $qb
+                ->select('COUNT(g)')
+                ->getQuery()->getSingleScalarResult();
+        } catch (NoResultException|NonUniqueResultException $e) {
+            throw new \LogicException('a count query should return one result', previous: $e);
+        }
+    }
+
     private function buildQueryBySocialActionWithDescendants(SocialAction $action): QueryBuilder
     {
         $actions = $action->getDescendantsWithThis();

src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php

@@ -16,14 +16,17 @@ use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 final readonly class ResultRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(private EntityManagerInterface $entityManager, private RequestStack $requestStack)
     {
         $this->repository = $entityManager->getRepository(Result::class);
     }
@@ -125,6 +128,100 @@ final readonly class ResultRepository implements ObjectRepository
         return Result::class;
     }
 
+    private function getLang(): string
+    {
+        return $this->requestStack->getCurrentRequest()?->getLocale() ?? 'fr';
+    }
+
+    public function getResult(
+        QueryBuilder $qb,
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = [],
+    ): array {
+        $qb->select('r');
+
+        $qb
+            ->setFirstResult($start)
+            ->setMaxResults($limit);
+
+        foreach ($orderBy as $field => $direction) {
+            $qb->addOrderBy('r.'.$field, $direction);
+        }
+
+        return $qb->getQuery()->getResult();
+    }
+
+    private function queryByTitle(string $pattern): QueryBuilder
+    {
+        $qb = $this->entityManager->createQueryBuilder()->from(Result::class, 'r');
+
+        $qb
+            ->where($qb->expr()->like('LOWER(UNACCENT(JSON_EXTRACT(r.title, :lang)))', "CONCAT('%', LOWER(UNACCENT(:pattern)), '%')"))
+            ->setParameter('pattern', $pattern)
+            ->setParameter('lang', $this->getLang());
+
+        return $qb;
+    }
+
+    public function buildFilterBaseQuery(?string $queryString, array $isActive): QueryBuilder
+    {
+        if (null !== $queryString) {
+            $qb = $this->queryByTitle($queryString);
+        } else {
+            $qb = $this->entityManager->createQueryBuilder()->from(Result::class, 'r');
+        }
+
+        $now = new \DateTime('now');
+        if (in_array('Active', $isActive, true) && !in_array('Inactive', $isActive, true)) {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('r.desactivationDate'),
+                    $qb->expr()->gt('r.desactivationDate', ':now')
+                )
+            )->setParameter('now', $now);
+        } elseif (in_array('Inactive', $isActive, true) && !in_array('Active', $isActive, true)) {
+            $qb->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->isNotNull('r.desactivationDate'),
+                    $qb->expr()->lte('r.desactivationDate', ':now')
+                )
+            )->setParameter('now', $now);
+        }
+
+        return $qb;
+    }
+
+    /**
+     * @return array<int, Result>
+     */
+    public function findFilteredResults(
+        ?string $queryString = null,
+        array $isActive = ['active'],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = ['id' => 'ASC'],
+    ): array {
+        $qb = $this->buildFilterBaseQuery($queryString, $isActive);
+
+        return $this->getResult($qb, $start, $limit, $orderBy);
+    }
+
+    public function countFilteredResults(
+        ?string $queryString = null,
+        array $isActive = ['active'],
+    ): int {
+        $qb = $this->buildFilterBaseQuery($queryString, $isActive);
+
+        try {
+            return $qb
+                ->select('COUNT(r)')
+                ->getQuery()->getSingleScalarResult();
+        } catch (NoResultException|NonUniqueResultException $e) {
+            throw new \LogicException('a count query should return one result', previous: $e);
+        }
+    }
+
     private function buildQueryByGoal(Goal $goal): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('r');

src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php

@@ -14,14 +14,17 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 final readonly class SocialActionRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(private EntityManagerInterface $entityManager, private RequestStack $requestStack)
     {
         $this->repository = $entityManager->getRepository(SocialAction::class);
     }
@@ -84,6 +87,100 @@ final readonly class SocialActionRepository implements ObjectRepository
         return SocialAction::class;
     }
 
+    private function getLang(): string
+    {
+        return $this->requestStack->getCurrentRequest()?->getLocale() ?? 'fr';
+    }
+
+    public function getResult(
+        QueryBuilder $qb,
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = [],
+    ): array {
+        $qb->select('sa');
+
+        $qb
+            ->setFirstResult($start)
+            ->setMaxResults($limit);
+
+        foreach ($orderBy as $field => $direction) {
+            $qb->addOrderBy('sa.'.$field, $direction);
+        }
+
+        return $qb->getQuery()->getResult();
+    }
+
+    private function queryByTitle(string $pattern): QueryBuilder
+    {
+        $qb = $this->entityManager->createQueryBuilder()->from(SocialAction::class, 'sa');
+
+        $qb
+            ->where($qb->expr()->like('LOWER(UNACCENT(JSON_EXTRACT(sa.title, :lang)))', "CONCAT('%', LOWER(UNACCENT(:pattern)), '%')"))
+            ->setParameter('pattern', $pattern)
+            ->setParameter('lang', $this->getLang());
+
+        return $qb;
+    }
+
+    public function buildFilterBaseQuery(?string $queryString, array $isActive): QueryBuilder
+    {
+        if (null !== $queryString) {
+            $qb = $this->queryByTitle($queryString);
+        } else {
+            $qb = $this->entityManager->createQueryBuilder()->from(SocialAction::class, 'sa');
+        }
+
+        $now = new \DateTime('now');
+        if (in_array('Active', $isActive, true) && !in_array('Inactive', $isActive, true)) {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('sa.desactivationDate'),
+                    $qb->expr()->gt('sa.desactivationDate', ':now')
+                )
+            )->setParameter('now', $now);
+        } elseif (in_array('Inactive', $isActive, true) && !in_array('Active', $isActive, true)) {
+            $qb->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->isNotNull('sa.desactivationDate'),
+                    $qb->expr()->lte('sa.desactivationDate', ':now')
+                )
+            )->setParameter('now', $now);
+        }
+
+        return $qb;
+    }
+
+    /**
+     * @return array<int, SocialAction>
+     */
+    public function findFilteredSocialActions(
+        ?string $queryString = null,
+        array $isActive = ['active'],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = ['ordering' => 'ASC'],
+    ): array {
+        $qb = $this->buildFilterBaseQuery($queryString, $isActive);
+
+        return $this->getResult($qb, $start, $limit, $orderBy);
+    }
+
+    public function countFilteredSocialActions(
+        ?string $queryString = null,
+        array $isActive = ['active'],
+    ): int {
+        $qb = $this->buildFilterBaseQuery($queryString, $isActive);
+
+        try {
+            return $qb
+                ->select('COUNT(sa)')
+                ->getQuery()->getSingleScalarResult();
+        } catch (NoResultException|NonUniqueResultException $e) {
+            throw new \LogicException('a count query should return one result', previous: $e);
+        }
+    }
+
     private function buildQueryWithDesactivatedDateCriteria(): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('sa');

src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php

@@ -14,14 +14,17 @@ namespace Chill\PersonBundle\Repository\SocialWork;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 final readonly class SocialIssueRepository implements ObjectRepository
 {
     private EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    public function __construct(private EntityManagerInterface $entityManager, private RequestStack $requestStack)
     {
         $this->repository = $entityManager->getRepository(SocialIssue::class);
     }
@@ -79,6 +82,100 @@ final readonly class SocialIssueRepository implements ObjectRepository
         return SocialIssue::class;
     }
 
+    public function getResult(
+        QueryBuilder $qb,
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = [],
+    ): array {
+        $qb->select('si');
+
+        $qb
+            ->setFirstResult($start)
+            ->setMaxResults($limit);
+
+        foreach ($orderBy as $field => $direction) {
+            $qb->addOrderBy('si.'.$field, $direction);
+        }
+
+        return $qb->getQuery()->getResult();
+    }
+
+    private function getLang(): string
+    {
+        return $this->requestStack->getCurrentRequest()?->getLocale() ?? 'fr';
+    }
+
+    private function queryByTitle(string $pattern): QueryBuilder
+    {
+        $qb = $this->entityManager->createQueryBuilder()->from(SocialIssue::class, 'si');
+
+        $qb
+            ->where($qb->expr()->like('LOWER(UNACCENT(JSON_EXTRACT(si.title, :lang)))', "CONCAT('%', LOWER(UNACCENT(:pattern)), '%')"))
+            ->setParameter('pattern', $pattern)
+            ->setParameter('lang', $this->getLang());
+
+        return $qb;
+    }
+
+    public function buildFilterBaseQuery(?string $queryString, array $isActive): QueryBuilder
+    {
+        if (null !== $queryString) {
+            $qb = $this->queryByTitle($queryString);
+        } else {
+            $qb = $this->entityManager->createQueryBuilder()->from(SocialIssue::class, 'si');
+        }
+
+        $now = new \DateTime('now');
+        if (in_array('Active', $isActive, true) && !in_array('Inactive', $isActive, true)) {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->isNull('si.desactivationDate'),
+                    $qb->expr()->gt('si.desactivationDate', ':now')
+                )
+            )->setParameter('now', $now);
+        } elseif (in_array('Inactive', $isActive, true) && !in_array('Active', $isActive, true)) {
+            $qb->andWhere(
+                $qb->expr()->andX(
+                    $qb->expr()->isNotNull('si.desactivationDate'),
+                    $qb->expr()->lte('si.desactivationDate', ':now')
+                )
+            )->setParameter('now', $now);
+        }
+
+        return $qb;
+    }
+
+    /**
+     * @return array<int, SocialIssue>
+     */
+    public function findFilteredSocialIssues(
+        ?string $queryString = null,
+        array $isActive = ['active'],
+        ?int $start = 0,
+        ?int $limit = 50,
+        ?array $orderBy = ['ordering' => 'ASC'],
+    ): array {
+        $qb = $this->buildFilterBaseQuery($queryString, $isActive);
+
+        return $this->getResult($qb, $start, $limit, $orderBy);
+    }
+
+    public function countFilteredSocialIssues(
+        ?string $queryString = null,
+        array $isActive = ['active'],
+    ): int {
+        $qb = $this->buildFilterBaseQuery($queryString, $isActive);
+
+        try {
+            return $qb
+                ->select('COUNT(si)')
+                ->getQuery()->getSingleScalarResult();
+        } catch (NoResultException|NonUniqueResultException $e) {
+            throw new \LogicException('a count query should return one result', previous: $e);
+        }
+    }
+
     private function buildQueryWithDesactivatedDateCriteria(): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('si');

src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig

@@ -105,11 +105,14 @@
         {{ form_row(form.center) }}
     {% endif %}
 
-    <div id=addressForm>
-        {{ form_row(form.addressForm) }}
-    </div>
-    <div id=address>
-        {{ form_row(form.address) }}
+    <div id="address" class="row mb-1" style="display:flex;" title="{{ 'A new household will be created. The person will be member of this household.'|trans }}">
+        {{ form_label(form.address, 'Address'|trans) }}
+        <div class="col-sm-8">
+            {{ form_widget(form.address) }}
+            <div class="form-text text-muted">
+                {{ 'A new household will be created. The person will be member of this household.'|trans }}
+            </div>
+        </div>
     </div>
 
     <ul class="record_actions sticky-form-buttons">

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig

@@ -2,6 +2,9 @@
 
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
+
+        {% block filter_order %}{{ filter_order|chill_render_filter_order_helper }}{% endblock %}
+
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig

@@ -2,6 +2,9 @@
 
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
+
+        {% block filter_order %}{{ filter_order|chill_render_filter_order_helper }}{% endblock %}
+
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig

@@ -2,6 +2,9 @@
 
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
+
+        {% block filter_order %}{{ filter_order|chill_render_filter_order_helper }}{% endblock %}
+
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig

@@ -2,6 +2,9 @@
 
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
+
+        {% block filter_order %}{{ filter_order|chill_render_filter_order_helper }}{% endblock %}
+
         {% block table_entities_thead_tr %}
             <th>{{ 'Id' }}</th>
             <th>{{ 'Title'|trans }}</th>

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig

@@ -2,6 +2,9 @@
 
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
+
+        {% block filter_order %}{{ filter_order|chill_render_filter_order_helper }}{% endblock %}
+
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>

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

@@ -103,6 +103,11 @@ Employment status: Situation professionelle
 Administrative status: Situation administrative
 
 person:
+    # trans key according to new conventions
+    export:
+        aggregator:
+            by_center:
+                no_center: Sans territoire
     Identifiers: Identifiants