Merge branch 'master' into upgrade-php82

src/Bundle/ChillMainBundle/ChillMainBundle.php

@@ -72,7 +72,6 @@ class ChillMainBundle extends Bundle
         $container->addCompilerPass(new NotificationCounterCompilerPass());
         $container->addCompilerPass(new MenuCompilerPass());
         $container->addCompilerPass(new ACLFlagsCompilerPass());
-        $container->addCompilerPass(new GroupingCenterCompilerPass());
         $container->addCompilerPass(new CRUDControllerCompilerPass());
         $container->addCompilerPass(new ShortMessageCompilerPass());
     }

src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/GroupingCenterCompilerPass.php

@@ -1,37 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\DependencyInjection\CompilerPass;
-
-use LogicException;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-class GroupingCenterCompilerPass implements CompilerPassInterface
-{
-    public function process(ContainerBuilder $container)
-    {
-        if (false === $container->hasDefinition('chill.main.form.pick_centers_type')) {
-            throw new LogicException('The service chill.main.form.pick_centers_type does '
-                . 'not exists in container');
-        }
-
-        $pickCenterType = $container->getDefinition('chill.main.form.pick_centers_type');
-
-        foreach ($container->findTaggedServiceIds('chill.grouping_center') as $serviceId => $tagged) {
-            $pickCenterType->addMethodCall(
-                'addGroupingCenter',
-                [new Reference($serviceId)]
-            );
-        }
-    }
-}

src/Bundle/ChillMainBundle/Export/ExportInterface.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Export;
 
-use Closure;
 use Doctrine\ORM\QueryBuilder;
 
 /**

src/Bundle/ChillMainBundle/Export/Helper/DateTimeHelper.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Export\Helper;
 
 use DateTime;
+use DateTimeInterface;
 use Exception;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
@@ -35,7 +36,7 @@ class DateTimeHelper
                 return '';
             }
 
-            if ($value instanceof \DateTimeInterface) {
+            if ($value instanceof DateTimeInterface) {
                 return $value;
             }
 

src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\Type\Export;
 
-use Chill\MainBundle\Center\GroupingCenterInterface;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Export\ExportManager;
@@ -72,8 +71,10 @@ final class PickCenterType extends AbstractType
                 return $c->getName();
             },
             'data' => $centers,
-        ])
-            ->add('regroupment', EntityType::class, [
+        ]);
+
+        if (count($this->regroupmentRepository->findAllActive()) > 0) {
+            $builder->add('regroupment', EntityType::class, [
                 'class' => Regroupment::class,
                 'label' => 'regroupment',
                 'multiple' => true,
@@ -83,6 +84,7 @@ final class PickCenterType extends AbstractType
                     return $r->getName();
                 },
             ]);
+        }
 
         $builder->setDataMapper(new ExportPickCenterDataMapper());
     }

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue

@@ -233,7 +233,7 @@ export default {
                      // console.log('data original', data);
                      data.parent = {type: "thirdparty", id: this.parent.id};
                      data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
-                     data.profession = data.profession !== null ? {type: 'third_party_profession', id:  data.profession.id} : null;
+                     data.profession = data.profession !== '' ? data.profession : '';
                   } else {
                      type = this.$refs.castNew.radioType;
                      data = this.$refs.castNew.castDataByType();
@@ -241,8 +241,8 @@ export default {
                      if (typeof data.civility !== 'undefined' && null !== data.civility) {
                         data.civility = data.civility !== null ? {type: 'chill_main_civility', id: data.civility.id} : null;
                      }
-                     if (typeof data.profession !== 'undefined' && null !== data.profession) {
-                        data.profession = data.profession !== null ? {type: 'third_party_profession', id: data.profession.id} : null;
+                     if (typeof data.profession !== 'undefined' && '' !== data.profession) {
+                        data.profession = data.profession !== '' ? data.profession : '';
                      }
                      // console.log('onthefly data', data);
                   }

src/Bundle/ChillMainBundle/Resources/views/Export/new_centers_step.html.twig

@@ -41,9 +41,10 @@
             <h3 class="m-3">{{ 'Center'|trans }}</h3>
             {{ form_widget(form.centers.center) }}
 
-            <h3 class="m-3">{{ 'Pick aggregated centers'|trans }}</h3>
-            {{ form_widget(form.centers.regroupment) }}
-
+            {% if form.centers.regroupment is defined %}
+                <h3 class="m-3">{{ 'Pick aggregated centers'|trans }}</h3>
+                {{ form_widget(form.centers.regroupment) }}
+            {% endif %}
         </section>
 
         <p>{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-action btn-create' }, 'label' : 'Go to export options' } ) }}</p>