diff --git a/CHANGELOG.md b/CHANGELOG.md index af39c24e3..e50366d93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,30 @@ and this project adheres to * [activity] suggest requestor, user and ressources for adding persons|user|3rdparty * [calendar] suggest persons, professionals and invites for adding persons|3rdparty|user * [activity] take into account the restrictions on person|thirdparties|users visibilities defined in ActivityType +* [main] Add currentLocation to the User entity + add a page for selecting this location + add in the user menu (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/133) +* [activity] add user current location as default location for a new activity (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/133) +* [task] Select2 field in task form to allow search for a user (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/167) +* remove "search by phone configuration option": search by phone is now executed by default +* remplacer le classement par ordre alphabétique par un classement par ordre de pertinence, qui tient compte: + * de la présence d'une string avec le nom de la ville; + * de la similarité; + * du fait que la recherche commence par une partie du mot recherché +* ajouter la recherche par numéro de téléphone directement dans la barre de recherche et dans le formulaire recherche avancée; +* ajouter la recherche par date de naissance directement dans la barre de recherche; +* ajouter la recherche par ville dans la recherche avancée +* ajouter un lien vers le ménage dans les résultats de recherche +* ajouter l'id du parcours dans les résultats de recherche +* ajouter le demandeur dans les résultats de recherche +* ajout d'un bouton "recherche avancée" sur la page d'accueil +* [person] create an accompanying course: add client-side validation if no origin (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/210) +* [person] fix bounds for computing current person address: the new address appears immediatly +* [docgen] create a normalizer and serializer for normalization on doc format +* [person normalization] the key center is now "centers" and is an array. Empty array if no center + + +## Test releases + +### Test release 2021-11-15 * [main] fix adding multiple AddresseDeRelais (combine PickAddressType with ChillCollection) * [person]: do not suggest the current household of the person (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/51) @@ -30,10 +54,6 @@ and this project adheres to * [person suggest] In widget "add person", improve the pertinence of persons when one of the names starts with the pattern; * [person] do not ask for center any more on person creation * [3party] do not ask for center any more on 3party creation -* [task] Select2 field in task form to allow search for a user (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/167) - - -## Test releases ### Test release 2021-11-08 diff --git a/composer.json b/composer.json index 7b356f698..18722a420 100644 --- a/composer.json +++ b/composer.json @@ -91,7 +91,8 @@ }, "autoload-dev": { "psr-4": { - "App\\": "tests/app/src/" + "App\\": "tests/app/src/", + "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests" } }, "minimum-stability": "dev", diff --git a/docs/source/development/access_control_model.rst b/docs/source/development/access_control_model.rst index 58fe44319..e159f7fb6 100644 --- a/docs/source/development/access_control_model.rst +++ b/docs/source/development/access_control_model.rst @@ -23,15 +23,196 @@ Every time an entity is created, viewed or updated, the software check if the us The user must be granted access to the action on this particular entity, with this scope and center. +TL;DR +===== + +Resolve scope and center +------------------------ + +In a service, resolve the center and scope of an entity + +.. code-block:: php + + use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher; + use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher; + + + class MyService { + private ScopeResolverDispatcher $scopeResolverDispatcher; + private CenterResolverDispatcher $centerResolverDispatcher; + + public function myFunction($entity) { + /** @var null|Center[]|Center $center */ + $center = $this->centerResolverDispatcher->resolveCenter($entity); + // $center may be null, an array of center, or an instance of Center + + if ($this->scopeResolverDispatcher->isConcerned($entity) { + /** @var null|Scope[]|Scope */ + $scope = $this-scopeResolverDispatcher->resolveScope($entity); + // $scope may be null, an array of Scope, or an instance of Scope + } + + } + + } + +In twig template, resolve the center: + +.. code-block:: twig + + {# resolve a center #} + + {% if person|chill_resolve_center is not null%} + + {% if person|chill_resolve_center is iterable %} + {% set centers = person|chill_resolve_center %} + {% else %} + {% set centers = [ person|chill_resolve_center ] %} + {% endif %} + + + {{ 'Center'|trans|upper}} : + + {% for c in centers %} + {{ c.name|upper }} + {% if not loop.last %}, {% endif %} + {% endfor %} + {%- endif -%} + +In twig template, resolve the scope: + +.. code-block:: twig + + {% if entity|chill_is_scope_concerned %} + + {% if entity|chill_resolve_scope is iterable %} + {% set scopes = entity|chill_resolve_scope %} + {% else %} + {% set scopes = [ entity|chill_resolve_scope ] %} + {% endif %} + + Scopes : + {% for s in scopes %} + {{ c.name|localize_translatable_string }} + {% if not loop.last %}, {% endif %} + {% endfor %} + {%- endif -%} + +Build a ``Voter`` +----------------- + +.. code-block:: php + + security = $security; + + // we build here a voter helper. This will ease the operations below. + // when the authorization model is changed, it will be easy to make a different implementation + // of the helper, instead of writing all Voters + + $this->voterHelper = $voterHelperFactory + // create a builder with some context + ->generate(self::class) + // add the support of given roles for given class: + ->addCheckFor(Person::class, [self::SEE, self::CREATE]) + ->addCheckFor(PersonDocument::class, $this->getRoles()) + ->build(); + } + + + protected function supports($attribute, $subject) + { + return $this->voterHelper->supports($attribute, $subject); + } + + protected function voteOnAttribute($attribute, $subject, TokenInterface $token) + { + // basic check + if (!$token->getUser() instanceof User) { + return false; + } + + // we first check the acl for associated elements. + // here, we must be able to see the person associated to the document: + if ($subject instanceof PersonDocument + && !$this->security->isGranted(PersonVoter::SEE, $subject->getPerson())) { + + // not possible to see the associated person ? Then, not possible to see the document! + return false; + } + + // the voter helper will implements the logic: + return $this->voterHelper->voteOnAttribute($attribute, $subject, $token); + } + + // all the method below are used to register roles into the admin part + public function getRoles() + { + return [ + self::CREATE, + self::SEE, + self::SEE_DETAILS, + self::UPDATE, + self::DELETE + ]; + } + + public function getRolesWithoutScope() + { + return array(); + } + + + public function getRolesWithHierarchy() + { + return ['PersonDocument' => $this->getRoles() ]; + } + } + + + + From an user point of view --------------------------- +========================== The software is design to allow fine tuned access rights for complicated installation and team structure. The administrators may also decide that every user has the right to see all resources, where team have a more simple structure. Here is an overview of the model. Chill can be multi-center -^^^^^^^^^^^^^^^^^^^^^^^^^ +------------------------- Chill is designed to be installed once for social center who work with multiple teams separated, or for social services's federation who would like to share the same installation of the software for all their members. @@ -42,7 +223,7 @@ Otherwise, it is not required to create multiple center: Chill can also work for Obviously, users working in the different centers are not allowed to see the entities (_persons_, _reports_, _activities_) of other centers. But users may be attached to multiple centers: consequently they will be able to see the entities of the multiple centers they are attached to. Inside center, scope divide team -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +-------------------------------- Users are attached to one or more center and, inside to those center, there may exists differents scopes. The aim of those _scopes_ is to divide the whole team of social worker amongst different departement, for instance: the social team, the psychologist team, the nurse team, the administrative team, ... Each team is granted of different rights amongst scope. For instance, the social team may not see the _activities_ of the psychologist team. The administrative team may see the date & time's activities, but is not allowed to see the detail of those entities (the personal notes, ...). @@ -52,8 +233,38 @@ As entities have only one scopes, if some entities must be shared across two dif Example: if some activities must be seen and updated between nurses and psychologists, the administrator will create a scope "nurse and psy" and add the ability for both team "nurse" and "psychologist" to "create", "see", and "update" the activities belonging to scope "nurse and psy". + +Where does the ``scope`` and ``center`` comes from ? +==================================================== + +Most often, scope and center comes from user's input: + +* when person is created, Chill asks the associated center to the user. Then, every entity associated to the user (Activity, ...) is associated to this center; +* when an entity is created, Chill asks the associated scope. + +The UI check the model before adding those input into form. If the user hae access to only one center or scope, this scope or center is filled automatically, and the UI does not ask the user. Most of the times, the user does not see "Pick a scope" and "Pick a center" inputs. + +Scope and Center are associated to entities through ``ManyToOne`` properties, which are then mapped to ``FOREIGN KEY`` in tables, ... + +But sometimes, this implementation does not fits the needs: + +* persons are associated to center *geographically*: the address of each person contains lat/lon coordinates, and the center is resolved from this coordinated; +* some would like to associated persons to multiple center, or one center; +* entities are associated to scope through the job reached by "creator" (an user); +* some would like not to use scope at all; +* … + +For this reasons, associated center and scopes must be resolved programmatically. The default implementation rely on the model association, as described above. But it becomes possible to change the behaviour on different implementations. + +Is my entity "concerned" by scopes ? +------------------------------------ + +Some entities are concerned by scope, some not. + +This is also programmatically resolved. + The concepts translated into code ------------------------------------ +=================================== .. figure:: /_static/access_control_model.png @@ -81,7 +292,7 @@ At each step of his lifetime (creation, view of the entity and eventually of his All those action are executed through symfony voters and helpers. How to check authorization ? ----------------------------- +============================ Just use the symfony way-of-doing, but do not forget to associate the entity you want to check access. For instance, in controller : @@ -100,34 +311,23 @@ Just use the symfony way-of-doing, but do not forget to associate the entity you And in template : -.. code-block:: html+jinja +.. code-block:: twig {{ if is_granted('CHILL_ENTITY_SEE', entity) %}print something{% endif %} -Retrieving reachable scopes and centers ----------------------------------------- +Retrieving reachable scopes and centers for a user +-------------------------------------------------- -The class :class:`Chill\\MainBundle\\Security\\Authorization\\AuthorizationHelper` helps you to get centers and scope reachable by a user. +The class :class:`Chill\\MainBundle\\Security\\Authorization\\AuthorizationHelperInterface` helps you to get centers and scope reachable by a user. Those methods are intentionnaly build to give information about user rights: - getReachableCenters: to get reachable centers for a user - getReachableScopes : to get reachable scopes for a user -.. note:: - - The service is reachable through the Depedency injection with the key `chill.main.security.authorization.helper`. Example : - - .. code-block:: php - - $helper = $container->get('chill.main.security.authorization.helper'); - -.. todo:: - - Waiting for a link between our api and this doc, we invite you to read the method signatures `here `_ Adding your own roles -===================== +--------------------- Extending Chill will requires you to define your own roles and rules for your entities. You will have to define your own voter to do so. @@ -152,7 +352,7 @@ To create your own roles, you should: Declare your role ------------------- +^^^^^^^^^^^^^^^^^^ To declare new role, implement the class :class:`Chill\\MainBundle\\Security\\ProvideRoleInterface`. @@ -212,69 +412,8 @@ Example of an implementation of :class:`Chill\\MainBundle\\Security\\ProvideRole } -Implement your voter --------------------- - -Inside this class, you might use the :class:`Chill\\MainBundle\\Security\\Authorization\\AuthorizationHelper` to check permission (do not re-invent the wheel). This is a real-world example: - -.. code-block:: php - - namespace Chill\ReportBundle\Security\Authorization; - use Chill\MainBundle\Security\Authorization\AbstractChillVoter; - use Chill\MainBundle\Security\Authorization\AuthorizationHelper; - - - class ReportVoter extends AbstractChillVoter - { - const CREATE = 'CHILL_REPORT_CREATE'; - const SEE = 'CHILL_REPORT_SEE'; - const UPDATE = 'CHILL_REPORT_UPDATE'; - - /** - * - * @var AuthorizationHelper - */ - protected $helper; - - public function __construct(AuthorizationHelper $helper) - { - $this->helper = $helper; - } - - protected function getSupportedAttributes() - { - return array(self::CREATE, self::SEE, self::UPDATE); - } - protected function getSupportedClasses() - { - return array('Chill\ReportBundle\Entity\Report'); - } - protected function isGranted($attribute, $report, $user = null) - { - if (! $user instanceof \Chill\MainBundle\Entity\User){ - - return false; - } - - return $this->helper->userHasAccess($user, $report, $attribute); - } - } - -Then, you will have to declare the service and tag it as a voter : - -.. code-block:: yaml - - services: - chill.report.security.authorization.report_voter: - class: Chill\ReportBundle\Security\Authorization\ReportVoter - arguments: - - "@chill.main.security.authorization.helper" - tags: - - { name: security.voter } - - Adding role hierarchy ---------------------- +^^^^^^^^^^^^^^^^^^^^^ You should prepend Symfony's security component directly from your code. @@ -312,3 +451,484 @@ You should prepend Symfony's security component directly from your code. } + +Implement your voter +^^^^^^^^^^^^^^^^^^^^ + +Most of the time, Voter will check that: + +1. The given role is reachable (= ``$attribute``) +2. for the given center, +3. and, if any, for the given role +4. if the entity is associated to another entity, this entity should be, at least, viewable by the user. + +Thats what we call the "autorization logic". But this logic may be replace by a new one, and developers should take care of it. + + +Then voter implementation should take care of: + +* check the access to associated entities. For instance, if an ``Activity`` is associated to a ``Person``, the voter should first check that the user can show the associated ``Person``; +* as far as possible, delegates the check for associated center, scopes, and check for authorization using the authorization logic. VoterHelper will ease the most common operation of this logic. + +This is an example of implementation: + + +.. code-block:: php + + security = $security; + + // we build here a voter helper. This will ease the operations below. + // when the authorization model is changed, it will be easy to make a different implementation + // of the helper, instead of writing all Voters + + $this->voterHelper = $voterHelperFactory + // create a builder with some context + ->generate(self::class) + // add the support of given roles for given class: + ->addCheckFor(Person::class, [self::SEE, self::CREATE]) + ->addCheckFor(PersonDocument::class, $this->getRoles()) + ->build(); + } + + + protected function supports($attribute, $subject) + { + return $this->voterHelper->supports($attribute, $subject); + } + + protected function voteOnAttribute($attribute, $subject, TokenInterface $token) + { + // basic check + if (!$token->getUser() instanceof User) { + return false; + } + + // we first check the acl for associated elements. + // here, we must be able to see the person associated to the document: + if ($subject instanceof PersonDocument + && !$this->security->isGranted(PersonVoter::SEE, $subject->getPerson())) { + + // not possible to see the associated person ? Then, not possible to see the document! + return false; + } + + // the voter helper will implements the logic of checking: + // 1. that the center is reachable + // 2. for this given entity + // 3. for this given scope + // 4. and for the given role + return $this->voterHelper->voteOnAttribute($attribute, $subject, $token); + } + + public function getRoles() + { + // ... + } + + public function getRolesWithoutScope() + { + // ... + } + + + public function getRolesWithHierarchy() + { + // ... + } + } + +Then, you will have to declare the service and tag it as a voter : + +.. code-block:: yaml + + services: + chill.report.security.authorization.report_voter: + class: Chill\ReportBundle\Security\Authorization\ReportVoter + arguments: + - "@chill.main.security.authorization.helper" + tags: + - { name: security.voter } + + +How to resolve scope and center programmatically ? +================================================== + +In a service, resolve the center and scope of an entity + +.. code-block:: php + + use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher; + use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher; + + + class MyService { + private ScopeResolverDispatcher $scopeResolverDispatcher; + private CenterResolverDispatcher $centerResolverDispatcher; + + public function myFunction($entity) { + /** @var null|Center[]|Center $center */ + $center = $this->centerResolverDispatcher->resolveCenter($entity); + // $center may be null, an array of center, or an instance of Center + + if ($this->scopeResolverDispatcher->isConcerned($entity) { + /** @var null|Scope[]|Scope */ + $scope = $this-scopeResolverDispatcher->resolveScope($entity); + // $scope may be null, an array of Scope, or an instance of Scope + } + + } + + } + +In twig template, resolve the center: + +.. code-block:: twig + + {# resolve a center #} + + {% if person|chill_resolve_center is not null%} + + {% if person|chill_resolve_center is iterable %} + {% set centers = person|chill_resolve_center %} + {% else %} + {% set centers = [ person|chill_resolve_center ] %} + {% endif %} + + + {{ 'Center'|trans|upper}} : + + {% for c in centers %} + {{ c.name|upper }} + {% if not loop.last %}, {% endif %} + {% endfor %} + {%- endif -%} + +In twig template, resolve the scope: + +.. code-block:: twig + + {% if entity|chill_is_scope_concerned %} + + {% if entity|chill_resolve_scope is iterable %} + {% set scopes = entity|chill_resolve_scope %} + {% else %} + {% set scopes = [ entity|chill_resolve_scope ] %} + {% endif %} + + Scopes : + {% for s in scopes %} + {{ c.name|localize_translatable_string }} + {% if not loop.last %}, {% endif %} + {% endfor %} + {%- endif -%} + +What is the default implementation of Scope and Center resolver ? +----------------------------------------------------------------- + +By default, the implementation rely on association into entities. + +* implements ``Chill\MainBundle\Entity\HasCenterInterface`` on entities which have one or any center; +* implements ``Chill\MainBundle\Entity\HasCentersInterface`` on entities which have one, multiple or any centers; +* implements ``Chill\MainBundle\Entity\HasScopeInterface`` on entities which have one or any scope; +* implements ``Chill\MainBundle\Entity\HasScopesInterface`` on entities which have one or any scopes; + +Then, the default implementation will resolve the center and scope based on the implementation in your model. + +How to change the default behaviour ? +------------------------------------- + +Implements those interface into services: + +* ``Chill\MainBundle\Security\Resolver\CenterResolverInterface``; +* ``Chill\MainBundle\Security\Resolver\ScopeResolverInterface``; + +Authorization into lists and index pages +======================================== + +Due to the fact that authorization model may be overriden, "list" and "index" pages should not rely on center and scope from controller. This must be delegated to dedicated service, which will be aware of the authorization model. We call them ``ACLAwareRepository``. This service must implements an interface, in order to allow to change the implementation. + +The controller **must not** performs any DQL or SQL query. + +Example in a controller: + +.. code-block:: php + + namespace Chill\TaskBundle\Controller; + + use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; + use Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface; + + + final class SingleTaskController extends AbstractController + { + + private SingleTaskAclAwareRepositoryInterface $singleTaskAclAwareRepository; + + /** + * + * @Route( + * "/{_locale}/task/single-task/list", + * name="chill_task_singletask_list" + * ) + */ + public function listAction( + Request $request + ) { + $this->denyAccessUnlessGranted(TaskVoter::SHOW, null); + + $nb = $this->singleTaskAclAwareRepository->countByAllViewable( + '', // search pattern + [] // search flags + ); + $paginator = $this->paginatorFactory->create($nb); + + if (0 < $nb) { + $tasks = $this->singleTaskAclAwareRepository->findByAllViewable( + '', // search pattern + [] // search flags + $paginator->getCurrentPageFirstItemNumber(), + $paginator->getItemsPerPage(), + // ordering: + [ + 'startDate' => 'DESC', + 'endDate' => 'DESC', + ] + ); + } else { + $tasks = []; + } + + return $this->render('@ChillTask/SingleTask/List/index.html.twig', [ + 'tasks' => $tasks, + 'paginator' => $paginator, + 'filter_order' => $filterOrder + ]); + } + } + +Writing ``ACLAwareRepository`` +------------------------------ + +The ACLAwareRepository should rely on interfaces +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +As described above, the ACLAwareRepository will perform the query for listing entities, and take care of authorization. + +Those "ACLAwareRepositories" must be described into ``interfaces``. + +The service must rely on this interface, and not on the default implementation. + +Example: at first, we design an interface for listing ``SingleTask`` entities: + + +.. code-block:: php + + buildQuery($criterias); + + return $this->addAuthorizations($qb)->select("COUNT(e)")->getQuery()->getResult()->getSingleScalarResult(); + } + + public function findByAuthorized(array $criteria, int $start, int $limit, array $orderBy): array + { + $qb = $this->buildQuery($criterias); + + return $this->getResult($this->addAuthorizations($qb), $start, $limit, $orderBy); + } + + public function getResult(QueryBuilder $qb, int $start, int $limit, array $orderBy): array + { + $qb + ->setFirstResult($start) + ->setMaxResults($limit) + ; + + // add order by logic + + return $qb->getQuery()->getResult(); + } + + public function buildQuery(array $criterias): QueryBuilder + { + $qb = $this->em->createQueryBuilder(); + + // implement you logic with search criteria here + + return $qb; + } + + private function addAuthorizations(QueryBuilder $qb): QueryBuilder + { + // add authorization logic here + return $qb; + } + + } + +Once this logic is executed, it becomes easy to make a new implementation of the repository: + +.. code-block:: php + + namespace Chill\MyOtherBundle\Repository; + + use Doctrine\ORM\EntityManagerInterface; + use Doctrine\ORM\QueryBuilder; + use Chill\MyBundle\Repository\MyEntityACLAwareRepository + + + final class AnotherEntityACLAwareRepository implements MyEntityACLAwareRepositoryInterface { + + private EntityManagerInterface $em; + private \Chill\MyBundle\Repository\MyEntityACLAwareRepository $initial; + + public function __construct( + EntityManagerInterface $em, + \Chill\MyBundle\Repository\MyEntityACLAwareRepository $initial + ) { + $this->em = $em; + $this->initial = $initial; + } + + public function countByAuthorized(array $criterias): int + { + $qb = $this->initial->buildQuery($criterias); + + return $this->addAuthorizations($qb)->select("COUNT(e)")->getQuery()->getResult()->getSingleScalarResult(); + } + + public function findByAuthorized(array $criteria, int $start, int $limit, array $orderBy): array + { + $qb = $this->initial->buildQuery($criterias); + + return $this->initial->getResult($this->addAuthorizations($qb), $start, $limit, $orderBy); + } + + private function addAuthorizations(QueryBuilder $qb): QueryBuilder + { + // add a different authorization logic here + return $qb; + } + + } + +Then, register this service and decorates the old one: + +.. code-block:: yaml + + services: + Chill\MyOtherBundle\Repository\AnotherEntityACLAwareRepository: + autowire: true + autoconfigure: true + decorates: Chill\MyBundle\Repository\MyEntityACLAwareRepositoryInterface: + + + + diff --git a/phpstan-types.neon b/phpstan-types.neon index f10574600..dca84e17f 100644 --- a/phpstan-types.neon +++ b/phpstan-types.neon @@ -705,11 +705,6 @@ parameters: count: 1 path: src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php - - - message: "#^Method Chill\\\\PersonBundle\\\\Search\\\\SimilarityPersonSearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#" - count: 1 - path: src/Bundle/ChillPersonBundle/Search/SimilarityPersonSearch.php - - message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#" count: 1 diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 46b6698ec..7943ab3aa 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -4,6 +4,7 @@ parameters: - src/ excludePaths: - src/Bundle/*/Tests/* + - src/Bundle/*/tests/* - src/Bundle/*/Test/* - src/Bundle/*/config/* - src/Bundle/*/migrations/* diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 3faa756b3..80367c691 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -37,6 +37,9 @@ src/Bundle/ChillCalendarBundle/Tests/ + + src/Bundle/ChillDocGeneratorBundle/tests/ + diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php index 5e7e0de21..3f8356bb4 100644 --- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php +++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php @@ -298,16 +298,19 @@ final class ActivityController extends AbstractController $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']); + $defaultLocationId = $this->getUser()->getCurrentLocation()->getId(); + return $this->render($view, [ 'person' => $person, 'accompanyingCourse' => $accompanyingPeriod, 'entity' => $entity, 'form' => $form->createView(), - 'activity_json' => $activity_array + 'activity_json' => $activity_array, + 'default_location_id' => $defaultLocationId ]); } - public function showAction(Request $request, $id): Response + public function showAction(Request $request, int $id): Response { $view = null; @@ -361,7 +364,7 @@ final class ActivityController extends AbstractController /** * Displays a form to edit an existing Activity entity. */ - public function editAction($id, Request $request): Response + public function editAction(int $id, Request $request): Response { $view = null; diff --git a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php index 18a6f83d3..015900043 100644 --- a/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php +++ b/src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php @@ -36,6 +36,8 @@ use Chill\MainBundle\DataFixtures\ORM\LoadScopes; class LoadActivity extends AbstractFixture implements OrderedFixtureInterface { + use \Symfony\Component\DependencyInjection\ContainerAwareTrait; + /** * @var \Faker\Generator */ @@ -80,15 +82,10 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface * * @return \Chill\ActivityBundle\Entity\ActivityReason */ - private function getRandomActivityReason(array $excludingIds) + private function getRandomActivityReason() { $reasonRef = LoadActivityReason::$references[array_rand(LoadActivityReason::$references)]; - if (in_array($this->getReference($reasonRef)->getId(), $excludingIds, true)) { - // we have a reason which should be excluded. Find another... - return $this->getRandomActivityReason($excludingIds); - } - return $this->getReference($reasonRef); } @@ -103,7 +100,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface return $this->getReference($userRef); } - public function newRandomActivity($person) + public function newRandomActivity($person): ?Activity { $activity = (new Activity()) ->setUser($this->getRandomUser()) @@ -116,11 +113,13 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface // ->setAttendee($this->faker->boolean()) - $usedId = array(); for ($i = 0; $i < rand(0, 4); $i++) { - $reason = $this->getRandomActivityReason($usedId); - $usedId[] = $reason->getId(); - $activity->addReason($reason); + $reason = $this->getRandomActivityReason(); + if (null !== $reason) { + $activity->addReason($reason); + } else { + return null; + } } return $activity; @@ -137,7 +136,9 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface for ($i = 0; $i < $activityNbr; $i ++) { $activity = $this->newRandomActivity($person); - $manager->persist($activity); + if (null !== $activity) { + $manager->persist($activity); + } } } $manager->flush(); diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue index f152e7346..721f136a9 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue @@ -10,9 +10,12 @@
-
    +
    • - {{ p.text }} + + + {{ p.text }} +
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue index bef11159c..0b2dd6613 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue @@ -4,7 +4,7 @@ {{ textCutted }} - diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue index c8d1472bd..5fa3360b7 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue @@ -55,16 +55,17 @@ export default { } }, mounted() { - this.getLocationsList(); + getLocations().then(response => new Promise(resolve => { + console.log('getLocations', response); + this.locations = response.results; + if (window.default_location_id) { + let location = this.locations.filter(l => l.id === window.default_location_id); + this.$store.dispatch('updateLocation', location); + } + resolve(); + })) }, methods: { - getLocationsList() { - getLocations().then(response => new Promise(resolve => { - console.log('getLocations', response); - this.locations = response.results; - resolve(); - })) - }, customLabel(value) { return `${value.locationType.title.fr} ${value.name ? value.name : ''}`; } diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js index 01c56f5c2..ec937cc27 100644 --- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js +++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js @@ -55,6 +55,9 @@ const store = createStore({ .filter((p) => !existingPersonIds.includes(p.id)); }, suggestedRequestor(state) { + if (state.activity.accompanyingPeriod.requestor === null) { + return []; + } const existingPersonIds = state.activity.persons.map((p) => p.id); const existingThirdPartyIds = state.activity.thirdParties.map( (p) => p.id @@ -74,7 +77,7 @@ const store = createStore({ return state.activity.activityType.usersVisible === 0 ? [] : [state.activity.accompanyingPeriod.user].filter( - (u) => !existingUserIds.includes(u.id) + (u) => u !== null && !existingUserIds.includes(u.id) ); }, suggestedResources(state) { diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig index 1e1d65d91..f4a3d4d29 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig @@ -27,14 +27,16 @@ {{ activity.type.name | localize_translatable_string }}