reorder columns. Fixes #967

src/Domain/User/Controller/CollectivityController.php

@@ -169,10 +169,10 @@ class CollectivityController extends CRUDController
                 'informations_complementaires' => !\is_null($collectivity->getInformationsComplementaires()) ? nl2br($collectivity->getInformationsComplementaires()) : null,
                 'siren'                        => $collectivity->getSiren(),
                 'statut'                       => $collectivity->isActive() ? $active : $inactive,
-                'population'                   => $collectivity->getPopulation(),
-                'nbr_agents'                   => $collectivity->getNbrAgents(),
                 'nbr_cnil'                     => $collectivity->getNbrCnil(),
-                'tel_referent_rgpd'            => !\is_null($collectivity->getDpo()) ? ($collectivity->getDpo())->getPhoneNumber() : null,
+                'nbr_agents'                   => $collectivity->getNbrAgents(),
+                'population'                   => $collectivity->getPopulation(),
+                //'tel_referent_rgpd'            => !\is_null($collectivity->getDpo()) ? ($collectivity->getDpo())->getPhoneNumber() : null,
                 'createdAt'                    => !\is_null($collectivity->getCreatedAt()) ? $collectivity->getCreatedAt()->format('d-m-Y H:i') : null,
                 'updatedAt'                    => !\is_null($collectivity->getUpdatedAt()) ? $collectivity->getUpdatedAt()->format('d-m-Y H:i') : null,
                 'actions'                      => $this->getActionCellsContent($collectivity),
@@ -212,11 +212,11 @@ class CollectivityController extends CRUDController
             'nom_court',
             'type',
             'informations_complementaires',
+            'siren',
             'statut',
-            'date_maj',
-            'population',
-            'nbr_agents',
             'nbr_cnil',
+            'nbr_agents',
+            'population',
             'createdAt',
             'updatedAt',
             'actions',

src/Infrastructure/ORM/User/Repository/Collectivity.php

@@ -172,6 +172,9 @@ class Collectivity extends CRUDRepository implements Repository\Collectivity
             case 'statut':
                 $queryBuilder->addOrderBy('o.active', $orderDir);
                 break;
+            case 'informations_complementaires':
+                $queryBuilder->addOrderBy('o.informationsComplementaires', $orderDir);
+                break;
             case 'nbr_agents':
                 $queryBuilder->addOrderBy('o.nbrAgents', $orderDir);
                 break;