Merge branch 'master' into 111_exports_suite

src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php

@@ -49,9 +49,8 @@ class Evaluation
     /**
      * @ORM\ManyToMany(
      *     targetEntity=SocialAction::class,
-     *     inversedBy="evaluations"
+     *     mappedBy="evaluations"
      * )
-     * @ORM\JoinTable(name="chill_person_social_work_evaluation_action")
      */
     private Collection $socialActions;
 

src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php

@@ -16,6 +16,7 @@ use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\UrlType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -40,6 +41,10 @@ class EvaluationType extends AbstractType
             ->add('title', TranslatableStringFormType::class, [
                 'label' => 'Nom',
             ])
+            ->add('url', UrlType::class, [
+                'label' => 'evaluation.url',
+                'required' => false,
+            ])
             ->add('delay', DateIntervalType::class, [
                 'label' => 'evaluation.delay',
                 'required' => false,

src/Bundle/ChillPersonBundle/Resources/views/Household/summary.html.twig

@@ -180,7 +180,7 @@
               {% if members|length > 0 %}
                 <div class="flex-table list-household-members">
                   {% for m in members %}
-                    {% if m.position.shareHousehold %}
+                    {% if m.position is null or m.position.shareHousehold %}
                       {% include '@ChillPerson/Household/_render_member.html.twig' with {
                           'member': m,
                           'customButtons': { 'before': _self.customButtons(m, household) }

src/Bundle/ChillPersonBundle/config/services/exports_social_actions.yaml

@@ -9,12 +9,12 @@ services:
 
   ## FILTERS
 
-  chill.person.export.filter_social_work_type:
-     class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\SocialWorkTypeFilter
-     autowire: true
-     autoconfigure: true
-     tags:
-         - { name: chill.export_filter, alias: social_work_type_filter }
+  #chill.person.export.filter_social_work_type:
+  #   class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\SocialWorkTypeFilter
+  #   autowire: true
+  #   autoconfigure: true
+  #   tags:
+  #       - { name: chill.export_filter, alias: social_work_type_filter }
 
   chill.person.export.filter_scope:
     class: Chill\PersonBundle\Export\Filter\SocialWorkFilters\ScopeFilter

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

@@ -696,6 +696,7 @@ origin:
 evaluation:
     delay: Délai
     notificationDelay: Délai de notification
+    url: Lien internet
 
 goal:
    desactivationDate: Date de désactivation