Rector fixes

.changes/unreleased/UX-20251103-161910.yaml

@@ -1,6 +0,0 @@
-kind: UX
-body: Display whether doc generation template is active or not in admin and order templates alphabetically
-time: 2025-11-03T16:19:10.051947925+01:00
-custom:
-    Issue: "456"
-    SchemaChange: No schema change

.changes/unreleased/UX-20251119-153706.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Alphabetically order userJobs and mainLocations within user creation form
+time: 2025-11-19T15:37:06.393470745+01:00
+custom:
+    Issue: "470"
+    SchemaChange: No schema change

src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php

@@ -87,7 +87,7 @@ class AdminDocGeneratorTemplateController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        return $query->addSelect('REPLACE(JSON_EXTRACT(e.name, :lang), \' \', \'~\') AS HIDDEN name_lang')
+        return $query->addSelect('JSON_EXTRACT(e.name, :lang) AS HIDDEN name_lang')
             ->setParameter('lang', $request->getLocale())
             ->addOrderBy('name_lang', 'ASC');
     }

src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig

@@ -25,24 +25,12 @@
                             <div class="item-bloc">
                                 <div class="item-row">
                                     <div class="item-col" style="flex-basis:100%;">
-                                        <h2>{{ entity.name|localize_translatable_string }} </h2>
-                                        <p style="margin-left: 1rem;"><span class="badge bg-chill-gray">
-                                            {% if entity.active %}
-                                                {{ 'admin.active'|trans }}
-                                            {% else %}
-                                                {{ 'admin.not active'|trans }}
-                                            {% endif %}
-                                        </span></p>
+                                        <h2>{{ entity.name|localize_translatable_string }}</h2>
                                     </div>
                                 </div>
                                 <div class="item-row">
                                     <p><span class="badge bg-chill-green-dark">{{ contextManager.getContextByKey(entity.context).name|trans }}</span></p>
                                 </div>
-{#                                <div class="item-row">#}
-{#                                    <div class="item-col" style="flex-basis:100%;">#}
-{##}
-{#                                    </div>#}
-{#                                </div>#}
                                 <div class="item-row">
                                     <div class="item-col"></div>
                                     <ul class="record_actions item-col flex-shrink-1">

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

@@ -49,7 +49,3 @@ crud:
 
 
 Template file: Fichier modèle
-
-admin:
-    active: Actif
-    not active: Non-actif

src/Bundle/ChillMainBundle/Form/UserType.php

@@ -18,6 +18,7 @@ use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
+use Chill\MainBundle\Repository\UserJobRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -36,7 +37,7 @@ use Symfony\Component\Validator\Constraints\Regex;
 
 class UserType extends AbstractType
 {
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag) {}
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag, private readonly UserJobRepository $userJobRepository) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -80,12 +81,7 @@ class UserType extends AbstractType
                 'placeholder' => 'choose a job',
                 'class' => UserJob::class,
                 'choice_label' => fn (UserJob $c) => $this->translatableStringHelper->localize($c->getLabel()),
-                'query_builder' => static function (EntityRepository $er) {
-                    $qb = $er->createQueryBuilder('uj');
-                    $qb->where('uj.active = TRUE');
-
-                    return $qb;
-                },
+                'choices' => $this->loadAndSortUserJobs(),
             ])
             ->add('mainLocation', EntityType::class, [
                 'label' => 'Main location',
@@ -96,6 +92,7 @@ class UserType extends AbstractType
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('l');
                     $qb->orderBy('l.locationType');
+                    $qb->orderBy('l.name', 'ASC');
                     $qb->where('l.availableForUsers = TRUE');
 
                     return $qb;
@@ -155,6 +152,20 @@ class UserType extends AbstractType
         }
     }
 
+    private function loadAndSortUserJobs(): array
+    {
+        $items = $this->userJobRepository->findBy(['active' => true]);
+
+        usort(
+            $items,
+            fn ($a, $b) => mb_strtolower((string) $this->translatableStringHelper->localize($a->getLabel()))
+            <=>
+            mb_strtolower((string) $this->translatableStringHelper->localize($b->getLabel()))
+        );
+
+        return $items;
+    }
+
     /**
      * @param OptionsResolverInterface $resolver
      */