[Admin] General conventions (#11427)

* Change group for admin * Update filters
parti-renaissance · Feb 6, 2025 · ee7dc0b · ee7dc0b
1 parent 9a61942
commit ee7dc0b
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 5 deletions.
diff --git a/config/packages/security.yaml b/config/packages/security.yaml
@@ -175,7 +175,9 @@ security:
             - ROLE_APP_ADMIN_PROCURATION_V2_REQUEST_ALL
             - ROLE_APP_ADMIN_PROCURATION_V2_PROXY_ALL
             - ROLE_APP_ADMIN_PROCURATION_V2_PROCURATION_REQUEST_ALL
-        ROLE_ADMIN_TERRITOIRES_GENERAL_CONVENTIONS:
+
+        ## Idées
+        ROLE_ADMIN_IDEES_GENERAL_CONVENTIONS:
             - ROLE_APP_ADMIN_GENERAL_CONVENTION_ALL
 
         ## Application Mobile

diff --git a/config/services/admin.xml b/config/services/admin.xml
@@ -304,8 +304,14 @@
         </service>
         <service id="App\Admin\ReportAdmin" alias="app.admin.report" />
 
+        <!--
+        ######################################################
+        # Idées
+        ######################################################
+        -->
+
         <service id="app.admin.general_convention" class="App\Admin\GeneralConventionAdmin">
-            <tag name="sonata.admin" manager-type="orm" label="États généraux" group="Territoires" />
+            <tag name="sonata.admin" manager-type="orm" label="États généraux" group="Idées" />
 
             <argument />
             <argument>App\Entity\GeneralConvention\GeneralConvention</argument>

diff --git a/src/Admin/GeneralConventionAdmin.php b/src/Admin/GeneralConventionAdmin.php
@@ -2,6 +2,7 @@
 
 namespace App\Admin;
 
+use App\Admin\Filter\ZoneAutocompleteFilter;
 use App\Entity\Adherent;
 use App\Entity\Geo\Zone;
 use App\Form\Admin\SimpleMDEContent;
@@ -10,13 +11,84 @@
 use App\GeneralConvention\ParticipantQuality;
 use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Admin\AdminInterface;
+use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Form\Type\ModelAutocompleteType;
+use Sonata\DoctrineORMAdminBundle\Filter\CallbackFilter;
+use Sonata\DoctrineORMAdminBundle\Filter\DateRangeFilter;
+use Sonata\DoctrineORMAdminBundle\Filter\ModelFilter;
+use Sonata\Form\Type\DateRangePickerType;
 use Symfony\Component\Form\Extension\Core\Type\EnumType;
 
 class GeneralConventionAdmin extends AbstractAdmin
 {
+    protected function configureDatagridFilters(DatagridMapper $filter): void
+    {
+        $filter
+            ->add('departmentZone', ZoneAutocompleteFilter::class, [
+                'label' => 'Département',
+                'field_type' => ModelAutocompleteType::class,
+                'field_options' => [
+                    'multiple' => false,
+                    'minimum_input_length' => 1,
+                    'items_per_page' => 20,
+                    'property' => [
+                        'name',
+                        'code',
+                    ],
+                ],
+            ])
+            ->add('districtZone', ZoneAutocompleteFilter::class, [
+                'label' => 'Circonscription',
+                'field_type' => ModelAutocompleteType::class,
+                'field_options' => [
+                    'multiple' => false,
+                    'minimum_input_length' => 1,
+                    'items_per_page' => 20,
+                    'property' => [
+                        'name',
+                        'code',
+                    ],
+                ],
+            ])
+            ->add('committee', CallbackFilter::class, [
+                'label' => 'Comité',
+                'field_type' => ModelAutocompleteType::class,
+                'show_filter' => true,
+                'field_options' => [
+                    'model_manager' => $this->getModelManager(),
+                    'minimum_input_length' => 1,
+                    'items_per_page' => 20,
+                    'property' => 'name',
+                ],
+            ])
+            ->add('reporter', ModelFilter::class, [
+                'label' => 'Auteur',
+                'show_filter' => true,
+                'field_type' => ModelAutocompleteType::class,
+                'field_options' => [
+                    'model_manager' => $this->getModelManager(),
+                    'property' => [
+                        'search',
+                    ],
+                    'to_string_callback' => static function (Adherent $adherent): string {
+                        return \sprintf(
+                            '%s (%s) [%s]',
+                            $adherent->getFullName(),
+                            $adherent->getEmailAddress(),
+                            $adherent->getId()
+                        );
+                    },
+                ],
+            ])
+            ->add('reportedAt', DateRangeFilter::class, [
+                'label' => 'Date de remontée',
+                'field_type' => DateRangePickerType::class,
+            ])
+        ;
+    }
+
     protected function configureFormFields(FormMapper $form): void
     {
         $form

diff --git a/src/DataFixtures/ORM/LoadAdminData.php b/src/DataFixtures/ORM/LoadAdminData.php
@@ -79,7 +79,7 @@ public function load(ObjectManager $manager): void
             'ROLE_ADMIN_TERRITOIRES_JME_GENERAL_MEETING_REPORTS',
             'ROLE_ADMIN_TERRITOIRES_JME_EMAIL_TEMPLATES',
             'ROLE_ADMIN_TERRITOIRES_ELUS_NOTIFICATION',
-            'ROLE_ADMIN_TERRITOIRES_GENERAL_CONVENTIONS',
+            'ROLE_ADMIN_IDEES_GENERAL_CONVENTIONS',
             'ROLE_ADMIN_PETITION',
         ]);
 

diff --git a/src/DataFixtures/ORM/LoadAdministratorRoleData.php b/src/DataFixtures/ORM/LoadAdministratorRoleData.php
@@ -326,9 +326,9 @@ private function getRoles(): \Generator
             AdministratorRoleGroupEnum::ELECTIONS
         );
         yield $this->createRole(
-            'ROLE_ADMIN_TERRITOIRES_GENERAL_CONVENTIONS',
+            'ROLE_ADMIN_IDEES_GENERAL_CONVENTIONS',
             'Administrateur des états généraux',
-            AdministratorRoleGroupEnum::TERRITOIRES
+            AdministratorRoleGroupEnum::IDEES
         );
         // Application Mobile
         yield $this->createRole(