master merged into branch

.editorconfig

@@ -18,8 +18,10 @@ max_line_length = 80
 
 [COMMIT_EDITMSG]
 max_line_length = 0
+<<<<<<< Updated upstream
+=======
 
 [*.{js, vue, ts}]
 indent_size = 2
 indent_style = space
-
+>>>>>>> Stashed changes

.gitignore

@@ -1,5 +1,4 @@
 .composer/*
-composer
 composer.phar
 composer.lock
 docs/build/

CHANGELOG.md

@@ -11,29 +11,15 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-* [person][export] Fixed: rename the alias for `accompanying_period` to `acp` in filter associated with person
-* [activity][export] Feature: improve label for aliases in "Filter by activity type"
-* [activity][export] DX/Feature: use of an `ActivityTypeRepositoryInterface` instead of the old-style EntityRepository
-* [person][export] Fixed: some inconsistency with date filter on accompanying courses
-* [person][export] Fixed: use left join for related entities in accompanying course aggregators
-
-## Test releases
-
-### 2.0.0-beta2
-
-* [workflow]: Fixed: the notification is sent when the user is added to the first step.
-* [budget] Feature: allow to desactivate some charges and resources, adding an `active` key in the configuration
-* [person] Feature: on Evaluation, allow to configure an URL from the admin
-
-### 2022-06
-
 * [workflow]: added pagination to workflow list page
 * [homepage_widget]: null error on tasks widget fixed
 * [person-thirdparty]: fix quick-add of names that consist of multiple parts (eg. De Vlieger) within onthefly modal person/thirdparty
 * [search]: Order of birthdate fields changed in advanced search to avoid confusion.
 * [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
+* [filiation]: Allow the deletion of a relationship in filiations (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/608)
 * [household]: Reposition and cut button for enfant hors menage have been deleted (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/620)
-* [admin]: Add crud for composition type in admin (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/611)
+
+## Test releases
 
 ### 2022-05-30
 

composer.json

@@ -19,12 +19,10 @@
         "graylog2/gelf-php": "^1.5",
         "knplabs/knp-menu-bundle": "^3.0",
         "knplabs/knp-time-bundle": "^1.12",
-        "knpuniversity/oauth2-client-bundle": "^2.10",
         "league/csv": "^9.7.1",
         "nyholm/psr7": "^1.4",
         "ocramius/package-versions": "^1.10 || ^2",
         "odolbeau/phone-number-bundle": "^3.6",
-        "ovh/ovh": "^3.0",
         "phpoffice/phpspreadsheet": "^1.16",
         "ramsey/uuid-doctrine": "^1.7",
         "sensio/framework-extra-bundle": "^5.5",
@@ -38,7 +36,6 @@
         "symfony/http-foundation": "^4.4",
         "symfony/intl": "^4.4",
         "symfony/mailer": "^5.4",
-        "symfony/messenger": "^5.4",
         "symfony/mime": "^5.4",
         "symfony/monolog-bundle": "^3.5",
         "symfony/security-bundle": "^4.4",
@@ -52,7 +49,6 @@
         "symfony/webpack-encore-bundle": "^1.11",
         "symfony/workflow": "^4.4",
         "symfony/yaml": "^4.4",
-        "thenetworg/oauth2-azure": "^2.0",
         "twig/extra-bundle": "^3.0",
         "twig/intl-extra": "^3.0",
         "twig/markdown-extra": "^3.3",

docs/source/development/exports.rst

@@ -10,10 +10,10 @@
 Exports
 *******
 
-Export is an important issue within the Chill software : users should be able to :
+Export is an important issue for the Chill software : users should be able to :
 
 - compute statistics about their activity ;
-- list "things" which are a part of their activities.
+- list "things" which make part of their activities.
 
 The `main bundle`_ provides a powerful framework to build custom queries with re-usable parts across differents bundles.
 
@@ -34,31 +34,31 @@ Some vocabulary: 3 "Export elements"
 
 Four terms are used for this framework : 
 
-Exports
-   provide some basic operation on the data. Two kinds of exports are available :
+exports
+   provides some basic operation on the date. Two kind of exports are available : 
 
    - computed data : it may be "the number of people", "the number of activities", "the duration of activities", ...
-   - list data : it may be "the list of people", "the list of activities", ...
+   - list data : it may be "the list of people", "the list of activity", ...
 
-Filters
-   The filters create a filter on the data: it removes some information the user doesn't want to introduce in the computation done by the export.
+filters
+   The filters make a filter on the date: it removes some information the user doesn't want to introduce in the computation done by export. In other word, filters make a filter...
 
-   Example of a filter: "people under 18 years olds", "activities between the 1st of June and the 31st December", ...
+   Example of filter: "people under 18 years olds", "activities between the 1st of June and the 31st December", ...
 
-Aggregators
+aggregators
    The aggregator aggregates the data into some group (some software use the term 'bucket'). 
 
-   Example of an aggregator : "group people by gender", "group people by nationality", "group activity by type", ...
+   Example of aggregator : "group people by gender", "group people by nationality", "group activity by type", ...
 
-Formatters
+formatters
    The formatters format the data into a :class:`Symfony\Component\HttpFoundation\Response`, which  will be returned "as is" by the controller to the web client. 
 
-   Example of a formatter: "format data as CSV", "format data as an ods spreadsheet", ...
+   Example of formatter: "format data as CSV", "format data as ods spreadsheet", ...
 
 Anatomy of an export
 ---------------------
 
-An export can be thought of as a sentence where each part of this sentence refers to one or multiple export elements. Examples :
+An export may be explained as a sentence, where each part of this sentence refers to one or multiple exports element. Examples : 
 
 **Example 1**: Count the number of people having at least one activity in the last 12 month, and group them by nationality and gender, and format them in a CSV spreadsheet.
 
@@ -72,8 +72,8 @@ Here :
 
 Note that :
 
-- Aggregators, filters, exports and formatters are cross-bundle. Here the bundle *activity* provides a filter which is applied on an export provided by the person bundle ;
-- Multiple aggregator or filter for one export may exist. Currently, only one export is allowed.
+- aggregators, filters, exports and aggregators are cross-bundle. Here the bundle *activity* provides a filter which apply on an export provided by the person bundle ;
+- there may exists multiple aggregator or filter for one export. Currently, only one export is allowed.
 
 The result might be : 
 
@@ -89,7 +89,7 @@ The result might be :
 | France                | Female         | 150                       |
 +-----------------------+----------------+---------------------------+
 
-**Example 2**: Count the average duration of an activity with type "meeting", which occurs between the 1st of June and the 31st of December, group them by week, and format the data in an OpenDocument spreadsheet.
+**Example 2**: Count the average duration of an activity with type "meeting", which occurs between the 1st of June and the 31st of December, group them by week, and format the data in a OpenDocument spreadsheet.
 
 Here : 
 
@@ -116,13 +116,13 @@ The result might be :
 Authorization and exports
 -------------------------
 
-Exports, filters and aggregators should not show data the user is not allowed to see within the application.
+Exports, filters and aggregators should not make see data the user is not allowed to see.
 
 In other words, developers are required to take care of user authorization for each export.
 
-There should be a specific role that grants permission to users who are allowed to build exports. For more simplicity, this role should apply on a center, and should not require special circles.
+It should exists a special role that should be granted to users which are allowed to build exports. For more simplicity, this role should apply on center, and should not requires special circles.
 
-How does the magic work ?
+How does the magic works ?
 ===========================
 
 To build an export, we rely on the capacity of the database to execute queries with aggregate (i.e. GROUP BY) and filter (i.e. WHERE) instructions.
@@ -133,13 +133,13 @@ An export is an SQL query which is initiated by an export, and modified by aggre
 
    **Example**: Count the number of people having at least one activity in the last 12 month, and group them by nationality and gender
 
-   1. The report initiates the query
+   1. The report initiate the query 
 
    .. code-block:: SQL
 
       SELECT count(people.*) FROM people
 
-   2. The filter adds a where and join clause :
+   2. The filter add a where and join clause : 
 
    .. code-block:: SQL
 
@@ -147,7 +147,7 @@ An export is an SQL query which is initiated by an export, and modified by aggre
          RIGHT JOIN activity 
          WHERE activity.date IS BETWEEN now AND 6 month ago
 
-   3. The aggregator "nationality" adds a GROUP BY clause and a column in the SELECT statement:
+   3. The aggregator "nationality" add a GROUP BY clause and a column in the SELECT statement: 
 
    .. code-block:: sql
 
@@ -156,7 +156,7 @@ An export is an SQL query which is initiated by an export, and modified by aggre
          WHERE activity.date IS BETWEEN now AND 6 month ago 
          GROUP BY nationality
 
-   4. The aggregator "gender" does the same job as the nationality aggregator : it adds a GROUP BY clause and a column in the SELECT statement :
+   4. The aggregator "gender" do the same job as the nationality aggregator : it adds a GROUP BY clause and a column in the SELECT statement : 
 
    .. code-block:: sql
 
@@ -165,28 +165,28 @@ An export is an SQL query which is initiated by an export, and modified by aggre
          WHERE activity.date IS BETWEEN now AND 6 month ago 
          GROUP BY nationality, gender
 
-Each filter, aggregator and filter may collect parameters from the user through a form. This form is appended to the export form. Here is an example.
+Each filter, aggregator and filter may collect parameters from the user by providing a form. This form is appended to the export form. Here is an example.
 
 .. figure:: /_static/screenshots/development/export_form-fullpage.png
 
-   The screenshot shows the export form for ``CountPeople`` (Nombre de personnes). The filter by date of birth is checked (*Filtrer par date de naissance de la personne*), which triggers a subform, which is provided by the :class:`Chill\PersonBundle\Export\Filter\BirthdateFilter`. The other unchecked filter does not show the subform.
+   The screenshot show the export form for ``CountPeople`` (Nombre de personnes). The filter by date of birth is checked (*Filtrer par date de naissance de la personne*), which allow to show a subform, which is provided by the :class:`Chill\PersonBundle\Export\Filter\BirthdateFilter`. The other filter, which are unchecked, does not show the subform.
 
-   Two aggregators are also checked : by Country of birth (*Aggréger les personnes par pays de naissance*, the corresponding class is :class:`Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator`, which also triggers a subform. The aggregator by gender (*Aggréger les personnes par genre*) is also checked, but there is no corresponding subform.
+   Two aggregators are also checked : by Country of birth (*Aggréger les personnes par pays de naissance*, corresponding class is :class:`Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator`, which also open a subform. The aggregator by gender (*Aggréger les personnes par genre*) is also checked, but there is no corresponding subform.
 
 The Export Manager
 ------------------
 
-The Export manager (:class:`Chill\MainBundle\Export\ExportManager` is the central class which registers all exports, aggregators, filters and formatters.
+The Export manager (:class:`Chill\MainBundle\Export\ExportManager` is the central class which register all exports, aggregators, filters and formatters.
 
-The export manager is also responsible for orchestrating the whole export process, producing a :class:`Symfony\FrameworkBundle\HttpFoundation\Request` for each export request.
+The export manager is also responsible for orchestrating the whole export process, producing a :class:`Symfony\FrameworkBundle\HttpFoundation\Request` to each export request.
 
 
 The export form step
 --------------------
 
-The form step allows you to build a form, combining different parts of the module.
+The form step allow to build a form, aggregating different parts of the module.
 
-The building of forms is split into different subforms, where each one is responsible for rendering their part of the form (aggregators, filters, and export).
+The building of forms is separated between different subform, which are responsible for rendering their part of the form (aggregators, filters, and export). 
 
 .. figure:: /_static/puml/exports/form_steps.png
    :scale: 40%
@@ -194,12 +194,12 @@ The building of forms is split into different subforms, where each one is respon
 The formatter form step
 -----------------------
 
-The formatter form is processed *after* the user filled the export form. It is built the same way, but receives the data entered by the user on the previous step as parameters (i.e. export form). It may then adapt it accordingly (example: show a list of columns selected in aggregators).
+The formatter form is processed *after* the user filled the export form. It is built the same way, but receive in parameters the data entered by the user on the previous step (i.e. export form). It may then adapt it accordingly (example: show a list of columns selected in aggregators).
 
 Processing the export
 ---------------------
 
-The export process can be explained by this schema :
+The export process may be explained by this schema :
 
 .. figure:: /_static/puml/exports/processing_export.png
    :scale: 40%
@@ -219,20 +219,20 @@ This is an example of the ``CountPerson`` export :
    :language: php
    :linenos:
 
-* **Line 36**: the ``getType`` function returns a string. This string will be used to find the aggregtors and filters which will apply to this export.
-* **Line 41**: a simple description to help users understand what your export does.
+* **Line 36**: the ``getType`` function return a string. This string will be used to find the aggregtors and filters which will apply to this export.
+* **Line 41**: a simple description to help user to understand what your export does.
 * **Line 46**: The title of the export. A summary of what your export does.
-* **Line 51**: The list of roles required to execute this export.
+* **Line 51**: The list of roles requires to execute this export.
 * **Line 56**: We initiate the query here...
-* **Line 59**: We have to filter the query with centers the users checked in the form. We process the $acl variable to get all ``Center`` objects in one array
-* **Line 63**: We create the query with a query builder.
-* **Line 74**: We return the result, but make sure to hydrate the results as an array.
-* **Line 103**: return the list of formatter types which are allowed to be applied on this filter
+* **Line 59**: We have to filter the query with centers the users checked in the form. We process the $acl variable to get all ``Center`` object in one array
+* **Line 63**: We create the query, with a query builder.
+* **Line 74**: We simply returns the result, but take care of hydrating the results as an array.
+* **Line 103**: return the list of formatters types which are allowed to apply on this filter
 
 Filters
 -------
 
-This is an example of the *filter by birthdate*. This filter asks some information through a form (`buildForm` is not empty), and this form must be validated. To perform this validation, we implement a new Interface: :class:`Chill\MainBundle\Export\ExportElementValidatedInterface`:
+This is an example of the *filter by birthdate*. This filter ask some information in a form (`buildForm` is not empty), and this form must be validated. To performs this validations, we implement a new Interface: :class:`Chill\MainBundle\Export\ExportElementValidatedInterface`:
 
 .. literalinclude:: /_static/code/exports/BirthdateFilter.php
    :language: php

docs/source/installation/index.rst

@@ -14,13 +14,6 @@
 Installation & Usage
 ####################
 
-.. toctree::
-   :maxdepth: 2
-
-   prod.rst
-   prod-calendar-sms-sending.rst
-   msgraph-configure.rst
-
 
 Requirements
 ************
@@ -45,36 +38,13 @@ Clone or download the chill-app project and `cd` into the main directory.
 
 As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.
 
-2. Prepare composer download of sources
-=======================================
+2. Prepare your variables
+=========================
 
-As you are running in dev, you must configure an auth token for getting the source code. 
+Have a look at the variable in ``.env.dist`` and in ``app/config/parameters.yml.dist`` and check if you need to adapt them. If they do not adapt with your need, or if some are missing: 
 
-.. warning
-
-   If you skip this part, the code will be downloaded from dist instead of source (with git repository). You will probably replace the source manually, but the next time you will run ```composer update```, your repository will be replaced and you might loose something.
-
-1. Create a personal access token from https://gitlab.com/-/profile/personal_access_tokens, with the `read_api` scope.
-2. add a file called ```.composer/auth.json```:
-
-   .. code-block:: json
-
-      {
-        "gitlab-token": {
-            "gitlab.com": "glXXX-XXXXXXXXXXXXXXXXXXXX"
-        }
-      }
-
-2. Prepare your variables and environment
-=========================================
-
-Copy ```docker-compose.override.dev.yml``` into ```docker-compose.override.yml``` 
-
-.. code-block:: bash
-
-   cp docker-compose.override.dev.template.yml docker-compose.override.yml
-
-Configure your environment variables, by creating a .env.local file and override the desired variables.
+1. copy the file as ``.env``: ``cp .env.dist .env``
+2. you may replace some variables inside ``.env``
 
 **Note**: If you intend to use the bundle ``Chill-Doc-Store``, you will need to configure and install an openstack object storage container with temporary url middleware. You will have to configure `secret keys <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html#secret-keys>`_.
 
@@ -134,29 +104,6 @@ The password is always ``password``.
 
 Now, read `Operations` below.
 
-Prepare for development
-***********************
-
-Add a Gitlab token to ensure that you get always the source code:
-
-1. generate a gitlab token there: https://gitlab.com/oauth/token
-2. run this command (in php container, at the app's root): :code:`composer config gitlab-token.gitlab.com <your token>`
-
-The auth token should appears now in the directory :code:`.composer`:
-
-.. code-block: bash
-
-   $ cat .composer/auth.json
-   {
-       "gitlab-token": {
-           "gitlab.com": "<your token>"
-       }
-   }
-
-
-See also "how to switch branch and get new dependencies".
-
-
 Operations
 **********
 
@@ -264,25 +211,6 @@ How to run webpack interactively
 
 Executing :code:`bash docker-node.sh` will open a terminal in a node container, with volumes mounted.
 
-How to switch the branch for chill-bundles, and get new dependencies
-====================================================================
-
-During development, you will switch to new branches for chill-bundles. As long as the dependencies are equals, this does not cause any problem. But sometimes, a new branch introduces a new dependency, and you must download it.
-
-In order to do that without pain, use those steps:
-
-0. Ensuire you have a token, set
-1. at the app's root, update the `composer.json` to your current branch:
-
-.. code-block:: json
-
-   {
-      "require": {
-          "chill-bundles": "dev-<my-branch>@dev"
-   }
-
-2. mount into the php container, and run `composer update`
-
 Build the documentation API
 ===========================
 

docs/source/installation/msgraph-configure.rst

@@ -1,320 +0,0 @@
-
-Configure Chill for calendar sync and SSO with Microsoft Graph (Outlook)
-========================================================================
-
-Chill offers the possibility to:
-
-* authenticate users using Microsoft Graph, with relatively small adaptations;
-* synchronize calendar in both ways (`see the user manual for a large description of the feature <https://gitea.champs-libres.be/Chill-project/manuals>`_).
-
-Both can be configured separately (synchronising calendars without SSO, or SSO without calendar). When calendar sync is configured without SSL, the user's email address is the key to associate Chill's users with Microsoft's ones.
-
-Configure SSO
--------------
-
-On Azure side
-*************
-
-Configure an app with the Azure interface, and give it the name of your choice.
-
-Grab the tenant's ID for your app, which is visible on the main tab "Vue d'ensemble":
-
-.. figure:: ./saml_login_id_general.png
-
-This the variable which will be named :code:`SAML_IDP_APP_UUID`.
-
-Go to the "Single sign-on" ("Authentication unique") section. Choose "SAML" as protocol, and fill those values:
-
-.. figure:: ./saml_login_1.png
-
-1. The :code:`entityId` seems to be arbitrary. This will be your variable :code:`SAML_ENTITY_ID`;
-2. The url response must be your Chill's URL appended by :code:`/saml/acs`
-3. The only used attributes is :code:`emailaddress`, which must match the user's email one.
-
-.. figure:: ./saml_login_2.png
-
-You must download the certificate, as base64. The format for the download is :code:`cer`: you will remove the first and last line (the ones with :code:`-----BEGIN CERTIFICATE-----` and :code:`-----END CERTIFICATE-----`), and remove all the return line. The final result should be something as :code:`MIIAbcdef...XyZA=`.
-
-This certificat will be your :code:`SAML_IDP_X509_CERT` variable.
-
-The url login will be filled automatically with your tenant id.
-
-Do not forget to provider user's accesses to your app, using the "Utilisateurs et groupes" tab:
-
-.. figure:: ./saml_login_appro.png
-
-
-You must know have gathered all the required variables for SSO:
-
-.. code-block:: 
-
-   SAML_BASE_URL=https://test.chill.be # must be
-   SAML_ENTITY_ID=https://test.chill.be # must match the one entered
-   SAML_IDP_APP_UUID=42XXXXXX-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-   SAML_IDP_X509_CERT: MIIC...E8u3bk # truncated
-
-Configure chill app
-*******************
-
-* add the bundle :code:`hslavich/oneloginsaml-bundle`
-* add the configuration file (see example above)
-* configure the security part (see example above)
-* add a user SAML factory into your src, and register it
-
-
-.. code-block:: yaml
-
-   # config/packages/hslavich_onelogin.yaml
-
-   parameters:
-     saml_base_url: '%env(resolve:SAML_BASE_URL)%'
-     saml_entity_id: '%env(resolve:SAML_ENTITY_ID)%'
-     saml_idp_x509cert: '%env(resolve:SAML_IDP_X509_CERT)%'
-     saml_idp_app_uuid: '%env(resolve:SAML_IDP_APP_UUID)%'
-
-
-   hslavich_onelogin_saml:
-     # Basic settings
-     idp:
-       entityId: 'https://sts.windows.net/%saml_idp_app_uuid%/'
-       singleSignOnService:
-         url: 'https://login.microsoftonline.com/%saml_idp_app_uuid%/saml2'
-         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
-       singleLogoutService:
-         url: 'https://login.microsoftonline.com/%saml_idp_app_uuid%/saml2'
-         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
-       x509cert: '%saml_idp_x509cert%'
-     sp:
-       entityId: '%saml_entity_id%'
-       assertionConsumerService:
-         url: '%saml_base_url%/saml/acs'
-         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST'
-       singleLogoutService:
-         url: '%saml_base_url%/saml/'
-         binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect'
-       privateKey: ''
-     # Optional settings.
-     baseurl: '%saml_base_url%/saml'
-     strict: true
-     debug: true
-     security:
-       nameIdEncrypted:       false
-       authnRequestsSigned:   false
-       logoutRequestSigned:   false
-       logoutResponseSigned:  false
-       wantMessagesSigned:    false
-       wantAssertionsSigned:  false
-       wantNameIdEncrypted:   false
-       requestedAuthnContext: true
-       signMetadata: false
-       wantXMLValidation: true
-       signatureAlgorithm: 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256'
-       digestAlgorithm: 'http://www.w3.org/2001/04/xmlenc#sha256'
-     contactPerson:
-       technical:
-         givenName: 'Tech User'
-         emailAddress: 'techuser@example.com'
-       support:
-         givenName: 'Support User'
-         emailAddress: 'supportuser@example.com'
-     organization:
-       en:
-         name: 'Example'
-         displayname: 'Example'
-         url: 'http://example.com'
-
-
-.. code-block:: yaml
-
-   # config/security.yaml
-   # merge this with other existing configurations
-
-   security:
-
-
-       providers:
-           saml_provider:
-               # Loads user from user repository
-               entity:
-                   class: Chill\MainBundle\Entity\User
-                   property: username
-
-       firewalls:
-
-
-           default:
-               # saml part:
-               saml:
-                   username_attribute: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress
-                   # weird behaviour in dev environment... configuration seems different
-                   # username_attribute: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name
-                   # Use the attribute's friendlyName instead of the name
-                   use_attribute_friendly_name: false
-                   user_factory: user_from_saml_factory
-                   persist_user: true
-                   check_path: saml_acs
-                   login_path: saml_login
-               logout:
-                   path: /saml/logout
-
-
-.. code-block:: php
-
-   // src/Security/SamlFactory.php
-
-   namespace App\Security;
-
-   use Chill\MainBundle\Entity\User;
-   use Hslavich\OneloginSamlBundle\Security\Authentication\Token\SamlTokenInterface;
-   use Hslavich\OneloginSamlBundle\Security\User\SamlUserFactoryInterface;
-
-   class UserSamlFactory implements SamlUserFactoryInterface
-   {
-       public function createUser(SamlTokenInterface $token)
-       {
-           $attributes = $token->getAttributes();
-           $user = new User();
-           $user->setUsername($attributes['http://schemas.microsoft.com/identity/claims/displayname'][0]);
-           $user->setLabel($attributes['http://schemas.microsoft.com/identity/claims/displayname'][0]);
-           $user->setPassword('');
-           $user->setEmail($attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'][0]);
-           $user->setAttributes($attributes);
-
-           return $user;
-       }
-   }
-
-
-
-Configure sync
---------------
-
-The sync processe might be configured in the same app, or into a different app.
-
-The synchronization processes use Oauth2.0 for authentication and authorization.
-
-.. note::
-
-   Two flows are in use:
-
-   * we authenticate "on behalf of a user", to allow users to see their own calendar or other user's calendar into the web interface. 
-
-     Typically, when the page is loaded, Chill first check that an authorization token exists. If not, the user is redirected to Microsoft Azure for authentification and a new token is grabbed (most of the times, this is transparent for users). 
-
-   * Chill also acts "as a machine", to synchronize calendars with a daemon background.
-
-One can access the configuration using this screen (it is quite well hidden into the multiple of tabs):
-
-.. figure:: ./oauth_app_registration.png
-
-   You can find the oauth configuration on the "Securité > Autorisations" tab, and click on "application registration" (not translated).
-
-Add a redirection URI for you authentification:
-
-.. figure:: ./oauth_api_authentification.png
-
-   The URI must be "your chill public url" with :code:`/connect/azure/check` at the end.
-
-Allow some authorizations for your app:
-
-.. figure:: ./oauth_api_autorisees.png
-
-Take care of the separation between autorization "on behalf of a user" (déléguée), or "for a machine" (application).
-
-Some explanation:
-
-* Users must be allowed to read their user profile (:code:`User.Read`), and the profile of other users (:code:`User.ReadBasicAll`);
-* They must be allowed to read their calendar (:code:`Calendars.Read`), and the calendars shared with them (:code:`Calendars.Read.Shared`);
-
-The sync daemon must have write access:
-
-* the daemon must be allowed to read all users and their profile, to establish a link between them and the Chill's users: (:code:`Users.Read.All`);
-* it must also be allowed to read and write into the calendars (:code:`Calendars.ReadWrite.All`)
-* for sending invitation to other users, the permission (:code:`Mail.Send`) must be granted.
-
-At this step, you might choose to accept those permissions for all users, or let them do it by yourself.
-
-Grab your client id:
-
-.. figure:: ./oauth_api_client_id.png
-
-This will be your :code:`OAUTH_AZURE_CLIENT_ID` variable.
-
-
-Generate a secret:
-
-.. figure:: ./oauth_api_secret.png
-
-This will be your :code:`OAUTH_AZURE_CLIENT_SECRET` variable.
-
-And get you azure's tenant id, which is the same as the :code:`SAML_IDP_APP_UUID` (see above).
-
-Your variables will be:
-
-.. code-block::
-
-   OAUTH_AZURE_CLIENT_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-   OAUTH_AZURE_CLIENT_TENANT=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-   OAUTH_AZURE_CLIENT_SECRET: 3-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-Then, configure chill:
-
-Enable the calendar sync with microsoft azure:
-
-.. code-block:: yaml
-
-   # config/packages/chill_calendar.yaml
-
-   chill_calendar:
-       remote_calendars_sync:
-           microsoft_graph:
-               enabled: true
-
-and configure the oauth client:
-
-.. code-block:: yaml
-
-   # config/packages/knp_oauth2_client.yaml
-   knpu_oauth2_client:
-       clients:
-           azure:
-               type: azure
-               client_id: '%env(OAUTH_AZURE_CLIENT_ID)%'
-               client_secret: '%env(OAUTH_AZURE_CLIENT_SECRET)%'
-               redirect_route: chill_calendar_remote_connect_azure_check
-               redirect_params: { }
-               tenant: '%env(OAUTH_AZURE_CLIENT_TENANT)%'
-               url_api: 'https://graph.microsoft.com/'
-               default_end_point_version: '2.0'
-
-
-You can now process for the first api authorization on the application side, (unless you did it in the Azure interface), and get a first token, by using :
-
-:code:`bin/console chill:calendar:msgraph-grant-admin-consent`
-
-This will generate a url that you can use to grant your app for your tenant. The redirection may fails in the browser, but this is not relevant: if you get an authorization token in the CLI, the authentication works.
-
-Run the processes to synchronize
---------------------------------
-
-The calendar synchronization is processed using symfony messenger. It seems to be intersting to configure a queue (in the postgresql database it is the most simple way), and to run a worker for synchronization, at least in production.
-
-The association between chill's users and Microsoft's users is done by this cli command:
-
-.. code-block:: 
-
-   bin/console chill:calendar:msgraph-user-map-subscribe
-
-This command:
-
-* will associate the Microsoft's user metadata in our database;
-* and, most important, create a subscription to get notification when the user alter his calendar, to sync chill's event and ranges in sync.
-
-The subscription least at most 3 days. This command should be runned:
-
-* at least each time a user is added;
-* and, at least, every three days.
-
-In production, we advise to run it at least every day to get the sync working.
-
-

docs/source/installation/prod-calendar-sms-sending.rst

@@ -1,27 +0,0 @@
-
-Send short messages (SMS) with calendar bundle
-==============================================
-
-To activate the sending of messages, you should run this command on a regularly basis (using, for instance, a cronjob):
-
-.. code-block:: bash
-
-   bin/console chill:calendar:send-short-messages
-
-A transporter must be configured for the message to be effectively sent. 
-
-Configure OVH Transporter
--------------------------
-
-Currently, this is the only one transporter available.
-
-For configuring this, simply add this config variable in your environment:
-
-```env
-SHORT_MESSAGE_DSN=ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz
-```
-
-In order to generate the application key, secret, and consumerKey, refers to their `documentation <https://docs.ovh.com/gb/en/api/first-steps-with-ovh-api/>`_.
-
-Before to be able to send your first sms, you must enable your account, grab some credits, and configure a sender. The service_name is an internal configuration generated by OVH.
-

docs/source/installation/prod.rst

@@ -1,48 +0,0 @@
-.. Copyright (C)  2014-2019 Champs Libres Cooperative SCRLFS
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled "GNU
-Free Documentation License".
-
-Installation for production
-###########################
-
-An installation use these services, which are deployed using docker containers:
-
-* a php-fpm image, which run the Php and Symfony code for Chill;
-* a nginx image, which serves the assets, and usually proxy the php requests to the fpm image;
-* a redis server, which stores the cache, sessions (this is currently hardcoded in the php image), and some useful keys (like wopi locks);
-* a postgresql database. The use of postgresql is mandatory;
-* a relatorio service, which transform odt templates to full documents (replacing the placeholders);
-
-Some external services:
-
-* (required) an openstack object store, configured with `temporary url <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html>` configured (no openstack users is required). This is currently the only way to store documents from chill;
-* a mailer service (SMTP)
-* (optional) a service for verifying phone number. Currently, only Twilio is possible;
-* (optional) a service for sending Short Messages (SMS). Currently, only Ovh is possible;
-
-The `docker-compose.yaml` file of chill app is a basis for a production install. The environment variable in the ```.env``` and ```.env.prod``` should be overriden by environment variables, or ```.env.local``` files.
-
-This should be adapted to your needs:
-
-* The image for php and nginx apps are pre-compiled images, with the default configuration and bundle. If they do not fullfill your needs, you should compile your own images.
-
-   .. TODO:
-
-      As the time of writing (2022-07-03) those images are not published yet.
-
-* Think about how you will backup your database. Some adminsys find easier to store database outside of docker, which might be easier to administrate or replicate.
-
-Tweak symfony messenger
-=======================
-
-Calendar sync is processed using symfony messenger.
-
-You can tweak the configuration 
-
-Going further:
-
-* Configure the saml login and synchronisation with Outlook api

exports_alias_conventions.csv

@@ -1,63 +0,0 @@
-Entity,Join,Attribute,Alias
-AccompanyingPeriod::class,,,acp
-,AccompanyingPeriodWork::class,acp.works,acpw
-,AccompanyingPeriodParticipation::class,acp.participations,acppart
-,Location::class,acp.administrativeLocation,acploc
-,ClosingMotive::class,acp.closingMotive,acpmotive
-,UserJob::class,acp.job,acpjob
-,Origin::class,acp.origin,acporigin
-,Scope::class,acp.scopes,acpscope
-,SocialIssue::class,acp.socialIssues,acpsocialissue
-,User::class,acp.user,acpuser
-AccompanyingPeriodWork::class,,,acpw
-,AccompanyingPeriodWorkEvaluation::class,acpw.accompanyingPeriodWorkEvaluations,workeval
-,User::class,acpw.referrers,acpwuser
-,SocialAction::class,acpw.socialAction,acpwsocialaction
-,Goal::class,acpw.goals,goal
-,Result::class,acpw.results,result
-AccompanyingPeriodParticipation::class,,,acppart
-,Person::class,acppart.person,partperson
-AccompanyingPeriodWorkEvaluation::class,,,workeval
-,Evaluation::class,workeval.evaluation,eval
-Goal::class,,,goal
-,Result::class,goal.results,goalresult
-Person::class,,,person
-,Center::class,person.center,center
-,HouseholdMember::class,partperson.householdParticipations,householdmember
-,MaritalStatus::class,person.maritalStatus,personmarital
-,VendeePerson::class,,vp
-,VendeePersonMineur::class,,vpm
-ResidentialAddress::class,,,resaddr
-,ThirdParty::class,resaddr.hostThirdParty,tparty
-ThirdParty::class,,,tparty
-,ThirdPartyCategory::class,tparty.categories,tpartycat
-HouseholdMember::class,,,householdmember
-,Household::class,householdmember.household,household
-,Person::class,householdmember.person,memberperson
-,,memberperson.center,membercenter
-Household::class,,,household
-,HouseholdComposition::class,household.compositions,composition
-Activity::class,,,activity
-,Person::class,activity.person,actperson
-,AccompanyingPeriod::class,activity.accompanyingPeriod,acp
-,Person::class,activity_person_having_activity.person,person_person_having_activity
-,ActivityReason::class,activity_person_having_activity.reasons,reasons_person_having_activity
-,ActivityType::class,activity.activityType,acttype
-,Location::class,activity.location,actloc
-,SocialAction::class,activity.socialActions,actsocialaction
-,SocialIssue::class,activity.socialIssues,actsocialssue
-,ThirdParty::class,activity.thirdParties,acttparty
-,User::class,activity.user,actuser
-,User::class,activity.users,actusers
-,ActivityReason::class,activity.reasons,actreasons
-,Center::class,actperson.center,actcenter
-ActivityReason::class,,,actreasons
-,ActivityReasonCategory::class,actreason.category,actreasoncat
-Calendar::class,,,cal
-,CancelReason::class,cal.cancelReason,calcancel
-,Location::class,cal.location,calloc
-,User::class,cal.user,caluser
-VendeePerson::class,,,vp
-,SituationProfessionelle::class,vp.situationProfessionelle,vpprof
-,StatutLogement::class,vp.statutLogement,vplog
-,TempsDeTravail::class,vp.tempsDeTravail,vptt

exports_alias_conventions.md

@@ -1,71 +0,0 @@
-# Export conventions
-
-
-Add condition with distinct alias on each export join clauses (Indicators + Filters + Aggregators)
-
-These are alias conventions :
-
-| Entity                                  | Join                                    | Attribute                                  | Alias                             |
-|:----------------------------------------|:----------------------------------------|:-------------------------------------------|:----------------------------------|
-| AccompanyingPeriod::class               |                                         |                                            | acp                               |
-|                                         | AccompanyingPeriodWork::class           | acp.works                                  | acpw                              |
-|                                         | AccompanyingPeriodParticipation::class  | acp.participations                         | acppart                           |
-|                                         | Location::class                         | acp.administrativeLocation                 | acploc                            |
-|                                         | ClosingMotive::class                    | acp.closingMotive                          | acpmotive                         |
-|                                         | UserJob::class                          | acp.job                                    | acpjob                            |
-|                                         | Origin::class                           | acp.origin                                 | acporigin                         |
-|                                         | Scope::class                            | acp.scopes                                 | acpscope                          |
-|                                         | SocialIssue::class                      | acp.socialIssues                           | acpsocialissue                    |
-|                                         | User::class                             | acp.user                                   | acpuser                           |
-| AccompanyingPeriodWork::class           |                                         |                                            | acpw                              |
-|                                         | AccompanyingPeriodWorkEvaluation::class | acpw.accompanyingPeriodWorkEvaluations     | workeval                          |
-|                                         | User::class                             | acpw.referrers                             | acpwuser                          |
-|                                         | SocialAction::class                     | acpw.socialAction                          | acpwsocialaction                  |
-|                                         | Goal::class                             | acpw.goals                                 | goal                              |
-|                                         | Result::class                           | acpw.results                               | result                        |
-| AccompanyingPeriodParticipation::class  |                                         |                                            | acppart                           |
-|                                         | Person::class                           | acppart.person                             | partperson                        |
-| AccompanyingPeriodWorkEvaluation::class |                                         |                                            | workeval                          |
-|                                         | Evaluation::class                       | workeval.evaluation                        | eval                              |
-| Goal::class                             |                                         |                                            | goal                              |
-|                                         | Result::class                           | goal.results                               | goalresult                        |
-| Person::class                           |                                         |                                            | person                            |
-|                                         | Center::class                           | person.center                              | center                            |
-|                                         | HouseholdMember::class                  | partperson.householdParticipations         | householdmember                   |
-|                                         | MaritalStatus::class                    | person.maritalStatus                       | personmarital                     |
-|                                         | VendeePerson::class                     |                                            | vp                                |
-|                                         | VendeePersonMineur::class               |                                            | vpm                               |
-| ResidentialAddress::class               |                                         |                                            | resaddr                           |
-|                                         | ThirdParty::class                       | resaddr.hostThirdParty                     | tparty                            |
-| ThirdParty::class                       |                                         |                                            | tparty                            |
-|                                         | ThirdPartyCategory::class               | tparty.categories                          | tpartycat                         |
-| HouseholdMember::class                  |                                         |                                            | householdmember                   |
-|                                         | Household::class                        | householdmember.household                  | household                         |
-|                                         | Person::class                           | householdmember.person                     | memberperson                      |
-|                                         |                                         | memberperson.center                        | membercenter                      |
-| Household::class                        |                                         |                                            | household                         |
-|                                         | HouseholdComposition::class             | household.compositions                     | composition                       |
-| Activity::class                         |                                         |                                            | activity                          |
-|                                         | Person::class                           | activity.person                            | actperson                         |
-|                                         | AccompanyingPeriod::class               | activity.accompanyingPeriod                | acp                            |
-|                                         | Person::class                           | activity\_person\_having\_activity.person  | person\_person\_having\_activity  |
-|                                         | ActivityReason::class                   | activity\_person\_having\_activity.reasons | reasons\_person\_having\_activity |
-|                                         | ActivityType::class                     | activity.activityType                      | acttype                           |
-|                                         | Location::class                         | activity.location                          | actloc                            |
-|                                         | SocialAction::class                     | activity.socialActions                     | actsocialaction                   |
-|                                         | SocialIssue::class                      | activity.socialIssues                      | actsocialssue                     |
-|                                         | ThirdParty::class                       | activity.thirdParties                      | acttparty                         |
-|                                         | User::class                             | activity.user                              | actuser                           |
-|                                         | User::class                             | activity.users                             | actusers                          |
-|                                         | ActivityReason::class                   | activity.reasons                           | actreasons                        |
-|                                         | Center::class                           | actperson.center                           | actcenter                         |
-| ActivityReason::class                   |                                         |                                            | actreasons                        |
-|                                         | ActivityReasonCategory::class           | actreason.category                         | actreasoncat                      |
-| Calendar::class                         |                                         |                                            | cal                               |
-|                                         | CancelReason::class                     | cal.cancelReason                           | calcancel                         |
-|                                         | Location::class                         | cal.location                               | calloc                            |
-|                                         | User::class                             | cal.user                                   | caluser                           |
-| VendeePerson::class                     |                                         |                                            | vp                                |
-|                                         | SituationProfessionelle::class          | vp.situationProfessionelle                 | vpprof                            |
-|                                         | StatutLogement::class                   | vp.statutLogement                          | vplog                             |
-|                                         | TempsDeTravail::class                   | vp.tempsDeTravail                          | vptt                              |

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -17,11 +17,10 @@ use Chill\ActivityBundle\Form\ActivityType;
 use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Repository\ActivityTypeCategoryRepository;
-use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Repository\LocationRepository;
-use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
@@ -56,7 +55,7 @@ final class ActivityController extends AbstractController
 
     private ActivityTypeCategoryRepository $activityTypeCategoryRepository;
 
-    private ActivityTypeRepositoryInterface $activityTypeRepository;
+    private ActivityTypeRepository $activityTypeRepository;
 
     private CenterResolverManagerInterface $centerResolver;
 
@@ -74,11 +73,9 @@ final class ActivityController extends AbstractController
 
     private ThirdPartyRepository $thirdPartyRepository;
 
-    private UserRepositoryInterface $userRepository;
-
     public function __construct(
         ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
-        ActivityTypeRepositoryInterface $activityTypeRepository,
+        ActivityTypeRepository $activityTypeRepository,
         ActivityTypeCategoryRepository $activityTypeCategoryRepository,
         PersonRepository $personRepository,
         ThirdPartyRepository $thirdPartyRepository,
@@ -89,7 +86,6 @@ final class ActivityController extends AbstractController
         EventDispatcherInterface $eventDispatcher,
         LoggerInterface $logger,
         SerializerInterface $serializer,
-        UserRepositoryInterface $userRepository,
         CenterResolverManagerInterface $centerResolver
     ) {
         $this->activityACLAwareRepository = $activityACLAwareRepository;
@@ -104,7 +100,6 @@ final class ActivityController extends AbstractController
         $this->eventDispatcher = $eventDispatcher;
         $this->logger = $logger;
         $this->serializer = $serializer;
-        $this->userRepository = $userRepository;
         $this->centerResolver = $centerResolver;
     }
 
@@ -376,7 +371,7 @@ final class ActivityController extends AbstractController
         if ($request->query->has('activityData')) {
             $activityData = $request->query->get('activityData');
 
-            if (array_key_exists('durationTime', $activityData) && $activityType->getDurationTimeVisible() > 0) {
+            if (array_key_exists('durationTime', $activityData)) {
                 $durationTimeInMinutes = $activityData['durationTime'];
                 $hours = floor($durationTimeInMinutes / 60);
                 $minutes = $durationTimeInMinutes % 60;
@@ -395,36 +390,26 @@ final class ActivityController extends AbstractController
                 }
             }
 
-            if (array_key_exists('personsId', $activityData) && $activityType->getPersonsVisible() > 0) {
+            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) && $activityType->getThirdPartiesVisible() > 0) {
+            if (array_key_exists('professionalsId', $activityData)) {
                 foreach ($activityData['professionalsId'] as $professionalsId) {
                     $professional = $this->thirdPartyRepository->find($professionalsId);
                     $entity->addThirdParty($professional);
                 }
             }
 
-            if (array_key_exists('usersId', $activityData) && $activityType->getUsersVisible() > 0) {
-                foreach ($activityData['usersId'] as $userId) {
-                    $user = $this->userRepository->find($userId);
-
-                    if (null !== $user) {
-                        $entity->addUser($user);
-                    }
-                }
-            }
-
-            if (array_key_exists('location', $activityData) && $activityType->getLocationVisible() > 0) {
+            if (array_key_exists('location', $activityData)) {
                 $location = $this->locationRepository->find($activityData['location']);
                 $entity->setLocation($location);
             }
 
-            if (array_key_exists('comment', $activityData) && $activityType->getCommentVisible() > 0) {
+            if (array_key_exists('comment', $activityData)) {
                 $comment = new CommentEmbeddable();
                 $comment->setComment($activityData['comment']);
                 $comment->setUserId($this->getUser()->getid());

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -516,11 +516,6 @@ class ActivityType
         return $this->userVisible;
     }
 
-    public function hasCategory(): bool
-    {
-        return null !== $this->getCategory();
-    }
-
     /**
      * Is active
      * return true if the type is active.

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialActionAggregator.php

@@ -1,87 +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);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
-use Chill\PersonBundle\Templating\Entity\SocialActionRender;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class BySocialActionAggregator implements AggregatorInterface
-{
-    private SocialActionRender $actionRender;
-
-    private SocialActionRepository $actionRepository;
-
-    public function __construct(
-        SocialActionRender $actionRender,
-        SocialActionRepository $actionRepository
-    ) {
-        $this->actionRender = $actionRender;
-        $this->actionRepository = $actionRepository;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.socialActions', 'actsocialaction');
-        }
-
-        $qb->addSelect('actsocialaction.id AS socialaction_aggregator');
-        $qb->addGroupBy('socialaction_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value) {
-            if ('_header' === $value) {
-                return 'Social action';
-            }
-
-            if (null === $value) {
-                return '';
-            }
-
-            $sa = $this->actionRepository->find($value);
-
-            return $this->actionRender->renderString($sa, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['socialaction_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked socialaction';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/BySocialIssueAggregator.php

@@ -1,87 +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);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class BySocialIssueAggregator implements AggregatorInterface
-{
-    private SocialIssueRender $issueRender;
-
-    private SocialIssueRepository $issueRepository;
-
-    public function __construct(
-        SocialIssueRepository $issueRepository,
-        SocialIssueRender $issueRender
-    ) {
-        $this->issueRepository = $issueRepository;
-        $this->issueRender = $issueRender;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.socialIssues', 'actsocialissue');
-        }
-
-        $qb->addSelect('actsocialissue.id AS socialissue_aggregator');
-        $qb->addGroupBy('socialissue_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Social issues';
-            }
-
-            if (null === $value) {
-                return '';
-            }
-
-            $i = $this->issueRepository->find($value);
-
-            return $this->issueRender->renderString($i, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['socialissue_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked socialissue';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByThirdpartyAggregator.php

@@ -1,87 +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);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
-use Chill\ThirdPartyBundle\Templating\Entity\ThirdPartyRender;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class ByThirdpartyAggregator implements AggregatorInterface
-{
-    private ThirdPartyRender $thirdPartyRender;
-
-    private ThirdPartyRepository $thirdPartyRepository;
-
-    public function __construct(
-        ThirdPartyRepository $thirdPartyRepository,
-        ThirdPartyRender $thirdPartyRender
-    ) {
-        $this->thirdPartyRepository = $thirdPartyRepository;
-        $this->thirdPartyRender = $thirdPartyRender;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('acttparty', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.thirdParties', 'acttparty');
-        }
-
-        $qb->addSelect('acttparty.id AS thirdparty_aggregator');
-        $qb->addGroupBy('thirdparty_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Accepted thirdparty';
-            }
-
-            if (null === $value) {
-                return '';
-            }
-
-            $tp = $this->thirdPartyRepository->find($value);
-
-            return $this->thirdPartyRender->renderString($tp, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['thirdparty_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked thirdparties';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByUserAggregator.php

@@ -1,87 +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);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\UserRepository;
-use Chill\MainBundle\Templating\Entity\UserRender;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class ByUserAggregator implements AggregatorInterface
-{
-    private UserRender $userRender;
-
-    private UserRepository $userRepository;
-
-    public function __construct(
-        UserRepository $userRepository,
-        UserRender $userRender
-    ) {
-        $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.users', 'actusers');
-        }
-
-        $qb->addSelect('actusers.id AS users_aggregator');
-        $qb->addGroupBy('users_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Accepted users';
-            }
-
-            if (null === $value) {
-                return '';
-            }
-
-            $u = $this->userRepository->find($value);
-
-            return $this->userRender->renderString($u, []);
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['users_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by linked users';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php

@@ -1,123 +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);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use DateTime;
-use Doctrine\ORM\QueryBuilder;
-use RuntimeException;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class DateAggregator implements AggregatorInterface
-{
-    private const CHOICES = [
-        'by month' => 'month',
-        'by week' => 'week',
-        'by year' => 'year',
-    ];
-
-    private const DEFAULT_CHOICE = 'year';
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        TranslatorInterface $translator
-    ) {
-        $this->translator = $translator;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $order = null;
-
-        switch ($data['frequency']) {
-            case 'month':
-                $fmt = 'YYYY-MM';
-                break;
-
-            case 'week':
-                $fmt = 'YYYY-IW';
-                break;
-
-            case 'year':
-                $fmt = 'YYYY'; $order = 'DESC';
-                break; // order DESC does not works !
-
-            default:
-                throw new RuntimeException(sprintf("The frequency data '%s' is invalid.", $data['frequency']));
-        }
-
-        $qb->addSelect(sprintf("TO_CHAR(activity.date, '%s') AS date_aggregator", $fmt));
-        $qb->addGroupBy('date_aggregator');
-        $qb->addOrderBy('date_aggregator', $order);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('frequency', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return static function ($value) use ($data): string {
-            if ('_header' === $value) {
-                return 'by ' . $data['frequency'];
-            }
-
-            if (null === $value) {
-                return '';
-            }
-
-            switch ($data['frequency']) {
-                case 'month':
-
-                case 'week':
-                    //return $this->translator->trans('for week') .' '. $value ;
-
-                case 'year':
-                    //return $this->translator->trans('in year') .' '. $value ;
-
-                default:
-                    return $value;
-            }
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['date_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by date';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/LocationTypeAggregator.php

@@ -1,89 +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);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\LocationTypeRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class LocationTypeAggregator implements AggregatorInterface
-{
-    private LocationTypeRepository $locationTypeRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        LocationTypeRepository $locationTypeRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->locationTypeRepository = $locationTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actloc', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.location', 'actloc');
-        }
-
-        $qb->addSelect('IDENTITY(actloc.locationType) AS locationtype_aggregator');
-        $qb->addGroupBy('locationtype_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Accepted locationtype';
-            }
-
-            if (null === $value) {
-                return '';
-            }
-
-            $lt = $this->locationTypeRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $lt->getTitle()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['locationtype_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by locationtype';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/UserScopeAggregator.php

@@ -1,89 +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);
-
-namespace Chill\ActivityBundle\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Repository\ScopeRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class UserScopeAggregator implements AggregatorInterface
-{
-    private ScopeRepository $scopeRepository;
-
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(
-        ScopeRepository $scopeRepository,
-        TranslatableStringHelper $translatableStringHelper
-    ) {
-        $this->scopeRepository = $scopeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actuser', $qb->getAllAliases(), true)) {
-            $qb->leftJoin('activity.user', 'actuser');
-        }
-
-        $qb->addSelect('IDENTITY(actuser.mainScope) AS userscope_aggregator');
-        $qb->addGroupBy('userscope_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // no form
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'Scope';
-            }
-
-            if (null === $value) {
-                return '';
-            }
-
-            $s = $this->scopeRepository->find($value);
-
-            return $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['userscope_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Group activity by userscope';
-    }
-}

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

@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Aggregator\PersonAggregators;
+namespace Chill\ActivityBundle\Export\Aggregator;
 
-use Chill\ActivityBundle\Export\Declarations;
 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;
@@ -23,6 +23,7 @@ use Doctrine\ORM\QueryBuilder;
 use RuntimeException;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 use function array_key_exists;
@@ -46,19 +47,19 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole(): ?string
+    public function addRole()
     {
-        return null;
+        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
         // add select element
         if ('reasons' === $data['level']) {
-            $elem = 'actreasons.id';
+            $elem = 'reasons.id';
             $alias = 'activity_reasons_id';
         } elseif ('categories' === $data['level']) {
-            $elem = 'actreasoncat.id';
+            $elem = 'category.id';
             $alias = 'activity_categories_id';
         } else {
             throw new RuntimeException('The data provided are not recognized.');
@@ -67,15 +68,29 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         $qb->addSelect($elem . ' as ' . $alias);
 
         // make a jointure only if needed
-        if (!in_array( 'actreasons', $qb->getAllAliases(), true)) {
-            $qb->innerJoin('activity.reasons', 'actreasons');
+        $join = $qb->getDQLPart('join');
+
+        if (
+            (
+                array_key_exists('activity', $join)
+            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            )
+            || (!array_key_exists('activity', $join))
+        ) {
+            $qb->add(
+                'join',
+                [
+                    'activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons'),
+                ],
+                true
+            );
         }
 
         // join category if necessary
         if ('activity_categories_id' === $alias) {
             // add join only if needed
-            if (!in_array('actreasoncat', $qb->getAllAliases(), true)) {
-                $qb->join('actreasons.category', 'actreasoncat');
+            if (!$this->checkJoinAlreadyDefined($qb->getDQLPart('join')['activity'], 'category')) {
+                $qb->join('reasons.category', 'category');
             }
         }
 
@@ -89,9 +104,9 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
         }
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
-        return Declarations::ACTIVITY_PERSON;
+        return 'activity';
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -179,4 +194,23 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
                 ->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

@@ -11,50 +11,49 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator;
 
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+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 function in_array;
+use Symfony\Component\Security\Core\Role\Role;
 
 class ActivityTypeAggregator implements AggregatorInterface
 {
     public const KEY = 'activity_type_aggregator';
 
-    protected ActivityTypeRepositoryInterface $activityTypeRepository;
+    protected ActivityTypeRepository $activityTypeRepository;
 
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
-        ActivityTypeRepositoryInterface $activityTypeRepository,
+        ActivityTypeRepository $activityTypeRepository,
         TranslatableStringHelperInterface $translatableStringHelper
     ) {
         $this->activityTypeRepository = $activityTypeRepository;
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-    public function addRole(): ?string
+    public function addRole()
     {
-        return null;
+        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        if (!in_array('acttype', $qb->getAllAliases(), true)) {
-            $qb->join('activity.activityType', 'acttype');
-        }
+        // add select element
+        $qb->addSelect(sprintf('IDENTITY(activity.type) AS %s', self::KEY));
 
-        $qb->addSelect(sprintf('IDENTITY(activity.activityType) AS %s', self::KEY));
+        // add the "group by" part
         $qb->addGroupBy(self::KEY);
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
-        return Declarations::ACTIVITY;
+        return 'activity';
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -72,10 +71,6 @@ class ActivityTypeAggregator implements AggregatorInterface
                 return 'Activity type';
             }
 
-            if (null === $value) {
-                return '';
-            }
-
             $t = $this->activityTypeRepository->find($value);
 
             return $this->translatableStringHelper->localize($t->getName());
@@ -91,4 +86,23 @@ class ActivityTypeAggregator implements AggregatorInterface
     {
         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

@@ -11,33 +11,29 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Aggregator;
 
-use Chill\ActivityBundle\Export\Declarations;
+use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\AggregatorInterface;
 use Chill\MainBundle\Repository\UserRepository;
-use Chill\MainBundle\Templating\Entity\UserRender;
 use Closure;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 
 class ActivityUserAggregator implements AggregatorInterface
 {
     public const KEY = 'activity_user_id';
 
-    private UserRender $userRender;
-
     private UserRepository $userRepository;
 
     public function __construct(
-        UserRepository $userRepository,
-        UserRender $userRender
+        UserRepository $userRepository
     ) {
         $this->userRepository = $userRepository;
-        $this->userRender = $userRender;
     }
 
-    public function addRole(): ?string
+    public function addRole()
     {
-        return null;
+        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
@@ -51,7 +47,7 @@ class ActivityUserAggregator implements AggregatorInterface
 
     public function applyOn(): string
     {
-        return Declarations::ACTIVITY;
+        return 'activity';
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -61,18 +57,15 @@ class ActivityUserAggregator implements AggregatorInterface
 
     public function getLabels($key, $values, $data): Closure
     {
+        // preload users at once
+        $this->userRepository->findBy(['id' => $values]);
+
         return function ($value) {
             if ('_header' === $value) {
-                return 'Activity user';
+                return 'activity user';
             }
 
-            if (null === $value) {
-                return '';
-            }
-
-            $u = $this->userRepository->find($value);
-
-            return $this->userRender->renderString($u, []);
+            return $this->userRepository->find($value)->getUsername();
         };
     }
 

src/Bundle/ChillActivityBundle/Export/Declarations.php

@@ -1,24 +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);
-
-namespace Chill\ActivityBundle\Export;
-
-/**
- * This class declare constants used for the export framework.
- */
-abstract class Declarations
-{
-    public const ACTIVITY = 'activity';
-
-    public const ACTIVITY_ACP = 'activity_linked_to_acp';
-
-    public const ACTIVITY_PERSON = 'activity_linked_to_person';
-}

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

@@ -9,20 +9,18 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
+namespace Chill\ActivityBundle\Export\Export;
 
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 
-class CountActivity implements ExportInterface, GroupedExportInterface
+class CountActivity implements ExportInterface
 {
     protected ActivityRepository $activityRepository;
 
@@ -43,12 +41,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
 
     public function getDescription()
     {
-        return 'Count activities linked to a person by various parameters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
+        return 'Count activities by various parameters.';
     }
 
     public function getLabels($key, array $values, $data)
@@ -57,7 +50,7 @@ class CountActivity implements ExportInterface, GroupedExportInterface
             throw new LogicException("the key {$key} is not used by this export");
         }
 
-        return static fn ($value) => '_header' === $value ? 'Number of activities linked to a person' : $value;
+        return static fn ($value) => '_header' === $value ? 'Number of activities' : $value;
     }
 
     public function getQueryKeys($data)
@@ -72,25 +65,23 @@ class CountActivity implements ExportInterface, GroupedExportInterface
 
     public function getTitle()
     {
-        return 'Count activities linked to a person';
+        return 'Count activities';
     }
 
-    public function getType(): string
+    public function getType()
     {
-        return Declarations::ACTIVITY;
+        return 'activity';
     }
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
-        $qb = $this->activityRepository->createQueryBuilder('activity');
-
-        if (!in_array('person', $qb->getAllAliases(), true)) {
-            $qb->join('activity.person', 'person');
-        }
-
-        $qb->select('COUNT(activity.id) as export_count_activity');
+        $qb = $this
+            ->activityRepository
+            ->createQueryBuilder('activity')
+            ->select('COUNT(activity.id) as export_count_activity')
+            ->join('activity.person', 'person');
 
         $qb
             ->where($qb->expr()->in('person.center', ':centers'))
@@ -99,17 +90,13 @@ class CountActivity implements ExportInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole(): string
+    public function requiredRole()
     {
-        return ActivityStatsVoter::STATS;
+        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function supportsModifiers()
     {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_PERSON,
-            PersonDeclarations::PERSON_TYPE,
-        ];
+        return ['person', 'activity'];
     }
 }

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityDuration.php

@@ -1,109 +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);
-
-namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class AvgActivityDuration implements ExportInterface, GroupedExportInterface
-{
-    protected EntityRepository $repository;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(Activity::class);
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'Average activities linked to an accompanying period duration by various parameters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_avg_activity_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period duration' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_avg_activity_duration'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Average activity linked to an accompanying period duration';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('activity');
-
-        $qb
-            ->join('activity.accompanyingPeriod', 'acp')
-            ->select('AVG(activity.durationTime) as export_avg_activity_duration')
-            ->andWhere($qb->expr()->isNotNull('activity.durationTime'));
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return ActivityStatsVoter::STATS;
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_ACP,
-            PersonDeclarations::ACP_TYPE,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/AvgActivityVisitDuration.php

@@ -1,111 +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);
-
-namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class AvgActivityVisitDuration implements ExportInterface, GroupedExportInterface
-{
-    protected EntityRepository $repository;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(Activity::class);
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // TODO: Implement buildForm() method.
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'Average activities linked to an accompanying period visit duration by various parameters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_avg_activity_visit_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Average activities linked to an accompanying period visit duration' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_avg_activity_visit_duration'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Average activity linked to an accompanying period visit duration';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('activity');
-
-        $qb
-            ->join('activity.accompanyingPeriod', 'acp')
-            ->select('AVG(activity.travelTime) as export_avg_activity_visit_duration')
-            ->andWhere($qb->expr()->isNotNull('activity.travelTime'))
-            ;
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return ActivityStatsVoter::STATS;
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_ACP,
-            PersonDeclarations::ACP_TYPE,
-        ];
-    }
-}

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

@@ -1,111 +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);
-
-namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query;
-use LogicException;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class CountActivity implements ExportInterface, GroupedExportInterface
-{
-    protected EntityRepository $repository;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(Activity::class);
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'Count activities linked to an accompanying period by various parameters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-    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 linked to an accompanying period' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_count_activity'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Count activities linked to an accompanying period';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('activity');
-
-        if (!in_array('acp', $qb->getAllAliases(), true)) {
-            $qb->join('activity.accompanyingPeriod', 'acp');
-        }
-
-        $qb->select('COUNT(DISTINCT activity.id) as export_count_activity');
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return ActivityStatsVoter::STATS;
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_ACP,
-            PersonDeclarations::ACP_TYPE,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityDuration.php

@@ -1,112 +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);
-
-namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class SumActivityDuration implements ExportInterface, GroupedExportInterface
-{
-    protected EntityRepository $repository;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(Activity::class);
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // TODO: Implement buildForm() method.
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'Sum activities linked to an accompanying period duration by various parameters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_sum_activity_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period duration' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_sum_activity_duration'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Sum activity linked to an accompanying period duration';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('activity');
-
-        if (!in_array('acp', $qb->getAllAliases(), true)) {
-            $qb->join('activity.accompanyingPeriod', 'acp');
-        }
-
-        $qb->select('SUM(activity.durationTime) as export_sum_activity_duration')
-            ->andWhere($qb->expr()->isNotNull('activity.durationTime'));
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return ActivityStatsVoter::STATS;
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_ACP,
-            PersonDeclarations::ACP_TYPE,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Export/Export/LinkedToACP/SumActivityVisitDuration.php

@@ -1,112 +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);
-
-namespace Chill\ActivityBundle\Export\Export\LinkedToACP;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\Query;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class SumActivityVisitDuration implements ExportInterface, GroupedExportInterface
-{
-    protected EntityRepository $repository;
-
-    public function __construct(
-        EntityManagerInterface $em
-    ) {
-        $this->repository = $em->getRepository(Activity::class);
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        // TODO: Implement buildForm() method.
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'Sum activities linked to an accompanying period visit duration by various parameters.';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to an accompanying period';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_sum_activity_visit_duration' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
-        }
-
-        return static fn ($value) => '_header' === $value ? 'Sum activities linked to an accompanying period visit duration' : $value;
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_sum_activity_visit_duration'];
-    }
-
-    public function getResult($qb, $data)
-    {
-        return $qb->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle(): string
-    {
-        return 'Sum activity linked to an accompanying period visit duration';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ACTIVITY;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
-    {
-        $qb = $this->repository->createQueryBuilder('activity');
-
-        if (!in_array('acp', $qb->getAllAliases(), true)) {
-            $qb->join('activity.accompanyingPeriod', 'acp');
-        }
-
-        $qb->select('SUM(activity.travelTime) as export_sum_activity_visit_duration')
-            ->andWhere($qb->expr()->isNotNull('activity.travelTime'));
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return ActivityStatsVoter::STATS;
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_ACP,
-            PersonDeclarations::ACP_TYPE,
-        ];
-    }
-}

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

@@ -9,23 +9,21 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
+namespace Chill\ActivityBundle\Export\Export;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
 use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 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 Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -34,7 +32,7 @@ use function array_key_exists;
 use function count;
 use function in_array;
 
-class ListActivity implements ListInterface, GroupedExportInterface
+class ListActivity implements ListInterface
 {
     protected EntityManagerInterface $entityManager;
 
@@ -96,12 +94,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function getDescription()
     {
-        return 'List activities linked to a person description';
-    }
-
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
+        return 'List activities';
     }
 
     public function getLabels($key, array $values, $data)
@@ -187,12 +180,12 @@ class ListActivity implements ListInterface, GroupedExportInterface
 
     public function getTitle()
     {
-        return 'List activity linked to a person';
+        return 'List activities';
     }
 
-    public function getType(): string
+    public function getType()
     {
-        return Declarations::ACTIVITY;
+        return 'activity';
     }
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
@@ -211,8 +204,8 @@ class ListActivity implements ListInterface, GroupedExportInterface
         $qb
             ->from('ChillActivityBundle:Activity', 'activity')
             ->join('activity.person', 'person')
-            ->join('actperson.center', 'actcenter')
-            ->andWhere('actcenter IN (:authorized_centers)')
+            ->join('person.center', 'center')
+            ->andWhere('center IN (:authorized_centers)')
             ->setParameter('authorized_centers', $centers);
 
         foreach ($this->fields as $f) {
@@ -239,8 +232,8 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         break;
 
                     case 'user_username':
-                        $qb->join('activity.user', 'actuser');
-                        $qb->addSelect('actuser.username AS user_username');
+                        $qb->join('activity.user', 'user');
+                        $qb->addSelect('user.username AS user_username');
 
                         break;
 
@@ -274,17 +267,13 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return $qb;
     }
 
-    public function requiredRole(): string
+    public function requiredRole()
     {
-        return ActivityStatsVoter::LISTS;
+        return new Role(ActivityStatsVoter::LISTS);
     }
 
     public function supportsModifiers()
     {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_PERSON,
-            //PersonDeclarations::PERSON_TYPE,
-        ];
+        return ['activity', 'person'];
     }
 }

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

@@ -9,26 +9,23 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Export\LinkedToPerson;
+namespace Chill\ActivityBundle\Export\Export;
 
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter;
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Export\ExportInterface;
 use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\ORM\Query;
 use LogicException;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 
 /**
  * This export allow to compute stats on activity duration.
  *
  * The desired stat must be given in constructor.
  */
-class StatActivityDuration implements ExportInterface, GroupedExportInterface
+class StatActivityDuration implements ExportInterface
 {
     public const SUM = 'sum';
 
@@ -62,22 +59,17 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
     public function getDescription()
     {
         if (self::SUM === $this->action) {
-            return 'Sum activities linked to a person duration by various parameters.';
+            return 'Sum activities duration by various parameters.';
         }
     }
 
-    public function getGroup(): string
-    {
-        return 'Exports of activities linked to a person';
-    }
-
     public function getLabels($key, array $values, $data)
     {
         if ('export_stat_activity' !== $key) {
             throw new LogicException(sprintf('The key %s is not used by this export', $key));
         }
 
-        $header = self::SUM === $this->action ? 'Sum activities linked to a person duration' : false;
+        $header = self::SUM === $this->action ? 'Sum of activities duration' : false;
 
         return static fn (string $value) => '_header' === $value ? $header : $value;
     }
@@ -95,19 +87,19 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
     public function getTitle()
     {
         if (self::SUM === $this->action) {
-            return 'Sum activity linked to a person duration';
+            return 'Sum activity duration';
         }
     }
 
-    public function getType(): string
+    public function getType()
     {
-        return Declarations::ACTIVITY;
+        return 'activity';
     }
 
     public function initiateQuery(array $requiredModifiers, array $acl, array $data = [])
     {
         $centers = array_map(
-            static fn (array $el): Center => $el['center'],
+            static fn (array $el): string => $el['center'],
             $acl
         );
 
@@ -121,22 +113,18 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
 
         return $qb->select($select)
             ->join('activity.person', 'person')
-            ->join('actperson.center', 'actcenter')
-            ->where($qb->expr()->in('actcenter', ':centers'))
+            ->join('person.center', 'center')
+            ->where($qb->expr()->in('center', ':centers'))
             ->setParameter(':centers', $centers);
     }
 
-    public function requiredRole(): string
+    public function requiredRole()
     {
-        return ActivityStatsVoter::STATS;
+        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function supportsModifiers()
     {
-        return [
-            Declarations::ACTIVITY,
-            Declarations::ACTIVITY_PERSON,
-            //PersonDeclarations::PERSON_TYPE,
-        ];
+        return ['person', 'activity'];
     }
 }

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

@@ -1,95 +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);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\PersonBundle\Export\Declarations;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ActivityTypeFilter implements FilterInterface
-{
-    private ActivityTypeRepositoryInterface $activityTypeRepository;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(
-        ActivityTypeRepositoryInterface $activityTypeRepository,
-        TranslatableStringHelperInterface $translatableStringHelper
-    ) {
-        $this->activityTypeRepository = $activityTypeRepository;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('activity', $qb->getAllAliases(), true)) {
-            $qb->join(Activity::class, 'activity', Expr\Join::WITH, 'activity.accompanyingPeriod = acp');
-        }
-
-        $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
-
-        $qb->andWhere($clause);
-        $qb->setParameter('selected_activity_types', $data['types']);
-    }
-
-    public function applyOn()
-    {
-        return Declarations::ACP_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_activitytypes', EntityType::class, [
-            'class' => ActivityType::class,
-            'choices' => $this->activityTypeRepository->findAllActive(),
-            'choice_label' => function (ActivityType $aty) {
-                return
-                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
-                    .
-                    $this->translatableStringHelper->localize($aty->getName());
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $types = [];
-
-        foreach ($data['accepted_activitytypes'] as $aty) {
-            $types[] = $this->translatableStringHelper->localize($aty->getName());
-        }
-
-        return ['Filtered by activity types: only %activitytypes%', [
-            '%activitytypes%' => implode(', ', $types),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter accompanying course by activity type';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialActionFilter.php

@@ -1,92 +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);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Templating\Entity\SocialActionRender;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class BySocialActionFilter implements FilterInterface
-{
-    private SocialActionRender $actionRender;
-
-    public function __construct(SocialActionRender $actionRender)
-    {
-        $this->actionRender = $actionRender;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('actsocialaction', $qb->getAllAliases(), true)) {
-            $qb->join('activity.socialActions', 'actsocialaction');
-        }
-
-        $clause = $qb->expr()->in('actsocialaction.id', ':socialactions');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('socialactions', $data['accepted_socialactions']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_socialactions', EntityType::class, [
-            'class' => SocialAction::class,
-            'choice_label' => function (SocialAction $sa) {
-                return $this->actionRender->renderString($sa, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $actions = [];
-
-        foreach ($data['accepted_socialactions'] as $sa) {
-            $actions[] = $this->actionRender->renderString($sa, []);
-        }
-
-        return ['Filtered activity by linked socialaction: only %actions%', [
-            '%actions%' => implode(', ou ', $actions),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by linked socialaction';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/BySocialIssueFilter.php

@@ -1,92 +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);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class BySocialIssueFilter implements FilterInterface
-{
-    private SocialIssueRender $issueRender;
-
-    public function __construct(SocialIssueRender $issueRender)
-    {
-        $this->issueRender = $issueRender;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('actsocialissue', $qb->getAllAliases(), true)) {
-            $qb->join('activity.socialIssues', 'actsocialissue');
-        }
-
-        $clause = $qb->expr()->in('actsocialissue.id', ':socialissues');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('socialissues', $data['accepted_socialissues']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_socialissues', EntityType::class, [
-            'class' => SocialIssue::class,
-            'choice_label' => function (SocialIssue $si) {
-                return $this->issueRender->renderString($si, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $issues = [];
-
-        foreach ($data['accepted_socialissues'] as $si) {
-            $issues[] = $this->issueRender->renderString($si, []);
-        }
-
-        return ['Filtered activity by linked socialissue: only %issues%', [
-            '%issues%' => implode(', ou ', $issues),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by linked socialissue';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/ByUserFilter.php

@@ -1,92 +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);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\Entity\UserRender;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class ByUserFilter implements FilterInterface
-{
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        if (!in_array('actusers', $qb->getAllAliases(), true)) {
-            $qb->join('activity.users', 'actusers');
-        }
-
-        $clause = $qb->expr()->in('actusers.id', ':users');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('users', $data['accepted_users']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_users', EntityType::class, [
-            'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $users = [];
-
-        foreach ($data['accepted_users'] as $u) {
-            $users[] = $this->userRender->renderString($u, []);
-        }
-
-        return ['Filtered activity by linked users: only %users%', [
-            '%users%' => implode(', ou ', $users),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by linked users';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/EmergencyFilter.php

@@ -1,92 +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);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\FilterInterface;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class EmergencyFilter implements FilterInterface
-{
-    private const CHOICES = [
-        'activity is emergency' => true,
-        'activity is not emergency' => false,
-    ];
-
-    private const DEFAULT_CHOICE = false;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->eq('activity.emergency', ':emergency');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('emergency', $data['accepted_emergency']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_emergency', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        foreach (self::CHOICES as $k => $v) {
-            if ($v === $data['accepted_emergency']) {
-                $choice = $k;
-            }
-        }
-
-        return ['Filtered activity by emergency: only %emergency%', [
-            '%emergency%' => $this->translator->trans($choice),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by emergency';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/LocationTypeFilter.php

@@ -1,93 +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);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\LocationType;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class LocationTypeFilter implements FilterInterface
-{
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actloc', $qb->getAllAliases(), true)) {
-            $qb->join('activity.location', 'actloc');
-        }
-
-        $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('actloc.locationType', ':locationtype');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('locationtype', $data['accepted_locationtype']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_locationtype', EntityType::class, [
-            'class' => LocationType::class,
-            'choice_label' => function (LocationType $type) {
-                return $this->translatableStringHelper->localize($type->getTitle());
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $types = [];
-
-        foreach ($data['accepted_locationtype'] as $type) {
-            $types[] = $this->translatableStringHelper->localize(
-                $type->getTitle()
-            );
-        }
-
-        return ['Filtered activity by locationtype: only %types%', [
-            '%types%' => implode(', ou ', $types),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by locationtype';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/SentReceivedFilter.php

@@ -1,89 +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);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\FilterInterface;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class SentReceivedFilter implements FilterInterface
-{
-    private const CHOICES = [
-        'is sent' => Activity::SENTRECEIVED_SENT,
-        'is received' => Activity::SENTRECEIVED_RECEIVED,
-    ];
-
-    private const DEFAULT_CHOICE = Activity::SENTRECEIVED_SENT;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->eq('activity.sentReceived', ':sentreceived');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('sentreceived', $data['accepted_sentreceived']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_sentreceived', ChoiceType::class, [
-            'choices' => self::CHOICES,
-            'multiple' => false,
-            'expanded' => true,
-            'empty_data' => self::DEFAULT_CHOICE,
-            'data' => self::DEFAULT_CHOICE,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $sentreceived = array_flip(self::CHOICES)[$data['accepted_sentreceived']];
-
-        return ['Filtered activity by sentreceived: only %sentreceived%', [
-            '%sentreceived%' => $this->translator->trans($sentreceived),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by sentreceived';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserFilter.php

@@ -1,88 +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);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\Entity\UserRender;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class UserFilter implements FilterInterface
-{
-    private UserRender $userRender;
-
-    public function __construct(UserRender $userRender)
-    {
-        $this->userRender = $userRender;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->in('activity.user', ':users');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('users', $data['accepted_users']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_users', EntityType::class, [
-            'class' => User::class,
-            'choice_label' => function (User $u) {
-                return $this->userRender->renderString($u, []);
-            },
-            'multiple' => true,
-            'expanded' => true,
-            'label' => 'Creators',
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $users = [];
-
-        foreach ($data['accepted_users'] as $u) {
-            $users[] = $this->userRender->renderString($u, []);
-        }
-
-        return ['Filtered activity by user: only %users%', [
-            '%users%' => implode(', ou ', $users),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by user';
-    }
-}

src/Bundle/ChillActivityBundle/Export/Filter/ACPFilters/UserScopeFilter.php

@@ -1,96 +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);
-
-namespace Chill\ActivityBundle\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\Query\Expr\Andx;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\FormBuilderInterface;
-use function in_array;
-
-class UserScopeFilter implements FilterInterface
-{
-    private TranslatableStringHelper $translatableStringHelper;
-
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
-    {
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data)
-    {
-        if (!in_array('actuser', $qb->getAllAliases(), true)) {
-            $qb->join('activity.user', 'actuser');
-        }
-
-        $where = $qb->getDQLPart('where');
-
-        $clause = $qb->expr()->in('actuser.mainScope', ':userscope');
-
-        if ($where instanceof Andx) {
-            $where->add($clause);
-        } else {
-            $where = $qb->expr()->andX($clause);
-        }
-
-        $qb->add('where', $where);
-        $qb->setParameter('userscope', $data['accepted_userscope']);
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ACTIVITY_ACP;
-    }
-
-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder->add('accepted_userscope', EntityType::class, [
-            'class' => Scope::class,
-            'choice_label' => function (Scope $s) {
-                return $this->translatableStringHelper->localize(
-                    $s->getName()
-                );
-            },
-            'multiple' => true,
-            'expanded' => true,
-        ]);
-    }
-
-    public function describeAction($data, $format = 'string'): array
-    {
-        $scopes = [];
-
-        foreach ($data['accepted_userscope'] as $s) {
-            $scopes[] = $this->translatableStringHelper->localize(
-                $s->getName()
-            );
-        }
-
-        return ['Filtered activity by userscope: only %scopes%', [
-            '%scopes%' => implode(', ou ', $scopes),
-        ]];
-    }
-
-    public function getTitle(): string
-    {
-        return 'Filter activity by userscope';
-    }
-}

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

@@ -11,13 +11,12 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Export\Filter;
 
-use Chill\ActivityBundle\Export\Declarations;
 use Chill\MainBundle\Export\FilterInterface;
-use Chill\MainBundle\Form\Type\ChillDateType;
 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;
@@ -33,7 +32,7 @@ class ActivityDateFilter implements FilterInterface
         $this->translator = $translator;
     }
 
-    public function addRole(): ?string
+    public function addRole()
     {
         return null;
     }
@@ -58,22 +57,36 @@ class ActivityDateFilter implements FilterInterface
         $qb->setParameter('date_to', $data['date_to']);
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
-        return Declarations::ACTIVITY;
+        return 'activity';
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder
-            ->add('date_from', ChillDateType::class, [
+        $builder->add(
+            'date_from',
+            DateType::class,
+            [
                 'label' => 'Activities after this date',
                 'data' => new DateTime(),
-            ])
-            ->add('date_to', ChillDateType::class, [
+                'attr' => ['class' => 'datepicker'],
+                'widget' => 'single_text',
+                'format' => 'dd-MM-yyyy',
+            ]
+        );
+
+        $builder->add(
+            'date_to',
+            DateType::class,
+            [
                 'label' => 'Activities before this date',
                 'data' => new DateTime(),
-            ]);
+                'attr' => ['class' => 'datepicker'],
+                'widget' => 'single_text',
+                'format' => 'dd-MM-yyyy',
+            ]
+        );
 
         $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
             /** @var \Symfony\Component\Form\FormInterface $filterForm */

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

@@ -9,11 +9,11 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Filter\PersonFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Export\Declarations;
 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;
@@ -23,6 +23,7 @@ use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 use function array_key_exists;
@@ -42,9 +43,9 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $this->activityReasonRepository = $activityReasonRepository;
     }
 
-    public function addRole(): ?string
+    public function addRole()
     {
-        return null;
+        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
@@ -52,9 +53,20 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $where = $qb->getDQLPart('where');
         $join = $qb->getDQLPart('join');
         $clause = $qb->expr()->in('reasons', ':selected_activity_reasons');
-
-        if (!in_array('actreasons', $qb->getAllAliases(), true)) {
-            $qb->join('activity.reasons', 'actreasons');
+        //dump($join);
+        // add a join to reasons only if needed
+        if (
+            (
+                array_key_exists('activity', $join)
+            && !$this->checkJoinAlreadyDefined($join['activity'], 'reasons')
+            )
+            || (!array_key_exists('activity', $join))
+        ) {
+            $qb->add(
+                'join',
+                ['activity' => new Join(Join::INNER_JOIN, 'activity.reasons', 'reasons')],
+                true
+            );
         }
 
         if ($where instanceof Expr\Andx) {
@@ -67,9 +79,9 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
         $qb->setParameter('selected_activity_reasons', $data['reasons']);
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
-        return Declarations::ACTIVITY_PERSON;
+        return 'activity';
     }
 
     public function buildForm(FormBuilderInterface $builder)
@@ -112,4 +124,21 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
                 ->addViolation();
         }
     }
+
+    /**
+     * Check if a join between Activity and Reason is already defined.
+     *
+     * @param Join[] $joins
+     * @param mixed $alias
+     */
+    private function checkJoinAlreadyDefined(array $joins, $alias): bool
+    {
+        foreach ($joins as $join) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

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

@@ -12,8 +12,8 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Export\Filter;
 
 use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Export\Declarations;
-use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+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;
@@ -22,79 +22,78 @@ use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 use function count;
 
 class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInterface
 {
-    protected ActivityTypeRepositoryInterface $activityTypeRepository;
+    protected ActivityTypeRepository $activityTypeRepository;
 
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
         TranslatableStringHelperInterface $translatableStringHelper,
-        ActivityTypeRepositoryInterface $activityTypeRepository
+        ActivityTypeRepository $activityTypeRepository
     ) {
         $this->translatableStringHelper = $translatableStringHelper;
         $this->activityTypeRepository = $activityTypeRepository;
     }
 
-    public function addRole(): ?string
+    public function addRole()
     {
-        return null;
+        return new Role(ActivityStatsVoter::STATS);
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        $clause = $qb->expr()->in('activity.activityType', ':selected_activity_types');
+        $where = $qb->getDQLPart('where');
+        $clause = $qb->expr()->in('activity.type', ':selected_activity_types');
 
-        $qb->andWhere($clause);
+        if ($where instanceof Expr\Andx) {
+            $where->add($clause);
+        } else {
+            $where = $qb->expr()->andX($clause);
+        }
+
+        $qb->add('where', $where);
         $qb->setParameter('selected_activity_types', $data['types']);
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
-        return Declarations::ACTIVITY;
+        return 'activity';
     }
 
     public function buildForm(FormBuilderInterface $builder)
     {
-        $builder->add('types', EntityType::class, [
-            'choices' => $this->activityTypeRepository->findAllActive(),
+        $builder->add(
+            'types',
+            EntityType::class,
+            [
                 'class' => ActivityType::class,
-            'choice_label' => function (ActivityType $aty) {
-                return
-                    ($aty->hasCategory() ? $this->translatableStringHelper->localize($aty->getCategory()->getName()) . ' > ' : '')
-                    .
-                    $this->translatableStringHelper->localize($aty->getName());
-            },
-            'group_by' => function (ActivityType $type) {
-                if (!$type->hasCategory()) {
-                    return null;
-                }
-
-                return $this->translatableStringHelper->localize($type->getCategory()->getName());
-            },
+                'choice_label' => fn (ActivityType $type) => $this->translatableStringHelper->localize($type->getName()),
                 'multiple' => true,
                 'expanded' => false,
-            'attr' => [
-                'class' => 'select2'
             ]
-        ]);
+        );
     }
 
     public function describeAction($data, $format = 'string')
     {
         // collect all the reasons'name used in this filter in one array
         $reasonsNames = array_map(
-            fn (ActivityType $t): string => $this->translatableStringHelper->localize($t->getName()),
+            fn (ActivityType $t): string => '"' . $this->translatableStringHelper->localize($t->getName()) . '"',
             $this->activityTypeRepository->findBy(['id' => $data['types']->toArray()])
         );
 
-        return ['Filtered by activity type: only %list%', [
-            '%list%' => implode(', ou ', $reasonsNames),
-        ]];
+        return [
+            'Filtered by activity type: only %list%',
+            [
+                '%list%' => implode(', ', $reasonsNames),
+            ],
+        ];
     }
 
     public function getTitle()
@@ -110,4 +109,23 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
                 ->addViolation();
         }
     }
+
+    /**
+     * 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) {
+            if ($join->getAlias() === $alias) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

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

@@ -9,9 +9,8 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Export\Filter\PersonFilters;
+namespace Chill\ActivityBundle\Export\Filter;
 
-use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityReason;
 use Chill\ActivityBundle\Repository\ActivityReasonRepository;
 use Chill\MainBundle\Export\ExportElementValidatedInterface;
@@ -53,17 +52,17 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
         $this->translator = $translator;
     }
 
-    public function addRole(): ?string
+    public function addRole()
     {
         return null;
     }
 
     public function alterQuery(QueryBuilder $qb, $data)
     {
-        // create a subquery for activity
+        // create a query for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
         $sqb->select('person_person_having_activity.id')
-            ->from(Activity::class, 'activity_person_having_activity')
+            ->from('ChillActivityBundle:Activity', 'activity_person_having_activity')
             ->join('activity_person_having_activity.person', 'person_person_having_activity');
 
         // add clause between date
@@ -103,7 +102,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
         $qb->setParameter('person_having_activity_reasons', $data['reasons']);
     }
 
-    public function applyOn(): string
+    public function applyOn()
     {
         return Declarations::PERSON_IMPLIED_IN;
     }
@@ -198,7 +197,7 @@ class PersonHavingActivityBetweenDateFilter implements ExportElementValidatedInt
 
     public function getTitle()
     {
-        return 'Filter by person having an activity in a period';
+        return 'Filtered by person having an activity in a period';
     }
 
     public function validateForm($data, ExecutionContextInterface $context)

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

@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Form\Type;
 
 use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Repository\ActivityTypeRepositoryInterface;
+use Chill\ActivityBundle\Repository\ActivityTypeRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\QueryBuilder;
@@ -23,25 +23,37 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class TranslatableActivityType extends AbstractType
 {
-    protected ActivityTypeRepositoryInterface $activityTypeRepository;
+    protected ActivityTypeRepository $activityTypeRepository;
 
     protected TranslatableStringHelperInterface $translatableStringHelper;
 
     public function __construct(
         TranslatableStringHelperInterface $helper,
-        ActivityTypeRepositoryInterface $activityTypeRepository
+        ActivityTypeRepository $activityTypeRepository
     ) {
         $this->translatableStringHelper = $helper;
         $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,
-                'choices' => $this->activityTypeRepository->findAllActive(),
+                'query_builder' => $this->activityTypeRepository
+                    ->createQueryBuilder('at'),
                 'choice_label' => function (ActivityType $type) {
                     return $this->translatableStringHelper->localize($type->getName());
                 },

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php

@@ -13,58 +13,18 @@ namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\ActivityType;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
-use UnexpectedValueException;
-
-final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
-{
-    private EntityRepository $repository;
-
-    public function __construct(EntityManagerInterface $em)
-    {
-        $this->repository =  $em->getRepository(ActivityType::class);
-    }
 
 /**
-     * @return array|ActivityType[]
+ * @method ActivityType|null find($id, $lockMode = null, $lockVersion = null)
+ * @method ActivityType|null findOneBy(array $criteria, array $orderBy = null)
+ * @method ActivityType[]    findAll()
+ * @method ActivityType[]    findBy(array $criteria, array $orderBy = null, $limit = null, $offset = null)
  */
-    public function findAllActive(): array
+class ActivityTypeRepository extends ServiceEntityRepository
 {
-        return $this->findBy(['active' => true]);
-    }
-
-    public function find($id): ?ActivityType
+    public function __construct(ManagerRegistry $registry)
     {
-        return $this->repository->find($id);
+        parent::__construct($registry, ActivityType::class);
     }
-
-    /**
-     * @return array|ActivityType[]
-     */
-    public function findAll(): array
-    {
-        return $this->repository->findAll();
-    }
-
-    /**
-     * @return array|ActivityType[]
-     */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
-    public function findOneBy(array $criteria): ?ActivityType
-    {
-        return $this->repository->findOneBy($criteria);
-    }
-
-    public function getClassName(): string
-    {
-        return ActivityType::class;
-    }
-
-
 }

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepositoryInterface.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Repository;
-
-use Chill\ActivityBundle\Entity\ActivityType;
-use Doctrine\Persistence\ObjectRepository;
-
-interface ActivityTypeRepositoryInterface extends ObjectRepository
-{
-    /**
-     * @return array|ActivityType[]
-     */
-    public function findAllActive(): array;
-
-}

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

@@ -35,13 +35,6 @@ const getLocationTypeByDefaultFor = (entity) => {
     );
 };
 
-/**
- * Post a location
- *
- * **NOTE**: also in use for Calendar
- * @param body
- * @returns {Promise<T>}
- */
 const postLocation = (body) => {
     const url = `/api/1.0/main/location.json`;
     return fetch(url, {

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

@@ -111,7 +111,7 @@ export default function prepareLocations(store) {
         if (window.default_location_id) {
             for (let group of store.state.availableLocations) {
                 let location = group.locations.find((l) => l.id === window.default_location_id);
-                if (location !== undefined && store.state.activity.location === null) {
+                if (location !== undefined & store.state.activity.location === null) {
                     store.dispatch('updateLocation', location);
                     break;
                 }

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

@@ -1,14 +1,3 @@
-{#
-    WARNING: this file is in use in both ActivityBundle and CalendarBundle.
-
-    Take care when editing this file.
-
-    Maybe should we think about abstracting this file a bit more ? Moving it to PersonBundle ?
-#}
-{% if context == 'calendar_accompanyingCourse' %}
-    {% import "@ChillCalendar/_invite.html.twig" as invite %}
-{% endif %}
-
 {% macro href(pathname, key, value) %}
     {% set parms = { (key): value } %}
     {{ path(pathname, parms) }}
@@ -29,7 +18,7 @@
 {% endmacro %}
 
 {% set blocks = [] %}
-{% if context == 'calendar_accompanyingCourse' or entity.activityType.personsVisible %}
+{% if entity.activityType.personsVisible %}
     {% if context == 'person' %}
         {% set blocks = blocks|merge([{
             'title': 'Others persons'|trans,
@@ -54,7 +43,7 @@
         }]) %}
     {% endif %}
 {% endif %}
-{% if context == 'calendar_accompanyingCourse' or entity.activityType.thirdPartiesVisible %}
+{% if entity.activityType.thirdPartiesVisible %}
     {% set blocks = blocks|merge([{
         'title': 'Third parties'|trans,
         'items': entity.thirdParties,
@@ -63,7 +52,7 @@
         'key'  : 'id',
     }]) %}
 {% endif %}
-{% if context == 'calendar_accompanyingCourse' or entity.activityType.usersVisible %}
+{% if entity.activityType.usersVisible %}
     {% set blocks = blocks|merge([{
         'title': 'Users concerned'|trans,
         'items': entity.users,
@@ -143,12 +132,6 @@
                             {% if bloc.type == 'user' %}
                                 <span class="badge-user">
                                     {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
-                                    {%- if context == 'calendar_accompanyingCourse' %}
-                                        {% set invite = entity.inviteForUser(item) %}
-                                        {% if invite is not null %}
-                                        {{ invite.invite_span(invite) }}
-                                        {% endif %}
-                                    {%- endif -%}
                                 </span>
                             {% else %}
                                 {{ _self.insert_onthefly(bloc.type, item) }}

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityStatsVoter.php

@@ -13,10 +13,10 @@ namespace Chill\ActivityBundle\Security\Authorization;
 
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
-use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
-use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\MainBundle\Security\ProvideRoleHierarchyInterface;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+
+use function in_array;
 
 class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
@@ -24,14 +24,14 @@ class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierar
 
     public const STATS = 'CHILL_ACTIVITY_STATS';
 
-    protected VoterHelperInterface $helper;
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $helper;
 
-    public function __construct(VoterHelperFactoryInterface $voterHelperFactory)
+    public function __construct(AuthorizationHelper $helper)
     {
-        $this->helper = $voterHelperFactory
-            ->generate(self::class)
-            ->addCheckFor(Center::class, [self::STATS, self::LISTS])
-            ->build();
+        $this->helper = $helper;
     }
 
     public function getRoles(): array
@@ -49,14 +49,30 @@ class ActivityStatsVoter extends AbstractChillVoter implements ProvideRoleHierar
         return $this->getAttributes();
     }
 
-    protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
+    protected function getSupportedClasses()
     {
-        return $this->helper->voteOnAttribute($attribute, $subject, $token);
+        return [Center::class];
+    }
+
+    protected function isGranted($attribute, $object, $user = null)
+    {
+        if (!$user instanceof \Symfony\Component\Security\Core\User\UserInterface) {
+            return false;
+        }
+
+        return $this->helper->userHasAccess($user, $object, $attribute);
     }
 
     protected function supports($attribute, $subject)
     {
-        return $this->helper->supports($attribute, $subject);
+        if (
+            $subject instanceof Center
+            && in_array($attribute, $this->getAttributes(), true)
+        ) {
+            return true;
+        }
+
+        return false;
     }
 
     private function getAttributes()

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialActionAggregatorTest.php

@@ -1,59 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialActionAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-final class BySocialActionAggregatorTest extends AbstractAggregatorTest
-{
-    private BySocialActionAggregator $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::$container->get('chill.activity.export.bysocialaction_aggregator');
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.socialActions', 'actsocialaction')
-                ,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/BySocialIssueAggregatorTest.php

@@ -1,59 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialIssueAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-final class BySocialIssueAggregatorTest extends AbstractAggregatorTest
-{
-    private BySocialIssueAggregator $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::$container->get('chill.activity.export.bysocialissue_aggregator');
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.socialIssues', 'actsocialissue')
-                ,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByThirdpartyAggregatorTest.php

@@ -1,59 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-final class ByThirdpartyAggregatorTest extends AbstractAggregatorTest
-{
-    private ByThirdpartyAggregator $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::$container->get('chill.activity.export.bythirdparty_aggregator');
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.thirdParties', 'acttparty')
-                ,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/ByUserAggregatorTest.php

@@ -1,59 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByUserAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-final class ByUserAggregatorTest extends AbstractAggregatorTest
-{
-    private ByUserAggregator $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::$container->get('chill.activity.export.byuser_aggregator');
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.users', 'actusers')
-                ,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/DateAggregatorTest.php

@@ -1,66 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\DateAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-final class DateAggregatorTest extends AbstractAggregatorTest
-{
-    private DateAggregator $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::$container->get('chill.activity.export.date_aggregator');
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [
-                'frequency' => 'month',
-            ],
-            [
-                'frequency' => 'week',
-            ],
-            [
-                'frequency' => 'year',
-            ]
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/LocationTypeAggregatorTest.php

@@ -1,59 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\LocationTypeAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-final class LocationTypeAggregatorTest extends AbstractAggregatorTest
-{
-    private LocationTypeAggregator $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::$container->get('chill.activity.export.locationtype_aggregator');
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.location', 'actloc')
-                ,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ACPAggregators/UserScopeAggregatorTest.php

@@ -1,59 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\ACPAggregators;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\ACPAggregators\UserScopeAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-final class UserScopeAggregatorTest extends AbstractAggregatorTest
-{
-    private UserScopeAggregator $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::$container->get('chill.activity.export.userscope_aggregator');
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.accompanyingPeriod', 'acp')
-                ->join('activity.user', 'actuser')
-                ,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityReasonAggregatorTest.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
-use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
@@ -22,7 +21,10 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  */
 final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
 {
-    private ActivityReasonAggregator $aggregator;
+    /**
+     * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
+     */
+    private $aggregator;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityTypeAggregatorTest.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
-use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityTypeAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
@@ -22,7 +21,10 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  */
 final class ActivityTypeAggregatorTest extends AbstractAggregatorTest
 {
-    private ActivityTypeAggregator $aggregator;
+    /**
+     * @var \Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
+     */
+    private $aggregator;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/ActivityUserAggregatorTest.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Aggregator;
 
-use Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator;
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 
 /**
@@ -22,7 +21,10 @@ use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
  */
 final class ActivityUserAggregatorTest extends AbstractAggregatorTest
 {
-    private ActivityUserAggregator $aggregator;
+    /**
+     * @var \Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
+     */
+    private $aggregator;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/Tests/Export/Aggregator/PersonAggregators/ActivityReasonAggregatorTest.php

@@ -1,65 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Aggregator\PersonAggregators;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-final class ActivityReasonAggregatorTest extends AbstractAggregatorTest
-{
-    private ActivityReasonAggregator $aggregator;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        $this->aggregator = self::$container->get('chill.activity.export.reason_aggregator');
-    }
-
-    public function getAggregator()
-    {
-        return $this->aggregator;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [
-                'level' => 'reasons',
-            ],
-            [
-                'level' => 'categories',
-            ]
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.person', 'actperson')
-                ->innerJoin('activity.reasons', 'actreasons')
-                ->join('actreasons.category', 'actreasoncat')
-                ,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ActivityTypeFilterTest.php

@@ -1,85 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query\Expr;
-
-/**
- * @internal
- * @coversNothing
- */
-final class ActivityTypeFilterTest extends AbstractFilterTest
-{
-    private ActivityTypeFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.filter_activitytype');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(ActivityType::class, 'at')
-            ->select('at')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'accepted_activitytypes' => $a
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(AccompanyingPeriod::class, 'acp')
-                ->join(Activity::class, 'activity', Expr\Join::WITH, 'activity.accompanyingPeriod = acp')
-                ->join('activity.activityType', 'acttype'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialActionFilterTest.php

@@ -1,82 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class BySocialActionFilterTest extends AbstractFilterTest
-{
-    private BySocialActionFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.bysocialaction_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(SocialAction::class, 'sa')
-            ->select('sa')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'accepted_socialactions' => $a
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.socialActions', 'actsocialaction'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/BySocialIssueFilterTest.php

@@ -1,83 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialIssueFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class BySocialIssueFilterTest extends AbstractFilterTest
-{
-    private BySocialIssueFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.bysocialissue_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(SocialIssue::class, 'si')
-            ->select('si')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'accepted_socialissues' => $a
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.socialIssues', 'actsocialissue')
-            ,
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/ByUserFilterTest.php

@@ -1,82 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\ByUserFilter;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class ByUserFilterTest extends AbstractFilterTest
-{
-    private ByUserFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.byuser_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(User::class, 'u')
-            ->select('u')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'accepted_users' => $a
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.users', 'actusers'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/EmergencyFilterTest.php

@@ -1,67 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\EmergencyFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class EmergencyFilterTest extends AbstractFilterTest
-{
-    private EmergencyFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.emergency_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            ['accepted_emergency' => true ],
-            ['accepted_emergency' => false ],
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/LocationTypeFilterTest.php

@@ -1,82 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter;
-use Chill\MainBundle\Entity\LocationType;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class LocationTypeFilterTest extends AbstractFilterTest
-{
-    private LocationTypeFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.locationtype_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(LocationType::class, 'lt')
-            ->select('lt')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'accepted_locationtype' => $a
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.location', 'actloc'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/SentReceivedFilterTest.php

@@ -1,67 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\SentReceivedFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class SentReceivedFilterTest extends AbstractFilterTest
-{
-    private SentReceivedFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.sentreceived_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            ['accepted_sentreceived' => Activity::SENTRECEIVED_SENT ],
-            ['accepted_sentreceived' => Activity::SENTRECEIVED_RECEIVED ]
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserFilterTest.php

@@ -1,81 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\UserFilter;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class UserFilterTest extends AbstractFilterTest
-{
-    private UserFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.user_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(User::class, 'u')
-            ->select('u')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'accepted_users' => $a
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ACPFilters/UserScopeFilterTest.php

@@ -1,82 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\ACPFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ACPFilters\UserScopeFilter;
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class UserScopeFilterTest extends AbstractFilterTest
-{
-    private UserScopeFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.userscope_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(Scope::class, 's')
-            ->select('s')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'accepted_userscope' => $a
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.user', 'actuser'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityDateFilterTest.php

@@ -1,69 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Export\Filter\ActivityDateFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class ActivityDateFilterTest extends AbstractFilterTest
-{
-    private ActivityDateFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.date_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        return [
-            [
-                'date_from' => \DateTime::createFromFormat('Y-m-d', '2020-01-01'),
-                'date_to' => \DateTime::createFromFormat('Y-m-d', '2021-01-01'),
-            ]
-        ];
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Filter;
 
-use Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\Common\Collections\ArrayCollection;
 
@@ -21,7 +20,10 @@ use Doctrine\Common\Collections\ArrayCollection;
  */
 final class ActivityReasonFilterTest extends AbstractFilterTest
 {
-    private ActivityReasonFilter $filter;
+    /**
+     * @var \Chill\PersonBundle\Export\Filter\GenderFilter
+     */
+    private $filter;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityTypeFilterTest.php

@@ -1,81 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Entity\ActivityType;
-use Chill\ActivityBundle\Export\Filter\ActivityTypeFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class ActivityTypeFilterTest extends AbstractFilterTest
-{
-    private ActivityTypeFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.type_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(ActivityType::class, 'at')
-            ->select('at')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'types' => $a
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/ActivityReasonFilterTest.php

@@ -1,82 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\PersonFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class ActivityReasonFilterTest extends AbstractFilterTest
-{
-    private ActivityReasonFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.reason_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(ActivityReason::class, 'ar')
-            ->select('ar')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'reasons' => $a
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity')
-                ->join('activity.reasons', 'actreasons'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilterTest.php

@@ -1,83 +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);
-
-namespace Chill\ActivityBundle\Tests\Export\Filter\PersonFilters;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter;
-use Chill\MainBundle\Test\Export\AbstractFilterTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- * @coversNothing
- */
-final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
-{
-    private PersonHavingActivityBetweenDateFilter $filter;
-
-    protected function setUp(): void
-    {
-        self::bootKernel();
-
-        // add a fake request with a default locale (used in translatable string)
-        $request = $this->prophesize();
-
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
-        $request->getLocale()->willReturn('fr');
-
-        $this->filter = self::$container->get('chill.activity.export.person_having_an_activity_between_date_filter');
-    }
-
-    public function getFilter()
-    {
-        return $this->filter;
-    }
-
-    public function getFormData(): array
-    {
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        $array = $em->createQueryBuilder()
-            ->from(ActivityReason::class, 'ar')
-            ->select('ar')
-            ->getQuery()
-            ->getResult();
-
-        $data = [];
-
-        foreach ($array as $a) {
-            $data[] = [
-                'date_from' => \DateTime::createFromFormat('Y-m-d', '2021-07-01'),
-                'date_to' => \DateTime::createFromFormat('Y-m-d', '2022-07-01'),
-                'reasons' => $a
-            ];
-        }
-
-        return $data;
-    }
-
-    public function getQueryBuilders(): array
-    {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
-
-        $em = self::$container->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(activity.id)')
-                ->from(Activity::class, 'activity'),
-        ];
-    }
-}

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 namespace Chill\ActivityBundle\Tests\Export\Filter;
 
-use Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use DateTime;
 use function array_slice;
@@ -22,7 +21,10 @@ use function array_slice;
  */
 final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
 {
-    private PersonHavingActivityBetweenDateFilter $filter;
+    /**
+     * @var \Chill\PersonBundle\Export\Filter\PersonHavingActivityBetweenDateFilter
+     */
+    private $filter;
 
     protected function setUp(): void
     {

src/Bundle/ChillActivityBundle/config/services/export.yaml

@@ -3,48 +3,26 @@ services:
         autowire: true
         autoconfigure: true
 
-    ## Indicators
-    chill.activity.export.count_activity_linked_to_person:
-        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\CountActivity
+    chill.activity.export.count_activity:
+        class: Chill\ActivityBundle\Export\Export\CountActivity
         tags:
-            - { name: chill.export, alias: 'count_activity_linked_to_person' }
+            - { name: chill.export, alias: 'count_activity' }
 
-    chill.activity.export.sum_activity_duration_linked_to_person:
-        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\StatActivityDuration
+    chill.activity.export.sum_activity_duration:
+        class: Chill\ActivityBundle\Export\Export\StatActivityDuration
         tags:
-            - { name: chill.export, alias: 'sum_activity_duration_linked_to_person' }
+            - { name: chill.export, alias: 'sum_activity_duration' }
 
-    chill.activity.export.list_activity_linked_to_person:
-        class: Chill\ActivityBundle\Export\Export\LinkedToPerson\ListActivity
+    chill.activity.export.list_activity:
+        class: Chill\ActivityBundle\Export\Export\ListActivity
         tags:
-            - { name: chill.export, alias: 'list_activity_linked_to_person' }
+            - { name: chill.export, alias: 'list_activity' }
 
-    chill.activity.export.count_activity_linked_to_acp:
-        class: Chill\ActivityBundle\Export\Export\LinkedToACP\CountActivity
+    chill.activity.export.reason_filter:
+        class: Chill\ActivityBundle\Export\Filter\ActivityReasonFilter
         tags:
-            - { name: chill.export, alias: 'count_activity_linked_to_acp' }
+            - { name: chill.export_filter, alias: 'activity_reason_filter' }
 
-    chill.activity.export.sum_activity_duration_linked_to_acp:
-        class: Chill\ActivityBundle\Export\Export\LinkedToACP\SumActivityDuration
-        tags:
-            - { name: chill.export, alias: 'sum_activity_duration_linked_to_acp' }
-
-    chill.activity.export.sum_activity_visit_duration_linked_to_acp:
-        class: Chill\ActivityBundle\Export\Export\LinkedToACP\SumActivityVisitDuration
-        tags:
-            - { name: chill.export, alias: 'sum_activity_visit_duration_linked_to_acp' }
-
-    chill.activity.export.avg_activity_duration_linked_to_acp:
-        class: Chill\ActivityBundle\Export\Export\LinkedToACP\AvgActivityDuration
-        tags:
-            - { name: chill.export, alias: 'avg_activity_duration_linked_to_acp' }
-
-    chill.activity.export.avg_activity_visit_duration_linked_to_acp:
-        class: Chill\ActivityBundle\Export\Export\LinkedToACP\AvgActivityVisitDuration
-        tags:
-            - { name: chill.export, alias: 'avg_activity_visit_duration_linked_to_acp' }
-
-    ## Filters
     chill.activity.export.type_filter:
         class: Chill\ActivityBundle\Export\Filter\ActivityTypeFilter
         tags:
@@ -55,66 +33,15 @@ services:
         tags:
             - { name: chill.export_filter, alias: 'activity_date_filter' }
 
-    chill.activity.export.reason_filter:
-        class: Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter
-        tags:
-            - { name: chill.export_filter, alias: 'activity_reason_filter' }
-
     chill.activity.export.person_having_an_activity_between_date_filter:
-        class: Chill\ActivityBundle\Export\Filter\PersonFilters\PersonHavingActivityBetweenDateFilter
+        class: Chill\ActivityBundle\Export\Filter\PersonHavingActivityBetweenDateFilter
         tags:
             - #0 register as a filter
                 name: chill.export_filter
                 alias: 'activity_person_having_ac_bw_date_filter'
 
-    chill.activity.export.filter_activitytype:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\ActivityTypeFilter
-        tags:
-            - { name: chill.export_filter, alias: 'accompanyingcourse_activitytype_filter' }
-
-    chill.activity.export.locationtype_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\LocationTypeFilter
-        tags:
-            - { name: chill.export_filter, alias: 'activity_locationtype_filter' }
-
-    chill.activity.export.byuser_filter:  # TMS (M2M)
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\ByUserFilter
-        tags:
-            - { name: chill.export_filter, alias: 'activity_byuser_filter' }
-
-    chill.activity.export.emergency_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\EmergencyFilter
-        tags:
-            - { name: chill.export_filter, alias: 'activity_emergency_filter' }
-
-    chill.activity.export.sentreceived_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\SentReceivedFilter
-        tags:
-            - { name: chill.export_filter, alias: 'activity_sentreceived_filter' }
-
-    chill.activity.export.bysocialaction_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialActionFilter
-        tags:
-            - { name: chill.export_filter, alias: 'activity_bysocialaction_filter' }
-
-    chill.activity.export.bysocialissue_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\BySocialIssueFilter
-        tags:
-            - { name: chill.export_filter, alias: 'activity_bysocialissue_filter' }
-
-    chill.activity.export.user_filter: # Creator (M2O)
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\UserFilter
-        tags:
-            - { name: chill.export_filter, alias: 'activity_user_filter' }
-
-    chill.activity.export.userscope_filter:
-        class: Chill\ActivityBundle\Export\Filter\ACPFilters\UserScopeFilter
-        tags:
-            - { name: chill.export_filter, alias: 'activity_userscope_filter' }
-
-    ## Aggregators
     chill.activity.export.reason_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\PersonAggregators\ActivityReasonAggregator
+        class: Chill\ActivityBundle\Export\Aggregator\ActivityReasonAggregator
         tags:
             - { name: chill.export_aggregator, alias: activity_reason_aggregator }
 
@@ -127,38 +54,3 @@ services:
         class: Chill\ActivityBundle\Export\Aggregator\ActivityUserAggregator
         tags:
             - { name: chill.export_aggregator, alias: activity_user_aggregator }
-
-    chill.activity.export.locationtype_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\LocationTypeAggregator
-        tags:
-            - { name: chill.export_aggregator, alias: activity_locationtype_aggregator }
-
-    chill.activity.export.date_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\DateAggregator
-        tags:
-            - { name: chill.export_aggregator, alias: activity_date_aggregator }
-
-    chill.activity.export.byuser_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByUserAggregator
-        tags:
-            - { name: chill.export_aggregator, alias: activity_byuser_aggregator }
-
-    chill.activity.export.bythirdparty_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\ByThirdpartyAggregator
-        tags:
-            - { name: chill.export_aggregator, alias: activity_bythirdparty_aggregator }
-
-    chill.activity.export.bysocialaction_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialActionAggregator
-        tags:
-            - { name: chill.export_aggregator, alias: activity_bysocialaction_aggregator }
-
-    chill.activity.export.bysocialissue_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\BySocialIssueAggregator
-        tags:
-            - { name: chill.export_aggregator, alias: activity_bysocialissue_aggregator }
-
-    chill.activity.export.userscope_aggregator:
-        class: Chill\ActivityBundle\Export\Aggregator\ACPAggregators\UserScopeAggregator
-        tags:
-            - { name: chill.export_aggregator, alias: activity_userscope_aggregator }

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

@@ -203,39 +203,18 @@ Are you sure you want to remove the activity about "%name%" ?: Êtes-vous sûr d
 The activity has been successfully removed.: L'activité a été supprimée.
 
 # exports
-Exports of activities linked to a person: Exports des activités liées à une personne
-Number of activities linked to a person: Nombre d'activités liées à une personne
-Count activities linked to a person: Nombre d'activités
-Count activities linked to a person by various parameters.: Compte le nombre d'activités enregistrées et liées à une personne en fonction de différents paramètres.
-Sum activity linked to a person duration: Durée des activités
-Sum activities linked to a person duration: Durée des activités liés à un usager
-Sum activities linked to a person duration by various parameters.: Additionne la durée des activités en fonction de différents paramètres.
-List activity linked to a person: Liste les activités
-List activities linked to a person: Liste des activités liés à un usager
-List activities linked to a person description: Crée la liste des activités en fonction de différents paramètres.
-
-Exports of activities linked to an accompanying period: Exports des activités liées à un parcours
-Number of activities linked to an accompanying period: Nombre d'activités liées à un parcours
-Count activities linked to an accompanying period: Nombre d'activités
-Count activities linked to an accompanying period by various parameters.: Compte le nombre d'activités enregistrées et liées à un parcours en fonction de différents paramètres.
-Sum activity linked to an accompanying period duration: Somme de la durée des activités
-Sum activities linked to an accompanying period duration: Somme de la durée des activités liées à un parcours
-Sum activities linked to an accompanying period duration by various parameters.: Additionne la durée des activités en fonction de différents paramètres.
-Sum activity linked to an accompanying period visit duration: Somme de la durée de déplacement des activités
-Sum activities linked to an accompanying period visit duration: Somme de la durée de déplacement des activités liées à un parcours
-Sum activities linked to an accompanying period visit duration by various parameters.: Additionne la durée de déplacement des activités en fonction de différents paramètres.
-Average activity linked to an accompanying period duration: Moyenne de la durée des activités
-Average activities linked to an accompanying period duration: Moyenne de la durée des activités liées à un parcours
-Average activities linked to an accompanying period duration by various parameters.: Moyenne de la durée des activités en fonction de différents paramètres.
-Average activity linked to an accompanying period visit duration: Moyenne de la durée de déplacement des activités
-Average activities linked to an accompanying period visit duration: Moyenne de la durée de déplacement des activités liées à un parcours
-Average activities linked to an accompanying period visit duration by various parameters.: Moyenne de la durée de déplacement des activités en fonction de différents paramètres.
+Count activities: Nombre d'activités
+Count activities by various parameters.: Compte le nombre d'activités enregistrées en fonction de différents paramètres.
+Sum activity duration: Total de la durée des activités
+Sum activities duration by various parameters.: Additionne la durée des activités en fonction de différents paramètres.
+List activities: Liste les activités
+Number of activities: Nombre d'activités
 
 #filters
-Filter by reason: Filtrer les activités par sujet
+Filter by reason: Filtrer par sujet d'activité
 'Filtered by reasons: only %list%': 'Filtré par sujet: seulement %list%'
-'Filtered by activity type: only %list%': "Filtré par type d'activité: uniquement %list%"
-Filtered by date activity: Filtrer les activités par date
+'Filtered by activity type: only %list%': "Filtré par type d'activity: seulement %list%"
+Filtered by date activity: Filtrer par date d'activité
 Activities after this date: Activités après cette date
 Activities before this date: Activités avant cette date
 "Filtered by date of activity: only between %date_from% and %date_to%": "Filtré par date de l'activité: uniquement entre %date_from% et %date_to%"
@@ -247,59 +226,18 @@ Implied in an activity before this date: Impliqué dans une activité avant cett
 Filtered by person having an activity between %date_from% and %date_to% with reasons %reasons_name%: Filtré par personnes associées à une activité entre %date_from% et %date_to% avec les sujets %reasons_name%
 Activity reasons for those activities: Sujets de ces activités
 
-Filter by activity type: Filtrer les activités par type
-
-Filter activity by locationtype: Filtrer les activités par type de localisation
-'Filtered activity by locationtype: only %types%': "Filtré par type de localisation: uniquement %types%"
-Accepted locationtype: Types de localisation
-Filter activity by linked users: Filtrer les activités par TMS
-'Filtered activity by linked users: only %users%': "Filtré par TMS: uniquement %users%"
-Accepted users: TMS(s)
-Filter activity by emergency: Filtrer les activités par urgence
-'Filtered activity by emergency: only %emergency%': "Filtré par urgence: uniquement si %emergency%"
-activity is emergency: l'activité est urgente
-activity is not emergency: l'activité n'est pas urgente
-Filter activity by sentreceived: Filtrer les activités par envoyé/reçu
-'Filtered activity by sentreceived: only %sentreceived%': "Filtré par envoyé/reçu: uniquement %sentreceived%"
-Accepted sentreceived: ''
-is sent: envoyé
-is received: reçu
-Filter activity by linked socialaction: Filtrer les activités par action liée
-'Filtered activity by linked socialaction: only %actions%': "Filtré par action liée: uniquement %actions%"
-Filter activity by linked socialissue: Filtrer les activités par problématique liée
-'Filtered activity by linked socialissue: only %issues%': "Filtré par problématique liée: uniquement %issues%"
-Filter activity by user: Filtrer les activités par créateur
-'Filtered activity by user: only %users%': "Filtré par créateur: uniquement %users%"
-Creators: Créateurs
-Filter activity by userscope: Filtrer les activités par service du créateur
-'Filtered activity by userscope: only %scopes%': "Filtré par service du créateur: uniquement %scopes%"
-Accepted userscope: Services
+Filter by activity type: Filtrer par type d'activité
 
 #aggregators
 Activity type: Type d'activité
-Activity user: Utilisateur lié à l'activité
+Activity user: Utilisateur lié à l'activity
 By reason: Par sujet
 By category of reason: Par catégorie de sujet
 Reason's level: Niveau du sujet
 Group by reasons: Sujet d'activité
-Aggregate by activity user: Grouper les activités par utilisateur
-Aggregate by activity type: Grouper les activités par type
-Aggregate by activity reason: Grouper les activités par sujet
-
-Group activity by locationtype: Grouper les activités par type de localisation
-Group activity by date: Grouper les activités par date
-Frequency: Fréquence
-by month: Par mois
-by week: Par semaine
-for week: Semaine
-by year: Par année
-in year: En
-Group activity by linked users: Grouper les activités par TMS impliqué
-Group activity by linked thirdparties: Grouper les activités par tiers impliqué
-Accepted thirdparty: Tiers impliqué
-Group activity by linked socialaction: Grouper les activités par action liée
-Group activity by linked socialissue: Grouper les activités par problématique liée
-Group activity by userscope: Grouper les activités par service du créateur
+Aggregate by activity user: Aggréger par utilisateur lié à l'activité
+Aggregate by activity type: Aggréger par type d'activité
+Aggregate by activity reason: Aggréger par sujet de l'activité
 
 Last activities: Les dernières activités
 
@@ -311,6 +249,6 @@ This is the minimal activity data: Activité n°
 
 docgen:
     Activity basic: Echange
-    A basic context for activity: Contexte pour les activités
-    Accompanying period with a list of activities: Parcours d'accompagnement avec liste des activités
-    Accompanying period with a list of activities description: Ce contexte reprend les informations du parcours, et tous les activités pour un parcours. Les activités ne sont pas filtrés.
+    A basic context for activity: Contexte pour les échanges
+    Accompanying period with a list of activities: Parcours d'accompagnement avec liste des échanges
+    Accompanying period with a list of activities description: Ce contexte reprend les informations du parcours, et tous les échanges pour un parcours. Les échanges ne sont pas filtrés.

src/Bundle/ChillActivityBundle/translations/messages.nl.yaml

@@ -195,7 +195,7 @@ Number of activities: Nombre d'activités
 #filters
 Filter by reason: Filtrer par sujet d'activité
 'Filtered by reasons: only %list%': 'Filtré par sujet: seulement %list%'
-'Filtered by activity type: only %list%': "Filtré par type d'activity: uniquement %list%"
+'Filtered by activity type: only %list%': "Filtré par type d'activity: seulement %list%"
 Filtered by date activity: Filtrer par date d'activité
 Activities after this date: Activités après cette date
 Activities before this date: Activités avant cette date
@@ -217,9 +217,9 @@ By reason: Par sujet
 By category of reason: Par catégorie de sujet
 Reason's level: Niveau du sujet
 Group by reasons: Sujet d'activité
-Aggregate by activity user: Grouper par utilisateur lié à l'activité
-Aggregate by activity type: Grouper par type d'activité
-Aggregate by activity reason: Grouper par sujet de l'activité
+Aggregate by activity user: Aggréger par utilisateur lié à l'activité
+Aggregate by activity type: Aggréger par type d'activité
+Aggregate by activity reason: Aggréger par sujet de l'activité
 
 Last activities: Les dernières activités
 
@@ -231,4 +231,4 @@ This is the minimal activity data: Activité n°
 
 docgen:
     Activity basic: Echange
-    A basic context for activity: Contexte pour les activités
+    A basic context for activity: Contexte pour les échanges

src/Bundle/ChillBudgetBundle/Config/ConfigRepository.php

@@ -29,58 +29,44 @@ class ConfigRepository
         $this->charges = $charges;
     }
 
-    public function getChargesKeys(bool $onlyActive = false): array
+    public function getChargesKeys(): array
     {
-        return array_map(static function ($element) { return $element['key']; }, $this->getCharges($onlyActive));
+        return array_map(static function ($element) { return $element['key']; }, $this->charges);
     }
 
     /**
      * @return array where keys are the resource'key and label the ressource label
      */
-    public function getChargesLabels(bool $onlyActive = false)
+    public function getChargesLabels()
     {
         $charges = [];
 
-        foreach ($this->getCharges($onlyActive) as $definition) {
+        foreach ($this->charges as $definition) {
             $charges[$definition['key']] = $this->normalizeLabel($definition['labels']);
         }
 
         return $charges;
     }
 
-    public function getResourcesKeys(bool $onlyActive = false): array
+    public function getResourcesKeys(): array
     {
-        return array_map(static function ($element) { return $element['key']; }, $this->getResources($onlyActive));
+        return array_map(static function ($element) { return $element['key']; }, $this->resources);
     }
 
     /**
      * @return array where keys are the resource'key and label the ressource label
      */
-    public function getResourcesLabels(bool $onlyActive = false)
+    public function getResourcesLabels()
     {
         $resources = [];
 
-        foreach ($this->getResources($onlyActive) as $definition) {
+        foreach ($this->resources as $definition) {
             $resources[$definition['key']] = $this->normalizeLabel($definition['labels']);
         }
 
         return $resources;
     }
 
-    private function getCharges(bool $onlyActive = false): array
-    {
-        return $onlyActive ?
-            array_filter($this->charges, function ($el) { return $el['active']; })
-            : $this->charges;
-    }
-
-    private function getResources(bool $onlyActive = false): array
-    {
-        return $onlyActive ?
-            array_filter($this->resources, function ($el) { return $el['active']; })
-            : $this->resources;
-    }
-
     private function normalizeLabel($labels)
     {
         $normalizedLabels = [];

src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php

@@ -14,6 +14,11 @@ namespace Chill\BudgetBundle\DependencyInjection;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
+/**
+ * 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/configuration.html}
+ */
 class Configuration implements ConfigurationInterface
 {
     public function getConfigTreeBuilder()
@@ -32,7 +37,6 @@ class Configuration implements ConfigurationInterface
             ->info('the key stored in database')
             ->example('salary')
             ->end()
-            ->booleanNode('active')->defaultTrue()->end()
             ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
             ->arrayPrototype()
             ->children()
@@ -55,7 +59,6 @@ class Configuration implements ConfigurationInterface
             ->info('the key stored in database')
             ->example('salary')
             ->end()
-            ->booleanNode('active')->defaultTrue()->end()
             ->arrayNode('labels')->isRequired()->requiresAtLeastOneElement()
             ->arrayPrototype()
             ->children()

src/Bundle/ChillBudgetBundle/Form/ChargeType.php

@@ -103,7 +103,7 @@ class ChargeType extends AbstractType
     private function getTypes()
     {
         $charges = $this->configRepository
-            ->getChargesLabels(true);
+            ->getChargesLabels();
 
         // rewrite labels to filter in language
         foreach ($charges as $key => $labels) {

src/Bundle/ChillBudgetBundle/Form/ResourceType.php

@@ -87,7 +87,7 @@ class ResourceType extends AbstractType
     private function getTypes()
     {
         $resources = $this->configRepository
-            ->getResourcesLabels(true);
+            ->getResourcesLabels();
 
         // rewrite labels to filter in language
         foreach ($resources as $key => $labels) {

src/Bundle/ChillCalendarBundle/ChillCalendarBundle.php

@@ -11,16 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle;
 
-use Chill\CalendarBundle\RemoteCalendar\DependencyInjection\RemoteCalendarCompilerPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 class ChillCalendarBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
-    {
-        parent::build($container);
-
-        $container->addCompilerPass(new RemoteCalendarCompilerPass());
-    }
 }

src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php

@@ -1,77 +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);
-
-namespace Chill\CalendarBundle\Command;
-
-use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MachineTokenStorage;
-use KnpU\OAuth2ClientBundle\Client\ClientRegistry;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\FormatterHelper;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-use TheNetworg\OAuth2\Client\Provider\Azure;
-
-class AzureGrantAdminConsentAndAcquireToken extends Command
-{
-    private Azure $azure;
-
-    private ClientRegistry $clientRegistry;
-
-    private MachineTokenStorage $machineTokenStorage;
-
-    public function __construct(Azure $azure, ClientRegistry $clientRegistry, MachineTokenStorage $machineTokenStorage)
-    {
-        parent::__construct('chill:calendar:msgraph-grant-admin-consent');
-
-        $this->azure = $azure;
-        $this->clientRegistry = $clientRegistry;
-        $this->machineTokenStorage = $machineTokenStorage;
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        /** @var FormatterHelper $formatter */
-        $formatter = $this->getHelper('formatter');
-        $this->azure->scope = ['https://graph.microsoft.com/.default'];
-        $authorizationUrl = explode('?', $this->azure->getAuthorizationUrl(['prompt' => 'admin_consent']));
-
-        // replace the first part by the admin consent authorization url
-        $authorizationUrl[0] = strtr('https://login.microsoftonline.com/{tenant}/adminconsent', ['{tenant}' => $this->azure->tenant]);
-
-        $output->writeln('Go to the url');
-        $output->writeln(implode('?', $authorizationUrl));
-        $output->writeln('Authenticate as admin, and grant admin consent');
-
-        // not necessary ?
-        $helper = $this->getHelper('question');
-        $question = new ConfirmationQuestion('Access granted ?');
-
-        if (!$helper->ask($input, $output, $question)) {
-            $messages = ['No problem, we will wait for you', 'Grant access and come back here'];
-            $output->writeln($formatter->formatBlock($messages, 'warning'));
-
-            return 0;
-        }
-
-        $token = $this->machineTokenStorage->getToken();
-
-        $messages = ['Token acquired!', 'We could acquire a machine token successfully'];
-        $output->writeln($formatter->formatBlock($messages, 'success'));
-
-        $output->writeln('Token information:');
-        $output->writeln($token->getToken());
-        $output->writeln('Expires at: ' . $token->getExpires());
-        $output->writeln('To inspect the token content, go to https://jwt.ms/#access_token=' . urlencode($token->getToken()));
-
-        return 0;
-    }
-}

src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php

@@ -1,164 +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);
-
-namespace Chill\CalendarBundle\Command;
-
-use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\EventsOnUserSubscriptionCreator;
-use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MapCalendarToUser;
-use Chill\CalendarBundle\RemoteCalendar\Connector\MSGraph\MSGraphUserRepository;
-use DateInterval;
-use DateTimeImmutable;
-use Doctrine\ORM\EntityManagerInterface;
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class MapAndSubscribeUserCalendarCommand extends Command
-{
-    private EntityManagerInterface $em;
-
-    private EventsOnUserSubscriptionCreator $eventsOnUserSubscriptionCreator;
-
-    private LoggerInterface $logger;
-
-    private MapCalendarToUser $mapCalendarToUser;
-
-    private MSGraphUserRepository $userRepository;
-
-    public function __construct(
-        EntityManagerInterface $em,
-        EventsOnUserSubscriptionCreator $eventsOnUserSubscriptionCreator,
-        LoggerInterface $logger,
-        MapCalendarToUser $mapCalendarToUser,
-        MSGraphUserRepository $userRepository
-    ) {
-        parent::__construct('chill:calendar:msgraph-user-map-subscribe');
-
-        $this->em = $em;
-        $this->eventsOnUserSubscriptionCreator = $eventsOnUserSubscriptionCreator;
-        $this->logger = $logger;
-        $this->mapCalendarToUser = $mapCalendarToUser;
-        $this->userRepository = $userRepository;
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $this->logger->info(__CLASS__ . ' execute command');
-
-        $limit = 50;
-        $offset = 0;
-        /** @var DateInterval $interval the interval before the end of the expiration */
-        $interval = new DateInterval('P1D');
-        $expiration = (new DateTimeImmutable('now'))->add(new DateInterval($input->getOption('subscription-duration')));
-        $total = $this->userRepository->countByMostOldSubscriptionOrWithoutSubscriptionOrData($interval);
-        $created = 0;
-        $renewed = 0;
-
-        $this->logger->info(__CLASS__ . ' the number of user to get - renew', [
-            'total' => $total,
-            'expiration' => $expiration->format(DateTimeImmutable::ATOM),
-        ]);
-
-        while ($offset < ($total - 1)) {
-            $users = $this->userRepository->findByMostOldSubscriptionOrWithoutSubscriptionOrData(
-                $interval,
-                $limit,
-                $offset
-            );
-
-            foreach ($users as $user) {
-                if (!$this->mapCalendarToUser->hasUserId($user)) {
-                    $this->mapCalendarToUser->writeMetadata($user);
-                }
-
-                if ($this->mapCalendarToUser->hasUserId($user)) {
-                    // we first try to renew an existing subscription, if any.
-                    // if not, or if it fails, we try to create a new one
-                    if ($this->mapCalendarToUser->hasActiveSubscription($user)) {
-                        $this->logger->debug(__CLASS__ . ' renew a subscription for', [
-                            'userId' => $user->getId(),
-                            'username' => $user->getUsernameCanonical(),
-                        ]);
-
-                        ['secret' => $secret, 'id' => $id, 'expiration' => $expirationTs]
-                            = $this->eventsOnUserSubscriptionCreator->renewSubscriptionForUser($user, $expiration);
-                        $this->mapCalendarToUser->writeSubscriptionMetadata($user, $expirationTs, $id, $secret);
-
-                        if (0 !== $expirationTs) {
-                            ++$renewed;
-                        } else {
-                            $this->logger->warning(__CLASS__ . ' could not renew subscription for a user', [
-                                'userId' => $user->getId(),
-                                'username' => $user->getUsernameCanonical(),
-                            ]);
-                        }
-                    }
-
-                    if (!$this->mapCalendarToUser->hasActiveSubscription($user)) {
-                        $this->logger->debug(__CLASS__ . ' create a subscription for', [
-                            'userId' => $user->getId(),
-                            'username' => $user->getUsernameCanonical(),
-                        ]);
-
-                        ['secret' => $secret, 'id' => $id, 'expiration' => $expirationTs]
-                            = $this->eventsOnUserSubscriptionCreator->createSubscriptionForUser($user, $expiration);
-                        $this->mapCalendarToUser->writeSubscriptionMetadata($user, $expirationTs, $id, $secret);
-
-                        if (0 !== $expirationTs) {
-                            ++$created;
-                        } else {
-                            $this->logger->warning(__CLASS__ . ' could not create subscription for a user', [
-                                'userId' => $user->getId(),
-                                'username' => $user->getUsernameCanonical(),
-                            ]);
-                        }
-                    }
-                }
-
-                ++$offset;
-            }
-
-            $this->em->flush();
-            $this->em->clear();
-        }
-
-        $this->logger->warning(__CLASS__ . ' process executed', [
-            'created' => $created,
-            'renewed' => $renewed,
-        ]);
-
-        return 0;
-    }
-
-    protected function configure()
-    {
-        parent::configure();
-
-        $this
-            ->setDescription('MSGraph: collect user metadata and create subscription on events for users')
-            ->addOption(
-                'renew-before-end-interval',
-                'r',
-                InputOption::VALUE_OPTIONAL,
-                'delay before renewing subscription',
-                'P1D'
-            )
-            ->addOption(
-                'subscription-duration',
-                's',
-                InputOption::VALUE_OPTIONAL,
-                'duration for the subscription',
-                'PT4230M'
-            );
-    }
-}

src/Bundle/ChillCalendarBundle/Command/SendShortMessageOnEligibleCalendar.php

@@ -1,41 +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);
-
-namespace Chill\CalendarBundle\Command;
-
-use Chill\CalendarBundle\Service\ShortMessageNotification\BulkCalendarShortMessageSender;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class SendShortMessageOnEligibleCalendar extends Command
-{
-    private BulkCalendarShortMessageSender $messageSender;
-
-    public function __construct(BulkCalendarShortMessageSender $messageSender)
-    {
-        parent::__construct();
-
-        $this->messageSender = $messageSender;
-    }
-
-    public function getName()
-    {
-        return 'chill:calendar:send-short-messages';
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $this->messageSender->sendBulkMessageToEligibleCalendars();
-
-        return 0;
-    }
-}

src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php

@@ -1,200 +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);
-
-namespace Chill\CalendarBundle\Command;
-
-use Chill\CalendarBundle\Entity\Calendar;
-use Chill\CalendarBundle\Service\ShortMessageNotification\ShortMessageForCalendarBuilderInterface;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
-use Chill\MainBundle\Repository\UserRepositoryInterface;
-use Chill\MainBundle\Service\ShortMessage\ShortMessageTransporterInterface;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Repository\PersonRepository;
-use DateInterval;
-use DateTimeImmutable;
-use libphonenumber\PhoneNumber;
-use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumberType;
-use libphonenumber\PhoneNumberUtil;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Symfony\Component\Console\Question\Question;
-use UnexpectedValueException;
-use function count;
-
-class SendTestShortMessageOnCalendarCommand extends Command
-{
-    private ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder;
-
-    private PersonRepository $personRepository;
-
-    private PhoneNumberHelperInterface $phoneNumberHelper;
-
-    private PhoneNumberUtil $phoneNumberUtil;
-
-    private ShortMessageTransporterInterface $transporter;
-
-    private UserRepositoryInterface $userRepository;
-
-    public function __construct(
-        PersonRepository $personRepository,
-        PhoneNumberUtil $phoneNumberUtil,
-        PhoneNumberHelperInterface $phoneNumberHelper,
-        ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder,
-        ShortMessageTransporterInterface $transporter,
-        UserRepositoryInterface $userRepository
-    ) {
-        parent::__construct();
-
-        $this->personRepository = $personRepository;
-        $this->phoneNumberUtil = $phoneNumberUtil;
-        $this->phoneNumberHelper = $phoneNumberHelper;
-        $this->messageForCalendarBuilder = $messageForCalendarBuilder;
-        $this->transporter = $transporter;
-        $this->userRepository = $userRepository;
-    }
-
-    public function getName()
-    {
-        return 'chill:calendar:test-send-short-message';
-    }
-
-    protected function configure()
-    {
-        $this->setDescription('Test sending a SMS for a dummy calendar appointment');
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $calendar = new Calendar();
-        $calendar->setSendSMS(true);
-
-        /** @var QuestionHelper $helper */
-        $helper = $this->getHelper('question');
-
-        // start date
-        $question = new Question('When will start the appointment ? (default: "1 hour") ', '1 hour');
-        $startDate = new DateTimeImmutable($helper->ask($input, $output, $question));
-
-        if (false === $startDate) {
-            throw new UnexpectedValueException('could not create a date with this date and time');
-        }
-
-        $calendar->setStartDate($startDate);
-
-        // end date
-        $question = new Question('How long will last the appointment ? (default: "PT30M") ', 'PT30M');
-        $interval = new DateInterval($helper->ask($input, $output, $question));
-
-        if (false === $interval) {
-            throw new UnexpectedValueException('could not create the interval');
-        }
-
-        $calendar->setEndDate($calendar->getStartDate()->add($interval));
-
-        // a person
-        $question = new Question('Who will participate ? Give an id for a person. ');
-        $question
-            ->setValidator(function ($answer): Person {
-                if (!is_numeric($answer)) {
-                    throw new UnexpectedValueException('the answer must be numeric');
-                }
-
-                if (0 >= (int) $answer) {
-                    throw new UnexpectedValueException('the answer must be greater than zero');
-                }
-
-                $person = $this->personRepository->find((int) $answer);
-
-                if (null === $person) {
-                    throw new UnexpectedValueException('The person is not found');
-                }
-
-                return $person;
-            });
-
-        $person = $helper->ask($input, $output, $question);
-        $calendar->addPerson($person);
-
-        // a main user
-        $question = new Question('Who will be the main user ? Give an id for a user. ');
-        $question
-            ->setValidator(function ($answer): User {
-                if (!is_numeric($answer)) {
-                    throw new UnexpectedValueException('the answer must be numeric');
-                }
-
-                if (0 >= (int) $answer) {
-                    throw new UnexpectedValueException('the answer must be greater than zero');
-                }
-
-                $user = $this->userRepository->find((int) $answer);
-
-                if (null === $user) {
-                    throw new UnexpectedValueException('The user is not found');
-                }
-
-                return $user;
-            });
-
-        $user = $helper->ask($input, $output, $question);
-        $calendar->setMainUser($user);
-
-        // phonenumber
-        $phonenumberFormatted = null !== $person->getMobilenumber() ?
-            $this->phoneNumberUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164) : '';
-        $question = new Question(
-            sprintf('To which number are we going to send this fake message ? (default to: %s)', $phonenumberFormatted),
-            $phonenumberFormatted
-        );
-
-        $question->setNormalizer(function ($answer): PhoneNumber {
-            if (null === $answer) {
-                throw new UnexpectedValueException('The person is not found');
-            }
-
-            $phone = $this->phoneNumberUtil->parse($answer, 'BE');
-
-            if (!$this->phoneNumberUtil->isPossibleNumberForType($phone, PhoneNumberType::MOBILE)) {
-                throw new UnexpectedValueException('Phone number si not a mobile');
-            }
-
-            return $phone;
-        });
-
-        $phone = $helper->ask($input, $output, $question);
-
-        $question = new ConfirmationQuestion('really send the message to the phone ?');
-        $reallySend = (bool) $helper->ask($input, $output, $question);
-
-        $messages = $this->messageForCalendarBuilder->buildMessageForCalendar($calendar);
-
-        if (0 === count($messages)) {
-            $output->writeln('no message to send to this user');
-        }
-
-        foreach ($messages as $key => $message) {
-            $output->writeln("The short message for SMS {$key} will be: ");
-            $output->writeln($message->getContent());
-            $message->setPhoneNumber($phone);
-
-            if ($reallySend) {
-                $this->transporter->send($message);
-            }
-        }
-
-        return 0;
-    }
-}