Merge branch 'master' into social_action_exports

2025-08-20 22:53:49 +00:00 · 2022-07-28 15:45:46 +02:00
parent e6b66216ae da556248d4
commit 8fdb2747ac
73 changed files with 1108 additions and 757 deletions
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -21,6 +21,7 @@ use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
@@ -56,6 +57,8 @@ final class ActivityController extends AbstractController

    private ActivityTypeRepository $activityTypeRepository;

+    private CenterResolverManagerInterface $centerResolver;
+
    private EntityManagerInterface $entityManager;

    private EventDispatcherInterface $eventDispatcher;
@@ -82,7 +85,8 @@ final class ActivityController extends AbstractController
        EntityManagerInterface $entityManager,
        EventDispatcherInterface $eventDispatcher,
        LoggerInterface $logger,
-        SerializerInterface $serializer
+        SerializerInterface $serializer,
+        CenterResolverManagerInterface $centerResolver
    ) {
        $this->activityACLAwareRepository = $activityACLAwareRepository;
        $this->activityTypeRepository = $activityTypeRepository;
@@ -96,6 +100,7 @@ final class ActivityController extends AbstractController
        $this->eventDispatcher = $eventDispatcher;
        $this->logger = $logger;
        $this->serializer = $serializer;
+        $this->centerResolver = $centerResolver;
    }

    /**
@@ -198,7 +203,7 @@ final class ActivityController extends AbstractController
        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);

        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
+            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
@@ -416,7 +421,7 @@ final class ActivityController extends AbstractController
        $this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);

        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
+            'center' => $this->centerResolver->resolveCenters($entity)[0] ?? null,
            'role' => new Role('CHILL_ACTIVITY_CREATE'),
            'activityType' => $entity->getActivityType(),
            'accompanyingPeriod' => $accompanyingPeriod,
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -61,8 +61,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
                ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
                ActivityVoter::FULL => [
-                    ActivityVoter::CREATE_PERSON,
-                    ActivityVoter::CREATE_ACCOMPANYING_COURSE,
                    ActivityVoter::DELETE,
                    ActivityVoter::UPDATE,
                ],
--- a/src/Bundle/ChillActivityBundle/Entity/Activity.php
+++ b/src/Bundle/ChillActivityBundle/Entity/Activity.php
@@ -16,8 +16,8 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
-use Chill\MainBundle\Entity\HasCenterInterface;
-use Chill\MainBundle\Entity\HasScopeInterface;
+use Chill\MainBundle\Entity\HasCentersInterface;
+use Chill\MainBundle\Entity\HasScopesInterface;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
@@ -55,7 +55,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 *     getUserFunction="getUser",
 * path="scope")
 */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
+class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCentersInterface, HasScopesInterface
 {
    public const SENTRECEIVED_RECEIVED = 'received';

@@ -306,13 +306,17 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     * get the center
     * center is extracted from person.
     */
-    public function getCenter(): ?Center
+    public function getCenters(): iterable
    {
        if ($this->person instanceof Person) {
-            return $this->person->getCenter();
+            return [$this->person->getCenter()];
        }

-        return null;
+        if ($this->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
+            return $this->getAccompanyingPeriod()->getCenters() ?? [];
+        }
+
+        return [];
    }

    public function getComment(): CommentEmbeddable
@@ -422,6 +426,19 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
        return $this->scope;
    }

+    public function getScopes(): iterable
+    {
+        if (null !== $this->getAccompanyingPeriod()) {
+            return $this->getAccompanyingPeriod()->getScopes();
+        }
+
+        if (null !== $this->getPerson()) {
+            return [$this->scope];
+        }
+
+        return [];
+    }
+
    public function getSentReceived(): string
    {
        return $this->sentReceived;
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -14,17 +14,20 @@ namespace Chill\ActivityBundle\Form;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\DocStoreBundle\Form\StoredObjectType;
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Form\Type\PrivateCommentType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
@@ -50,6 +53,7 @@ use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;

+use Symfony\Component\Security\Core\Role\Role;
 use function in_array;

 class ActivityType extends AbstractType
@@ -109,19 +113,18 @@ class ActivityType extends AbstractType
        $activityType = $options['activityType'];

        // TODO revoir la gestion des center au niveau du form des activité.
-        if ($options['center']) {
+        if ($options['center'] instanceof Center && null !== $options['data']->getPerson()) {
            $builder->add('scope', ScopePickerType::class, [
                'center' => $options['center'],
-                'role' => $options['role'],
-                // TODO make required again once scope and rights are fixed
-                'required' => false,
+                'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
+                'required' => true,
            ]);
        }

        /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
        $accompanyingPeriod = null;

-        if ($options['accompanyingPeriod']) {
+        if ($options['accompanyingPeriod'] instanceof AccompanyingPeriod) {
            $accompanyingPeriod = $options['accompanyingPeriod'];
        }

@@ -218,12 +221,10 @@ class ActivityType extends AbstractType
            ]);
        }

-        if ($activityType->isVisible('user') && $options['center']) {
-            $builder->add('user', UserPickerType::class, [
+        if ($activityType->isVisible('user') && $options['center'] instanceof Center) {
+            $builder->add('user', PickUserDynamicType::class, [
                'label' => $activityType->getLabel('user'),
                'required' => $activityType->isRequired('user'),
-                'center' => $options['center'],
-                'role' => $options['role'],
            ]);
        }

@@ -442,8 +443,8 @@ class ActivityType extends AbstractType

        $resolver
            ->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
-            ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
-            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
+            ->setAllowedTypes('center', ['null', Center::class])
+            ->setAllowedTypes('role', [Role::class, 'string'])
            ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
    }
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
@@ -120,3 +120,11 @@

 {{ form_end(edit_form) }}
 {# {{ form(delete_form) }} #}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
@@ -46,7 +46,7 @@

    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}

-    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
    <ul class="record_actions sticky-form-buttons">
        <li>
            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
@@ -119,3 +119,11 @@
  </li>
 </ul>
 {{ form_end(form) }}
+
+{% block js %}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -133,7 +133,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn

                // change attribute CREATE
                if (self::CREATE === $attribute) {
-                    $attribute = self::CREATE_PERSON;
+                    return $this->voterHelper->voteOnAttribute(self::CREATE_PERSON, $subject->getPerson(), $token);
                }
            } elseif ($subject->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod())) {
@@ -144,7 +144,8 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                    if (AccompanyingPeriod::STEP_CLOSED === $subject->getAccompanyingPeriod()->getStep()) {
                        return false;
                    }
-                    $attribute = self::CREATE_ACCOMPANYING_COURSE;
+
+                    return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject->getAccompanyingPeriod(), $token);
                }
            } else {
                throw new RuntimeException('Could not determine context of activity.');
@@ -158,12 +159,12 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn

            // transform the attribute
            if (self::CREATE === $attribute) {
-                $attribute = self::CREATE_ACCOMPANYING_COURSE;
+                return $this->voterHelper->voteOnAttribute(self::CREATE_ACCOMPANYING_COURSE, $subject, $token);
            }
        } elseif ($subject instanceof Person) {
            // transform the attribute
            if (self::CREATE === $attribute) {
-                $attribute = self::CREATE_PERSON;
+                return $this->voterHelper->voteOnAttribute(self::CREATE_PERSON, $subject, $token);
            }
        }

--- a/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
+++ b/src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
@@ -130,8 +130,10 @@ class ActivityContext implements
                        return $this->personRender->renderString($p, []);
                    },
                    'multiple' => false,
+                    'required' => false,
                    'expanded' => true,
                    'label' => $options[$key . 'Label'],
+                    'placeholder' => $this->translator->trans('Any person selected'),
                ]);
            }
        }