fix banners: resolve_center is always an iterable

.gitignore

@@ -20,5 +20,3 @@ docs/build/
 .phpunit.result.cache
 ###< phpunit/phpunit ###
 
-/.php-cs-fixer.cache
-/.idea/

.gitlab-ci.yml

@@ -1,87 +1,50 @@
 ---
+image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
 
 # Select what we should cache between builds
 cache:
-    paths:
+  paths:
-        - tests/app/vendor/
+    - tests/app/vendor/
-        - .cache
+    - .composer
+
+before_script:
+  # add extensions to postgres
+  - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;"
+  # Install and run Composer
+  - mkdir -p $COMPOSER_HOME
+  - curl -sS https://getcomposer.org/installer | php
+  - php -d memory_limit=2G composer.phar install
+  - php tests/app/bin/console doctrine:migrations:migrate -n
+  - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev
+  - php -d memory_limit=3G tests/app/bin/console doctrine:fixtures:load -n
+  - php -d memory_limit=2G tests/app/bin/console cache:clear --env=test
+  - echo "before_script finished"
 
 # Bring in any services we need http://docs.gitlab.com/ee/ci/docker/using_docker_images.html#what-is-a-service
 # See http://docs.gitlab.com/ee/ci/services/README.html for examples.
 services:
-    - name: postgis/postgis:12-3.1-alpine
+  - name: postgis/postgis:12-3.1-alpine
-      alias: db
+    alias: db
-    - name: redis
+  - name: redis
-      alias: redis
+    alias: redis
 
 # Set any variables we need
 variables:
-    GIT_DEPTH: 1
+  # Configure postgres environment variables (https://hub.docker.com/r/_/postgres/)
-    # Configure postgres environment variables (https://hub.docker.com/r/_/postgres/)
+  POSTGRES_USER: postgres
-    POSTGRES_USER: postgres
+  POSTGRES_PASSWORD: postgres
-    POSTGRES_PASSWORD: postgres
+  # fetch the chill-app using git submodules
-    # fetch the chill-app using git submodules
+  GIT_SUBMODULE_STRATEGY: recursive
-    GIT_SUBMODULE_STRATEGY: recursive
+  REDIS_HOST: redis
-    REDIS_HOST: redis
+  REDIS_PORT: 6379
-    REDIS_PORT: 6379
+  REDIS_URL: redis://redis:6379
-    REDIS_URL: redis://redis:6379
+  # change vendor dir to make the app install into tests/apps
-    # change vendor dir to make the app install into tests/apps
+  COMPOSER_VENDOR_DIR: tests/app/vendor
-    COMPOSER_VENDOR_DIR: tests/app/vendor
+  # cache some composer data
+  COMPOSER_HOME: .composer
 
-stages:
-    - Composer install
-    - Tests
 
-build:
+# Run our tests
-    stage: Composer install
+test:
-    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
+  script:
-    before_script:
+    - php -d memory_limit=3G bin/phpunit --colors=never
-        - curl -sS https://getcomposer.org/installer | php
-        - php -d memory_limit=2G composer.phar config -g cache-dir "$(pwd)/.cache"
-    script:
-        - php -d memory_limit=2G composer.phar install --optimize-autoloader --no-ansi --no-interaction --no-progress
-    cache:
-        paths:
-            - .cache/
-    artifacts:
-        expire_in: 30 min
-        paths:
-            - bin
-            - tests/app/vendor/
-
-code_style:
-    stage: Tests
-    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
-    script:
-        - bin/grumphp run --tasks=phpcsfixer
-    artifacts:
-        expire_in: 30 min
-        paths:
-            - bin
-            - tests/app/vendor/
-
-sa_tests:
-    stage: Tests
-    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
-    script:
-        - bin/grumphp run --tasks=phpstan
-    artifacts:
-        expire_in: 30 min
-        paths:
-            - bin
-            - tests/app/vendor/
-
-unit_tests:
-    stage: Tests
-    image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
-    script:
-        - php tests/app/bin/console doctrine:migrations:migrate -n
-        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=dev
-        - php -d memory_limit=3G tests/app/bin/console doctrine:fixtures:load -n
-        - php -d memory_limit=2G tests/app/bin/console cache:clear --env=test
-        - php -d memory_limit=3G bin/phpunit --colors=never
-    artifacts:
-        expire_in: 30 min
-        paths:
-            - bin
-            - tests/app/vendor/

.php_cs.dist.php

@@ -1,79 +0,0 @@
-<?php
-
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
-/** @var \drupol\PhpCsFixerConfigsPhp\Config\Php73 $config */
-$config = require __DIR__ . '/tests/app/vendor/drupol/php-conventions/config/php73/php_cs_fixer.config.php';
-
-$config
-    ->getFinder()
-    ->ignoreDotFiles(false)
-    ->notPath('tests/app')
-    ->name(['.php_cs.dist.php']);
-
-$rules = $config->getRules();
-
-$riskyRules = [
-    'ternary_to_elvis_operator' => false,
-    'php_unit_mock_short_will_return' => false,
-    'php_unit_set_up_tear_down_visibility' => false,
-    'php_unit_construct' => false,
-    'php_unit_dedicate_assert' => false,
-    'php_unit_expectation' => false,
-    'php_unit_mock' => false,
-    'php_unit_namespaced' => false,
-    'php_unit_no_expectation_annotation' => false,
-    'php_unit_test_case_static_method_calls' => false,
-    'php_unit_test_annotation' => false,
-    //    'final_internal_class' => false,
-    //    'strict_param' => false,
-    //    'declare_strict_types' => false,
-    //    'strict_comparison' => false,
-    //    'no_unreachable_default_argument_value' => false,
-    //    'ereg_to_preg' => false,
-    //    'ordered_interfaces' => false,
-    //    'error_suppression' => false,
-    //    'non_printable_character' => false,
-    //    'ordered_traits' => false,
-    //    'no_useless_sprintf' => false,
-    //    'dir_constant' => false,
-    //    'no_alias_functions' => false,
-    //    'implode_call' => false,
-    //    'combine_nested_dirname' => false,
-    //    'pow_to_exponentiation' => false,
-    //    'comment_to_phpdoc' => false,
-    //    'no_unset_on_property' => false,
-    //    'native_constant_invocation' => false,
-    //    'function_to_constant' => false,
-    //    'is_null' => false,
-    //    'native_function_invocation' => false,
-    //    'no_trailing_whitespace_in_string' => false,
-    //    'array_push' => false,
-    //    'fopen_flag_order' => false,
-    //    'fopen_flags' => false,
-    //    'logical_operators' => false,
-    //    'modernize_types_casting' => false,
-    //    'no_homoglyph_names' => false,
-    //    'no_unneeded_final_method' => false,
-    //    'random_api_migration' => false,
-    //    'static_lambda' => false,
-    //    'set_type_to_cast' => false,
-    //    'string_line_ending' => false,
-    //    'psr_autoloading' => false,
-];
-
-$rules = array_merge(
-    $rules,
-    $riskyRules
-);
-
-$rules['header_comment']['header'] = trim(file_get_contents(__DIR__ . '/resource/header.txt'));
-
-return $config->setRules($rules);

CHANGELOG.md

@@ -11,53 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-* [person search] fix bug when using birthdate after and birthdate before
-* [person search] increase pertinence when lastname begins with search pattern
 
-## Test releases
-
-### Test release 2021-11-19 - bis
-
-* [household] do not allow to create two addresses on the same date
-* [activity] handle case when there is no social action associated to social issue
-* [activity] layout for issues / actions
-* [activity][bugfix] in edit mode, the form will now load the social action list
-
-### Test release 2021-11-29
-
-* [person] suggest entities (person | thirdparty) when creating/editing the accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/119)
-* [activity] add custom validation on the Activity class, based on what is required from the ActivityType (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/188)
-* [main] translate multiselect messages when selecting/creating address
-* [main] set the coordinates of the city when creating a new address OR choosing "pas d'adresse complète"
-* Use the user.label in accompanying course banner, instead of username;
-* fix: show validation message when closing accompanying course;
-* [thirdparty] link from modal to thirdparty detail page fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/228)
-* [assets] new asset to style suggestions lists (with add/remove item link) (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/258)
-* [accompanyingCourseWorkEdit] improves hyphenation and line breaks for long badges
-* [acompanyingCourse] improve Resume page
-  * complete all needed informations,
-  * actions and activities are clickables,
-  * better placement with js masonry blocks on top of content area,
-  * https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/101
-  * https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/295
-* [activity/calendar] on show page, concerned groups of persons table adapt itself to isVisibles options
-* [activity] remove the "plus" button in activity list
-* [activity] check ACL on activity list in person context
-* [list for accompanying course in person] filter list using ACL
-* [validation] toasts are displayed for errors when modifying accompanying course (generalization required).
-* [period] only the user can enable confidentiality
-* add an endpoint for checking permissions. See https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/232
-* [activity] for a new activity: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
-* [calendar] for a new rdv: suggest and create on-the-fly locations based on the accompanying course location + location of the suggested parties
-
-### Test release 2021-11-22
-
-* [activity] delete admin_user_show in twig template because this route is not defined and should be defined
-* [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:
@@ -74,11 +28,9 @@ and this project adheres to
 * [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
+
-* [accompanyingCourse] Ability to close accompanying course (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/296)
+
-* [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
-* [list result] show all courses, except ones with period closed
-* [accompanyingCourse] improve banner with small carousel to display slide social-issues or slide associated persons (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/69)
 
 ### Test release 2021-11-15
 
@@ -96,8 +48,6 @@ and this project adheres to
 * [person] do not ask for center any more on person creation
 * [3party] do not ask for center any more on 3party creation
 
-## Test releases
-
 ### Test release 2021-11-08
 
 * [person]: Display the name of a user when searching after a User (TMS)

CONVENTIONS.md

@@ -98,7 +98,7 @@ Finalement, il importe ici de définir ce qu'est un bloc, ce qu'est une zone d'a
 
 Par exemple pour mettre un style au titre on précise juste h3 dans la cascade bloc.
 
-```scss
+```sass
 div.bloc {
    // un bloc générique, utilisé à plusieurs endroits
    &.bloc-dark {
@@ -381,31 +381,3 @@ A chaque fois qu'un lien est indiqué, vérifier si on ne doit pas utiliser la f
     * utiliser `chill_return_path_or` dans le bouton "Cancel";
     * pour les boutons "enregistrer et voir" et "Enregistrer et fermer" => ?
 
-### Assets pour les listes de suggestion
-
-Créer une liste de suggestions à ajouter (tout l'item est cliquable)
-```html
-<ul class="list-suggest add-items">
-   <li>
-      <span>item</span>
-   </li>
-</ul>
-```
-Créer une liste de suggestions à enlever (avec une croix rouge cliquable, l'ancre a est vide)
-```html
-<ul class="list-suggest remove-items">
-    <li>
-        <span>
-            item
-            <a></a>
-        </span>
-    </li>
-</ul>
-```
-Créer un titre enlevable (avec une croix rouge cliquable, l'ancre a est vide)
-```html
-<div class="item-title">
-    title
-    <a></a>
-</div>
-```

LICENSE

@@ -629,12 +629,12 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
+    chill-bundles
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 2021  Chill Project
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
+    it under the terms of the GNU Affero General Public License as published
-    the Free Software Foundation, either version 3 of the License, or
+    by the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,

composer.json

@@ -52,9 +52,10 @@
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
-        "drupol/php-conventions": "^5",
         "fakerphp/faker": "^1.13",
         "nelmio/alice": "^3.8",
+        "phpstan/extension-installer": "^1.1",
+        "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^7.0",
         "symfony/debug-bundle": "^5.1",

docs/source/_static/code/exports/BirthdateFilter.php

@@ -1,24 +1,19 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\PersonBundle\Export\Filter;
 
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
-use DateTime;
-use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Validator\Constraints;
+use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Doctrine\ORM\Query\Expr;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use Symfony\Component\Form\FormError;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 
-class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
+class BirthdateFilter implements FilterInterface, ExportElementValidatedInterface
 {
     // add specific role for this filter    
     public function addRole()
@@ -27,16 +22,78 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
         return null;
     }
 
+    // we give information on which type of export this filter applies
+    public function applyOn()
+    {
+        return 'person';
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by person\'s birthdate';
+    }
+
+    // we build a form to collect some parameters from the users
+    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
+    {
+        $builder->add('date_from', DateType::class, array(
+            'label' => "Born after this date",
+            'data'  => new \DateTime(),
+            'attr'  => array('class' => 'datepicker'),
+            'widget'=> 'single_text',
+            'format' => 'dd-MM-yyyy',
+        ));
+        
+        $builder->add('date_to', DateType::class, array(
+            'label' => "Born before this date",
+            'data'  => new \DateTime(),
+            'attr'  => array('class' => 'datepicker'),
+            'widget'=> 'single_text',
+            'format' => 'dd-MM-yyyy',
+        ));
+        
+    }
+   
+    // the form created above must be validated. The process of validation
+    // is executed here. This function is added by the interface 
+    // `ExportElementValidatedInterface`, and can be ignore if there is 
+    // no need for a validation
+    public function validateForm($data, ExecutionContextInterface $context)
+    { 
+        $date_from = $data['date_from'];
+        $date_to   = $data['date_to'];
+        
+        if ($date_from === null) {
+            $context->buildViolation('The "date from" should not be empty')
+                //->atPath('date_from')
+                ->addViolation();
+        }
+        
+        if ($date_to === null) {
+            $context->buildViolation('The "date to" should not be empty')
+                //->atPath('date_to')
+                ->addViolation();
+        }
+        
+        if (
+            ($date_from !== null && $date_to !== null)
+            &&
+            $date_from >= $date_to
+        ) {
+            $context->buildViolation('The date "date to" should be after the '
+                . 'date given in "date from" field')
+                ->addViolation();
+        }
+    }
+
+
     // here, we alter the query created by Export
     public function alterQuery(\Doctrine\ORM\QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
         // we create the clause here
-        $clause = $qb->expr()->between(
+        $clause = $qb->expr()->between('person.birthdate', ':date_from', 
-            'person.birthdate',
+            ':date_to');
-            ':date_from',
-            ':date_to'
-        );
 
         // we have to take care **not to** remove previous clauses...
         if ($where instanceof Expr\Andx) {
@@ -51,76 +108,16 @@ class BirthdateFilter implements ExportElementValidatedInterface, FilterInterfac
         $qb->setParameter('date_to', $data['date_to']);
     }
 
-    // we give information on which type of export this filter applies
-    public function applyOn()
-    {
-        return 'person';
-    }
-
-    // we build a form to collect some parameters from the users
-    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder)
-    {
-        $builder->add('date_from', DateType::class, [
-            'label' => 'Born after this date',
-            'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
-            'widget' => 'single_text',
-            'format' => 'dd-MM-yyyy',
-        ]);
-
-        $builder->add('date_to', DateType::class, [
-            'label' => 'Born before this date',
-            'data' => new DateTime(),
-            'attr' => ['class' => 'datepicker'],
-            'widget' => 'single_text',
-            'format' => 'dd-MM-yyyy',
-        ]);
-    }
-
     // here, we create a simple string which will describe the action of
     // the filter in the Response
     public function describeAction($data, $format = 'string')
     {
-        return ['Filtered by person\'s birtdate: '
+        return array('Filtered by person\'s birtdate: '
-            . 'between %date_from% and %date_to%', [
+            . 'between %date_from% and %date_to%', array(
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%' => $data['date_to']->format('d-m-Y'),
+                '%date_to%'   => $data['date_to']->format('d-m-Y')
-            ], ];
+            ));
     }
 
-    public function getTitle()
-    {
-        return 'Filter by person\'s birthdate';
-    }
 
-    // the form created above must be validated. The process of validation
-    // is executed here. This function is added by the interface
-    // `ExportElementValidatedInterface`, and can be ignore if there is
-    // no need for a validation
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        $date_from = $data['date_from'];
-        $date_to = $data['date_to'];
-
-        if (null === $date_from) {
-            $context->buildViolation('The "date from" should not be empty')
-                //->atPath('date_from')
-                ->addViolation();
-        }
-
-        if (null === $date_to) {
-            $context->buildViolation('The "date to" should not be empty')
-                //->atPath('date_to')
-                ->addViolation();
-        }
-
-        if (
-            (null !== $date_from && null !== $date_to)
-            && $date_from >= $date_to
-        ) {
-            $context->buildViolation('The date "date to" should be after the '
-                . 'date given in "date from" field')
-                ->addViolation();
-        }
-    }
 }

docs/source/_static/code/exports/CountPerson.php

@@ -1,107 +1,51 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
 
 namespace Chill\PersonBundle\Export\Export;
 
 use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
+use Doctrine\ORM\QueryBuilder;
-use Chill\PersonBundle\Export\Declarations;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query;
 use Symfony\Component\Form\FormBuilderInterface;
+use Doctrine\ORM\Query;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\PersonBundle\Export\Declarations;
+use Chill\MainBundle\Export\FormatterInterface;
+use Doctrine\ORM\EntityManagerInterface;
 
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class CountPerson implements ExportInterface
 {
     /**
+     *
      * @var EntityManagerInterface
      */
     protected $entityManager;
     
     public function __construct(
-        EntityManagerInterface $em
+            EntityManagerInterface $em
-    ) {
+            )
+    {
         $this->entityManager = $em;
     }
     
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // this export does not add any form
-    }
-
-    public function getAllowedFormattersTypes()
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription()
-    {
-        return 'Count peoples by various parameters.';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        // the Closure which will be executed by the formatter.
-        return function ($value) {
-            switch ($value) {
-                case '_header':
-                    // we have to process specifically the '_header' string,
-                    // which will be used by the formatter to show a column title
-                    return $this->getTitle();
-
-                default:
-                    // for all value, we do not process them and return them
-                    // immediatly
-                    return $value;
-            }
-        };
-    }
-
-    public function getQueryKeys($data)
-    {
-        // this array match the result keys in the query. We have only
-        // one column.
-        return ['export_result'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle()
-    {
-        return 'Count peoples';
-    }
-
     public function getType()
     {
         return Declarations::PERSON_TYPE;
     }
     
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function getDescription()
     {
-        // we gather all center the user choose.
+        return "Count peoples by various parameters.";
-        $centers = array_map(static function ($el) { return $el['center']; }, $acl);
+    }
     
-        $qb = $this->entityManager->createQueryBuilder();
+    public function getTitle()
-
+    {
-        $qb->select('COUNT(person.id) AS export_result')
+        return "Count peoples";
-            ->from('ChillPersonBundle:Person', 'person')
-            ->join('person.center', 'center')
-            ->andWhere('center IN (:authorized_centers)')
-            ->setParameter('authorized_centers', $centers);
-
-        return $qb;
     }
     
     public function requiredRole()
@@ -109,9 +53,66 @@ class CountPerson implements ExportInterface
         return new Role(PersonVoter::STATS);
     }
     
+    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
+    {
+        // we gather all center the user choose.
+        $centers = array_map(function($el) { return $el['center']; }, $acl);
+        
+        $qb = $this->entityManager->createQueryBuilder();
+        
+        $qb->select('COUNT(person.id) AS export_result')
+                ->from('ChillPersonBundle:Person', 'person')
+                ->join('person.center', 'center')
+                ->andWhere('center IN (:authorized_centers)')
+                ->setParameter('authorized_centers', $centers);
+                ;
+        
+        
+        return $qb;
+    }
+    
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+    
+    public function getQueryKeys($data)
+    {
+        // this array match the result keys in the query. We have only
+        // one column.
+        return array('export_result');
+    }
+    
+    public function getLabels($key, array $values, $data)
+    {
+        
+        // the Closure which will be executed by the formatter. 
+        return function($value) {
+            switch($value) {
+                case '_header':
+                  // we have to process specifically the '_header' string, 
+                  // which will be used by the formatter to show a column title
+                  return $this->getTitle();
+                default:
+                  // for all value, we do not process them and return them
+                  // immediatly
+                  return $value;
+        };
+    }
+    
+    public function getAllowedFormattersTypes()
+    {
+        return array(FormatterInterface::TYPE_TABULAR);
+    }
+    
+    public function buildForm(FormBuilderInterface $builder) {
+        // this export does not add any form
+    }
+    
     public function supportsModifiers()
     {
         // explain the export manager which formatters and filters are allowed
-        return [Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN];
+        return array(Declarations::PERSON_TYPE, Declarations::PERSON_IMPLIED_IN);
     }
+    
 }

docs/source/development/pagination/example.php

@@ -1,27 +1,20 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\MyBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+
+
+class ItemController extends Controller {
 
-class example extends Controller
-{
     public function yourAction() 
     {
         $em = $this->getDoctrine()->getManager();
         // first, get the number of total item are available
         $total = $em
-            ->createQuery('SELECT COUNT (item.id) FROM ChillMyBundle:Item item')
+             ->createQuery("SELECT COUNT (item.id) FROM ChillMyBundle:Item item")
-            ->getSingleScalarResult();
+             ->getSingleScalarResult();
        
         // get the PaginatorFactory
         $paginatorFactory = $this->get('chill_main.paginator_factory');
@@ -32,18 +25,18 @@ class example extends Controller
         
         // launch your query on item. Limit the query to the results
         // for the current page using the paginator
-        $items = $em->createQuery('SELECT item FROM ChillMyBundle:Item item WHERE <your clause>')
+        $items = $em->createQuery("SELECT item FROM ChillMyBundle:Item item WHERE <your clause>")
             // use the paginator to get the first item number
             ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
             // use the paginator to get the number of items to display
             ->setMaxResults($paginator->getItemsPerPage());
             
-        return $this->render(
+        return $this->render('ChillMyBundle:Item:list.html.twig', array(
-            'ChillMyBundle:Item:list.html.twig',
-            [
                 'items' => $items,
-                'paginator' => $paginator,
+                'paginator' => $paginator
-            ]
+                );
-        );
+            
     }
+
 }
+

docs/source/development/useful-snippets/controller-secured-for-person.php

@@ -1,43 +1,33 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\HealthBundle\Controller;
 
 use Chill\HealthBundle\Security\Authorization\ConsultationVoter;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Role\Role;
 
 class ConsultationController extends Controller
 {
     /**
+     * 
      * @param int $id personId
-     *
-     * @throws type
-     *
      * @return \Symfony\Component\HttpFoundation\Response
+     * @throws type
      */
     public function listAction($id)
     {
-        /** @var \Chill\PersonBundle\Entity\Person $person */
+        /* @var $person \Chill\PersonBundle\Entity\Person */
         $person = $this->get('chill.person.repository.person')
             ->find($id);
         
-        if (null === $person) {
+        if ($person === null) {
-            throw $this->createNotFoundException('The person is not found');
+            throw $this->createNotFoundException("The person is not found");
         }
         
         $this->denyAccessUnlessGranted(PersonVoter::SEE, $person);
         
-        /** @var \Chill\MainBundle\Security\Authorization\AuthorizationHelper $authorizationHelper */
+        /* @var $authorizationHelper \Chill\MainBundle\Security\Authorization\AuthorizationHelper */
         $authorizationHelper = $this->get('chill.main.security.'
             . 'authorization.helper');
         
@@ -45,7 +35,7 @@ class ConsultationController extends Controller
             $this->getUser(), 
             new Role(ConsultationVoter::SEE), 
             $person->getCenter()
-        );
+            );
         
         // create a query which take circles into account        
         $consultations = $this->getDoctrine()->getManager()
@@ -56,9 +46,10 @@ class ConsultationController extends Controller
             ->setParameter('circles', $circles)
             ->getResult();
         
-        return $this->render('ChillHealthBundle:Consultation:list.html.twig', [
+        return $this->render('ChillHealthBundle:Consultation:list.html.twig', array(
-            'person' => $person,
+                'person' => $person,
-            'consultations' => $consultations,
+                'consultations' => $consultations
-        ]);
+            ));    
     }
 }
+

docs/source/development/user-interface/widgets/ChillMainConfiguration.php

@@ -1,63 +1,64 @@
 <?php
+   # Chill\MainBundle\DependencyInjection\Configuration.php
   
-/**
+   namespace Chill\MainBundle\DependencyInjection;
- * 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.
- */
 
-declare(strict_types=1);
-
-namespace Chill\MainBundle\DependencyInjection;
-
-   use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
    use Symfony\Component\Config\Definition\Builder\TreeBuilder;
    use Symfony\Component\Config\Definition\ConfigurationInterface;
+   use Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait;
    use Symfony\Component\DependencyInjection\ContainerBuilder;
 
    /**
-    * Configure the main bundle.
+    * Configure the main bundle
     */
-   class ChillMainConfiguration implements ConfigurationInterface
+   class Configuration implements ConfigurationInterface
    {
+       
        use AddWidgetConfigurationTrait;
        
        /**
-        * @var ContainerBuilder
+	*
-        */
+	* @var ContainerBuilder
+	*/
        private $containerBuilder;
 
-       public function __construct(
+       
-           array $widgetFactories,
+       public function __construct(array $widgetFactories = array(), 
-           ContainerBuilder $containerBuilder
+	       ContainerBuilder $containerBuilder)
-       ) {
+       {
            // we register here widget factories (see below)
-           $this->setWidgetFactories($widgetFactories);
+	   $this->setWidgetFactories($widgetFactories);
            // we will need the container builder later...
-           $this->containerBuilder = $containerBuilder;
+	   $this->containerBuilder = $containerBuilder;
        }
        
+       /**
+	* {@inheritDoc}
+	*/
        public function getConfigTreeBuilder()
        {
-           $treeBuilder = new TreeBuilder();
+	   $treeBuilder = new TreeBuilder();
-           $rootNode = $treeBuilder->root('chill_main');
+	   $rootNode = $treeBuilder->root('chill_main');
 
-           $rootNode
+	   $rootNode
-               ->children()
+	       ->children()
 
                    // ...
-               ->arrayNode('widgets')
-               ->canBeDisabled()
-               ->children()
-                            // we declare here all configuration for homepage place
-               ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder))
-               ->end() // end of widgets/children
-               ->end() // end of widgets
-               ->end() // end of root/children
-               ->end() // end of root
-;
 
-           return $treeBuilder;
+		   ->arrayNode('widgets')
+		       ->canBeDisabled()
+		       ->children()
+                            // we declare here all configuration for homepage place
+			    ->append($this->addWidgetsConfiguration('homepage', $this->containerBuilder))
+		       ->end() // end of widgets/children
+		   ->end() // end of widgets
+		  ->end() // end of root/children
+	       ->end() // end of root
+	   ;
+
+	   
+	   return $treeBuilder;
        }
    }
+
+

docs/source/development/user-interface/widgets/ChillMainExtension.php

@@ -1,19 +1,16 @@
 <?php
 
-/**
+#Chill\MainBundle\DependencyInjection\ChillMainExtension.php
- * 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.
- */
-
-declare(strict_types=1);
 
 namespace Chill\MainBundle\DependencyInjection;
 
-use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
+use Chill\MainBundle\DependencyInjection\Configuration;
 
 /**
  * This class load config for chillMainExtension.
@@ -21,23 +18,19 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesExtensionInterface
 {
     /**
-     * widget factory.
+     * widget factory
      * 
      * @var WidgetFactoryInterface[]
      */
-    protected $widgetFactories = [];
+    protected $widgetFactories = array();
     
     public function addWidgetFactory(WidgetFactoryInterface $factory)
     {
         $this->widgetFactories[] = $factory;
     }
     
-    public function getConfiguration(array $config, ContainerBuilder $container)
-    {
-        return new Configuration($this->widgetFactories, $container);
-    }
-
     /**
+     * 
      * @return WidgetFactoryInterface[]
      */
     public function getWidgetFactories()
@@ -52,11 +45,15 @@ class ChillMainExtension extends Extension implements Widget\HasWidgetFactoriesE
         $config = $this->processConfiguration($configuration, $configs);
         
         // add the key 'widget' without the key 'enable'
-        $container->setParameter(
+        $container->setParameter('chill_main.widgets', 
-            'chill_main.widgets',
+            array('homepage' => $config['widgets']['homepage']));
-            ['homepage' => $config['widgets']['homepage']]
-        );
 
         // ... 
     }
+    
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return new Configuration($this->widgetFactories, $container);
+    }
+    
 }

docs/source/development/user-interface/widgets/ChillPersonAddAPersonListWidgetFactory.php

@@ -1,51 +1,55 @@
 <?php
 
-/**
+# Chill/PersonBundle/Widget/PersonListWidgetFactory
- * 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.
- */
-
-declare(strict_types=1);
 
 namespace Chill\PersonBundle\Widget;
 
 use Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory;
-use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\Config\Definition\Builder\NodeBuilder;
 
 /**
  * add configuration for the person_list widget.
  */
-class ChillPersonAddAPersonListWidgetFactory extends AbstractWidgetFactory
+class PersonListWidgetFactory extends AbstractWidgetFactory
 {
-    /*
+   /*
-     * append the option to the configuration
+    * append the option to the configuration
-     * see http://symfony.com/doc/current/components/config/definition.html
+    * see http://symfony.com/doc/current/components/config/definition.html
-     *
+    *
-     */
+    */
     public function configureOptions($place, NodeBuilder $node)
     {
         $node->booleanNode('only_active')
-            ->defaultTrue()
+                ->defaultTrue()
-            ->end();
+                ->end();
         $node->integerNode('number_of_items')
             ->defaultValue(50)
             ->end();
         $node->scalarNode('filtering_class')
-            ->defaultNull()
+                ->defaultNull()
-            ->end();
+                ->end();
+            
     }
      
-    /**
+   /*
-     * return an array with the allowed places where the widget can be rendered.
+    * return an array with the allowed places where the widget can be rendered
-     *
+    *
-     * @return string[]
+    * @return string[]
-     */
+    */   
     public function getAllowedPlaces()
     {
-        return ['homepage'];
+        return array('homepage');
+    }
+    
+   /* 
+    * return the widget alias
+    *
+    * @return string
+    */
+    public function getWidgetAlias()
+    {
+        return 'person_list';
     }
     
     /*
@@ -61,13 +65,5 @@ class ChillPersonAddAPersonListWidgetFactory extends AbstractWidgetFactory
         return 'chill_person.widget.person_list';
     }
     
-    /**
-     * return the widget alias.
-     *
-     * @return string
-     */
-    public function getWidgetAlias()
-    {
-        return 'person_list';
-    }
 }
+

docs/source/development/user-interface/widgets/ChillPersonAddAPersonWidget.php

@@ -1,73 +1,66 @@
 <?php
-
+# Chill/PersonBundle/Widget/PersonListWidget.php
-/**
- * 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.
- */
-
-declare(strict_types=1);
 
 namespace Chill\PersonBundle\Widget;
 
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Templating\Widget\WidgetInterface;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
-use DateTime;
-use Doctrine\DBAL\Types\Type;
-use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Doctrine\DBAL\Types\Type;
-use Symfony\Component\Security\Core\Role\Role;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Twig_Environment;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\ORM\EntityManager;
 
 /**
  * add a widget with person list. 
  * 
  * The configuration is defined by `PersonListWidgetFactory`
  */
-class ChillPersonAddAPersonWidget implements WidgetInterface
+class PersonListWidget implements WidgetInterface
 {
-    /**
-     * the authorization helper.
-     *
-     * @var AuthorizationHelper;
-     */
-    protected $authorizationHelper;
     
     /**
-     * The entity manager.
+     * Repository for persons
-     *
-     * @var EntityManager
-     */
-    protected $entityManager;
-
-    /**
-     * Repository for persons.
      * 
      * @var EntityRepository
      */
     protected $personRepository;
     
     /**
+     * The entity manager
+     *
+     * @var EntityManager
+     */
+    protected $entityManager;
+    
+    /**
+     * the authorization helper
+     * 
+     * @var AuthorizationHelper;
+     */
+    protected $authorizationHelper;
+    
+    /**
+     *
      * @var TokenStorage
      */
     protected $tokenStorage;
     
     /**
+     *
      * @var UserInterface
      */
     protected $user;
     
     public function __construct(
-        EntityRepository $personRepostory,
+            EntityRepository $personRepostory,
-        EntityManager $em,
+            EntityManager $em,
-        AuthorizationHelper $authorizationHelper,
+            AuthorizationHelper $authorizationHelper,
-        TokenStorage $tokenStorage
+            TokenStorage $tokenStorage
-    ) {
+            ) {
         $this->personRepository = $personRepostory;
         $this->authorizationHelper = $authorizationHelper;
         $this->tokenStorage = $tokenStorage;
@@ -75,24 +68,27 @@ class ChillPersonAddAPersonWidget implements WidgetInterface
     }
 
     /**
-     * @param type $place
      * 
+     * @param type $place
+     * @param array $context
+     * @param array $config
      * @return string
      */
-    public function render(Twig_Environment $env, $place, array $context, array $config)
+    public function render(\Twig_Environment $env, $place, array $context, array $config)
     { 
         $qb = $this->personRepository
-            ->createQueryBuilder('person');
+                ->createQueryBuilder('person');
         
         // show only the person from the authorized centers
         $and = $qb->expr()->andX();
         $centers = $this->authorizationHelper
-            ->getReachableCenters($this->getUser(), new Role(PersonVoter::SEE));
+                ->getReachableCenters($this->getUser(), new Role(PersonVoter::SEE));
         $and->add($qb->expr()->in('person.center', ':centers'));
         $qb->setParameter('centers', $centers);
         
+
         // add the "only active" where clause
-        if (true === $config['only_active']) {
+        if ($config['only_active'] === true) {
             $qb->join('person.accompanyingPeriods', 'ap');
             $or = new Expr\Orx();
             // add the case where closingDate IS NULL
@@ -102,10 +98,10 @@ class ChillPersonAddAPersonWidget implements WidgetInterface
             $or->add($andWhenClosingDateIsNull);
             // add the case when now is between opening date and closing date
             $or->add(
-                (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
+                    (new Expr())->between(':now', 'ap.openingDate', 'ap.closingDate')
-            );
+                );
             $and->add($or);
-            $qb->setParameter('now', new DateTime(), Type::DATE);
+            $qb->setParameter('now', new \DateTime(), Type::DATE);
         }
         
         // adding the where clause to the query
@@ -117,15 +113,17 @@ class ChillPersonAddAPersonWidget implements WidgetInterface
         
         return $env->render(
             'ChillPersonBundle:Widget:homepage_person_list.html.twig',
-            ['persons' => $persons]
+            array('persons' => $persons)
-        );
+            );
     }
     
     /**
+     * 
      * @return UserInterface
      */
     private function getUser()
     {
         // return a user
     }
+
 }

docs/source/development/user-interface/widgets/ChillPersonExtension.php

@@ -1,48 +1,51 @@
 <?php
 
-/**
+# Chill/PersonBundle/DependencyInjection/ChillPersonExtension.php
- * 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.
- */
-
-declare(strict_types=1);
 
 namespace Chill\PersonBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Chill\MainBundle\DependencyInjection\MissingBundleException;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
 
 /**
- * This is the class that loads and manages your bundle configuration.
+ * This is the class that loads and manages your bundle configuration
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class ChillPersonExtension extends Extension implements PrependExtensionInterface
 {
+    /**
+     * {@inheritDoc}
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
-        // ...
+      // ...
     }
     
+    
     /**
-     * Add a widget "add a person" on the homepage, automatically.
+     * 
+     * Add a widget "add a person" on the homepage, automatically
      * 
      * @param \Chill\PersonBundle\DependencyInjection\containerBuilder $container
      */
     public function prepend(ContainerBuilder $container) 
     {
-        $container->prependExtensionConfig('chill_main', [
+        $container->prependExtensionConfig('chill_main', array(
-            'widgets' => [
+            'widgets' => array(
-                'homepage' => [
+                'homepage' => array(
-                    [
+                    array(
                         'widget_alias' => 'add_person',
-                        'order' => 2,
+                        'order' => 2
-                    ],
+                    )
-                ],
+                )
-            ],
+            )
-        ]);
+        ));
     }
 }
+

grumphp.yml

@@ -1,14 +0,0 @@
-imports:
-    - {
-          resource: tests/app/vendor/drupol/php-conventions/config/php73/grumphp.yml,
-      }
-
-parameters:
-    tasks.phpcsfixer.config: .php_cs.dist.php
-    tasks.license.name: AGPL-3.0
-    tasks.license.holder: Champs-Libres
-    tasks.license.date_from: 2001
-
-    tasks.phpcsfixer.allow_risky: true
-    tasks.phpcsfixer.diff: true
-    tasks.phpstan.level: 1

phpstan-critical.neon

@@ -70,6 +70,11 @@ parameters:
             count: 1
             path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
 
+        -
+            message: "#^Undefined variable\\: \\$value$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php
+
         -
             message: "#^Undefined variable\\: \\$choiceSlug$#"
             count: 1

phpstan-types.neon

@@ -1,5 +1,15 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Entity/Activity.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -10,6 +20,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php
+
 		-
 			message: "#^Method Chill\\\\ActivityBundle\\\\Export\\\\Export\\\\StatActivityDuration\\:\\:getDescription\\(\\) should return string but return statement is missing\\.$#"
 			count: 1
@@ -20,6 +35,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -35,6 +55,36 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Menu/AdminMenuBuilder.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 3
@@ -45,16 +95,36 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillBudgetBundle/Form/ResourceType.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillBudgetBundle/Security/Authorization/BudgetElementVoter.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 3
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 4
@@ -120,11 +190,21 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Entity/Participation.php
+
 		-
 			message: "#^Method Chill\\\\EventBundle\\\\Entity\\\\Participation\\:\\:offsetGet\\(\\) should return mixed but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillEventBundle/Entity/Participation.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -145,6 +225,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/StatusType.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
@@ -155,6 +240,16 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
+
 		-
 			message: "#^Casting to string something that's already string\\.$#"
 			count: 5
@@ -165,6 +260,11 @@ parameters:
 			count: 2
 			path: src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillFamilyMembersBundle/Security/Voter/FamilyMemberVoter.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -185,6 +285,16 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
 
+		-
+			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+
 		-
 			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\ChillImportUsersCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
 			count: 1
@@ -195,6 +305,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -205,6 +320,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+
 		-
 			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\LoadAndUpdateLanguagesCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
 			count: 1
@@ -240,6 +360,36 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLanguages.php
+
+		-
+			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 5
+			path: src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ExportsCompilerPass.php
+
+		-
+			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -255,11 +405,21 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/User.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Entity/User.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 6
+			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
+
 		-
 			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
 			count: 1
@@ -290,6 +450,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/ComposedRoleScopeType.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 3
@@ -301,15 +466,55 @@ parameters:
 			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
 
 		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/TranslatableStringFormType.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
 			count: 2
 			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
 
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/Entity/SearchUserApiProvider.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AbstractChillVoter.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Security/ParentRoleHelper.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverVoter.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -330,11 +535,21 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Validation/Validator/RoleScopeScopePresence.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -360,16 +575,51 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
 
+		-
+			message: "#^Call to function array_search\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 6
 			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/DependencyInjection/CompilerPass/AccompanyingPeriodTimelineCompilerPass.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Export/AbstractAccompanyingPeriodExportElement.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -380,11 +630,26 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Export/Aggregator/NationalityAggregator.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/GenderFilter.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -405,11 +670,26 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+
 		-
 			message: "#^Method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\QueryBuilder\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 3
@@ -420,26 +700,71 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillPersonBundle/Templating/Entity/ClosingMotiveRender.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReportACL.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
+
 		-
 			message: "#^Method Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\LoadReports\\:\\:getRandomChoice\\(\\) should return array\\<string\\>\\|string but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 4
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 2
 			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
+
 		-
 			message: "#^Method Chill\\\\ReportBundle\\\\Security\\\\Authorization\\\\ReportVoter\\:\\:supports\\(\\) should return bool but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 4
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/DataFixtures/ORM/LoadTaskACL.php
+
 		-
 			message: "#^Casting to string something that's already string\\.$#"
 			count: 3
@@ -465,11 +790,31 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+
 		-
 			message: "#^Method Chill\\\\TaskBundle\\\\Timeline\\\\TaskLifeCycleEventTimelineProvider\\:\\:getTransitionByName\\(\\) should return Symfony\\\\Component\\\\Workflow\\\\Transition but return statement is missing\\.$#"
 			count: 1
 			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 4
+			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -480,6 +825,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -490,6 +840,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
 
+		-
+			message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1

phpstan.neon.dist

@@ -3,7 +3,6 @@ parameters:
     paths:
         - src/
     excludePaths:
-        - docs/
         - src/Bundle/*/Tests/*
         - src/Bundle/*/tests/*
         - src/Bundle/*/Test/*
@@ -19,8 +18,7 @@ parameters:
         - src/Bundle/*/src/Resources/*
 
 includes:
-    - phpstan-baseline.neon
-    - phpstan-critical.neon
-    - phpstan-deprecations.neon
     - phpstan-types.neon
+    - phpstan-critical.neon
+    - phpstan-baseline.neon
 

resource/header.txt

@@ -1,5 +0,0 @@
-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.
-

src/Bundle/ChillActivityBundle/ChillActivityBundle.php

@@ -1,14 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -1,25 +1,15 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Controller;
 
-use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Form\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
@@ -27,46 +17,46 @@ use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\AccompanyingPeriodRepository;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
-use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\ActivityBundle\Form\ActivityType;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Symfony\Component\Serializer\SerializerInterface;
-use function array_key_exists;
 
 final class ActivityController extends AbstractController
 {
-    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
-
-    private ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
-
-    private ActivityRepository $activityRepository;
-
-    private ActivityTypeCategoryRepository $activityTypeCategoryRepository;
-
-    private ActivityTypeRepository $activityTypeRepository;
-
-    private EntityManagerInterface $entityManager;
-
     private EventDispatcherInterface $eventDispatcher;
 
-    private LocationRepository $locationRepository;
-
     private LoggerInterface $logger;
 
-    private PersonRepository $personRepository;
-
     private SerializerInterface $serializer;
 
+    private ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
+
+    private ActivityTypeRepository $activityTypeRepository;
+
     private ThirdPartyRepository $thirdPartyRepository;
 
+    private PersonRepository $personRepository;
+
+    private LocationRepository $locationRepository;
+
+    private EntityManagerInterface $entityManager;
+
+    private ActivityRepository $activityRepository;
+
+    private AccompanyingPeriodRepository $accompanyingPeriodRepository;
+
+    private ActivityTypeCategoryRepository $activityTypeCategoryRepository;
+
     public function __construct(
         ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
         ActivityTypeRepository $activityTypeRepository,
@@ -95,151 +85,6 @@ final class ActivityController extends AbstractController
         $this->serializer = $serializer;
     }
 
-    /**
-     * Deletes a Activity entity.
-     *
-     * @param mixed $id
-     */
-    public function deleteAction(Request $request, $id)
-    {
-        $view = null;
-
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        $activity = $this->activityRepository->find($id);
-
-        if (!$activity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
-        }
-
-        if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
-            $accompanyingPeriod = $activity->getAccompanyingPeriod();
-        } else {
-            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
-        }
-
-        // TODO
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
-
-        $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
-
-        if ($request->getMethod() === Request::METHOD_DELETE) {
-            $form->handleRequest($request);
-
-            if ($form->isValid()) {
-                $this->logger->notice('An activity has been removed', [
-                    'by_user' => $this->getUser()->getUsername(),
-                    'activity_id' => $activity->getId(),
-                    'person_id' => $activity->getPerson() ? $activity->getPerson()->getId() : null,
-                    'comment' => $activity->getComment()->getComment(),
-                    'scope_id' => $activity->getScope() ? $activity->getScope()->getId() : null,
-                    'reasons_ids' => $activity->getReasons()
-                        ->map(
-                            static fn (ActivityReason $ar): int => $ar->getId()
-                        )
-                        ->toArray(),
-                    'type_id' => $activity->getActivityType()->getId(),
-                    'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
-                    'date' => $activity->getDate()->format('Y-m-d'),
-                    'attendee' => $activity->getAttendee(),
-                ]);
-
-                $this->entityManager->remove($activity);
-                $this->entityManager->flush();
-
-                $this->addFlash('success', $this->get('translator')
-                    ->trans('The activity has been successfully removed.'));
-
-                $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-
-                return $this->redirectToRoute('chill_activity_activity_list', $params);
-            }
-        }
-
-        if (null === $view) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        return $this->render($view, [
-            'activity' => $activity,
-            'delete_form' => $form->createView(),
-            'person' => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-        ]);
-    }
-
-    /**
-     * Displays a form to edit an existing Activity entity.
-     */
-    public function editAction(int $id, Request $request): Response
-    {
-        $view = null;
-
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        $entity = $this->activityRepository->find($id);
-
-        if (null === $entity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
-        }
-
-        if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
-            $accompanyingPeriod = $entity->getAccompanyingPeriod();
-        } else {
-            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
-        }
-        // TODO
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
-
-        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
-            'role' => new Role('CHILL_ACTIVITY_UPDATE'),
-            'activityType' => $entity->getActivityType(),
-            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->entityManager->persist($entity);
-            $this->entityManager->flush();
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
-
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-            $params['id'] = $entity->getId();
-
-            return $this->redirectToRoute('chill_activity_activity_show', $params);
-        }
-
-        $deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod);
-
-        /*
-         * TODO
-        $event = new PrivacyEvent($person, array(
-            'element_class' => Activity::class,
-            'element_id' => $entity->getId(),
-            'action' => 'edit'
-        ));
-        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-         */
-
-        if (null === $view) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
-
-        return $this->render($view, [
-            'entity' => $entity,
-            'edit_form' => $form->createView(),
-            'delete_form' => $deleteForm->createView(),
-            'person' => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-            'activity_json' => $activity_array,
-        ]);
-    }
-
     /**
      * Lists all Activity entities.
      */
@@ -258,7 +103,7 @@ final class ActivityController extends AbstractController
 
             $event = new PrivacyEvent($person, [
                 'element_class' => Activity::class,
-                'action' => 'list',
+                'action' => 'list'
             ]);
             $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
@@ -276,152 +121,12 @@ final class ActivityController extends AbstractController
             $view,
             [
                 'activities' => $activities,
-                'person' => $person,
+                'person'   => $person,
                 'accompanyingCourse' => $accompanyingPeriod,
             ]
         );
     }
 
-    public function newAction(Request $request): Response
-    {
-        $view = null;
-
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:newPerson.html.twig';
-        }
-
-        $activityType_id = $request->get('activityType_id', 0);
-        $activityType = $this->activityTypeRepository->find($activityType_id);
-
-        if (isset($activityType) && !$activityType->isActive()) {
-            throw new InvalidArgumentException('Activity type must be active');
-        }
-
-        $activityData = null;
-
-        if ($request->query->has('activityData')) {
-            $activityData = $request->query->get('activityData');
-        }
-
-        if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType
-            || !$activityType->isActive()) {
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-
-            if (null !== $activityData) {
-                $params['activityData'] = $activityData;
-            }
-
-            return $this->redirectToRoute('chill_activity_activity_select_type', $params);
-        }
-
-        $entity = new Activity();
-        $entity->setUser($this->getUser());
-
-        if ($person instanceof Person) {
-            $entity->setPerson($person);
-        }
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $entity->setAccompanyingPeriod($accompanyingPeriod);
-        }
-
-        $entity->setActivityType($activityType);
-        $entity->setDate(new DateTime('now'));
-
-        if ($request->query->has('activityData')) {
-            $activityData = $request->query->get('activityData');
-
-            if (array_key_exists('durationTime', $activityData)) {
-                $durationTimeInMinutes = $activityData['durationTime'];
-                $hours = floor($durationTimeInMinutes / 60);
-                $minutes = $durationTimeInMinutes % 60;
-                $duration = DateTime::createFromFormat('H:i', $hours . ':' . $minutes);
-
-                if ($duration) {
-                    $entity->setDurationTime($duration);
-                }
-            }
-
-            if (array_key_exists('date', $activityData)) {
-                $date = DateTime::createFromFormat('Y-m-d', $activityData['date']);
-
-                if ($date) {
-                    $entity->setDate($date);
-                }
-            }
-
-            if (array_key_exists('personsId', $activityData)) {
-                foreach ($activityData['personsId'] as $personId) {
-                    $concernedPerson = $this->personRepository->find($personId);
-                    $entity->addPerson($concernedPerson);
-                }
-            }
-
-            if (array_key_exists('professionalsId', $activityData)) {
-                foreach ($activityData['professionalsId'] as $professionalsId) {
-                    $professional = $this->thirdPartyRepository->find($professionalsId);
-                    $entity->addThirdParty($professional);
-                }
-            }
-
-            if (array_key_exists('location', $activityData)) {
-                $location = $this->locationRepository->find($activityData['location']);
-                $entity->setLocation($location);
-            }
-
-            if (array_key_exists('comment', $activityData)) {
-                $comment = new CommentEmbeddable();
-                $comment->setComment($activityData['comment']);
-                $comment->setUserId($this->getUser()->getid());
-                $comment->setDate(new DateTime('now'));
-                $entity->setComment($comment);
-            }
-        }
-
-        $this->denyAccessUnlessGranted(ActivityVoter::CREATE, $entity);
-
-        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
-            'role' => new Role('CHILL_ACTIVITY_CREATE'),
-            'activityType' => $entity->getActivityType(),
-            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            $this->entityManager->persist($entity);
-            $this->entityManager->flush();
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
-
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-
-            $params['id'] = $entity->getId();
-
-            return $this->redirectToRoute('chill_activity_activity_show', $params);
-        }
-
-        if (null === $view) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
-
-        $defaultLocation = $this->getUser()->getCurrentLocation();
-
-        return $this->render($view, [
-            'person' => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-            'entity' => $entity,
-            'form' => $form->createView(),
-            'activity_json' => $activity_array,
-            'default_location' => $defaultLocation,
-        ]);
-    }
-
     public function selectTypeAction(Request $request): Response
     {
         $view = null;
@@ -454,7 +159,7 @@ final class ActivityController extends AbstractController
             ];
         }
 
-        if (null === $view) {
+        if ($view === null) {
             throw $this->createNotFoundException('Template not found');
         }
 
@@ -466,7 +171,143 @@ final class ActivityController extends AbstractController
         ]);
     }
 
-    public function showAction(Request $request, int $id): Response
+    public function newAction(Request $request): Response
+    {
+        $view = null;
+
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
+        } elseif ($person instanceof Person) {
+            $view = 'ChillActivityBundle:Activity:newPerson.html.twig';
+        }
+
+        $activityType_id = $request->get('activityType_id', 0);
+        $activityType = $this->activityTypeRepository->find($activityType_id);
+
+        if (isset($activityType) && !$activityType->isActive()) {
+            throw new \InvalidArgumentException('Activity type must be active');
+        }
+
+        $activityData = null;
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+        }
+
+        if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType ||
+            !$activityType->isActive()) {
+
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+            if (null !== $activityData) {
+                $params['activityData'] = $activityData;
+            }
+            return $this->redirectToRoute('chill_activity_activity_select_type', $params);
+        }
+
+        $entity = new Activity();
+        $entity->setUser($this->getUser());
+
+        if ($person instanceof Person) {
+            $entity->setPerson($person);
+        }
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $entity->setAccompanyingPeriod($accompanyingPeriod);
+        }
+
+        $entity->setType($activityType);
+        $entity->setDate(new \DateTime('now'));
+
+        if ($request->query->has('activityData')) {
+            $activityData = $request->query->get('activityData');
+
+            if (array_key_exists('durationTime', $activityData)) {
+                $durationTimeInMinutes = $activityData['durationTime'];
+                $hours = floor($durationTimeInMinutes / 60);
+                $minutes = $durationTimeInMinutes % 60;
+                $duration = \DateTime::createFromFormat("H:i", $hours.':'.$minutes);
+                if ($duration) {
+                    $entity->setDurationTime($duration);
+                }
+            }
+
+            if (array_key_exists('date', $activityData)) {
+                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
+                if ($date) {
+                    $entity->setDate($date);
+                }
+            }
+
+            if (array_key_exists('personsId', $activityData)) {
+                foreach($activityData['personsId'] as $personId){
+                    $concernedPerson = $this->personRepository->find($personId);
+                    $entity->addPerson($concernedPerson);
+                }
+            }
+
+            if (array_key_exists('professionalsId', $activityData)) {
+                foreach($activityData['professionalsId'] as $professionalsId){
+                    $professional = $this->thirdPartyRepository->find($professionalsId);
+                    $entity->addThirdParty($professional);
+                }
+            }
+
+            if (array_key_exists('location', $activityData)) {
+                $location = $this->locationRepository->find($activityData['location']);
+                $entity->setLocation($location);
+            }
+
+            if (array_key_exists('comment', $activityData)) {
+                $comment = new CommentEmbeddable();
+                $comment->setComment($activityData['comment']);
+                $comment->setUserId($this->getUser()->getid());
+                $comment->setDate(new \DateTime('now'));
+                $entity->setComment($comment);
+            }
+
+        }
+
+        // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
+
+        $form = $this->createForm(ActivityType::class, $entity, [
+            'center' => $entity->getCenter(),
+            'role'   => new Role('CHILL_ACTIVITY_CREATE'),
+            'activityType' => $entity->getType(),
+            'accompanyingPeriod' => $accompanyingPeriod,
+        ])->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->entityManager->persist($entity);
+            $this->entityManager->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
+
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+            $params['id'] = $entity->getId();
+
+            return $this->redirectToRoute('chill_activity_activity_show', $params);
+        }
+
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
+
+        return $this->render($view, [
+            'person'   => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'entity' => $entity,
+            'form' => $form->createView(),
+            'activity_json' => $activity_array
+        ]);
+    }
+
+    public function showAction(Request $request, $id): Response
     {
         $view = null;
 
@@ -486,8 +327,8 @@ final class ActivityController extends AbstractController
 
         if (null !== $accompanyingPeriod) {
             // @TODO: Properties created dynamically.
-            $entity->personsAssociated = $entity->getPersonsAssociated();
+           $entity->personsAssociated = $entity->getPersonsAssociated();
-            $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
+           $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
         }
 
         // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
@@ -503,33 +344,160 @@ final class ActivityController extends AbstractController
             'action' => 'show'
         ));
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-         */
+        */
 
-        if (null === $view) {
+        if ($view === null) {
             throw $this->createNotFoundException('Template not found');
         }
 
         return $this->render($view, [
-            'person' => $person,
+            'person'      => $person,
             'accompanyingCourse' => $accompanyingPeriod,
-            'entity' => $entity,
+            'entity'      => $entity,
             'delete_form' => $deleteForm->createView(),
         ]);
     }
 
-    private function buildParamsToUrl(?Person $person, ?AccompanyingPeriod $accompanyingPeriod): array
+    /**
+     * Displays a form to edit an existing Activity entity.
+     */
+    public function editAction($id, Request $request): Response
     {
-        $params = [];
+        $view = null;
 
-        if (null !== $person) {
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
-            $params['person_id'] = $person->getId();
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
+        } elseif ($person instanceof Person) {
+            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
         }
 
-        if (null !== $accompanyingPeriod) {
+        $entity = $this->activityRepository->find($id);
-            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
+
+        if (null === $entity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
-        return $params;
+        // TODO
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
+
+        $form = $this->createForm(ActivityType::class, $entity, [
+            'center' => $entity->getCenter(),
+            'role'   => new Role('CHILL_ACTIVITY_UPDATE'),
+            'activityType' => $entity->getType(),
+            'accompanyingPeriod' => $accompanyingPeriod,
+        ])->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->entityManager->persist($entity);
+            $this->entityManager->flush();
+
+            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
+
+            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+            $params['id'] = $entity->getId();
+
+            return $this->redirectToRoute('chill_activity_activity_show', $params);
+        }
+
+        $deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod);
+
+        /*
+         * TODO
+        $event = new PrivacyEvent($person, array(
+            'element_class' => Activity::class,
+            'element_id' => $entity->getId(),
+            'action' => 'edit'
+        ));
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+        */
+
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
+
+        return $this->render($view, [
+            'entity'      => $entity,
+            'edit_form'   => $form->createView(),
+            'delete_form' => $deleteForm->createView(),
+            'person' => $person,
+            'accompanyingCourse' => $accompanyingPeriod,
+            'activity_json' => $activity_array
+        ]);
+    }
+
+    /**
+     * Deletes a Activity entity.
+     */
+    public function deleteAction(Request $request, $id)
+    {
+        $view = null;
+
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
+        } elseif ($person instanceof Person) {
+            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
+        }
+
+        $activity = $this->activityRepository->find($id);
+
+        if (!$activity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
+        }
+
+        // TODO
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
+
+        $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
+
+        if ($request->getMethod() === Request::METHOD_DELETE) {
+            $form->handleRequest($request);
+
+            if ($form->isValid()) {
+                $this->logger->notice("An activity has been removed", [
+                   'by_user' => $this->getUser()->getUsername(),
+                   'activity_id' => $activity->getId(),
+                   'person_id' => $activity->getPerson() ? $activity->getPerson()->getId() : null,
+                   'comment' => $activity->getComment()->getComment(),
+                   'scope_id' => $activity->getScope() ? $activity->getScope()->getId() : null,
+                   'reasons_ids' => $activity->getReasons()
+                      ->map(
+                          static fn (ActivityReason $ar): int => $ar->getId()
+                      )
+                      ->toArray(),
+                   'type_id' => $activity->getType()->getId(),
+                   'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
+                   'date' => $activity->getDate()->format('Y-m-d'),
+                   'attendee' => $activity->getAttendee()
+                ]);
+
+                $this->entityManager->remove($activity);
+                $this->entityManager->flush();
+
+                $this->addFlash('success', $this->get('translator')
+                      ->trans("The activity has been successfully removed."));
+
+                $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+
+                return $this->redirectToRoute('chill_activity_activity_list', $params);
+            }
+        }
+
+        if ($view === null) {
+            throw $this->createNotFoundException('Template not found');
+        }
+
+        return $this->render($view, [
+           'activity' => $activity,
+           'delete_form' => $form->createView(),
+           'person' => $person,
+           'accompanyingCourse' => $accompanyingPeriod,
+        ]);
     }
 
     /**
@@ -549,13 +517,13 @@ final class ActivityController extends AbstractController
 
     private function getEntity(Request $request): array
     {
-        $person = $accompanyingPeriod = null;
+        $person = $accompanyingPeriod  = null;
 
         if ($request->query->has('person_id')) {
             $person_id = $request->get('person_id');
             $person = $this->personRepository->find($person_id);
 
-            if (null === $person) {
+            if ($person === null) {
                 throw $this->createNotFoundException('Person not found');
             }
 
@@ -564,19 +532,34 @@ final class ActivityController extends AbstractController
             $accompanying_period_id = $request->get('accompanying_period_id');
             $accompanyingPeriod = $this->accompanyingPeriodRepository->find($accompanying_period_id);
 
-            if (null === $accompanyingPeriod) {
+            if ($accompanyingPeriod === null) {
                 throw $this->createNotFoundException('Accompanying Period not found');
             }
 
             // TODO Add permission
             // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
         } else {
-            throw $this->createNotFoundException('Person or Accompanying Period not found');
+            throw $this->createNotFoundException("Person or Accompanying Period not found");
         }
 
         return [
             $person,
-            $accompanyingPeriod,
+            $accompanyingPeriod
         ];
     }
+
+    private function buildParamsToUrl(?Person $person, ?AccompanyingPeriod $accompanyingPeriod): array
+    {
+        $params = [];
+
+        if (null !== $person) {
+            $params['person_id'] = $person->getId();
+        }
+
+        if (null !== $accompanyingPeriod) {
+            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
+        }
+
+        return $params;
+    }
 }

src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php

@@ -1,30 +1,38 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+
 use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 use Chill\ActivityBundle\Form\ActivityReasonCategoryType;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * ActivityReasonCategory controller.
+ *
  */
 class ActivityReasonCategoryController extends AbstractController
 {
+
+    /**
+     * Lists all ActivityReasonCategory entities.
+     *
+     */
+    public function indexAction()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
+
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', array(
+            'entities' => $entities,
+        ));
+    }
     /**
      * Creates a new ActivityReasonCategory entity.
+     *
      */
     public function createAction(Request $request)
     {
@@ -37,19 +45,71 @@ class ActivityReasonCategoryController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', ['id' => $entity->getId()]));
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_show', array('id' => $entity->getId())));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', array(
             'entity' => $entity,
-            'form' => $form->createView(),
+            'form'   => $form->createView(),
-        ]);
+        ));
+    }
+
+    /**
+     * Creates a form to create a ActivityReasonCategory entity.
+     *
+     * @param ActivityReasonCategory $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(ActivityReasonCategory $entity)
+    {
+        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activityreasoncategory_create'),
+            'method' => 'POST',
+        ));
+
+        $form->add('submit', SubmitType::class, array('label' => 'Create'));
+
+        return $form;
+    }
+
+    /**
+     * Displays a form to create a new ActivityReasonCategory entity.
+     *
+     */
+    public function newAction()
+    {
+        $entity = new ActivityReasonCategory();
+        $form   = $this->createCreateForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', array(
+            'entity' => $entity,
+            'form'   => $form->createView(),
+        ));
+    }
+
+    /**
+     * Finds and displays a ActivityReasonCategory entity.
+     *
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
+        }
+
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', array(
+            'entity'      => $entity,
+        ));
     }
 
     /**
      * Displays a form to edit an existing ActivityReasonCategory entity.
      *
-     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -63,64 +123,33 @@ class ActivityReasonCategoryController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', array(
-            'entity' => $entity,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            'edit_form'   => $editForm->createView(),
-        ]);
+        ));
     }
 
     /**
-     * Lists all ActivityReasonCategory entities.
+    * Creates a form to edit a ActivityReasonCategory entity.
-     */
+    *
-    public function indexAction()
+    * @param ActivityReasonCategory $entity The entity
+    *
+    * @return \Symfony\Component\Form\Form The form
+    */
+    private function createEditForm(ActivityReasonCategory $entity)
     {
-        $em = $this->getDoctrine()->getManager();
+        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', array('id' => $entity->getId())),
+            'method' => 'PUT',
+        ));
 
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->findAll();
+        $form->add('submit', SubmitType::class, array('label' => 'Update'));
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:index.html.twig', [
+        return $form;
-            'entities' => $entities,
-        ]);
     }
-
-    /**
-     * Displays a form to create a new ActivityReasonCategory entity.
-     */
-    public function newAction()
-    {
-        $entity = new ActivityReasonCategory();
-        $form = $this->createCreateForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:new.html.twig', [
-            'entity' => $entity,
-            'form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * Finds and displays a ActivityReasonCategory entity.
-     *
-     * @param mixed $id
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReasonCategory')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReasonCategory entity.');
-        }
-
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:show.html.twig', [
-            'entity' => $entity,
-        ]);
-    }
-
     /**
      * Edits an existing ActivityReasonCategory entity.
      *
-     * @param mixed $id
      */
     public function updateAction(Request $request, $id)
     {
@@ -138,50 +167,12 @@ class ActivityReasonCategoryController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', ['id' => $id]));
+            return $this->redirect($this->generateUrl('chill_activity_activityreasoncategory_edit', array('id' => $id)));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReasonCategory:edit.html.twig', array(
-            'entity' => $entity,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            'edit_form'   => $editForm->createView(),
-        ]);
+        ));
-    }
-
-    /**
-     * Creates a form to create a ActivityReasonCategory entity.
-     *
-     * @param ActivityReasonCategory $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(ActivityReasonCategory $entity)
-    {
-        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
-            'action' => $this->generateUrl('chill_activity_activityreasoncategory_create'),
-            'method' => 'POST',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Create']);
-
-        return $form;
-    }
-
-    /**
-     * Creates a form to edit a ActivityReasonCategory entity.
-     *
-     * @param ActivityReasonCategory $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createEditForm(ActivityReasonCategory $entity)
-    {
-        $form = $this->createForm(ActivityReasonCategoryType::class, $entity, [
-            'action' => $this->generateUrl('chill_activity_activityreasoncategory_update', ['id' => $entity->getId()]),
-            'method' => 'PUT',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Update']);
-
-        return $form;
     }
 }

src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php

@@ -1,30 +1,38 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;
 
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Form\ActivityReasonType;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
  * ActivityReason controller.
+ *
  */
 class ActivityReasonController extends AbstractController
 {
+
+    /**
+     * Lists all ActivityReason entities.
+     *
+     */
+    public function indexAction()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
+
+        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', array(
+            'entities' => $entities,
+        ));
+    }
     /**
      * Creates a new ActivityReason entity.
+     *
      */
     public function createAction(Request $request)
     {
@@ -37,19 +45,71 @@ class ActivityReasonController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $entity->getId()]));
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', array('id' => $entity->getId())));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', array(
             'entity' => $entity,
-            'form' => $form->createView(),
+            'form'   => $form->createView(),
-        ]);
+        ));
+    }
+
+    /**
+     * Creates a form to create a ActivityReason entity.
+     *
+     * @param ActivityReason $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(ActivityReason $entity)
+    {
+        $form = $this->createForm(ActivityReasonType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activityreason_create'),
+            'method' => 'POST',
+        ));
+
+        $form->add('submit', SubmitType::class, array('label' => 'Create'));
+
+        return $form;
+    }
+
+    /**
+     * Displays a form to create a new ActivityReason entity.
+     *
+     */
+    public function newAction()
+    {
+        $entity = new ActivityReason();
+        $form   = $this->createCreateForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', array(
+            'entity' => $entity,
+            'form'   => $form->createView(),
+        ));
+    }
+
+    /**
+     * Finds and displays a ActivityReason entity.
+     *
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
+        }
+
+        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', array(
+            'entity'      => $entity,
+        ));
     }
 
     /**
      * Displays a form to edit an existing ActivityReason entity.
      *
-     * @param mixed $id
      */
     public function editAction($id)
     {
@@ -63,64 +123,33 @@ class ActivityReasonController extends AbstractController
 
         $editForm = $this->createEditForm($entity);
 
-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', array(
-            'entity' => $entity,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            'edit_form'   => $editForm->createView()
-        ]);
+        ));
     }
 
     /**
-     * Lists all ActivityReason entities.
+    * Creates a form to edit a ActivityReason entity.
-     */
+    *
-    public function indexAction()
+    * @param ActivityReason $entity The entity
+    *
+    * @return \Symfony\Component\Form\Form The form
+    */
+    private function createEditForm(ActivityReason $entity)
     {
-        $em = $this->getDoctrine()->getManager();
+        $form = $this->createForm(ActivityReasonType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activityreason_update', array('id' => $entity->getId())),
+            'method' => 'PUT',
+        ));
 
-        $entities = $em->getRepository('ChillActivityBundle:ActivityReason')->findAll();
+        $form->add('submit', SubmitType::class, array('label' => 'Update'));
 
-        return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
+        return $form;
-            'entities' => $entities,
-        ]);
     }
-
-    /**
-     * Displays a form to create a new ActivityReason entity.
-     */
-    public function newAction()
-    {
-        $entity = new ActivityReason();
-        $form = $this->createCreateForm($entity);
-
-        return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
-            'entity' => $entity,
-            'form' => $form->createView(),
-        ]);
-    }
-
-    /**
-     * Finds and displays a ActivityReason entity.
-     *
-     * @param mixed $id
-     */
-    public function showAction($id)
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        $entity = $em->getRepository('ChillActivityBundle:ActivityReason')->find($id);
-
-        if (!$entity) {
-            throw $this->createNotFoundException('Unable to find ActivityReason entity.');
-        }
-
-        return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', [
-            'entity' => $entity,
-        ]);
-    }
-
     /**
      * Edits an existing ActivityReason entity.
      *
-     * @param mixed $id
      */
     public function updateAction(Request $request, $id)
     {
@@ -138,50 +167,12 @@ class ActivityReasonController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreason', ['id' => $id]));
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', array('id' => $id)));
         }
 
-        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
+        return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', array(
-            'entity' => $entity,
+            'entity'      => $entity,
-            'edit_form' => $editForm->createView(),
+            'edit_form'   => $editForm->createView()
-        ]);
+        ));
-    }
-
-    /**
-     * Creates a form to create a ActivityReason entity.
-     *
-     * @param ActivityReason $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createCreateForm(ActivityReason $entity)
-    {
-        $form = $this->createForm(ActivityReasonType::class, $entity, [
-            'action' => $this->generateUrl('chill_activity_activityreason_create'),
-            'method' => 'POST',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Create']);
-
-        return $form;
-    }
-
-    /**
-     * Creates a form to edit a ActivityReason entity.
-     *
-     * @param ActivityReason $entity The entity
-     *
-     * @return \Symfony\Component\Form\Form The form
-     */
-    private function createEditForm(ActivityReason $entity)
-    {
-        $form = $this->createForm(ActivityReasonType::class, $entity, [
-            'action' => $this->generateUrl('chill_activity_activityreason_update', ['id' => $entity->getId()]),
-            'method' => 'PUT',
-        ]);
-
-        $form->add('submit', SubmitType::class, ['label' => 'Update']);
-
-        return $form;
     }
 }

src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php

@@ -1,14 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -18,8 +9,10 @@ use Symfony\Component\HttpFoundation\Request;
 class AdminActivityPresenceController extends CRUDController
 {
     /**
+     * @param string $action
      * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     *
+     * @param Request $request
+     * @param PaginatorInterface $paginator
      * @return \Doctrine\ORM\QueryBuilder|mixed
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php

@@ -1,14 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -18,8 +9,10 @@ use Symfony\Component\HttpFoundation\Request;
 class AdminActivityTypeCategoryController extends CRUDController
 {
     /**
+     * @param string $action
      * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     *
+     * @param Request $request
+     * @param PaginatorInterface $paginator
      * @return \Doctrine\ORM\QueryBuilder|mixed
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php

@@ -1,14 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -18,14 +9,15 @@ use Symfony\Component\HttpFoundation\Request;
 class AdminActivityTypeController extends CRUDController
 {
     /**
+     * @param string $action
      * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     *
+     * @param Request $request
+     * @param PaginatorInterface $paginator
      * @return \Doctrine\ORM\QueryBuilder|mixed
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
         /** @var \Doctrine\ORM\QueryBuilder $query */
-        return $query->orderBy('e.ordering', 'ASC')
+        return $query->orderBy('e.ordering', 'ASC');
-            ->addOrderBy('e.id', 'ASC');
     }
 }

src/Bundle/ChillActivityBundle/Controller/AdminController.php

@@ -1,20 +1,33 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
+ * Copyright (C) 2015 Champs Libres <info@champs-libres.coop>
  *
- * For the full copyright and license information, please view
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Controller;
 
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 
 /**
- * Controller for activity configuration.
+ * Controller for activity configuration
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ * @author Champs Libres <info@champs-libres.coop>
  */
 class AdminController extends AbstractController
 {

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php

@@ -1,36 +1,48 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
-use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectManager;
 use Faker\Factory as FakerFactory;
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
+use Chill\ActivityBundle\DataFixtures\ORM\LoadActivityReason;
+use Chill\ActivityBundle\DataFixtures\ORM\LoadActivityType;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
 
 class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 {
     use \Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
-    private EntityManagerInterface $em;
-
     /**
      * @var \Faker\Generator
      */
     private $faker;
+    private EntityManagerInterface $em;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -43,53 +55,30 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
         return 16400;
     }
 
-    public function load(ObjectManager $manager)
+    /**
+     * Return a random scope
+     *
+     * @return \Chill\MainBundle\Entity\Scope
+     */
+    private function getRandomScope()
     {
-        $persons = $this->em
+        $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
-            ->getRepository(Person::class)
+        return $this->getReference($scopeRef);
-            ->findAll();
-
-        foreach ($persons as $person) {
-            $activityNbr = mt_rand(0, 3);
-
-            for ($i = 0; $i < $activityNbr; ++$i) {
-                $activity = $this->newRandomActivity($person);
-
-                if (null !== $activity) {
-                    $manager->persist($activity);
-                }
-            }
-        }
-        $manager->flush();
-    }
-
-    public function newRandomActivity($person): ?Activity
-    {
-        $activity = (new Activity())
-            ->setUser($this->getRandomUser())
-            ->setPerson($person)
-            ->setDate($this->faker->dateTimeThisYear())
-            ->setDurationTime($this->faker->dateTime(36000))
-            ->setType($this->getRandomActivityType())
-            ->setScope($this->getRandomScope());
-
-        //      ->setAttendee($this->faker->boolean())
-
-        for ($i = 0; mt_rand(0, 4) > $i; ++$i) {
-            $reason = $this->getRandomActivityReason();
-
-            if (null !== $reason) {
-                $activity->addReason($reason);
-            } else {
-                return null;
-            }
-        }
-
-        return $activity;
     }
 
     /**
-     * Return a random activityReason.
+     * Return a random activityType
+     *
+     * @return \Chill\ActivityBundle\Entity\ActivityType
+     */
+    private function getRandomActivityType()
+    {
+        $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)];
+        return $this->getReference($typeRef);
+    }
+
+    /**
+     * Return a random activityReason
      *
      * @return \Chill\ActivityBundle\Entity\ActivityReason
      */
@@ -101,38 +90,57 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
     }
 
     /**
-     * Return a random activityType.
+     * Return a random user
-     *
-     * @return \Chill\ActivityBundle\Entity\ActivityType
-     */
-    private function getRandomActivityType()
-    {
-        $typeRef = LoadActivityType::$references[array_rand(LoadActivityType::$references)];
-
-        return $this->getReference($typeRef);
-    }
-
-    /**
-     * Return a random scope.
-     *
-     * @return \Chill\MainBundle\Entity\Scope
-     */
-    private function getRandomScope()
-    {
-        $scopeRef = LoadScopes::$references[array_rand(LoadScopes::$references)];
-
-        return $this->getReference($scopeRef);
-    }
-
-    /**
-     * Return a random user.
      *
      * @return \Chill\MainBundle\Entity\User
      */
     private function getRandomUser()
     {
         $userRef = array_rand(LoadUsers::$refs);
-
         return $this->getReference($userRef);
     }
+
+    public function newRandomActivity($person): ?Activity
+    {
+        $activity = (new Activity())
+            ->setUser($this->getRandomUser())
+            ->setPerson($person)
+            ->setDate($this->faker->dateTimeThisYear())
+            ->setDurationTime($this->faker->dateTime(36000))
+            ->setType($this->getRandomActivityType())
+            ->setScope($this->getRandomScope())
+            ;
+
+        //      ->setAttendee($this->faker->boolean())
+
+        for ($i = 0; $i < rand(0, 4); $i++) {
+            $reason = $this->getRandomActivityReason();
+            if (null !== $reason) {
+                $activity->addReason($reason);
+            } else {
+                return null;
+            }
+        }
+
+        return $activity;
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        $persons = $this->em
+            ->getRepository(Person::class)
+            ->findAll();
+
+        foreach ($persons as $person) {
+            $activityNbr = rand(0,3);
+
+            for ($i = 0; $i < $activityNbr; $i ++) {
+                $activity = $this->newRandomActivity($person);
+                if (null !== $activity) {
+                    $manager->persist($activity);
+                }
+            }
+        }
+        $manager->flush();
+    }
 }

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php

@@ -1,23 +1,15 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
+use Chill\ActivityBundle\DataFixtures\ORM\LoadActivity;
 
 /**
- * Load notififications into database.
+ * Load notififications into database
  */
 class LoadActivityNotifications extends AbstractFixture implements DependentFixtureInterface
 {
@@ -33,9 +25,9 @@ class LoadActivityNotifications extends AbstractFixture implements DependentFixt
                 'center a_social',
                 'center a_administrative',
                 'center a_direction',
-                'multi_center',
+                'multi_center'
             ],
-        ],
+        ]
     ];
 
     public function getDependencies()

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReason.php

@@ -1,64 +1,77 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  * 
- * For the full copyright and license information, please view
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * the LICENSE file that was distributed with this source code.
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
+use Chill\ActivityBundle\Entity\ActivityReason;
 
 /**
- * Description of LoadActivityReason.
+ * Description of LoadActivityReason
+ *
+ * @author Champs-Libres Coop
  */
 class LoadActivityReason extends AbstractFixture implements OrderedFixtureInterface
 {
-    public static $references = [];
-
     public function getOrder()
     {
         return 16300;
     }
     
+    public static $references = array();
+    
     public function load(ObjectManager $manager)
     {
         $reasons = [
             [
                 'name' => ['fr' => 'Recherche logement', 'en' => 'Housing research', 'nl' => 'Woning zoektoch'],
-                'category' => 'cat_Housing', ],
+                'category' => 'cat_Housing'],
             [
                 'name' => ['fr' => 'Problème avec propriétaire', 'en' => 'Landlord problems', 'nl' => 'Huisbaas problemen'],
-                'category' => 'cat_Housing', ],
+                'category' => 'cat_Housing'],
             [
                 'name' => ['fr' => 'Retard de payement', 'en' => 'Payement problems', 'nl' => 'Betalings vertragingen'],
-                'category' => 'cat_Housing', ],
+                'category' => 'cat_Housing'],
             [
                 'name' => ['fr' => 'Explication législation', 'en' => 'Legislation explanation', 'nl' => 'Legislative uitleg'],
-                'category' => 'cat_Unemployment procedure', ],
+                'category' => 'cat_Unemployment procedure'],
             [
                 'name' => ['fr' => 'Coaching entretien d\'activation', 'en' => 'Interview coaching', 'nl' => 'Interview coaching'],
-                'category' => 'cat_Unemployment procedure', ],
+                'category' => 'cat_Unemployment procedure'],
             [
                 'name' => ['fr' => 'Récupération des allocations', 'en' => 'Allowance recovery', 'nl' => 'Terugwinning van de uitkeringen'],
-                'category' => 'cat_Unemployment procedure', ],
+                'category' => 'cat_Unemployment procedure']
         ];
         
         foreach ($reasons as $r) {
-            echo 'Creating activity reason : ' . $r['name']['en'] . "\n";
+            print "Creating activity reason : " . $r['name']['en'] . "\n";
             $activityReason = (new ActivityReason())
                 ->setName(($r['name']))
                 ->setActive(true)
                 ->setCategory($this->getReference($r['category']));
             $manager->persist($activityReason);
-            $reference = 'activity_reason_' . $r['name']['en'];
+            $reference = 'activity_reason_'.$r['name']['en'];
             $this->addReference($reference, $activityReason);
             static::$references[] = $reference;
         }

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityReasonCategory.php

@@ -1,23 +1,35 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  * 
- * For the full copyright and license information, please view
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- * the LICENSE file that was distributed with this source code.
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-
+use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 /**
- * Description of LoadActivityReasonCategory.
+ * Description of LoadActivityReasonCategory
+ *
+ * @author Champs-Libres Coop
  */
 class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -29,20 +41,21 @@ class LoadActivityReasonCategory extends AbstractFixture implements OrderedFixtu
     public function load(ObjectManager $manager)
     {
         $categs = [
-            ['name' => ['fr' => 'Logement', 'en' => 'Housing', 'nl' => 'Woning']],
+            ['name' =>
-            ['name' => ['fr' => 'Démarches chômage', 'en' => 'Unemployment procedure', 'nl' => 'Werkloosheid werkwijze']],
+                ['fr' => 'Logement', 'en' => 'Housing', 'nl' => 'Woning']],
+            ['name' =>
+                ['fr' => 'Démarches chômage', 'en' => 'Unemployment procedure', 'nl' => 'Werkloosheid werkwijze']],
         ];
             
         foreach ($categs as $c) {
-            echo 'Creating activity reason category : ' . $c['name']['en'] . "\n";
+            print "Creating activity reason category : " . $c['name']['en'] . "\n";
             $activityReasonCategory = (new ActivityReasonCategory())
                 ->setName(($c['name']))
                 ->setActive(true);
             $manager->persist($activityReasonCategory);
             $this->addReference(
-                'cat_' . $c['name']['en'],
+              'cat_'.$c['name']['en'],
-                $activityReasonCategory
+              $activityReasonCategory);
-            );
         }
         
         $manager->flush();

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityType.php

@@ -1,67 +1,86 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Entity\ActivityType;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
+use Chill\ActivityBundle\Entity\ActivityType;
 
 /**
- * Description of LoadActivityType.
+ * Description of LoadActivityType
+ *
+ * @author Champs-Libres Coop
  */
 class LoadActivityType extends Fixture implements OrderedFixtureInterface
 {
-    public static $references = [];
-
     public function getOrder()
     {
         return 16100;
     }
 
+    public static $references = array();
+
     public function load(ObjectManager $manager)
     {
         $types = [
-            // Exange
+            # Exange
             [
-                'name' => ['fr' => 'Entretien physique avec l\'usager'],
+                'name' =>
-                'category' => 'exchange', ],
+                    ['fr' => 'Entretien physique avec l\'usager'],
+                'category' => 'exchange' ],
             [
-                'name' => ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel'],
+                'name' =>
-                'category' => 'exchange', ],
+                    ['fr' => 'Appel téléphonique', 'en' => 'Telephone call', 'nl' => 'Telefoon appel'],
+                'category' => 'exchange' ],
             [
-                'name' => ['fr' => 'Courriel', 'en' => 'Email', 'nl' => 'Email'],
+                'name' =>
-                'category' => 'exchange', ],
+                    ['fr' => 'Courriel', 'en' => 'Email', 'nl' => 'Email'],
-            // Meeting
+                'category' => 'exchange' ],
+            # Meeting
             [
-                'name' => ['fr' => 'Point technique encadrant'],
+                'name' =>
-                'category' => 'meeting', ],
+                    ['fr' => 'Point technique encadrant'],
+                'category' => 'meeting' ],
             [
-                'name' => ['fr' => 'Réunion avec des partenaires'],
+                'name' =>
-                'category' => 'meeting', ],
+                    ['fr' => 'Réunion avec des partenaires'],
+                'category' => 'meeting' ],
             [
-                'name' => ['fr' => 'Commission pluridisciplinaire et pluri-institutionnelle'],
+                'name' =>
-                'category' => 'meeting', ],
+                    ['fr' => 'Commission pluridisciplinaire et pluri-institutionnelle'],
+                'category' => 'meeting' ],
         ];
 
         foreach ($types as $t) {
-            echo 'Creating activity type : ' . $t['name']['fr'] . ' (cat:' . $t['category'] . " \n";
+            print "Creating activity type : " . $t['name']['fr'] . " (cat:". $t['category']  . " \n";
             $activityType = (new ActivityType())
                 ->setName(($t['name']))
-                ->setCategory($this->getReference('activity_type_cat_' . $t['category']))
+                ->setCategory($this->getReference('activity_type_cat_'.$t['category']))
                 ->setSocialIssuesVisible(1)
                 ->setSocialActionsVisible(1);
             $manager->persist($activityType);
-            $reference = 'activity_type_' . $t['name']['fr'];
+            $reference = 'activity_type_'.$t['name']['fr'];
             $this->addReference($reference, $activityType);
             static::$references[] = $reference;
         }

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityTypeCategory.php

@@ -1,27 +1,40 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Entity\ActivityTypeCategory;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
+use Chill\ActivityBundle\Entity\ActivityTypeCategory;
 
 /**
- * Fixtures for ActivityTypeCategory.
+ * Fixtures for ActivityTypeCategory
+ *
+ * @author Champs-Libres Coop
  */
 class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterface
 {
-    public static $references = [];
+    public static $references = array();
 
     public function getOrder()
     {
@@ -42,13 +55,13 @@ class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterfac
         ];
 
         foreach ($categories as $cat) {
-            echo 'Creating activity type category : ' . $cat['ref'] . "\n";
+            print "Creating activity type category : " . $cat['ref'] . "\n";
 
             $newCat = (new ActivityTypeCategory())
                 ->setName(($cat['name']));
 
             $manager->persist($newCat);
-            $reference = 'activity_type_cat_' . $cat['ref'];
+            $reference = 'activity_type_cat_'.$cat['ref'];
 
             $this->addReference($reference, $newCat);
             static::$references[] = $reference;

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivitytACL.php

@@ -1,29 +1,37 @@
 <?php
 
-/**
+/*
- * Chill is a software for social workers
+ * Copyright (C) 2015 Julien Fastré <julien.fastre@champs-libres.coop>
  *
- * For the full copyright and license information, please view
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DataFixtures\ORM;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
-use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
-use Chill\MainBundle\Entity\RoleScope;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use function in_array;
+use Chill\MainBundle\DataFixtures\ORM\LoadPermissionsGroup;
+use Chill\MainBundle\Entity\RoleScope;
+use Chill\MainBundle\DataFixtures\ORM\LoadScopes;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 
 /**
  * Add a role CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE for all groups except administrative,
- * and a role CHILL_ACTIVITY_SEE for administrative.
+ * and a role CHILL_ACTIVITY_SEE for administrative
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -32,12 +40,12 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
         return 16000;
     }
 
+    
     public function load(ObjectManager $manager)
     {
         foreach (LoadPermissionsGroup::$refs as $permissionsGroupRef) {
             $permissionsGroup = $this->getReference($permissionsGroupRef);
-
+            foreach (LoadScopes::$references as $scopeRef){
-            foreach (LoadScopes::$references as $scopeRef) {
                 $scope = $this->getReference($scopeRef);
                 //create permission group
                 switch ($permissionsGroup->getName()) {
@@ -45,52 +53,47 @@ class LoadActivitytACL extends AbstractFixture implements OrderedFixtureInterfac
                         if ($scope->getName()['en'] === 'administrative') {
                             break 2; // we do not want any power on administrative
                         }
-
                         break;
-
                     case 'administrative':
                     case 'direction':
-                        if (in_array($scope->getName()['en'], ['administrative', 'social'], true)) {
+                        if (in_array($scope->getName()['en'], array('administrative', 'social'))) {
                             break 2; // we do not want any power on social or administrative
                         }  
-
                         break;
                 }
                 
-                printf(
+                printf("Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s "
-                    'Adding CHILL_ACTIVITY_UPDATE & CHILL_ACTIVITY_CREATE & CHILL_ACTIVITY_DELETE, and stats and list permissions to %s '
                         . "permission group, scope '%s' \n", 
-                    $permissionsGroup->getName(),
+                        $permissionsGroup->getName(), $scope->getName()['en']);
-                    $scope->getName()['en']
-                );
                 $roleScopeUpdate = (new RoleScope())
-                    ->setRole('CHILL_ACTIVITY_UPDATE')
+                            ->setRole('CHILL_ACTIVITY_UPDATE')
-                    ->setScope($scope);
+                            ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeUpdate);
                 $roleScopeCreate = (new RoleScope())
-                    ->setRole(ActivityVoter::CREATE_ACCOMPANYING_COURSE)
+                            ->setRole('CHILL_ACTIVITY_CREATE')
-                    ->setScope($scope);
+                            ->setScope($scope);
-                $roleScopeCreate = (new RoleScope())
-                    ->setRole(ActivityVoter::CREATE_PERSON)
-                    ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeCreate);
                 $roleScopeDelete = (new RoleScope())
-                    ->setRole('CHILL_ACTIVITY_DELETE')
+                            ->setRole('CHILL_ACTIVITY_DELETE')
-                    ->setScope($scope);
+                            ->setScope($scope);
                 $permissionsGroup->addRoleScope($roleScopeDelete);
                 $roleScopeList = (new RoleScope())
-                    ->setRole(ActivityStatsVoter::LISTS);
+                            ->setRole(ActivityStatsVoter::LISTS)
+                            ;
                 $permissionsGroup->addRoleScope($roleScopeList);
                 $roleScopeStat = (new RoleScope())
-                    ->setRole(ActivityStatsVoter::STATS);
+                            ->setRole(ActivityStatsVoter::STATS)
+                            ;
                 $permissionsGroup->addRoleScope($roleScopeStat);
                 
                 $manager->persist($roleScopeUpdate);
                 $manager->persist($roleScopeCreate);
                 $manager->persist($roleScopeDelete);
             }
+            
         }
         
         $manager->flush();
     }
+
 }

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -1,30 +1,45 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DependencyInjection;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 
 /**
- * This is the class that loads and manages your bundle configuration.
+ * This is the class that loads and manages your bundle configuration
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
 class ChillActivityExtension extends Extension implements PrependExtensionInterface
 {
+    /**
+     * {@inheritdoc}
+     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
@@ -32,7 +47,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
 
         $container->setParameter('chill_activity.form.time_duration', $config['form']['time_duration']);
 
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/export.yaml');
         $loader->load('services/repositories.yaml');
@@ -50,38 +65,33 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         $this->prependCruds($container);
     }
 
-    public function prependAuthorization(ContainerBuilder $container)
+    /* (non-PHPdoc)
-    {
-        $container->prependExtensionConfig('security', [
-            'role_hierarchy' => [
-                ActivityVoter::UPDATE => [ActivityVoter::SEE_DETAILS],
-                ActivityVoter::CREATE_PERSON => [ActivityVoter::SEE_DETAILS],
-                ActivityVoter::CREATE_ACCOMPANYING_COURSE => [ActivityVoter::SEE_DETAILS],
-                ActivityVoter::DELETE => [ActivityVoter::SEE_DETAILS],
-                ActivityVoter::SEE_DETAILS => [ActivityVoter::SEE],
-                ActivityVoter::FULL => [
-                    ActivityVoter::CREATE_PERSON,
-                    ActivityVoter::CREATE_ACCOMPANYING_COURSE,
-                    ActivityVoter::DELETE,
-                    ActivityVoter::UPDATE,
-                ],
-            ],
-        ]);
-    }
-
-    /** (non-PHPdoc).
      * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
     public function prependRoutes(ContainerBuilder $container)
     {
         //add routes for custom bundle
-        $container->prependExtensionConfig('chill_main', [
+         $container->prependExtensionConfig('chill_main', array(
-            'routing' => [
+           'routing' => array(
-                'resources' => [
+              'resources' => array(
-                    '@ChillActivityBundle/config/routes.yaml',
+                 '@ChillActivityBundle/config/routes.yaml'
-                ],
+              )
-            ],
+           )
-        ]);
+        ));
+    }
+
+    public function prependAuthorization(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('security', array(
+           'role_hierarchy' => array(
+              ActivityVoter::UPDATE => array(ActivityVoter::SEE_DETAILS),
+              ActivityVoter::CREATE => array(ActivityVoter::SEE_DETAILS),
+              ActivityVoter::DELETE => array(ActivityVoter::SEE_DETAILS),
+              ActivityVoter::SEE_DETAILS => array(ActivityVoter::SEE),
+              ActivityVoter::FULL => [ActivityVoter::CREATE, ActivityVoter::DELETE,
+                   ActivityVoter::UPDATE],
+           )
+        ));
     }
 
     protected function prependCruds(ContainerBuilder $container)
@@ -97,17 +107,17 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                     'actions' => [
                         'index' => [
                             'template' => '@ChillActivity/ActivityType/index.html.twig',
-                            'role' => 'ROLE_ADMIN',
+                            'role' => 'ROLE_ADMIN'
                         ],
-                        'new' => [
+                        'new'   => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityType/new.html.twig',
                         ],
-                        'edit' => [
+                        'edit'  => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityType/edit.html.twig',
-                        ],
+                        ]
-                    ],
+                    ]
                 ],
                 [
                     'class' => \Chill\ActivityBundle\Entity\ActivityTypeCategory::class,
@@ -118,17 +128,17 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                     'actions' => [
                         'index' => [
                             'template' => '@ChillActivity/ActivityTypeCategory/index.html.twig',
-                            'role' => 'ROLE_ADMIN',
+                            'role' => 'ROLE_ADMIN'
                         ],
-                        'new' => [
+                        'new'   => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityTypeCategory/new.html.twig',
                         ],
-                        'edit' => [
+                        'edit'  => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityTypeCategory/edit.html.twig',
-                        ],
+                        ]
-                    ],
+                    ]
                 ],
                 [
                     'class' => \Chill\ActivityBundle\Entity\ActivityPresence::class,
@@ -139,19 +149,19 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
                     'actions' => [
                         'index' => [
                             'template' => '@ChillActivity/ActivityPresence/index.html.twig',
-                            'role' => 'ROLE_ADMIN',
+                            'role' => 'ROLE_ADMIN'
                         ],
-                        'new' => [
+                        'new'   => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityPresence/new.html.twig',
                         ],
-                        'edit' => [
+                        'edit'  => [
                             'role' => 'ROLE_ADMIN',
                             'template' => '@ChillActivity/ActivityPresence/edit.html.twig',
-                        ],
+                        ]
-                    ],
+                    ]
                 ],
-            ],
+            ]
         ]);
     }
 }

src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php

@@ -1,74 +1,69 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-use function is_int;
 
 /**
- * This is the class that validates and merges configuration from your app/config files.
+ * This is the class that validates and merges configuration from your app/config files
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
 class Configuration implements ConfigurationInterface
 {
+    /**
+     * {@inheritdoc}
+     */
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder('chill_activity');
         $rootNode = $treeBuilder->getRootNode('chill_activity');
         
         $rootNode
-            ->children()
+                ->children()
-            ->arrayNode('form')
+                    ->arrayNode('form')
-            ->canBeEnabled()
+                        ->canBeEnabled()
-            ->children()
+                        ->children()
-            ->arrayNode('time_duration')
+                            ->arrayNode('time_duration')
-            ->isRequired()
+                            ->isRequired()
-            ->requiresAtLeastOneElement()
+                            ->requiresAtLeastOneElement()
-            ->defaultValue(
+                            ->defaultValue(
-                [
+                                    array(
-                    ['label' => '5 minutes',  'seconds' => 300],
+                                        [ 'label' => '5 minutes',  'seconds' => 300], 
-                    ['label' => '10 minutes', 'seconds' => 600],
+                                        [ 'label' => '10 minutes', 'seconds' => 600],
-                    ['label' => '15 minutes', 'seconds' => 900],
+                                        [ 'label' => '15 minutes', 'seconds' => 900],
-                    ['label' => '20 minutes', 'seconds' => 1200],
+                                        [ 'label' => '20 minutes', 'seconds' => 1200],
-                    ['label' => '25 minutes', 'seconds' => 1500],
+                                        [ 'label' => '25 minutes', 'seconds' => 1500],
-                    ['label' => '30 minutes', 'seconds' => 1800],
+                                        [ 'label' => '30 minutes', 'seconds' => 1800],
-                    ['label' => '45 minutes', 'seconds' => 2700],
+                                        [ 'label' => '45 minutes', 'seconds' => 2700],
-                    ['label' => '1 hour',     'seconds' => 3600],
+                                        [ 'label' => '1 hour',     'seconds' => 3600],
-                    ['label' => '1 hour 15',  'seconds' => 4500],
+                                        [ 'label' => '1 hour 15',  'seconds' => 4500],
-                    ['label' => '1 hour 30',  'seconds' => 5400],
+                                        [ 'label' => '1 hour 30',  'seconds' => 5400],
-                    ['label' => '1 hour 45',  'seconds' => 6300],
+                                        [ 'label' => '1 hour 45',  'seconds' => 6300],
-                    ['label' => '2 hours',    'seconds' => 7200],
+                                        [ 'label' => '2 hours',    'seconds' => 7200],
-                ]
+                                        )
-            )
+                                    )
-            ->info('The intervals of time to show in activity form')
+                            ->info('The intervals of time to show in activity form')
-            ->prototype('array')
+
-            ->children()
+                            ->prototype('array')
-            ->scalarNode('seconds')
+                                ->children()
-            ->info('The number of seconds of this duration. Must be an integer.')
+                                    ->scalarNode('seconds')
-            ->cannotBeEmpty()
+                                        ->info("The number of seconds of this duration. Must be an integer.")
-            ->validate()
+                                        ->cannotBeEmpty()
-            ->ifTrue(static function ($data) {
+                                        ->validate()
-                return !is_int($data);
+                                            ->ifTrue(function($data) {
-            })->thenInvalid('The value %s is not a valid integer')
+                                                return !is_int($data);
-            ->end()
+                                            })->thenInvalid("The value %s is not a valid integer")
-            ->end()
+                                        ->end()
-            ->scalarNode('label')
+                                    ->end()
-            ->cannotBeEmpty()
+                                    ->scalarNode('label')
-            ->info('The label to show into fields')
+                                        ->cannotBeEmpty()
-            ->end()
+                                        ->info("The label to show into fields")
-            ->end()
+                                    ->end()
-            ->end()
+                                ->end()
+
+                            ->end()
 //                            ->validate()
 //                            
 //                                ->ifTrue(function ($data) {
@@ -89,10 +84,11 @@ class Configuration implements ConfigurationInterface
 //                                    })
 //                                    ->thenInvalid("The data are invalid. The keys must be a string and the value integers")
 //                            ->end()
-            ->end()
+                            ->end()
-            ->end()
+                        ->end()
-            ->end()
+                
-            ->end();
+                    ->end()
+                ->end();
 
         return $treeBuilder;
     }

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -1,106 +1,52 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Entity;
 
-use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
 use Chill\DocStoreBundle\Entity\Document;
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Entity\HasCenterInterface;
-use Chill\MainBundle\Entity\HasScopeInterface;
 use Chill\MainBundle\Entity\Location;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTime;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\Center;
+use Chill\PersonBundle\Entity\Person;
+use Chill\MainBundle\Entity\HasCenterInterface;
+use Chill\MainBundle\Entity\HasScopeInterface;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\ArrayCollection;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Serializer\Annotation\Groups;
-use Symfony\Component\Serializer\Annotation\SerializedName;
+use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
- * Class Activity.
+ * Class Activity
  *
+ * @package Chill\ActivityBundle\Entity
  * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
  * @ORM\Table(name="activity")
- * @ORM\HasLifecycleCallbacks
+ * @ORM\HasLifecycleCallbacks()
  * @DiscriminatorMap(typeProperty="type", mapping={
- *     "activity": Activity::class
+ *  "activity"=Activity::class
- * })
+ *  })
- * @ActivityValidator\ActivityValidity
- *
- * @UserCircleConsistency(
- *     "CHILL_ACTIVITY_SEE_DETAILS",
- *     getUserFunction="getUser",
- * path="scope")
  */
-class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterface, HasCenterInterface, HasScopeInterface
+
+/*
+ * TODO : revoir
+ * @UserCircleConsistency(
+ *      "CHILL_ACTIVITY_SEE_DETAILS",
+ *      getUserFunction="getUser",
+ *      path="scope")
+ */
+
+class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
 {
-    public const SENTRECEIVED_RECEIVED = 'received';
+    const SENTRECEIVED_SENT = 'sent';
-
+    const SENTRECEIVED_RECEIVED = 'received';
-    public const SENTRECEIVED_SENT = 'sent';
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
-     * @Groups({"read"})
-     */
-    private ?AccompanyingPeriod $accompanyingPeriod = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
-     * @Groups({"read"})
-     * @SerializedName("activityType")
-     * @ORM\JoinColumn(name="type_id")
-     */
-    private ActivityType $activityType;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
-     */
-    private ?ActivityPresence $attendee = null;
-
-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
-     */
-    private CommentEmbeddable $comment;
-
-    /**
-     * @ORM\Column(type="datetime")
-     */
-    private DateTime $date;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
-     */
-    private Collection $documents;
-
-    /**
-     * @ORM\Column(type="time", nullable=true)
-     */
-    private ?DateTime $durationTime = null;
-
-    /**
-     * @ORM\Column(type="boolean", options={"default": false})
-     */
-    private bool $emergency = false;
 
     /**
      * @ORM\Id
@@ -111,44 +57,35 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private ?int $id = null;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     * @groups({"read"})
      */
-    private ?Location $location = null;
+    private User $user;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
+     * @ORM\Column(type="datetime")
      */
-    private ?Person $person = null;
+    private \DateTime $date;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
+     * @ORM\Column(type="time", nullable=true)
-     * @Groups({"read"})
      */
-    private ?Collection $persons = null;
+    private ?\DateTime $durationTime = null;
+
+    /**
+     * @ORM\Column(type="time", nullable=true)
+     */
+    private ?\DateTime $travelTime = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
+     */
+    private ?ActivityPresence $attendee = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
      */
     private Collection $reasons;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
-     */
-    private ?Scope $scope = null;
-
-    /**
-     * @ORM\Column(type="string", options={"default": ""})
-     */
-    private string $sentReceived = '';
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
-     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
-     * @Groups({"read"})
-     */
-    private Collection $socialActions;
-
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
@@ -156,6 +93,45 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      */
     private Collection $socialIssues;
 
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
+     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
+     * @Groups({"read"})
+     */
+    private Collection $socialActions;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
+     */
+    private ActivityType $type;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
+     */
+    private ?Scope $scope = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
+     */
+    private ?Person $person = null;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
+     * @Groups({"read"})
+     */
+    private ?AccompanyingPeriod $accompanyingPeriod = null;
+
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
+     */
+    private CommentEmbeddable $comment;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
+     * @Groups({"read"})
+     */
+    private ?Collection $persons = null;
+
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
      * @Groups({"read"})
@@ -163,14 +139,9 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private ?Collection $thirdParties = null;
 
     /**
-     * @ORM\Column(type="time", nullable=true)
+     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject", cascade={"persist"})
      */
-    private ?DateTime $travelTime = null;
+    private Collection $documents;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     */
-    private User $user;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
@@ -178,6 +149,23 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      */
     private ?Collection $users = null;
 
+    /**
+     * @ORM\Column(type="boolean", options={"default"=false})
+     */
+    private bool $emergency = false;
+
+    /**
+     * @ORM\Column(type="string", options={"default"=""})
+     */
+    private string $sentReceived = '';
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
+     * @groups({"read"})
+     */
+    private ?Location $location = null;
+
+
     public function __construct()
     {
         $this->reasons = new ArrayCollection();
@@ -190,27 +178,71 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         $this->socialActions = new ArrayCollection();
     }
 
-    public function addDocument(Document $document): self
+    public function getId(): ?int
     {
-        $this->documents[] = $document;
+        return $this->id;
+    }
+
+    public function setUser(UserInterface $user): self
+    {
+        $this->user = $user;
 
         return $this;
     }
 
-    /**
+    public function getUser(): User
-     * Add a person to the person list.
-     */
-    public function addPerson(?Person $person): self
     {
-        if (null !== $person) {
+        return $this->user;
-            if (!$this->persons->contains($person)) {
+    }
-                $this->persons[] = $person;
+
-            }
+    public function setDate(\DateTime $date): self
-        }
+    {
+        $this->date = $date;
 
         return $this;
     }
 
+    public function getDate(): \DateTime
+    {
+        return $this->date;
+    }
+
+    public function setDurationTime(?\DateTime $durationTime): self
+    {
+        $this->durationTime = $durationTime;
+
+        return $this;
+    }
+
+    public function getDurationTime(): ?\DateTime
+    {
+        return $this->durationTime;
+    }
+
+    public function setTravelTime(\DateTime $travelTime): self
+    {
+        $this->travelTime = $travelTime;
+
+        return $this;
+    }
+
+    public function getTravelTime(): ?\DateTime
+    {
+        return $this->travelTime;
+    }
+
+    public function setAttendee(ActivityPresence $attendee): self
+    {
+        $this->attendee = $attendee;
+
+        return $this;
+    }
+
+    public function getAttendee(): ?ActivityPresence
+    {
+        return $this->attendee;
+    }
+
     public function addReason(ActivityReason $reason): self
     {
         $this->reasons->add($reason);
@@ -218,15 +250,28 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function addSocialAction(SocialAction $socialAction): self
+    public function removeReason(ActivityReason $reason): void
     {
-        if (!$this->socialActions->contains($socialAction)) {
+        $this->reasons->removeElement($reason);
-            $this->socialActions[] = $socialAction;
+    }
-        }
+
+    public function getReasons(): Collection
+    {
+        return $this->reasons;
+    }
+
+    public function setReasons(?ArrayCollection $reasons): self
+    {
+        $this->reasons = $reasons;
 
         return $this;
     }
 
+    public function getSocialIssues(): Collection
+    {
+        return $this->socialIssues;
+    }
+
     public function addSocialIssue(SocialIssue $socialIssue): self
     {
         if (!$this->socialIssues->contains($socialIssue)) {
@@ -236,46 +281,88 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function addThirdParty(?ThirdParty $thirdParty): self
+    public function removeSocialIssue(SocialIssue $socialIssue): self
     {
-        if (null !== $thirdParty) {
+        $this->socialIssues->removeElement($socialIssue);
-            if (!$this->thirdParties->contains($thirdParty)) {
+
-                $this->thirdParties[] = $thirdParty;
+        return $this;
-            }
+    }
+
+    public function getSocialActions(): Collection
+    {
+        return $this->socialActions;
+    }
+
+    public function addSocialAction(SocialAction $socialAction): self
+    {
+        if (!$this->socialActions->contains($socialAction)) {
+            $this->socialActions[] = $socialAction;
         }
 
         return $this;
     }
 
-    public function addUser(?User $user): self
+    public function removeSocialAction(SocialAction $socialAction): self
     {
-        if (null !== $user) {
+        $this->socialActions->removeElement($socialAction);
-            if (!$this->users->contains($user)) {
-                $this->users[] = $user;
-            }
-        }
 
         return $this;
     }
 
+
+
+
+    public function setType(ActivityType $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    public function getType(): ActivityType
+    {
+        return $this->type;
+    }
+
+    public function setScope(Scope $scope): self
+    {
+        $this->scope = $scope;
+
+        return $this;
+    }
+
+    public function getScope(): ?Scope
+    {
+        return $this->scope;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        return $this;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
     public function getAccompanyingPeriod(): ?AccompanyingPeriod
     {
         return $this->accompanyingPeriod;
     }
 
-    public function getActivityType(): ActivityType
+    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
     {
-        return $this->activityType;
+        $this->accompanyingPeriod = $accompanyingPeriod;
-    }
 
-    public function getAttendee(): ?ActivityPresence
+        return $this;
-    {
-        return $this->attendee;
     }
 
     /**
      * get the center
-     * center is extracted from person.
+     * center is extracted from person
      */
     public function getCenter(): ?Center
     {
@@ -291,39 +378,28 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->comment;
     }
 
-    public function getDate(): DateTime
+    public function setComment(CommentEmbeddable $comment): self
     {
-        return $this->date;
+        $this->comment = $comment;
+
+        return $this;
     }
 
-    public function getDocuments(): Collection
+    /**
+     * Add a person to the person list
+     */
+    public function addPerson(?Person $person): self
     {
-        return $this->documents;
+        if (null !== $person) {
+            $this->persons[] = $person;
+        }
+
+        return $this;
     }
 
-    public function getDurationTime(): ?DateTime
+    public function removePerson(Person $person): void
     {
-        return $this->durationTime;
+        $this->persons->removeElement($person);
-    }
-
-    public function getEmergency(): bool
-    {
-        return $this->emergency;
-    }
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getLocation(): ?Location
-    {
-        return $this->location;
-    }
-
-    public function getPerson(): ?Person
-    {
-        return $this->person;
     }
 
     public function getPersons(): Collection
@@ -335,16 +411,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     {
         if (null !== $this->accompanyingPeriod) {
             $personsAssociated = [];
-
             foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
                 if ($this->persons->contains($participation->getPerson())) {
                     $personsAssociated[] = $participation->getPerson();
                 }
             }
-
             return $personsAssociated;
         }
-
         return [];
     }
 
@@ -352,187 +425,16 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     {
         if (null !== $this->accompanyingPeriod) {
             $personsNotAssociated = [];
-
-            // TODO better semantic with:  return $this->persons->filter(...);
             foreach ($this->persons as $person) {
-                if ($this->accompanyingPeriod->getOpenParticipationContainsPerson($person) === null) {
+                if (!in_array($person, $this->getPersonsAssociated())) {
-                    $personsNotAssociated[] = $person;
+                     $personsNotAssociated[] = $person;
                 }
             }
-
             return $personsNotAssociated;
         }
-
         return [];
     }
 
-    public function getReasons(): Collection
-    {
-        return $this->reasons;
-    }
-
-    public function getScope(): ?Scope
-    {
-        return $this->scope;
-    }
-
-    public function getSentReceived(): string
-    {
-        return $this->sentReceived;
-    }
-
-    public function getSocialActions(): Collection
-    {
-        return $this->socialActions;
-    }
-
-    public function getSocialIssues(): Collection
-    {
-        return $this->socialIssues;
-    }
-
-    public function getThirdParties(): Collection
-    {
-        return $this->thirdParties;
-    }
-
-    public function getTravelTime(): ?DateTime
-    {
-        return $this->travelTime;
-    }
-
-    /**
-     * @deprecated
-     */
-    public function getType(): ActivityType
-    {
-        return $this->activityType;
-    }
-
-    public function getUser(): User
-    {
-        return $this->user;
-    }
-
-    public function getUsers(): Collection
-    {
-        return $this->users;
-    }
-
-    public function isEmergency(): bool
-    {
-        return $this->getEmergency();
-    }
-
-    public function removeDocument(Document $document): void
-    {
-        $this->documents->removeElement($document);
-    }
-
-    public function removePerson(Person $person): void
-    {
-        $this->persons->removeElement($person);
-    }
-
-    public function removeReason(ActivityReason $reason): void
-    {
-        $this->reasons->removeElement($reason);
-    }
-
-    public function removeSocialAction(SocialAction $socialAction): self
-    {
-        $this->socialActions->removeElement($socialAction);
-
-        return $this;
-    }
-
-    public function removeSocialIssue(SocialIssue $socialIssue): self
-    {
-        $this->socialIssues->removeElement($socialIssue);
-
-        return $this;
-    }
-
-    public function removeThirdParty(ThirdParty $thirdParty): void
-    {
-        $this->thirdParties->removeElement($thirdParty);
-    }
-
-    public function removeUser(User $user): void
-    {
-        $this->users->removeElement($user);
-    }
-
-    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
-    {
-        $this->accompanyingPeriod = $accompanyingPeriod;
-
-        return $this;
-    }
-
-    public function setActivityType(ActivityType $activityType): self
-    {
-        $this->activityType = $activityType;
-
-        return $this;
-    }
-
-    public function setAttendee(ActivityPresence $attendee): self
-    {
-        $this->attendee = $attendee;
-
-        return $this;
-    }
-
-    public function setComment(CommentEmbeddable $comment): self
-    {
-        $this->comment = $comment;
-
-        return $this;
-    }
-
-    public function setDate(DateTime $date): self
-    {
-        $this->date = $date;
-
-        return $this;
-    }
-
-    public function setDocuments(Collection $documents): self
-    {
-        $this->documents = $documents;
-
-        return $this;
-    }
-
-    public function setDurationTime(?DateTime $durationTime): self
-    {
-        $this->durationTime = $durationTime;
-
-        return $this;
-    }
-
-    public function setEmergency(bool $emergency): self
-    {
-        $this->emergency = $emergency;
-
-        return $this;
-    }
-
-    public function setLocation(?Location $location): Activity
-    {
-        $this->location = $location;
-
-        return $this;
-    }
-
-    public function setPerson(?Person $person): self
-    {
-        $this->person = $person;
-
-        return $this;
-    }
-
     public function setPersons(?Collection $persons): self
     {
         $this->persons = $persons;
@@ -540,25 +442,22 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setReasons(?ArrayCollection $reasons): self
+    public function addThirdParty(?ThirdParty $thirdParty): self
     {
-        $this->reasons = $reasons;
+        if (null !== $thirdParty) {
-
+           $this->thirdParties[] = $thirdParty;
+        }
         return $this;
     }
 
-    public function setScope(Scope $scope): self
+    public function removeThirdParty(ThirdParty $thirdParty): void
     {
-        $this->scope = $scope;
+        $this->thirdParties->removeElement($thirdParty);
-
-        return $this;
     }
 
-    public function setSentReceived(?string $sentReceived): self
+    public function getThirdParties(): Collection
     {
-        $this->sentReceived = (string) $sentReceived;
+        return $this->thirdParties;
-
-        return $this;
     }
 
     public function setThirdParties(?Collection $thirdParties): self
@@ -568,34 +467,99 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this;
     }
 
-    public function setTravelTime(DateTime $travelTime): self
+    public function addDocument(Document $document): self
     {
-        $this->travelTime = $travelTime;
+        $this->documents[] = $document;
 
         return $this;
     }
 
-    /**
+    public function removeDocument(Document $document): void
-     * @deprecated
-     */
-    public function setType(ActivityType $activityType): self
     {
-        $this->activityType = $activityType;
+        $this->documents->removeElement($document);
+    }
+
+    public function getDocuments(): Collection
+    {
+        return $this->documents;
+    }
+
+    public function setDocuments(Collection $documents): self
+    {
+        $this->documents = $documents;
 
         return $this;
     }
 
-    public function setUser(UserInterface $user): self
+    public function addUser(?User $user): self
     {
-        $this->user = $user;
+        if (null !== $user) {
-
+            $this->users[] = $user;
+        }
         return $this;
     }
 
+    public function removeUser(User $user): void
+    {
+        $this->users->removeElement($user);
+    }
+
+    public function getUsers(): Collection
+    {
+        return $this->users;
+    }
+
     public function setUsers(?Collection $users): self
     {
         $this->users = $users;
 
         return $this;
     }
+
+    public function isEmergency(): bool
+    {
+        return $this->getEmergency();
+    }
+
+    public function getEmergency(): bool
+    {
+        return $this->emergency;
+    }
+
+    public function setEmergency(bool $emergency): self
+    {
+        $this->emergency = $emergency;
+
+        return $this;
+    }
+
+    public function getSentReceived(): string
+    {
+        return $this->sentReceived;
+    }
+
+    public function setSentReceived(?string $sentReceived): self
+    {
+        $this->sentReceived = (string) $sentReceived;
+
+        return $this;
+    }
+
+    /**
+     * @return Location|null
+     */
+    public function getLocation(): ?Location
+    {
+        return $this->location;
+    }
+
+    /**
+     * @param Location|null $location
+     * @return Activity
+     */
+    public function setLocation(?Location $location): Activity
+    {
+        $this->location = $location;
+        return $this;
+    }
 }

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

@@ -1,32 +1,37 @@
 <?php
 
-/**
+/*
- * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * the LICENSE file that was distributed with this source code.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Class ActivityPresence.
+ * Class ActivityPresence
  *
- * @ORM\Entity
+ * @package Chill\ActivityBundle\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="activitytpresence")
- * @ORM\HasLifecycleCallbacks
+ * @ORM\HasLifecycleCallbacks()
  */
 class ActivityPresence
 {
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private bool $active = true;
-
     /**
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -40,48 +45,53 @@ class ActivityPresence
     private array $name = [];
 
     /**
-     * Get active
+     * @ORM\Column(type="boolean")
-     * return true if the category type is active.
      */
-    public function getActive(): bool
+    private bool $active = true;
-    {
-        return $this->active;
-    }
 
     public function getId(): int
     {
         return $this->id;
     }
 
-    public function getName(): array
-    {
-        return $this->name;
-    }
-
-    /**
-     * Is active
-     * return true if the category type is active.
-     */
-    public function isActive(): bool
-    {
-        return $this->getActive();
-    }
-
-    /**
-     * Set active
-     * set to true if the category type is active.
-     */
-    public function setActive(bool $active): self
-    {
-        $this->active = $active;
-
-        return $this;
-    }
-
     public function setName(array $name): self
     {
         $this->name = $name;
 
         return $this;
     }
+
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get active
+     * return true if the category type is active.
+     */
+    public function getActive(): bool
+    {
+        return $this->active;
+    }
+
+    /**
+     * Is active
+     * return true if the category type is active
+     */
+    public function isActive(): bool
+    {
+        return $this->getActive();
+    }
+
+    /**
+     * Set active
+     * set to true if the category type is active
+     */
+    public function setActive(bool $active): self
+    {
+        $this->active = $active;
+
+        return $this;
+    }
 }

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -1,43 +1,40 @@
 <?php
 
-/**
+/*
- * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- * the LICENSE file that was distributed with this source code.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Chill\ActivityBundle\Entity\ActivityReasonCategory;
 
 /**
- * Class ActivityReason.
+ * Class ActivityReason
  *
- * @ORM\Entity
+ * @package Chill\ActivityBundle\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="activityreason")
- * @ORM\HasLifecycleCallbacks
+ * @ORM\HasLifecycleCallbacks()
  */
 class ActivityReason
 {
     /**
-     * @var bool
+     * @var integer
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-    /**
-     * @var ActivityReasonCategory
-     * @ORM\ManyToOne(
-     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
-     * inversedBy="reasons")
-     */
-    private $category;
-
-    /**
-     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -52,17 +49,86 @@ class ActivityReason
     private $name;
 
     /**
-     * Get active.
+     * @var ActivityReasonCategory
-     *
+     * @ORM\ManyToOne(
-     * @return bool
+     *     targetEntity="Chill\ActivityBundle\Entity\ActivityReasonCategory",
+     *     inversedBy="reasons")
      */
-    public function getActive()
+    private $category;
+
+    /**
+     * @var boolean
+     * @ORM\Column(type="boolean")
+     */
+    private $active = true;
+
+
+    /**
+     * Get id
+     *
+     * @return integer
+     */
+    public function getId()
     {
-        return $this->active;
+        return $this->id;
     }
 
     /**
-     * Get category.
+     * Set name
+     *
+     * @param array $name
+     * @return ActivityReason
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get name
+     *
+     * @return array | string
+     */
+    public function getName($locale = null)
+    {
+        if ($locale) {
+            if (isset($this->name[$locale])) {
+                return $this->name[$locale];
+            } else {
+                foreach ($this->name as $name) {
+                    if (!empty($name)) {
+                        return $name;
+                    }
+                }
+            }
+            return '';
+        } else {
+            return $this->name;
+        }
+    }
+
+    /**
+     * Set category of the reason. If you set to the reason an inactive
+     * category, the reason will become inactive
+     *
+     * @param ActivityReasonCategory $category
+     * @return ActivityReason
+     */
+    public function setCategory(ActivityReasonCategory $category)
+    {
+        if($this->category !== $category && ! $category->getActive()) {
+            $this->setActive(False);
+        }
+
+        $this->category = $category;
+
+        return $this;
+    }
+
+    /**
+     * Get category
      *
      * @return ActivityReasonCategory
      */
@@ -72,46 +138,9 @@ class ActivityReason
     }
 
     /**
-     * Get id.
+     * Set active
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get name.
-     *
-     * @param mixed|null $locale
-     *
-     * @return array | string
-     */
-    public function getName($locale = null)
-    {
-        if ($locale) {
-            if (isset($this->name[$locale])) {
-                return $this->name[$locale];
-            }
-
-            foreach ($this->name as $name) {
-                if (!empty($name)) {
-                    return $name;
-                }
-            }
-
-            return '';
-        }
-
-        return $this->name;
-    }
-
-    /**
-     * Set active.
-     *
-     * @param bool $active
      *
+     * @param boolean $active
      * @return ActivityReason
      */
     public function setActive($active)
@@ -122,33 +151,13 @@ class ActivityReason
     }
 
     /**
-     * Set category of the reason. If you set to the reason an inactive
+     * Get active
-     * category, the reason will become inactive.
      *
-     * @return ActivityReason
+     * @return boolean
      */
-    public function setCategory(ActivityReasonCategory $category)
+    public function getActive()
     {
-        if ($this->category !== $category && !$category->getActive()) {
+        return $this->active;
-            $this->setActive(false);
-        }
-
-        $this->category = $category;
-
-        return $this;
-    }
-
-    /**
-     * Set name.
-     *
-     * @param array $name
-     *
-     * @return ActivityReason
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-
-        return $this;
     }
 }
+

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -1,36 +1,39 @@
 <?php
 
-/**
+/*
- * Chill is a software for social workers
+ * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
  *
- * For the full copyright and license information, please view
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Entity;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
+use Doctrine\Common\Collections\ArrayCollection;
 
 /**
- * Class ActivityReasonCategory.
+ * Class ActivityReasonCategory
  *
- * @ORM\Entity
+ * @package Chill\ActivityBundle\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="activityreasoncategory")
- * @ORM\HasLifecycleCallbacks
+ * @ORM\HasLifecycleCallbacks()
  */
 class ActivityReasonCategory
 {
     /**
-     * @var bool
+     * @var integer
-     * @ORM\Column(type="boolean")
-     */
-    private $active = true;
-
-    /**
-     * @var int
      *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -45,12 +48,17 @@ class ActivityReasonCategory
     private $name;
 
     /**
-     * Array of ActivityReason.
+     * @var boolean
-     *
+     * @ORM\Column(type="boolean")
+     */
+    private $active = true;
+
+    /**
+     * Array of ActivityReason
      * @var ArrayCollection
      * @ORM\OneToMany(
      *     targetEntity="Chill\ActivityBundle\Entity\ActivityReason",
-     * mappedBy="category")
+     *     mappedBy="category")
      */
     private $reasons;
 
@@ -67,23 +75,13 @@ class ActivityReasonCategory
      */
     public function __toString()
     {
-        return 'ActivityReasonCategory(' . $this->getName('x') . ')';
+        return 'ActivityReasonCategory('.$this->getName('x').')';
     }
 
     /**
-     * Get active.
+     * Get id
      *
-     * @return bool
+     * @return integer
-     */
-    public function getActive()
-    {
-        return $this->active;
-    }
-
-    /**
-     * Get id.
-     *
-     * @return int
      */
     public function getId()
     {
@@ -91,9 +89,20 @@ class ActivityReasonCategory
     }
 
     /**
-     * Get name.
+     * Set name
      *
-     * @param mixed|null $locale
+     * @param array $name
+     * @return ActivityReasonCategory
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get name
      *
      * @return array
      */
@@ -102,32 +111,30 @@ class ActivityReasonCategory
         if ($locale) {
             if (isset($this->name[$locale])) {
                 return $this->name[$locale];
-            }
+            } else {
-
+                foreach ($this->name as $name) {
-            foreach ($this->name as $name) {
+                    if (!empty($name)) {
-                if (!empty($name)) {
+                        return $name;
-                    return $name;
+                    }
                 }
             }
-
             return '';
+        } else {
+            return $this->name;
         }
-
-        return $this->name;
     }
 
     /**
      * Declare a category as active (or not). When a category is set
      * as unactive, all the reason have this entity as category is also
-     * set as unactive.
+     * set as unactive
-     *
-     * @param bool $active
      *
+     * @param boolean $active
      * @return ActivityReasonCategory
      */
     public function setActive($active)
     {
-        if ($this->active !== $active && !$active) {
+        if($this->active !== $active && !$active) {
             foreach ($this->reasons as $reason) {
                 $reason->setActive($active);
             }
@@ -139,16 +146,13 @@ class ActivityReasonCategory
     }
 
     /**
-     * Set name.
+     * Get active
      *
-     * @param array $name
+     * @return boolean
-     *
-     * @return ActivityReasonCategory
      */
-    public function setName($name)
+    public function getActive()
     {
-        $this->name = $name;
+        return $this->active;
-
-        return $this;
     }
 }
+

src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Entity;
@@ -14,17 +7,12 @@ namespace Chill\ActivityBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="activitytypecategory")
- * @ORM\HasLifecycleCallbacks
+ * @ORM\HasLifecycleCallbacks()
  */
 class ActivityTypeCategory
 {
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private bool $active = true;
-
     /**
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
@@ -38,10 +26,38 @@ class ActivityTypeCategory
     private array $name = [];
 
     /**
-     * @ORM\Column(type="float", options={"default": "0.0"})
+     * @ORM\Column(type="boolean")
+     */
+    private bool $active = true;
+
+    /**
+     * @ORM\Column(type="float", options={"default"="0.0"})
      */
     private float $ordering = 0.0;
 
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set name
+     */
+    public function setName(array $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Get name
+     */
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
     /**
      * Get active
      * return true if the category type is active.
@@ -51,27 +67,9 @@ class ActivityTypeCategory
         return $this->active;
     }
 
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get name.
-     */
-    public function getName(): array
-    {
-        return $this->name;
-    }
-
-    public function getOrdering(): float
-    {
-        return $this->ordering;
-    }
-
     /**
      * Is active
-     * return true if the category type is active.
+     * return true if the category type is active
      */
     public function isActive(): bool
     {
@@ -80,7 +78,7 @@ class ActivityTypeCategory
 
     /**
      * Set active
-     * set to true if the category type is active.
+     * set to true if the category type is active
      */
     public function setActive(bool $active): self
     {
@@ -89,14 +87,9 @@ class ActivityTypeCategory
         return $this;
     }
 
-    /**
+    public function getOrdering(): float
-     * Set name.
-     */
-    public function setName(array $name): self
     {
-        $this->name = $name;
+        return $this->ordering;
-
-        return $this;
     }
 
     public function setOrdering(float $ordering): self

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php

@@ -1,32 +1,22 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Repository\ActivityReasonCategoryRepository;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
-use RuntimeException;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Doctrine\ORM\QueryBuilder;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr\Join;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function array_key_exists;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use function count;
 
 class ActivityReasonAggregator implements AggregatorInterface, ExportElementValidatedInterface
 {
@@ -46,47 +36,42 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
     public function alterQuery(QueryBuilder $qb, $data)
     {
         // add select element
-        if ('reasons' === $data['level']) {
+        if ($data['level'] === 'reasons') {
             $elem = 'reasons.id';
             $alias = 'activity_reasons_id';
-        } elseif ('categories' === $data['level']) {
+        } elseif ($data['level'] === 'categories') {
             $elem = 'category.id';
             $alias = 'activity_categories_id';
         } else {
-            throw new RuntimeException('The data provided are not recognized.');
+            throw new \RuntimeException('The data provided are not recognized.');
         }
 
-        $qb->addSelect($elem . ' as ' . $alias);
+        $qb->addSelect($elem.' as '.$alias);
 
         // make a jointure only if needed
         $join = $qb->getDQLPart('join');
-
         if (
-            (
+            (array_key_exists('activity', $join)
-                array_key_exists('activity', $join)
+            &&
-            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
             )
-            || (!array_key_exists('activity', $join))
+            OR
+            (! array_key_exists('activity', $join))
         ) {
             $qb->add(
                 'join',
                 [
-                    'activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons'),
+                    'activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')
                 ],
                 true
             );
         }
 
         // join category if necessary
-        if ('activity_categories_id' === $alias) {
+        if ($alias === 'activity_categories_id') {
             // add join only if needed
             if (!$this->checkJoinAlreadyDefined($qb->getDQLPart('join')['activity'], 'category')) {
                 $qb->join('reasons.category', 'category');
@@ -103,6 +88,24 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         }
     }
 
+    /**
+     * Check if a join between Activity and another alias
+     *
+     * @param Join[] $joins
+     * @param string $alias the alias to search for
+     * @return boolean
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias)
+    {
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     public function applyOn()
     {
         return 'activity';
@@ -115,37 +118,52 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
             ChoiceType::class,
             [
                 'choices' => [
-                    'By reason' => 'reasons',
+                    'By reason'             => 'reasons',
-                    'By category of reason' => 'categories',
+                    'By category of reason' => 'categories'
                 ],
                 'multiple' => false,
                 'expanded' => true,
-                'label' => "Reason's level",
+                'label' => "Reason's level"
             ]
         );
     }
 
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if ($data['level'] === null) {
+            $context
+                ->buildViolation("The reasons's level should not be empty.")
+                ->addViolation();
+        }
+    }
+
+    public function getTitle()
+    {
+        return 'Aggregate by activity reason';
+    }
+
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
     public function getLabels($key, array $values, $data)
     {
         // for performance reason, we load data from db only once
         switch ($data['level']) {
             case 'reasons':
                 $this->activityReasonRepository->findBy(['id' => $values]);
-
                 break;
-
             case 'categories':
                 $this->activityReasonCategoryRepository->findBy(['id' => $values]);
-
                 break;
-
             default:
-                throw new RuntimeException(sprintf("The level data '%s' is invalid.", $data['level']));
+                throw new \RuntimeException(sprintf("The level data '%s' is invalid.", $data['level']));
         }
 
-        return function ($value) use ($data) {
+        return function($value) use ($data) {
-            if ('_header' === $value) {
+            if ($value === '_header') {
-                return 'reasons' === $data['level'] ? 'Group by reasons' : 'Group by categories of reason';
+                return $data['level'] === 'reasons' ? 'Group by reasons' : 'Group by categories of reason';
             }
 
             switch ($data['level']) {
@@ -153,63 +171,32 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
                     $r = $this->activityReasonRepository->find($value);
 
                     return sprintf(
-                        '%s > %s',
+                        "%s > %s",
                         $this->translatableStringHelper->localize($r->getCategory()->getName()),
                         $this->translatableStringHelper->localize($r->getName())
                     );
-
                 case 'categories':
                     $c = $this->activityReasonCategoryRepository->find($value);
 
                     return $this->translatableStringHelper->localize($c->getName());
             }
         };
+
     }
 
     public function getQueryKeys($data)
     {
         // add select element
-        if ('reasons' === $data['level']) {
+        if ($data['level'] === 'reasons') {
-            return ['activity_reasons_id'];
+            return array('activity_reasons_id');
         }
 
-        if ('categories' === $data['level']) {
+        if ($data['level'] === 'categories') {
-            return ['activity_categories_id'];
+            return array ('activity_categories_id');
         }
 
-        throw new RuntimeException('The data provided are not recognised.');
+        throw new \RuntimeException('The data provided are not recognised.');
+
     }
 
-    public function getTitle()
-    {
-        return 'Aggregate by activity reason';
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['level']) {
-            $context
-                ->buildViolation("The reasons's level should not be empty.")
-                ->addViolation();
-        }
-    }
-
-    /**
-     * Check if a join between Activity and another alias.
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityTypeAggregator.php

@@ -1,34 +1,26 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator;
 
 use Chill\ActivityBundle\Repository\ActivityTypeRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Closure;
-use Doctrine\ORM\Query\Expr\Join;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use Doctrine\ORM\QueryBuilder;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Doctrine\ORM\Query\Expr\Join;
 
 class ActivityTypeAggregator implements AggregatorInterface
 {
-    public const KEY = 'activity_type_aggregator';
-
     protected ActivityTypeRepository $activityTypeRepository;
 
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
+    public const KEY = 'activity_type_aggregator';
+
     public function __construct(
         ActivityTypeRepository $activityTypeRepository,
         TranslatableStringHelperInterface $translatableStringHelper
@@ -37,11 +29,6 @@ class ActivityTypeAggregator implements AggregatorInterface
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
     public function alterQuery(QueryBuilder $qb, $data)
     {
         // add select element
@@ -51,6 +38,24 @@ class ActivityTypeAggregator implements AggregatorInterface
         $qb->addGroupBy(self::KEY);
     }
 
+    /**
+     * Check if a join between Activity and another alias
+     *
+     * @param Join[] $joins
+     * @param string $alias the alias to search for
+     * @return boolean
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias)
+    {
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     public function applyOn()
     {
         return 'activity';
@@ -61,13 +66,23 @@ class ActivityTypeAggregator implements AggregatorInterface
         // no form required for this aggregator
     }
 
-    public function getLabels($key, array $values, $data): Closure
+    public function getTitle()
+    {
+        return 'Aggregate by activity type';
+    }
+
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
+    public function getLabels($key, array $values, $data): \Closure
     {
         // for performance reason, we load data from db only once
         $this->activityTypeRepository->findBy(['id' => $values]);
 
-        return function ($value): string {
+        return function($value): string {
-            if ('_header' === $value) {
+            if ($value === '_header') {
                 return 'Activity type';
             }
 
@@ -82,27 +97,4 @@ class ActivityTypeAggregator implements AggregatorInterface
         return [self::KEY];
     }
 
-    public function getTitle()
-    {
-        return 'Aggregate by activity type';
-    }
-
-    /**
-     * Check if a join between Activity and another alias.
-     *
-     * @param Join[] $joins
-     * @param string $alias the alias to search for
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
-    {
-        foreach ($joins as $join) {
-            if ($join->getAlias() === $alias) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUserAggregator.php

@@ -1,23 +1,13 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Export\Aggregator;
 
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
-use Closure;
-use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use Doctrine\ORM\QueryBuilder;
+use Chill\MainBundle\Export\AggregatorInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 
 class ActivityUserAggregator implements AggregatorInterface
 {
@@ -55,13 +45,13 @@ class ActivityUserAggregator implements AggregatorInterface
         // nothing to add
     }
 
-    public function getLabels($key, $values, $data): Closure
+    public function getLabels($key, $values, $data): \Closure
     {
         // preload users at once
         $this->userRepository->findBy(['id' => $values]);
 
-        return function ($value) {
+        return function($value) {
-            if ('_header' === $value) {
+            if ($value === '_header') {
                 return 'activity user';
             }
 
@@ -71,7 +61,7 @@ class ActivityUserAggregator implements AggregatorInterface
 
     public function getQueryKeys($data)
     {
-        return [self::KEY];
+        return [ self::KEY ];
     }
 
     public function getTitle(): string

src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php

@@ -1,24 +1,16 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Export;
 
 use Chill\ActivityBundle\Repository\ActivityRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
-use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\ORM\Query;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 
 class CountActivity implements ExportInterface
 {
@@ -32,11 +24,7 @@ class CountActivity implements ExportInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
-    }
 
-    public function getAllowedFormattersTypes()
-    {
-        return [FormatterInterface::TYPE_TABULAR];
     }
 
     public function getDescription()
@@ -44,25 +32,6 @@ class CountActivity implements ExportInterface
         return 'Count activities by various parameters.';
     }
 
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_count_activity' !== $key) {
-            throw new LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Number of activities' : $value;
-    }
-
-    public function getQueryKeys($data)
-    {
-        return ['export_count_activity'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
     public function getTitle()
     {
         return 'Count activities';
@@ -73,9 +42,9 @@ class CountActivity implements ExportInterface
         return 'activity';
     }
 
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
+    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = array())
     {
-        $centers = array_map(static fn ($el) => $el['center'], $acl);
+        $centers = array_map(static fn($el) => $el['center'], $acl);
 
         $qb = $this
             ->activityRepository
@@ -90,13 +59,38 @@ class CountActivity implements ExportInterface
         return $qb;
     }
 
+    public function supportsModifiers()
+    {
+        return ['person', 'activity'];
+    }
+
     public function requiredRole()
     {
         return new Role(ActivityStatsVoter::STATS);
     }
 
-    public function supportsModifiers()
+    public function getAllowedFormattersTypes()
     {
-        return ['person', 'activity'];
+        return [FormatterInterface::TYPE_TABULAR];
     }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ($key !== 'export_count_activity') {
+            throw new \LogicException("the key $key is not used by this export");
+        }
+
+        return static fn($value) => $value === '_header' ? 'Number of activities' : $value;
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['export_count_activity'];
+    }
+
+    public function getResult($qb, $data)
+    {
+        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
 }

src/Bundle/ChillActivityBundle/Export/Export/ListActivity.php

@@ -1,40 +1,35 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Export;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\ListInterface;
+use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use DateTime;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Symfony\Component\Form\FormBuilderInterface;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraints\Callback;
+use Doctrine\ORM\Query;
+use Chill\MainBundle\Export\FormatterInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function array_key_exists;
-use function count;
-use function in_array;
 
 class ListActivity implements ListInterface
 {
+    private ActivityRepository $activityRepository;
+
     protected EntityManagerInterface $entityManager;
 
+    protected TranslatorInterface $translator;
+
+    protected TranslatableStringHelperInterface $translatableStringHelper;
+
     protected array $fields = [
         'id',
         'date',
@@ -46,15 +41,9 @@ class ListActivity implements ListInterface
         'type_name',
         'person_firstname',
         'person_lastname',
-        'person_id',
+        'person_id'
     ];
 
-    protected TranslatableStringHelperInterface $translatableStringHelper;
-
-    protected TranslatorInterface $translator;
-
-    private ActivityRepository $activityRepository;
-
     public function __construct(
         EntityManagerInterface $em,
         TranslatorInterface $translator,
@@ -73,17 +62,18 @@ class ListActivity implements ListInterface
             'multiple' => true,
             'expanded' => true,
             'choices' => array_combine($this->fields, $this->fields),
-            'label' => 'Fields to include in export',
+            'label'    => 'Fields to include in export',
             'constraints' => [new Callback([
-                'callback' => static function ($selected, ExecutionContextInterface $context) {
+                'callback' => function($selected, ExecutionContextInterface $context) {
                     if (count($selected) === 0) {
                         $context->buildViolation('You must select at least one element')
                             ->atPath('fields')
                             ->addViolation();
                     }
-                },
+                }
-            ])],
+            ])]
         ]);
+
     }
 
     public function getAllowedFormattersTypes()
@@ -93,72 +83,69 @@ class ListActivity implements ListInterface
 
     public function getDescription()
     {
-        return 'List activities';
+        return "List activities";
     }
 
     public function getLabels($key, array $values, $data)
     {
-        switch ($key) {
+        switch ($key)
-            case 'date':
+        {
-                return static function ($value) {
+            case 'date' :
-                    if ('_header' === $value) {
+                return static function($value) {
+                    if ($value === '_header') {
                         return 'date';
                     }
 
-                    $date = DateTime::createFromFormat('Y-m-d H:i:s', $value);
+                    $date = \DateTime::createFromFormat('Y-m-d H:i:s', $value);
 
                     return $date->format('d-m-Y');
                 };
-
             case 'attendee':
-                return static function ($value) {
+                return static function($value) {
-                    if ('_header' === $value) {
+                    if ($value === '_header') {
                         return 'attendee';
                     }
 
                     return $value ? 1 : 0;
                 };
-
+            case 'list_reasons' :
-            case 'list_reasons':
                 $activityRepository = $this->activityRepository;
 
-                return function ($value) use ($activityRepository): string {
+                return function($value) use ($activityRepository): string {
-                    if ('_header' === $value) {
+                    if ($value === '_header') {
                         return 'activity reasons';
                     }
 
                     $activity = $activityRepository->find($value);
 
-                    return implode(', ', array_map(function (ActivityReason $r) {
+                    return implode(", ", array_map(function(ActivityReason $r) {
-                        return '"' .
+
+                        return '"'.
                                 $this->translatableStringHelper->localize($r->getCategory()->getName())
-                                . ' > ' .
+                                .' > '.
                                 $this->translatableStringHelper->localize($r->getName())
-                                . '"';
+                                .'"';
                     }, $activity->getReasons()->toArray()));
                 };
-
+            case 'circle_name' :
-            case 'circle_name':
+                return function($value) {
-                return function ($value) {
+                    if ($value === '_header') {
-                    if ('_header' === $value) {
                         return 'circle';
                     }
 
                     return $this->translatableStringHelper->localize(json_decode($value, true));
                 };
-
+            case 'type_name' :
-            case 'type_name':
+                return function($value) {
-                return function ($value) {
+                    if ($value === '_header') {
-                    if ('_header' === $value) {
                         return 'activity type';
                     }
 
                     return $this->translatableStringHelper->localize(json_decode($value, true));
                 };
-
             default:
-                return static function ($value) use ($key) {
+                return static function($value) use ($key) {
-                    if ('_header' === $value) {
+                    if ($value === '_header') {
                         return $key;
                     }
 
@@ -189,75 +176,59 @@ class ListActivity implements ListInterface
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
-        $centers = array_map(static function ($el) { return $el['center']; }, $acl);
+        $centers = array_map(function($el) { return $el['center']; }, $acl);
 
         // throw an error if any fields are present
-        if (!array_key_exists('fields', $data)) {
+        if (!\array_key_exists('fields', $data)) {
             throw new InvalidArgumentException('Any fields have been checked.');
         }
 
         $qb = $this->entityManager->createQueryBuilder();
 
         $qb
-            ->from('ChillActivityBundle:Activity', 'activity')
+                ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'person')
+                ->join('activity.person', 'person')
-            ->join('person.center', 'center')
+                ->join('person.center', 'center')
-            ->andWhere('center IN (:authorized_centers)')
+                ->andWhere('center IN (:authorized_centers)')
-            ->setParameter('authorized_centers', $centers);
+                ->setParameter('authorized_centers', $centers);
 
         foreach ($this->fields as $f) {
-            if (in_array($f, $data['fields'], true)) {
+            if (in_array($f, $data['fields'])) {
                 switch ($f) {
                     case 'id':
                         $qb->addSelect('activity.id AS id');
-
                         break;
-
                     case 'person_firstname':
                         $qb->addSelect('person.firstName AS person_firstname');
-
                         break;
-
                     case 'person_lastname':
                         $qb->addSelect('person.lastName AS person_lastname');
-
                         break;
-
                     case 'person_id':
                         $qb->addSelect('person.id AS person_id');
-
                         break;
-
                     case 'user_username':
                         $qb->join('activity.user', 'user');
                         $qb->addSelect('user.username AS user_username');
-
                         break;
-
                     case 'circle_name':
                         $qb->join('activity.scope', 'circle');
                         $qb->addSelect('circle.name AS circle_name');
-
                         break;
-
                     case 'type_name':
                         $qb->join('activity.type', 'type');
                         $qb->addSelect('type.name AS type_name');
-
                         break;
-
                     case 'list_reasons':
                         // this is a trick... The reasons is filled with the
                         // activity id which will be used to load reasons
                         $qb->addSelect('activity.id AS list_reasons');
-
                         break;
-
                     default:
                         $qb->addSelect(sprintf('activity.%s as %s', $f, $f));
-
                         break;
                 }
+
             }
         }
 
@@ -273,4 +244,5 @@ class ListActivity implements ListInterface
     {
         return ['activity', 'person'];
     }
+
 }

src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php

@@ -1,24 +1,16 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Export;
 
 use Chill\ActivityBundle\Repository\ActivityRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
-use Doctrine\ORM\Query;
-use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\ORM\Query;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 
 /**
  * This export allow to compute stats on activity duration.
@@ -27,6 +19,8 @@ use Symfony\Component\Security\Core\Role\Role;
  */
 class StatActivityDuration implements ExportInterface
 {
+    private ActivityRepository $activityRepository;
+
     public const SUM = 'sum';
 
     /**
@@ -34,8 +28,6 @@ class StatActivityDuration implements ExportInterface
      */
     protected string $action;
 
-    private ActivityRepository $activityRepository;
-
     /**
      * @param string $action the stat to perform
      */
@@ -49,6 +41,59 @@ class StatActivityDuration implements ExportInterface
 
     public function buildForm(FormBuilderInterface $builder)
     {
+
+    }
+
+    public function getDescription()
+    {
+        if ($this->action === self::SUM) {
+            return 'Sum activities duration by various parameters.';
+        }
+    }
+
+    public function getTitle()
+    {
+        if ($this->action === self::SUM) {
+            return 'Sum activity duration';
+        }
+
+    }
+
+    public function getType()
+    {
+        return 'activity';
+    }
+
+    public function initiateQuery(array $requiredModifiers,  array $acl, array $data = [])
+    {
+        $centers = array_map(
+            static fn(array $el): string => $el['center'],
+            $acl
+        );
+
+        $qb = $this->activityRepository->createQueryBuilder('activity');
+
+        $select = null;
+
+        if ($this->action === self::SUM) {
+            $select = 'SUM(activity.durationTime) AS export_stat_activity';
+        }
+
+        return $qb->select($select)
+            ->join('activity.person',  'person')
+            ->join('person.center', 'center')
+            ->where($qb->expr()->in('center', ':centers'))
+            ->setParameter(':centers', $centers);
+    }
+
+    public function supportsModifiers()
+    {
+        return ['person', 'activity'];
+    }
+
+    public function requiredRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function getAllowedFormattersTypes()
@@ -56,22 +101,15 @@ class StatActivityDuration implements ExportInterface
         return [FormatterInterface::TYPE_TABULAR];
     }
 
-    public function getDescription()
-    {
-        if (self::SUM === $this->action) {
-            return 'Sum activities duration by various parameters.';
-        }
-    }
-
     public function getLabels($key, array $values, $data)
     {
-        if ('export_stat_activity' !== $key) {
+        if ($key !== 'export_stat_activity') {
-            throw new LogicException(sprintf('The key %s is not used by this export', $key));
+            throw new \LogicException(sprintf('The key %s is not used by this export', $key));
         }
 
-        $header = self::SUM === $this->action ? 'Sum of activities duration' : false;
+        $header = $this->action === self::SUM ? 'Sum of activities duration' : false;
 
-        return static fn (string $value) => '_header' === $value ? $header : $value;
+        return static fn(string $value) => $value === '_header' ?  $header : $value;
     }
 
     public function getQueryKeys($data)
@@ -84,47 +122,4 @@ class StatActivityDuration implements ExportInterface
         return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
     }
 
-    public function getTitle()
-    {
-        if (self::SUM === $this->action) {
-            return 'Sum activity duration';
-        }
-    }
-
-    public function getType()
-    {
-        return 'activity';
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $centers = array_map(
-            static fn (array $el): string => $el['center'],
-            $acl
-        );
-
-        $qb = $this->activityRepository->createQueryBuilder('activity');
-
-        $select = null;
-
-        if (self::SUM === $this->action) {
-            $select = 'SUM(activity.durationTime) AS export_stat_activity';
-        }
-
-        return $qb->select($select)
-            ->join('activity.person', 'person')
-            ->join('person.center', 'center')
-            ->where($qb->expr()->in('center', ':centers'))
-            ->setParameter(':centers', $centers);
-    }
-
-    public function requiredRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
-    public function supportsModifiers()
-    {
-        return ['person', 'activity'];
-    }
 }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityDateFilter.php

@@ -1,33 +1,25 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use DateTime;
-use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormError;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Translation\TranslatorInterface;
 
 class ActivityDateFilter implements FilterInterface
 {
     protected TranslatorInterface $translator;
 
-    public function __construct(TranslatorInterface $translator)
+    function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
@@ -40,11 +32,8 @@ class ActivityDateFilter implements FilterInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->between(
+        $clause = $qb->expr()->between('activity.date', ':date_from',
-            'activity.date',
+            ':date_to');
-            ':date_from',
-            ':date_to'
-        );
 
         if ($where instanceof Expr\Andx) {
             $where->add($clause);
@@ -69,9 +58,9 @@ class ActivityDateFilter implements FilterInterface
             DateType::class,
             [
                 'label' => 'Activities after this date',
-                'data' => new DateTime(),
+                'data'  => new \DateTime(),
-                'attr' => ['class' => 'datepicker'],
+                'attr'  => ['class' => 'datepicker'],
-                'widget' => 'single_text',
+                'widget'=> 'single_text',
                 'format' => 'dd-MM-yyyy',
             ]
         );
@@ -81,49 +70,46 @@ class ActivityDateFilter implements FilterInterface
             DateType::class,
             [
                 'label' => 'Activities before this date',
-                'data' => new DateTime(),
+                'data'  => new \DateTime(),
-                'attr' => ['class' => 'datepicker'],
+                'attr'  => ['class' => 'datepicker'],
-                'widget' => 'single_text',
+                'widget'=> 'single_text',
                 'format' => 'dd-MM-yyyy',
             ]
         );
 
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
-            /** @var \Symfony\Component\Form\FormInterface $filterForm */
+            /* @var $filterForm \Symfony\Component\Form\FormInterface */
             $filterForm = $event->getForm()->getParent();
             $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();
 
-            if (true === $enabled) {
+            if ($enabled === true) {
                 // if the filter is enabled, add some validation
-                $form = $event->getForm();
+                $form      = $event->getForm();
                 $date_from = $form->get('date_from')->getData();
-                $date_to = $form->get('date_to')->getData();
+                $date_to   = $form->get('date_to')->getData();
 
                 // check that fields are not empty
-                if (null === $date_from) {
+                if ($date_from === null) {
                     $form->get('date_from')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
+                        . 'should not be empty')));
-                    ));
                 }
-
+                if ($date_to   === null) {
-                if (null === $date_to) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
+                        . 'should not be empty')));
-                    ));
                 }
 
                 // check that date_from is before date_to
                 if (
-                    (null !== $date_from && null !== $date_to)
+                    ($date_from !== null && $date_to !== null)
-                    && $date_from >= $date_to
+                    &&
+                    $date_from >= $date_to
                 ) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This date should be after '
                             . 'the date given in "Implied in an activity after '
-                            . 'this date" field')
+                            . 'this date" field')));
-                    ));
                 }
             }
         });
@@ -135,8 +121,8 @@ class ActivityDateFilter implements FilterInterface
             'Filtered by date of activity: only between %date_from% and %date_to%',
             [
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%' => $data['date_to']->format('d-m-Y'),
+                '%date_to%' => $data['date_to']->format('d-m-Y')
-            ],
+            ]
         ];
     }
 
@@ -144,4 +130,5 @@ class ActivityDateFilter implements FilterInterface
     {
         return 'Filtered by date activity';
     }
+
 }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityReasonFilter.php

@@ -1,39 +1,30 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Doctrine\ORM\Query\Expr\Join;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function array_key_exists;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
-use function count;
 
-class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInterface
+class ActivityReasonFilter implements FilterInterface, ExportElementValidatedInterface
 {
-    protected ActivityReasonRepository $activityReasonRepository;
-
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
+    protected ActivityReasonRepository $activityReasonRepository;
+
     public function __construct(
         TranslatableStringHelper $helper,
         ActivityReasonRepository $activityReasonRepository
@@ -42,30 +33,26 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $this->activityReasonRepository = $activityReasonRepository;
     }
 
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $join = $qb->getDQLPart('join');
+        $join  = $qb->getDQLPart('join');
         $clause = $qb->expr()->in('reasons', ':selected_activity_reasons');
         //dump($join);
         // add a join to reasons only if needed
         if (
-            (
+            (array_key_exists('activity', $join)
-                array_key_exists('activity', $join)
+            &&
-            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
             )
-            || (!array_key_exists('activity', $join))
+            ||
+            (! array_key_exists('activity', $join))
         ) {
             $qb->add(
-                'join',
+                    'join',
-                ['activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')],
+                    array('activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')),
-                true
+                    true
-            );
+                    );
         }
 
         if ($where instanceof Expr\Andx) {
@@ -78,57 +65,11 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $qb->setParameter('selected_activity_reasons', $data['reasons']);
     }
 
-    public function applyOn()
-    {
-        return 'activity';
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('reasons', EntityType::class, [
-            'class' => ActivityReason::class,
-            'choice_label' => fn (ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getName()),
-            'group_by' => fn (ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
-            'multiple' => true,
-            'expanded' => false,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string')
-    {
-        // collect all the reasons'name used in this filter in one array
-        $reasonsNames = array_map(
-            fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
-            $this->activityReasonRepository->findBy(['id' => $data['reasons']->toArray()])
-        );
-
-        return [
-            'Filtered by reasons: only %list%',
-            [
-                '%list%' => implode(', ', $reasonsNames),
-            ],
-        ];
-    }
-
-    public function getTitle()
-    {
-        return 'Filter by reason';
-    }
-
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['reasons'] || count($data['reasons']) === 0) {
-            $context
-                ->buildViolation('At least one reason must be chosen')
-                ->addViolation();
-        }
-    }
-
     /**
-     * Check if a join between Activity and Reason is already defined.
+     * Check if a join between Activity and Reason is already defined
      *
      * @param Join[] $joins
-     * @param mixed $alias
+     * @return boolean
      */
     private function checkJoinAlreadyDefined(array $joins, $alias): bool
     {
@@ -140,4 +81,55 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
 
         return false;
     }
+
+    public function applyOn()
+    {
+        return 'activity';
+    }
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        $builder->add('reasons', EntityType::class, [
+            'class' => ActivityReason::class,
+            'choice_label' => fn(ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getName()),
+            'group_by' => fn(ActivityReason $reason) => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
+            'multiple' => true,
+            'expanded' => false
+        ]);
+    }
+
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if ($data['reasons'] === null || count($data['reasons']) === 0) {
+            $context
+                ->buildViolation('At least one reason must be chosen')
+                ->addViolation();
+        }
+    }
+
+    public function getTitle()
+    {
+        return 'Filter by reason';
+    }
+
+    public function addRole()
+    {
+        return new Role(ActivityStatsVoter::STATS);
+    }
+
+    public function describeAction($data, $format = 'string')
+    {
+        // collect all the reasons'name used in this filter in one array
+        $reasonsNames = array_map(
+            fn(ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
+            $this->activityReasonRepository->findBy(array('id' => $data['reasons']->toArray()))
+        );
+
+        return [
+            'Filtered by reasons: only %list%',
+            [
+                '%list%' => implode(", ", $reasonsNames),
+            ]
+        ];
+    }
 }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -1,37 +1,29 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter;
 
-use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityTypeRepository;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Doctrine\ORM\Query\Expr;
 use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
+use Doctrine\ORM\Query\Expr\Join;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function count;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
+use Chill\ActivityBundle\Entity\ActivityType;
 
-class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
+class ActivityTypeFilter implements FilterInterface, ExportElementValidatedInterface
 {
-    protected ActivityTypeRepository $activityTypeRepository;
-
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
+    protected ActivityTypeRepository $activityTypeRepository;
+
     public function __construct(
         TranslatableStringHelperInterface $translatableStringHelper,
         ActivityTypeRepository $activityTypeRepository
@@ -40,11 +32,6 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         $this->activityTypeRepository = $activityTypeRepository;
     }
 
-    public function addRole()
-    {
-        return new Role(ActivityStatsVoter::STATS);
-    }
-
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
@@ -60,6 +47,23 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         $qb->setParameter('selected_activity_types', $data['types']);
     }
 
+    /**
+     * Check if a join between Activity and Reason is already defined
+     *
+     * @param Join[] $joins
+     * @return boolean
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias)
+    {
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     public function applyOn()
     {
         return 'activity';
@@ -72,27 +76,20 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
             EntityType::class,
             [
                 'class' => ActivityType::class,
-                'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
+                'choice_label' => fn(ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
                 'multiple' => true,
-                'expanded' => false,
+                'expanded' => false
             ]
         );
     }
 
-    public function describeAction($data, $format = 'string')
+    public function validateForm($data, ExecutionContextInterface $context)
     {
-        // collect all the reasons'name used in this filter in one array
+        if ($data['types'] === null || count($data['types']) === 0) {
-        $reasonsNames = array_map(
+            $context
-            fn (ActivityType $t): string => '"' . $this->translatableStringHelper->localize($t->getName()) . '"',
+                ->buildViolation('At least one type must be chosen')
-            $this->activityTypeRepository->findBy(['id' => $data['types']->toArray()])
+                ->addViolation();
-        );
+        }
-
-        return [
-            'Filtered by activity type: only %list%',
-            [
-                '%list%' => implode(', ', $reasonsNames),
-            ],
-        ];
     }
 
     public function getTitle()
@@ -100,31 +97,24 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
         return 'Filter by activity type';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
+    public function addRole()
     {
-        if (null === $data['types'] || count($data['types']) === 0) {
+        return new Role(ActivityStatsVoter::STATS);
-            $context
-                ->buildViolation('At least one type must be chosen')
-                ->addViolation();
-        }
     }
 
-    /**
+    public function describeAction($data, $format = 'string')
-     * Check if a join between Activity and Reason is already defined.
-     *
-     * @param Join[] $joins
-     * @param mixed $alias
-     *
-     * @return bool
-     */
-    private function checkJoinAlreadyDefined(array $joins, $alias)
     {
-        foreach ($joins as $join) {
+        // collect all the reasons'name used in this filter in one array
-            if ($join->getAlias() === $alias) {
+        $reasonsNames = array_map(
-                return true;
+            fn(ActivityType $t): string => '"' . $this->translatableStringHelper->localize($t->getName()) . '"',
-            }
+            $this->activityTypeRepository->findBy(['id' => $data['types']->toArray()])
-        }
+        );
 
-        return false;
+        return [
+            'Filtered by activity type: only %list%',
+            [
+                '%list%' => implode(", ", $reasonsNames),
+            ]
+        ];
     }
 }

src/Bundle/ChillActivityBundle/Export/Filter/PersonHavingActivityBetweenDateFilter.php

@@ -1,44 +1,35 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
-use Chill\MainBundle\Export\ExportElementValidatedInterface;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\Export\FilterType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\PersonBundle\Export\Declarations;
-use DateTime;
-use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\FormError;
+use Chill\MainBundle\Form\Type\Export\FilterType;
+use Doctrine\ORM\Query\Expr;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\PersonBundle\Export\Declarations;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function count;
+use Chill\MainBundle\Export\ExportElementValidatedInterface;
 
-class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInterface, FilterInterface
+class PersonHavingActivityBetweenDateFilter implements FilterInterface, ExportElementValidatedInterface
 {
-    protected ActivityReasonRepository $activityReasonRepository;
-
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
+    protected ActivityReasonRepository $activityReasonRepository;
+
     protected TranslatorInterface $translator;
 
     public function __construct(
@@ -75,8 +66,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
 
         $sqb->andWhere(
             $sqb->expr()->in(
-                'reasons_person_having_activity',
+                'reasons_person_having_activity', ':person_having_activity_reasons'
-                ':person_having_activity_reasons'
             )
         );
 
@@ -90,14 +80,10 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
         }
 
         $qb->add('where', $where);
-        $qb->setParameter(
+        $qb->setParameter('person_having_activity_between_date_from',
-            'person_having_activity_between_date_from',
+                $data['date_from']);
-            $data['date_from']
+        $qb->setParameter('person_having_activity_between_date_to',
-        );
+                $data['date_to']);
-        $qb->setParameter(
-            'person_having_activity_between_date_to',
-            $data['date_to']
-        );
         $qb->setParameter('person_having_activity_reasons', $data['reasons']);
     }
 
@@ -110,71 +96,76 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
     {
         $builder->add('date_from', DateType::class, [
             'label' => 'Implied in an activity after this date',
-            'data' => new DateTime(),
+            'data'  => new \DateTime(),
-            'attr' => ['class' => 'datepicker'],
+            'attr'  => ['class' => 'datepicker'],
-            'widget' => 'single_text',
+            'widget'=> 'single_text',
             'format' => 'dd-MM-yyyy',
         ]);
 
         $builder->add('date_to', DateType::class, [
             'label' => 'Implied in an activity before this date',
-            'data' => new DateTime(),
+            'data'  => new \DateTime(),
-            'attr' => ['class' => 'datepicker'],
+            'attr'  => ['class' => 'datepicker'],
-            'widget' => 'single_text',
+            'widget'=> 'single_text',
             'format' => 'dd-MM-yyyy',
         ]);
 
         $builder->add('reasons', EntityType::class, [
             'class' => ActivityReason::class,
             'choice_label' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getName()),
-            'group_by' => fn (ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
+            'group_by' => fn(ActivityReason $reason): ?string => $this->translatableStringHelper->localize($reason->getCategory()->getName()),
             'data' => $this->activityReasonRepository->findAll(),
             'multiple' => true,
             'expanded' => false,
-            'label' => 'Activity reasons for those activities',
+            'label'    => 'Activity reasons for those activities'
         ]);
 
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
-            /** @var FormInterface $filterForm */
+            /* @var FormInterface $filterForm  */
             $filterForm = $event->getForm()->getParent();
             $enabled = $filterForm->get(FilterType::ENABLED_FIELD)->getData();
 
-            if (true === $enabled) {
+            if ($enabled === true) {
                 // if the filter is enabled, add some validation
-                $form = $event->getForm();
+                $form      = $event->getForm();
                 $date_from = $form->get('date_from')->getData();
-                $date_to = $form->get('date_to')->getData();
+                $date_to   = $form->get('date_to')->getData();
 
                 // check that fields are not empty
-                if (null === $date_from) {
+                if ($date_from === null) {
                     $form->get('date_from')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
+                        . 'should not be empty')));
-                    ));
                 }
-
+                if ($date_to   === null) {
-                if (null === $date_to) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This field '
-                        . 'should not be empty')
+                        . 'should not be empty')));
-                    ));
                 }
 
                 // check that date_from is before date_to
                 if (
-                    (null !== $date_from && null !== $date_to)
+                    ($date_from !== null && $date_to !== null)
-                    && $date_from >= $date_to
+                    &&
+                    $date_from >= $date_to
                 ) {
                     $form->get('date_to')->addError(new FormError(
                         $this->translator->trans('This date '
                         . 'should be after the date given in "Implied in an '
-                        . 'activity after this date" field')
+                        . 'activity after this date" field')));
-                    ));
                 }
             }
         });
     }
 
+    public function validateForm($data, ExecutionContextInterface $context)
+    {
+        if ($data['reasons'] === null || count($data['reasons']) === 0) {
+            $context->buildViolation('At least one reason must be chosen')
+                ->addViolation();
+        }
+    }
+
     public function describeAction($data, $format = 'string')
     {
         return [
@@ -182,15 +173,15 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
             . '%date_to% with reasons %reasons_name%',
             [
                 '%date_from%' => $data['date_from']->format('d-m-Y'),
-                '%date_to%' => $data['date_to']->format('d-m-Y'),
+                '%date_to%'   => $data['date_to']->format('d-m-Y'),
-                '%reasons_name%' => implode(
+                '%reasons_name%'  => implode(
-                    ', ',
+                    ", ",
                     array_map(
-                        fn (ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
+                        fn(ActivityReason $r): string => '"' . $this->translatableStringHelper->localize($r->getName()) . '"',
                         $data['reasons']
                     )
-                ),
+                )
-            ],
+            ]
         ];
     }
 
@@ -199,11 +190,4 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
         return 'Filtered by person having an activity in a period';
     }
 
-    public function validateForm($data, ExecutionContextInterface $context)
-    {
-        if (null === $data['reasons'] || count($data['reasons']) === 0) {
-            $context->buildViolation('At least one reason must be chosen')
-                ->addViolation();
-        }
-    }
 }

src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php

@@ -1,22 +1,13 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityPresence;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityPresenceType extends AbstractType
 {
@@ -24,19 +15,19 @@ class ActivityPresenceType extends AbstractType
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, [
+            ->add('active', ChoiceType::class, array(
-                'choices' => [
+                'choices' => array(
                     'Yes' => true,
-                    'No' => false,
+                    'No'  => false
-                ],
+                ),
-                'expanded' => true,
+                'expanded' => true
-            ]);
+            ));
     }
 
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults([
+        $resolver->setDefaults(array(
-            'data_class' => ActivityPresence::class,
+            'data_class' => ActivityPresence::class
-        ]);
+        ));
     }
 }

src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php

@@ -1,29 +1,25 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;
 
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityReasonCategoryType extends AbstractType
 {
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', CheckboxType::class, ['required' => false]);
+            ->add('active', CheckboxType::class, array('required' => false))
+        ;
     }
 
     /**
@@ -31,9 +27,9 @@ class ActivityReasonCategoryType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
+        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory',
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReasonCategory'
-        ]);
+        ));
     }
 
     /**

src/Bundle/ChillActivityBundle/Form/ActivityReasonType.php

@@ -1,38 +1,37 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;
 
-use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\ActivityBundle\Form\Type\TranslatableActivityReasonCategory;
 
 class ActivityReasonType extends AbstractType
 {
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', CheckboxType::class, ['required' => false])
+            ->add('active', CheckboxType::class, array('required' => false))
-            ->add('category', TranslatableActivityReasonCategory::class);
+            ->add('category', TranslatableActivityReasonCategory::class)
+        ;
     }
 
+    /**
+     * @param OptionsResolver $resolver
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
+        $resolver->setDefaults(array(
-            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReason',
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityReason'
-        ]);
+        ));
     }
 
     /**

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -1,14 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\Activity;
@@ -16,57 +7,54 @@ use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\DocStoreBundle\Form\StoredObjectType;
 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\ScopePickerType;
-use Chill\MainBundle\Form\Type\UserPickerType;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Chill\PersonBundle\Templating\Entity\SocialActionRender;
+use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateInterval;
-use DateTime;
-use DateTimeZone;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectManager;
-use RuntimeException;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\CallbackTransformer;
-use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Doctrine\Persistence\ObjectManager;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Chill\MainBundle\Entity\User;
+use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Chill\MainBundle\Form\Type\UserPickerType;
-use function in_array;
+use Chill\MainBundle\Form\Type\ScopePickerType;
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\CallbackTransformer;
+use Chill\PersonBundle\Form\DataTransformer\PersonToIdTransformer;
+use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
+use Chill\PersonBundle\Templating\Entity\SocialActionRender;
 
 class ActivityType extends AbstractType
 {
+    protected User $user;
+
     protected AuthorizationHelper $authorizationHelper;
 
     protected ObjectManager $om;
 
-    protected SocialActionRender $socialActionRender;
+    protected TranslatableStringHelper $translatableStringHelper;
 
     protected SocialIssueRender $socialIssueRender;
 
+    protected SocialActionRender $socialActionRender;
+
     protected array $timeChoices;
 
-    protected TranslatableStringHelper $translatableStringHelper;
+    public function __construct (
-
-    protected User $user;
-
-    public function __construct(
         TokenStorageInterface $tokenStorage,
         AuthorizationHelper $authorizationHelper,
         ObjectManager $om,
@@ -76,7 +64,7 @@ class ActivityType extends AbstractType
         SocialActionRender $socialActionRender
     ) {
         if (!$tokenStorage->getToken()->getUser() instanceof User) {
-            throw new RuntimeException('you should have a valid user');
+            throw new \RuntimeException("you should have a valid user");
         }
 
         $this->user = $tokenStorage->getToken()->getUser();
@@ -112,13 +100,12 @@ class ActivityType extends AbstractType
                 'center' => $options['center'],
                 'role' => $options['role'],
                 // TODO make required again once scope and rights are fixed
-                'required' => false,
+                'required' => false
             ]);
         }
 
         /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
-        $accompanyingPeriod = null;
+        $accompanyingPeriod = NULL;
-
         if ($options['accompanyingPeriod']) {
             $accompanyingPeriod = $options['accompanyingPeriod'];
         }
@@ -126,53 +113,49 @@ class ActivityType extends AbstractType
         if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
             $builder->add('socialIssues', HiddenType::class);
             $builder->get('socialIssues')
-                ->addModelTransformer(new CallbackTransformer(
+               ->addModelTransformer(new CallbackTransformer(
-                    static function (iterable $socialIssuesAsIterable): string {
+                   function (iterable $socialIssuesAsIterable): string {
-                        $socialIssueIds = [];
+                       $socialIssueIds = [];
-
+                       foreach ($socialIssuesAsIterable as $value) {
-                        foreach ($socialIssuesAsIterable as $value) {
+                          $socialIssueIds[] = $value->getId();
-                            $socialIssueIds[] = $value->getId();
+                       }
-                        }
+                       return implode(',', $socialIssueIds);
-
+                   },
-                        return implode(',', $socialIssueIds);
+                   function (?string $socialIssuesAsString): array {
-                    },
+                       if (null === $socialIssuesAsString) {
-                    function (?string $socialIssuesAsString): array {
+                          return [];
-                        if (null === $socialIssuesAsString) {
+                       }
-                            return [];
+                       return array_map(
-                        }
+                          fn(string $id): ?SocialIssue => $this->om->getRepository(SocialIssue::class)->findOneBy(['id' => (int) $id]),
-
+                          explode(',', $socialIssuesAsString)
-                        return array_map(
+                       );
-                            fn (string $id): ?SocialIssue => $this->om->getRepository(SocialIssue::class)->findOneBy(['id' => (int) $id]),
+                   }
-                            explode(',', $socialIssuesAsString)
+               ))
-                        );
+            ;
-                    }
-                ));
         }
 
         if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
             $builder->add('socialActions', HiddenType::class);
             $builder->get('socialActions')
-                ->addModelTransformer(new CallbackTransformer(
+               ->addModelTransformer(new CallbackTransformer(
-                    static function (iterable $socialActionsAsIterable): string {
+                   function (iterable $socialActionsAsIterable): string {
-                        $socialActionIds = [];
+                       $socialActionIds = [];
-
+                       foreach ($socialActionsAsIterable as $value) {
-                        foreach ($socialActionsAsIterable as $value) {
+                          $socialActionIds[] = $value->getId();
-                            $socialActionIds[] = $value->getId();
+                       }
-                        }
+                       return implode(',', $socialActionIds);
-
+                   },
-                        return implode(',', $socialActionIds);
+                   function (?string $socialActionsAsString): array {
-                    },
+                       if (null === $socialActionsAsString) {
-                    function (?string $socialActionsAsString): array {
+                          return [];
-                        if (null === $socialActionsAsString) {
+                       }
-                            return [];
+                       return array_map(
-                        }
+                          fn(string $id): ?SocialAction => $this->om->getRepository(SocialAction::class)->findOneBy(['id' => (int) $id]),
-
+                          explode(',', $socialActionsAsString)
-                        return array_map(
+                       );
-                            fn (string $id): ?SocialAction => $this->om->getRepository(SocialAction::class)->findOneBy(['id' => (int) $id]),
+                   }
-                            explode(',', $socialActionsAsString)
+               ))
-                        );
+            ;
-                    }
-                ));
         }
 
         if ($activityType->isVisible('date')) {
@@ -205,7 +188,7 @@ class ActivityType extends AbstractType
                 'choice_label' => function (ActivityPresence $activityPresence) {
                     return $this->translatableStringHelper->localize($activityPresence->getName());
                 },
-                'query_builder' => static function (EntityRepository $er) {
+                'query_builder' => function (EntityRepository $er) {
                     return $er->createQueryBuilder('a')
                         ->where('a.active = true');
                 },
@@ -217,7 +200,7 @@ class ActivityType extends AbstractType
                 'label' => $activityType->getLabel('user'),
                 'required' => $activityType->isRequired('user'),
                 'center' => $options['center'],
-                'role' => $options['role'],
+                'role'   => $options['role']
             ]);
         }
 
@@ -230,8 +213,8 @@ class ActivityType extends AbstractType
                 'choice_label' => function (ActivityReason $activityReason) {
                     return $this->translatableStringHelper->localize($activityReason->getName());
                 },
-                'attr' => ['class' => 'select2 '],
+                'attr' => array('class' => 'select2 '),
-                'query_builder' => static function (EntityRepository $er) {
+                'query_builder' => function (EntityRepository $er) {
                     return $er->createQueryBuilder('a')
                         ->where('a.active = true');
                 },
@@ -249,45 +232,43 @@ class ActivityType extends AbstractType
         if ($activityType->isVisible('persons')) {
             $builder->add('persons', HiddenType::class);
             $builder->get('persons')
-                ->addModelTransformer(new CallbackTransformer(
+               ->addModelTransformer(new CallbackTransformer(
-                    static function (iterable $personsAsIterable): string {
+                   function (iterable $personsAsIterable): string {
-                        $personIds = [];
+                       $personIds = [];
-
+                       foreach ($personsAsIterable as $value) {
-                        foreach ($personsAsIterable as $value) {
+                          $personIds[] = $value->getId();
-                            $personIds[] = $value->getId();
+                       }
-                        }
+                       return implode(',', $personIds);
-
+                   },
-                        return implode(',', $personIds);
+                   function (?string $personsAsString): array {
-                    },
+                       return array_map(
-                    function (?string $personsAsString): array {
+                          fn(string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
-                        return array_map(
+                          explode(',', $personsAsString)
-                            fn (string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
+                       );
-                            explode(',', $personsAsString)
+                   }
-                        );
+               ))
-                    }
+           ;
-                ));
         }
 
         if ($activityType->isVisible('thirdParties')) {
             $builder->add('thirdParties', HiddenType::class);
             $builder->get('thirdParties')
-                ->addModelTransformer(new CallbackTransformer(
+               ->addModelTransformer(new CallbackTransformer(
-                    static function (iterable $thirdpartyAsIterable): string {
+                   function (iterable $thirdpartyAsIterable): string {
-                        $thirdpartyIds = [];
+                       $thirdpartyIds = [];
-
+                       foreach ($thirdpartyAsIterable as $value) {
-                        foreach ($thirdpartyAsIterable as $value) {
+                          $thirdpartyIds[] = $value->getId();
-                            $thirdpartyIds[] = $value->getId();
+                       }
-                        }
+                       return implode(',', $thirdpartyIds);
-
+                   },
-                        return implode(',', $thirdpartyIds);
+                   function (?string $thirdpartyAsString): array {
-                    },
+                       return array_map(
-                    function (?string $thirdpartyAsString): array {
+                           fn(string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
-                        return array_map(
+                           explode(',', $thirdpartyAsString)
-                            fn (string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
+                       );
-                            explode(',', $thirdpartyAsString)
+                   }
-                        );
+               ))
-                    }
+           ;
-                ));
         }
 
         if ($activityType->isVisible('documents')) {
@@ -297,47 +278,46 @@ class ActivityType extends AbstractType
                 'required' => $activityType->isRequired('documents'),
                 'allow_add' => true,
                 'button_add_label' => 'activity.Insert a document',
-                'button_remove_label' => 'activity.Remove a document',
+                'button_remove_label' => 'activity.Remove a document'
             ]);
         }
 
         if ($activityType->isVisible('users')) {
             $builder->add('users', HiddenType::class);
             $builder->get('users')
-                ->addModelTransformer(new CallbackTransformer(
+               ->addModelTransformer(new CallbackTransformer(
-                    static function (iterable $usersAsIterable): string {
+                   function (iterable $usersAsIterable): string {
-                        $userIds = [];
+                       $userIds = [];
-
+                       foreach ($usersAsIterable as $value) {
-                        foreach ($usersAsIterable as $value) {
+                           $userIds[] = $value->getId();
-                            $userIds[] = $value->getId();
+                       }
-                        }
+                       return implode(',', $userIds);
-
+                   },
-                        return implode(',', $userIds);
+                   function (?string $usersAsString): array {
-                    },
+                       return array_map(
-                    function (?string $usersAsString): array {
+                           fn(string $id): ?User => $this->om->getRepository(User::class)->findOneBy(['id' => (int) $id]),
-                        return array_map(
+                           explode(',', $usersAsString)
-                            fn (string $id): ?User => $this->om->getRepository(User::class)->findOneBy(['id' => (int) $id]),
+                       );
-                            explode(',', $usersAsString)
+                   }
-                        );
+               ))
-                    }
+           ;
-                ));
         }
 
         if ($activityType->isVisible('location')) {
             $builder->add('location', HiddenType::class)
                 ->get('location')
                 ->addModelTransformer(new CallbackTransformer(
-                    static function (?Location $location): string {
+                    function (?Location $location): string {
                         if (null === $location) {
                             return '';
                         }
-
                         return $location->getId();
                     },
                     function (?string $id): ?Location {
                         return $this->om->getRepository(Location::class)->findOneBy(['id' => (int) $id]);
                     }
-                ));
+                ))
+            ;
         }
 
         if ($activityType->isVisible('emergency')) {
@@ -367,7 +347,7 @@ class ActivityType extends AbstractType
                 ->addModelTransformer($durationTimeTransformer);
 
             $builder->get($fieldName)
-                ->addEventListener(FormEvents::PRE_SET_DATA, static function (FormEvent $formEvent) use (
+                ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $formEvent) use (
                     $timeChoices,
                     $builder,
                     $durationTimeTransformer,
@@ -376,25 +356,24 @@ class ActivityType extends AbstractType
                 ) {
                     // set the timezone to GMT, and fix the difference between current and GMT
                     // the datetimetransformer will then handle timezone as GMT
-                    $timezoneUTC = new DateTimeZone('GMT');
+                    $timezoneUTC = new \DateTimeZone('GMT');
-                    /** @var DateTime $data */
+                    /* @var $data \DateTime */
-                    $data = $formEvent->getData() === null ?
+                    $data = $formEvent->getData() === NULL ?
-                        DateTime::createFromFormat('U', 300) :
+                        \DateTime::createFromFormat('U', 300) :
                         $formEvent->getData();
                     $seconds = $data->getTimezone()->getOffset($data);
                     $data->setTimeZone($timezoneUTC);
-                    $data->add(new DateInterval('PT' . $seconds . 'S'));
+                    $data->add(new \DateInterval('PT'.$seconds.'S'));
 
                     // test if the timestamp is in the choices.
                     // If not, recreate the field with the new timestamp
-                    if (!in_array($data->getTimestamp(), $timeChoices, true)) {
+                    if (!in_array($data->getTimestamp(), $timeChoices)) {
                         // the data are not in the possible values. add them
                         $timeChoices[$data->format('H:i')] = $data->getTimestamp();
                         $form = $builder->create($fieldName, ChoiceType::class, array_merge(
-                            $durationTimeOptions,
+                            $durationTimeOptions, [
-                            [
                                 'choices' => $timeChoices,
-                                'auto_initialize' => false,
+                                'auto_initialize' => false
                             ]
                         ));
                         $form->addModelTransformer($durationTimeTransformer);
@@ -404,10 +383,12 @@ class ActivityType extends AbstractType
         }
     }
 
+
+
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'data_class' => Activity::class,
+            'data_class' => Activity::class
         ]);
 
         $resolver
@@ -415,7 +396,8 @@ class ActivityType extends AbstractType
             ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
             ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
             ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
-            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null']);
+            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null'])
+        ;
     }
 
     public function getBlockPrefix(): string

src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php

@@ -1,23 +1,14 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityTypeCategoryType extends AbstractType
 {
@@ -25,23 +16,24 @@ class ActivityTypeCategoryType extends AbstractType
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, [
+            ->add('active', ChoiceType::class, array(
-                'choices' => [
+                'choices' => array(
                     'Yes' => true,
-                    'No' => false,
+                    'No'  => false
-                ],
+                ),
-                'expanded' => true,
+                'expanded' => true
-            ])
+            ))
             ->add('ordering', NumberType::class, [
                 'required' => true,
-                'scale' => 5,
+                'scale' => 5
-            ]);
+            ])
+        ;
     }
 
     public function configureOptions(OptionsResolver $resolver): void
     {
-        $resolver->setDefaults([
+        $resolver->setDefaults(array(
-            'data_class' => ActivityTypeCategory::class,
+            'data_class' => ActivityTypeCategory::class
-        ]);
+        ));
     }
 }

src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php

@@ -1,27 +1,18 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form;
 
 use Chill\ActivityBundle\Entity\ActivityTypeCategory;
 use Chill\ActivityBundle\Form\Type\ActivityFieldPresence;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityTypeType extends AbstractType
 {
@@ -39,9 +30,9 @@ class ActivityTypeType extends AbstractType
             ->add('active', ChoiceType::class, [
                 'choices' => [
                     'Yes' => true,
-                    'No' => false,
+                    'No'  => false
                 ],
-                'expanded' => true,
+                'expanded' => true
             ])
             ->add('category', EntityType::class, [
                 'class' => ActivityTypeCategory::class,
@@ -51,20 +42,20 @@ class ActivityTypeType extends AbstractType
             ])
             ->add('ordering', NumberType::class, [
                 'required' => true,
-                'scale' => 5,
+                'scale' => 5
-            ]);
+            ])
+        ;
 
         $fields = [
             'persons', 'user', 'date', 'place', 'persons',
             'thirdParties', 'durationTime', 'travelTime', 'attendee',
             'reasons', 'comment', 'sentReceived', 'documents',
-            'emergency', 'socialIssues', 'socialActions', 'users',
+            'emergency', 'accompanyingPeriod', 'socialData', 'users'
         ];
-
         foreach ($fields as $field) {
             $builder
-                ->add($field . 'Visible', ActivityFieldPresence::class)
+                ->add($field.'Visible', ActivityFieldPresence::class)
-                ->add($field . 'Label', TextType::class, [
+                ->add($field.'Label', TextType::class, [
                     'required' => false,
                     'empty_data' => '',
                 ]);
@@ -73,8 +64,8 @@ class ActivityTypeType extends AbstractType
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
+        $resolver->setDefaults(array(
-            'data_class' => \Chill\ActivityBundle\Entity\ActivityType::class,
+            'data_class' => \Chill\ActivityBundle\Entity\ActivityType::class
-        ]);
+        ));
     }
 }

src/Bundle/ChillActivityBundle/Form/Type/ActivityFieldPresence.php

@@ -1,14 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityType;
@@ -18,21 +9,21 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class ActivityFieldPresence extends AbstractType
 {
+    public function getParent()
+    {
+        return ChoiceType::class;
+    }
+
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
-            [
+            array(
                 'choices' => [
                     'Invisible' => ActivityType::FIELD_INVISIBLE,
                     'Optional' => ActivityType::FIELD_OPTIONAL,
                     'Required' => ActivityType::FIELD_REQUIRED,
                 ],
-            ]
+            )
         );
     }
-
-    public function getParent()
-    {
-        return ChoiceType::class;
-    }
 }

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReason.php

@@ -1,39 +1,54 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * Copyright (C) 2014-2020, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form\Type;
 
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Templating\Entity\ActivityReasonRender;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Doctrine\ORM\EntityRepository;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Templating\Entity\ActivityReasonRender;
 
 /**
- * FormType to choose amongst activity reasons.
+ * FormType to choose amongst activity reasons
+ * 
  */
 class TranslatableActivityReason extends AbstractType
 {
-    /**
-     * @var ActivityReasonRender
-     */
-    protected $reasonRender;
 
     /**
+     *
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
     
+    /**
+     *
+     * @var ActivityReasonRender
+     */
+    protected $reasonRender;
+
     public function __construct(
         TranslatableStringHelper $translatableStringHelper,
         ActivityReasonRender $reasonRender
@@ -42,30 +57,6 @@ class TranslatableActivityReason extends AbstractType
         $this->reasonRender = $reasonRender;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults(
-            [
-                'class' => 'ChillActivityBundle:ActivityReason',
-                'choice_label' => function (ActivityReason $choice) {
-                    return $this->reasonRender->renderString($choice, []);
-                },
-                'group_by' => function (ActivityReason $choice): ?string {
-                    if (null !== $category = $choice->getCategory()) {
-                        return $this->translatableStringHelper->localize($category->getName());
-                    }
-
-                    return null;
-                },
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('r')
-                        ->where('r.active = true');
-                },
-                'attr' => ['class' => ' select2 '],
-            ]
-        );
-    }
-
     public function getBlockPrefix()
     {
         return 'translatable_activity_reason';
@@ -75,4 +66,28 @@ class TranslatableActivityReason extends AbstractType
     {
         return EntityType::class;
     }
+    
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            array(
+                'class' => 'ChillActivityBundle:ActivityReason',
+                'choice_label' => function(ActivityReason $choice)  {
+                    return $this->reasonRender->renderString($choice, []);
+                },
+                'group_by' => function(ActivityReason $choice): ?string {
+                    if (null !== $category = $choice->getCategory()) {
+                        return $this->translatableStringHelper->localize($category->getName());
+                    }
+
+                    return null;
+                },
+                'query_builder' => function (EntityRepository $er) {
+                    return $er->createQueryBuilder('r')
+                        ->where('r.active = true');
+                },
+                'attr' => [ 'class' => ' select2 ']
+            )
+        );
+    }
 }

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityReasonCategory.php

@@ -1,25 +1,40 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Form\Type;
 
-use Doctrine\ORM\EntityRepository;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Doctrine\ORM\EntityRepository;
 
 /**
- * Description of TranslatableActivityReasonCategory.
+ * Description of TranslatableActivityReasonCategory
+ *
+ * @author Champs-Libres Coop
  */
+
+
 class TranslatableActivityReasonCategory extends AbstractType
 {
     /**
@@ -32,21 +47,6 @@ class TranslatableActivityReasonCategory extends AbstractType
         $this->requestStack = $requestStack;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $locale = $this->requestStack->getCurrentRequest()->getLocale();
-        $resolver->setDefaults(
-            [
-                'class' => 'ChillActivityBundle:ActivityReasonCategory',
-                'choice_label' => 'name[' . $locale . ']',
-                'query_builder' => static function (EntityRepository $er) {
-                    return $er->createQueryBuilder('c')
-                        ->where('c.active = true');
-                },
-            ]
-        );
-    }
-
     public function getBlockPrefix()
     {
         return 'translatable_activity_reason_category';
@@ -56,4 +56,19 @@ class TranslatableActivityReasonCategory extends AbstractType
     {
         return EntityType::class;
     }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $locale = $this->requestStack->getCurrentRequest()->getLocale();
+        $resolver->setDefaults(
+            array(
+                'class' => 'ChillActivityBundle:ActivityReasonCategory',
+                'choice_label' => 'name['.$locale.']',
+                'query_builder' => function (EntityRepository $er) {
+                    return $er->createQueryBuilder('c')
+                        ->where('c.active = true');
+                }
+            )
+        );
+    }
 }

src/Bundle/ChillActivityBundle/Form/Type/TranslatableActivityType.php

@@ -1,32 +1,25 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Form\Type;
 
-use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Chill\ActivityBundle\Entity\ActivityType;
 
 class TranslatableActivityType extends AbstractType
 {
-    protected ActivityTypeRepository $activityTypeRepository;
-
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
+    protected ActivityTypeRepository $activityTypeRepository;
+
     public function __construct(
         TranslatableStringHelperInterface $helper,
         ActivityTypeRepository $activityTypeRepository
@@ -35,32 +28,6 @@ class TranslatableActivityType extends AbstractType
         $this->activityTypeRepository = $activityTypeRepository;
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        /** @var QueryBuilder $qb */
-        $qb = $options['query_builder'];
-
-        if (true === $options['active_only']) {
-            $qb->where($qb->expr()->eq('at.active', ':active'));
-            $qb->setParameter('active', true, Types::BOOLEAN);
-        }
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults(
-            [
-                'class' => ActivityType::class,
-                'active_only' => true,
-                'query_builder' => $this->activityTypeRepository
-                    ->createQueryBuilder('at'),
-                'choice_label' => function (ActivityType $type) {
-                    return $this->translatableStringHelper->localize($type->getName());
-                },
-            ]
-        );
-    }
-
     public function getBlockPrefix()
     {
         return 'translatable_activity_type';
@@ -70,4 +37,29 @@ class TranslatableActivityType extends AbstractType
     {
         return EntityType::class;
     }
+
+    public function buildForm(FormBuilderInterface $builder, array $options) {
+        /* @var QueryBuilder $qb */
+        $qb = $options['query_builder'];
+
+        if ($options['active_only'] === true) {
+            $qb->where($qb->expr()->eq('at.active', ':active'));
+            $qb->setParameter('active', true, Types::BOOLEAN);
+        }
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(
+            array(
+                'class' => ActivityType::class,
+                'active_only' => true,
+                'query_builder' => $this->activityTypeRepository
+                    ->createQueryBuilder('at'),
+                'choice_label' => function (ActivityType $type) {
+                    return $this->translatableStringHelper->localize($type->getName());
+                }
+            )
+        );
+    }
 }

src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -1,29 +1,22 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Menu;
 
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
 {
-    protected Security $security;
-
     protected TranslatorInterface $translator;
 
+    protected Security $security;
+
     public function __construct(
         Security $security,
         TranslatorInterface $translator
@@ -31,6 +24,10 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         $this->security = $security;
         $this->translator = $translator;
     }
+    public static function getMenuIds(): array
+    {
+        return ['accompanyingCourse'];
+    }
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
@@ -42,13 +39,8 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
                 'route' => 'chill_activity_activity_list',
                 'routeParameters' => [
                     'accompanying_period_id' => $period->getId(),
-                ], ])
+                ]])
                 ->setExtras(['order' => 40]);
         }
     }
-
-    public static function getMenuIds(): array
-    {
-        return ['accompanyingCourse'];
-    }
 }

src/Bundle/ChillActivityBundle/Menu/AdminMenuBuilder.php

@@ -1,12 +1,4 @@
 <?php
-
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Menu;
@@ -14,7 +6,6 @@ namespace Chill\ActivityBundle\Menu;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Security;
-use function in_array;
 
 final class AdminMenuBuilder implements LocalMenuBuilderInterface
 {
@@ -25,33 +16,33 @@ final class AdminMenuBuilder implements LocalMenuBuilderInterface
         $this->security = $security;
     }
 
+    public static function getMenuIds(): array
+    {
+        return ['admin_index', 'admin_section', 'admin_activity'];
+    }
+
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
         if (!$this->security->isGranted('ROLE_ADMIN')) {
             return;
         }
 
-        if (in_array($menuId, ['admin_index', 'admin_section'], true)) {
+        if (in_array($menuId, ['admin_index', 'admin_section'])) {
             $menu->addChild('Activities', [
-                'route' => 'chill_admin_activity_index',
+                'route' => 'chill_admin_activity_index'
             ])
                 ->setExtras([
                     'order' => 2000,
-                    'explain' => 'Activity configuration',
+                    'explain' => "Activity configuration"
                 ]);
         } else {
             $menu
                 ->addChild('Activities', [
-                    'route' => 'chill_admin_activity_index',
+                    'route' => 'chill_admin_activity_index'
                 ])
                 ->setExtras([
-                    'order' => '60',
+                    'order' => '60'
                 ]);
         }
     }
-
-    public static function getMenuIds(): array
-    {
-        return ['admin_index', 'admin_section', 'admin_activity'];
-    }
 }

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -1,56 +1,68 @@
 <?php
-
+/*
-/**
+ * Copyright (C) 2018 Julien Fastré <julien.fastre@champs-libres.coop>
- * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * This program is free software: you can redistribute it and/or modify
- * the LICENSE file that was distributed with this source code.
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Menu; 
-
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Symfony\Component\Translation\TranslatorInterface;
 
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
 class PersonMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
-     * @var AuthorizationCheckerInterface
+     *
-     */
-    protected $authorizationChecker;
-
-    /**
      * @var TranslatorInterface
      */
     protected $translator;
     
+    /**
+     *
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+    
     public function __construct(
         AuthorizationCheckerInterface $authorizationChecker,
-        TranslatorInterface $translator
+        TranslatorInterface $translator)
-    ) {
+    {
         $this->translator = $translator;
         $this->authorizationChecker = $authorizationChecker;
     }
 
+    
     public function buildMenu($menuId, MenuItem $menu, array $parameters)
     {
-        /** @var \Chill\PersonBundle\Entity\Person $person */
+        /* @var $person \Chill\PersonBundle\Entity\Person */
         $person = $parameters['person'];
         
         if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
             $menu->addChild(
-                $this->translator->trans('Activity list'),
+                $this->translator->trans('Activity list'), [
-                [
                     'route' => 'chill_activity_activity_list',
-                    'routeParameters' => ['person_id' => $person->getId()],
+                    'routeParameters' => [ 'person_id' => $person->getId() ],
-                ]
+                ])
-            )
+                ->setExtra('order', 201)
-                ->setExtra('order', 201);
+                ;
         }
     }
 

src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php

@@ -1,21 +1,17 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Notification;
 
-use Chill\ActivityBundle\Entity\Activity;
 use Chill\MainBundle\Entity\Notification;
+use Chill\ActivityBundle\Entity\Activity;
 
 final class ActivityNotificationRenderer
 {
+    public function supports(Notification $notification, array $options = []): bool
+    {
+        return $notification->getRelatedEntityClass() == Activity::class;
+    }
+
     public function getTemplate()
     {
         return '@ChillActivity/Activity/showInNotification.html.twig';
@@ -25,9 +21,4 @@ final class ActivityNotificationRenderer
     {
         return ['notification' => $notification];
     }
-
-    public function supports(Notification $notification, array $options = []): bool
-    {
-        return $notification->getRelatedEntityClass() === Activity::class;
-    }
 }

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -1,47 +1,60 @@
 <?php
 
-/**
+/*
  * Chill is a software for social workers
  *
- * For the full copyright and license information, please view
+ * Copyright (C) 2021, Champs Libres Cooperative SCRLFS,
- * the LICENSE file that was distributed with this source code.
+ * <http://www.champs-libres.coop>, <info@champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcherInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
-use Doctrine\ORM\EntityManagerInterface;
+use Chill\ActivityBundle\Repository\ActivityRepository;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\Entity\Scope;
+use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\Query\Expr\Orx;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Security;
-use function count;
+
-use function in_array;
 
 final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
 {
     private AuthorizationHelper $authorizationHelper;
 
-    private CenterResolverDispatcherInterface $centerResolverDispatcher;
+    private TokenStorageInterface $tokenStorage;
-
-    private EntityManagerInterface $em;
 
     private ActivityRepository $repository;
 
+    private EntityManagerInterface $em;
+
     private Security $security;
 
-    private TokenStorageInterface $tokenStorage;
+    private CenterResolverDispatcher $centerResolverDispatcher;
 
     public function __construct(
         AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcherInterface $centerResolverDispatcher,
+        CenterResolverDispatcher $centerResolverDispatcher,
         TokenStorageInterface $tokenStorage,
         ActivityRepository $repository,
         EntityManagerInterface $em,
@@ -55,11 +68,34 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         $this->security = $security;
     }
 
+    /**
+     * @param Person $person
+     * @param string $role
+     * @param int|null $start
+     * @param int|null $limit
+     * @param array $orderBy
+     * @return array|Activity[]
+     */
+    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
+    {
+        $user = $this->security->getUser();
+        $center = $this->centerResolverDispatcher->resolveCenter($person);
+        if (0 === count($orderBy)) {
+            $orderBy = ['date' => 'DESC'];
+        }
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableCircles($user, $role, $center);
+
+        return $this->em->getRepository(Activity::class)
+            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
+        ;
+    }
+
     public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
     {
         $user = $this->security->getUser();
         $center = $this->centerResolverDispatcher->resolveCenter($period);
-
         if (0 === count($orderBy)) {
             $orderBy = ['date' => 'DESC'];
         }
@@ -71,27 +107,6 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
             ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
     }
 
-    /**
-     * @param array $orderBy
-     *
-     * @return Activity[]|array
-     */
-    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
-    {
-        $user = $this->security->getUser();
-        $center = $this->centerResolverDispatcher->resolveCenter($person);
-
-        if (0 === count($orderBy)) {
-            $orderBy = ['date' => 'DESC'];
-        }
-
-        $reachableScopes = $this->authorizationHelper
-            ->getReachableCircles($user, $role, $center);
-
-        return $this->em->getRepository(Activity::class)
-            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
-    }
-
     public function queryTimelineIndexer(string $context, array $args = []): array
     {
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
@@ -100,15 +115,15 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         [$where, $parameters] = $this->getWhereClause($context, $args);
 
         return [
-            'id' => $metadataActivity->getTableName()
+           'id' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('id'),
+                .'.'.$metadataActivity->getColumnName('id'),
-            'type' => 'activity',
+           'type' => 'activity',
-            'date' => $metadataActivity->getTableName()
+           'date' => $metadataActivity->getTableName()
-                 . '.' . $metadataActivity->getColumnName('date'),
+                .'.'.$metadataActivity->getColumnName('date'),
-            'FROM' => $from,
+           'FROM' => $from,
-            'WHERE' => $where,
+           'WHERE' => $where,
-            'parameters' => $parameters,
+           'parameters' => $parameters
-        ];
+       ];
     }
 
     private function getFromClauseCenter(array $args): string
@@ -117,12 +132,13 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $associationMapping = $metadataActivity->getAssociationMapping('person');
 
-        return $metadataActivity->getTableName() . ' JOIN '
+        return $metadataActivity->getTableName().' JOIN '
-            . $metadataPerson->getTableName() . ' ON '
+            .$metadataPerson->getTableName().' ON '
-            . $metadataPerson->getTableName() . '.' .
+            .$metadataPerson->getTableName().'.'.
                 $associationMapping['joinColumns'][0]['referencedColumnName']
-            . ' = '
+            .' = '
-            . $associationMapping['joinColumns'][0]['name'];
+            .$associationMapping['joinColumns'][0]['name']
+            ;
     }
 
     private function getWhereClause(string $context, array $args): array
@@ -133,22 +149,21 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $activityToPerson = $metadataActivity->getAssociationMapping('person')['joinColumns'][0]['name'];
-        $activityToScope = $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'];
+        $activityToScope  = $metadataActivity->getAssociationMapping('scope')['joinColumns'][0]['name'];
         $personToCenter = $metadataPerson->getAssociationMapping('center')['joinColumns'][0]['name'];
 
+
         // acls:
         $role = new Role(ActivityVoter::SEE);
-        $reachableCenters = $this->authorizationHelper->getReachableCenters(
+        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(),
-            $this->tokenStorage->getToken()->getUser(),
+                $role);
-            $role
-        );
 
         if (count($reachableCenters) === 0) {
             // insert a dummy condition
             return 'FALSE = TRUE';
         }
 
-        if ('person' === $context) {
+        if ($context === 'person') {
             // we start with activities having the person_id linked to person
             $where .= sprintf('%s = ? AND ', $activityToPerson);
             $parameters[] = $person->getId();
@@ -157,22 +172,21 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         // we add acl (reachable center and scopes)
         $where .= '('; // first loop for the for centers
         $centersI = 0; // like centers#i
-
         foreach ($reachableCenters as $center) {
             // we pass if not in centers
-            if (!in_array($center, $args['centers'], true)) {
+            if (!\in_array($center, $args['centers'])) {
                 continue;
             }
             // we get all the reachable scopes for this center
             $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
-                static function (Scope $scope) { return $scope->getId(); },
+                function(Scope $scope) { return $scope->getId(); },
                 $reachableScopes
             );
 
             // if not the first center
-            if (0 < $centersI) {
+            if ($centersI > 0) {
                 $where .= ') OR (';
             }
 
@@ -185,20 +199,21 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
             $scopesI = 0; //like scope#i
 
             foreach ($reachablesScopesId as $scopeId) {
-                if (0 < $scopesI) {
+                if ($scopesI > 0) {
                     $where .= ' OR ';
                 }
                 $where .= sprintf(' %s.%s = ? ', $metadataActivity->getTableName(), $activityToScope);
                 $parameters[] = $scopeId;
-                ++$scopesI;
+                $scopesI ++;
             }
             // close loop for scopes
             $where .= ') ';
-            ++$centersI;
+            $centersI++;
         }
         // close loop for centers
         $where .= ')';
 
         return [$where, $parameters];
     }
+
 }

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php

@@ -1,14 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -17,12 +8,12 @@ use Chill\PersonBundle\Entity\Person;
 interface ActivityACLAwareRepositoryInterface
 {
     /**
-     * @return Activity[]|array
+     * @return array|Activity[]
-     */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
-
-    /**
-     * @return Activity[]|array
      */
     public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
+
+    /**
+     * @return array|Activity[]
+     */
+    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
 }

src/Bundle/ChillActivityBundle/Repository/ActivityReasonCategoryRepository.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Repository;

src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Repository;

src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Repository;
@@ -30,6 +23,34 @@ class ActivityRepository extends ServiceEntityRepository
         parent::__construct($registry, Activity::class);
     }
 
+    /**
+     * @return Activity[]
+     */
+    public function findByPersonImplied(Person $person, array $scopes, ?array $orderBy = [ 'date' => 'DESC'], ?int $limit = 100, ?int $offset = 0): array
+    {
+        $qb = $this->createQueryBuilder('a');
+        $qb->select('a');
+
+        $qb
+            ->where($qb->expr()->in('a.scope', ':scopes'))
+            ->setParameter('scopes', $scopes)
+            ->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->eq('a.person', ':person'),
+                    ':person MEMBER OF a.persons'
+                )
+            )
+            ->setParameter('person', $person);
+
+        foreach ($orderBy as $k => $dir) {
+            $qb->addOrderBy('a.'.$k, $dir);
+        }
+
+        $qb->setMaxResults($limit)->setFirstResult($offset);
+
+        return $qb->getQuery()->getResult();
+    }
+
     /**
      * @return Activity[]
      */
@@ -60,35 +81,7 @@ class ActivityRepository extends ServiceEntityRepository
             ->setParameter('period', $period);
 
         foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.' . $k, $dir);
+            $qb->addOrderBy('a.'.$k, $dir);
-        }
-
-        $qb->setMaxResults($limit)->setFirstResult($offset);
-
-        return $qb->getQuery()->getResult();
-    }
-
-    /**
-     * @return Activity[]
-     */
-    public function findByPersonImplied(Person $person, array $scopes, ?array $orderBy = ['date' => 'DESC'], ?int $limit = 100, ?int $offset = 0): array
-    {
-        $qb = $this->createQueryBuilder('a');
-        $qb->select('a');
-
-        $qb
-            ->where($qb->expr()->in('a.scope', ':scopes'))
-            ->setParameter('scopes', $scopes)
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->eq('a.person', ':person'),
-                    ':person MEMBER OF a.persons'
-                )
-            )
-            ->setParameter('person', $person);
-
-        foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.' . $k, $dir);
         }
 
         $qb->setMaxResults($limit)->setFirstResult($offset);

src/Bundle/ChillActivityBundle/Repository/ActivityTypeCategoryRepository.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Repository;

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * 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.
- */
-
 declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Repository;

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue

@@ -1,7 +1,7 @@
 <template>
-   <concerned-groups v-if="hasPerson"></concerned-groups>
+   <concerned-groups></concerned-groups>
-   <social-issues-acc v-if="hasSocialIssues"></social-issues-acc>
+   <social-issues-acc></social-issues-acc>
-   <location v-if="hasLocation"></location>
+   <location></location>
 </template>
 
 <script>
@@ -11,7 +11,6 @@ import Location from './components/Location.vue';
 
 export default {
    name: "App",
-    props: ['hasSocialIssues', 'hasLocation', 'hasPerson'],
    components: {
       ConcernedGroups,
       SocialIssuesAcc,

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/api.js

@@ -1,5 +1,4 @@
 import { getSocialIssues } from 'ChillPersonAssets/vuejs/AccompanyingCourse/api.js';
-import { fetchResults } from 'ChillMainAssets/lib/api/apiMethods';
 
 /*
 *  Load socialActions by socialIssue (id)
@@ -13,20 +12,33 @@ const getSocialActionByIssue = (id) => {
       });
 };
 
-const getLocations = () => fetchResults('/api/1.0/main/location.json');
-
-const getLocationTypes = () => fetchResults('/api/1.0/main/location-type.json');
-
 /*
-*   Load Location Type by defaultFor
+*   Load Locations
-*   @param {string} entity - can be "person" or "thirdparty"
  */
-const getLocationTypeByDefaultFor = (entity) => {
+const getLocations = () => {
-    return getLocationTypes().then(results =>
+    const url = `/api/1.0/main/location.json`;
-        results.filter(t => t.defaultFor === entity)[0]
+    return fetch(url)
-    );
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
 };
 
+/*
+*   Load Location Types
+ */
+const getLocationTypes = () => {
+    const url = `/api/1.0/main/location-type.json`;
+    return fetch(url)
+        .then(response => {
+            if (response.ok) { return response.json(); }
+            throw Error('Error with request resource response');
+        });
+};
+
+/*
+*   Post a Location
+ */
 const postLocation = (body) => {
     const url = `/api/1.0/main/location.json`;
     return fetch(url, {
@@ -47,6 +59,5 @@ export {
    getSocialActionByIssue,
    getLocations,
    getLocationTypes,
-   getLocationTypeByDefaultFor,
    postLocation
 };

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue

@@ -1,33 +1,36 @@
 <template>
-    <teleport to="#add-persons" v-if="isComponentVisible">
+   <teleport to="#add-persons">
 
-        <div class="flex-bloc concerned-groups" :class="getContext">
+      <div class="flex-bloc concerned-groups" :class="getContext">
-            <persons-bloc
+         <persons-bloc
-                v-for="bloc in contextPersonsBlocs"
+            v-for="bloc in contextPersonsBlocs"
-                v-bind:key="bloc.key"
+            v-bind:key="bloc.key"
-                v-bind:bloc="bloc"
+            v-bind:bloc="bloc"
-                v-bind:blocWidth="getBlocWidth"
+            v-bind:setPersonsInBloc="setPersonsInBloc">
-                v-bind:setPersonsInBloc="setPersonsInBloc">
+         </persons-bloc>
-            </persons-bloc>
+      </div>
-        </div>
-        <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
-            <ul class="list-suggest add-items">
-                <li v-for="p in suggestedEntities" @click="addSuggestedEntity(p)">
-                    <span>{{ p.text }}</span>
-                </li>
-            </ul>
-        </div>
 
-        <add-persons
+     <div v-if="getContext === 'accompanyingCourse' && filterSuggestedPersons.length > 0">
-            buttonTitle="activity.add_persons"
+         <ul class="list-unstyled">
-            modalTitle="activity.add_persons"
+          <li v-for="p in filterSuggestedPersons" @click="addNewPerson(p)">
-            v-bind:key="addPersons.key"
+             <span class="badge bg-primary" style="cursor: pointer;">
-            v-bind:options="addPersonsOptions"
+                 <i class="fa fa-plus fa-fw text-success"></i>
-            @addNewPersons="addNewPersons"
+                 {{ p.text }}
-            ref="addPersons">
+             </span>
-        </add-persons>
+          </li>
+        </ul>
+     </div>
 
-    </teleport>
+      <add-persons
+         buttonTitle="activity.add_persons"
+         modalTitle="activity.add_persons"
+         v-bind:key="addPersons.key"
+         v-bind:options="addPersons.options"
+         @addNewPersons="addNewPersons"
+         ref="addPersons">
+      </add-persons>
+
+  </teleport>
 </template>
 
 <script>
@@ -52,35 +55,38 @@ export default {
             {  key: 'personsAssociated',
                title: 'activity.bloc_persons_associated',
                persons: [],
-               included: window.activity ? window.activity.activityType.personsVisible !== 0 : true
+               included: false
             },
             {  key: 'personsNotAssociated',
                title: 'activity.bloc_persons_not_associated',
                persons: [],
-               included: window.activity ? window.activity.activityType.personsVisible !== 0 : true
+               included: false
             },
             {  key: 'thirdparty',
                title: 'activity.bloc_thirdparty',
                persons: [],
-               included: window.activity ? window.activity.activityType.thirdPartiesVisible !== 0 : true
+               included: true
             },
             {  key: 'users',
                title: 'activity.bloc_users',
                persons: [],
-               included: window.activity ? window.activity.activityType.usersVisible !== 0 : true
+               included: true
             },
          ],
          addPersons: {
-            key: 'activity'
+            key: 'activity',
+            options: {
+               type: ['person', 'thirdparty', 'user'],
+               priority: null,
+               uniq: false,
+               button: {
+                   size: 'btn-sm'
+               }
+            }
          }
       }
    },
    computed: {
-      isComponentVisible() {
-         return window.activity
-             ? (window.activity.activityType.personsVisible !== 0 || window.activity.activityType.thirdPartiesVisible !== 0 || window.activity.activityType.usersVisible !== 0)
-             : true
-      },
       ...mapState({
          persons: state => state.activity.persons,
          thirdParties: state => state.activity.thirdParties,
@@ -88,41 +94,14 @@ export default {
          accompanyingCourse: state => state.activity.accompanyingPeriod
       }),
       ...mapGetters([
-          'suggestedEntities'
+          'filterSuggestedPersons'
       ]),
       getContext() {
          return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
       },
       contextPersonsBlocs() {
          return this.personsBlocs.filter(bloc => bloc.included !== false);
-      },
+      }
-      addPersonsOptions() {
-         let optionsType = [];
-         if (window.activity) {
-            if (window.activity.activityType.personsVisible !== 0) {
-               optionsType.push('person')
-            }
-            if (window.activity.activityType.thirdPartiesVisible !== 0) {
-               optionsType.push('thirdparty')
-            }
-            if (window.activity.activityType.usersVisible !== 0) {
-               optionsType.push('user')
-            }
-         } else {
-            optionsType = ['person', 'thirdparty', 'user'];
-         }
-         return {
-            type: optionsType,
-            priority: null,
-            uniq: false,
-            button: {
-                  size: 'btn-sm'
-            }
-         }
-      },
-       getBlocWidth() {
-           return Math.round(100/(this.contextPersonsBlocs.length)) + '%';
-       }
    },
    mounted() {
       this.setPersonsInBloc();
@@ -192,7 +171,7 @@ export default {
       },
       addNewPersons({ selected, modal }) {
          console.log('@@@ CLICK button addNewPersons', selected);
-         selected.forEach((item) => {
+         selected.forEach(function(item) {
                this.$store.dispatch('addPersonsInvolved', item);
             }, this
          );
@@ -200,7 +179,7 @@ export default {
          modal.showModal = false;
          this.setPersonsInBloc();
       },
-      addSuggestedEntity(person) {
+      addNewPerson(person) {
         this.$store.dispatch('addPersonsInvolved', { result: person, type: 'person' });
         this.setPersonsInBloc();
       },

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue

@@ -1,8 +1,12 @@
 <template>
    <li>
-      <span :title="person.text">
+      <span class="badge bg-primary" :title="person.text">
-         <span class="chill_denomination">{{ textCutted }}</span>
+         <span class="chill_denomination">
-         <a @click.prevent="$emit('remove', person)"></a>
+            {{ textCutted }}
+         </span>
+         <a class="fa fa-fw fa-times text-danger text-decoration-none"
+            @click.prevent="$emit('remove', person)">
+         </a>
       </span>
    </li>
 </template>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue

@@ -1,11 +1,11 @@
 <template>
-   <div class="item-bloc" :style="{ 'flex-basis': blocWidth }">
+   <div class="item-bloc">
       <div class="item-row">
          <div class="item-col">
             <h4>{{ $t(bloc.title) }}</h4>
          </div>
          <div class="item-col">
-            <ul class="list-suggest remove-items">
+            <ul class="list-content">
                <person-badge
                   v-for="person in bloc.persons"
                   v-bind:key="person.id"
@@ -25,7 +25,7 @@ export default {
    components: {
       PersonBadge
    },
-   props: ['bloc', 'setPersonsInBloc', 'blocWidth'],
+   props: ['bloc', 'setPersonsInBloc'],
    methods: {
       removePerson(item) {
          console.log('@@ CLICK remove person: item', item);

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue

@@ -2,9 +2,10 @@
     <teleport to="#location">
         <div class="mb-3 row">
             <label class="col-form-label col-sm-4">
-                {{ $t("activity.location") }}
+                {{ $t('activity.location') }}
             </label>
             <div class="col-sm-8">
+
                 <VueMultiselect
                     name="selectLocation"
                     id="selectLocation"
@@ -16,10 +17,7 @@
                     :placeholder="$t('activity.choose_location')"
                     :custom-label="customLabel"
                     :options="locations"
-                    group-values="locations"
+                    v-model="location">
-                    group-label="locationGroup"
-                    v-model="location"
-                >
                 </VueMultiselect>
 
                 <new-location v-bind:locations="locations"></new-location>
@@ -29,146 +27,48 @@
 </template>
 
 <script>
-import { mapState, mapGetters } from "vuex";
+import { mapState } from "vuex";
-import VueMultiselect from "vue-multiselect";
+import VueMultiselect from 'vue-multiselect';
-import NewLocation from "./Location/NewLocation.vue";
+import NewLocation from './Location/NewLocation.vue';
-import { getLocations, getLocationTypeByDefaultFor } from "../api.js";
+import { getLocations } from '../api.js';
 
 export default {
     name: "Location",
     components: {
         NewLocation,
-        VueMultiselect,
+        VueMultiselect
     },
     data() {
         return {
-            locations: [],
+            locations: []
-        };
+        }
     },
     computed: {
-        ...mapState(["activity"]),
+        ...mapState(['activity']),
-        ...mapGetters(["suggestedEntities"]),
         location: {
             get() {
                 return this.activity.location;
             },
             set(value) {
-                this.$store.dispatch("updateLocation", value);
+                this.$store.dispatch('updateLocation', value);
-            },
-        },
-    },
-    mounted() {
-        getLocations().then(
-            (results) => {
-                getLocationTypeByDefaultFor('person').then(
-                    (personLocationType) => {
-                        if (personLocationType) {
-                            const personLocation = this.makeAccompanyingPeriodLocation(personLocationType);
-                            const concernedPersonsLocation =
-                                this.makeConcernedPersonsLocation(personLocationType);
-                            getLocationTypeByDefaultFor('thirdparty').then(
-                                thirdpartyLocationType => {
-                                    const concernedThirdPartiesLocation =
-                                        this.makeConcernedThirdPartiesLocation(thirdpartyLocationType);
-                                    this.locations = [
-                                        {
-                                            locationGroup: 'Localisation du parcours',
-                                            locations: [personLocation]
-                                        },
-                                        {
-                                            locationGroup: 'Parties concernées',
-                                            locations: [...concernedPersonsLocation, ...concernedThirdPartiesLocation]
-                                        },
-                                        {
-                                            locationGroup: 'Autres localisations',
-                                            locations: results
-                                        }
-                                    ];
-                                }
-                            )
-                        } else {
-                            this.locations = [
-                                {
-                                    locationGroup: 'Localisations',
-                                    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);
-                        }
-                    }
-                )
-            })
-    },
-    methods: {
-        labelAccompanyingCourseLocation(value) {
-            return `${value.address.text} (${value.locationType.title.fr})`
-        },
-        customLabel(value) {
-            return value.locationType
-                ? value.name
-                    ? value.name === '__AccompanyingCourseLocation__'
-                        ? this.labelAccompanyingCourseLocation(value)
-                        : `${value.name} (${value.locationType.title.fr})`
-                    : value.locationType.title.fr
-                : '';
-        },
-        makeConcernedPersonsLocation(locationType) {
-            let locations = [];
-            this.suggestedEntities.forEach(
-                (e) => {
-                    if (e.type === 'person' && e.current_household_address !== null){
-                        locations.push({
-                            type: 'location',
-                            id: -this.suggestedEntities.indexOf(e)*10,
-                            onthefly: true,
-                            name: e.text,
-                            address: {
-                                id: e.current_household_address.address_id,
-                            },
-                            locationType: locationType
-                        });
-                    }
-                }
-            )
-            return locations;
-        },
-        makeConcernedThirdPartiesLocation(locationType) {
-            let locations = [];
-            this.suggestedEntities.forEach(
-                (e) => {
-                    if (e.type === 'thirdparty' && e.address !== null){
-                        locations.push({
-                            type: 'location',
-                            id: -this.suggestedEntities.indexOf(e)*10,
-                            onthefly: true,
-                            name: e.text,
-                            address: { id: e.address.address_id },
-                            locationType: locationType
-                        });
-                    }
-                }
-            )
-            return locations;
-        },
-        makeAccompanyingPeriodLocation(locationType) {
-            const accPeriodLocation = this.activity.accompanyingPeriod.location;
-            return {
-                type: 'location',
-                id: -1,
-                onthefly: true,
-                name: '__AccompanyingCourseLocation__',
-                address: {
-                    id: accPeriodLocation.address_id,
-                    text: `${accPeriodLocation.text} - ${accPeriodLocation.postcode.code} ${accPeriodLocation.postcode.name}`
-                },
-                locationType: locationType
             }
         }
     },
-};
+    mounted() {
+        this.getLocationsList();
+    },
+    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 : ''}`;
+        }
+    }
+}
+
 </script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue

@@ -214,9 +214,11 @@ export default {
             return cond;
         },
         getLocationTypesList() {
-            getLocationTypes().then(results => {
+            getLocationTypes().then(response => new Promise(resolve => {
-                this.locationTypes = results.filter(t => t.availableForUsers === true);
+                console.log('getLocationTypes', response);
-            })
+                this.locationTypes = response.results.filter(t => t.availableForUsers === true);
+                resolve();
+            }))
         },
         openModal() {
             this.modal.showModal = true;
@@ -245,6 +247,7 @@ export default {
                 postLocation(body)
                     .then(
                         location => new Promise(resolve => {
+                            console.log('postLocation', location);
                             this.locations.push(location);
                             this.$store.dispatch('updateLocation', location);
                             resolve();

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue

@@ -50,26 +50,19 @@
                <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
             </div>
 
-            <span v-else-if="socialIssuesSelected.length === 0" class="inline-choice chill-no-data-statement mt-3">
+            <check-social-action
+               v-if="socialIssuesSelected.length || socialActionsSelected.length"
+               v-for="action in socialActionsList"
+               v-bind:key="action.id"
+               v-bind:action="action"
+               v-bind:selection="socialActionsSelected"
+               @updateSelected="updateActionsSelected">
+            </check-social-action>
+
+            <span v-else class="inline-choice chill-no-data-statement mt-3">
                {{ $t('activity.select_first_a_social_issue') }}
             </span>
 
-             <template v-else-if="socialActionsList.length > 0">
-                 <check-social-action
-                     v-if="socialIssuesSelected.length || socialActionsSelected.length"
-                     v-for="action in socialActionsList"
-                     v-bind:key="action.id"
-                     v-bind:action="action"
-                     v-bind:selection="socialActionsSelected"
-                     @updateSelected="updateActionsSelected">
-                 </check-social-action>
-             </template>
-
-            <span v-else-if="actionAreLoaded && socialActionsList.length === 0" class="inline-choice chill-no-data-statement mt-3">
-                {{ $t('activity.social_action_list_empty') }}
-            </span>
-
-
          </div>
       </div>
 
@@ -92,8 +85,7 @@ export default {
    data() {
       return {
          issueIsLoading: false,
-         actionIsLoading: false,
+         actionIsLoading: false
-         actionAreLoaded: false,
       }
    },
    computed: {
@@ -117,7 +109,6 @@ export default {
       /* Load others issues in multiselect
       */
       this.issueIsLoading = true;
-      this.actionAreLoaded = false;
       getSocialIssues().then(response => new Promise((resolve, reject) => {
          this.$store.commit('updateIssuesOther', response.results);
 
@@ -150,8 +141,6 @@ export default {
          this.$store.commit('filterList', 'actions');
 
          this.issueIsLoading = false;
-         this.actionAreLoaded = true;
-         this.updateActionsList();
          resolve();
       }));
    },
@@ -184,6 +173,7 @@ export default {
          to get social actions concerned
       */
       updateActionsList() {
+         //console.log('updateActionsList');
          this.resetActionsList();
          this.socialIssuesSelected.forEach(item => {
 
@@ -198,7 +188,6 @@ export default {
                   this.$store.commit('filterList', 'actions');
 
                   this.actionIsLoading = false;
-                  this.actionAreLoaded = true;
                   resolve();
             }));
          }, this);
@@ -207,7 +196,6 @@ export default {
       */
       resetActionsList() {
          this.$store.commit('resetActionsList');
-         this.actionAreLoaded = false;
          this.socialActionsSelected.forEach(item => {
             this.$store.commit('addActionInList', item);
          }, this);

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue

@@ -10,7 +10,7 @@
             v-bind:value="action"
             />
          <label class="form-check-label" v-bind:for="action.id">
-            <span class="badge bg-light text-dark">{{ action.text }}</span>
+            {{ action.text }}
          </label>
          
       </div>
@@ -34,15 +34,3 @@ export default {
    }
 }
 </script>
-
-<style lang="scss" scoped>
-@import 'ChillMainAssets/module/bootstrap/shared';
-@import 'ChillPersonAssets/chill/scss/mixins';
-@import 'ChillMainAssets/chill/scss/chill_variables';
-span.badge {
-    @include badge_social($social-action-color);
-    font-size: 95%;
-    margin-bottom: 5px;
-    margin-right: 1em;
-}
-</style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue

@@ -10,7 +10,7 @@
             v-bind:value="issue"
             />
          <label class="form-check-label" v-bind:for="issue.id">
-            <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
+            {{ issue.text }}
          </label>
          
       </div>
@@ -34,15 +34,3 @@ export default {
    }
 }
 </script>
-
-<style lang="scss" scoped>
-@import 'ChillMainAssets/module/bootstrap/shared';
-@import 'ChillPersonAssets/chill/scss/mixins';
-@import 'ChillMainAssets/chill/scss/chill_variables';
-span.badge {
-    @include badge_social($social-issue-color);
-    font-size: 95%;
-    margin-bottom: 5px;
-    margin-right: 1em;
-}
-</style>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/i18n.js

@@ -9,7 +9,6 @@ const activityMessages = {
          choose_other_social_issue: "Ajouter une autre problématique sociale...",
          social_actions: "Actions d'accompagnement",
          select_first_a_social_issue: "Sélectionnez d'abord une problématique sociale",
-         social_action_list_empty: "Aucune action sociale disponible",
 
          //
          add_persons: "Ajouter des personnes concernées",

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js

@@ -7,19 +7,8 @@ import App from './App.vue';
 
 const i18n = _createI18n(activityMessages);
 
-const hasSocialIssues = document.querySelector('#social-issues-acc') !== null;
-const hasLocation = document.querySelector('#location') !== null;
-const hasPerson = document.querySelector('#add-persons') !== null;
-
 const app = createApp({
-   template: `<app :hasSocialIssues="hasSocialIssues", :hasLocation="hasLocation", :hasPerson="hasPerson"></app>`,
+   template: `<app></app>`,
-    data() {
-       return {
-           hasSocialIssues,
-           hasLocation,
-           hasPerson,
-       };
-    }
 })
 .use(store)
 .use(i18n)

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -1,6 +1,5 @@
 import 'es6-promise/auto';
 import { createStore } from 'vuex';
-import { postLocation } from './api';
 
 const debug = process.env.NODE_ENV !== 'production';
 //console.log('window.activity', window.activity);
@@ -20,319 +19,172 @@ const removeIdFromValue = (string, id) => {
 };
 
 const store = createStore({
-    strict: debug,
+  strict: debug,
-    state: {
+  state: {
-        activity: window.activity,
+    activity: window.activity,
-        socialIssuesOther: [],
+    socialIssuesOther: [],
-        socialActionsList: [],
+    socialActionsList: [],
+  },
+  getters: {
+    filterSuggestedPersons(state) {
+      if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
+        return [];
+      }
+      let existingPersonIds = state.activity.persons.map(p => p.id);
+      return state.activity.accompanyingPeriod.participations.filter(p => p.endDate === null)
+        .map(p => p.person)
+        .filter(p => !existingPersonIds.includes(p.id))
+    }
+  },
+  mutations: {
+    // SocialIssueAcc
+    addIssueInList(state, issue) {
+      //console.log('add issue list', issue.id);
+      state.activity.accompanyingPeriod.socialIssues.push(issue);
+    },
+    addIssueSelected(state, issue) {
+      //console.log('add issue selected', issue.id);
+      state.activity.socialIssues.push(issue);
+    },
+    updateIssuesSelected(state, issues) {
+      //console.log('update issues selected', issues);
+      state.activity.socialIssues = issues;
+    },
+    updateIssuesOther(state, payload) {
+      //console.log('update issues other');
+      state.socialIssuesOther = payload;
+    },
+    removeIssueInOther(state, issue) {
+      //console.log('remove issue other', issue.id);
+      state.socialIssuesOther = state.socialIssuesOther.filter(i => i.id !== issue.id);
+    },
+    resetActionsList(state) {
+      //console.log('reset list actions');
+      state.socialActionsList = [];
+    },
+    addActionInList(state, action) {
+      //console.log('add action list', action.id);
+      state.socialActionsList.push(action);
+    },
+    updateActionsSelected(state, actions) {
+      //console.log('update actions selected', actions);
+      state.activity.socialActions = actions;
+    },
+    filterList(state, list) {
+      const filterList = (list) => {
+        // remove duplicates entries
+        list = list.filter((value, index) => list.findIndex(array => array.id === value.id) === index);
+        // alpha sort
+        list.sort((a,b) => (a.text > b.text) ? 1 : ((b.text > a.text) ? -1 : 0));
+        return list;
+      };
+      if (list === 'issues') {
+        state.activity.accompanyingPeriod.socialIssues = filterList(state.activity.accompanyingPeriod.socialIssues);
+      }
+      if (list === 'actions') {
+        state.socialActionsList = filterList(state.socialActionsList);
+      }
     },
-    getters: {
-        suggestedEntities(state) {
-            if (typeof state.activity.accompanyingPeriod === "undefined") {
-                return [];
-            }
-            const allEntities = [
-                ...store.getters.suggestedPersons,
-                ...store.getters.suggestedRequestor,
-                ...store.getters.suggestedUser,
-                ...store.getters.suggestedResources,
-            ];
-            const uniqueIds = [
-                ...new Set(allEntities.map((i) => `${i.type}-${i.id}`)),
-            ];
-            return Array.from(
-                uniqueIds,
-                (id) => allEntities.filter((r) => `${r.type}-${r.id}` === id)[0]
-            );
-        },
-        suggestedPersons(state) {
-            const existingPersonIds = state.activity.persons.map((p) => p.id);
-            return state.activity.activityType.personsVisible === 0
-                ? []
-                : state.activity.accompanyingPeriod.participations
-                      .filter((p) => p.endDate === null)
-                      .map((p) => p.person)
-                      .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
-            );
 
-            return [state.activity.accompanyingPeriod.requestor].filter(
+    // ConcernedGroups
-                (r) =>
+    addPersonsInvolved(state, payload) {
-                    (r.type === "person" &&
+      //console.log('### mutation addPersonsInvolved', payload.result.type);
-                        !existingPersonIds.includes(r.id) &&
+      switch (payload.result.type) {
-                        state.activity.activityType.personsVisible !== 0) ||
+        case 'person':
-                    (r.type === "thirdparty" &&
+          state.activity.persons.push(payload.result);
-                        !existingThirdPartyIds.includes(r.id) &&
+          break;
-                        state.activity.activityType.thirdPartiesVisible !== 0)
+        case 'thirdparty':
-            );
+          state.activity.thirdParties.push(payload.result);
-        },
+          break;
-        suggestedUser(state) {
+        case 'user':
-            const existingUserIds = state.activity.users.map((p) => p.id);
+          state.activity.users.push(payload.result);
-            return state.activity.activityType.usersVisible === 0
+          break;
-                ? []
+      };
-                : [state.activity.accompanyingPeriod.user].filter(
-                      (u) => u !== null && !existingUserIds.includes(u.id)
-                  );
-        },
-        suggestedResources(state) {
-            const resources = state.activity.accompanyingPeriod.resources;
-            const existingPersonIds = state.activity.persons.map((p) => p.id);
-            const existingThirdPartyIds = state.activity.thirdParties.map(
-                (p) => p.id
-            );
-            return state.activity.accompanyingPeriod.resources
-                .map((r) => r.resource)
-                .filter(
-                    (r) =>
-                        (r.type === "person" &&
-                            !existingPersonIds.includes(r.id) &&
-                            state.activity.activityType.personsVisible !== 0) ||
-                        (r.type === "thirdparty" &&
-                            !existingThirdPartyIds.includes(r.id) &&
-                            state.activity.activityType.thirdPartiesVisible !== 0)
-                );
-        },
     },
-    mutations: {
+    removePersonInvolved(state, payload) {
-        // SocialIssueAcc
+      //console.log('### mutation removePersonInvolved', payload.type);
-        addIssueInList(state, issue) {
+      switch (payload.type) {
-            //console.log('add issue list', issue.id);
+        case 'person':
-            state.activity.accompanyingPeriod.socialIssues.push(issue);
+          state.activity.persons = state.activity.persons.filter(person => person !== payload);
-        },
+          break;
-        addIssueSelected(state, issue) {
+        case 'thirdparty':
-            //console.log('add issue selected', issue.id);
+          state.activity.thirdParties = state.activity.thirdParties.filter(thirdparty => thirdparty !== payload);
-            state.activity.socialIssues.push(issue);
+          break;
-        },
+        case 'user':
-        updateIssuesSelected(state, issues) {
+          state.activity.users = state.activity.users.filter(user => user !== payload);
-            //console.log('update issues selected', issues);
+          break;
-            state.activity.socialIssues = issues;
+      };
-        },
-        updateIssuesOther(state, payload) {
-            //console.log('update issues other');
-            state.socialIssuesOther = payload;
-        },
-        removeIssueInOther(state, issue) {
-            //console.log('remove issue other', issue.id);
-            state.socialIssuesOther = state.socialIssuesOther.filter(
-                (i) => i.id !== issue.id
-            );
-        },
-        resetActionsList(state) {
-            //console.log('reset list actions');
-            state.socialActionsList = [];
-        },
-        addActionInList(state, action) {
-            //console.log('add action list', action.id);
-            state.socialActionsList.push(action);
-        },
-        updateActionsSelected(state, actions) {
-            //console.log('update actions selected', actions);
-            state.activity.socialActions = actions;
-        },
-        filterList(state, list) {
-            const filterList = (list) => {
-                // remove duplicates entries
-                list = list.filter(
-                    (value, index) =>
-                        list.findIndex((array) => array.id === value.id) ===
-                        index
-                );
-                // alpha sort
-                list.sort((a, b) =>
-                    a.text > b.text ? 1 : b.text > a.text ? -1 : 0
-                );
-                return list;
-            };
-            if (list === "issues") {
-                state.activity.accompanyingPeriod.socialIssues = filterList(
-                    state.activity.accompanyingPeriod.socialIssues
-                );
-            }
-            if (list === "actions") {
-                state.socialActionsList = filterList(state.socialActionsList);
-            }
-        },
-
-        // ConcernedGroups
-        addPersonsInvolved(state, payload) {
-            console.log("### mutation addPersonsInvolved", payload);
-            switch (payload.result.type) {
-                case "person":
-                    state.activity.persons.push(payload.result);
-                    break;
-                case "thirdparty":
-                    state.activity.thirdParties.push(payload.result);
-                    break;
-                case "user":
-                    state.activity.users.push(payload.result);
-                    break;
-            }
-        },
-        removePersonInvolved(state, payload) {
-            //console.log('### mutation removePersonInvolved', payload.type);
-            switch (payload.type) {
-                case "person":
-                    state.activity.persons = state.activity.persons.filter(
-                        (person) => person !== payload
-                    );
-                    break;
-                case "thirdparty":
-                    state.activity.thirdParties =
-                        state.activity.thirdParties.filter(
-                            (thirdparty) => thirdparty !== payload
-                        );
-                    break;
-                case "user":
-                    state.activity.users = state.activity.users.filter(
-                        (user) => user !== payload
-                    );
-                    break;
-            }
-        },
-        updateLocation(state, value) {
-            console.log("### mutation: updateLocation", value);
-            state.activity.location = value;
-        },
     },
-    actions: {
+    updateLocation(state, value) {
-        addIssueSelected({ commit }, issue) {
+        console.log('### mutation: updateLocation', value);
-            let aSocialIssues = document.getElementById(
+        state.activity.location = value;
-                "chill_activitybundle_activity_socialIssues"
+    }
-            );
+  },
-            aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
+  actions: {
-            commit("addIssueSelected", issue);
+    addIssueSelected({ commit }, issue) {
-        },
+      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
-        updateIssuesSelected({ commit }, payload) {
+      aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
-            let aSocialIssues = document.getElementById(
+      commit('addIssueSelected', issue);
-                "chill_activitybundle_activity_socialIssues"
-            );
-            aSocialIssues.value = "";
-            payload.forEach((item) => {
-                aSocialIssues.value = addIdToValue(
-                    aSocialIssues.value,
-                    item.id
-                );
-            });
-            commit("updateIssuesSelected", payload);
-        },
-        updateActionsSelected({ commit }, payload) {
-            let aSocialActions = document.getElementById(
-                "chill_activitybundle_activity_socialActions"
-            );
-            aSocialActions.value = "";
-            payload.forEach((item) => {
-                aSocialActions.value = addIdToValue(
-                    aSocialActions.value,
-                    item.id
-                );
-            });
-            commit("updateActionsSelected", payload);
-        },
-        addPersonsInvolved({ commit }, payload) {
-            //console.log('### action addPersonsInvolved', payload.result.type);
-            switch (payload.result.type) {
-                case "person":
-                    let aPersons = document.getElementById(
-                        "chill_activitybundle_activity_persons"
-                    );
-                    aPersons.value = addIdToValue(
-                        aPersons.value,
-                        payload.result.id
-                    );
-                    break;
-                case "thirdparty":
-                    let aThirdParties = document.getElementById(
-                        "chill_activitybundle_activity_thirdParties"
-                    );
-                    aThirdParties.value = addIdToValue(
-                        aThirdParties.value,
-                        payload.result.id
-                    );
-                    break;
-                case "user":
-                    let aUsers = document.getElementById(
-                        "chill_activitybundle_activity_users"
-                    );
-                    aUsers.value = addIdToValue(
-                        aUsers.value,
-                        payload.result.id
-                    );
-                    break;
-            }
-            commit("addPersonsInvolved", payload);
-        },
-        removePersonInvolved({ commit }, payload) {
-            //console.log('### action removePersonInvolved', payload);
-            switch (payload.type) {
-                case "person":
-                    let aPersons = document.getElementById(
-                        "chill_activitybundle_activity_persons"
-                    );
-                    aPersons.value = removeIdFromValue(
-                        aPersons.value,
-                        payload.id
-                    );
-                    break;
-                case "thirdparty":
-                    let aThirdParties = document.getElementById(
-                        "chill_activitybundle_activity_thirdParties"
-                    );
-                    aThirdParties.value = removeIdFromValue(
-                        aThirdParties.value,
-                        payload.id
-                    );
-                    break;
-                case "user":
-                    let aUsers = document.getElementById(
-                        "chill_activitybundle_activity_users"
-                    );
-                    aUsers.value = removeIdFromValue(aUsers.value, payload.id);
-                    break;
-            }
-            commit("removePersonInvolved", payload);
-        },
-        updateLocation({ commit }, value) {
-            console.log("### action: updateLocation", value);
-            let hiddenLocation = document.getElementById(
-                "chill_activitybundle_activity_location"
-            );
-            if (value.onthefly) {
-                const body = {
-                    "type": "location",
-                    "name": value.name === '__AccompanyingCourseLocation__' ? null : value.name,
-                    "locationType": {
-                        "id": value.locationType.id,
-                        "type": "location-type"
-                    }
-                };
-                if (value.address.id) {
-                    Object.assign(body, {
-                        "address": {
-                            "id": value.address.id
-                        },
-                    })
-                }
-                postLocation(body)
-                    .then(
-                        location => hiddenLocation.value = location.id
-                    ).catch(
-                        err => {
-                            console.log(err.message);
-                        }
-                    );
-            } else {
-                hiddenLocation.value = value.id;
-            }
-            commit("updateLocation", value);
-        },
     },
+    updateIssuesSelected({ commit }, payload) {
+      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
+      aSocialIssues.value = '';
+      payload.forEach(item => {
+        aSocialIssues.value = addIdToValue(aSocialIssues.value, item.id);
+      });
+      commit('updateIssuesSelected', payload);
+    },
+    updateActionsSelected({ commit }, payload) {
+      let aSocialActions = document.getElementById("chill_activitybundle_activity_socialActions");
+      aSocialActions.value = '';
+      payload.forEach(item => {
+        aSocialActions.value = addIdToValue(aSocialActions.value, item.id);
+      });
+      commit('updateActionsSelected', payload);
+    },
+    addPersonsInvolved({ commit }, payload) {
+      //console.log('### action addPersonsInvolved', payload.result.type);
+      switch (payload.result.type) {
+        case 'person':
+          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
+          aPersons.value = addIdToValue(aPersons.value, payload.result.id);
+          break;
+        case 'thirdparty':
+          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
+          aThirdParties.value = addIdToValue(aThirdParties.value, payload.result.id);
+          break;
+        case 'user':
+          let aUsers = document.getElementById("chill_activitybundle_activity_users");
+          aUsers.value = addIdToValue(aUsers.value, payload.result.id);
+          break;
+      };
+      commit('addPersonsInvolved', payload);
+    },
+    removePersonInvolved({ commit }, payload) {
+      //console.log('### action removePersonInvolved', payload);
+      switch (payload.type) {
+        case 'person':
+          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
+          aPersons.value = removeIdFromValue(aPersons.value, payload.id);
+          break;
+        case 'thirdparty':
+          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
+          aThirdParties.value = removeIdFromValue(aThirdParties.value, payload.id);
+          break;
+        case 'user':
+          let aUsers = document.getElementById("chill_activitybundle_activity_users");
+          aUsers.value = removeIdFromValue(aUsers.value, payload.id);
+          break;
+      };
+      commit('removePersonInvolved', payload);
+    },
+    updateLocation({ commit }, value) {
+        console.log('### action: updateLocation', value);
+        let hiddenLocation = document.getElementById("chill_activitybundle_activity_location");
+        hiddenLocation.value = value.id;
+        commit('updateLocation', value);
+    }
+  }
 });
 
 export default store;

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php

@@ -1,38 +1,13 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
-use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
 
 class AppKernel extends Kernel
 {
-    /**
-     * @return string
-     */
-    public function getCacheDir()
-    {
-        return sys_get_temp_dir() . '/ActivityBundle/cache';
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogDir()
-    {
-        return sys_get_temp_dir() . '/ActivityBundle/logs';
-    }
-
     public function registerBundles()
     {
-        return [
+        return array(
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Chill\CustomFieldsBundle\ChillCustomFieldsBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
@@ -45,12 +20,28 @@ class AppKernel extends Kernel
             new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
-            //add here all the required bundle (some bundle are not required)
+            #add here all the required bundle (some bundle are not required)
-        ];
+        );
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
+    }
+
+    /**
+     * @return string
+     */
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir().'/ActivityBundle/cache';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogDir()
+    {
+        return sys_get_temp_dir().'/ActivityBundle/logs';
     }
 }

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php

@@ -1,20 +1,11 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
-use Composer\Autoload\ClassLoader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
+use Composer\Autoload\ClassLoader;
 
 /** @var ClassLoader $loader */
-$loader = require __DIR__ . '/../../../../../vendor/autoload.php';
+$loader = require __DIR__.'/../../../../../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
 
 return $loader;

src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/web/app_dev.php

@@ -1,16 +1,7 @@
 <?php
 
-/**
- * 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.
- */
-
-declare(strict_types=1);
-
-use Symfony\Component\Debug\Debug;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Debug\Debug;
 
 // If you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
@@ -20,17 +11,16 @@ use Symfony\Component\HttpFoundation\Request;
 // Feel free to remove this, extend it, or make something more sophisticated.
 if (isset($_SERVER['HTTP_CLIENT_IP'])
     || isset($_SERVER['HTTP_X_FORWARDED_FOR'])
-    || !(in_array($_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1'], true) || \PHP_SAPI === 'cli-server')
+    || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server')
 ) {
     header('HTTP/1.0 403 Forbidden');
-
+    exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
-    exit('You are not allowed to access this file. Check ' . basename(__FILE__) . ' for more information.');
 }
 
-$loader = require_once __DIR__ . '/../app/bootstrap.php.cache';
+$loader = require_once __DIR__.'/../app/bootstrap.php.cache';
 Debug::enable();
 
-require_once __DIR__ . '/../app/AppKernel.php';
+require_once __DIR__.'/../app/AppKernel.php';
 
 $kernel = new AppKernel('dev', true);
 $kernel->loadClassCache();

src/Bundle/ChillActivityBundle/Resources/views/Activity/activity-badge-title.html.twig

@@ -26,45 +26,23 @@
 
         {{ activity.type.name | localize_translatable_string }}
 
-        {% if activity.emergency %}
+        <ul class="small_in_title">
-            <span class="badge bg-danger rounded-pill fs-6">{{ 'Emergency'|trans|upper }}</span>
-        {% endif %}
-
-        <ul class="small_in_title mt-3">
-
-            {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
-                <li>
-                    <span class="item-key">{{ 'Sent received'|trans ~ ' : ' }}</span>
-                    <b>{{ activity.sentReceived|capitalize|trans }}</b>
-                </li>
-            {% endif %}
-
             {% if activity.location and t.locationVisible %}
-                <li>
+            <li>
-                    <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
+                <span class="item-key">{{ 'location'|trans ~ ': ' }}</span>
-                    <b>
+                <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
-                        <span>{{ activity.location.locationType.title|localize_translatable_string }}</span>
+                {{ activity.location.name }}
-                        {{ activity.location.name }}
+            </li>
-                    </b>
-                </li>
             {% endif %}
-
             {% if activity.user and t.userVisible %}
                 <li>
                     <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                    <b>{{ activity.user.usernameCanonical }}</b>
+                    {{ activity.user.usernameCanonical }}
                 </li>
             {% endif %}
-
-            <li class="associated-persons">
-                <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
-                {% for p in activity.personsAssociated %}
-                    <span class="badge-person">{{ p|chill_entity_render_box }}</span>
-                {% endfor %}
-            </li>
         </ul>
 
-        <ul class="list-content my-3">
+        <ul class="list-content">
             {%- if t.reasonsVisible -%}
                 {%- if activity.reasons is not empty -%}
                     <li class="reasons">
@@ -93,9 +71,11 @@
                 {%- endif -%}
             {% endif %}
         </ul>
+
     </span>
 </h2>
 
+{#
 {% if context == 'person' and activity.accompanyingPeriod is not empty %}
     <div class="mt-3">
         <a class="btn btn-sm btn-outline-primary"
@@ -107,4 +87,4 @@
         </a>
     </div>
 {% endif %}
-
+#}

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -3,93 +3,90 @@
     {{ path(pathname, parms) }}
 {% endmacro %}
 
-{% macro computeWidth(nbBlocks) %}
+{% if context == 'person' %}
-    {{ 'flex-basis: ' ~ (100 / nbBlocks)|round(1) ~ '%;' }}
+    {% set blocs = [
-{% endmacro %}
+        {   'title': 'Others persons'|trans,
-
-{% set blocks = [] %}
-{% if entity.activityType.personsVisible %}
-    {% if context == 'person' %}
-        {% set blocks = blocks|merge([{
-            'title': 'Others persons'|trans,
             'items': entity.persons,
             'path' : 'chill_person_view',
             'key'  : 'person_id'
-        }]) %}
+        },
-    {% else %}
+        {   'title': 'Third parties'|trans,
-        {% set blocks = blocks|merge([{
+            'items': entity.thirdParties,
-            'title': 'Persons in accompanying course'|trans,
+            'path' : 'chill_3party_3party_show',
+            'key'  : 'thirdparty_id'
+        },
+        {   'title': 'Users concerned'|trans,
+            'items': entity.users,
+            'path' : 'admin_user_show',
+            'key'  : 'id'
+        },
+    ] %}
+{% else %}
+    {% set blocs = [
+        {   'title': 'Persons in accompanying course'|trans,
             'items': entity.personsAssociated,
             'path' : 'chill_person_view',
             'key'  : 'person_id'
-        },{
+        },
-            'title': 'Third persons'|trans,
+        {   'title': 'Third persons'|trans,
             'items': entity.personsNotAssociated,
             'path' : 'chill_person_view',
-            'key'  : 'person_id',
+            'key'  : 'person_id'
-        }]) %}
+        },
-    {% endif %}
+        {   'title': 'Third parties'|trans,
-{% endif %}
+            'items': entity.thirdParties,
-{% if entity.activityType.thirdPartiesVisible %}
+            'path' : 'chill_3party_3party_show',
-    {% set blocks = blocks|merge([{
+            'key'  : 'thirdparty_id'
-        'title': 'Third parties'|trans,
+        },
-        'items': entity.thirdParties,
+        {   'title': 'Users concerned'|trans,
-        'path' : 'chill_crud_3party_3party_view',
+            'items': entity.users,
-        'key'  : 'id',
+            'key'  : 'id'
-    }]) %}
+        },
-{% endif %}
+    ] %}
-{% if entity.activityType.usersVisible %}
-    {% set blocks = blocks|merge([{
-        'title': 'Users concerned'|trans,
-        'items': entity.users,
-        'key'  : 'id',
-    }]) %}
 {% endif %}
 
 {% if (with_display == 'bloc') %}
 <div class="{{ context }} flex-bloc concerned-groups">
-    {% for bloc in blocks %}
+    {% for bloc in blocs %}
-
+    <div class="item-bloc">
-        <div class="item-bloc" style="{{ _self.computeWidth(loop.length) }}">
+        <div class="item-row">
-            <div class="item-row">
+            <div class="item-col">
-                <div class="item-col">
+                <h4>{{ bloc.title }}</h4>
-                    <h4>{{ bloc.title }}</h4>
+            </div>
-                </div>
+            <div class="item-col">
-                <div class="item-col">
+                <ul class="list-content">
-                    <ul class="list-content">
+                    {% for item in bloc.items %}
-                        {% for item in bloc.items %}
+                    <li>
-                            <li>
+                        {% if bloc.path is defined %}
-                                {% if bloc.path is defined %}
+                        <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                                    <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
+                            <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
-                                    <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                                {{ item|chill_entity_render_box({
-                                        {{ item|chill_entity_render_box({
+                                    'render': 'raw',
-                                            'render': 'raw',
+                                    'addAltNames': false
-                                            'addAltNames': false
+                                }) }}
-                                        }) }}
+                            </span>
-                                    </span>
+                        </a>
-                                    </a>
+                    {% else %}
-                                {% else %}
+                        <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
-                                    <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
+                            {{ item|chill_entity_render_box({
-                                        {{ item|chill_entity_render_box({
+                                'render': 'raw',
-                                            'render': 'raw',
+                                'addAltNames': false
-                                            'addAltNames': false
+                            }) }}
-                                        }) }}
+                        </span>
-                                    </span>
+                    {% endif %}
-                                {% endif %}
+                    </li>
-                            </li>
+                    {% endfor %}
-                        {% endfor %}
+                </ul>
-                    </ul>
-                </div>
             </div>
         </div>
-
+    </div>
     {% endfor %}
 </div>
 {% endif %}
 
 {% if (with_display == 'row') %}
 <div class="concerned-groups">
-    {% for bloc in blocks %}
+    {% for bloc in blocs %}
     <div class="group">
         {% if bloc.items|length > 0 %}
             <h4>{{ bloc.title }}</h4>
@@ -122,7 +119,7 @@
 
 {% if (with_display == 'wrap-list') %}
 <div class="concerned-groups wrap-list">
-    {% for bloc in blocks %}
+    {% for bloc in blocs %}
         <div class="wl-row">
             {% if bloc.items|length > 0 %}
                 <div class="wl-col title">

src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -28,30 +28,25 @@
     {{ form_row(edit_form.socialActions) }}
 {% endif %}
 
-{%- if edit_form.socialIssues is defined or edit_form.socialIssues is defined -%}
 <div id="social-issues-acc"></div>
-{% endif %}
 
 {%- if edit_form.reasons is defined -%}
     {{ form_row(edit_form.reasons) }}
 {% endif %}
 
-{%- if edit_form.persons is defined or edit_form.thirdParties is defined or edit_form.users is defined -%}
+<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-    <h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
 
-    {%- if edit_form.persons is defined -%}
+{%- if edit_form.persons is defined -%}
-        {{ form_widget(edit_form.persons) }}
+    {{ form_widget(edit_form.persons) }}
-    {% endif %}
+{% endif %}
-    {%- if edit_form.thirdParties is defined -%}
+{%- if edit_form.thirdParties is defined -%}
-        {{ form_widget(edit_form.thirdParties) }}
+    {{ form_widget(edit_form.thirdParties) }}
-    {% endif %}
+{% endif %}
-    {%- if edit_form.users is defined -%}
+{%- if edit_form.users is defined -%}
-        {{ form_widget(edit_form.users) }}
+    {{ form_widget(edit_form.users) }}
-    {% endif %}
-
-    <div id="add-persons"></div>
 {% endif %}
 
+<div id="add-persons"></div>
 
 <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig

@@ -3,6 +3,7 @@
     {% if activities|length == 0 %}
         <p class="chill-no-data-statement">
             {{ "There isn't any activities."|trans }}
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-sm btn-create"></a>
         </p>
 
     {% else %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig

@@ -20,14 +20,12 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse'} %}
 
-    {% if is_granted('CHILL_ACTIVITY_CREATE', accompanyingCourse) %}
     <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}) }}" class="btn btn-create">
-                {{ 'Create'|trans }}
+                {{ 'Add a new activity' | trans }}
             </a>
         </li>
     </ul>
-    {% endif %}
 
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig

@@ -36,14 +36,12 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': '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}) }}"
-               class="btn btn-create" tabindex="-1" role="button" aria-disabled="true">{{ 'Create'|trans }}
+               class="btn btn-create disabled" tabindex="-1" role="button" aria-disabled="true">{{ 'Add a new activity' | trans }}
             </a>
         </li>
     </ul>
-    {% endif %}
 
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig

@@ -2,11 +2,9 @@
     {% for activity in activities | slice(0,5) %}
         {% set t = activity.type %}
 
-        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
+        <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"></a>
-            class="badge-link" title="{{ 'Show the activity'|trans }}">
 
-            {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
+        {% include '@ChillActivity/Activity/activity-badge-title.html.twig' %}
-        </a>
 
     {% endfor %}
 </div>