Merge branch 'fix-prototypage-details' into deploy/quick-fixes

.gitlab-ci.yml

@@ -5,13 +5,11 @@ image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4
 cache:
   paths:
     - tests/app/vendor/
-    - .composer
 
 before_script:
   # add extensions to postgres
   - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;"
   # Install and run Composer
-  - mkdir -p $COMPOSER_HOME
   - curl -sS https://getcomposer.org/installer | php
   - php -d memory_limit=2G composer.phar install
   - php tests/app/bin/console doctrine:migrations:migrate -n
@@ -36,10 +34,6 @@ variables:
   REDIS_HOST: redis
   REDIS_PORT: 6379
   REDIS_URL: redis://redis:6379
-  # change vendor dir to make the app install into tests/apps
-  COMPOSER_VENDOR_DIR: tests/app/vendor
-  # cache some composer data
-  COMPOSER_HOME: .composer
 
 
 # Run our tests

composer.json

@@ -1,70 +1,9 @@
 {
     "name": "chill-project/chill-bundles",
+    "license": "AGPL-3.0-only",
     "type": "library",
     "description": "Most used bundles for chill-project",
-    "keywords": [
-        "chill",
-        "social worker"
-    ],
-    "license": "AGPL-3.0-only",
-    "require": {
-        "champs-libres/async-uploader-bundle": "dev-sf4",
-        "champs-libres/wopi-bundle": "dev-master",
-        "composer/package-versions-deprecated": "^1.10",
-        "doctrine/doctrine-bundle": "^2.1",
-        "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "^2.7",
-        "erusev/parsedown": "^1.7",
-        "graylog2/gelf-php": "^1.5",
-        "knplabs/knp-menu": "^3.1",
-        "knplabs/knp-menu-bundle": "^3.0",
-        "knplabs/knp-time-bundle": "^1.12",
-        "league/csv": "^9.7.1",
-        "nyholm/psr7": "^1.4",
-        "phpoffice/phpspreadsheet": "^1.16",
-        "sensio/framework-extra-bundle": "^5.5",
-        "symfony/asset": "4.*",
-        "symfony/browser-kit": "^5.2",
-        "symfony/css-selector": "^5.2",
-        "symfony/expression-language": "4.*",
-        "symfony/form": "4.*",
-        "symfony/intl": "4.*",
-        "symfony/monolog-bundle": "^3.5",
-        "symfony/security-bundle": "4.*",
-        "symfony/serializer": "^5.2",
-        "symfony/swiftmailer-bundle": "^3.5",
-        "symfony/templating": "4.*",
-        "symfony/translation": "4.*",
-        "symfony/twig-bundle": "^4.4",
-        "symfony/validator": "4.*",
-        "symfony/webpack-encore-bundle": "^1.11",
-        "symfony/workflow": "4.*",
-        "symfony/yaml": "4.*",
-        "twig/extra-bundle": "^2.12 || ^3.0",
-        "twig/intl-extra": "^3.0",
-        "twig/markdown-extra": "^3.3",
-        "twig/twig": "^2.12 || ^3.0"
-    },
-    "conflict": {
-        "symfony/symfony": "*"
-    },
-    "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "^3.3",
-        "fakerphp/faker": "^1.13",
-        "nelmio/alice": "^3.8",
-        "phpunit/phpunit": "^7.0",
-        "symfony/debug-bundle": "^5.1",
-        "symfony/dotenv": "^5.1",
-        "symfony/maker-bundle": "^1.20",
-        "symfony/phpunit-bridge": "^5.2",
-        "symfony/stopwatch": "^5.1",
-        "symfony/var-dumper": "4.*",
-        "symfony/web-profiler-bundle": "^5.0"
-    },
-    "config": {
-        "bin-dir": "bin",
-        "vendor-dir": "tests/app/vendor"
-    },
+    "keywords": ["chill", "social worker"],
     "autoload": {
         "psr-4": {
             "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle",
@@ -77,24 +16,75 @@
             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
-            "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
-            "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
-            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
-            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
-            "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src"
+            "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\": "tests/app/src/"
+          "App\\": "tests/app/src/"
         }
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
+    "require": {
+        "champs-libres/async-uploader-bundle": "dev-sf4",
+        "graylog2/gelf-php": "^1.5",
+        "symfony/form": "4.*",
+        "symfony/twig-bundle": "^4.4",
+        "twig/extra-bundle": "^2.12|^3.0",
+        "twig/twig": "^2.12|^3.0",
+        "composer/package-versions-deprecated": "^1.10",
+        "doctrine/doctrine-bundle": "^2.1",
+        "doctrine/doctrine-migrations-bundle": "^3.0",
+        "doctrine/orm": "^2.7",
+        "symfony/asset": "4.*",
+        "symfony/monolog-bundle": "^3.5",
+        "symfony/security-bundle": "4.*",
+        "symfony/translation": "4.*",
+        "symfony/validator": "4.*",
+        "sensio/framework-extra-bundle": "^5.5",
+        "symfony/yaml": "4.*",
+        "symfony/webpack-encore-bundle": "^1.11",
+        "knplabs/knp-menu": "^3.1",
+        "knplabs/knp-menu-bundle": "^3.0",
+        "symfony/templating": "4.*",
+        "twig/intl-extra": "^3.0",
+        "symfony/workflow": "4.*",
+        "symfony/expression-language": "4.*",
+        "knplabs/knp-time-bundle": "^1.12",
+        "symfony/intl": "4.*",
+        "symfony/swiftmailer-bundle": "^3.5",
+        "league/csv": "^9.6",
+        "phpoffice/phpspreadsheet": "^1.16",
+        "symfony/browser-kit": "^5.2",
+        "symfony/css-selector": "^5.2",
+        "twig/markdown-extra": "^3.3",
+        "erusev/parsedown": "^1.7",
+        "symfony/serializer": "^5.2",
+        "symfony/webpack-encore-bundle": "^1.11"
+    },
+    "conflict": {
+        "symfony/symfony": "*"
+    },
+    "require-dev": {
+        "fakerphp/faker": "^1.13",
+        "phpunit/phpunit": "^7.0",
+        "symfony/dotenv": "^5.1",
+        "symfony/maker-bundle": "^1.20",
+        "doctrine/doctrine-fixtures-bundle": "^3.3",
+        "symfony/stopwatch": "^5.1",
+        "symfony/web-profiler-bundle": "^5.0",
+        "symfony/var-dumper": "4.*",
+        "symfony/debug-bundle": "^5.1",
+        "symfony/phpunit-bridge": "^5.2",
+        "nelmio/alice": "^3.8"
+    },
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         }
+    },
+    "config": {
+      "vendor-dir": "tests/app/vendor",
+      "bin-dir": "bin"
     }
 }

docs/source/development/pagination.rst

@@ -28,7 +28,7 @@ Then, render the pagination using the dedicated twig function.
 
 .. code-block:: html+twig
 
-   {% extends "@ChillPerson/Person/layout.html.twig"  %}
+   {% extends "ChillPersonBundle::layout.html.twig"  %}
 
    {% block title 'Item list'|trans %}
 

docs/source/development/user-interface/layout-template-usage.rst

@@ -149,7 +149,7 @@ It proposes a new block :
 
   * where to display the admin content
 
-@ChillPersonBundle/Person/layout.html.twig
+ChillPersonBundle::layout.html.twig
 -----------------------------------
 
 This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the person details in the block `top_banner`, set the menu `person` as the vertical menu.

package.json.txt

@@ -1,3 +0,0 @@
-add npm/yarn dependency in package.json :
-
-"select2-bootstrap-theme": "0.1.0-beta.10",

phpunit.xml.dist

@@ -10,7 +10,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="APP_ENV" value="test" force="true" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" /> 
         <server name="SHELL_VERBOSITY" value="-1" />
     </php>
 
@@ -31,12 +31,6 @@
          <!-- temporarily removed, the time to find a fix -->
          <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
         </testsuite>
-        <testsuite name="AsideActivityBundle">
-          <directory suffix="Test.php">src/Bundle/ChillAsideActivityBundle/src/Tests/</directory>
-        </testsuite>
-        <testsuite name="CalendarBundle">
-            <directory suffix="Test.php">src/Bundle/ChillCalendarBundle/Tests/</directory>
-        </testsuite>
     </testsuites>
 
     <listeners>

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -22,9 +22,6 @@
 
 namespace Chill\ActivityBundle\Controller;
 
-use Chill\ActivityBundle\Repository\ActivityACLAwareRepository;
-use Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface;
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
@@ -39,7 +36,6 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Form\ActivityType;
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Symfony\Component\Serializer\SerializerInterface;
 
 /**
@@ -57,16 +53,12 @@ class ActivityController extends AbstractController
 
     protected SerializerInterface $serializer;
 
-    protected ActivityACLAwareRepositoryInterface $activityACLAwareRepository;
-
     public function __construct(
-        ActivityACLAwareRepositoryInterface $activityACLAwareRepository,
         EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper,
         LoggerInterface $logger,
         SerializerInterface $serializer
     ) {
-        $this->activityACLAwareRepository = $activityACLAwareRepository;
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
@@ -80,14 +72,18 @@ class ActivityController extends AbstractController
     {
         $em = $this->getDoctrine()->getManager();
         $view = null;
-        // TODO: add pagination
 
         [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($person instanceof Person) {
-            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
-            $activities = $this->activityACLAwareRepository
-                ->findByPerson($person, ActivityVoter::SEE, 0, null);
+            $reachableScopes = $this->authorizationHelper
+                ->getReachableCircles($this->getUser(), new Role('CHILL_ACTIVITY_SEE'),
+                    $person->getCenter());
+
+            $activities = $em->getRepository('ChillActivityBundle:Activity')->findBy(
+                ['person' => $person, 'scope' => $reachableScopes],
+                ['date' => 'DESC'],
+            );
 
             $event = new PrivacyEvent($person, array(
                 'element_class' => Activity::class,
@@ -97,10 +93,10 @@ class ActivityController extends AbstractController
 
             $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
         } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
-
-            $activities = $this->activityACLAwareRepository
-                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE);
+            $activities = $em->getRepository('ChillActivityBundle:Activity')->findBy(
+                ['accompanyingPeriod' => $accompanyingPeriod],
+                ['date' => 'DESC'],
+            );
 
             $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         }
@@ -140,12 +136,6 @@ class ActivityController extends AbstractController
             ];
         }
 
-        if ($request->query->has('activityData')) {
-            $activityData = $request->query->get('activityData');
-        } else {
-            $activityData = [];
-        }
-
         if ($view === null) {
             throw $this->createNotFoundException('Template not found');
         }
@@ -154,7 +144,6 @@ class ActivityController extends AbstractController
             'person' => $person,
             'accompanyingCourse' => $accompanyingPeriod,
             'data' => $data,
-            'activityData' => $activityData
         ]);
     }
 
@@ -174,19 +163,10 @@ class ActivityController extends AbstractController
         $activityType = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityType::class)
             ->find($activityType_id);
 
-        $activityData = null;
-        if ($request->query->has('activityData')) {
-            $activityData = $request->query->get('activityData');
-        }
-
         if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType ||
             !$activityType->isActive()) {
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-
-            if (null !== $activityData) {
-                $params['activityData'] = $activityData;
-            }
             return $this->redirectToRoute('chill_activity_activity_select_type', $params);
         }
 
@@ -204,50 +184,6 @@ class ActivityController extends AbstractController
         $entity->setType($activityType);
         $entity->setDate(new \DateTime('now'));
 
-        if ($request->query->has('activityData')) {
-            $activityData = $request->query->get('activityData');
-
-            if (array_key_exists('durationTime', $activityData)) {
-                $durationTimeInMinutes = $activityData['durationTime'];
-                $hours = floor($durationTimeInMinutes / 60);
-                $minutes = $durationTimeInMinutes % 60;
-                $duration = \DateTime::createFromFormat("H:i", $hours.':'.$minutes);
-                if ($duration) {
-                    $entity->setDurationTime($duration);
-                }
-            }
-
-            if (array_key_exists('date', $activityData)) {
-                $date = \DateTime::createFromFormat('Y-m-d', $activityData['date']);
-                if ($date) {
-                    $entity->setDate($date);
-                }
-            }
-
-            if (array_key_exists('personsId', $activityData)) {
-                foreach($activityData['personsId'] as $personId){
-                    $concernedPerson = $em->getRepository(\Chill\PersonBundle\Entity\Person::class)->find($personId);
-                    $entity->addPerson($concernedPerson);
-                }
-            }
-
-            if (array_key_exists('professionalsId', $activityData)) {
-                foreach($activityData['professionalsId'] as $professionalsId){
-                    $professional = $em->getRepository(\Chill\ThirdPartyBundle\Entity\ThirdParty::class)->find($professionalsId);
-                    $entity->addThirdParty($professional);
-                }
-            }
-
-            if (array_key_exists('comment', $activityData)) {
-                $comment = new CommentEmbeddable();
-                $comment->setComment($activityData['comment']);
-                $comment->setUserId($this->getUser()->getid());
-                $comment->setDate(new \DateTime('now'));
-                $entity->setComment($comment);
-            }
-
-        }
-
         // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
         // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
 
@@ -265,7 +201,6 @@ class ActivityController extends AbstractController
             $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
 
             $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-
             $params['id'] = $entity->getId();
 
             return $this->redirectToRoute('chill_activity_activity_show', $params);
@@ -303,7 +238,7 @@ class ActivityController extends AbstractController
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
-
+        
         if (null !== $accompanyingPeriod) {
            $entity->personsAssociated = $entity->getPersonsAssociated();
            $entity->personsNotAssociated = $entity->getPersonsNotAssociated();

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

@@ -22,7 +22,6 @@ class LoadActivityNotifications extends AbstractFixture implements DependentFixt
             'entityRef' => 'activity_gerard depardieu',
             'sender' => 'center a_social',
             'addressees' => [
-                'center a_social',
                 'center a_administrative',
                 'center a_direction',
                 'multi_center'

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -55,7 +55,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/controller.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/templating.yaml');
-        $loader->load('services/accompanyingPeriodConsistency.yaml');
     }
 
     public function prepend(ContainerBuilder $container)

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -23,7 +23,6 @@ namespace Chill\ActivityBundle\Entity;
 use Chill\DocStoreBundle\Entity\Document;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
@@ -61,7 +60,7 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
  *      path="scope")
  */
 
-class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPeriodLinkedWithSocialIssuesEntityInterface
+class Activity implements HasCenterInterface, HasScopeInterface
 {
     const SENTRECEIVED_SENT = 'sent';
     const SENTRECEIVED_RECEIVED = 'received';
@@ -283,7 +282,7 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         return $this->socialIssues;
     }
 
-    public function addSocialIssue(SocialIssue $socialIssue): self
+    public function addSocialIssue(?SocialIssue $socialIssue): self
     {
         if (!$this->socialIssues->contains($socialIssue)) {
             $this->socialIssues[] = $socialIssue;
@@ -304,7 +303,7 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         return $this->socialActions;
     }
 
-    public function addSocialAction(SocialAction $socialAction): self
+    public function addSocialAction(?SocialAction $socialAction): self
     {
         if (!$this->socialActions->contains($socialAction)) {
             $this->socialActions[] = $socialAction;
@@ -418,7 +417,7 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
         return $this->persons;
     }
 
-    public function getPersonsAssociated(): array
+    public function getPersonsAssociated(): array 
     {
         if (null !== $this->accompanyingPeriod) {
             $personsAssociated = [];
@@ -427,11 +426,11 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
                     $personsAssociated[] = $participation->getPerson();
                 }
             }
-            return $personsAssociated;
+            return $personsAssociated; 
         }
         return [];
     }
-
+    
     public function getPersonsNotAssociated(): array
     {
         if (null !== $this->accompanyingPeriod) {
@@ -444,7 +443,7 @@ class Activity implements HasCenterInterface, HasScopeInterface, AccompanyingPer
             return $personsNotAssociated;
         }
         return [];
-    }
+    }    
 
     public function setPersons(?Collection $persons): self
     {

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -224,8 +224,7 @@ class ActivityType extends AbstractType
 
         if ($activityType->isVisible('comment')) {
             $builder->add('comment', CommentType::class, [
-                'label' => empty($activityType->getLabel('comment')) 
-                    ? 'activity.comment' : $activityType->getLabel('comment'),
+                'label' => $activityType->getLabel('comment'),
                 'required' => $activityType->isRequired('comment'),
             ]);
         }

src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -36,7 +36,7 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         $period = $parameters['accompanyingCourse'];
 
         if (AccompanyingPeriod::STEP_DRAFT !== $period->getStep()) {
-            $menu->addChild($this->translator->trans('Activity'), [
+            $menu->addChild($this->translator->trans('Activity list'), [
                 'route' => 'chill_activity_activity_list',
                 'routeParameters' => [
                     'accompanying_period_id' => $period->getId(),

src/Bundle/ChillActivityBundle/Menu/MenuBuilder.php

@@ -0,0 +1,88 @@
+<?php
+/*
+ * 
+ */
+namespace Chill\ActivityBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Translation\TranslatorInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Role\Role;
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+
+/**
+ * 
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
+ */
+class MenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     *
+     * @var TokenStorageInterface
+     */
+    protected $tokenStorage;
+    
+    /**
+     *
+     * @var TranslatorInterface
+     */
+    protected $translator;
+    
+    /**
+     *
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
+    
+    public function __construct(
+        TokenStorageInterface $tokenStorage, 
+        TranslatorInterface $translator, 
+        AuthorizationHelper $authorizationHelper
+    ) {
+        $this->tokenStorage = $tokenStorage;
+        $this->translator = $translator;
+        $this->authorizationHelper = $authorizationHelper;
+    }
+
+    
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        /* @var $person \Chill\PersonBundle\Entity\Person */
+        $person  = $parameters['person'];
+        $user    = $this->tokenStorage->getToken()->getUser();
+        $roleSee = new Role(ActivityVoter::SEE);
+        $roleAdd = new Role(ActivityVoter::CREATE);
+        
+        if ($this->authorizationHelper->userHasAccess($user, $person, $roleSee)) {
+            $menu->addChild($this->translator->trans('Activity list'), [
+                    'route' => 'chill_activity_activity_list',
+                    'routeParameters' => [
+                        'person_id' => $person->getId()
+                    ]
+                ])
+                ->setExtras([
+                    'order' => 201
+                ]);
+        }
+        
+        if ($this->authorizationHelper->userHasAccess($user, $person, $roleAdd)) {
+            $menu->addChild($this->translator->trans('Add a new activity'), [
+                    'route' => 'chill_activity_activity_new',
+                    'routeParameters' => [
+                        'person_id' => $person->getId()
+                    ]
+                ])
+                ->setExtras([
+                    'order' => 200
+                ]);
+        }
+    }
+
+    public static function getMenuIds(): array
+    {
+        return [ 'person' ];
+    }
+}

src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php

@@ -15,7 +15,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-namespace Chill\ActivityBundle\Menu; 
+namespace Chill\ActivityBundle\Menu;
+
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
@@ -54,15 +55,26 @@ class PersonMenuBuilder implements LocalMenuBuilderInterface
     {
         /* @var $person \Chill\PersonBundle\Entity\Person */
         $person = $parameters['person'];
-        
-        if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
-            $menu->addChild(
-                $this->translator->trans('Activity list'), [
-                    'route' => 'chill_activity_activity_list',
-                    'routeParameters' => [ 'person_id' => $person->getId() ],
-                ])
-                ->setExtra('order', 201)
-                ;
+
+        if (false) {
+            if ($this->authorizationChecker->isGranted(ActivityVoter::SEE, $person)) {
+                $menu->addChild(
+                    $this->translator->trans('Activity list'), [
+                        'route' => 'chill_activity_activity_list',
+                        'routeParameters' => [ 'person_id' => $person->getId() ],
+                    ])
+                    ->setExtra('order', 201)
+                    ;
+            }
+            if ($this->authorizationChecker->isGranted(ActivityVoter::CREATE, $person)) {
+                $menu->addChild(
+                    $this->translator->trans('Add a new activity'), [
+                        'route' => 'chill_activity_activity_new',
+                        'routeParameters' => [ 'person_id' => $person->getId() ],
+                    ])
+                    ->setExtra('order', 200)
+                    ;
+            }
         }
     }
 

src/Bundle/ChillActivityBundle/Notification/ActivityNotificationRenderer.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Notification;
-
-use Chill\MainBundle\Entity\Notification;
-use Chill\ActivityBundle\Entity\Activity;
-
-final class ActivityNotificationRenderer
-{
-    public function supports(Notification $notification, array $options = []): bool
-    {
-        return $notification->getRelatedEntityClass() == Activity::class;
-    }
-
-    public function getTemplate()
-    {
-        return '@ChillActivity/Activity/showInNotification.html.twig';
-    }
-
-    public function getTemplateData(Notification $notification)
-    {
-        return ['notification' => $notification];
-    }
-}

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -23,8 +23,6 @@
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
 use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
@@ -35,10 +33,9 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Role\Role;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Component\Security\Core\Security;
 
 
-final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInterface
+final class ActivityACLAwareRepository 
 {
     private AuthorizationHelper $authorizationHelper;
 
@@ -48,63 +45,16 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
 
     private EntityManagerInterface $em;
 
-    private Security $security;
-
-    private CenterResolverDispatcher $centerResolverDispatcher;
-
     public function __construct(
         AuthorizationHelper $authorizationHelper,
-        CenterResolverDispatcher $centerResolverDispatcher,
         TokenStorageInterface $tokenStorage,
         ActivityRepository $repository,
-        EntityManagerInterface $em,
-        Security $security
+        EntityManagerInterface $em
     ) {
         $this->authorizationHelper = $authorizationHelper;
-        $this->centerResolverDispatcher = $centerResolverDispatcher;
         $this->tokenStorage = $tokenStorage;
         $this->repository = $repository;
         $this->em = $em;
-        $this->security = $security;
-    }
-
-    /**
-     * @param Person $person
-     * @param string $role
-     * @param int|null $start
-     * @param int|null $limit
-     * @param array $orderBy
-     * @return array|Activity[]
-     */
-    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
-    {
-        $user = $this->security->getUser();
-        $center = $this->centerResolverDispatcher->resolveCenter($person);
-        if (0 === count($orderBy)) {
-            $orderBy = ['date' => 'DESC'];
-        }
-
-        $reachableScopes = $this->authorizationHelper
-            ->getReachableCircles($user, $role, $center);
-
-        return $this->em->getRepository(Activity::class)
-            ->findByPersonImplied($person, $reachableScopes, $orderBy, $limit, $start);
-        ;
-    }
-
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array
-    {
-        $user = $this->security->getUser();
-        $center = $this->centerResolverDispatcher->resolveCenter($period);
-        if (0 === count($orderBy)) {
-            $orderBy = ['date' => 'DESC'];
-        }
-
-        $scopes = $this->authorizationHelper
-            ->getReachableCircles($user, $role, $center);
-
-        return $this->em->getRepository(Activity::class)
-            ->findByAccompanyingPeriod($period, $scopes, true, $limit, $start, $orderBy);
     }
 
     public function queryTimelineIndexer(string $context, array $args = []): array
@@ -131,7 +81,7 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $associationMapping = $metadataActivity->getAssociationMapping('person');
-
+        
         return $metadataActivity->getTableName().' JOIN '
             .$metadataPerson->getTableName().' ON '
             .$metadataPerson->getTableName().'.'.
@@ -145,7 +95,7 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
     {
         $where = '';
         $parameters = [];
-
+        
         $metadataActivity = $this->em->getClassMetadata(Activity::class);
         $metadataPerson = $this->em->getClassMetadata(Person::class);
         $activityToPerson = $metadataActivity->getAssociationMapping('person')['joinColumns'][0]['name'];
@@ -155,20 +105,20 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
 
         // acls:
         $role = new Role(ActivityVoter::SEE);
-        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(),
+        $reachableCenters = $this->authorizationHelper->getReachableCenters($this->tokenStorage->getToken()->getUser(), 
                 $role);
-
+        
         if (count($reachableCenters) === 0) {
             // insert a dummy condition
             return 'FALSE = TRUE';
         }
 
-        if ($context === 'person') {
-            // we start with activities having the person_id linked to person
+        if ($context === 'person') { 
+            // we start with activities having the person_id linked to person 
             $where .= sprintf('%s = ? AND ', $activityToPerson);
             $parameters[] = $person->getId();
         }
-
+        
         // we add acl (reachable center and scopes)
         $where .= '('; // first loop for the for centers
         $centersI = 0; // like centers#i
@@ -181,7 +131,7 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
             $reachableScopes = $this->authorizationHelper->getReachableScopes($this->tokenStorage->getToken()->getUser(), $role, $center);
             // we get the ids for those scopes
             $reachablesScopesId = array_map(
-                function(Scope $scope) { return $scope->getId(); },
+                function(Scope $scope) { return $scope->getId(); }, 
                 $reachableScopes
             );
 
@@ -212,7 +162,7 @@ final class ActivityACLAwareRepository implements ActivityACLAwareRepositoryInte
         }
         // close loop for centers
         $where .= ')';
-
+        
         return [$where, $parameters];
     }
 

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Repository;
-
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-
-interface ActivityACLAwareRepositoryInterface
-{
-    /**
-     * @return array|Activity[]
-     */
-    public function findByPerson(Person $person, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
-
-    /**
-     * @return array|Activity[]
-     */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, string $role, ?int $start = 0, ?int $limit = 1000, ?array $orderBy = []): array;
-}

src/Bundle/ChillActivityBundle/Repository/ActivityRepository.php

@@ -23,8 +23,6 @@
 namespace Chill\ActivityBundle\Repository;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
 
@@ -40,86 +38,5 @@ class ActivityRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, Activity::class);
     }
-
-    /**
-     * @param $person
-     * @param array $scopes
-     * @param string[] $orderBy
-     * @param int $limit
-     * @param int $offset
-     * @return array|Activity[]
-     */
-    public function findByPersonImplied(Person $person, array $scopes, ?array $orderBy = [ 'date' => 'DESC'], ?int $limit = 100, ?int $offset = 0): array
-    {
-        $qb = $this->createQueryBuilder('a');
-        $qb->select('a');
-
-        $qb
-            ->where($qb->expr()->in('a.scope', ':scopes'))
-            ->setParameter('scopes', $scopes)
-            ->andWhere(
-                $qb->expr()->orX(
-                    $qb->expr()->eq('a.person', ':person'),
-                    ':person MEMBER OF a.persons'
-                )
-            )
-            ->setParameter('person', $person)
-            ;
-
-        foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.'.$k, $dir);
-        }
-
-        $qb->setMaxResults($limit)->setFirstResult($offset);
-
-        return $qb->getQuery()
-            ->getResult();
-    }
-
-    /**
-     * @param AccompanyingPeriod $period
-     * @param array $scopes
-     * @param int|null $limit
-     * @param int|null $offset
-     * @param array|string[] $orderBy
-     * @return array|Activity[]
-     */
-    public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $scopes, ?bool $allowNullScope = false, ?int $limit = 100, ?int $offset = 0, array $orderBy = ['date' => 'desc']): array
-    {
-        $qb = $this->createQueryBuilder('a');
-        $qb->select('a');
-
-        if (!$allowNullScope) {
-            $qb
-                ->where($qb->expr()->in('a.scope', ':scopes'))
-                ->setParameter('scopes', $scopes)
-            ;
-        } else {
-            $qb
-                ->where(
-                    $qb->expr()->orX(
-                        $qb->expr()->in('a.scope', ':scopes'),
-                        $qb->expr()->isNull('a.scope')
-                    )
-                )
-                ->setParameter('scopes', $scopes)
-            ;
-        }
-
-        $qb
-            ->andWhere(
-                $qb->expr()->eq('a.accompanyingPeriod', ':period')
-            )
-            ->setParameter('period', $period)
-        ;
-
-        foreach ($orderBy as $k => $dir) {
-            $qb->addOrderBy('a.'.$k, $dir);
-        }
-
-        $qb->setMaxResults($limit)->setFirstResult($offset);
-
-        return $qb->getQuery()
-            ->getResult();
-    }
+    
 }

src/Bundle/ChillActivityBundle/Resources/public/chill/chillactivity.scss

@@ -1,142 +0,0 @@
-// Access to Bootstrap variables and mixins
-@import '~ChillMainAssets/module/bootstrap/shared';
-
-// activity creation first step: select type page
-div.new-activity-select-type {
-   div.activity-row {
-      display: flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      justify-content: center;
-      gap: 12px;
-
-      div.bloc {
-         width: 200px;
-         align-self: flex-end;
-         height: 140px;
-         display: flex;
-         justify-content: center;
-         align-items: center;
-      }
-   }
-}
-
-// exceptions for flex-table in list-records
-div.activity-list {
-   div.flex-table {
-      div.item-bloc {
-         div.item-row.main {
-            div.item-col {
-               &:first-child {
-                  flex-basis: 15%;
-               }
-               ul.list-content {
-                  li.social-issues, li.social-actions {
-                     .badge-primary {
-                        font-variant: small-caps;
-                        font-weight: bold;
-                        font-size: 88%;
-                        margin-bottom: 0.2em;
-                     }
-                  }
-                  li.social-issues .badge-primary {
-                     background-color: $orange;
-                  }
-                  li.social-actions .badge-primary {
-                     background-color: $green;
-                  }
-               }
-            }
-         }
-         div.item-row.comment {
-            margin-left: 15%;
-            blockquote.chill-user-quote {
-               margin-top: 0.5em;
-               margin-bottom: 0.5em;
-            }
-         }
-         div.item-row.details {
-            margin-left: 15%;
-
-            // override flex-bloc to adapt in list
-            // TODO refund this
-            div.accompanyingCourse.flex-bloc.concerned-groups {
-               margin: 0;
-               width: 100%;
-               justify-content: space-around;
-               div.item-bloc {
-                  box-shadow: unset;
-                  padding: 0;
-                  flex-basis: 25%;
-                  div.item-row {
-                     flex-direction: column;
-                     div.item-col {
-                        &:first-child {
-                           width: unset;
-                        }
-                        &:last-child {
-                           border-top: 0;
-                           margin-top: 0;
-                           padding-top: 0;
-                           ul.list-content {
-                              padding: 0;
-                           }
-                        }
-                     }
-                  }
-               }
-            }
-
-         }
-         ul.list-content {
-            list-style-type: none;
-            padding-left: 1em;
-            margin: 0 0;
-            li {
-               margin-bottom: 0.2em;
-            }
-         }
-      }
-      div.duration {
-         font-size: smaller;
-         padding-left: 1em;
-         margin-top: 1em;
-      }
-   }
-}
-
-// exceptions for flex-bloc in concerned-groups
-div.flex-bloc.concerned-groups {
-   margin-top: 1em;
-   div.item-bloc {
-      flex-grow: 0; flex-shrink: 0; flex-basis: 25%; //4 blocs
-      ul.list-content {
-         list-style-type: none;
-         padding-left: 0;
-         li {
-            margin-bottom: 0.2em;
-            a {
-               color: $white;
-               cursor: pointer;
-               &:hover {
-                  color: #ffffffab;
-               }
-            }
-         }
-      }
-   }
-   &.person div.item-bloc {
-      flex-basis: 33%; //3 blocs
-   }
-}
-
-
-/// CHILL ENTITY RENDER BOX
-.chill-entity {
-
-   /// ACTIVITY-REASON
-   &.entity-activity-reason {
-      margin-right: 0.3em;
-      font-size: 120%;
-   }
-}

src/Bundle/ChillActivityBundle/Resources/public/chill/index.js

@@ -1 +0,0 @@
-require('./chillactivity.scss');

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

@@ -0,0 +1 @@
+require('./scss/chillactivity.scss');

src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss

@@ -0,0 +1,130 @@
+@import '~ChillMainSass/custom/config/colors';
+@import '~ChillMainSass/custom/mixins/entity';
+
+.chill-entity.chill-entity__activity-reason {
+    @include entity($chill-pink, white);
+}
+
+.activity {
+    color: $chill-green;
+}
+
+// exceptions for flex-bloc in concerned-groups
+div.flex-bloc.concerned-groups {
+   margin-top: 1em;
+   div.item-bloc {
+      flex-grow: 0; flex-shrink: 0; flex-basis: 25%; //4 blocs
+      ul.list-content {
+         list-style-type: none;
+         padding-left: 0;
+         li {
+            margin-bottom: 0.2em;
+            a {
+               color: white;
+               cursor: pointer;
+               &:hover {
+                  color: #ffffffab;
+               }
+            }
+         }
+      }
+   }
+   &.person div.item-bloc {
+      flex-basis: 33%; //3 blocs
+   }
+}
+
+// exceptions for flex-table in list-records
+div.flex-table.list-records {
+   div.item-bloc {
+      div.item-row.main {
+         div.item-col {
+            &:first-child {
+               flex-basis: 27%;
+            }
+            ul.list-content {
+               li.social-issues, li.social-actions {
+                  .badge-primary {
+                     font-variant: small-caps;
+                     font-weight: bold;
+                     font-size: 88%;
+                     margin-bottom: 0.2em;
+                  }
+               }
+               li.social-issues .badge-primary {
+                  background-color: var(--chill-orange);
+               }
+               li.social-actions .badge-primary {
+                  background-color: var(--chill-green);
+               }
+            }
+         }
+      }
+      div.item-row.details {
+         flex-direction: row;
+         & > div.item-col {
+            justify-content: flex-start;
+            align-self: center;
+            &:nth-child(1) {
+               flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
+            }
+            &:nth-child(2) {
+               flex-grow: 0; flex-shrink: 1; flex-basis: 70%;
+            }
+            
+            &:only-child {
+               flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
+               & > div.concerned-groups {
+                  flex-grow: 0; flex-shrink: 0; flex-basis: 100%;
+                  display: flex;
+                  flex-direction: column; // TODO pas fini
+                  div.group {
+                     flex-grow: 1; flex-shrink: 0; flex-basis: 30%;
+                     h4 {} 
+                     ul.list-content {
+                        li { 
+                           display: inline;
+                        } 
+                     }
+                  }
+               }
+            }
+         }
+         div.concerned-groups {
+            font-size: 85%;
+            h4 {
+               text-transform: uppercase;
+            }
+         }
+      }
+      ul.list-content {
+         list-style-type: none;
+         padding-left: 1em;
+         margin: 0 0;
+         li {
+            margin-bottom: 0.2em;
+         }
+      }
+   }
+   div.duration {
+      font-size: smaller;
+      padding-left: 1em;
+      margin-top: 1em;
+   }
+}
+
+div.activity-row {
+   display: flex;
+   flex-direction: row;
+   flex-wrap: wrap;
+   justify-content: center;
+   gap: 12px;
+   div.bloc {
+      width: 200px;
+      align-self: flex-end;
+      height: 140px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+   }
+}

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

@@ -2,7 +2,7 @@
    <teleport to="#add-persons">
 
       <div class="flex-bloc concerned-groups" :class="getContext">
-         <persons-bloc
+         <persons-bloc 
             v-for="bloc in contextPersonsBlocs"
             v-bind:key="bloc.key"
             v-bind:bloc="bloc"
@@ -10,15 +10,7 @@
          </persons-bloc>
       </div>
 
-     <div v-if="getContext === 'accompanyingCourse' && filterSuggestedPersons.length > 0">
-        <ul>
-          <li v-for="p in filterSuggestedPersons" @click="addNewPerson(p)">
-             {{ p.text }}
-          </li>
-        </ul>
-     </div>
-
-      <add-persons
+      <add-persons 
          buttonTitle="activity.add_persons"
          modalTitle="activity.add_persons"
          v-bind:key="addPersons.key"
@@ -26,12 +18,12 @@
          @addNewPersons="addNewPersons"
          ref="addPersons">
       </add-persons>
-
-  </teleport>
+ 
+  </teleport>  
 </template>
 
 <script>
-import { mapState, mapGetters } from 'vuex';
+import { mapState } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import PersonsBloc from './ConcernedGroups/PersonsBloc.vue';
 
@@ -44,36 +36,36 @@ export default {
    data() {
       return {
          personsBlocs: [
-            {  key: 'persons',
-               title: 'activity.bloc_persons',
-               persons: [],
-               included: false
+            {  key: 'persons', 
+               title: 'activity.bloc_persons', 
+               persons: [], 
+               included: false 
             },
-            {  key: 'personsAssociated',
-               title: 'activity.bloc_persons_associated',
-               persons: [],
-               included: false
+            {  key: 'personsAssociated', 
+               title: 'activity.bloc_persons_associated', 
+               persons: [], 
+               included: false 
             },
-            {  key: 'personsNotAssociated',
-               title: 'activity.bloc_persons_not_associated',
-               persons: [],
-               included: false
+            {  key: 'personsNotAssociated', 
+               title: 'activity.bloc_persons_not_associated', 
+               persons: [], 
+               included: false 
             },
-            {  key: 'thirdparty',
-               title: 'activity.bloc_thirdparty',
-               persons: [],
+            {  key: 'thirdparty', 
+               title: 'activity.bloc_thirdparty', 
+               persons: [], 
                included: true
             },
-            {  key: 'users',
-               title: 'activity.bloc_users',
-               persons: [],
+            {  key: 'users', 
+               title: 'activity.bloc_users', 
+               persons: [], 
                included: true
             },
          ],
          addPersons: {
             key: 'activity',
             options: {
-               type: ['person', 'thirdparty', 'user'], // TODO add 'user'
+               type: ['person', 'thirdparty'], // TODO add 'user'
                priority: null,
                uniq: false,
             }
@@ -87,9 +79,6 @@ export default {
          users: state => state.activity.users,
          accompanyingCourse: state => state.activity.accompanyingPeriod
       }),
-      ...mapGetters([
-          'filterSuggestedPersons'
-      ]),
       getContext() {
          return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
       },
@@ -102,10 +91,10 @@ export default {
    },
    methods: {
       setPersonsInBloc() {
-         let groups;
+         let groups; 
          if (this.accompanyingCourse) {
             groups = this.splitPersonsInGroups();
-         }
+         }     
          this.personsBlocs.forEach(bloc => {
             if (this.accompanyingCourse) {
                switch (bloc.key) {
@@ -120,7 +109,7 @@ export default {
                }
             } else {
                switch (bloc.key) {
-                  case 'persons':
+                  case 'persons': 
                      bloc.persons = this.persons;
                      bloc.included = true;
                      break;
@@ -139,7 +128,7 @@ export default {
       splitPersonsInGroups() {
          let personsAssociated = [];
          let personsNotAssociated = this.persons;
-         let participations = this.getCourseParticipations();
+         let participations = this.getCourseParticipations();         
          this.persons.forEach(person => {
             participations.forEach(participation => {
                if (person.id === participation.id) {
@@ -149,9 +138,9 @@ export default {
                }
             });
          });
-         return {
-            'personsAssociated': personsAssociated,
-            'personsNotAssociated': personsNotAssociated
+         return { 
+            'personsAssociated': personsAssociated, 
+            'personsNotAssociated': personsNotAssociated 
          };
       },
       getCourseParticipations() {
@@ -172,11 +161,7 @@ export default {
          this.$refs.addPersons.resetSearch(); // to cast child method
          modal.showModal = false;
          this.setPersonsInBloc();
-      },
-      addNewPerson(person) {
-        this.$store.dispatch('addPersonsInvolved', { result: person, type: 'person' });
-        this.setPersonsInBloc();
-      },
+      }
    }
 }
 </script>

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

@@ -1,6 +1,6 @@
 <template>
    <li>
-      <span class="badge bg-primary" :title="person.text">
+      <span class="badge badge-primary" :title="person.text">
          <span class="chill_denomination">
             {{ textCutted }}
          </span>

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

@@ -1,11 +1,11 @@
 <template>
    <teleport to="#social-issues-acc">
       
-      <div class="mb-3 row">
-         <div class="col-4">
-            <label class="col-form-label">{{ $t('activity.social_issues') }}</label>
+      <div class="container">
+         <div class="grid-4 clear">
+            <label>{{ $t('activity.social_issues') }}</label>
          </div>
-         <div class="col-8">
+         <div class="grid-8">
             
             <check-social-issue
                v-for="issue in socialIssuesList"
@@ -41,11 +41,11 @@
          </div>
       </div>
 
-      <div class="mb-3 row">
-         <div class="col-4">
-            <label class="col-form-label">{{ $t('activity.social_actions') }}</label>
+      <div class="container">
+         <div class="grid-4 clear">
+            <label>{{ $t('activity.social_actions') }}</label>
          </div>
-         <div class="col-8">
+         <div class="grid-8">
             
             <div v-if="actionIsLoading === true">
                <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>

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

@@ -1,20 +1,18 @@
 <template>
    <span class="inline-choice">
-      <div class="form-check">
-   
-         <input class="form-check-input"
-            type="checkbox" 
-            v-model="selected"
-            name="action"
-            v-bind:id="action.id" 
-            v-bind:value="action"
-            />
-         <label class="form-check-label" v-bind:for="action.id">
-            {{ action.text }}
-         </label>
-         
-      </div>
-   </span>
+      
+      <input 
+         type="checkbox" 
+         v-model="selected"
+         name="action"
+         v-bind:id="action.id" 
+         v-bind:value="action"
+         />
+      <label class="inline" v-bind:for="action.id">
+         {{ action.text }}
+      </label>
+      
+   </span><br>
 </template>
 
 <script>

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

@@ -1,20 +1,18 @@
 <template>
    <span class="inline-choice">
-      <div class="form-check">
       
-         <input class="form-check-input"
-            type="checkbox" 
-            v-model="selected"
-            name="issue"
-            v-bind:id="issue.id" 
-            v-bind:value="issue"
-            />
-         <label class="form-check-label" v-bind:for="issue.id">
-            {{ issue.text }}
-         </label>
-         
-      </div>
-   </span>
+      <input 
+         type="checkbox" 
+         v-model="selected"
+         name="issue"
+         v-bind:id="issue.id" 
+         v-bind:value="issue"
+         />
+      <label class="inline" v-bind:for="issue.id">
+         {{ issue.text }}
+      </label>
+      
+   </span><br>
 </template>
 
 <script>

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

@@ -5,175 +5,165 @@ const debug = process.env.NODE_ENV !== 'production';
 //console.log('window.activity', window.activity);
 
 const addIdToValue = (string, id) => {
-  let array = string ? string.split(',') : [];
-  array.push(id.toString());
-  let str = array.join();
-  return str;
+   let array = string ? string.split(',') : [];
+   array.push(id.toString());
+   let str = array.join();
+   return str;
 };
 
 const removeIdFromValue = (string, id) => {
-  let array = string.split(',');
-  array = array.filter(el => el !== id.toString());
-  let str = array.join();
-  return str;
+   let array = string.split(',');
+   array = array.filter(el => el !== id.toString());
+   let str = array.join();
+   return str;
 };
 
 const store = createStore({
-  strict: debug,
-  state: {
-    activity: window.activity,
-    socialIssuesOther: [],
-    socialActionsList: [],
-  },
-  getters: {
-    filterSuggestedPersons(state) {
-      if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
-        return [];
+   strict: debug,
+   state: {
+     activity: window.activity,
+     socialIssuesOther: [],
+     socialActionsList: [],
+   },
+   mutations: {
+      
+      // SocialIssueAcc
+      addIssueInList(state, issue) {
+         //console.log('add issue list', issue.id);
+         state.activity.accompanyingPeriod.socialIssues.push(issue);         
+      },
+      addIssueSelected(state, issue) {
+         //console.log('add issue selected', issue.id);
+         state.activity.socialIssues.push(issue);
+      },
+      updateIssuesSelected(state, issues) {
+         //console.log('update issues selected', issues);
+         state.activity.socialIssues = issues;
+      },
+      updateIssuesOther(state, payload) {
+         //console.log('update issues other');
+         state.socialIssuesOther = payload;
+      },
+      removeIssueInOther(state, issue) {
+         //console.log('remove issue other', issue.id);
+         state.socialIssuesOther = state.socialIssuesOther.filter(i => i.id !== issue.id);
+      },
+      resetActionsList(state) {
+         //console.log('reset list actions');
+         state.socialActionsList = [];
+      },
+      addActionInList(state, action) {
+         //console.log('add action list', action.id);
+         state.socialActionsList.push(action);         
+      },
+      updateActionsSelected(state, actions) {
+         //console.log('update actions selected', actions);
+         state.activity.socialActions = actions;
+      },
+      filterList(state, list) {
+         const filterList = (list) => {
+            // remove duplicates entries
+            list = list.filter((value, index) => list.findIndex(array => array.id === value.id) === index);
+            // alpha sort
+            list.sort((a,b) => (a.text > b.text) ? 1 : ((b.text > a.text) ? -1 : 0));
+            return list;
+         };
+         if (list === 'issues') {
+            state.activity.accompanyingPeriod.socialIssues = filterList(state.activity.accompanyingPeriod.socialIssues);
+         }
+         if (list === 'actions') {
+            state.socialActionsList = filterList(state.socialActionsList);
+         }
+      },
+      
+      // ConcernedGroups
+      addPersonsInvolved(state, payload) {
+         //console.log('### mutation addPersonsInvolved', payload.result.type);
+         switch (payload.result.type) {
+            case 'person':
+               state.activity.persons.push(payload.result);
+               break;
+            case 'thirdparty':
+               state.activity.thirdParties.push(payload.result);
+               break;
+            case 'user':
+               state.activity.users.push(payload.result); 
+               break;
+         };
+      },
+      removePersonInvolved(state, payload) {
+         //console.log('### mutation removePersonInvolved', payload.type);
+         switch (payload.type) {
+            case 'person':
+               state.activity.persons = state.activity.persons.filter(person => person !== payload);
+               break;
+            case 'thirdparty':
+               state.activity.thirdParties = state.activity.thirdParties.filter(thirdparty => thirdparty !== payload);
+               break;
+            case 'user':
+               state.activity.users = state.activity.users.filter(user => user !== payload); 
+               break;
+         };
       }
-      let existingPersonIds = state.activity.persons.map(p => p.id);
-      return state.activity.accompanyingPeriod.participations.filter(p => p.endDate === null)
-        .map(p => p.person)
-        .filter(p => !existingPersonIds.includes(p.id))
-    }
-  },
-  mutations: {
-    // SocialIssueAcc
-    addIssueInList(state, issue) {
-      //console.log('add issue list', issue.id);
-      state.activity.accompanyingPeriod.socialIssues.push(issue);
-    },
-    addIssueSelected(state, issue) {
-      //console.log('add issue selected', issue.id);
-      state.activity.socialIssues.push(issue);
-    },
-    updateIssuesSelected(state, issues) {
-      //console.log('update issues selected', issues);
-      state.activity.socialIssues = issues;
-    },
-    updateIssuesOther(state, payload) {
-      //console.log('update issues other');
-      state.socialIssuesOther = payload;
-    },
-    removeIssueInOther(state, issue) {
-      //console.log('remove issue other', issue.id);
-      state.socialIssuesOther = state.socialIssuesOther.filter(i => i.id !== issue.id);
-    },
-    resetActionsList(state) {
-      //console.log('reset list actions');
-      state.socialActionsList = [];
-    },
-    addActionInList(state, action) {
-      //console.log('add action list', action.id);
-      state.socialActionsList.push(action);
-    },
-    updateActionsSelected(state, actions) {
-      //console.log('update actions selected', actions);
-      state.activity.socialActions = actions;
-    },
-    filterList(state, list) {
-      const filterList = (list) => {
-        // remove duplicates entries
-        list = list.filter((value, index) => list.findIndex(array => array.id === value.id) === index);
-        // alpha sort
-        list.sort((a,b) => (a.text > b.text) ? 1 : ((b.text > a.text) ? -1 : 0));
-        return list;
-      };
-      if (list === 'issues') {
-        state.activity.accompanyingPeriod.socialIssues = filterList(state.activity.accompanyingPeriod.socialIssues);
+   },
+   actions: {
+      addIssueSelected({ commit }, issue) {
+         let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
+         aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
+         commit('addIssueSelected', issue);
+      },
+      updateIssuesSelected({ commit }, payload) {
+         let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
+         aSocialIssues.value = '';
+         payload.forEach(item => {
+            aSocialIssues.value = addIdToValue(aSocialIssues.value, item.id);
+         });
+         commit('updateIssuesSelected', payload);
+      },
+      updateActionsSelected({ commit }, payload) {
+         let aSocialActions = document.getElementById("chill_activitybundle_activity_socialActions");
+         aSocialActions.value = '';
+         payload.forEach(item => {
+            aSocialActions.value = addIdToValue(aSocialActions.value, item.id);
+         });
+         commit('updateActionsSelected', payload);
+      },
+      addPersonsInvolved({ commit }, payload) {
+         //console.log('### action addPersonsInvolved', payload.result.type);
+         switch (payload.result.type) {
+            case 'person':
+               let aPersons = document.getElementById("chill_activitybundle_activity_persons");
+               aPersons.value = addIdToValue(aPersons.value, payload.result.id);
+               break;
+            case 'thirdparty':
+               let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
+               aThirdParties.value = addIdToValue(aThirdParties.value, payload.result.id);
+               break;
+            case 'user':
+               let aUsers = document.getElementById("chill_activitybundle_activity_users");
+               aUsers.value = addIdToValue(aUsers.value, payload.result.id);
+               break;
+         };
+         commit('addPersonsInvolved', payload);
+      },
+      removePersonInvolved({ commit }, payload) {
+         //console.log('### action removePersonInvolved', payload);
+         switch (payload.type) {
+            case 'person':
+               let aPersons = document.getElementById("chill_activitybundle_activity_persons");
+               aPersons.value = removeIdFromValue(aPersons.value, payload.id);
+               break;
+            case 'thirdparty':
+               let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
+               aThirdParties.value = removeIdFromValue(aThirdParties.value, payload.id);
+               break;
+            case 'user':
+               let aUsers = document.getElementById("chill_activitybundle_activity_users");
+               aUsers.value = removeIdFromValue(aUsers.value, payload.id);
+               break;
+         };
+         commit('removePersonInvolved', payload);
       }
-      if (list === 'actions') {
-        state.socialActionsList = filterList(state.socialActionsList);
-      }
-    },
-
-    // ConcernedGroups
-    addPersonsInvolved(state, payload) {
-      //console.log('### mutation addPersonsInvolved', payload.result.type);
-      switch (payload.result.type) {
-        case 'person':
-          state.activity.persons.push(payload.result);
-          break;
-        case 'thirdparty':
-          state.activity.thirdParties.push(payload.result);
-          break;
-        case 'user':
-          state.activity.users.push(payload.result);
-          break;
-      };
-    },
-    removePersonInvolved(state, payload) {
-      //console.log('### mutation removePersonInvolved', payload.type);
-      switch (payload.type) {
-        case 'person':
-          state.activity.persons = state.activity.persons.filter(person => person !== payload);
-          break;
-        case 'thirdparty':
-          state.activity.thirdParties = state.activity.thirdParties.filter(thirdparty => thirdparty !== payload);
-          break;
-        case 'user':
-          state.activity.users = state.activity.users.filter(user => user !== payload);
-          break;
-      };
-    }
-  },
-  actions: {
-    addIssueSelected({ commit }, issue) {
-      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
-      aSocialIssues.value = addIdToValue(aSocialIssues.value, issue.id);
-      commit('addIssueSelected', issue);
-    },
-    updateIssuesSelected({ commit }, payload) {
-      let aSocialIssues = document.getElementById("chill_activitybundle_activity_socialIssues");
-      aSocialIssues.value = '';
-      payload.forEach(item => {
-        aSocialIssues.value = addIdToValue(aSocialIssues.value, item.id);
-      });
-      commit('updateIssuesSelected', payload);
-    },
-    updateActionsSelected({ commit }, payload) {
-      let aSocialActions = document.getElementById("chill_activitybundle_activity_socialActions");
-      aSocialActions.value = '';
-      payload.forEach(item => {
-        aSocialActions.value = addIdToValue(aSocialActions.value, item.id);
-      });
-      commit('updateActionsSelected', payload);
-    },
-    addPersonsInvolved({ commit }, payload) {
-      //console.log('### action addPersonsInvolved', payload.result.type);
-      switch (payload.result.type) {
-        case 'person':
-          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
-          aPersons.value = addIdToValue(aPersons.value, payload.result.id);
-          break;
-        case 'thirdparty':
-          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
-          aThirdParties.value = addIdToValue(aThirdParties.value, payload.result.id);
-          break;
-        case 'user':
-          let aUsers = document.getElementById("chill_activitybundle_activity_users");
-          aUsers.value = addIdToValue(aUsers.value, payload.result.id);
-          break;
-      };
-      commit('addPersonsInvolved', payload);
-    },
-    removePersonInvolved({ commit }, payload) {
-      //console.log('### action removePersonInvolved', payload);
-      switch (payload.type) {
-        case 'person':
-          let aPersons = document.getElementById("chill_activitybundle_activity_persons");
-          aPersons.value = removeIdFromValue(aPersons.value, payload.id);
-          break;
-        case 'thirdparty':
-          let aThirdParties = document.getElementById("chill_activitybundle_activity_thirdParties");
-          aThirdParties.value = removeIdFromValue(aThirdParties.value, payload.id);
-          break;
-        case 'user':
-          let aUsers = document.getElementById("chill_activitybundle_activity_users");
-          aUsers.value = removeIdFromValue(aUsers.value, payload.id);
-          break;
-      };
-      commit('removePersonInvolved', payload);
-    }
   }
 });
 

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

@@ -59,11 +59,8 @@
                     {% for item in bloc.items %}
                     <li>
                         <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                            <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
-                                {{ item|chill_entity_render_box({
-                                    'render': 'raw',
-                                    'addAltNames': false
-                                }) }}
+                            <span class="badge badge-primary">
+                                {{ item|chill_entity_render_box({'only_denomination': true}) }}
                             </span>
                         </a>
                     </li>
@@ -75,7 +72,7 @@
     {% endfor %}
 </div>
 {% endif %}
-
+    
 {% if (with_display == 'row') %}
 <div class="concerned-groups">
     {% for bloc in blocs %}
@@ -86,11 +83,8 @@
                 {% for item in bloc.items %}
                 <li>
                     <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                        <span class="{% if (badge_person is defined and badge_person == true) %}badge-person{% else %}badge bg-primary{% endif %}">
-                            {{ item|chill_entity_render_box({
-                                'render': 'raw',
-                                'addAltNames': false
-                            }) }}
+                        <span class="badge badge-primary">
+                            {{ item|chill_entity_render_box({'only_denomination': true}) }}
                         </span>
                     </a>
                 </li>

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

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 {% set person = activity.person %}

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

@@ -1,5 +1,8 @@
-<h1>{{ "Update activity"|trans }}</h1>
-<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
+<h1>{{ "Update activity"|trans ~ ' :' }}
+    <span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
+        {{ entity.type.name|localize_translatable_string }}
+    </span>
+</h1>
 
 {{ form_start(edit_form) }}
 {{ form_errors(edit_form) }}
@@ -54,7 +57,7 @@
     {{ form_row(edit_form.date) }}
 {% endif %}
 
-{# TODO .. location #}
+.. location
 
 {%- if edit_form.durationTime is defined -%}
     {{ form_row(edit_form.durationTime) }}
@@ -65,7 +68,7 @@
 {% endif %}
 
 {%- if edit_form.comment is defined -%}
-    {# TODO .. public and private #}
+    .. public and private
     {{ form_row(edit_form.comment) }}
 {% endif %}
 
@@ -77,7 +80,7 @@
     {{ form_row(edit_form.attendee) }}
 {% endif %}
 
-{# TODO .. status #}
+.. status
 
 {% set person_id = null %}
 {% if entity.person %}
@@ -91,12 +94,12 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="btn btn-cancel">
+            <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id  } ) }}" class="sc-button bt-cancel">
                 {{ 'Cancel'|trans }}
             </a>
         </li>
         <li>
-            <button class="btn btn-update" type="submit">{{ 'Save'|trans }}</button>
+            <button class="sc-button bt-update" type="submit">{{ 'Save activity'|trans }}</button>
         </li>
     </ul>
 {{ form_end(edit_form) }}

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

@@ -5,17 +5,12 @@
 {% block title  'Update activity'|trans %}
 
 {% block content %}
-<div class="activity-edit">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
-            
-</div>
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
 {% endblock %}
 
 {% block js %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
@@ -27,7 +22,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

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

@@ -14,23 +14,19 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
 {% block title  'Update activity'|trans %}
 
 {% block personcontent %}
-<div class="activity-edit">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
-            
-</div>
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
@@ -42,6 +38,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

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

@@ -1,186 +1,179 @@
-<div class="activity-list context-{{ context }}">
+{% set person_id = null %}
+{% if person %}
+    {% set person_id = person.id %}
+{% endif %}
 
-    {% if activities|length == 0 %}
-        <p class="chill-no-data-statement">
-            {{ "There isn't any activities."|trans }}
-            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-sm btn-create"></a>
-        </p>
+{% set accompanying_course_id = null %}
+{% if accompanyingCourse %}
+    {% set accompanying_course_id = accompanyingCourse.id %}
+{% endif %}
 
-    {% else %}
-        <div class="flex-table">
-            {% for activity in activities %}
-                {% set t = activity.type %}
-                <div class="item-bloc">
-                    <div class="item-row main">
-                        <div class="item-col">
+<h2>{{ 'Activity list' |trans }}</h2>
 
-                            {% if activity.date %}
-                                <h3>{{ activity.date|format_date('long') }}</h3>
-                            {% endif %}
+{% if activities|length == 0 %}
+    <p class="chill-no-data-statement">
+        {{ "There isn't any activities."|trans }}
+        <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create button-small"></a>
+    </p>
+{% else %}
 
-                            <div class="duration">
-                                {% if activity.durationTime and t.durationTimeVisible %}
-                                    <p>
-                                        <i class="fa fa-fw fa-hourglass-end"></i>
-                                        {{ activity.durationTime|date('H:i') }}
-                                    </p>
-                                {% endif %}
-                                {% if activity.travelTime and t.travelTimeVisible %}
-                                    <p>
-                                        <i class="fa fa-fw fa-car"></i>
-                                        {{ activity.travelTime|date('H:i') }}
-                                    </p>
-                                {% endif %}
-                            </div>
-
-                            {% if context == 'person' and activity.accompanyingPeriod is not empty %}
-                                <div class="mt-3">
-                                    <a class="btn btn-sm btn-outline-primary"
-                                       title="{{ 'Period number %number%'|trans({'%number%': activity.accompanyingPeriod.id}) }}"
-                                       href="{{ chill_path_add_return_path(
-                                           "chill_person_accompanying_course_index",
-                                           { 'accompanying_period_id': activity.accompanyingPeriod.id }
-                                       ) }}"><i class="fa fa-random"></i>
-                                    </a>
-                                </div>
-                            {% endif %}
-
-                        </div>
-                        <div class="item-col">
-
-                            <div class="float-button top">
-                                <div class="box">
-
-                                    <div class="action">
-                                        <ul class="record_actions">
-                                <li>
-                                    <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
-                                       class="btn btn-sm btn-show "></a>
-                                </li>
-                                {% if no_action is not defined or no_action == false %}
-                                    {# TODO
-                                        {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
-                                    #}
-                                    <li>
-                                        <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
-                                           class="btn btn-sm btn-update "></a>
-                                    </li>
-                                    {# TODO
-                                        {% endif %}
-                                        {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
-                                    #}
-                                    <li>
-                                        <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
-                                           class="btn btn-sm btn-delete "></a>
-                                    </li>
-                                    {# TODO
-                                        {% endif %}
-                                    #}
-                                {% endif %}
-                            </ul>
-                                    </div>
-
-                                    <ul class="list-content">
-
-                                        {% if activity.user and t.userVisible %}
-                                            <li>
-                                                <abbr class="referrer" title="{{ 'Referrer'|trans }}">ref:</abbr>
-                                                <b>{{ activity.user.usernameCanonical }}</b>
-                                            </li>
-                                        {% endif %}
-
-                                        <li>
-                                            <b>{{ activity.type.name | localize_translatable_string }}</b>
-
-                                            {% if activity.attendee is not null and t.attendeeVisible %}
-                                                {% if activity.attendee %}
-                                                    {{ '→ ' ~ 'present'|trans|capitalize }}
-                                                {% else %}
-                                                    {{ '→ ' ~ 'not present'|trans|capitalize }}
-                                                {% endif %}
-                                            {% endif %}
-                                        </li>
-
-                                        <li>
-                                            <b>{{ 'location'|trans ~ ': ' }}</b>
-                                            Domicile de l'usager
-
-                                            {# TODO {% if activity.location %}{{ activity.location }}{% endif %}
-                                            #}
-
-                                        </li>
-
-                                        {%- if t.reasonsVisible -%}
-                                            <li>
-                                                {%- if activity.reasons is not empty -%}
-                                                    {% for r in activity.reasons %}
-                                                        {{ r|chill_entity_render_box }}
-                                                    {% endfor %}
-                                                {%- endif -%}
-                                            </li>
-                                        {% endif %}
-
-                                        {%- if t.socialIssuesVisible %}
-                                            <li class="social-issues">
-                                                {%- if activity.socialIssues is not empty -%}
-                                                    {% for r in activity.socialIssues %}
-                                                        {{ r|chill_entity_render_box }}
-                                                    {% endfor %}
-                                                {%- endif -%}
-                                            </li>
-                                        {% endif %}
-
-                                        {%- if t.socialActionsVisible -%}
-                                            <li class="social-actions">
-                                                {%- if activity.socialActions is not empty -%}
-                                                    {% for r in activity.socialActions %}
-                                                        {{ r|chill_entity_render_box }}
-                                                    {% endfor %}
-                                                {%- endif -%}
-                                            </li>
-                                        {% endif %}
-
-
-                                    </ul>
-
-
-
-
-                                </div>
-                            </div>
-
-                        </div>
-                    </div>
-
-
-                    {%  if activity.comment.comment is not empty
-                        or activity.persons|length > 0
-                        or activity.thirdParties|length > 0
-                        or activity.users|length > 0
-                    %}
-                        <div class="item-row comment separator">
-                            {% if activity.comment.comment is not empty %}
-                                {{ activity.comment|chill_entity_render_box({
-                                    'disable_markdown': false,
-                                    'limit_lines': 3,
-                                    'metadata': false,
-                                }) }}
-                            {% endif %}
-                        </div>
-                        <div class="item-row details">
-                            {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
-                                'context': context,
-                                'with_display': 'bloc',
-                                'entity': activity,
-                                'badge_person': true
-                            } %}
-                        </div>
+<div class="flex-table list-records {{ context }}">
+    <!--
+    <thead>
+        <tr>
+            <th class="chill-red">{{'Date' | trans }}</th>
+            <th class="chill-green">{{'Duration Time' | trans }}</th>
+            <th class="chill-orange">{{'Reasons' | trans}}</th>
+            <th>{{'Type' | trans}}</th>
+            <th>&nbsp;</th>
+        </tr>
+    </thead>
+-->
+    {% for activity in activities %}
+        {% set t = activity.type %}
+        <div class="item-bloc">
+            <div class="item-row main">
+                <div class="item-col">
+                                        
+                    {% if activity.date %}
+                        <h3>{{ activity.date|format_date('long') }}</h3>
                     {% endif %}
-
-
+                   
+                    <div class="duration">
+                      {% if t.durationTimeVisible > 0 %}
+                        <p>
+                            <i class="fa fa-fw fa-hourglass-end"></i>
+                            {{ activity.durationTime|date('H:i') }}
+                        </p>
+                      {% endif %}
+                        
+                        {% if activity.travelTime and t.travelTimeVisible %}
+                        <p>
+                            <i class="fa fa-fw fa-car"></i>
+                            {{ activity.travelTime|date('H:i') }}
+                        </p>
+                        {% endif %}
+                    </div>
+                    
                 </div>
-            {% endfor %}
-        </div>
-    {% endif %}
+                <div class="item-col">
+                    <ul class="list-content">
+                        {% if activity.user and t.userVisible %}
+                        <li>
+                            <b>{{ 'by'|trans }}{{ activity.user.usernameCanonical }}</b>
+                        </li>
+                        {% endif %}
+                        
+                        <li>
+                            <b>{{ activity.type.name | localize_translatable_string }}</b>
+                            
+                            {% if activity.attendee is not null and t.attendeeVisible %}
+                                {% if activity.attendee %}
+                                    {{ '→ ' ~ 'present'|trans|capitalize }} 
+                                {% else %} 
+                                    {{ '→ ' ~ 'not present'|trans|capitalize }}
+                                {% endif %}
+                            {% endif %}
+                        </li>
+                        
+                        <li>
+                            <b>{{ 'location'|trans ~ ': ' }}</b>
+                            Domicile de l'usager
+                            {#
+                                {% if activity.location %}{{ activity.location }}{% endif %}
+                            #}
+                        </li>
+                        
+                        {%- if t.reasonsVisible -%}
+                        <li>
+                            {%- if activity.reasons is empty -%}
+                                <span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span>
+                            {%- else -%}
+                                {% for r in activity.reasons %}
+                                    {{ r|chill_entity_render_box }}
+                                {% endfor %}
+                            {%- endif -%}
+                        </li>
+                        {% endif %}
 
+                        {%- if t.socialIssuesVisible %}
+                            <li class="social-issues">
+                                {%- if activity.socialIssues is empty -%}
+                                    <span class="chill-no-data-statement">{{ 'No social issues associated'|trans }}</span>
+                                {%- else -%}
+                                    {% for r in activity.socialIssues %}
+                                      {{ r|chill_entity_render_box }}
+                                    {% endfor %}
+                                {%- endif -%}
+                            </li>
+                        {% endif %}
+                        
+                        {%- if t.socialActionsVisible -%}
+                            <li class="social-actions">
+                                {%- if activity.socialActions is empty -%}
+                                    <span class="chill-no-data-statement">{{ 'No social actions associated'|trans }}</span>
+                                {%- else -%}
+                                    {% for r in activity.socialActions %}
+                                        <span class="badge badge-primary">{{ r.title|localize_translatable_string }}</span>
+                                    {% endfor %}
+                                {%- endif -%}
+                            </li>
+                        {% endif %}
+
+                        
+                    </ul>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="sc-button bt-show "></a>
+                        </li>
+                        {# TOOD
+                        {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
+                        #}
+                        <li>
+                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}" class="sc-button bt-update "></a>
+                        </li>
+                        {# TOOD
+                        {% endif %}
+                        {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
+                        #}
+                        <li>
+                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="sc-button bt-delete "></a>
+                        </li>
+                        {#
+                        {% endif %}
+                        #}
+                    </ul>
+                </div>
+            </div>
+            
+            {%  
+                if activity.comment.comment is not empty 
+                or activity.persons|length > 0
+                or activity.thirdParties|length > 0
+                or activity.users|length > 0 
+            %}
+            <div class="item-row details">
+                <div class="item-col">
+                    {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'row', 'entity': activity } %}
+                </div>
+                
+                {% if activity.comment.comment is not empty %}
+                <div class="item-col comment">
+                    {{ activity.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+                </div>
+                {% endif %}
+            </div>
+            {% endif %}
+            
+        </div>
+    {% endfor %}
 </div>
+{% endif %}
+
+<ul class="record_actions">
+    <li>
+        <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create">
+            {{ 'Add a new activity' | trans }}
+        </a>
+    </li>
+</ul>

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

@@ -5,27 +5,5 @@
 {% block title %}{{ 'Activity list' |trans }}{% endblock title %}
 
 {% block content %}
-
-    {% set person_id = null %}
-    {% if person %}
-        {% set person_id = person.id %}
-    {% endif %}
-
-    {% set accompanying_course_id = null %}
-    {% if accompanyingCourse %}
-        {% set accompanying_course_id = accompanyingCourse.id %}
-    {% endif %}
-
-    <h1>{{ 'Activity list' |trans }}</h1>
-
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse'} %}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li>
-            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-create">
-                {{ 'Add a new activity' | trans }}
-            </a>
-        </li>
-    </ul>
-
 {% endblock %}

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

@@ -14,34 +14,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
 {% block title %}{{ 'Activity list' |trans }}{% endblock title %}
 
 {% block personcontent %}
-
-    {% set person_id = null %}
-    {% if person %}
-        {% set person_id = person.id %}
-    {% endif %}
-
-    {% set accompanying_course_id = null %}
-    {% if accompanyingCourse %}
-        {% set accompanying_course_id = accompanyingCourse.id %}
-    {% endif %}
-
-    <h1>{{ 'Activity list' |trans }}</h1>
-
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li>
-            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
-               class="btn btn-create disabled" tabindex="-1" role="button" aria-disabled="true">{{ 'Add a new activity' | trans }}
-            </a>
-        </li>
-    </ul>
-
 {% endblock %}

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

@@ -1,5 +1,8 @@
-<h1>{{ "Activity creation"|trans ~ ' :' }}</h1>
-<h2 class="chill-green mb-4">{{ entity.type.name|localize_translatable_string }}</h2>
+<h1>{{ "Activity creation"|trans ~ ' :' }}
+    <span style="font-size: 70%; text-transform: lowercase; margin-left: 1em;">
+        {{ entity.type.name|localize_translatable_string }}
+    </span>
+</h1>
 
 {{ form_start(form) }}
 {{ form_errors(form) }}
@@ -55,7 +58,7 @@
     {{ form_row(form.date) }}
 {% endif %}
 
-{# TODO .. location #}
+.. location
 
 {%- if form.durationTime is defined -%}
     {{ form_row(form.durationTime) }}
@@ -66,7 +69,7 @@
 {% endif %}
 
 {%- if form.comment is defined -%}
-    {# TODO .. public and private #}
+    .. public and private
     {{ form_row(form.comment) }}
 {% endif %}
 
@@ -78,13 +81,13 @@
     {{ form_row(form.attendee) }}
 {% endif %}
 
-{# TODO .. status #}
+.. status
 
 <ul class="record_actions sticky-form-buttons">
   <li class="cancel">
-    <a
-      class="btn btn-cancel"
-      {%- if context == 'person' -%}
+    <a 
+      class="sc-button bt-cancel"
+      {%- if context == 'person' -%} 
       href="{{ chill_return_path_or('chill_activity_activity_list', { 'person_id': person.id } )}}"
       {%- else -%}
       href="{{ chill_return_path_or('chill_activity_activity_list', { 'accompanying_period_id': accompanyingCourse.id } )}}"
@@ -94,8 +97,8 @@
     </a>
   </li>
   <li>
-    <button class="btn btn-create" type="submit">
-      {{ 'Create'|trans }}
+    <button class="sc-button bt-create" type="submit">
+      {{ 'Add a new activity'|trans }}
     </button>
   </li>
 </ul>

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

@@ -5,29 +5,23 @@
 {% block title 'Activity creation' |trans %}
 
 {% block content %}
-<div class="activity-new">
-
     <div id="activity"></div> {# <=== vue component #}
     {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
-
-</div>
 {% endblock %}
 
 {% block js %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_script_tags('async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
-            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
+            chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
             '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
         });
-        window.activity = {{ activity_json|json_encode|raw }};
+        window.activity = {{ activity_json|json_encode|raw }}; 
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
 {% endblock %}
 
 {% block css %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

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

@@ -1,20 +1,16 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_new' %}
 
 {% block title 'Activity creation' |trans %}
 
 {% block personcontent %}
-<div class="activity-new">
-            
-            <div id="activity"></div> {# <=== vue component #}
-            {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
-            
-</div>
+    <div id="activity"></div> {# <=== vue component #}
+    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
@@ -26,6 +22,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

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

@@ -1,35 +1,28 @@
-<div class="new-activity-select-type">
-    <h2 class="chill-red">{{ "Activity creation"|trans }}</h2>
+<h2 class="chill-red">{{ "Activity creation"|trans }}</h2>
 
-    {# TODO: refaire l'html css des tuilles #}
+{# TODO: refaire l'html css des tuilles #}
 
-    {% for row in data %}
-        <h3>{{ row.activityTypeCategory.name|localize_translatable_string }}</h3>
-        <div class="activity-row">
-            {% for activityType in row.activityTypes %}
+{% for row in data %}
+    <h3>{{ row.activityTypeCategory.name|localize_translatable_string }}</h3>
+    <div class="activity-row">
+        {% for activityType in row.activityTypes %}
 
-                {% set person_id = null %}
-                {% if person %}
-                    {% set person_id = person.id %}
-                {% endif %}
+            {% set person_id = null %}
+            {% if person %}
+                {% set person_id = person.id %}
+            {% endif %}
 
-                {% set accompanying_course_id = null %}
-                {% if accompanyingCourse %}
-                    {% set accompanying_course_id = accompanyingCourse.id %}
-                {% endif %}
+            {% set accompanying_course_id = null %}
+            {% if accompanyingCourse %}
+                {% set accompanying_course_id = accompanyingCourse.id %}
+            {% endif %}
 
-                <a href="{{ path('chill_activity_activity_new', {
-                    'person_id': person_id,
-                    'activityType_id': activityType.id,
-                    'accompanying_period_id': accompanying_course_id,
-                    'activityData': activityData
-                }) }}">
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'activityType_id': activityType.id, 'accompanying_period_id': accompanying_course_id }) }}">
 
-                    <div class="bloc btn btn-primary btn-lg btn-block">
-                        {{ activityType.name|localize_translatable_string }}
-                    </div>
-                </a>
-            {% endfor %}
-        </div>
-    {% endfor %}
-</div>
+                <div class="bloc btn btn-primary btn-lg btn-block">
+                    {{ activityType.name|localize_translatable_string }}
+                </div>
+            </a>
+        {% endfor %}
+    </div>
+{% endfor %}

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

@@ -1,4 +1,4 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_new' %}
 

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

@@ -4,7 +4,7 @@
 <h1>
   {{ "Activity"|trans }}
   {%- if t.emergencyVisible and entity.emergency -%}
-  <span class="badge bg-secondary">
+  <span class="badge badge-secondary">
     {{- 'Emergency'|trans -}}
   </span>
 {%- endif -%}
@@ -64,26 +64,16 @@
 
     {% if t.durationTimeVisible %}
     <dt class="inline">{{ 'Duration Time'|trans }}</dt>
-    <dd>{% if entity.durationTime is not null %}
-            {{ entity.durationTime|date('H:i') }}
-        {% else %}
-            {{ 'None'|trans|capitalize }}
-        {% endif %}
-    </dd>
+    <dd>{{ entity.durationTime|date('H:i') }}</dd>
     {% endif %}
 
     {% if t.travelTimeVisible %}
     <dt class="inline">{{ 'Travel Time'|trans }}</dt>
-    <dd>{% if entity.travelTime is not null %}
-            {{ entity.travelTime|date('H:i') }}
-        {% else %}
-            {{ 'None'|trans|capitalize }}
-        {% endif %}
-    </dd>
+    <dd>{{ entity.travelTime|date('H:i') }}</dd>
     {% endif %}
 
     {% if t.commentVisible %}
-    <dt class="inline">{{ 'activity.comment'|trans }}</dt>
+    <dt class="inline">{{ 'Comment'|trans }}</dt>
       {%- if entity.comment.empty -%}
           <dd><span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span></dd>
       {%- else -%}
@@ -119,28 +109,25 @@
     {% set accompanying_course_id = accompanyingCourse.id %}
 {% endif %}
 
-<ul class="record_actions sticky-form-buttons">
+<ul class="record_actions">
     <li class="cancel">
-        <a class="btn btn-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}">
+        <a class="sc-button bt-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person_id, 'accompanying_period_id': accompanying_course_id } ) }}">
             {{ 'Back to the list'|trans }}
         </a>
     </li>
     <li>
-        <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
-            {{ 'Edit'|trans }}
-        </a>
+    <a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
+        {{ 'Edit the activity'|trans }}
+    </a>
     </li>
-
     {# TODO
     {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
     #}
-
     <li>
-        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
+        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="sc-button bt-delete">
             {{ 'Delete'|trans }}
         </a>
     </li>
-
     {#
     {% endif %}
     #}

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

@@ -2,14 +2,10 @@
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
-{% block title 'Show the activity'|trans %}
+{% block title 'Activity'|trans %}
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block content -%}
-<div class="activity-show">
-
-            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
-
-</div>
+    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
 {% endblock content %}

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

@@ -1,4 +0,0 @@
-
-{{ dump(notification) }}
-
-<a href="{{ path('chill_activity_activity_show', {'id': notification.relatedEntityId })  }}">Go to Activity</a>

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

@@ -1,15 +1,11 @@
-{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
 {% set activeRouteKey = 'chill_activity_activity_list' %}
 
-{% block title 'Show the activity'|trans %}
+{% block title 'Activity'|trans %}
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
 
 {% block personcontent -%}
-<div class="activity-show">
-
-            {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
-
-</div>
+    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
 {% endblock personcontent %}

src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig

@@ -25,7 +25,7 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_crud_activity_presence_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                            <a href="{{ path('chill_crud_activity_presence_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                         </li>
                     </ul>
                 </td>
@@ -36,7 +36,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_crud_activity_presence_new') }}" class="btn btn-create">
+            <a href="{{ path('chill_crud_activity_presence_new') }}" class="sc-button bt-create">
                 {{ 'Create a new activity presence'|trans }}
             </a>
         </li>

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

@@ -26,10 +26,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'btn btn-chill-orange' } } ) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button orange' } } ) }}
         </li>
     </ul>
 

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/index.html.twig

@@ -33,10 +33,10 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -47,7 +47,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activityreason_new') }}" class="btn btn-new">
+            <a href="{{ path('chill_activity_activityreason_new') }}" class="sc-button bt-new">
                 {{ 'Create a new activity reason'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/new.html.twig

@@ -26,10 +26,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_row(form.submit, { 'attr': { 'class' : 'btn btn-new' } } ) }}
+            {{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
         </li>
     </ul>
 

src/Bundle/ChillActivityBundle/Resources/views/ActivityReason/show.html.twig

@@ -40,12 +40,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreason') }}" class="btn btn-cancel">
+            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="btn btn-edit">
+            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
                 {{ 'Edit'|trans }}
             </a>
         </li>

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

@@ -25,12 +25,12 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            {{ form_row(edit_form.submit, { 'attr': { 'class': 'btn btn-edit' } } ) }}
+            {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button bt-edit' } } ) }}
         </li>
     </ul>
 

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/index.html.twig

@@ -34,10 +34,10 @@
                 <td>
                     <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -48,7 +48,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="btn btn-new">
+            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="sc-button bt-new">
                 {{ 'Create a new activity category reason'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/new.html.twig

@@ -25,10 +25,10 @@
 
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr': { 'class' : 'btn btn-new' } } ) }}
+            {{ form_widget(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
         </li>
     </ul>
     {{ form_end(form) }}

src/Bundle/ChillActivityBundle/Resources/views/ActivityReasonCategory/show.html.twig

@@ -39,12 +39,12 @@
     </table>
     <ul class="record_actions">
         <li class="cancel">
-            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="btn btn-cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="btn btn-edit">
+            <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
                 {{ 'Edit'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/ActivityType/index.html.twig

@@ -41,7 +41,7 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_crud_activity_type_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_crud_activity_type_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -52,7 +52,7 @@
 
         <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_crud_activity_type_new') }}" class="btn btn-create">
+            <a href="{{ path('chill_crud_activity_type_new') }}" class="sc-button bt-create">
                 {{ 'Create a new activity type'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig

@@ -25,7 +25,7 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_crud_activity_type_category_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                            <a href="{{ path('chill_crud_activity_type_category_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                         </li>
                     </ul>
                 </td>
@@ -36,7 +36,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_crud_activity_type_category_new') }}" class="btn btn-create">
+            <a href="{{ path('chill_crud_activity_type_category_new') }}" class="sc-button bt-create">
                 {{ 'Create a new activity type category'|trans }}
             </a>
         </li>

src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig

@@ -29,13 +29,13 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activity_show', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="btn btn-view">
+            <a href="{{ path('chill_activity_activity_show', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-view">
                 {{ 'Show the activity'|trans }}
             </a>
         </li>
         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
         <li>
-            <a href="{{ path('chill_activity_activity_edit', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="btn btn-edit">
+            <a href="{{ path('chill_activity_activity_edit', { 'person_id': activity.person.id, 'id': activity.id} ) }}" class="sc-button bt-edit">
                 {{ 'Edit the activity'|trans }}
             </a>
         </li>

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

@@ -19,11 +19,6 @@
 
 namespace Chill\ActivityBundle\Security\Authorization;
 
-use Chill\MainBundle\Security\Authorization\VoterHelperFactoryInterface;
-use Chill\MainBundle\Security\Authorization\VoterHelperInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
 use Chill\MainBundle\Security\Authorization\AbstractChillVoter;
@@ -33,10 +28,11 @@ use Chill\MainBundle\Entity\User;
 use Chill\ActivityBundle\Entity\Activity;
 use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\Security\Core\Role\Role;
-use Symfony\Component\Security\Core\Security;
 
 /**
- * Voter for Activity class
+ *
+ *
+ * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
 class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
 {
@@ -45,37 +41,30 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
     const SEE_DETAILS = 'CHILL_ACTIVITY_SEE_DETAILS';
     const UPDATE = 'CHILL_ACTIVITY_UPDATE';
     const DELETE = 'CHILL_ACTIVITY_DELETE';
-    const FULL = 'CHILL_ACTIVITY_FULL';
 
-    private const ALL = [
-        self::CREATE,
-        self::SEE,
-        self::UPDATE,
-        self::DELETE,
-        self::SEE_DETAILS,
-        self::FULL
-    ];
+    /**
+     *
+     * @var AuthorizationHelper
+     */
+    protected $helper;
 
-    protected VoterHelperInterface $voterHelper;
-
-    protected Security $security;
-
-    public function __construct(
-        Security $security,
-        VoterHelperFactoryInterface $voterHelperFactory
-    ) {
-        $this->security = $security;
-        $this->voterHelper = $voterHelperFactory->generate(self::class)
-            ->addCheckFor(Person::class, [self::SEE, self::CREATE])
-            ->addCheckFor(AccompanyingPeriod::class, [self::SEE, self::CREATE])
-            ->addCheckFor(Activity::class, self::ALL)
-            ->build();
+    public function __construct(AuthorizationHelper $helper)
+    {
+        $this->helper = $helper;
     }
 
 
     protected function supports($attribute, $subject)
     {
-        return $this->voterHelper->supports($attribute, $subject);
+        if ($subject instanceof Activity) {
+            return \in_array($attribute, $this->getAttributes());
+        } elseif ($subject instanceof Person) {
+            return $attribute === self::SEE 
+                ||
+                $attribute === self::CREATE;
+        } else {
+            return false;
+        }
     }
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
@@ -83,34 +72,32 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
         if (!$token->getUser() instanceof User) {
             return false;
         }
-
-        if ($subject instanceof Activity) {
-            if ($subject->getPerson() instanceof Person) {
-                // the context is person: we must have the right to see the person
-                if (!$this->security->isGranted(PersonVoter::SEE, $subject->getPerson())) {
-                    return false;
-                }
-            } elseif ($subject->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
-                if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $subject->getAccompanyingPeriod())) {
-                    return false;
-                }
-            } else {
-                throw new \RuntimeException("could not determine context of activity");
-            }
+        
+        if ($subject instanceof Person) {
+            $centers = $this->helper->getReachableCenters($token->getUser(), new Role($attribute));
+            
+            return \in_array($subject->getCenter(), $centers);
         }
-
-        return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
+        
+        /* @var $subject Activity */
+        return $this->helper->userHasAccess($token->getUser(), $subject, $attribute);
+    }
+    
+    private function getAttributes()
+    {
+        return [ self::CREATE, self::SEE, self::UPDATE, self::DELETE,
+                  self::SEE_DETAILS ];
     }
 
 
     public function getRoles()
     {
-        return self::ALL;
+        return $this->getAttributes();
     }
 
     public function getRolesWithoutScope()
     {
-        return [];
+        return array();
     }
 
 

src/Bundle/ChillActivityBundle/Templating/Entity/ActivityReasonRender.php

@@ -35,37 +35,35 @@ class ActivityReasonRender extends AbstractChillEntityRender
      * @var TranslatableStringHelper
      */
     protected $translatableStringHelper;
-
+    
     public function __construct(TranslatableStringHelper $translatableStringHelper)
     {
         $this->translatableStringHelper = $translatableStringHelper;
     }
 
-
+    
     public function renderBox($entity, array $options): string
     {
         return
             $this->getDefaultOpeningBox('activity-reason').
-            '<span class="badge bg-chill-pink">'.
             '<i class="fa fa-question-circle"></i>&nbsp;'.
-            '<span class="category">'.
+            '<span class="activity-reason__category">'.
             $this->translatableStringHelper->localize(
                 $entity->getCategory()->getName()
             ).
             '</span>'.
-            '<span class="separator">&nbsp;>&nbsp;</span>'.
-            '<span class="reason">'.
+            '<span class="activity-reason__separator">&nbsp;>&nbsp;</span>'.
+            '<span class="activity-reason__reason">'.
             $this->translatableStringHelper->localize(
                 $entity->getName()
             ).
             '</span>'.
-            '</span>'.
             $this->getDefaultClosingBox()
             ;
     }
 
     /**
-     *
+     * 
      * @param ActivityReason $entity
      * @param array $options
      * @return string
@@ -73,12 +71,12 @@ class ActivityReasonRender extends AbstractChillEntityRender
     public function renderString($entity, array $options): string
     {
         $category = '';
-
+        
         if (null !== $entity->getCategory()) {
             $category = $this->translatableStringHelper->localize(
                 $entity->getCategory()->getName()). ' > ';
         }
-
+        
         return $category .
             $this->translatableStringHelper->localize(
                 $entity->getName()

src/Bundle/ChillActivityBundle/chill.webpack.config.js

@@ -1,11 +1,10 @@
 // this file loads all assets from the Chill person bundle
-module.exports = function(encore, entries)
-{
-    entries.push(__dirname + '/Resources/public/chill/index.js');
-
+module.exports = function(encore, entries) {
+    entries.push(__dirname + '/Resources/public/index.js');
+    
     encore.addAliases({
         ChillActivityAssets: __dirname + '/Resources/public'
     });
-
+    
     encore.addEntry('vue_activity', __dirname + '/Resources/public/vuejs/Activity/index.js');
 };

src/Bundle/ChillActivityBundle/config/services.yaml

@@ -1,5 +1,21 @@
-services:
-
+services:     
+    chill.activity.security.authorization.activity_voter:
+        class: Chill\ActivityBundle\Security\Authorization\ActivityVoter
+        arguments:
+            - "@chill.main.security.authorization.helper"
+        tags:
+            - { name: security.voter }
+            - { name: chill.role }
+            
+    chill.activity.security.authorization.activity_stats_voter:
+        class: Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter
+        arguments:
+            - "@chill.main.security.authorization.helper"
+        tags:
+            - { name: security.voter }
+            - { name: chill.role }
+            
+            
     chill.activity.timeline:
         class: Chill\ActivityBundle\Timeline\TimelineActivityProvider
         arguments:
@@ -17,13 +33,3 @@ services:
         autoconfigure: true
         resource: '../Menu/'
         tags: ['chill.menu_builder']
-
-    Chill\ActivityBundle\Notification\:
-        autowire: true
-        autoconfigure: true
-        resource: '../Notification'
-
-    Chill\ActivityBundle\Security\Authorization\:
-        resource: '../Security/Authorization/'
-        autowire: true
-        autoconfigure: true

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

@@ -1,14 +0,0 @@
-services:
-    accompanying_period_social_issue_consistency_for_activity:
-        class: 'Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodSocialIssueConsistencyEntityListener'
-        tags:
-            -
-                name: 'doctrine.orm.entity_listener'
-                event: 'prePersist'
-                entity: 'Chill\ActivityBundle\Entity\Activity'
-                lazy: true
-            -
-                name: 'doctrine.orm.entity_listener'
-                event: 'preUpdate'
-                entity: 'Chill\ActivityBundle\Entity\Activity'
-                lazy: true

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

@@ -1,4 +1,8 @@
 services:
     Chill\ActivityBundle\Controller\ActivityController:
-        autowire: true
+        arguments:
+            $eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
+            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
+            $logger: '@chill.main.logger'
+            $serializer: '@Symfony\Component\Serializer\SerializerInterface'
         tags: ['controller.service_arguments']

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

@@ -24,7 +24,9 @@ services:
             - '@Doctrine\Persistence\ManagerRegistry'
 
     Chill\ActivityBundle\Repository\ActivityACLAwareRepository:
-        autowire: true
-        autoconfigure: true
-    Chill\ActivityBundle\Repository\ActivityACLAwareRepositoryInterface: '@Chill\ActivityBundle\Repository\ActivityACLAwareRepository'
+        arguments:
+            $tokenStorage: '@Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface'
+            $authorizationHelper: '@Chill\MainBundle\Security\Authorization\AuthorizationHelper'
+            $repository: '@Chill\ActivityBundle\Repository\ActivityRepository'
+            $em: '@Doctrine\ORM\EntityManagerInterface'
 

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

@@ -74,16 +74,15 @@ Users concerned: T(M)S
 activity:
     Insert a document: Insérer un document
     Remove a document: Supprimer le document
-    comment: Commentaire
 
 
 #timeline
 '%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
 
 #controller
-'Success : activity created!': L'activité a été créée.
+'Success : activity created!': Bravo ! L'activité a été créée.
 'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'activité n'a pas été créée.
-'Success : activity updated!': L'activité a été mise à jour.
+'Success : activity updated!': Bravo ! L'activité a été mise à jour.
 'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'activité n'a pas été mise à jour.
 
 # ROLES

src/Bundle/ChillAsideActivityBundle/LICENSE

@@ -1,661 +0,0 @@
-GNU AFFERO GENERAL PUBLIC LICENSE
-   Version 3, 19 November 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-        Preamble
-
-The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-   TERMS AND CONDITIONS
-
-0. Definitions.
-
-"This License" refers to version 3 of the GNU Affero General Public License.
-
-"Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-1. Source Code.
-
-The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-The Corresponding Source for a work in source code form is that
-same work.
-
-2. Basic Permissions.
-
-All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-a) The work must carry prominent notices stating that you modified
-it, and giving a relevant date.
-
-b) The work must carry prominent notices stating that it is
-released under this License and any conditions added under section
-7.  This requirement modifies the requirement in section 4 to
-"keep intact all notices".
-
-c) You must license the entire work, as a whole, under this
-License to anyone who comes into possession of a copy.  This
-License will therefore apply, along with any applicable section 7
-additional terms, to the whole of the work, and all its parts,
-regardless of how they are packaged.  This License gives no
-permission to license the work in any other way, but it does not
-invalidate such permission if you have separately received it.
-
-d) If the work has interactive user interfaces, each must display
-Appropriate Legal Notices; however, if the Program has interactive
-interfaces that do not display Appropriate Legal Notices, your
-work need not make them do so.
-
-A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-a) Convey the object code in, or embodied in, a physical product
-(including a physical distribution medium), accompanied by the
-Corresponding Source fixed on a durable physical medium
-customarily used for software interchange.
-
-b) Convey the object code in, or embodied in, a physical product
-(including a physical distribution medium), accompanied by a
-written offer, valid for at least three years and valid for as
-long as you offer spare parts or customer support for that product
-model, to give anyone who possesses the object code either (1) a
-copy of the Corresponding Source for all the software in the
-product that is covered by this License, on a durable physical
-medium customarily used for software interchange, for a price no
-more than your reasonable cost of physically performing this
-conveying of source, or (2) access to copy the
-Corresponding Source from a network server at no charge.
-
-c) Convey individual copies of the object code with a copy of the
-written offer to provide the Corresponding Source.  This
-alternative is allowed only occasionally and noncommercially, and
-only if you received the object code with such an offer, in accord
-with subsection 6b.
-
-d) Convey the object code by offering access from a designated
-place (gratis or for a charge), and offer equivalent access to the
-Corresponding Source in the same way through the same place at no
-further charge.  You need not require recipients to copy the
-Corresponding Source along with the object code.  If the place to
-copy the object code is a network server, the Corresponding Source
-may be on a different server (operated by you or a third party)
-that supports equivalent copying facilities, provided you maintain
-clear directions next to the object code saying where to find the
-Corresponding Source.  Regardless of what server hosts the
-Corresponding Source, you remain obligated to ensure that it is
-available for as long as needed to satisfy these requirements.
-
-e) Convey the object code using peer-to-peer transmission, provided
-you inform other peers where the object code and Corresponding
-Source of the work are being offered to the general public at no
-charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-"Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-a) Disclaiming warranty or limiting liability differently from the
-terms of sections 15 and 16 of this License; or
-
-b) Requiring preservation of specified reasonable legal notices or
-author attributions in that material or in the Appropriate Legal
-Notices displayed by works containing it; or
-
-c) Prohibiting misrepresentation of the origin of that material, or
-requiring that modified versions of such material be marked in
-reasonable ways as different from the original version; or
-
-d) Limiting the use for publicity purposes of names of licensors or
-authors of the material; or
-
-e) Declining to grant rights under trademark law for use of some
-trade names, trademarks, or service marks; or
-
-f) Requiring indemnification of licensors and authors of that
-material by anyone who conveys the material (or modified versions of
-it) with contractual assumptions of liability to the recipient, for
-any liability that these contractual assumptions directly impose on
-those licensors and authors.
-
-All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-8. Termination.
-
-You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-13. Remote Network Interaction; Use with the GNU General Public License.
-
-Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-<one line to give the program's name and a brief idea of what it does.>
-Copyright (C) <year>  <name of author>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.

src/Bundle/ChillAsideActivityBundle/README.md

@@ -1,3 +0,0 @@
-# Aside activities module
-
-This module offers the possibility to add extra curricular activities per user (eg. administrative tasks, formation, meetings) not immediately related to client support.

src/Bundle/ChillAsideActivityBundle/src/ChillAsideActivityBundle.php

@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\AsideActivityBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class ChillAsideActivityBundle extends Bundle
-{
-}

src/Bundle/ChillAsideActivityBundle/src/Controller/AdminController.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace Chill\AsideActivityBundle\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-
-/**
- * Controller for activity configuration
- *
- * @author Julien Fastré <julien.fastre@champs-libres.coop>
- * @author Champs Libres <info@champs-libres.coop>
- */
-class AdminController extends AbstractController
-{
-    
-    public function redirectToAdminIndexAction()
-    {
-        return $this->redirectToRoute('chill_main_admin_central');
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityCategoryController.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace Chill\AsideActivityBundle\Controller;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-
-/**
- * Class AsideActivityBundle
- */
-class AsideActivityCategoryController extends CRUDController
-{
-
-}

src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php

@@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\AsideActivityBundle\Controller;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\HttpFoundation\Request;
-use Chill\MainBundle\Pagination\PaginatorInterface;
-use Doctrine\Common\Collections\Criteria;
-
-final class AsideActivityController extends CRUDController
-{
-    protected function buildQueryEntities(string $action, Request $request)
-    {
-        $qb = parent::buildQueryEntities($action, $request);
-
-        if ('index' === $action) {
-            $qb->andWhere($qb->expr()->eq('e.agent', ':user'));
-            $qb->setParameter('user', $this->getUser());
-        }
-
-        return $qb;
-    }
-
-    protected function orderQuery(
-        string $action,
-        $query,
-        Request $request,
-        PaginatorInterface $paginator
-    ) {
-        if ('index' === $action) {
-           return $query->orderBy('e.date', 'DESC');
-        }
-
-        return parent::orderQuery($action, $query, $request, $paginator);
-    }
-
-
-}

src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace Chill\AsideActivityBundle\DataFixtures\ORM;
-
-use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Chill\MainBundle\DataFixtures\ORM\LoadUsers;
-use Chill\MainBundle\Repository\UserRepository;
-use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-
-class LoadAsideActivity extends Fixture implements DependentFixtureInterface
-{
-    private UserRepository $userRepository;
-
-    public function __construct(UserRepository $userRepository)
-    {
-        $this->userRepository = $userRepository;
-    }
-
-    public function getDependencies(): array
-    {
-        return [
-            LoadUsers::class,
-            LoadAsideActivityCategory::class
-        ];
-    }
-
-    public function load(ObjectManager $manager)
-    {
-        $user = $this->userRepository->findOneBy(['username' => 'center a_social']);
-
-        for ($i = 0; $i < 50; $i++) {
-            $activity = new AsideActivity();
-            $activity
-                ->setAgent($user)
-                ->setCreatedAt(new \DateTimeImmutable('now'))
-                ->setCreatedBy($user)
-                ->setUpdatedAt(new \DateTimeImmutable('now'))
-                ->setUpdatedBy($user)
-                ->setType(
-                    $this->getReference('aside_activity_category_0')
-                )
-                ->setDate((new \DateTimeImmutable('today'))
-                    ->sub(new \DateInterval('P'.\random_int(1, 100).'D')))
-            ;
-
-            $manager->persist($activity);
-        }
-
-        $manager->flush();
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivityCategory.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Chill\AsideActivityBundle\DataFixtures\ORM;
-
-use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
-use Doctrine\Persistence\ObjectManager;
-
-class LoadAsideActivityCategory extends \Doctrine\Bundle\FixturesBundle\Fixture
-{
-    public function load(ObjectManager $manager)
-    {
-        foreach ([
-            'Appel téléphonique',
-            'Formation'
-                 ] as $key => $label) {
-            $category = new AsideActivityCategory();
-            $category->setTitle(['fr' => $label]);
-            $manager->persist($category);
-            $this->setReference('aside_activity_category_'.$key, $category);
-        }
-
-        $manager->flush();
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php

@@ -1,108 +0,0 @@
-<?php
-
-/**
- * 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\AsideActivityBundle\DependencyInjection;
-
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\Extension;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Symfony\Component\DependencyInjection\Loader;
-
-final class ChillAsideActivityExtension extends Extension implements PrependExtensionInterface
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @phpstan-ignore-next-line
-     */
-    public function load(array $configs, ContainerBuilder $container): void
-    {
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
-        $loader->load('services.yaml');
-        $loader->load('services/form.yaml');
-        $loader->load('services/menu.yaml');
-    }
-
-    public function prepend(ContainerBuilder $container)
-    {
-        $this->prependRoute($container);
-        $this->prependCruds($container);
-    }
-
-    protected function prependRoute(ContainerBuilder $container)
-    {
-        //declare routes for task bundle
-        $container->prependExtensionConfig('chill_main', array(
-           'routing' => array(
-              'resources' => array(
-                  '@ChillAsideActivityBundle/config/routes.yaml',
-              )
-           )
-        ));
-    }
-
-    protected function prependCruds(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('chill_main', [
-            'cruds' => [
-                [
-                    'class' => \Chill\AsideActivityBundle\Entity\AsideActivityCategory::class,
-                    'name' => 'aside_activity_category',
-                    'base_path' => '/admin/asideactivity/category',
-                    'form_class' => \Chill\AsideActivityBundle\Form\AsideActivityCategoryType::class,
-                    'controller' => \Chill\AsideActivityBundle\Controller\AsideActivityCategoryController::class,
-                    'actions' => [
-                        'index' => [
-                            'template' => '@ChillAsideActivity/asideActivityCategory/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
-                        ],
-                        'new'   => [
-                            'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillAsideActivity/asideActivityCategory/new.html.twig',
-                        ],
-                        'edit'  => [
-                            'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillAsideActivity/asideActivityCategory/edit.html.twig',
-                        ]
-                    ]
-                ],
-                [
-                    'class' => \Chill\AsideActivityBundle\Entity\AsideActivity::class,
-                    'name' => 'aside_activity',
-                    'base_path' => '/asideactivity',
-                    'form_class' => \Chill\AsideActivityBundle\Form\AsideActivityFormType::class,
-                    'controller' => \Chill\AsideActivityBundle\Controller\AsideActivityController::class,
-                    'actions' => [
-                        'index' => [
-                            'template' => '@ChillAsideActivity/asideActivity/list.html.twig',
-                            'role' => 'ROLE_USER'
-                        ],
-                        'new'   => [
-                            'role' => 'ROLE_USER',
-                            'template' => '@ChillAsideActivity/asideActivity/new.html.twig',
-                        ],
-                        'view' => [
-                            'role' => 'ROLE_USER',
-                            'template' => '@ChillAsideActivity/asideActivity/view.html.twig',
-                        ],
-                        'edit'  => [
-                            'role' => 'ROLE_USER',
-                            'template' => '@ChillAsideActivity/asideActivity/edit.html.twig',
-                        ],
-                        'delete' => [
-                            'role' => 'ROLE_USER',
-                            'template' => '@ChillAsideActivity/asideActivity/delete.html.twig',
-                        ]
-                    ]
-                ],
-            ]
-        ]);
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php

@@ -1,203 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\AsideActivityBundle\Entity;
-
-use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Entity\User;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
-/**
- * @ORM\Entity
- * @ORM\Table(schema="chill_asideactivity")
- */
-class AsideActivity implements TrackUpdateInterface, TrackCreationInterface
-{
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private ?int $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=AsideActivityCategory::class, inversedBy="asideActivities")
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private $type;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private \Chill\MainBundle\Entity\User $createdBy;
-
-    /**
-     * @ORM\Column(type="datetime")
-     */
-    private $createdAt;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     */
-    private \Chill\MainBundle\Entity\User $updatedBy;
-
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    private $updatedAt;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=false)
-     * @Assert\NotBlank()
-     */
-    private \Chill\MainBundle\Entity\User $agent;
-
-    /**
-     * @ORM\Column(type="datetime")
-     */
-    private $date;
-
-    /**
-     * @ORM\Column(type="time", nullable=true)
-     */
-    private ?\DateTimeInterface $duration = null;
-
-    /**
-     * @ORM\Column(type="string", length=100, nullable=true)
-     */
-    private $location;
-
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private $note;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getType(): ?AsideActivityCategory
-    {
-        return $this->type;
-    }
-
-    public function setType(?AsideActivityCategory $type): self
-    {
-        $this->type = $type;
-
-        return $this;
-    }
-
-    public function getCreatedBy(): ?User
-    {
-        return $this->createdBy;
-    }
-
-    public function setCreatedBy(?User $createdBy): self
-    {
-        $this->createdBy = $createdBy;
-
-        return $this;
-    }
-
-    public function getCreatedAt(): ?\DateTimeInterface
-    {
-        return $this->createdAt;
-    }
-
-    public function setCreatedAt(\DateTimeInterface $createdAt): self
-    {
-        $this->createdAt = $createdAt;
-
-        return $this;
-    }
-
-    public function getUpdatedBy(): ?User
-    {
-        return $this->updatedBy;
-    }
-
-    public function setUpdatedBy(?User $updatedBy): self
-    {
-        $this->updatedBy = $updatedBy;
-
-        return $this;
-    }
-
-    public function getUpdatedAt(): ?\DateTimeInterface
-    {
-        return $this->updatedAt;
-    }
-
-    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
-    {
-        $this->updatedAt = $updatedAt;
-
-        return $this;
-    }
-
-    public function getAgent(): ?User
-    {
-        return $this->agent;
-    }
-
-    public function setAgent(?User $agent): self
-    {
-        $this->agent = $agent;
-
-        return $this;
-    }
-
-    public function getDate(): ?\DateTimeInterface
-    {
-        return $this->date;
-    }
-
-    public function setDate(\DateTimeInterface $date): self
-    {
-        $this->date = $date;
-
-        return $this;
-    }
-
-    public function getDuration(): ?\DateTimeInterface
-    {
-        return $this->duration;
-    }
-
-    public function setDuration(?\DateTimeInterface $duration): self
-    {
-        $this->duration = $duration;
-
-        return $this;
-    }
-
-    public function getLocation(): ?string
-    {
-        return $this->location;
-    }
-
-    public function setLocation(?string $location): self
-    {
-        $this->location = $location;
-
-        return $this;
-    }
-
-    public function getNote(): ?string
-    {
-        return $this->note;
-    }
-
-    public function setNote(?string $note): self
-    {
-        $this->note = $note;
-
-        return $this;
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php

@@ -1,62 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\AsideActivityBundle\Entity;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity
- * @ORM\Table(schema="chill_asideactivity")
- */
-class AsideActivityCategory
-{
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private int $id;
-
-    /**
-     * @ORM\Column(type="json", length=255)
-     */
-    private array $title;
-
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private bool $isActive = true;
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getTitle(): ?array
-    {
-        return $this->title;
-    }
-
-    public function setTitle(array $title): self
-    {
-        $this->title = $title;
-
-        return $this;
-    }
-
-    public function getIsActive(): bool
-    {
-        return $this->isActive;
-    }
-
-    public function setIsActive(bool $isActive): self
-    {
-        $this->isActive = $isActive;
-
-        return $this;
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityCategoryType.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Chill\AsideActivityBundle\Form;
-
-use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-
-use Symfony\Component\Form\FormBuilderInterface;
-
-final class AsideActivityCategoryType extends AbstractType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder->add('title', TranslatableStringFormType::class,
-        [
-           'label' => 'Nom',
-        ])
-        ->add('isActive', ChoiceType::class, 
-        [
-            'choices' => [
-                'Yes' => true,
-                'No' => false
-            ],
-            'expanded' => true
-        ]);
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php

@@ -1,150 +0,0 @@
-<?php
-
-namespace Chill\AsideActivityBundle\Form;
-
-use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Form\Type\ChillDateType;
-use Chill\MainBundle\Form\Type\ChillTextareaType;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Doctrine\ORM\EntityRepository;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Symfony\Component\Form\FormEvent;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Security;
-
-final class AsideActivityFormType extends AbstractType
-{
-    protected array $timeChoices;
-    private TranslatableStringHelper $translatableStringHelper;
-    private TokenStorageInterface $storage;
-
-    public function __construct (
-        TranslatableStringHelper $translatableStringHelper,
-        ParameterBagInterface $parameterBag,
-        TokenStorageInterface $storage
-    ){
-        $this->timeChoices = $parameterBag->get('chill_activity.form.time_duration');
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->storage = $storage;
-    }
-
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $timeChoices = [];
-
-        foreach ($this->timeChoices as $e) {
-            $timeChoices[$e['label']] = $e['seconds'];
-        }
-
-        $durationTimeTransformer = new DateTimeToTimestampTransformer('GMT', 'GMT');
-        $durationTimeOptions = [
-            'choices' => $timeChoices,
-            'placeholder' => 'Choose the duration',
-        ];
-
-        $builder
-            ->add('agent', EntityType::class,
-            [
-                'label' => 'Agent',
-                'required' => true,
-                'class' => User::class,
-                'data' => $this->storage->getToken()->getUser(),
-                'query_builder' => function(EntityRepository $er){
-                    return $er->createQueryBuilder('u')->where('u.enabled = true');
-                },
-                'attr' => array('class' => 'select2 '),
-                'placeholder' => 'Choose the agent for whom this activity is created',
-                'choice_label' => 'username'
-            ])
-            ->add('date', ChillDateType::class,
-            [
-                'label' => 'date',
-                'data' => new \DateTime(),
-                //SETTING RANGE ONLY POSSIBLE WITH WIDGET 'CHOICE' AND NOT 'SINGLE_TEXT'?
-                // 'widget' => 'choice',
-                // 'years' => range(2020, date('Y')),
-                // 'months' => range(1, date('m')),
-                // 'days' => range(1, date('d')),
-                'required' => true
-            ])
-            ->add('type', EntityType::class,
-            [
-                'label' => 'Type',
-                'required' => true,
-                'class' => AsideActivityCategory::class,
-                'placeholder' => 'Choose the activity category',
-                // 'choice_label' => 'title[""]'
-                'choice_label' => function (AsideActivityCategory $asideActivityCategory) {
-                    return $this->translatableStringHelper->localize($asideActivityCategory->getTitle());
-                },
-            ])
-            ->add('duration', ChoiceType::class, $durationTimeOptions)
-            ->add('note', ChillTextareaType::class, [
-                'label' => 'Note',
-                'required' => false,
-            ]);
-
-            foreach (['duration'] as $fieldName)
-            {
-                $builder->get($fieldName)
-                ->addModelTransformer($durationTimeTransformer);
-
-            $builder->get($fieldName)
-                ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $formEvent) use (
-                    $timeChoices,
-                    $builder,
-                    $durationTimeTransformer,
-                    $durationTimeOptions,
-                    $fieldName
-                ) {
-                    // set the timezone to GMT, and fix the difference between current and GMT
-                    // the datetimetransformer will then handle timezone as GMT
-                    $timezoneUTC = new \DateTimeZone('GMT');
-                    /* @var $data \DateTimeImmutable */
-                    $data = $formEvent->getData() === NULL ?
-                        \DateTime::createFromFormat('U', 300) :
-                        $formEvent->getData();
-                    $seconds = $data->getTimezone()->getOffset($data);
-                    $data->setTimeZone($timezoneUTC);
-                    $data->add(new \DateInterval('PT'.$seconds.'S'));
-
-                    // test if the timestamp is in the choices.
-                    // If not, recreate the field with the new timestamp
-                    if (!in_array($data->getTimestamp(), $timeChoices)) {
-                        // the data are not in the possible values. add them
-                        $timeChoices[$data->format('H:i')] = $data->getTimestamp();
-                        $form = $builder->create($fieldName, ChoiceType::class, array_merge(
-                            $durationTimeOptions, [
-                                'choices' => $timeChoices,
-                                'auto_initialize' => false
-                            ]
-                        ));
-                        $form->addModelTransformer($durationTimeTransformer);
-                        $formEvent->getForm()->getParent()->add($form->getForm());
-                    }
-                });
-            }
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults([
-            'data_class' => AsideActivity::class,
-        ]);
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'chill_asideactivitybundle_asideactivity';
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/Menu/SectionMenuBuilder.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace Chill\AsideActivityBundle\Menu;
-
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Knp\Menu\MenuItem;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-/**
- * Class SectionMenuBuilder
- *
- * @package Chill\AsideActivityBundle\Menu
- */
-class SectionMenuBuilder implements LocalMenuBuilderInterface
-{
-    protected TranslatorInterface $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    /**
-     * @param $menuId
-     * @param MenuItem $menu
-     * @param array $parameters
-     */
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        $menu->addChild($this->translator->trans('Create an aside activity'), [
-                'route' => 'chill_crud_aside_activity_new'
-            ])
-            ->setExtras([
-                'order' => 11,
-                'icons' => [ 'plus' ]
-            ]);
-    }
-
-    /**
-     * @return array
-     */
-    public static function getMenuIds(): array
-    {
-        return [ 'section' ];
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityCategoryRepository.php

@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\AsideActivityBundle\Repository;
-
-use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectRepository;
-
-class AsideActivityCategoryRepository implements ObjectRepository
-{
-    private EntityRepository $repository;
-    
-    public function __construct(EntityManagerInterface $entityManager)
-    {
-        $this->repository = $entityManager->getRepository(AsideActivityCategory::class);
-    }
-
-
-    public function find($id): ?AsideActivityCategory
-    {
-        return $this->repository->find($id);
-    }
-
-    /**
-     * @return AsideActivityCategory[]
-     */
-    public function findAll(): array
-    {
-        return $this->repository->findAll();
-    }
-
-    /**
-     * @return AsideActivityCategory[]
-     */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
-    public function findOneBy(array $criteria): ?AsideActivityCategory
-    {
-        return $this->repository->findOneBy($criteria);
-    }
-
-    public function getClassName(): string
-    {
-        return AsideActivityCategory::class;
-    }
-}

src/Bundle/ChillAsideActivityBundle/src/Repository/AsideActivityRepository.php

@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\AsideActivityBundle\Repository;
-
-use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectRepository;
-
-final class AsideActivityRepository implements ObjectRepository
-{
-    private EntityRepository $repository;
-
-    public function __construct(EntityManagerInterface $entityManager)
-    {
-        $this->repository = $entityManager->getRepository(AsideActivity::class);
-    }
-
-    public function find($id): ?AsideActivity
-    {
-        return $this->repository->find($id);
-    }
-
-    /**
-     * @return AsideActivity[]
-     */
-    public function findAll(): array
-    {
-        return $this->repository->findAll();
-    }
-
-    /**
-     * @return AsideActivity[]
-     */
-    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
-    {
-        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
-    }
-
-    public function findOneBy(array $criteria): ?AsideActivity
-    {
-        return $this->repository->findOneBy($criteria);
-    }
-
-    public function getClassName(): string
-    {
-        return AsideActivity::class;
-    }
-
-}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/layout_asideactivity.html.twig

@@ -1,14 +0,0 @@
-{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
-
-{% block vertical_menu_content %}
-	{{ chill_menu('admin_aside_activity', {
-        'layout': '@ChillAsideActivity/Admin/menu_asideactivity.html.twig',
-    }) }}
-{% endblock %}
-
-{% block layout_wvm_content %}
-	{% block admin_content %}
-		<!-- block personcontent empty -->
-		<h1>{{ 'Aside activity configuration' |trans }}</h1>
-	{% endblock %}
-{% endblock  %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/Admin/menu_asideactivity.html.twig

@@ -1,4 +0,0 @@
-{% extends "@ChillMain/Menu/verticalMenu.html.twig" %}
-{% block v_menu_title %}
-	{{ 'Aside activity configuration menu'|trans }}
-{% endblock %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/_delete.html.twig

@@ -1,30 +0,0 @@
-<div class="{% block crud_content_main_div_class %}col-10 centered{% endblock %}">
-	{% block crud_content_header %}
-		<h1>{{ ('crud.'~crud_name~'.title_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</h1>
-	{% endblock crud_content_header %}
-
-	<p class="message-confirm">{{ ('crud.'~crud_name~'.confirm_message_delete')|trans({ '%as_string%': 'Aside Activity' }) }}</p>
-
-	{{ form_start(form) }}
-
-	<ul class="record_actions">
-		{% block content_form_actions_back %}
-			<li class="cancel">
-				<a class="btn btn-cancel" href="{{ chill_return_path_or('chill_crud_'~crud_name~'_index') }}">
-					{{ 'Cancel'|trans }}
-				</a>
-			</li>
-		{% endblock %}
-		{% block content_form_actions_before %}
-
-        {% endblock %}
-		{% block content_form_actions_confirm_delete %}
-			<li>
-				<button type="submit" class="btn btn-delete" value="delete-and-close">{{ ('crud.'~crud_name~'.button_delete')|trans }}</button>
-			</li>
-		{% endblock content_form_actions_confirm_delete %}
-		{% block content_form_actions_after %}{% endblock %}
-	</ul>
-
-	{{ form_end(form) }}
-</div>

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/delete.html.twig

@@ -1,8 +0,0 @@
-{% extends '@ChillMain/layout.html.twig' %}
-
-{# {% block title %}{{ ('crud.' ~ crud_name ~ '.delete.title')|trans({'%crud_name%': crud_name}) }}{% endblock %} #}
-
-{% block content %}
-    {% embed '@ChillAsideActivity/asideActivity/_delete.html.twig' %}
-    {% endembed %}
-{% endblock content %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/edit.html.twig

@@ -1,14 +0,0 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
-{% endblock %}
-
-{% block admin_content %}
-{# {% as we are in the admin layout, we override the admin content with the CRUD content %} #}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {# we do not have "view" page. We empty the corresponding block #}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig

@@ -1,8 +0,0 @@
-{% extends '@ChillMain/layout.html.twig' %}
-
-{% block title %}{{ ('crud.' ~ crud_name ~ '.index.title')|trans({'%crud_name%': crud_name}) }}{% endblock %}
-
-{% block content %}
-    {% embed '@ChillAsideActivity/AsideActivity/_index.html.twig' %}
-    {% endembed %}
-{% endblock content %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/list.html.twig

@@ -1,97 +0,0 @@
-{% extends "@ChillMain/layout.html.twig" %}
-
-{% block title %}
-	{{ 'Aside activity list' |trans }}
-{% endblock title %}
-
-{% block content %}
-	<div class="col-md-10 col-xxl asideactivity-list">
-		<h2>{{ 'My aside activities' |trans }}</h2>
-
-		{% if entities|length == 0 %}
-			<p class="chill-no-data-statement">
-				{{ "There aren't any aside activities."|trans }}
-				<a href="{{ path('chill_crud_aside_activity_new') }}" class="btn btn-create button-small"></a>
-			</p>
-		{% else %}
-
-			<div
-				class="flex-table my-4 list-records">
-				{# Sort activities according to date in descending order #}
-				{% for entity in entities %}
-					{% set t = entity.type %}
-
-					<div class="item-bloc">
-						<div class="item-row main">
-							<div class="item-col">
-
-								<h3>
-									<b>{{ entity.type.title | localize_translatable_string }}</b>
-								</h3>
-
-								{% if entity.date %}
-									<p>{{ entity.date|format_date('long') }}</p>
-								{% endif %}
-
-								<div class="duration">
-									<p>
-										<i class="fa fa-fw fa-hourglass-end"></i>
-										{{ entity.duration|date('H:i') }}
-									</p>
-								</div>
-
-							</div>
-							<div class="item-col">
-								<ul class="list-content">
-									{% if entity.createdBy %}
-										<li>
-											<b>{{ 'Created by: '|trans }}{{ entity.createdBy.usernameCanonical }}</b>
-										</li>
-									{% endif %}
-								</ul>
-							</div>
-						</div>
-
-						{# {%
-												                if entity.note is not empty
-												                or entity.createdBy|length > 0
-												            %}
-												            <div class="item-row details">
-												                {% if entity.note is not empty %}
-												                <div class="item-col comment">
-												                    {{ entity.note|chill_markdown_to_html }}
-												                </div>
-												                {% endif %}
-
-												            </div>
-												            {% endif %} #}
-						<div class="item-col">
-							<ul class="list-content">
-								<ul class="record_actions">
-                                    <li>
-                                        <a href="{{ chill_path_add_return_path('chill_crud_aside_activity_edit', { 'id': entity.id }) }}" class="btn btn-update btn-mini "></a>
-                                    </li>
-									<li>
-										<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_delete', { 'id': entity.id } ) }}" class="btn btn-delete btn-mini"></a>
-									</li>
-								</ul>
-							</ul>
-						</div>
-					</div>
-
-				{% endfor %}
-			</div>
-
-            {{ chill_pagination(paginator) }}
-
-			<ul class="record_actions">
-				<li>
-					<a href="{{ chill_path_add_return_path('chill_crud_aside_activity_new') }}" class="btn btn-create">
-						{{ 'Create' | trans }}
-					</a>
-				</li>
-			</ul>
-		</div>
-	{% endif %}
-
-{% endblock %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/new.html.twig

@@ -1,11 +0,0 @@
-{% extends '@ChillMain/Admin/layout.html.twig' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_new_title.html.twig') %}
-{% endblock %}
-
-{% block admin_content %}
-{% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig

@@ -1,15 +0,0 @@
-{% extends '@ChillMain/layout.html.twig' %}
-
-{% set activeRouteKey = '' %}
-
-{% block title %}
-{% include('@ChillMain/CRUD/_view_title.html.twig') %}
-{% endblock %}
-
-{% block content %}
-{% embed '@ChillMain/CRUD/_view_content.html.twig' %}
-    {% block crud_content_header %}
-        <h1>{{ ('crud.' ~ crud_name ~ '.title_view')|trans }}</h1>
-    {% endblock crud_content_header %}
-{% endembed %}
-{% endblock %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/edit.html.twig

@@ -1,12 +0,0 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
-
-{% block title %}
-    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
-{% endblock %}
-
-{% block layout_wvm_content %}
-    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-        {% block content_form_actions_view %}{% endblock %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
-{% endblock %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/index.html.twig

@@ -1,44 +0,0 @@
-{% extends "@ChillAsideActivity/Admin/layout_asideactivity.html.twig" %}
-
-{% block admin_content %}
-	<h1>{{ 'ActivityType list'|trans }}</h1>
-
-	<table class="records_list table table-bordered border-dark">
-		<thead>
-			<tr>
-				<th>{{ 'Name'|trans }}</th>
-				<th>{{ 'Active'|trans }}</th>
-				<th>{{ 'Actions'|trans }}</th>
-			</tr>
-		</thead>
-		<tbody>
-			{% for entity in entities %}
-				<tr>
-					<td>{{ entity.title|localize_translatable_string }}</td>
-					<td style="text-align:center;">
-						{%- if entity.isActive -%}
-							<i class="fa fa-check-square-o"></i>
-						{%- else -%}
-							<i class="fa fa-square-o"></i>
-						{%- endif -%}
-					</td>
-					<td>
-						<ul class="record_actions">
-							<li>
-								<a href="{{ path('chill_crud_aside_activity_category_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
-							</li>
-						</ul>
-					</td>
-				</tr>
-			{% endfor %}
-		</tbody>
-	</table>
-
-	<ul class="record_actions">
-		<li>
-			<a href="{{ path('chill_crud_aside_activity_category_new') }}" class="btn btn-create">
-				{{ 'Create a new aside activity type'|trans }}
-			</a>
-		</li>
-	</ul>
-{% endblock %}

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivityCategory/new.html.twig

@@ -1,11 +0,0 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
-
-{% block title %}
-    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
-{% endblock %}
-
-{% block layout_wvm_content %}
-    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
-        {% block content_form_actions_save_and_show %}{% endblock %}
-    {% endembed %}
-{% endblock %}

src/Bundle/ChillAsideActivityBundle/src/Tests/Controller/AsideActivityControllerTest.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace Chill\AsideActivityBundle\Tests\Controller;
-
-use Chill\MainBundle\Test\PrepareClientTrait;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Doctrine\ORM\EntityManagerInterface;
-
-
-class AccompanyingCourseControllerTest extends WebTestCase
-{
-    use PrepareClientTrait;
-
-    public function setUp()
-    {
-        parent::setUp();
-        self::bootKernel();
-        $this->client = $this->getClientAuthenticated();
-    }
-
-   public function testIndexWithoutUsers()
-    {
-        $this->client->request('GET', '/fr/asideactivity'); 
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-    }
-
-    public function testNewWithoutUsers()
-    {
-        $this->client->request('GET', '/fr/asideactivity/new'); 
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-    }
-
-    /**
-     * @dataProvider generateAsideActivityId
-     */
-
-    public function testEditWithoutUsers(int $asideActivityId)
-    {
-        $this->client->request('GET', "/fr/asideactivity/{$asideActivityId}/edit");
-
-        $this->assertEquals(200, $this->client->getResponse()->getStatusCode());
-    }
-
-    public function generateAsideActivityId()
-    {
-        self::bootKernel();
-
-        $qb = self::$container->get(EntityManagerInterface::class)
-            ->createQueryBuilder();
-
-        $asideActivityIds = $qb
-            ->select('DISTINCT asideactivity.id')
-            ->from(AsideActivity::class, 'asideactivity')
-            ->innerJoin('asideactivity.agent', 'agent')
-            ->where($qb->expr()->eq('agent.username', ':center_name'))
-            ->setParameter('center_name', 'center a_social')
-            ->setMaxResults(100)
-            ->getQuery()
-            ->getResult()
-        ;
-
-        \shuffle($asideActivityIds);
-
-        yield [ \array_pop($asideActivityIds)['id'] ];
-        yield [ \array_pop($asideActivityIds)['id'] ];
-        yield [ \array_pop($asideActivityIds)['id'] ];
-    }
-
-
-}

src/Bundle/ChillAsideActivityBundle/src/config/routes.yaml

@@ -1,12 +0,0 @@
-chill_asideactivities_controllers:
-  resource: "@ChillAsideActivityBundle/Controller"
-  type: annotation
-
-chill_admin_aside_activity_redirect_to_admin_index:
-  path: /{_locale}/admin/activity_redirect_to_main
-  controller: Chill\ActivityBundle\Controller\AdminController::redirectToAdminIndexAction
-  options:
-    menus:
-      admin_aside_activity:
-        order: 0
-        label: Main admin menu

src/Bundle/ChillAsideActivityBundle/src/config/services.yaml

@@ -1,5 +0,0 @@
-services:
-    Chill\AsideActivityBundle\DataFixtures\:
-        resource: './../DataFixtures'
-        autowire: true
-        autoconfigure: true

src/Bundle/ChillAsideActivityBundle/src/config/services/form.yaml

@@ -1,6 +0,0 @@
----
-services:
-    Chill\AsideActivityBundle\Form\:
-        resource: './../../Form'
-        autowire: true
-        autoconfigure: true