Simplify configuration by using regexes.

LICENSE

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

composer.json

@@ -1,9 +1,69 @@
 {
     "name": "chill-project/chill-bundles",
-    "license": "AGPL-3.0-only",
     "type": "library",
     "description": "Most used bundles for chill-project",
-    "keywords": ["chill", "social worker"],
+    "keywords": [
+        "chill",
+        "social worker"
+    ],
+    "license": "AGPL-3.0-only",
+    "require": {
+        "champs-libres/async-uploader-bundle": "dev-sf4",
+        "composer/package-versions-deprecated": "^1.10",
+        "doctrine/doctrine-bundle": "^2.1",
+        "doctrine/doctrine-migrations-bundle": "^3.0",
+        "doctrine/orm": "^2.7",
+        "drupol/php-conventions": "^5.0",
+        "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.6",
+        "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"
+    },
     "autoload": {
         "psr-4": {
             "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle",
@@ -21,70 +81,13 @@
     },
     "autoload-dev": {
         "psr-4": {
-          "App\\": "tests/app/src/"
+            "App\\": "tests/app/src/"
         }
     },
-    "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/_static/code/exports/CountPerson.php

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

docs/source/development/pagination/example.php

@@ -8,21 +8,21 @@ use Symfony\Component\HttpFoundation\Request;
 
 class ItemController extends Controller {
 
-    public function yourAction() 
+    public function yourAction()
     {
         $em = $this->getDoctrine()->getManager();
         // first, get the number of total item are available
         $total = $em
              ->createQuery("SELECT COUNT (item.id) FROM ChillMyBundle:Item item")
              ->getSingleScalarResult();
-       
+
         // get the PaginatorFactory
         $paginatorFactory = $this->get('chill_main.paginator_factory');
-        
+
-        // create a pagination instance. This instance is only valid for 
+        // create a pagination instance. This instance is only valid for
         // the current route and parameters
         $paginator = $paginatorFactory->create($total);
-        
+
         // launch your query on item. Limit the query to the results
         // for the current page using the paginator
         $items = $em->createQuery("SELECT item FROM ChillMyBundle:Item item WHERE <your clause>")
@@ -30,12 +30,12 @@ class ItemController extends Controller {
             ->setFirstResult($paginator->getCurrentPage()->getFirstItemNumber())
             // use the paginator to get the number of items to display
             ->setMaxResults($paginator->getItemsPerPage());
-            
+
         return $this->render('ChillMyBundle:Item:list.html.twig', array(
                 'items' => $items,
                 'paginator' => $paginator
-                );
+                )
-            
+        );
     }
 
 }

grumphp.yml

@@ -0,0 +1,22 @@
+imports:
+  - { resource: tests/app/vendor/drupol/php-conventions/config/php73/grumphp.yml }
+
+parameters:
+  tasks.license.name: AGPL-3.0
+  tasks.license.holder: Champs-Libres
+  tasks.phpstan.configuration: phpstan.neon
+  tasks.phpstan.ignore_patterns:
+    - /src\/Bundle\/(.*)\/migrations/
+    - /src\/Bundle\/(.*)\/Resources/
+    - /src\/Bundle\/(.*)\/Tests/
+    - /src\/Bundle\/(.*)\/Test/
+    - /src\/Bundle\/(.*)\/config/
+    - /src\/Bundle\/(.*)\/translations/
+    - /src\/Bundle\/(.*)\/DataFixtures/
+    - /^docs/
+    - /^tests/
+  skip_tasks:
+    - composer_require_checker
+    - phpcsfixer
+    - phpcs
+    - twigcs

phpstan.neon

@@ -0,0 +1,3 @@
+includes:
+	- phpstan-baseline.neon
+

psalm.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="tests/" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -23,20 +23,16 @@
 namespace Chill\ActivityBundle\Controller;
 
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\PersonBundle\Entity\Person;
 use Chill\ActivityBundle\Form\ActivityType;
-use Symfony\Component\Serializer\SerializerInterface;
 
 /**
  * Class ActivityController
@@ -45,227 +41,216 @@ use Symfony\Component\Serializer\SerializerInterface;
  */
 class ActivityController extends AbstractController
 {
-    protected EventDispatcherInterface $eventDispatcher;
 
-    protected AuthorizationHelper $authorizationHelper;
+    /**
+     * @var EventDispatcherInterface
+     */
+    protected $eventDispatcher;
 
-    protected LoggerInterface $logger;
+    /**
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
 
-    protected SerializerInterface $serializer;
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;
 
+    /**
+     * ActivityController constructor.
+     *
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param AuthorizationHelper $authorizationHelper
+     */
     public function __construct(
         EventDispatcherInterface $eventDispatcher,
         AuthorizationHelper $authorizationHelper,
-        LoggerInterface $logger,
+        LoggerInterface $logger
-        SerializerInterface $serializer
     ) {
         $this->eventDispatcher = $eventDispatcher;
         $this->authorizationHelper = $authorizationHelper;
         $this->logger = $logger;
-        $this->serializer = $serializer;
     }
 
     /**
      * Lists all Activity entities.
+     *
      */
-    public function listAction(Request $request): Response
+    public function listAction($person_id, Request $request)
     {
         $em = $this->getDoctrine()->getManager();
-        $view = null;
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
+        if ($person === NULL) {
-
+            throw $this->createNotFoundException('Person not found');
-        if ($person instanceof Person) {
-            $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,
-                'action' => 'list'
-            ));
-            $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-
-            $view = 'ChillActivityBundle:Activity:listPerson.html.twig';
-        } elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $activities = $em->getRepository('ChillActivityBundle:Activity')->findBy(
-                ['accompanyingPeriod' => $accompanyingPeriod],
-                ['date' => 'DESC'],
-            );
-
-            $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         }
 
-        return $this->render($view, array(
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+
+        $reachableScopes = $this->authorizationHelper
+            ->getReachableScopes($this->getUser(), new Role('CHILL_ACTIVITY_SEE'),
+            $person->getCenter());
+
+        $activities = $em->getRepository('ChillActivityBundle:Activity')
+                ->findBy(
+                      array('person' => $person, 'scope' => $reachableScopes),
+                      array('date' => 'DESC')
+                      );
+
+        $event = new PrivacyEvent($person, array(
+            'element_class' => Activity::class,
+            'action' => 'list'
+        ));
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+
+        return $this->render('ChillActivityBundle:Activity:list.html.twig', array(
             'activities' => $activities,
-            'person'   => $person,
+            'person'   => $person
-            'accompanyingCourse' => $accompanyingPeriod,
         ));
     }
-
+    /**
-    public function selectTypeAction(Request $request): Response
+     * Creates a new Activity entity.
+     *
+     */
+    public function createAction($person_id, Request $request)
     {
         $em = $this->getDoctrine()->getManager();
-        $view = null;
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
+        if ($person === NULL) {
-
+            throw $this->createNotFoundException('person not found');
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:selectTypeAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:selectTypePerson.html.twig';
         }
 
-        $data = [];
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-
-        $activityTypeCategories = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityTypeCategory::class)
-            ->findBy(['active' => true], ['ordering' => 'ASC']);
-
-        foreach ($activityTypeCategories as $activityTypeCategory) {
-            $activityTypes = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityType::class)
-                ->findBy(['active' => true, 'category' => $activityTypeCategory], ['ordering' => 'ASC']);
-
-            $data[] = [
-                'activityTypeCategory' => $activityTypeCategory,
-                'activityTypes' => $activityTypes,
-            ];
-        }
-
-        if ($view === null) {
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        return $this->render($view, [
-            'person' => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-            'data' => $data,
-        ]);
-    }
-
-    public function newAction(Request $request): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:newPerson.html.twig';
-        }
-
-        $activityType_id = $request->get('activityType_id', 0);
-        $activityType = $em->getRepository(\Chill\ActivityBundle\Entity\ActivityType::class)
-            ->find($activityType_id);
-
-        if (!$activityType instanceof \Chill\ActivityBundle\Entity\ActivityType ||
-            !$activityType->isActive()) {
-
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-            return $this->redirectToRoute('chill_activity_activity_select_type', $params);
-        }
 
         $entity = new Activity();
-        $entity->setUser($this->getUser());
+        $entity->setPerson($person);
+        $form = $this->createCreateForm($entity, $person);
+        $form->handleRequest($request);
 
-        if ($person instanceof Person) {
+        if ($form->isValid()) {
-            $entity->setPerson($person);
+            $em = $this->getDoctrine()->getManager();
-        }
 
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity,
-            $entity->setAccompanyingPeriod($accompanyingPeriod);
+                    'creation of this activity not allowed');
-        }
 
-        $entity->setType($activityType);
-        $entity->setDate(new \DateTime('now'));
-
-        // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
-
-        $form = $this->createForm(ActivityType::class, $entity, [
-            'center' => $entity->getCenter(),
-            'role'   => new Role('CHILL_ACTIVITY_CREATE'),
-            'activityType' => $entity->getType(),
-            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
             $em->persist($entity);
             $em->flush();
 
-            $this->addFlash('success', $this->get('translator')->trans('Success : activity created!'));
+            $this->get('session')
+                ->getFlashBag()
+                ->add('success',
+                    $this->get('translator')
+                        ->trans('Success : activity created!')
+                );
 
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+            return $this->redirect(
-            $params['id'] = $entity->getId();
+                $this->generateUrl('chill_activity_activity_show',
-
+                array('id' => $entity->getId(), 'person_id' => $person_id)));
-            return $this->redirectToRoute('chill_activity_activity_show', $params);
         }
 
-        if ($view === null) {
+        $this->get('session')
-            throw $this->createNotFoundException('Template not found');
+            ->getFlashBag()->add('danger',
-        }
+                $this->get('translator')
+                    ->trans('The form is not valid. The activity has not been created !')
+            );
 
-        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
+        return $this->render('ChillActivityBundle:Activity:new.html.twig', array(
-
-        return $this->render($view, [
-            'person'   => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
             'entity' => $entity,
-            'form' => $form->createView(),
+            'form'   => $form->createView(),
-            'activity_json' => $activity_array
+            'person' => $person
-        ]);
+        ));
     }
 
-    public function showAction(Request $request, $id): Response
+    /**
+     * Creates a form to create a Activity entity.
+     *
+     * @param Activity $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(Activity $entity)
+    {
+        $form = $this->createForm(ActivityType::class, $entity,
+              array(
+                'action' => $this->generateUrl('chill_activity_activity_create', [
+                    'person_id' => $entity->getPerson()->getId(),
+                    ]),
+                'method' => 'POST',
+                'center' => $entity->getCenter(),
+                'role'   => new Role('CHILL_ACTIVITY_CREATE')
+            )
+        );
+
+        return $form;
+    }
+
+    /**
+     * Displays a form to create a new Activity entity.
+     *
+     */
+    public function newAction($person_id)
     {
         $em = $this->getDoctrine()->getManager();
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
+        if ($person === NULL){
-
+            throw $this->createNotFoundException('Person not found');
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:showPerson.html.twig';
         }
 
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+
+        $entity = new Activity();
+        $entity->setUser($this->get('security.token_storage')->getToken()->getUser());
+        $entity->setPerson($person);
+        $entity->setDate(new \DateTime('now'));
+
+        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_CREATE', $entity);
+
+        $form   = $this->createCreateForm($entity, $person);
+
+        return $this->render('ChillActivityBundle:Activity:new.html.twig', array(
+            'person'   => $person,
+            'entity' => $entity,
+            'form'   => $form->createView(),
+        ));
+    }
+
+    /**
+     * Finds and displays a Activity entity.
+     *
+     */
+    public function showAction($person_id, $id)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+
+        if (!$person) {
+            throw $this->createNotFoundException('person not found');
+        }
+
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+
         $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
-        
-        if (null !== $accompanyingPeriod) {
-           $entity->personsAssociated = $entity->getPersonsAssociated();
-           $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
-        }
 
-        // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
+        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
 
-        $deleteForm = $this->createDeleteForm($id, $person, $accompanyingPeriod);
+        $deleteForm = $this->createDeleteForm($id, $person);
 
-        // TODO
-        /*
         $event = new PrivacyEvent($person, array(
             'element_class' => Activity::class,
             'element_id' => $entity->getId(),
             'action' => 'show'
         ));
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        */
 
-        if ($view === null) {
+        return $this->render('ChillActivityBundle:Activity:show.html.twig', array(
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        return $this->render($view, array(
             'person'      => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
             'entity'      => $entity,
             'delete_form' => $deleteForm->createView(),
         ));
@@ -275,70 +260,118 @@ class ActivityController extends AbstractController
      * Displays a form to edit an existing Activity entity.
      *
      */
-    public function editAction($id, Request $request): Response
+    public function editAction($person_id, $id)
     {
         $em = $this->getDoctrine()->getManager();
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
 
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
+        if (!$person) {
-
+            throw $this->createNotFoundException('person not found');
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:editPerson.html.twig';
         }
 
+        $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
+
         $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
 
         if (!$entity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
-        // TODO
+        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
 
-        $form = $this->createForm(ActivityType::class, $entity, [
+        $editForm = $this->createEditForm($entity);
-            'center' => $entity->getCenter(),
+        $deleteForm = $this->createDeleteForm($id, $person);
-            'role'   => new Role('CHILL_ACTIVITY_UPDATE'),
-            'activityType' => $entity->getType(),
-            'accompanyingPeriod' => $accompanyingPeriod,
-        ])->handleRequest($request);
 
-        if ($form->isSubmitted() && $form->isValid()) {
-            $em->persist($entity);
-            $em->flush();
-
-            $this->addFlash('success', $this->get('translator')->trans('Success : activity updated!'));
-
-            $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-            $params['id'] = $id;
-            return $this->redirectToRoute('chill_activity_activity_show', $params);
-        }
-
-        $deleteForm = $this->createDeleteForm($id, $person, $accompanyingPeriod);
-
-        /*
-         * TODO
         $event = new PrivacyEvent($person, array(
             'element_class' => Activity::class,
             'element_id' => $entity->getId(),
             'action' => 'edit'
         ));
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
-        */
 
-        if ($view === null) {
+        return $this->render('ChillActivityBundle:Activity:edit.html.twig', array(
-            throw $this->createNotFoundException('Template not found');
+            'entity'      => $entity,
+            'edit_form'   => $editForm->createView(),
+            'delete_form' => $deleteForm->createView(),
+            'person' => $person
+        ));
+    }
+
+    /**
+    * Creates a form to edit a Activity entity.
+    *
+    * @param Activity $entity The entity
+    *
+    * @return \Symfony\Component\Form\Form The form
+    */
+    private function createEditForm(Activity $entity)
+    {
+        $form = $this->createForm(ActivityType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activity_update',
+                    array(
+                        'id' => $entity->getId(),
+                        'person_id' => $entity->getPerson()->getId()
+                )),
+            'method' => 'PUT',
+            'center' => $entity->getCenter(),
+            'role'   => new Role('CHILL_ACTIVITY_UPDATE')
+        ));
+
+        return $form;
+    }
+    /**
+     * Edits an existing Activity entity.
+     *
+     */
+    public function updateAction(Request $request, $person_id, $id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $person = $em->getRepository('ChillPersonBundle:Person')->find($person_id);
+        $entity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
-        $activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
+        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
 
-        return $this->render($view, array(
+        $deleteForm = $this->createDeleteForm($id, $person);
+        $editForm = $this->createEditForm($entity);
+        $editForm->handleRequest($request);
+
+        $event = new PrivacyEvent($person, array(
+            'element_class' => Activity::class,
+            'element_id' => $entity->getId(),
+            'action' => 'update'
+        ));
+        $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
+
+        if ($editForm->isValid()) {
+            $em->flush();
+
+            $this->get('session')
+                ->getFlashBag()
+                ->add('success',
+                    $this->get('translator')
+                        ->trans('Success : activity updated!')
+                );
+
+            return $this->redirect($this->generateUrl('chill_activity_activity_show', array('id' => $id, 'person_id' => $person_id)));
+        }
+
+        $this->get('session')
+            ->getFlashBag()
+            ->add('error',
+                $this->get('translator')
+                    ->trans('This form contains errors')
+            );
+
+        return $this->render('ChillActivityBundle:Activity:edit.html.twig', array(
+            'person'      => $entity->getPerson(),
             'entity'      => $entity,
-            'edit_form'   => $form->createView(),
+            'edit_form'   => $editForm->createView(),
             'delete_form' => $deleteForm->createView(),
-            'person' => $person,
-            'accompanyingCourse' => $accompanyingPeriod,
-            'activity_json' => $activity_array
         ));
     }
 
@@ -346,29 +379,22 @@ class ActivityController extends AbstractController
      * Deletes a Activity entity.
      *
      */
-    public function deleteAction(Request $request, $id)
+    public function deleteAction(Request $request, $id, $person_id)
     {
         $em = $this->getDoctrine()->getManager();
 
-        [$person, $accompanyingPeriod] = $this->getEntity($request);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
-        } elseif ($person instanceof Person) {
-            $view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
-        }
-
         /* @var $activity Activity */
-        $activity = $em->getRepository('ChillActivityBundle:Activity')->find($id);
+        $activity = $em->getRepository('ChillActivityBundle:Activity')
+              ->find($id);
+        $person = $activity->getPerson();
 
         if (!$activity) {
             throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
-        // TODO
+        $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
-        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_DELETE', $activity);
 
-        $form = $this->createDeleteForm($id, $person, $accompanyingPeriod);
+        $form = $this->createDeleteForm($id, $person);
 
         if ($request->getMethod() === Request::METHOD_DELETE) {
             $form->handleRequest($request);
@@ -378,14 +404,14 @@ class ActivityController extends AbstractController
                 $this->logger->notice("An activity has been removed", array(
                    'by_user' => $this->getUser()->getUsername(),
                    'activity_id' => $activity->getId(),
-                   'person_id' => $activity->getPerson() ? $activity->getPerson()->getId() : null,
+                   'person_id' => $activity->getPerson()->getId(),
                    'comment' => $activity->getComment()->getComment(),
-                   'scope_id' => $activity->getScope() ? $activity->getScope()->getId() : null,
+                   'scope_id' => $activity->getScope()->getId(),
                    'reasons_ids' => $activity->getReasons()
                       ->map(function ($ar) { return $ar->getId(); })
                       ->toArray(),
                    'type_id' => $activity->getType()->getId(),
-                   'duration' => $activity->getDurationTime() ? $activity->getDurationTime()->format('U') : null,
+                   'duration' => $activity->getDurationTime()->format('U'),
                    'date' => $activity->getDate()->format('Y-m-d'),
                    'attendee' => $activity->getAttendee()
                 ));
@@ -396,86 +422,37 @@ class ActivityController extends AbstractController
                 $this->addFlash('success', $this->get('translator')
                       ->trans("The activity has been successfully removed."));
 
-                $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
+                return $this->redirect($this->generateUrl(
-                return $this->redirectToRoute('chill_activity_activity_list', $params);
+                  'chill_activity_activity_list', array(
+                     'person_id' => $person_id
+                  )));
             }
         }
 
-        if ($view === null) {
+        return $this->render('ChillActivityBundle:Activity:confirm_delete.html.twig', array(
-            throw $this->createNotFoundException('Template not found');
-        }
-
-        return $this->render($view, array(
            'activity' => $activity,
-           'delete_form' => $form->createView(),
+           'delete_form' => $form->createView()
-           'person' => $person,
-           'accompanyingCourse' => $accompanyingPeriod,
         ));
+
+
     }
 
     /**
      * Creates a form to delete a Activity entity by id.
+     *
+     * @param mixed $id The entity id
+     *
+     * @return \Symfony\Component\Form\Form The form
      */
-    private function createDeleteForm(int $id, ?Person $person, ?AccompanyingPeriod $accompanyingPeriod): Form
+    private function createDeleteForm($id, $person)
     {
-        $params = $this->buildParamsToUrl($person, $accompanyingPeriod);
-        $params['id'] = $id;
-
         return $this->createFormBuilder()
-            ->setAction($this->generateUrl('chill_activity_activity_delete', $params))
+            ->setAction($this->generateUrl(
+                'chill_activity_activity_delete',
+                array('id' => $id, 'person_id' => $person->getId())))
             ->setMethod('DELETE')
             ->add('submit', SubmitType::class, array('label' => 'Delete'))
             ->getForm()
         ;
     }
-
-    private function getEntity(Request $request): array
-    {
-        $em = $this->getDoctrine()->getManager();
-        $person = $accompanyingPeriod  = null;
-
-        if ($request->query->has('person_id')) {
-            $person_id = $request->get('person_id');
-            $person = $em->getRepository(Person::class)->find($person_id);
-
-            if ($person === null) {
-                throw $this->createNotFoundException('Person not found');
-            }
-
-            $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-        } elseif ($request->query->has('accompanying_period_id')) {
-            $accompanying_period_id = $request->get('accompanying_period_id');
-            $accompanyingPeriod = $em->getRepository(AccompanyingPeriod::class)->find($accompanying_period_id);
-
-            if ($accompanyingPeriod === null) {
-                throw $this->createNotFoundException('Accompanying Period not found');
-            }
-
-            // TODO Add permission
-            // $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person);
-        } else {
-            throw $this->createNotFoundException("Person or Accompanying Period not found");
-        }
-
-        return [
-            $person, $accompanyingPeriod
-        ];
-    }
-
-    private function buildParamsToUrl(
-        ?Person $person,
-        ?AccompanyingPeriod $accompanyingPeriod
-    ): array {
-        $params = [];
-
-        if ($person) {
-            $params['person_id'] = $person->getId();
-        }
-
-        if ($accompanyingPeriod) {
-            $params['accompanying_period_id'] = $accompanyingPeriod->getId();
-        }
-
-        return $params;
-    }
 }

src/Bundle/ChillActivityBundle/Controller/ActivityTypeController.php

@@ -0,0 +1,178 @@
+<?php
+
+namespace Chill\ActivityBundle\Controller;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\ActivityBundle\Form\ActivityTypeType;
+
+/**
+ * Class ActivityTypeController
+ *
+ * @package Chill\ActivityBundle\Controller
+ */
+class ActivityTypeController extends AbstractController
+{
+
+    /**
+     * Lists all ActivityType entities.
+     *
+     */
+    public function indexAction()
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entities = $em->getRepository('ChillActivityBundle:ActivityType')->findAll();
+
+        return $this->render('ChillActivityBundle:ActivityType:index.html.twig', array(
+            'entities' => $entities,
+        ));
+    }
+    /**
+     * Creates a new ActivityType entity.
+     *
+     */
+    public function createAction(Request $request)
+    {
+        $entity = new ActivityType();
+        $form = $this->createCreateForm($entity);
+        $form->handleRequest($request);
+
+        if ($form->isValid()) {
+            $em = $this->getDoctrine()->getManager();
+            $em->persist($entity);
+            $em->flush();
+
+            return $this->redirect($this->generateUrl('chill_activity_activitytype_show', array('id' => $entity->getId())));
+        }
+
+        return $this->render('ChillActivityBundle:ActivityType:new.html.twig', array(
+            'entity' => $entity,
+            'form'   => $form->createView(),
+        ));
+    }
+
+    /**
+     * Creates a form to create a ActivityType entity.
+     *
+     * @param ActivityType $entity The entity
+     *
+     * @return \Symfony\Component\Form\Form The form
+     */
+    private function createCreateForm(ActivityType $entity)
+    {
+        $form = $this->createForm(ActivityTypeType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activitytype_create'),
+            'method' => 'POST',
+        ));
+
+        $form->add('submit', SubmitType::class, array('label' => 'Create'));
+
+        return $form;
+    }
+
+    /**
+     * Displays a form to create a new ActivityType entity.
+     *
+     */
+    public function newAction()
+    {
+        $entity = new ActivityType();
+        $form   = $this->createCreateForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityType:new.html.twig', array(
+            'entity' => $entity,
+            'form'   => $form->createView(),
+        ));
+    }
+
+    /**
+     * Finds and displays a ActivityType entity.
+     *
+     */
+    public function showAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityType')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityType entity.');
+        }
+
+        return $this->render('ChillActivityBundle:ActivityType:show.html.twig', array(
+            'entity'      => $entity,
+        ));
+    }
+
+    /**
+     * Displays a form to edit an existing ActivityType entity.
+     *
+     */
+    public function editAction($id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityType')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityType entity.');
+        }
+
+        $editForm = $this->createEditForm($entity);
+
+        return $this->render('ChillActivityBundle:ActivityType:edit.html.twig', array(
+            'entity'      => $entity,
+            'edit_form'   => $editForm->createView()
+        ));
+    }
+
+    /**
+    * Creates a form to edit a ActivityType entity.
+    *
+    * @param ActivityType $entity The entity
+    *
+    * @return \Symfony\Component\Form\Form The form
+    */
+    private function createEditForm(ActivityType $entity)
+    {
+        $form = $this->createForm(ActivityTypeType::class, $entity, array(
+            'action' => $this->generateUrl('chill_activity_activitytype_update', array('id' => $entity->getId())),
+            'method' => 'PUT',
+        ));
+
+        $form->add('submit', SubmitType::class, array('label' => 'Update'));
+
+        return $form;
+    }
+    /**
+     * Edits an existing ActivityType entity.
+     *
+     */
+    public function updateAction(Request $request, $id)
+    {
+        $em = $this->getDoctrine()->getManager();
+
+        $entity = $em->getRepository('ChillActivityBundle:ActivityType')->find($id);
+
+        if (!$entity) {
+            throw $this->createNotFoundException('Unable to find ActivityType entity.');
+        }
+
+        $editForm = $this->createEditForm($entity);
+        $editForm->handleRequest($request);
+
+        if ($editForm->isValid()) {
+            $em->flush();
+
+            return $this->redirect($this->generateUrl('chill_activity_activitytype_edit', array('id' => $id)));
+        }
+
+        return $this->render('ChillActivityBundle:ActivityType:edit.html.twig', array(
+            'entity'      => $entity,
+            'edit_form'   => $editForm->createView(),
+        ));
+    }
+}

src/Bundle/ChillActivityBundle/Controller/AdminActivityPresenceController.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Controller;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Chill\MainBundle\Pagination\PaginatorInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-class AdminActivityPresenceController extends CRUDController
-{
-    /**
-     * @param string $action
-     * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     * @param Request $request
-     * @param PaginatorInterface $paginator
-     * @return \Doctrine\ORM\QueryBuilder|mixed
-     */
-    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
-    {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
-        return $query->orderBy('e.id', 'ASC');
-    }
-}

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeCategoryController.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Controller;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Chill\MainBundle\Pagination\PaginatorInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-class AdminActivityTypeCategoryController extends CRUDController
-{
-    /**
-     * @param string $action
-     * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     * @param Request $request
-     * @param PaginatorInterface $paginator
-     * @return \Doctrine\ORM\QueryBuilder|mixed
-     */
-    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
-    {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
-        return $query->orderBy('e.ordering', 'ASC');
-    }
-}

src/Bundle/ChillActivityBundle/Controller/AdminActivityTypeController.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Controller;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Chill\MainBundle\Pagination\PaginatorInterface;
-use Symfony\Component\HttpFoundation\Request;
-
-class AdminActivityTypeController extends CRUDController
-{
-    /**
-     * @param string $action
-     * @param \Doctrine\ORM\QueryBuilder|mixed $query
-     * @param Request $request
-     * @param PaginatorInterface $paginator
-     * @return \Doctrine\ORM\QueryBuilder|mixed
-     */
-    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
-    {
-        /** @var \Doctrine\ORM\QueryBuilder $query */
-        return $query->orderBy('e.ordering', 'ASC');
-    }
-}

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

@@ -116,10 +116,9 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
             ->setDurationTime($this->faker->dateTime(36000))
             ->setType($this->getRandomActivityType())
             ->setScope($this->getRandomScope())
+            ->setAttendee($this->faker->boolean())
             ;
 
-        //      ->setAttendee($this->faker->boolean())
-
         $usedId = array();
         for ($i = 0; $i < rand(0, 4); $i++) {
             $reason = $this->getRandomActivityReason($usedId);
@@ -138,15 +137,11 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface, C
 
         foreach($persons as $person) {
             $activityNbr = rand(0,3);
-            $ref = 'activity_'.$person->getFullnameCanonical();
-
             for($i = 0; $i < $activityNbr; $i ++) {
-                print "Creating an activity type for  : ".$person." (ref: ".$ref.")  \n";
+                print "Creating an activity type for  : ".$person."\n";
                 $activity = $this->newRandomActivity($person);
                 $manager->persist($activity);
             }
-
-            $this->setReference($ref, $activity);
         }
         $manager->flush();
     }

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

@@ -1,38 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\DataFixtures\ORM;
-
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait;
-use Chill\ActivityBundle\DataFixtures\ORM\LoadActivity;
-
-/**
- * Load notififications into database
- */
-class LoadActivityNotifications extends AbstractFixture implements DependentFixtureInterface
-{
-    use LoadAbstractNotificationsTrait;
-
-    public $notifs = [
-        [
-            'message' => 'Hello !',
-            'entityClass' => Activity::class,
-            'entityRef' => 'activity_gerard depardieu',
-            'sender' => 'center a_social',
-            'addressees' => [
-                'center a_administrative',
-                'center a_direction',
-                'multi_center'
-            ],
-        ]
-    ];
-
-    public function getDependencies()
-    {
-        return [
-            LoadActivity::class,
-        ];
-    }
-}

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

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

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

@@ -1,72 +0,0 @@
-<?php
-
-/*
- * Chill is a software for social workers
- *
- * Copyright (C) 2014-2021, Champs Libres Cooperative SCRLFS,
- * <http://www.champs-libres.coop>, <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace Chill\ActivityBundle\DataFixtures\ORM;
-
-use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-use Chill\ActivityBundle\Entity\ActivityTypeCategory;
-
-/**
- * Fixtures for ActivityTypeCategory
- *
- * @author Champs-Libres Coop
- */
-class LoadActivityTypeCategory extends Fixture implements OrderedFixtureInterface
-{
-    public static $references = array();
-
-    public function getOrder()
-    {
-        return 16050;
-    }
-
-    public function load(ObjectManager $manager)
-    {
-        $categories = [
-            [
-                'name' => ['fr' => 'Échange avec usager', 'en' => 'Exchange with user'],
-                'ref' => 'exchange',
-            ],
-            [
-                'name' => ['fr' => 'Réunion', 'en' => 'Meeting'],
-                'ref' => 'meeting',
-            ],
-        ];
-
-        foreach ($categories as $cat) {
-            print "Creating activity type category : " . $cat['ref'] . "\n";
-
-            $newCat = (new ActivityTypeCategory())
-                ->setName(($cat['name']));
-
-            $manager->persist($newCat);
-            $reference = 'activity_type_cat_'.$cat['ref'];
-
-            $this->addReference($reference, $newCat);
-            static::$references[] = $reference;
-        }
-
-        $manager->flush();
-    }
-}

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -3,7 +3,7 @@
 /*
  * Chill is a software for social workers
  *
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS,
+ * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
  * <http://www.champs-libres.coop>, <info@champs-libres.coop>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -44,7 +44,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
-
+        
         $container->setParameter('chill_activity.form.time_duration', $config['form']['time_duration']);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
@@ -56,18 +56,17 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/form.yaml');
         $loader->load('services/templating.yaml');
     }
-
+    
     public function prepend(ContainerBuilder $container)
     {
         $this->prependRoutes($container);
         $this->prependAuthorization($container);
-        $this->prependCruds($container);
     }
 
     /* (non-PHPdoc)
      * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
      */
-    public function prependRoutes(ContainerBuilder $container)
+    public function prependRoutes(ContainerBuilder $container) 
     {
         //add routes for custom bundle
          $container->prependExtensionConfig('chill_main', array(
@@ -78,7 +77,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
            )
         ));
     }
-
+    
     public function prependAuthorization(ContainerBuilder $container)
     {
         $container->prependExtensionConfig('security', array(
@@ -90,75 +89,4 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
            )
         ));
     }
-
-    protected function prependCruds(ContainerBuilder $container)
-    {
-        $container->prependExtensionConfig('chill_main', [
-            'cruds' => [
-                [
-                    'class' => \Chill\ActivityBundle\Entity\ActivityType::class,
-                    'name' => 'activity_type',
-                    'base_path' => '/admin/activity/type',
-                    'form_class' => \Chill\ActivityBundle\Form\ActivityTypeType::class,
-                    'controller' => \Chill\ActivityBundle\Controller\AdminActivityTypeController::class,
-                    'actions' => [
-                        'index' => [
-                            'template' => '@ChillActivity/ActivityType/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
-                        ],
-                        'new'   => [
-                            'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillActivity/ActivityType/new.html.twig',
-                        ],
-                        'edit'  => [
-                            'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillActivity/ActivityType/edit.html.twig',
-                        ]
-                    ]
-                ],
-                [
-                    'class' => \Chill\ActivityBundle\Entity\ActivityTypeCategory::class,
-                    'name' => 'activity_type_category',
-                    'base_path' => '/admin/activity/type_category',
-                    'form_class' => \Chill\ActivityBundle\Form\ActivityTypeCategoryType::class,
-                    'controller' => \Chill\ActivityBundle\Controller\AdminActivityTypeCategoryController::class,
-                    'actions' => [
-                        'index' => [
-                            'template' => '@ChillActivity/ActivityTypeCategory/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
-                        ],
-                        'new'   => [
-                            'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillActivity/ActivityTypeCategory/new.html.twig',
-                        ],
-                        'edit'  => [
-                            'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillActivity/ActivityTypeCategory/edit.html.twig',
-                        ]
-                    ]
-                ],
-                [
-                    'class' => \Chill\ActivityBundle\Entity\ActivityPresence::class,
-                    'name' => 'activity_presence',
-                    'base_path' => '/admin/activity/presence',
-                    'form_class' => \Chill\ActivityBundle\Form\ActivityPresenceType::class,
-                    'controller' => \Chill\ActivityBundle\Controller\AdminActivityPresenceController::class,
-                    'actions' => [
-                        'index' => [
-                            'template' => '@ChillActivity/ActivityPresence/index.html.twig',
-                            'role' => 'ROLE_ADMIN'
-                        ],
-                        'new'   => [
-                            'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillActivity/ActivityPresence/new.html.twig',
-                        ],
-                        'edit'  => [
-                            'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillActivity/ActivityPresence/edit.html.twig',
-                        ]
-                    ]
-                ],
-            ]
-        ]);
-    }
 }

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -20,25 +20,19 @@
 
 namespace Chill\ActivityBundle\Entity;
 
-use Chill\DocStoreBundle\Entity\Document;
-use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\Mapping as ORM;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Center;
+use Chill\ActivityBundle\Entity\ActivityReason;
+use Chill\ActivityBundle\Entity\ActivityType;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Entity\HasCenterInterface;
 use Chill\MainBundle\Entity\HasScopeInterface;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 use Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistency;
-use Symfony\Component\Serializer\Annotation\Groups;
-use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
 /**
  * Class Activity
@@ -47,513 +41,311 @@ use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
  * @ORM\Entity(repositoryClass="Chill\ActivityBundle\Repository\ActivityRepository")
  * @ORM\Table(name="activity")
  * @ORM\HasLifecycleCallbacks()
- * @DiscriminatorMap(typeProperty="type", mapping={
- *  "activity"=Activity::class
- *  })
- */
-
-/*
- * TODO : revoir
  * @UserCircleConsistency(
  *      "CHILL_ACTIVITY_SEE_DETAILS",
  *      getUserFunction="getUser",
  *      path="scope")
  */
-
 class Activity implements HasCenterInterface, HasScopeInterface
 {
-    const SENTRECEIVED_SENT = 'sent';
-    const SENTRECEIVED_RECEIVED = 'received';
-
     /**
+     * @var integer
+     *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"read"})
      */
-    private ?int $id = null;
+    private $id;
 
     /**
+     * @var User
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
      */
-    private User $user;
+    private $user;
 
     /**
+     * @var \DateTime
      * @ORM\Column(type="datetime")
      */
-    private \DateTime $date;
+    private $date;
 
     /**
-     * @ORM\Column(type="time", nullable=true)
+     * @var \DateTime
+     * @ORM\Column(type="time")
      */
-    private ?\DateTime $durationTime = null;
+    private $durationTime;
 
     /**
-     * @ORM\Column(type="time", nullable=true)
+     * @var boolean
+     * @ORM\Column(type="boolean")
      */
-    private ?\DateTime $travelTime = null;
+    private $attendee;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
-     */
-    private ?ActivityPresence $attendee = null;
 
     /**
+     * @var ActivityReason
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
      */
-    private Collection $reasons;
+    private $reasons;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
-     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
-     */
-    private $socialIssues;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
-     * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
-     */
-    private $socialActions;
-
 
     /**
+     * @var ActivityType
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
      */
-    private ActivityType $type;
+    private $type;
 
     /**
+     * @var Scope
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
      */
-    private ?Scope $scope = null;
+    private $scope;
 
     /**
+     * @var Person
      * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\Person")
      */
-    private ?Person $person = null;
+    private $person;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\PersonBundle\Entity\AccompanyingPeriod")
-     * @Groups({"read"})
-     */
-    private ?AccompanyingPeriod $accompanyingPeriod = null;
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
      */
-    private CommentEmbeddable $comment;
+    private $comment;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
+     * Activity constructor.
-     * @Groups({"read"})
      */
-    private ?Collection $persons = null;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
-     * @Groups({"read"})
-     */
-    private ?Collection $thirdParties = null;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\DocStoreBundle\Entity\StoredObject")
-     */
-    private Collection $documents;
-
-    /**
-     * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
-     * @Groups({"read"})
-     */
-    private ?Collection $users = null;
-
-    /**
-     * @ORM\Column(type="boolean", options={"default"=false})
-     */
-    private bool $emergency = false;
-
-    /**
-     * @ORM\Column(type="string", options={"default"=""})
-     */
-    private string $sentReceived = '';
-
     public function __construct()
     {
         $this->reasons = new ArrayCollection();
         $this->comment = new CommentEmbeddable();
-        $this->persons = new ArrayCollection();
-        $this->thirdParties = new ArrayCollection();
-        $this->documents = new ArrayCollection();
-        $this->users = new ArrayCollection();
-        $this->socialIssues = new ArrayCollection();
-        $this->socialActions = new ArrayCollection();
     }
 
-    public function getId(): ?int
+    /**
+     * Get id
+     *
+     * @return integer
+     */
+    public function getId()
     {
         return $this->id;
     }
 
-    public function setUser(User $user): self
+    /**
+     * Set user
+     *
+     * @param User $user
+     * @return Activity
+     */
+    public function setUser(User $user)
     {
         $this->user = $user;
 
         return $this;
     }
 
-    public function getUser(): User
+    /**
+     * Get user
+     *
+     * @return User
+     */
+    public function getUser()
     {
         return $this->user;
     }
 
-    public function setDate(\DateTime $date): self
+    /**
+     * Set date
+     *
+     * @param \DateTime $date
+     * @return Activity
+     */
+    public function setDate($date)
     {
         $this->date = $date;
 
         return $this;
     }
 
-    public function getDate(): \DateTime
+    /**
+     * Get date
+     *
+     * @return \DateTime
+     */
+    public function getDate()
     {
         return $this->date;
     }
 
-    public function setDurationTime(?\DateTime $durationTime): self
+    /**
+     * Set durationTime
+     *
+     * @param \DateTime $durationTime
+     * @return Activity
+     */
+    public function setDurationTime($durationTime)
     {
         $this->durationTime = $durationTime;
 
         return $this;
     }
 
-    public function getDurationTime(): ?\DateTime
+    /**
+     * Get durationTime
+     *
+     * @return \DateTime
+     */
+    public function getDurationTime()
     {
         return $this->durationTime;
     }
 
-    public function setTravelTime(\DateTime $travelTime): self
+    /**
-    {
+     * Set attendee
-        $this->travelTime = $travelTime;
+     *
-
+     * @param boolean $attendee
-        return $this;
+     * @return Activity
-    }
+     */
-
+    public function setAttendee($attendee)
-    public function getTravelTime(): ?\DateTime
-    {
-        return $this->travelTime;
-    }
-
-    public function setAttendee(ActivityPresence $attendee): self
     {
         $this->attendee = $attendee;
 
         return $this;
     }
 
-    public function getAttendee(): ?ActivityPresence
+    /**
+     * Get attendee
+     *
+     * @return boolean
+     */
+    public function getAttendee()
     {
         return $this->attendee;
     }
 
-    public function addReason(ActivityReason $reason): self
+    /**
+     * Add a reason
+     *
+     * @param ActivityReason $reason
+     * @return Activity
+     */
+    public function addReason(ActivityReason $reason)
     {
-        $this->reasons->add($reason);
+        $this->reasons[] = $reason;
-
-        return $this;
-    }
-
-    public function removeReason(ActivityReason $reason): void
-    {
-        $this->reasons->removeElement($reason);
-    }
-
-    public function getReasons(): Collection
-    {
-        return $this->reasons;
-    }
-
-    public function setReasons(?ArrayCollection $reasons): self
-    {
-        $this->reasons = $reasons;
-
-        return $this;
-    }
-
-    public function getSocialIssues(): Collection
-    {
-        return $this->socialIssues;
-    }
-
-    public function addSocialIssue(SocialIssue $socialIssue): self
-    {
-        if (!$this->socialIssues->contains($socialIssue)) {
-            $this->socialIssues[] = $socialIssue;
-        }
-
-        return $this;
-    }
-
-    public function removeSocialIssue(SocialIssue $socialIssue): self
-    {
-        $this->socialIssues->removeElement($socialIssue);
 
         return $this;
     }
 
     /**
-     * @return Collection|SocialAction[]
+     * @param ActivityReason $reason
      */
-    public function getSocialActions(): Collection
+    public function removeReason(ActivityReason $reason)
     {
-        return $this->socialActions;
+        $this->reasons->removeElement($reason);
     }
 
-    public function addSocialAction(SocialAction $socialAction): self
+    /**
+     * Get reasons
+     *
+     * @return Collection
+     */
+    public function getReasons()
     {
-        if (!$this->socialActions->contains($socialAction)) {
+        return $this->reasons;
-            $this->socialActions[] = $socialAction;
-        }
-
-        return $this;
     }
 
-    public function removeSocialAction(SocialAction $socialAction): self
+    /**
-    {
+     * Set type
-        $this->socialActions->removeElement($socialAction);
+     *
-
+     * @param ActivityType $type
-        return $this;
+     * @return Activity
-    }
+     */
-
+    public function setType(ActivityType $type)
-
-
-
-    public function setType(ActivityType $type): self
     {
         $this->type = $type;
 
         return $this;
     }
 
-    public function getType(): ActivityType
+    /**
+     * Get type
+     *
+     * @return ActivityType
+     */
+    public function getType()
     {
         return $this->type;
     }
 
-    public function setScope(Scope $scope): self
+    /**
+     * Set scope
+     *
+     * @param Scope $scope
+     * @return Activity
+     */
+    public function setScope(Scope $scope)
     {
         $this->scope = $scope;
 
         return $this;
     }
 
-    public function getScope(): ?Scope
+    /**
+     * Get scope
+     *
+     * @return Scope
+     */
+    public function getScope()
     {
         return $this->scope;
     }
 
-    public function setPerson(?Person $person): self
+    /**
+     * Set person
+     *
+     * @param Person $person
+     * @return Activity
+     */
+    public function setPerson(Person $person)
     {
         $this->person = $person;
 
         return $this;
     }
 
-    public function getPerson(): ?Person
+    /**
+     * Get person
+     *
+     * @return Person
+     */
+    public function getPerson()
     {
         return $this->person;
     }
 
-    public function getAccompanyingPeriod(): ?AccompanyingPeriod
-    {
-        return $this->accompanyingPeriod;
-    }
-
-    public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self
-    {
-        $this->accompanyingPeriod = $accompanyingPeriod;
-
-        return $this;
-    }
-
     /**
      * get the center
      * center is extracted from person
+     *
+     * @return Center
      */
-    public function getCenter(): ?Center
+    public function getCenter()
     {
-        if ($this->person instanceof Person) {
+        return $this->person->getCenter();
-            return $this->person->getCenter();
-        }
-
-        return null;
     }
 
-    public function getComment(): CommentEmbeddable
+    /**
+     * @return \Chill\MainBundle\Entity\Embeddalbe\CommentEmbeddable
+     */
+    public function getComment()
     {
         return $this->comment;
     }
 
-    public function setComment(CommentEmbeddable $comment): self
+    /**
+     * @param \Chill\MainBundle\Entity\Embeddalbe\CommentEmbeddable $comment
+     */
+    public function setComment($comment)
     {
         $this->comment = $comment;
-
-        return $this;
-    }
-
-    /**
-     * Add a person to the person list
-     */
-    public function addPerson(?Person $person): self
-    {
-        if (null !== $person) {
-            $this->persons[] = $person;
-        }
-
-        return $this;
-    }
-
-    public function removePerson(Person $person): void
-    {
-        $this->persons->removeElement($person);
-    }
-
-    public function getPersons(): Collection
-    {
-        return $this->persons;
-    }
-
-    public function getPersonsAssociated(): array 
-    {
-        if (null !== $this->accompanyingPeriod) {
-            $personsAssociated = [];
-            foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
-                if ($this->persons->contains($participation->getPerson())) {
-                    $personsAssociated[] = $participation->getPerson();
-                }
-            }
-            return $personsAssociated; 
-        }
-        return [];
-    }
-    
-    public function getPersonsNotAssociated(): array
-    {
-        if (null !== $this->accompanyingPeriod) {
-            $personsNotAssociated = [];
-            foreach ($this->persons as $person) {
-                if (!in_array($person, $this->getPersonsAssociated())) {
-                     $personsNotAssociated[] = $person;
-                }
-            }
-            return $personsNotAssociated;
-        }
-        return [];
-    }    
-
-    public function setPersons(?Collection $persons): self
-    {
-        $this->persons = $persons;
-
-        return $this;
-    }
-
-    public function addThirdParty(?ThirdParty $thirdParty): self
-    {
-        if (null !== $thirdParty) {
-           $this->thirdParties[] = $thirdParty;
-        }
-        return $this;
-    }
-
-    public function removeThirdParty(ThirdParty $thirdParty): void
-    {
-        $this->thirdParties->removeElement($thirdParty);
-    }
-
-    public function getThirdParties(): Collection
-    {
-        return $this->thirdParties;
-    }
-
-    public function setThirdParties(?Collection $thirdParties): self
-    {
-        $this->thirdParties = $thirdParties;
-
-        return $this;
-    }
-
-    public function addDocument(Document $document): self
-    {
-        $this->documents[] = $document;
-
-        return $this;
-    }
-
-    public function removeDocument(Document $document): void
-    {
-        $this->documents->removeElement($document);
-    }
-
-    public function getDocuments(): Collection
-    {
-        return $this->documents;
-    }
-
-    public function setDocuments(Collection $documents): self
-    {
-        $this->documents = $documents;
-
-        return $this;
-    }
-
-    public function addUser(?User $user): self
-    {
-        if (null !== $user) {
-            $this->users[] = $user;
-        }
-        return $this;
-    }
-
-    public function removeUser(User $user): void
-    {
-        $this->users->removeElement($user);
-    }
-
-    public function getUsers(): Collection
-    {
-        return $this->users;
-    }
-
-    public function setUsers(?Collection $users): self
-    {
-        $this->users = $users;
-
-        return $this;
-    }
-
-    public function isEmergency(): bool
-    {
-        return $this->getEmergency();
-    }
-
-    public function getEmergency(): bool
-    {
-        return $this->emergency;
-    }
-
-    public function setEmergency(bool $emergency): self
-    {
-        $this->emergency = $emergency;
-
-        return $this;
-    }
-
-    public function getSentReceived(): string
-    {
-        return $this->sentReceived;
-    }
-
-    public function setSentReceived(?string $sentReceived): self
-    {
-        $this->sentReceived = (string) $sentReceived;
-
-        return $this;
     }
 }
+

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

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

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -1,19 +1,19 @@
 <?php
 
 /*
- *
+ * 
  * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
+ * 
  * This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  * published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -32,239 +32,45 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class ActivityType
 {
-    const FIELD_INVISIBLE = 0;
-    const FIELD_OPTIONAL = 1;
-    const FIELD_REQUIRED = 2;
-
     /**
+     * @var integer
+     *
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private ?int $id;
+    private $id;
 
     /**
+     * @var array
      * @ORM\Column(type="json_array")
      */
-    private array $name = [];
+    private $name;
-
+    
     /**
+     * @var bool
      * @ORM\Column(type="boolean")
      */
-    private bool $active = true;
+    private $active = true;
 
-    /**
-     * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityTypeCategory")
-     */
-    private ?ActivityTypeCategory $category = null;
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=2})
-     */
-    private int $personVisible = self::FIELD_REQUIRED;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $personLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=2})
-     */
-    private int $userVisible = self::FIELD_REQUIRED;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $userLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=2})
-     */
-    private int $dateVisible = self::FIELD_REQUIRED;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $dateLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $placeVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $placeLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $personsVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $personsLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $thirdPartiesVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $thirdPartiesLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $durationTimeVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $durationTimeLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $travelTimeVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $travelTimeLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $attendeeVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $attendeeLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $reasonsVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $reasonsLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $commentVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $commentLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $sentReceivedVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $sentReceivedLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $documentsVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $documentsLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $usersVisible = self::FIELD_OPTIONAL;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $usersLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $emergencyVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $emergencyLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $accompanyingPeriodVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $accompanyingPeriodLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $socialDataVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $socialDataLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $socialIssuesVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $socialIssuesLabel = '';
-
-    /**
-     * @ORM\Column(type="smallint", nullable=false, options={"default"=1})
-     */
-    private int $socialActionsVisible = self::FIELD_INVISIBLE;
-
-    /**
-     * @ORM\Column(type="string", nullable=false, options={"default"=""})
-     */
-    private string $socialActionsLabel = '';
-
-    /**
-     * @ORM\Column(type="float", options={"default"="0.0"})
-     */
-    private float $ordering = 0.0;
 
     /**
      * Get id
+     *
+     * @return integer
      */
-    public function getId(): int
+    public function getId()
     {
         return $this->id;
     }
 
     /**
      * Set name
+     *
+     * @param array $name
+     * @return ActivityType
      */
-    public function setName(array $name): self
+    public function setName($name)
     {
         $this->name = $name;
 
@@ -273,551 +79,58 @@ class ActivityType
 
     /**
      * Get name
+     *
+     * @return array | string
      */
-    public function getName(): array
+    public function getName($locale = null)
     {
-        return $this->name;
+        if ($locale) {
+            if (isset($this->name[$locale])) {
+                return $this->name[$locale];
+            } else {
+                foreach ($this->name as $name) {
+                    if (!empty($name)) {
+                        return $name;
+                    }
+                }
+            }
+            return '';
+        } else {
+            return $this->name;
+        }
     }
-
+    
     /**
      * Get active
      * return true if the type is active.
+     * 
+     * @return boolean
      */
-    public function getActive(): bool
+    public function getActive() {
-    {
         return $this->active;
     }
-
+    
     /**
      * Is active
      * return true if the type is active
+     * 
+     * @return boolean
      */
-    public function isActive(): bool
+    public function isActive() {
-    {
         return $this->getActive();
     }
 
     /**
      * Set active
      * set to true if the type is active
+     * 
+     * @param boolean $active
+     * @return ActivityType
      */
-    public function setActive(bool $active): self
+    public function setActive($active) {
-    {
         $this->active = $active;
-
         return $this;
     }
 
-    public function getCategory(): ?ActivityTypeCategory
-    {
-        return $this->category;
-    }
-
-    public function setCategory(?ActivityTypeCategory $category): self
-    {
-        $this->category = $category;
-
-        return $this;
-    }
-
-    public function getPersonVisible(): int
-    {
-        return $this->personVisible;
-    }
-
-    public function setPersonVisible(int $personVisible): self
-    {
-        $this->personVisible = $personVisible;
-
-        return $this;
-    }
-
-    public function getPersonLabel(): string
-    {
-        return $this->personLabel;
-    }
-
-    public function setPersonLabel(string $personLabel): self
-    {
-        $this->personLabel = $personLabel;
-
-        return $this;
-    }
-
-    public function getUserVisible(): int
-    {
-        return $this->userVisible;
-    }
-
-    public function setUserVisible(int $userVisible): self
-    {
-        $this->userVisible = $userVisible;
-
-        return $this;
-    }
-
-    public function getUserLabel(): string
-    {
-        return $this->userLabel;
-    }
-
-    public function setUserLabel(string $userLabel): self
-    {
-        $this->userLabel = $userLabel;
-
-        return $this;
-    }
-
-    public function getDateVisible(): int
-    {
-        return $this->dateVisible;
-    }
-
-    public function setDateVisible(int $dateVisible): self
-    {
-        $this->dateVisible = $dateVisible;
-
-        return $this;
-    }
-
-    public function getDateLabel(): string
-    {
-        return $this->dateLabel;
-    }
-
-    public function setDateLabel(string $dateLabel): self
-    {
-        $this->dateLabel = $dateLabel;
-
-        return $this;
-    }
-
-    public function getPlaceVisible(): int
-    {
-        return $this->placeVisible;
-    }
-
-    public function setPlaceVisible(int $placeVisible): self
-    {
-        $this->placeVisible = $placeVisible;
-
-        return $this;
-    }
-
-    public function getPlaceLabel(): string
-    {
-        return $this->placeLabel;
-    }
-
-    public function setPlaceLabel(string $placeLabel): self
-    {
-        $this->placeLabel = $placeLabel;
-
-        return $this;
-    }
-
-    public function getPersonsVisible(): int
-    {
-        return $this->personsVisible;
-    }
-
-    public function setPersonsVisible(int $personsVisible): self
-    {
-        $this->personsVisible = $personsVisible;
-
-        return $this;
-    }
-
-    public function getPersonsLabel(): string
-    {
-        return $this->personsLabel;
-    }
-
-    public function setPersonsLabel(string $personsLabel): self
-    {
-        $this->personsLabel = $personsLabel;
-
-        return $this;
-    }
-
-    public function getThirdPartiesVisible(): int
-    {
-        return $this->thirdPartiesVisible;
-    }
-
-    public function setThirdPartiesVisible(int $thirdPartiesVisible): self
-    {
-        $this->thirdPartiesVisible = $thirdPartiesVisible;
-
-        return $this;
-    }
-
-    public function getThirdPartiesLabel(): string
-    {
-        return $this->thirdPartiesLabel;
-    }
-
-    public function setThirdPartiesLabel(string $thirdPartiesLabel): self
-    {
-        $this->thirdPartiesLabel = $thirdPartiesLabel;
-
-        return $this;
-    }
-
-    public function getDurationTimeVisible(): int
-    {
-        return $this->durationTimeVisible;
-    }
-
-    public function setDurationTimeVisible(int $durationTimeVisible): self
-    {
-        $this->durationTimeVisible = $durationTimeVisible;
-
-        return $this;
-    }
-
-    public function getDurationTimeLabel(): string
-    {
-        return $this->durationTimeLabel;
-    }
-
-    public function setDurationTimeLabel(string $durationTimeLabel): self
-    {
-        $this->durationTimeLabel = $durationTimeLabel;
-
-        return $this;
-    }
-
-    public function getTravelTimeVisible(): int
-    {
-        return $this->travelTimeVisible;
-    }
-
-    public function setTravelTimeVisible(int $TravelTimeVisible): self
-    {
-        $this->travelTimeVisible = $TravelTimeVisible;
-
-        return $this;
-    }
-
-    public function getTravelTimeLabel(): string
-    {
-        return $this->travelTimeLabel;
-    }
-
-    public function setTravelTimeLabel(string $TravelTimeLabel): self
-    {
-        $this->travelTimeLabel = $TravelTimeLabel;
-
-        return $this;
-    }
-
-    public function getAttendeeVisible(): int
-    {
-        return $this->attendeeVisible;
-    }
-
-    public function setAttendeeVisible(int $attendeeVisible): self
-    {
-        $this->attendeeVisible = $attendeeVisible;
-
-        return $this;
-    }
-
-    public function getAttendeeLabel(): string
-    {
-        return $this->attendeeLabel;
-    }
-
-    public function setAttendeeLabel(string $attendeeLabel): self
-    {
-        $this->attendeeLabel = $attendeeLabel;
-
-        return $this;
-    }
-
-    public function getReasonsVisible(): int
-    {
-        return $this->reasonsVisible;
-    }
-
-    public function setReasonsVisible(int $reasonsVisible): self
-    {
-        $this->reasonsVisible = $reasonsVisible;
-
-        return $this;
-    }
-
-    public function getReasonsLabel(): string
-    {
-        return $this->reasonsLabel;
-    }
-
-    public function setReasonsLabel(string $reasonsLabel): self
-    {
-        $this->reasonsLabel = $reasonsLabel;
-
-        return $this;
-    }
-
-    public function getCommentVisible(): int
-    {
-        return $this->commentVisible;
-    }
-
-    public function setCommentVisible(int $commentVisible): self
-    {
-        $this->commentVisible = $commentVisible;
-
-        return $this;
-    }
-
-    public function getCommentLabel(): string
-    {
-        return $this->commentLabel;
-    }
-
-    public function setCommentLabel(string $commentLabel): self
-    {
-        $this->commentLabel = $commentLabel;
-
-        return $this;
-    }
-
-    public function getSentReceivedVisible(): int
-    {
-        return $this->sentReceivedVisible;
-    }
-
-    public function setSentReceivedVisible(int $sentReceivedVisible): self
-    {
-        $this->sentReceivedVisible = $sentReceivedVisible;
-
-        return $this;
-    }
-
-    public function getSentReceivedLabel(): string
-    {
-        return $this->sentReceivedLabel;
-    }
-
-    public function setSentReceivedLabel(string $sentReceivedLabel): self
-    {
-        $this->sentReceivedLabel = $sentReceivedLabel;
-
-        return $this;
-    }
-
-    public function getDocumentsVisible(): int
-    {
-        return $this->documentsVisible;
-    }
-
-    public function setDocumentsVisible(int $documentsVisible): self
-    {
-        $this->documentsVisible = $documentsVisible;
-
-        return $this;
-    }
-
-    public function getDocumentsLabel(): string
-    {
-        return $this->documentsLabel;
-    }
-
-    public function setDocumentsLabel(string $documentsLabel): self
-    {
-        $this->documentsLabel = $documentsLabel;
-
-        return $this;
-    }
-
-    public function getUsersVisible(): int
-    {
-        return $this->usersVisible;
-    }
-
-    public function setUsersVisible(int $usersVisible): self
-    {
-        $this->usersVisible = $usersVisible;
-
-        return $this;
-    }
-
-    public function getUsersLabel(): string
-    {
-        return $this->usersLabel;
-    }
-
-    public function setUsersLabel(string $usersLabel): self
-    {
-        $this->usersLabel = $usersLabel;
-
-        return $this;
-    }
-
-    public function getEmergencyVisible(): int
-    {
-        return $this->emergencyVisible;
-    }
-
-    public function setEmergencyVisible(int $emergencyVisible): self
-    {
-        $this->emergencyVisible = $emergencyVisible;
-
-        return $this;
-    }
-
-    public function getEmergencyLabel(): string
-    {
-        return $this->emergencyLabel;
-    }
-
-    public function setEmergencyLabel(string $emergencyLabel): self
-    {
-        $this->emergencyLabel = $emergencyLabel;
-
-        return $this;
-    }
-
-    public function getAccompanyingPeriodVisible(): int
-    {
-        return $this->accompanyingPeriodVisible;
-    }
-
-    public function setAccompanyingPeriodVisible(int $accompanyingPeriodVisible): self
-    {
-        $this->accompanyingPeriodVisible = $accompanyingPeriodVisible;
-
-        return $this;
-    }
-
-    public function getAccompanyingPeriodLabel(): string
-    {
-        return $this->accompanyingPeriodLabel;
-    }
-
-    public function setAccompanyingPeriodLabel(string $accompanyingPeriodLabel): self
-    {
-        $this->accompanyingPeriodLabel = $accompanyingPeriodLabel;
-
-        return $this;
-    }
-
-    public function getSocialDataVisible(): int
-    {
-        return $this->socialDataVisible;
-    }
-
-    public function setSocialDataVisible(int $socialDataVisible): self
-    {
-        $this->socialDataVisible = $socialDataVisible;
-
-        return $this;
-    }
-
-    public function getSocialDataLabel(): string
-    {
-        return $this->socialDataLabel;
-    }
-
-    public function setSocialDataLabel(string $socialDataLabel): self
-    {
-        $this->socialDataLabel = $socialDataLabel;
-
-        return $this;
-    }
-
-    public function isVisible(string $field): bool
-    {
-        $property = $field.'Visible';
-
-        if (!property_exists($this, $property)) {
-            throw new \InvalidArgumentException('Field "'.$field.'" not found');
-        }
-
-        return self::FIELD_INVISIBLE !== $this->$property;
-    }
-
-    public function isRequired(string $field): bool
-    {
-        $property = $field.'Visible';
-
-        if (!property_exists($this, $property)) {
-            throw new \InvalidArgumentException('Field "'.$field.'" not found');
-        }
-
-        return self::FIELD_REQUIRED === $this->$property;
-    }
-
-    public function getLabel(string $field): ?string
-    {
-        $property = $field.'Label';
-
-        if (!property_exists($this, $property)) {
-            throw new \InvalidArgumentException('Field "'.$field.'" not found');
-        }
-
-        return $this->$property;
-    }
-
-    public function getOrdering(): float
-    {
-        return $this->ordering;
-    }
-
-    public function setOrdering(float $ordering): self
-    {
-        $this->ordering = $ordering;
-
-        return $this;
-    }
-
-    public function getSocialIssuesVisible(): ?int
-    {
-        return $this->socialIssuesVisible;
-    }
-
-    public function setSocialIssuesVisible(int $socialIssuesVisible): self
-    {
-        $this->socialIssuesVisible = $socialIssuesVisible;
-
-        return $this;
-    }
-
-    public function getSocialIssuesLabel(): ?string
-    {
-        return $this->socialIssuesLabel;
-    }
-
-    public function setSocialIssuesLabel(string $socialIssuesLabel): self
-    {
-        $this->socialIssuesLabel = $socialIssuesLabel;
-
-        return $this;
-    }
-
-    public function getSocialActionsVisible(): ?int
-    {
-        return $this->socialActionsVisible;
-    }
-
-    public function setSocialActionsVisible(int $socialActionsVisible): self
-    {
-        $this->socialActionsVisible = $socialActionsVisible;
-
-        return $this;
-    }
-
-    public function getSocialActionsLabel(): ?string
-    {
-        return $this->socialActionsLabel;
-    }
-
-    public function setSocialActionsLabel(string $socialActionsLabel): self
-    {
-        $this->socialActionsLabel = $socialActionsLabel;
-
-        return $this;
-    }
 }
+

src/Bundle/ChillActivityBundle/Entity/ActivityTypeCategory.php

@@ -1,123 +0,0 @@
-<?php
-
-/*
- *
- * Copyright (C) 2015, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace Chill\ActivityBundle\Entity;
-
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * Class ActivityTypeCateogry
- *
- * @package Chill\ActivityBundle\Entity
- * @ORM\Entity()
- * @ORM\Table(name="activitytypecategory")
- * @ORM\HasLifecycleCallbacks()
- */
-class ActivityTypeCategory
-{
-    /**
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private ?int $id;
-
-    /**
-     * @ORM\Column(type="json_array")
-     */
-    private array $name = [];
-
-    /**
-     * @ORM\Column(type="boolean")
-     */
-    private bool $active = true;
-
-    /**
-     * @ORM\Column(type="float", options={"default"="0.0"})
-     */
-    private float $ordering = 0.0;
-
-    /**
-     * Get id
-     */
-    public function getId(): int
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set name
-     */
-    public function setName(array $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Get name
-     */
-    public function getName(): array
-    {
-        return $this->name;
-    }
-
-    /**
-     * Get active
-     * return true if the category type is active.
-     */
-    public function getActive(): bool
-    {
-        return $this->active;
-    }
-
-    /**
-     * Is active
-     * return true if the category type is active
-     */
-    public function isActive(): bool
-    {
-        return $this->getActive();
-    }
-
-    /**
-     * Set active
-     * set to true if the category type is active
-     */
-    public function setActive(bool $active): self
-    {
-        $this->active = $active;
-
-        return $this;
-    }
-
-    public function getOrdering(): float
-    {
-        return $this->ordering;
-    }
-
-    public function setOrdering(float $ordering): self
-    {
-        $this->ordering = $ordering;
-
-        return $this;
-    }
-}

src/Bundle/ChillActivityBundle/Form/ActivityPresenceType.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Form;
-
-use Chill\ActivityBundle\Entity\ActivityPresence;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-
-class ActivityPresenceType extends AbstractType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options): void
-    {
-        $builder
-            ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, array(
-                'choices' => array(
-                    'Yes' => true,
-                    'No'  => false
-                ),
-                'expanded' => true
-            ));
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(array(
-            'data_class' => ActivityPresence::class
-        ));
-    }
-}

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -2,21 +2,8 @@
 
 namespace Chill\ActivityBundle\Form;
 
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Entity\ActivityPresence;
-use Chill\ActivityBundle\Entity\ActivityReason;
-use Chill\DocStoreBundle\Form\StoredObjectType;
-use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\CommentType;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Doctrine\ORM\EntityRepository;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
@@ -28,341 +15,178 @@ use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTra
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Chill\ActivityBundle\Form\Type\TranslatableActivityType;
+use Chill\ActivityBundle\Form\Type\TranslatableActivityReason;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Form\Type\ChillDateType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Component\Form\CallbackTransformer;
-use Chill\PersonBundle\Form\DataTransformer\PersonToIdTransformer;
-use Chill\PersonBundle\Templating\Entity\SocialIssueRender;
 
 class ActivityType extends AbstractType
 {
-    protected User $user;
 
-    protected AuthorizationHelper $authorizationHelper;
+    /**
+     * the user running this form
+     *
+     * @var User
+     */
+    protected $user;
 
-    protected ObjectManager $om;
+    /**
+     *
+     * @var AuthorizationHelper
+     */
+    protected $authorizationHelper;
 
-    protected TranslatableStringHelper $translatableStringHelper;
+    /**
+     *
+     * @var ObjectManager
+     */
+    protected $om;
 
-    protected array $timeChoices;
+    /**
+     *
+     * @var TranslatableStringHelper
+     */
+    protected $translatableStringHelper;
 
-    public function __construct (
+    protected $timeChoices;
-        TokenStorageInterface $tokenStorage,
+
-        AuthorizationHelper $authorizationHelper,
+    public function __construct(
-        ObjectManager $om,
+            TokenStorageInterface $tokenStorage,
-        TranslatableStringHelper $translatableStringHelper,
+            AuthorizationHelper $authorizationHelper, ObjectManager $om,
-        array $timeChoices,
+            TranslatableStringHelper $translatableStringHelper,
-        SocialIssueRender $socialIssueRender
+            array $timeChoices
-    ) {
+            )
+    {
         if (!$tokenStorage->getToken()->getUser() instanceof User) {
             throw new \RuntimeException("you should have a valid user");
         }
-
         $this->user = $tokenStorage->getToken()->getUser();
         $this->authorizationHelper = $authorizationHelper;
         $this->om = $om;
         $this->translatableStringHelper = $translatableStringHelper;
         $this->timeChoices = $timeChoices;
-        $this->socialIssueRender = $socialIssueRender;
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options): void
+    /**
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
     {
         // handle times choices
-        $timeChoices = [];
+        $timeChoices = array();
 
         foreach ($this->timeChoices as $e) {
             $timeChoices[$e['label']] = $e['seconds'];
-        }
+        };
 
         $durationTimeTransformer = new DateTimeToTimestampTransformer('GMT', 'GMT');
-        $durationTimeOptions = [
+        $durationTimeOptions = array(
-            'choices' => $timeChoices,
+                'choices' => $timeChoices,
-            'placeholder' => 'Choose the duration',
+                'placeholder' => 'Choose the duration',
-        ];
+        );
 
-        /** @var \Chill\ActivityBundle\Entity\ActivityType $activityType */
+        $builder
-        $activityType = $options['activityType'];
+            ->add('date', ChillDateType::class, array(
-
+               'required' => true
-        if (!$activityType->isActive()) {
+            ))
-            throw new \InvalidArgumentException('Activity type must be active');
+            ->add('durationTime', ChoiceType::class, $durationTimeOptions)
-        }
+            ->add('attendee', ChoiceType::class, array(
-
+               'expanded' => true,
-        // TODO revoir la gestion des center au niveau du form des activité.
+               'required' => false,
-        if ($options['center']) {
+               'choices' => array(
-            $builder->add('scope', ScopePickerType::class, [
+                  'present' => true,
-                'center' => $options['center'],
+                  'not present' => false
-                'role' => $options['role']
+               )
-            ]);
+            ))
-        }
+            ->add('user', UserPickerType::class, [
-
-        /** @var ? \Chill\PersonBundle\Entity\AccompanyingPeriod  $accompanyingPeriod */
-        $accompanyingPeriod = NULL;
-        if ($options['accompanyingPeriod']) {
-            $accompanyingPeriod = $options['accompanyingPeriod'];
-        }
-
-        if ($activityType->isVisible('socialIssues') && $accompanyingPeriod) {
-            $builder->add('socialIssues', EntityType::class, [
-                'label' => $activityType->getLabel('socialIssues'),
-                'required' => $activityType->isRequired('socialIssues'),
-                'class' => SocialIssue::class,
-                'choice_label' => function (SocialIssue $socialIssue) {
-                    return $this->socialIssueRender->renderString($socialIssue, []);
-                },
-                'multiple' => true,
-                'choices' => $accompanyingPeriod->getRecursiveSocialIssues(),
-                'expanded' => true,
-            ]);
-        }
-
-        if ($activityType->isVisible('socialActions') && $accompanyingPeriod) {
-            $builder->add('socialActions', EntityType::class, [
-                'label' => $activityType->getLabel('socialActions'),
-                'required' => $activityType->isRequired('socialActions'),
-                'class' => SocialAction::class,
-                'choice_label' => function (SocialAction $socialAction) {
-                    return $this->translatableStringHelper->localize($socialAction->getTitle());
-                },
-                'multiple' => true,
-                'choices' => $accompanyingPeriod->getRecursiveSocialActions(),
-                'expanded' => true,
-            ]);
-        }
-
-        if ($activityType->isVisible('date')) {
-            $builder->add('date', ChillDateType::class, [
-                'label' => $activityType->getLabel('date'),
-                'required' => $activityType->isRequired('date'),
-            ]);
-        }
-
-        if ($activityType->isVisible('durationTime')) {
-            $durationTimeOptions['label'] = $activityType->getLabel('durationTime');
-            $durationTimeOptions['required'] = $activityType->isRequired('durationTime');
-
-            $builder->add('durationTime', ChoiceType::class, $durationTimeOptions);
-        }
-
-        if ($activityType->isVisible('travelTime')) {
-            $durationTimeOptions['label'] = $activityType->getLabel('travelTime');
-            $durationTimeOptions['required'] = $activityType->isRequired('travelTime');
-
-            $builder->add('travelTime', ChoiceType::class, $durationTimeOptions);
-        }
-
-        if ($activityType->isVisible('attendee')) {
-            $builder->add('attendee', EntityType::class, [
-                'label' => $activityType->getLabel('attendee'),
-                'required' => $activityType->isRequired('attendee'),
-                'expanded' => true,
-                'class' => ActivityPresence::class,
-                'choice_label' => function (ActivityPresence $activityPresence) {
-                    return $this->translatableStringHelper->localize($activityPresence->getName());
-                },
-                'query_builder' => function (EntityRepository $er) {
-                    return $er->createQueryBuilder('a')
-                        ->where('a.active = true');
-                },
-            ]);
-        }
-
-        if ($activityType->isVisible('user') && $options['center']) {
-            $builder->add('user', UserPickerType::class, [
-                'label' => $activityType->getLabel('user'),
-                'required' => $activityType->isRequired('user'),
                 'center' => $options['center'],
                 'role'   => $options['role']
-            ]);
+            ])
-        }
+            ->add('scope', ScopePickerType::class, [
-
+                'center' => $options['center'],
-        if ($activityType->isVisible('reasons')) {
+                'role'   => $options['role']
-            $builder->add('reasons', EntityType::class, [
+            ])
-                'label' => $activityType->getLabel('reasons'),
+            ->add('reasons', TranslatableActivityReason::class, array(
-                'required' => $activityType->isRequired('reasons'),
-                'class' => ActivityReason::class,
                 'multiple' => true,
-                'choice_label' => function (ActivityReason $activityReason) {
+                'required' => false,
-                    return $this->translatableStringHelper->localize($activityReason->getName());
+            ))
-                },
+            ->add('type', TranslatableActivityType::class, array(
-                'attr' => array('class' => 'select2 '),
+                'placeholder' => 'Choose a type',
-                'query_builder' => function (EntityRepository $er) {
+                'active_only' => true
-                    return $er->createQueryBuilder('a')
+            ))
-                        ->where('a.active = true');
+            ->add('comment', CommentType::class, [
-                },
+                'required' => false,
-            ]);
+            ])
-        }
+        ;
 
-        if ($activityType->isVisible('comment')) {
+        $builder->get('durationTime')
-            $builder->add('comment', CommentType::class, [
-                'label' => $activityType->getLabel('comment'),
-                'required' => $activityType->isRequired('comment'),
-            ]);
-        }
-
-        if ($activityType->isVisible('persons')) {
-            $builder->add('persons', HiddenType::class, [
-               //'data_class' => Person::class,
-            ]);
-            $builder->get('persons')
-               ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $personsAsIterable): string {
-                       $personIds = [];
-                       foreach ($personsAsIterable as $value) {
-                          $personIds[] = $value->getId();
-                       }
-                       return implode(',', $personIds);
-                   },
-                   function (?string $personsAsString): array {
-                       return array_map(
-                          fn(string $id): ?Person => $this->om->getRepository(Person::class)->findOneBy(['id' => (int) $id]),
-                          explode(',', $personsAsString)
-                       );
-                   }
-               ))
-           ;
-        }
-
-        if ($activityType->isVisible('thirdParties')) {
-            $builder->add('thirdParties', HiddenType::class, [
-               //'data_class' => ThirdParty::class,
-            ]);
-            $builder->get('thirdParties')
-               ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $thirdpartyAsIterable): string {
-                       $thirdpartyIds = [];
-                       foreach ($thirdpartyAsIterable as $value) {
-                          $thirdpartyIds[] = $value->getId();
-                       }
-                       return implode(',', $thirdpartyIds);
-                   },
-                   function (?string $thirdpartyAsString): array {
-                       return array_map(
-                           fn(string $id): ?ThirdParty => $this->om->getRepository(ThirdParty::class)->findOneBy(['id' => (int) $id]),
-                           explode(',', $thirdpartyAsString)
-                       );
-                   }
-               ))
-           ;
-        }
-
-        if ($activityType->isVisible('documents')) {
-            $builder->add('documents', ChillCollectionType::class, [
-                'entry_type' => StoredObjectType::class,
-                'label' => $activityType->getLabel('documents'),
-                'required' => $activityType->isRequired('documents'),
-                'allow_add' => true,
-                'button_add_label' => 'activity.Insert a document',
-                'button_remove_label' => 'activity.Remove a document'
-            ]);
-        }
-
-        if ($activityType->isVisible('users')) {
-            $builder->add('users', HiddenType::class, [
-               //'data_class' => User::class,
-            ]);
-            $builder->get('users')
-               ->addModelTransformer(new CallbackTransformer(
-                   function (iterable $usersAsIterable): string {
-                       $userIds = [];
-                       foreach ($usersAsIterable as $value) {
-                           $userIds[] = $value->getId();
-                       }
-                       return implode(',', $userIds);
-                   },
-                   function (?string $usersAsString): array {
-                       return array_map(
-                           fn(string $id): ?User => $this->om->getRepository(User::class)->findOneBy(['id' => (int) $id]),
-                           explode(',', $usersAsString)
-                       );
-                   }
-               ))
-           ;
-        }
-
-        if ($activityType->isVisible('emergency')) {
-            $builder->add('emergency', CheckboxType::class, [
-                'label' => $activityType->getLabel('emergency'),
-                'required' => $activityType->isRequired('emergency'),
-            ]);
-        }
-
-        if ($activityType->isVisible('sentReceived')) {
-            $builder->add('sentReceived', ChoiceType::class, [
-                'label' => $activityType->getLabel('sentReceived'),
-                'required' => $activityType->isRequired('sentReceived'),
-                'choices' => [
-                    'Sent' => Activity::SENTRECEIVED_SENT,
-                    'Received' => Activity::SENTRECEIVED_RECEIVED,
-                ],
-            ]);
-        }
-
-        foreach (['durationTime', 'travelTime'] as $fieldName) {
-            if (!$activityType->isVisible($fieldName)) {
-                continue;
-            }
-
-            $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 \DateTime */
-                    $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.
+        $builder->get('durationTime')
-                    // If not, recreate the field with the new timestamp
+                ->addEventListener(
-                    if (!in_array($data->getTimestamp(), $timeChoices)) {
+                        FormEvents::PRE_SET_DATA,
-                        // the data are not in the possible values. add them
+                        function(FormEvent $formEvent) use (
-                        $timeChoices[$data->format('H:i')] = $data->getTimestamp();
+                                $timeChoices,
-                        $form = $builder->create($fieldName, ChoiceType::class, array_merge(
+                                $builder,
-                            $durationTimeOptions, [
+                                $durationTimeTransformer,
-                                'choices' => $timeChoices,
+                                $durationTimeOptions
-                                'auto_initialize' => false
+                                )
-                            ]
+                        {
-                        ));
+                            // set the timezone to GMT, and fix the difference between current and GMT
-                        $form->addModelTransformer($durationTimeTransformer);
+                            // the datetimetransformer will then handle timezone as GMT
-                        $formEvent->getForm()->getParent()->add($form->getForm());
+                            $timezoneUTC = new \DateTimeZone('GMT');
-                    }
+                            /* @var $data \DateTime */
-                });
+                            $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(
+                                        'durationTime',
+                                        ChoiceType::class,
+                                        array_merge(
+                                                $durationTimeOptions,
+                                                array(
+                                                    'choices' => $timeChoices,
+                                                    'auto_initialize' => false
+                                                )
+                                                ));
+                                $form->addModelTransformer($durationTimeTransformer);
+                                $formEvent->getForm()->getParent()->add($form->getForm());
+                            }
+                        });
     }
 
-
+    /**
-
+     * @param OptionsResolverInterface $resolver
-    public function configureOptions(OptionsResolver $resolver): void
+     */
+    public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults([
+        $resolver->setDefaults(array(
-            'data_class' => Activity::class
+            'data_class' => 'Chill\ActivityBundle\Entity\Activity'
-        ]);
+        ));
 
         $resolver
-            ->setRequired(['center', 'role', 'activityType', 'accompanyingPeriod'])
+              ->setRequired(array('center', 'role'))
-            ->setAllowedTypes('center', ['null', 'Chill\MainBundle\Entity\Center'])
+              ->setAllowedTypes('center', 'Chill\MainBundle\Entity\Center')
-            ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
+              ->setAllowedTypes('role', 'Symfony\Component\Security\Core\Role\Role')
-            ->setAllowedTypes('activityType', \Chill\ActivityBundle\Entity\ActivityType::class)
+              ;
-            ->setAllowedTypes('accompanyingPeriod', [\Chill\PersonBundle\Entity\AccompanyingPeriod::class, 'null'])
-        ;
     }
 
-    public function getBlockPrefix(): string
+    /**
+     * @return string
+     */
+    public function getBlockPrefix()
     {
         return 'chill_activitybundle_activity';
     }

src/Bundle/ChillActivityBundle/Form/ActivityTypeCategoryType.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Form;
-
-use Chill\ActivityBundle\Entity\ActivityTypeCategory;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Chill\MainBundle\Form\Type\TranslatableStringFormType;
-
-class ActivityTypeCategoryType extends AbstractType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options): void
-    {
-        $builder
-            ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, array(
-                'choices' => array(
-                    'Yes' => true,
-                    'No'  => false
-                ),
-                'expanded' => true
-            ))
-            ->add('ordering', NumberType::class, [
-                'required' => true,
-                'scale' => 5
-            ])
-        ;
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
-    {
-        $resolver->setDefaults(array(
-            'data_class' => ActivityTypeCategory::class
-        ));
-    }
-}

src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php

@@ -2,13 +2,7 @@
 
 namespace Chill\ActivityBundle\Form;
 
-use Chill\ActivityBundle\Entity\ActivityTypeCategory;
-use Chill\ActivityBundle\Form\Type\ActivityFieldPresence;
-use Chill\MainBundle\Templating\TranslatableStringHelper;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\NumberType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -16,56 +10,38 @@ use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 
 class ActivityTypeType extends AbstractType
 {
-    private TranslatableStringHelper $translatableStringHelper;
+    /**
-
+     * @param FormBuilderInterface $builder
-    public function __construct(TranslatableStringHelper $translatableStringHelper)
+     * @param array $options
-    {
+     */
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('name', TranslatableStringFormType::class)
-            ->add('active', ChoiceType::class, [
+            ->add('active', ChoiceType::class, array(
-                'choices' => [
+                'choices' => array(
                     'Yes' => true,
                     'No'  => false
-                ],
+                ),
                 'expanded' => true
-            ])
+            ));
-            ->add('category', EntityType::class, [
-                'class' => ActivityTypeCategory::class,
-                'choice_label' => function (ActivityTypeCategory $activityTypeCategory) {
-                    return $this->translatableStringHelper->localize($activityTypeCategory->getName());
-                },
-            ])
-            ->add('ordering', NumberType::class, [
-                'required' => true,
-                'scale' => 5
-            ])
-        ;
-
-        $fields = [
-            'persons', 'user', 'date', 'place', 'persons',
-            'thirdParties', 'durationTime', 'travelTime', 'attendee',
-            'reasons', 'comment', 'sentReceived', 'documents',
-            'emergency', 'accompanyingPeriod', 'socialData', 'users'
-        ];
-        foreach ($fields as $field) {
-            $builder
-                ->add($field.'Visible', ActivityFieldPresence::class)
-                ->add($field.'Label', TextType::class, [
-                    'required' => false,
-                    'empty_data' => '',
-                ]);
-        }
     }
 
+    /**
+     * @param OptionsResolverInterface $resolver
+     */
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
-            'data_class' => \Chill\ActivityBundle\Entity\ActivityType::class
+            'data_class' => 'Chill\ActivityBundle\Entity\ActivityType'
         ));
     }
+
+    /**
+     * @return string
+     */
+    public function getBlockPrefix()
+    {
+        return 'chill_activitybundle_activitytype';
+    }
 }

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

@@ -1,29 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Form\Type;
-
-use Chill\ActivityBundle\Entity\ActivityType;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class ActivityFieldPresence extends AbstractType
-{
-    public function getParent()
-    {
-        return ChoiceType::class;
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults(
-            array(
-                'choices' => [
-                    'Invisible' => ActivityType::FIELD_INVISIBLE,
-                    'Optional' => ActivityType::FIELD_OPTIONAL,
-                    'Required' => ActivityType::FIELD_REQUIRED,
-                ],
-            )
-        );
-    }
-}

src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace Chill\ActivityBundle\Menu;
-
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
-use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
-{
-    protected TokenStorageInterface $tokenStorage;
-
-    protected AuthorizationHelper $authorizationHelper;
-
-    protected TranslatorInterface $translator;
-
-    public function __construct(
-        TokenStorageInterface $tokenStorage,
-        AuthorizationHelper $authorizationHelper,
-        TranslatorInterface $translator
-    ) {
-        $this->translator = $translator;
-        $this->authorizationHelper = $authorizationHelper;
-        $this->tokenStorage = $tokenStorage;
-    }
-    public static function getMenuIds(): array
-    {
-        return ['accompanyingCourse'];
-    }
-
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        $period = $parameters['accompanyingCourse'];
-
-        $menu->addChild($this->translator->trans('Activity list'), [
-            'route' => 'chill_activity_activity_list',
-            'routeParameters' => [
-                'accompanying_period_id' => $period->getId(),
-            ]])
-            ->setExtras(['order' => 40]);
-
-        $menu->addChild($this->translator->trans('Add a new activity'), [
-            'route' => 'chill_activity_activity_select_type',
-            'routeParameters' => [
-                'accompanying_period_id' => $period->getId(),
-            ]])
-            ->setExtras(['order' => 41]);
-
-
-
-    }
-}

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

@@ -0,0 +1,10 @@
+@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;
+}

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

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

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

@@ -1,114 +0,0 @@
-@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;
-   }
-}

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

@@ -1,170 +0,0 @@
-<template>
-   <teleport to="#add-persons">
-
-      <div class="flex-bloc concerned-groups" :class="getContext">
-         <persons-bloc 
-            v-for="bloc in contextPersonsBlocs"
-            v-bind:key="bloc.key"
-            v-bind:bloc="bloc"
-            v-bind:setPersonsInBloc="setPersonsInBloc">
-         </persons-bloc>
-      </div>
-
-      <add-persons 
-         buttonTitle="activity.add_persons"
-         modalTitle="activity.add_persons"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersons.options"
-         @addNewPersons="addNewPersons"
-         ref="addPersons">
-      </add-persons>
- 
-  </teleport>
-</template>
-
-<script>
-import { mapState } from 'vuex';
-import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
-import PersonsBloc from './components/PersonsBloc.vue';
-
-export default {
-   name: "App",
-   components: {
-      AddPersons,
-      PersonsBloc
-   },
-   data() {
-      return {
-         personsBlocs: [
-            {  key: 'persons', 
-               title: 'activity.bloc_persons', 
-               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: 'thirdparty', 
-               title: 'activity.bloc_thirdparty', 
-               persons: [], 
-               included: true
-            },
-            {  key: 'users', 
-               title: 'activity.bloc_users', 
-               persons: [], 
-               included: true
-            },
-         ],
-         addPersons: {
-            key: 'activity',
-            options: {
-               type: ['person', 'thirdparty'], // TODO add 'user'
-               priority: null,
-               uniq: false,
-            }
-         }
-      }
-   },
-   computed: {
-      ...mapState({
-         persons: state => state.activity.persons,
-         thirdParties: state => state.activity.thirdParties,
-         users: state => state.activity.users,
-         accompanyingCourse: state => state.activity.accompanyingPeriod
-      }),
-      getContext() {
-         return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
-      },
-      contextPersonsBlocs() {
-         return this.personsBlocs.filter(bloc => bloc.included !== false);
-      }
-   },
-   mounted() {
-      this.setPersonsInBloc();
-   },
-   methods: {
-      setPersonsInBloc() {
-         let groups; 
-         if (this.accompanyingCourse) {
-            groups = this.splitPersonsInGroups();
-         }     
-         this.personsBlocs.forEach(bloc => {
-            if (this.accompanyingCourse) {
-               switch (bloc.key) {
-                  case 'personsAssociated':
-                     bloc.persons = groups.personsAssociated;
-                     bloc.included = true;
-                     break;
-                  case 'personsNotAssociated':
-                     bloc.persons = groups.personsNotAssociated;
-                     bloc.included = true;
-                     break;
-               }
-            } else {
-               switch (bloc.key) {
-                  case 'persons': 
-                     bloc.persons = this.persons;
-                     bloc.included = true;
-                     break;
-               }
-            }
-            switch (bloc.key) {
-               case 'thirdparty':
-                  bloc.persons = this.thirdParties;
-                  break;
-               case 'users':
-                  bloc.persons = this.users;
-                  break;
-            }
-         }, groups);
-      },
-      splitPersonsInGroups() {
-         let personsAssociated = [];
-         let personsNotAssociated = this.persons;
-         let participations = this.getCourseParticipations();         
-         this.persons.forEach(person => {
-            participations.forEach(participation => {
-               if (person.id === participation.id) {
-                  console.log(person.id);
-                  personsAssociated.push(person);
-                  personsNotAssociated = personsNotAssociated.filter(p => p !== person);
-               }
-            });
-         });
-         return { 
-            'personsAssociated': personsAssociated, 
-            'personsNotAssociated': personsNotAssociated 
-         };
-      },
-      getCourseParticipations() {
-         let participations = [];
-         this.accompanyingCourse.participations.forEach(participation => {
-            if (!participation.endDate) {
-               participations.push(participation.person);
-            }
-         });
-         return participations;
-      },
-      addNewPersons({ selected, modal }) {
-         console.log('@@@ CLICK button addNewPersons', selected);
-         selected.forEach(function(item) {
-               this.$store.dispatch('addPersonsInvolved', item);
-            }, this
-         );
-         this.$refs.addPersons.resetSearch(); // to cast child method
-         modal.showModal = false;
-         this.setPersonsInBloc();
-      }
-   }
-}
-</script>
-
-<style lang="scss">
-</style>

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

@@ -1,29 +0,0 @@
-<template>
-   <li>
-      <span class="badge badge-primary" :title="person.text">
-         <span class="chill_denomination">
-            {{ textCutted }}
-         </span>
-         <a class="fa fa-fw fa-times"
-            @click.prevent="$emit('remove', person)">
-         </a>
-      </span>
-   </li>
-</template>
-
-<script>
-export default {
-   name: "PersonBadge",
-   props: ['person'],
-   computed: {
-      textCutted() {
-         let more = (this.person.text.length > 15) ?'…' : '';
-         return this.person.text.slice(0,15) + more;
-      }
-   },
-   emits: ['remove'],
-}
-</script>
-
-<style lang="css" scoped>
-</style>

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

@@ -1,41 +0,0 @@
-<template>
-   <div class="item-bloc">
-      <div class="item-row">
-         <div class="item-col">
-            <h4>{{ $t(bloc.title) }}</h4>
-         </div>
-         <div class="item-col">
-            <ul class="list-content">
-               <person-badge
-                  v-for="person in bloc.persons"
-                  v-bind:key="person.id"
-                  v-bind:person="person"
-                  @remove="removePerson">
-               </person-badge>
-            </ul>
-         </div>
-      </div>
-   </div>
-</template>
-
-<script>
-import PersonBadge from './PersonBadge.vue';
-export default {
-   name:"PersonsBloc",
-   components: {
-      PersonBadge
-   },
-   props: ['bloc', 'setPersonsInBloc'],
-   methods: {
-      removePerson(item) {
-         console.log('@@ CLICK remove person: item', item);
-         this.$store.dispatch('removePersonInvolved', item);
-         this.setPersonsInBloc();
-      }
-   }
-}
-</script>
-
-<style lang="scss">
-
-</style>

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

@@ -1,20 +0,0 @@
-import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
-
-const appMessages = {
-   fr: {
-      activity: {
-         add_persons: "Ajouter des personnes concernées",
-         bloc_persons: "Usagers",
-         bloc_persons_associated: "Usagers du parcours",
-         bloc_persons_not_associated: "Tiers non-pro.",
-         bloc_thirdparty: "Tiers professionnels",
-         bloc_users: "T(M)S",
-      }
-   }
-}
-
-Object.assign(appMessages.fr, personMessages.fr);
-
-export {
-   appMessages
-};

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

@@ -1,16 +0,0 @@
-import { createApp } from 'vue';
-import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n'
-import { appMessages } from './i18n'
-import store from './store'
-
-import App from './App.vue';
-
-const i18n = _createI18n(appMessages);
-
-const app = createApp({
-   template: `<app></app>`,
-})
-.use(store)
-.use(i18n)
-.component('app', App)
-.mount('#activity');

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

@@ -1,98 +0,0 @@
-import 'es6-promise/auto';
-import { createStore } from 'vuex';
-
-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;
-};
-
-const removeIdFromValue = (string, id) => {
-   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
-   },
-   getters: {
-   },
-   mutations: {
-      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: {
-      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);
-      }
-  }
-});
-
-export default store;

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

@@ -1,97 +0,0 @@
-{% macro href(pathname, key, value) %}
-    {% set parms = { (key): value } %}
-    {{ path(pathname, parms) }}
-{% endmacro %}
-
-{% if context == 'person' %}
-    {% set blocs = [
-        {   'title': 'Others persons'|trans, 
-            'items': entity.persons,
-            'path' : 'chill_person_view',
-            'key'  : 'person_id'
-        },
-        {   'title': 'Third parties'|trans, 
-            'items': entity.thirdParties,
-            'path' : 'chill_3party_3party_show',
-            'key'  : 'thirdparty_id'
-        },
-        {   'title': 'Users concerned'|trans, 
-            'items': entity.users,
-            'path' : 'admin_user_show',
-            'key'  : 'id'
-        },
-    ] %}
-{% else %}
-    {% set blocs = [
-        {   'title': 'Persons in accompanying course'|trans, 
-            'items': entity.personsAssociated,
-            'path' : 'chill_person_view',
-            'key'  : 'person_id'
-        },
-        {   'title': 'Third persons'|trans, 
-            'items': entity.personsNotAssociated,
-            'path' : 'chill_person_view',
-            'key'  : 'person_id'
-        },
-        {   'title': 'Third parties'|trans, 
-            'items': entity.thirdParties,
-            'path' : 'chill_3party_3party_show',
-            'key'  : 'thirdparty_id'
-        },
-        {   'title': 'Users concerned'|trans, 
-            'items': entity.users,
-            'path' : 'admin_user_show',
-            'key'  : 'id'
-        },
-    ] %}
-{% endif %}
-
-{% if (with_display == 'bloc') %}
-<div class="{{ context }} flex-bloc concerned-groups">
-    {% for bloc in blocs %}
-    <div class="item-bloc">
-        <div class="item-row">
-            <div class="item-col">
-                <h4>{{ bloc.title }}</h4>
-            </div>
-            <div class="item-col">
-                <ul class="list-content">
-                    {% for item in bloc.items %}
-                    <li>
-                        <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                            <span class="badge badge-primary">
-                                {{ item|chill_entity_render_box({'only_denomination': true}) }}
-                            </span>
-                        </a>
-                    </li>
-                    {% endfor %}
-                </ul>
-            </div>
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endif %}
-    
-{% if (with_display == 'row') %}
-<div class="concerned-groups">
-    {% for bloc in blocs %}
-    <div class="group">
-        {% if bloc.items|length > 0 %}
-            <h4>{{ bloc.title }}</h4>
-            <ul class="list-content">
-                {% for item in bloc.items %}
-                <li>
-                    <a href="{{ _self.href(bloc.path, bloc.key, item.id) }}">
-                        <span class="badge badge-primary">
-                            {{ item|chill_entity_render_box({'only_denomination': true}) }}
-                        </span>
-                    </a>
-                </li>
-                {% endfor %}
-            </ul>
-        {% endif %}
-    </div>
-    {% endfor %}
-</div>
-{% endif %}

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

@@ -6,6 +6,7 @@
 {% block title  'Remove activity'|trans %}
 
 {% block personcontent %}
+
 {{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
         'title'             : 'Remove activity'|trans,
@@ -14,4 +15,5 @@
         'cancel_parameters' : { 'person_id' : activity.person.id, 'id' : activity.id },
         'form'              : delete_form
     } ) }}
+    
 {% endblock %}

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

@@ -1,16 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
-
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-
-{% block title  'Remove activity'|trans %}
-
-{% block content %}
-    {{ include('@ChillMain/Util/confirmation_template.html.twig',
-        {
-            'title'             : 'Remove activity'|trans,
-            'confirm_question'  : 'Are you sure you want to remove the activity about "%name%" ?'|trans({ '%name%' : accompanyingCourse.id } ),
-            'cancel_route'      : 'chill_activity_activity_list',
-            'cancel_parameters' : { 'accompanying_course_id' : accompanyingCourse.id, 'id' : activity.id },
-            'form'              : delete_form
-        } ) }}
-{% endblock %}

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

@@ -1,101 +1,59 @@
-<h1>{{ "Update activity"|trans }}</h1>
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
-{{ form_start(edit_form) }}
+{% set activeRouteKey = 'chill_activity_activity_list' %}
-{{ form_errors(edit_form) }}
 
-{%- if edit_form.emergency is defined -%}
+{% block title  'Update activity'|trans %}
-    {{ form_row(edit_form.emergency) }}
-{% endif %}
 
-{%- if edit_form.sentReceived is defined -%}
+{% block personcontent %}
-    {{ form_row(edit_form.sentReceived) }}
+    <h1>{{ "Update activity"|trans }}</h1>
-{% endif %}
+
+    {{ form_start(edit_form) }}
 
-{%- if edit_form.user is defined -%}
     {{ form_row(edit_form.user) }}
-{% endif %}
-
-{%- if edit_form.scope is defined -%}
     {{ form_row(edit_form.scope) }}
-{% endif %}
 
-{%- if edit_form.socialActions is defined -%}
+    <h2>{{ 'Activity data'|trans }}</h2>
-    {{ form_row(edit_form.socialActions) }}
-{% endif %}
-
-{%- if edit_form.socialIssues is defined -%}
-    {{ form_row(edit_form.socialIssues) }}
-{% endif %}
-
-{%- if edit_form.reasons is defined -%}
-    {{ form_row(edit_form.reasons) }}
-{% endif %}
-
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-
-{%- if edit_form.persons is defined -%}
-    {{ form_widget(edit_form.persons) }}
-{% endif %}
-{%- if edit_form.thirdParties is defined -%}
-    {{ form_widget(edit_form.thirdParties) }}
-{% endif %}
-{%- if edit_form.users is defined -%}
-    {{ form_widget(edit_form.users) }}
-{% endif %}
-
-<div id="add-persons"></div>
-
-<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
-
-{%- if edit_form.date is defined -%}
     {{ form_row(edit_form.date) }}
-{% endif %}
-
-.. location
-
-{%- if edit_form.durationTime is defined -%}
     {{ form_row(edit_form.durationTime) }}
-{% endif %}
+    {{ form_row(edit_form.type) }}
-
-{%- if edit_form.travelTime is defined -%}
-    {{ form_row(edit_form.travelTime) }}
-{% endif %}
-
-{%- if edit_form.comment is defined -%}
-    .. public and private
-    {{ form_row(edit_form.comment) }}
-{% endif %}
-
-{%- if edit_form.documents is defined -%}
-    {{ form_row(edit_form.documents) }}
-{% endif %}
-
-{%- if edit_form.attendee is defined -%}
     {{ form_row(edit_form.attendee) }}
-{% endif %}
+    {{ form_row(edit_form.reasons) }}
+    {{ form_row(edit_form.comment) }}
 
-.. status
+    {{ form_widget(edit_form) }}
+        <ul class="record_actions sticky-form-buttons">
+            <li class="cancel">
+                <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': entity.person.id } ) }}" class="sc-button bt-cancel">
+                    {{ 'Cancel'|trans }}
+                </a>
+            </li>
+            <li>
+                <button class="sc-button bt-update" type="submit">{{ 'Save activity'|trans }}</button>
+            </li>
+        </ul>
+    {{ form_end(edit_form) }}
 
-{% set person_id = null %}
+    {# {{ form(delete_form) }} #}
-{% if entity.person %}
+{% endblock %}
-    {% set person_id = entity.person.id %}
-{% endif %}
 
-{% set accompanying_course_id = null %}
+{% block js %}
-{% if accompanyingCourse %}
+<script type="text/javascript">
-    {% set accompanying_course_id = accompanyingCourse.id %}
+    chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', '{{ "You are going to leave a page with unsubmitted data. Are you sure you want to leave ?"|trans }}');
-{% endif %}
+</script>
-
+{% endblock %}
-    <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="sc-button bt-cancel">
-                {{ 'Cancel'|trans }}
-            </a>
-        </li>
-        <li>
-            <button class="sc-button bt-update" type="submit">{{ 'Save activity'|trans }}</button>
-        </li>
-    </ul>
-{{ form_end(edit_form) }}
-
-{# {{ form(delete_form) }} #}

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

@@ -1,25 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
-
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-
-{% block title  'Update activity'|trans %}
-
-{% block content %}
-    <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
-{% endblock %}
-
-{% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
-    <script type="text/javascript">
-        chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_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 }}; 
-    </script>
-    {{ encore_entry_script_tags('vue_activity') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
-    {{ encore_entry_link_tags('vue_activity') }}
-{% endblock %}

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

@@ -1,41 +0,0 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillPerson/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-
-{% block title  'Update activity'|trans %}
-
-{% block personcontent %}
-    {% include 'ChillActivityBundle:Activity:edit.html.twig' %}
-    <div id="activity"></div> {# <=== vue component #}
-{% endblock %}
-
-{% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
-    <script type="text/javascript">
-        chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_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 }};
-    </script>
-    {{ encore_entry_script_tags('vue_activity') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
-    {{ encore_entry_link_tags('vue_activity') }}
-{% endblock %}

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

@@ -1,179 +1,87 @@
-{% set person_id = null %}
+{#
-{% if person %}
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
-    {% set person_id = person.id %}
+ *
-{% endif %}
+ * 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/>.
+#}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
-{% set accompanying_course_id = null %}
+{% set activeRouteKey = 'chill_activity_activity_list' %}
-{% if accompanyingCourse %}
-    {% set accompanying_course_id = accompanyingCourse.id %}
-{% endif %}
 
-<h2>{{ 'Activity list' |trans }}</h2>
+{% block title %}{{ 'Activity list' |trans }}{% endblock title %}
 
-{% if activities|length == 0 %}
+{% block personcontent %}
-    <p class="chill-no-data-statement">
+    <h2>{{ 'Activity list' |trans }}</h2>
-        {{ "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="flex-table list-records {{ context }}">
+    {% if activities|length == 0 %}
-    <!--
+        <p class="chill-no-data-statement">
-    <thead>
+            {{ "There isn't any activities."|trans }}
-        <tr>
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}" class="sc-button bt-create button-small"></a>
-            <th class="chill-red">{{'Date' | trans }}</th>
+        </p>
-            <th class="chill-green">{{'Duration Time' | trans }}</th>
+    {% else %}
-            <th class="chill-orange">{{'Reasons' | trans}}</th>
+    <table class="records_list">
-            <th>{{'Type' | trans}}</th>
+        <thead>
-            <th>&nbsp;</th>
+            <tr>
-        </tr>
+                <th class="chill-red">{{'Date' | trans }}</th>
-    </thead>
+                <th class="chill-green">{{'Duration Time' | trans }}</th>
--->
+                <th class="chill-orange">{{'Reasons' | trans}}</th>
-    {% for activity in activities %}
+                <th>{{'Type' | trans}}</th>
-        {% set t = activity.type %}
+                <th>&nbsp;</th>
-        <div class="item-bloc">
+            </tr>
-            <div class="item-row main">
+        </thead>
-                <div class="item-col">
+        <tbody>
-                                        
+        {% for activity in activities %}
-                    {% if activity.date %}
+            <tr>
-                        <h3>{{ activity.date|format_date('long') }}</h3>
+                <td>{% if activity.date %}{{ activity.date|format_date('long') }}{% endif %}</td>
+                <td>{{ activity.durationTime|date('H:i') }}</td>
+                <td>
+                    {% if activity.comment.comment is not empty %}
+                            {{ activity.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
                     {% endif %}
-                   
+                    {%- if activity.reasons is empty -%}
-                    <div class="duration">
+                        {{ 'No reason associated'|trans }}
-                      {% if t.durationTimeVisible > 0 %}
+                    {%- else -%}
-                        <p>
+                        {% for r in activity.reasons %}{{ r|chill_entity_render_box }} {% endfor %}
-                            <i class="fa fa-fw fa-hourglass-end"></i>
+                    {%- endif -%}
-                            {{ activity.durationTime|date('H:i') }}
+                </td>
-                        </p>
+                <td>{{ activity.type.name | localize_translatable_string }}</td>
-                      {% endif %}
+                <td>
-                        
-                        {% if activity.travelTime and t.travelTimeVisible %}
-                        <p>
-                            <i class="fa fa-fw fa-car"></i>
-                            {{ activity.travelTime|date('H:i') }}
-                        </p>
-                        {% endif %}
-                    </div>
-                    
-                </div>
-                <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>
+                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person.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>
+                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person.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>
+                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person.id } ) }}" class="sc-button bt-delete "></a>
                         </li>
-                        {#
                         {% endif %}
-                        #}
+                </td>
-                    </ul>
+            </tr>
-                </div>
+        {% endfor %}
-            </div>
+        </tbody>
-            
+    </table>
-            {%  
+    {% endif %}
-                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">
+    <ul class="record_actions">
-    <li>
+        <li>
-        <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="sc-button bt-create">
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}" class="sc-button bt-create">
-            {{ 'Add a new activity' | trans }}
+                {{ 'Add a new activity' | trans }}
-        </a>
+            </a>
-    </li>
+        </li>
-</ul>
+    </ul>
+{% endblock %}

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

@@ -1,9 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-
-{% block title %}{{ 'Activity list' |trans }}{% endblock title %}
-
-{% block content %}
-    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse'} %}
-{% endblock %}

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

@@ -1,25 +0,0 @@
-{#
- * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "@ChillPerson/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-
-{% block title %}{{ 'Activity list' |trans }}{% endblock title %}
-
-{% block personcontent %}
-    {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
-{% endblock %}

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

@@ -1,100 +1,50 @@
-<h1>{{ "Activity creation"|trans }}</h1>
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillPerson/layout.html.twig"  %}
 
-{{ form_start(form) }}
+{% set activeRouteKey = 'chill_activity_activity_new' %}
-{{ form_errors(form) }}
 
+{% block title 'Activity creation' |trans %}
 
-{%- if form.emergency is defined -%}
+{% block personcontent %}
-    {{ form_row(form.emergency) }}
+    <h2 class="chill-red">{{ "Activity creation"|trans }}</h1>
-{% endif %}
 
-{%- if form.sentReceived is defined -%}
+    {{ form_start(form) }}
-    {{ form_row(form.sentReceived) }}
-{% endif %}
 
-{%- if form.user is defined -%}
     {{ form_row(form.user) }}
-{% endif %}
-
-{%- if form.scope is defined -%}
     {{ form_row(form.scope) }}
-{% endif %}
 
-{%- if form.socialActions is defined -%}
+    <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
-    {{ form_row(form.socialActions) }}
-{% endif %}
 
-{%- if form.socialIssues is defined -%}
-    {{ form_row(form.socialIssues) }}
-{% endif %}
-
-
-{%- if form.reasons is defined -%}
-    {{ form_row(form.reasons) }}
-{% endif %}
-
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
-
-{%- if form.persons is defined -%}
-    {{ form_widget(form.persons) }}
-{% endif %}
-{%- if form.thirdParties is defined -%}
-    {{ form_widget(form.thirdParties) }}
-{% endif %}
-{%- if form.users is defined -%}
-    {{ form_widget(form.users) }}
-{% endif %}
-
-<div id="add-persons"></div>
-
-<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
-
-{%- if form.date is defined -%}
     {{ form_row(form.date) }}
-{% endif %}
-
-.. location
-
-{%- if form.durationTime is defined -%}
     {{ form_row(form.durationTime) }}
-{% endif %}
+    {{ form_row(form.type) }}
-
-{%- if form.travelTime is defined -%}
-    {{ form_row(form.travelTime) }}
-{% endif %}
-
-{%- if form.comment is defined -%}
-    .. public and private
-    {{ form_row(form.comment) }}
-{% endif %}
-
-{%- if form.documents is defined -%}
-    {{ form_row(form.documents) }}
-{% endif %}
-
-{%- if form.attendee is defined -%}
     {{ form_row(form.attendee) }}
-{% endif %}
+    {{ form_row(form.reasons) }}
+    {{ form_row(form.comment) }}
 
-.. status
+        <div class="grid-12 centered sticky-form-buttons">
+            <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new activity'|trans }}</button>
+        </div>
+    {{ form_end(form) }}
+{% endblock %}
 
-<ul class="record_actions sticky-form-buttons">
+{% block js %}
-  <li class="cancel">
+<script type="text/javascript">
-    <a 
+    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 }}');
-      class="sc-button bt-cancel"
+</script>
-      {%- if context == 'person' -%} 
+{% endblock %}
-      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 } )}}"
-      {%- endif -%}
-      >
-      {{ 'Cancel'|trans|chill_return_path_label }}
-    </a>
-  </li>
-  <li>
-    <button class="sc-button bt-create" type="submit">
-      {{ 'Add a new activity'|trans }}
-    </button>
-  </li>
-</ul>
-{{ form_end(form) }}

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

@@ -1,25 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_new' %}
-
-{% block title 'Activity creation' |trans %}
-
-{% block content %}
-    <div id="activity"></div> {# <=== vue component #}
-    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
-{% endblock %}
-
-{% block js %}
-    {{ encore_entry_script_tags('async_upload') }}
-    <script type="text/javascript">
-        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 }}; 
-    </script>
-    {{ encore_entry_script_tags('vue_activity') }}
-{% endblock %}
-
-{% block css %}
-    <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,25 +0,0 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_new' %}
-
-{% block title 'Activity creation' |trans %}
-
-{% block personcontent %}
-    {% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
-    <div id="activity"></div> {# <=== vue component #}
-{% endblock %}
-
-{% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
-    <script type="text/javascript">
-        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 }};
-    </script>
-    {{ encore_entry_script_tags('vue_activity') }}
-{% endblock %}
-
-{% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
-    {{ encore_entry_link_tags('vue_activity') }}
-{% endblock %}

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

@@ -1,28 +0,0 @@
-<h2 class="chill-red">{{ "Activity creation"|trans }}</h2>
-
-{# TODO: refaire l'html css des tuilles #}
-
-{% for row in data %}
-    <h3>{{ row.activityTypeCategory.name|localize_translatable_string }}</h3>
-    <div style="display:flex;justify-content:center;gap:12px;flex-wrap:wrap;">
-        {% for activityType in row.activityTypes %}
-
-            {% 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 %}
-
-            <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'activityType_id': activityType.id, 'accompanying_period_id': accompanying_course_id }) }}">
-
-                <div style="width:200px;height:200px;border:1px dotted red;display:flex;justify-content:center;align-items:center;align-content:center;">
-                    {{ activityType.name|localize_translatable_string }}
-                </div>
-            </a>
-        {% endfor %}
-    </div>
-{% endfor %}

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

@@ -1,9 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_new' %}
-
-{% block title 'Activity creation'|trans %}
-
-{% block content %}
-    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
-{% endblock %}

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

@@ -1,9 +0,0 @@
-{% extends "@ChillPerson/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_new' %}
-
-{% block title 'Activity creation'|trans %}
-
-{% block personcontent %}
-    {% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
-{% endblock %}

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

@@ -1,134 +1,68 @@
-{%- set t = entity.type -%}
+{% extends "@ChillPerson/layout.html.twig"  %}
-{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
 
-<h1>
+{% set activeRouteKey = 'chill_activity_activity_list' %}
-  {{ "Activity"|trans }}
-  {%- if t.emergencyVisible and entity.emergency -%}
-  <span class="badge badge-secondary">
-    {{- 'Emergency'|trans -}}
-  </span>
-{%- endif -%}
-</h1>
 
-<dl class="chill_view_data">
+{% block title 'Activity'|trans %}
 
-    <dt class="inline">{{ 'by'|trans|capitalize }}</dt>
+{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
-    <dd>{{ entity.user }}</dd>
 
-    <dt class="inline">{{ 'Type'|trans }}</dt>
+{% block personcontent -%}
-    <dd>{{ entity.type.name | localize_translatable_string }}</dd>
+    <h1 >{{ "Activity"|trans }}</h1>
 
-    {%- if entity.scope -%}
+    <dl class="chill_view_data">
+        <dt class="inline">{{ 'User'|trans }}</dt>
+        <dd>{{ entity.user }}</dd>
         <dt class="inline">{{ 'Scope'|trans }}</dt>
         <dd><span class="scope">{{ entity.scope.name|localize_translatable_string }}</span></dd>
-    {% endif %}
 
-    {% if t.socialIssuesVisible %}
+        <h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
-      <dt class="inline">{{ 'Social issues'|trans }}</dt>
+        <dt class="inline">{{ 'Person'|trans }}</dt>
-      <dd>
+        <dd>{{ entity.person }}</dd>
-        {% if entity.socialIssues|length == 0 %}
-          <p class="chill-no-data-statement">{{ 'Any social issues'|trans }}</p>
-        {% else %}
-          {% for si in entity.socialIssues %}{{ si|chill_entity_render_box }}{% endfor %}
-        {% endif %}
-      </dd>
-    {% endif %}
 
-    {% if t.socialActionsVisible %}
+        <dt class="inline">{{ 'Date'|trans }}</dt>
-      <dt class="inline">{{ 'Social actions'|trans }}</dt>
+        <dd>{{ entity.date|format_date('long') }}</dd>
-      <dd>
+        <dt class="inline">{{ 'Duration Time'|trans }}</dt>
-        {% if entity.socialActions|length == 0 %}
+        <dd>{{ entity.durationTime|date('H:i') }}</dd>
-          <p class="chill-no-data-statement">{{ 'Any social actions'|trans }}</p>
+        <dt class="inline">{{ 'Type'|trans }}</dt>
-        {% else %}
+        <dd>{{ entity.type.name | localize_translatable_string }}</dd>
-          {% for sa in entity.socialActions %}{{ sa|chill_entity_render_box }}{% endfor %}
-        {% endif %}
-      </dd>
-    {% endif %}
 
-    {% if t.reasonsVisible %}
+        <dt class="inline">{{ 'Attendee'|trans }}</dt>
-    <dt class="inline">{{ 'Reasons'|trans }}</dt>
+        <dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>
-    {%- if entity.reasons is empty -%}
-    <dd><span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span></dd>
-    {%- else -%}
-    <dd>{% for r in entity.reasons %}{{ r|chill_entity_render_box }} {% endfor %}</dd>
-    {%- endif -%}
-    {% endif %}
 
-<h2 class="chill-red">{{ 'Concerned groups'|trans }}</h2>
+        <dt class="inline">{{ 'Reasons'|trans }}</dt>
-{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': context, 'with_display': 'bloc' } %}
+        {%- if entity.reasons is empty -%}
+        <dd><span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span></dd>
+        {%- else -%}
+        <dd>{% for r in entity.reasons %}{{ r|chill_entity_render_box }} {% endfor %}</dd>
+        {%- endif -%}
 
-<h2 class="chill-red">{{ 'Activity data'|trans }}</h2>
+        <dt class="inline">{{ 'Comment'|trans }}</dt>
+        {%- if entity.comment is empty -%}
+            <dd><span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span></dd>
+        {%- else -%}
+            <dd>{{ entity.comment|chill_entity_render_box }}</dd>
+        {%- endif -%}
 
-    <dt class="inline">{{ 'Date'|trans }}</dt>
+    </dl>
-    <dd>{{ entity.date|format_date('long') }}</dd>
 
-    {% if t.durationTimeVisible %}
+    <ul class="record_actions">
-    <dt class="inline">{{ 'Duration Time'|trans }}</dt>
+        <li class="cancel">
-    <dd>{{ entity.durationTime|date('H:i') }}</dd>
+            <a class="sc-button bt-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person.id } ) }}">
-    {% endif %}
+                {{ 'Back to the list'|trans }}
-
+            </a>
-    {% if t.travelTimeVisible %}
+        </li>
-    <dt class="inline">{{ 'Travel Time'|trans }}</dt>
+        <li>
-    <dd>{{ entity.travelTime|date('H:i') }}</dd>
+        <a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person.id }) }}">
-    {% endif %}
+            {{ 'Edit the activity'|trans }}
-
-    {% if t.commentVisible %}
-    <dt class="inline">{{ 'Comment'|trans }}</dt>
-      {%- if entity.comment.empty -%}
-          <dd><span class="chill-no-data-statement">{{ 'No comment associated'|trans }}</span></dd>
-      {%- else -%}
-          <dd>{{ entity.comment|chill_entity_render_box }}</dd>
-      {%- endif -%}
-    {% endif %}
-
-    {% if t.documentsVisible and entity.documents|length > 0 %}
-      <dt>{{ 'Documents'|trans }}</dt>
-      <dd>
-        <ul>
-        {% for d in entity.documents %}
-          <li>{{ m.download_button(d) }}</li>
-        {% endfor %}
-        </ul>
-      </dd>
-    {% endif %}
-
-    {% if t.attendeeVisible %}
-    <dt class="inline">{{ 'Attendee'|trans }}</dt>
-    <dd>{% if entity.attendee is not null %}{% if entity.attendee %}{{ 'present'|trans|capitalize }} {% else %} {{ 'not present'|trans|capitalize }}{% endif %}{% else %}{{ 'None'|trans|capitalize }}{% endif %}</dd>
-    {% endif %}
-
-</dl>
-
-{% 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 %}
-
-<ul class="record_actions">
-    <li class="cancel">
-        <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>
-    <li>
+        {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
-    <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 }) }}">
+        <li>
-        {{ 'Edit the activity'|trans }}
+            <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person.id } ) }}" class="sc-button bt-delete">
-    </a>
+                {{ 'Delete'|trans }}
-    </li>
+            </a>
-    {# TODO
+        </li>
-    {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
+        {% endif %}
-    #}
+    </ul>
-    <li>
+
-        <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">
+{% endblock personcontent %}
-            {{ 'Delete'|trans }}
-        </a>
-    </li>
-    {#
-    {% endif %}
-    #}
-</ul>

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

@@ -1,11 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig"  %}
-
-{% set activeRouteKey = 'chill_activity_activity_list' %}
-
-{% block title 'Activity'|trans %}
-
-{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
-
-{% block content -%}
-    {% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
-{% endblock content %}

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

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

src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/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/ChillActivityBundle/Resources/views/ActivityPresence/index.html.twig

@@ -1,44 +0,0 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
-
-{% block admin_content %}
-    <h1>{{ 'ActivityPresence list'|trans }}</h1>
-
-    <table class="records_list">
-        <thead>
-        <tr>
-            <th>{{ 'Name'|trans }}</th>
-            <th>{{ 'Active'|trans }}</th>
-            <th>{{ 'Actions'|trans }}</th>
-        </tr>
-        </thead>
-        <tbody>
-        {% for entity in entities %}
-            <tr>
-                <td>{{ entity.name|localize_translatable_string }}</td>
-                <td style="text-align:center;">
-                    {%- if entity.active -%}
-                        <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_activity_presence_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-
-    <ul class="record_actions">
-        <li>
-            <a href="{{ path('chill_crud_activity_presence_new') }}" class="sc-button bt-create">
-                {{ 'Create a new activity presence'|trans }}
-            </a>
-        </li>
-    </ul>
-{% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/ActivityPresence/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/ChillActivityBundle/Resources/views/ActivityType/edit.html.twig

@@ -1,12 +1,40 @@
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
 {% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
-{% block title %}
+{% block admin_content %}
-    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    <h1>{{ 'ActivityType edit'|trans }}</h1>
-{% endblock %}
 
-{% block layout_wvm_content %}
+    {{ form_start(edit_form) }}
-    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+    {{ form_row(edit_form.active) }}
-        {% block content_form_actions_view %}{% endblock %}
+    {{ form_row(edit_form.name) }}
-        {% block content_form_actions_save_and_show %}{% endblock %}
+    
-    {% endembed %}
+    
+
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activitytype') }}" class="sc-button bt-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'sc-button bt-update' } } ) }}
+        </li>
+    </ul>
+    
+    {{ form_end(edit_form) }}
 {% endblock %}

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

@@ -30,7 +30,7 @@
         <tbody>
         {% for entity in entities %}
             <tr>
-                <td>{{ entity.name|localize_translatable_string }}</td>
+                <td><a href="{{ path('chill_activity_activitytype_show', { 'id': entity.id }) }}">{{ entity.name|localize_translatable_string }}</a></td>
                 <td style="text-align:center;">
                 {%- if entity.active -%}
                     <i class="fa fa-check-square-o"></i>
@@ -41,7 +41,10 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_crud_activity_type_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
+                        <a href="{{ path('chill_activity_activitytype_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
+                    </li>
+                    <li>
+                        <a href="{{ path('chill_activity_activitytype_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -52,7 +55,7 @@
 
         <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_crud_activity_type_new') }}" class="sc-button bt-create">
+            <a href="{{ path('chill_activity_activitytype_new') }}" class="sc-button bt-create">
                 {{ 'Create a new activity type'|trans }}
             </a>
         </li>

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

@@ -1,11 +1,38 @@
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
 {% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
 
-{% block title %}
+{% block admin_content %}
-    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+    <h1>{{ 'ActivityType creation'|trans }}</h1>
-{% endblock %}
 
-{% block layout_wvm_content %}
+    {{ form_start(form) }}
-    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {{ form_row(form.active) }}
-        {% block content_form_actions_save_and_show %}{% endblock %}
+    {{ form_row(form.name) }}
-    {% endembed %}
+    
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activitytype') }}" class="sc-button bt-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-new' } } ) }}
+        </li>
+    </ul>
+    {{ form_end(form) }}
+    
 {% endblock %}

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

@@ -0,0 +1,42 @@
+{#
+ * Copyright (C) 2014, Champs Libres Cooperative SCRLFS, <http://www.champs-libres.coop>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ *  License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
+
+{% block admin_content %}
+    <h1>{{ 'ActivityType'|trans }}</h1>
+
+    <table class="record_properties">
+        <tbody>
+            <tr>
+                <th>{{ 'Name'|trans }}</th>
+                <td>{{ entity.name|localize_translatable_string }}</td>
+            </tr>
+        </tbody>
+    </table>
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activitytype') }}" class="sc-button bt-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+        <li>
+            <a href="{{ path('chill_activity_activitytype_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
+                {{ 'Edit'|trans }}
+            </a>
+        </li>
+    </ul>
+{% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/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/ChillActivityBundle/Resources/views/ActivityTypeCategory/index.html.twig

@@ -1,44 +0,0 @@
-{% extends "@ChillActivity/Admin/layout_activity.html.twig" %}
-
-{% block admin_content %}
-    <h1>{{ 'ActivityTypeCategory list'|trans }}</h1>
-
-    <table class="records_list">
-        <thead>
-        <tr>
-            <th>{{ 'Name'|trans }}</th>
-            <th>{{ 'Active'|trans }}</th>
-            <th>{{ 'Actions'|trans }}</th>
-        </tr>
-        </thead>
-        <tbody>
-        {% for entity in entities %}
-            <tr>
-                <td>{{ entity.name|localize_translatable_string }}</td>
-                <td style="text-align:center;">
-                    {%- if entity.active -%}
-                        <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_activity_type_category_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-
-    <ul class="record_actions">
-        <li>
-            <a href="{{ path('chill_crud_activity_type_category_new') }}" class="sc-button bt-create">
-                {{ 'Create a new activity type category'|trans }}
-            </a>
-        </li>
-    </ul>
-{% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/ActivityTypeCategory/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/ChillActivityBundle/chill.webpack.config.js

@@ -1,10 +1,4 @@
 // this file loads all assets from the Chill person bundle
 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/routes.yaml

@@ -10,6 +10,10 @@ chill_activity_activityreasoncategory:
     resource: "@ChillActivityBundle/config/routes/activityreasoncategory.yaml"
     prefix:   /
 
+chill_activity_activitytype:
+    resource: "@ChillActivityBundle/config/routes/activitytype.yaml"
+    prefix:   /
+
 chill_admin_activity_index:
     path:     /{_locale}/admin/activity
     controller: Chill\ActivityBundle\Controller\AdminController::indexActivityAction
@@ -28,30 +32,3 @@ chill_admin_activity_redirect_to_admin_index:
             admin_activity:
                 order: 0
                 label: Main admin menu
-
-chill_activity_type_admin:
-    path:     /{_locale}/admin/activity/type
-    controller: cscrud_activity_type_controller:index
-    options:
-        menus:
-            admin_activity:
-                order: 2020
-                label: 'Activity Types'
-
-chill_activity_type_category_admin:
-    path:     /{_locale}/admin/activity/type_category
-    controller: cscrud_activity_type_category_controller:index
-    options:
-        menus:
-            admin_activity:
-                order: 2999
-                label: 'Activity Types Categories'
-
-chill_activity_presence_admin:
-    path:     /{_locale}/admin/activity/presence
-    controller: cscrud_activity_presence_controller:index
-    options:
-        menus:
-            admin_activity:
-                order: 2021
-                label: 'Activity Presences'

src/Bundle/ChillActivityBundle/config/routes/activity.yaml

@@ -1,26 +1,30 @@
 chill_activity_activity_list:
-    path:     /{_locale}/activity/
+    path:     /{_locale}/person/{person_id}/activity/
     controller: Chill\ActivityBundle\Controller\ActivityController::listAction
 
 chill_activity_activity_show:
-    path:     /{_locale}/activity/{id}/show
+    path:     /{_locale}/person/{person_id}/activity/{id}/show
     controller: Chill\ActivityBundle\Controller\ActivityController::showAction
 
-chill_activity_activity_select_type:
-    path:     /{_locale}/activity/select-type
-    controller: Chill\ActivityBundle\Controller\ActivityController::selectTypeAction
-
 chill_activity_activity_new:
-    path:     /{_locale}/activity/new
+    path:     /{_locale}/person/{person_id}/activity/new
     controller: Chill\ActivityBundle\Controller\ActivityController::newAction
-    methods:  [POST, GET]
+
+chill_activity_activity_create:
+    path:     /{_locale}/person/{person_id}/activity/create
+    controller: Chill\ActivityBundle\Controller\ActivityController::createAction
+    methods:  POST
 
 chill_activity_activity_edit:
-    path:     /{_locale}/activity/{id}/edit
+    path:     /{_locale}/person/{person_id}/activity/{id}/edit
     controller: Chill\ActivityBundle\Controller\ActivityController::editAction
-    methods:  [GET, POST, PUT]
+
+chill_activity_activity_update:
+    path:     /{_locale}/person/{person_id}/activity/{id}/update
+    controller: Chill\ActivityBundle\Controller\ActivityController::updateAction
+    methods:  [POST, PUT]
 
 chill_activity_activity_delete:
-    path:     /{_locale}/activity/{id}/delete
+    path:     /{_locale}/person/{person_id}/activity/{id}/delete
     controller: Chill\ActivityBundle\Controller\ActivityController::deleteAction
     methods:  [GET, POST, DELETE]

src/Bundle/ChillActivityBundle/config/routes/activitytype.yaml

@@ -0,0 +1,35 @@
+chill_activity_activitytype:
+    path:     /{_locale}/admin/activitytype/
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::indexAction
+    options:
+        menus:
+            admin_activity: 
+                order: 2020
+                label: "Activity Types"
+
+chill_activity_activitytype_show:
+    path:     /{_locale}/admin/activitytype/{id}/show
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::showAction
+
+chill_activity_activitytype_new:
+    path:     /{_locale}/admin/activitytype/new
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::newAction
+
+chill_activity_activitytype_create:
+    path:     /{_locale}/admin/activitytype/create
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::createAction
+    methods:  POST
+
+chill_activity_activitytype_edit:
+    path:     /{_locale}/admin/activitytype/{id}/edit
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::editAction
+
+chill_activity_activitytype_update:
+    path:     /{_locale}/admin/activitytype/{id}/update
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::updateAction
+    methods:  [POST, PUT]
+
+chill_activity_activitytype_delete:
+    path:     /{_locale}/admin/activitytype/{id}/delete
+    controller: Chill\ActivityBundle\Controller\ActivityTypeController::deleteAction
+    methods:  [POST, DELETE]

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

@@ -4,5 +4,4 @@ services:
             $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/form.yaml

@@ -6,7 +6,7 @@ services:
             - "@request_stack"
         tags:
             - { name: form.type, alias: translatable_activity_reason_category }
-
+            
     chill.activity.form.type.translatableactivityreason:
         class: Chill\ActivityBundle\Form\Type\TranslatableActivityReason
         arguments:
@@ -14,7 +14,7 @@ services:
             $reasonRender: '@Chill\ActivityBundle\Templating\Entity\ActivityReasonRender'
         tags:
             - { name: form.type, alias: translatable_activity_reason }
-
+            
     chill.activity.form.type.translatableactivitytype:
         class: Chill\ActivityBundle\Form\Type\TranslatableActivityType
         arguments:
@@ -22,7 +22,7 @@ services:
             - "@chill_activity.repository.activity_type"
         tags:
             - { name: form.type, alias: translatable_activity_type }
-
+            
     chill.activity.form.type.activity:
         class: Chill\ActivityBundle\Form\ActivityType
         arguments:
@@ -31,13 +31,5 @@ services:
             - "@doctrine.orm.entity_manager"
             - "@chill.main.helper.translatable_string"
             - "%chill_activity.form.time_duration%"
-            - '@Chill\PersonBundle\Templating\Entity\SocialIssueRender'
         tags:
             - { name: form.type, alias: chill_activitybundle_activity }
-
-    chill.activity.form.type.activityTypeType:
-        class: Chill\ActivityBundle\Form\ActivityTypeType
-        arguments:
-            - "@chill.main.helper.translatable_string"
-        tags:
-            - { name: form.type, alias: translatable_activity_type }

src/Bundle/ChillActivityBundle/migrations/Version20210401090853.php

@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210401090853 extends AbstractMigration
-{
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE SEQUENCE activitytypecategory_id_seq INCREMENT BY 1 MINVALUE 1 START 1000');
-        $this->addSql('CREATE TABLE activitytypecategory (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
-        $this->addSql('COMMENT ON COLUMN activitytypecategory.name IS \'(DC2Type:json_array)\'');
-        $this->addSql('INSERT INTO activitytypecategory VALUES(1, \'{"fr": "Défaut", "en": "Default"}\', true)');
-
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('DROP SEQUENCE activitytypecategory_id_seq CASCADE');
-        $this->addSql('DROP TABLE activitytypecategory');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210408122329.php

@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210408122329 extends AbstractMigration
-{
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype ADD personVisible SMALLINT DEFAULT 2 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD personLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD userVisible SMALLINT DEFAULT 2 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD userLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD dateVisible SMALLINT DEFAULT 2 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD dateLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD placeVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD placeLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD personsVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD personsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD thirdpartyVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD thirdpartyLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD durationTimeVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD durationTimeLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD attendeeVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD attendeeLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD reasonsVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD reasonsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD commentVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD commentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD sentReceivedVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD sentReceivedLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD documentVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD documentLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD emergencyVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD emergencyLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD accompanyingPeriodVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD accompanyingPeriodLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD socialDataVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD socialDataLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ALTER name SET NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ALTER active DROP DEFAULT');
-        $this->addSql('COMMENT ON COLUMN activitytype.name IS \'(DC2Type:json_array)\'');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype DROP personVisible');
-        $this->addSql('ALTER TABLE activitytype DROP personLabel');
-        $this->addSql('ALTER TABLE activitytype DROP userVisible');
-        $this->addSql('ALTER TABLE activitytype DROP userLabel');
-        $this->addSql('ALTER TABLE activitytype DROP dateVisible');
-        $this->addSql('ALTER TABLE activitytype DROP dateLabel');
-        $this->addSql('ALTER TABLE activitytype DROP placeVisible');
-        $this->addSql('ALTER TABLE activitytype DROP placeLabel');
-        $this->addSql('ALTER TABLE activitytype DROP personsVisible');
-        $this->addSql('ALTER TABLE activitytype DROP personsLabel');
-        $this->addSql('ALTER TABLE activitytype DROP thirdpartyVisible');
-        $this->addSql('ALTER TABLE activitytype DROP thirdpartyLabel');
-        $this->addSql('ALTER TABLE activitytype DROP durationTimeVisible');
-        $this->addSql('ALTER TABLE activitytype DROP durationTimeLabel');
-        $this->addSql('ALTER TABLE activitytype DROP attendeeVisible');
-        $this->addSql('ALTER TABLE activitytype DROP attendeeLabel');
-        $this->addSql('ALTER TABLE activitytype DROP reasonsVisible');
-        $this->addSql('ALTER TABLE activitytype DROP reasonsLabel');
-        $this->addSql('ALTER TABLE activitytype DROP commentVisible');
-        $this->addSql('ALTER TABLE activitytype DROP commentLabel');
-        $this->addSql('ALTER TABLE activitytype DROP sentReceivedVisible');
-        $this->addSql('ALTER TABLE activitytype DROP sentReceivedLabel');
-        $this->addSql('ALTER TABLE activitytype DROP documentVisible');
-        $this->addSql('ALTER TABLE activitytype DROP documentLabel');
-        $this->addSql('ALTER TABLE activitytype DROP emergencyVisible');
-        $this->addSql('ALTER TABLE activitytype DROP emergencyLabel');
-        $this->addSql('ALTER TABLE activitytype DROP accompanyingPeriodVisible');
-        $this->addSql('ALTER TABLE activitytype DROP accompanyingPeriodLabel');
-        $this->addSql('ALTER TABLE activitytype DROP socialDataVisible');
-        $this->addSql('ALTER TABLE activitytype DROP socialDataLabel');
-        $this->addSql('ALTER TABLE activitytype ALTER name DROP NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ALTER active SET DEFAULT \'true\'');
-        $this->addSql('COMMENT ON COLUMN activitytype.name IS NULL');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210415113216.php

@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210415113216 extends AbstractMigration
-{
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype ADD thirdPartiesVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD thirdPartiesLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD documentsVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD documentsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype DROP thirdpartyvisible');
-        $this->addSql('ALTER TABLE activitytype DROP thirdpartylabel');
-        $this->addSql('ALTER TABLE activitytype DROP documentvisible');
-        $this->addSql('ALTER TABLE activitytype DROP documentlabel');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype ADD thirdpartyvisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD thirdpartylabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD documentvisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD documentlabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype DROP thirdPartiesVisible');
-        $this->addSql('ALTER TABLE activitytype DROP thirdPartiesLabel');
-        $this->addSql('ALTER TABLE activitytype DROP documentsVisible');
-        $this->addSql('ALTER TABLE activitytype DROP documentsLabel');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210422073711.php

@@ -1,52 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210422073711 extends AbstractMigration
-{
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('CREATE SEQUENCE activitytpresence_id_seq INCREMENT BY 1 MINVALUE 1 START 6');
-        $this->addSql('CREATE TABLE activitytpresence (id INT NOT NULL, name JSON NOT NULL, active BOOLEAN NOT NULL, PRIMARY KEY(id))');
-
-        $list = [
-            'Usager pésent', "Absence de l''usager",
-            "Refus de visite ou d''entretien", 'Domicile non trouvé',
-            'Domicile erronéee'
-        ];
-        for ($i = 1; $i <= count($list); $i++) {
-            $this->addSql("INSERT INTO activitytpresence VALUES(".$i.", json_build_object('fr', '".$list[$i-1]."'), true)");
-        }
-
-        $this->addSql('ALTER TABLE activity ADD emergency BOOLEAN NOT NULL DEFAULT false');
-        $this->addSql('ALTER TABLE activity ADD sentReceived VARCHAR(255) NOT NULL DEFAULT \'\' ');
-        $this->addSql('ALTER TABLE activity ALTER attendee TYPE INT USING CASE WHEN attendee is false THEN 2 WHEN attendee is true THEN 1 ELSE null END');
-        $this->addSql('ALTER TABLE activity RENAME COLUMN attendee TO attendee_id');
-        $this->addSql('ALTER TABLE activity ADD CONSTRAINT FK_AC74095ABCFD782A FOREIGN KEY (attendee_id) REFERENCES activitytpresence (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activity DROP emergency');
-        $this->addSql('ALTER TABLE activity DROP CONSTRAINT FK_AC74095ABCFD782A');
-        $this->addSql('ALTER TABLE activity ADD attendee BOOLEAN DEFAULT NULL');
-        $this->addSql('ALTER TABLE activity DROP attendee_id');
-        $this->addSql('ALTER TABLE activity DROP sentReceived');
-
-        $this->addSql('DROP SEQUENCE activitytpresence_id_seq CASCADE');
-        $this->addSql('DROP TABLE activitytpresence');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210422123846.php

@@ -1,65 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210422123846 extends AbstractMigration
-{
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('CREATE TABLE activity_person (activity_id INT NOT NULL, person_id INT NOT NULL, PRIMARY KEY(activity_id, person_id))');
-        $this->addSql('CREATE INDEX IDX_66AA317681C06096 ON activity_person (activity_id)');
-        $this->addSql('CREATE INDEX IDX_66AA3176217BBB47 ON activity_person (person_id)');
-        $this->addSql('CREATE TABLE activity_thirdparty (activity_id INT NOT NULL, thirdparty_id INT NOT NULL, PRIMARY KEY(activity_id, thirdparty_id))');
-        $this->addSql('CREATE INDEX IDX_C6F0DE0381C06096 ON activity_thirdparty (activity_id)');
-        $this->addSql('CREATE INDEX IDX_C6F0DE03C7D3A8E6 ON activity_thirdparty (thirdparty_id)');
-        $this->addSql('CREATE TABLE activity_document (activity_id INT NOT NULL, document_id INT NOT NULL, PRIMARY KEY(activity_id, document_id))');
-        $this->addSql('CREATE INDEX IDX_78633A7881C06096 ON activity_document (activity_id)');
-        $this->addSql('CREATE INDEX IDX_78633A78C33F7837 ON activity_document (document_id)');
-        $this->addSql('CREATE TABLE activity_user (activity_id INT NOT NULL, user_id INT NOT NULL, PRIMARY KEY(activity_id, user_id))');
-        $this->addSql('CREATE INDEX IDX_8E570DDB81C06096 ON activity_user (activity_id)');
-        $this->addSql('CREATE INDEX IDX_8E570DDBA76ED395 ON activity_user (user_id)');
-        $this->addSql('ALTER TABLE activity_person ADD CONSTRAINT FK_66AA317681C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE activity_person ADD CONSTRAINT FK_66AA3176217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE activity_thirdparty ADD CONSTRAINT FK_C6F0DE0381C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE activity_thirdparty ADD CONSTRAINT FK_C6F0DE03C7D3A8E6 FOREIGN KEY (thirdparty_id) REFERENCES chill_3party.third_party (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE activity_document ADD CONSTRAINT FK_78633A7881C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        #$this->addSql('ALTER TABLE activity_document ADD CONSTRAINT FK_78633A78C33F7837 FOREIGN KEY (document_id) REFERENCES Document (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE activity_user ADD CONSTRAINT FK_8E570DDB81C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE activity_user ADD CONSTRAINT FK_8E570DDBA76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-
-        $this->addSql('ALTER TABLE activity ADD travelTime TIME(0) WITHOUT TIME ZONE DEFAULT NULL');
-
-        $this->addSql('ALTER TABLE activitytype ADD travelTimeVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD travelTimeLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD usersVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD usersLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('DROP TABLE activity_person');
-        $this->addSql('DROP TABLE activity_thirdparty');
-        $this->addSql('DROP TABLE activity_document');
-        $this->addSql('DROP TABLE activity_user');
-
-        $this->addSql('ALTER TABLE activity DROP travelTime');
-
-        $this->addSql('ALTER TABLE activitytype DROP travelTimeVisible');
-        $this->addSql('ALTER TABLE activitytype DROP travelTimeLabel');
-        $this->addSql('ALTER TABLE activitytype DROP usersVisible');
-        $this->addSql('ALTER TABLE activitytype DROP usersLabel');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210506071150.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210506071150 extends AbstractMigration
-{
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE activity ALTER durationtime DROP NOT NULL');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activity ALTER durationTime SET NOT NULL');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210506090417.php

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210506090417 extends AbstractMigration
-{
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype ADD ordering DOUBLE PRECISION DEFAULT \'0.0\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytypecategory ADD ordering DOUBLE PRECISION DEFAULT \'0.0\' NOT NULL');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytypecategory DROP ordering');
-        $this->addSql('ALTER TABLE activitytype DROP ordering');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210506094520.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210506094520 extends AbstractMigration
-{
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype ADD category_id INT DEFAULT 1');
-        $this->addSql('ALTER TABLE activitytype ADD CONSTRAINT FK_B38CD05112469DE2 FOREIGN KEY (category_id) REFERENCES activitytypecategory (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        $this->addSql('ALTER TABLE activitytype DROP CONSTRAINT FK_B38CD05112469DE2');;
-        $this->addSql('ALTER TABLE activitytype DROP category_id');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210506112500.php

@@ -1,42 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210506112500 extends AbstractMigration
-{
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE TABLE activity_storedobject (activity_id INT NOT NULL, storedobject_id INT NOT NULL, PRIMARY KEY(activity_id, storedobject_id))');
-        $this->addSql('CREATE INDEX IDX_6F660E9381C06096 ON activity_storedobject (activity_id)');
-        $this->addSql('CREATE INDEX IDX_6F660E93EE684399 ON activity_storedobject (storedobject_id)');
-        $this->addSql('ALTER TABLE activity_storedobject ADD CONSTRAINT FK_6F660E9381C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE activity_storedobject ADD CONSTRAINT FK_6F660E93EE684399 FOREIGN KEY (storedobject_id) REFERENCES chill_doc.stored_object (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('DROP TABLE activity_document');
-
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('CREATE SCHEMA public');
-        $this->addSql('CREATE TABLE activity_document (activity_id INT NOT NULL, document_id INT NOT NULL, PRIMARY KEY(activity_id, document_id))');
-        $this->addSql('CREATE INDEX idx_78633a78c33f7837 ON activity_document (document_id)');
-        $this->addSql('CREATE INDEX idx_78633a7881c06096 ON activity_document (activity_id)');
-        $this->addSql('ALTER TABLE activity_document ADD CONSTRAINT fk_78633a7881c06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('DROP TABLE activity_storedobject');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210520095626.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210520095626 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE activity ADD accompanyingPeriod_id INT DEFAULT NULL');
-        $this->addSql('ALTER TABLE activity ADD CONSTRAINT FK_AC74095AD7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE activity DROP CONSTRAINT FK_AC74095AD7FA8EF0');
-        $this->addSql('ALTER TABLE activity DROP accompanyingPeriod_id');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210528161250.php

@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Add socialIssues & socialActions fields to Activity
- */
-final class Version20210528161250 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add socialIssues & socialActions fields to Activity';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('CREATE TABLE chill_activity_activity_chill_person_socialissue (activity_id INT NOT NULL, socialissue_id INT NOT NULL, PRIMARY KEY(activity_id, socialissue_id))');
-        $this->addSql('CREATE INDEX IDX_3DA33F2681C06096 ON chill_activity_activity_chill_person_socialissue (activity_id)');
-        $this->addSql('CREATE INDEX IDX_3DA33F26A549916C ON chill_activity_activity_chill_person_socialissue (socialissue_id)');
-        $this->addSql('CREATE TABLE chill_activity_activity_chill_person_socialaction (activity_id INT NOT NULL, socialaction_id INT NOT NULL, PRIMARY KEY(activity_id, socialaction_id))');
-        $this->addSql('CREATE INDEX IDX_548F1AD881C06096 ON chill_activity_activity_chill_person_socialaction (activity_id)');
-        $this->addSql('CREATE INDEX IDX_548F1AD83DC32179 ON chill_activity_activity_chill_person_socialaction (socialaction_id)');
-        $this->addSql('ALTER TABLE chill_activity_activity_chill_person_socialissue ADD CONSTRAINT FK_3DA33F2681C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_activity_activity_chill_person_socialissue ADD CONSTRAINT FK_3DA33F26A549916C FOREIGN KEY (socialissue_id) REFERENCES chill_person_social_issue (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_activity_activity_chill_person_socialaction ADD CONSTRAINT FK_548F1AD881C06096 FOREIGN KEY (activity_id) REFERENCES activity (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-        $this->addSql('ALTER TABLE chill_activity_activity_chill_person_socialaction ADD CONSTRAINT FK_548F1AD83DC32179 FOREIGN KEY (socialaction_id) REFERENCES chill_person_social_action (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('DROP TABLE chill_activity_activity_chill_person_socialissue');
-        $this->addSql('DROP TABLE chill_activity_activity_chill_person_socialaction');
-    }
-}

src/Bundle/ChillActivityBundle/migrations/Version20210602103243.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Chill\Migrations\Activity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Add info for socialIssues & socialActions in ActivityType
- */
-final class Version20210602103243 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add info for socialIssues & socialActions in ActivityType';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE activitytype ADD socialIssuesVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD socialIssuesLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD socialActionsVisible SMALLINT DEFAULT 1 NOT NULL');
-        $this->addSql('ALTER TABLE activitytype ADD socialActionsLabel VARCHAR(255) DEFAULT \'\' NOT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE activitytype DROP socialIssuesVisible');
-        $this->addSql('ALTER TABLE activitytype DROP socialIssuesLabel');
-        $this->addSql('ALTER TABLE activitytype DROP socialActionsVisible');
-        $this->addSql('ALTER TABLE activitytype DROP socialActionsLabel');
-    }
-}

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

@@ -5,7 +5,6 @@ Activity: Activité
 Duration time: Durée
 Duration Time: Durée
 durationTime:  durée
-Travel time: Durée de déplacement
 Reasons: Sujets
 Attendee: Présence de la personne
 attendee: présence de la personne
@@ -20,30 +19,16 @@ present: présent
 not present: absent
 Delete: Supprimer
 Update: Mettre à jour
-Update activity: Modifier l'activité
+Update activity: Édition de l'activité
 Scope: Cercle
 Activity data: Données de l'activité
 No reason associated: Aucun sujet
-No social issues associated: Aucune problématique sociale
-No social actions associated: Aucune action d'accompagnement
 There isn't any activities.: Aucune activité enregistrée.
 type_name: type de l'activité
 person_firstname: prénom
 person_lastname: nom de famille
 person_id: identifiant de la personne
 Type: Type
-Invisible: Invisible
-Optional: Optionnel
-Required: Obligatoire
-Persons: Personnes
-Users: Utilisateurs
-Emergency: Urgent
-Sent received: Envoyer / Recevoir
-Sent: Envoyer
-Received: Recevoir
-by: 'Par '
-location: Lieu
-
 
 #forms
 Activity creation: Nouvelle activité
@@ -65,15 +50,6 @@ Choose a type: Choisir un type
 1 hour 30: 1 heure 30
 1 hour 45: 1 heure 45
 2 hours: 2 heures
-Concerned groups: Parties concernées
-Persons in accompanying course: Usagers du parcours
-Third persons: Tiers non-pro.
-Others persons: Usagers
-Third parties: Tiers professionnels
-Users concerned: T(M)S
-activity:
-    Insert a document: Insérer un document
-    Remove a document: Supprimer le document
 
 
 #timeline
@@ -101,16 +77,6 @@ Activity configuration menu: Configuration des activités
 Activity Types: Types d'activité
 Activity Reasons: Sujets d'une activité
 Activity Reasons Category: Catégories de sujet d'activités
-Activity Types Categories: Catégories des types d'activité
-
-# Crud
-crud:
-  activity_type:
-    title_new: Nouveau type d'activité
-    title_edit: Edition d'un type d'activité
-  activity_type_category:
-    title_new: Nouvelle catégorie de type d'activité
-    title_edit: Edition d'une catégorie de type d'activité
 
 # activity reason admin
 ActivityReason list: Liste des sujets
@@ -132,41 +98,12 @@ ActivityReasonCategory: Catégorie de sujet d'activité
 ActivityReasonCategory is active and will be proposed: La catégorie est active et sera proposée
 ActivityReasonCategory is inactive and won't be proposed: La catégorie est inactive et ne sera pas proposée
 
-# activity type type admin
+# activity type admin
 ActivityType list: Types d'activités
 Create a new activity type: Créer un nouveau type d'activité
-Persons visible: Visibilté du champ Personnes
+ActivityType creation: Nouveau type d'activité
-Persons label: Libellé du champ Personnes
+ActivityType: Type d'activité
-User visible: Visibilté du champ Utilisateur
+ActivityType edit: Modifier une activité
-User label: Libellé du champ Utilisateur
-Date visible: Visibilté du champ Date
-Date label: Libellé du champ Date
-Place visible: Visibilté du champ Lieu
-Place label: Libellé du champ Lieu
-Third parties visible: Visibilté du champ Tiers
-Third parties label: Libellé du champ Tiers
-Duration time visible: Visibilté du champ Durée
-Duration time label: Libellé du champ Durée
-Travel time visible: Visibilté du champ Durée de déplacement
-Travel time label: Libellé du champ Durée de déplacement
-Attendee visible: Visibilté du champ Présence de l'usager
-Attendee label: Libellé du champ Présence de l'usager
-Reasons visible: Visibilté du champ Sujet
-Reasons label: Libellé du champ Sujet
-Comment visible: Visibilté du champ Commentaire
-Comment label: Libellé du champ Commentaire
-Emergency visible: Visibilté du champ Urgent
-Emergency label: Libellé du champ Urgent
-Accompanying period visible: Visibilté du champ Période d'accompagnement
-Accompanying period label: Libellé du champ Période d'accompagnement
-Social data visible: Visibilté du champ Données sociales
-Social data label: Libellé du champ Données sociales
-Users visible: Visibilté du champ Utilisateurs
-Users label: Libellé du champ Utilisateurs
-
-# activity type category admin
-ActivityTypeCategory list: Liste des catégories des types d'activité
-Create a new activity type category: Créer une nouvelle catégorie de type d'activité
 
 # activity delete
 Remove activity: Supprimer une activité

src/Bundle/ChillMainBundle/CRUD/CompilerPass/CRUDControllerCompilerPass.php

@@ -22,7 +22,6 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Reference;
 use Chill\MainBundle\Routing\MenuComposer;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Alias;
 
 /**
  * 
@@ -50,32 +49,29 @@ class CRUDControllerCompilerPass implements CompilerPassInterface
     private function configureCrudController(ContainerBuilder $container, array $crudEntry, string $apiOrCrud): void
     {
         $controllerClass = $crudEntry['controller'];
+
         $controllerServiceName = 'cs'.$apiOrCrud.'_'.$crudEntry['name'].'_controller';
 
-        // create config parameter in container
-        $param = 'chill_main_'.$apiOrCrud.'_config_'.$crudEntry['name'];
-        $container->setParameter($param, $crudEntry);
-
         if ($container->hasDefinition($controllerClass)) {
-            // create an alias to not to re-create the service
+            $controller = $container->getDefinition($controllerClass);
-            $alias = new Alias($controllerClass, true);
+            $container->removeDefinition($controllerClass);
-            $container->setAlias($controllerServiceName, $alias);
+            $alreadyDefined = true;
-
-            // add the "addMethodCall"
-            $container->getDefinition($controllerClass)
-                ->addMethodCall('setCrudConfig', ['%'.$param.'%']);
-
         } else {
             $controller = new Definition($controllerClass);
+            $alreadyDefined = false;
+        }
 
-            $controller->addTag('controller.service_arguments');
+        $controller->addTag('controller.service_arguments');
+        if (FALSE === $alreadyDefined) {
             $controller->setAutoconfigured(true);
             $controller->setPublic(true);
-
-            $controller->addMethodCall('setCrudConfig', ['%'.$param.'%']);
-
-            $container->setDefinition($controllerServiceName, $controller);
         }
+
+        $param = 'chill_main_'.$apiOrCrud.'_config_'.$crudEntry['name'];
+        $container->setParameter($param, $crudEntry);
+        $controller->addMethodCall('setCrudConfig', ['%'.$param.'%']);
+
+        $container->setDefinition($controllerServiceName, $controller);
     }
     
 }

src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php

@@ -359,10 +359,9 @@ class ApiController extends AbstractCRUDController
      * 6. validate the base entity (not the deserialized one). Groups are fetched from getValidationGroups, validation is perform by `validate`
      * 7. run onAfterValidation
      * 8. if errors, return a 422 response with errors
-     * 9. if $forcePersist === true, persist the entity
+     * 9. flush the data 
-     * 10. flush the data 
+     * 10. run onAfterFlush
-     * 11. run onAfterFlush
+     * 11. return a 202 response for DELETE with empty body, or HTTP 200 for post with serialized posted entity
-     * 12. return a 202 response for DELETE with empty body, or HTTP 200 for post with serialized posted entity
      *
      * @param string action
      * @param mixed id
@@ -371,12 +370,11 @@ class ApiController extends AbstractCRUDController
      * @param string $property the name of the property. This will be used to make a `add+$property` and `remove+$property` method
      * @param string $postedDataType the type of the posted data (the content)
      * @param string $postedDataContext a context to deserialize posted data (the content)
-     * @param bool $forcePersist force to persist the created element (only for POST request)
      * @throw BadRequestException if unable to deserialize the posted data
      * @throw BadRequestException if the method is not POST or DELETE
      *
      */ 
-    protected function addRemoveSomething(string $action, $id, Request $request, string $_format, string $property, string $postedDataType, array $postedDataContext = [], bool $forcePersist = false): Response
+    protected function addRemoveSomething(string $action, $id, Request $request, string $_format, string $property, string $postedDataType, $postedDataContext = []): Response
     {
         $entity = $this->getEntity($action, $id, $request);
 
@@ -431,10 +429,6 @@ class ApiController extends AbstractCRUDController
             return $this->json($errors, 422);
         }
 
-        if ($forcePersist && $request->getMethod() === Request::METHOD_POST) {
-            $this->getDoctrine()->getManager()->persist($postedData);
-        }
-
         $this->getDoctrine()->getManager()->flush();
 
 

src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php

@@ -142,11 +142,11 @@ class CRUDRoutesLoader extends Loader
     protected function loadApi(array $crudConfig): RouteCollection
     {
         $collection = new RouteCollection();
-        $controller = 'csapi_'.$crudConfig['name'].'_controller';
+        $controller ='csapi_'.$crudConfig['name'].'_controller';
 
         foreach ($crudConfig['actions'] as $name => $action) {
             // filter only on single actions
-            $singleCollection = $action['single_collection'] ?? $name === '_entity' ? 'single' : NULL;
+            $singleCollection = $action['single-collection'] ?? $name === '_entity' ? 'single' : NULL;
             if ('collection' === $singleCollection) {
 //                continue;
             }
@@ -171,7 +171,7 @@ class CRUDRoutesLoader extends Loader
             // path are rewritten
             // if name === 'default', we rewrite it to nothing :-)
             $localName = \in_array($name, [ '_entity', '_index' ]) ? '' : '/'.$name;
-            if ('collection' === $action['single_collection'] || '_index' === $name) {
+            if ('collection' === $action['single-collection'] || '_index' === $name) {
                 $localPath = $action['path'] ?? $localName.'.{_format}';
             } else {
                 $localPath = $action['path'] ?? '/{id}'.$localName.'.{_format}';

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace Chill\MainBundle\DataFixtures\ORM;
-
-use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\Intl\Intl;
-use Chill\MainBundle\Entity\Notification;
-
-/**
- * Load notififications into database
- */
-trait LoadAbstractNotificationsTrait
-{
-    public function load(ObjectManager $manager)
-    {
-        foreach ($this->notifs as $notif) {
-            $entityId = $this->getReference($notif['entityRef'])->getId();
-
-            print('Adding notification for '.$notif['entityClass'].'(entity id:'.$entityId.")\n");
-
-            $newNotif = (new Notification())
-                ->setMessage($notif['message'])
-                ->setSender($this->getReference($notif['sender']))
-                ->setRelatedEntityClass($notif['entityClass'])
-                ->setRelatedEntityId($entityId)
-                ->setDate(new \DateTimeImmutable('now'))
-                ->setRead([])
-                ;
-
-            foreach ($notif['addressees'] as $addressee) {
-                $newNotif->addAddressee($this->getReference($addressee));
-            }
-
-            $manager->persist($newNotif);
-
-            $manager->flush();
-        }
-    }
-}

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -115,6 +115,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
         $loader->load('services.yaml');
         $loader->load('services/doctrine.yaml');
         $loader->load('services/logger.yaml');
+        $loader->load('services/repositories.yaml');
         $loader->load('services/pagination.yaml');
         $loader->load('services/export.yaml');
         $loader->load('services/form.yaml');
@@ -195,9 +196,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
             ->prependExtensionConfig(
                 'doctrine',
                 [
-                    'dbal' => [
+                   'dbal' => [
-                        // ignore views:
-                        'schema_filter' => '~^(?!view_)~',
                         // This is mandatory since we are using postgis as database.
                         'mapping_types' => [
                             'geometry' => 'string',
@@ -279,8 +278,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                             'methods' => [
                                 Request::METHOD_GET => true,
                                 Request::METHOD_POST => true,
-                                Request::METHOD_HEAD => true,
+                                Request::METHOD_HEAD => true
-                                Request::METHOD_PATCH => true
                             ]
                         ],
                     ]
@@ -322,8 +320,7 @@ class ChillMainExtension extends Extension implements PrependExtensionInterface,
                         '_entity' => [
                             'methods' => [
                                 Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true,
+                                Request::METHOD_HEAD => true
-                                Request::METHOD_POST => true,
                             ]
                         ],
                     ]

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -205,7 +205,7 @@ class Configuration implements ConfigurationInterface
                                             ->ignoreExtraKeys(false)
                                             ->info('the requirements for the route. Will be set to `[ \'id\' => \'\d+\' ]` if left empty.')
                                         ->end()
-                                        ->enumNode('single_collection')
+                                        ->enumNode('single-collection')
                                             ->values(['single', 'collection'])
                                             ->defaultValue('single')
                                             ->info('indicates if the returned object is a single element or a collection. '.

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -11,7 +11,7 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty;
 /**
  * Address
  *
- * @ORM\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="chill_main_address")
  * @ORM\HasLifecycleCallbacks()
  */
@@ -116,7 +116,7 @@ class Address
      * @ORM\Column(type="date")
      * @groups({"write"})
      */
-    private \DateTime $validFrom;
+    private $validFrom;
 
     /**
      * Indicates when the address ends. Used to build an history
@@ -127,7 +127,7 @@ class Address
      * @ORM\Column(type="date", nullable=true)
      * @groups({"write"})
      */
-    private ?\DateTime $validTo = null;
+    private $validTo;
 
     /**
      * True if the address is a "no address", aka homeless person, ...

src/Bundle/ChillMainBundle/Entity/AddressReference.php

@@ -7,7 +7,7 @@ use Chill\MainBundle\Doctrine\Model\Point;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="chill_main_address_reference")
  * @ORM\HasLifecycleCallbacks()
  */

src/Bundle/ChillMainBundle/Entity/Center.php

@@ -25,7 +25,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="Chill\MainBundle\Repository\CenterRepository")
  * @ORM\Table(name="centers")
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>

src/Bundle/ChillMainBundle/Entity/Country.php

@@ -8,7 +8,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
 /**
  * Country
  *
- * @ORM\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="country")
  * @ORM\Cache(usage="READ_ONLY", region="country_cache_region")
  * @ORM\HasLifecycleCallbacks()

src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php

@@ -37,11 +37,6 @@ class CommentEmbeddable
         return $this->comment;
     }
 
-    public function isEmpty()
-    {
-        return empty($this->getComment());
-    }
-
     /**
      * @param string $comment
      */

src/Bundle/ChillMainBundle/Entity/GroupCenter.php

@@ -27,7 +27,7 @@ use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="group_centers")
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
  *

src/Bundle/ChillMainBundle/Entity/Language.php

@@ -25,7 +25,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * Language
  *
- * @ORM\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="language")
  * @ORM\Cache(usage="READ_ONLY", region="language_cache_region")
  * @ORM\HasLifecycleCallbacks()

src/Bundle/ChillMainBundle/Entity/Notification.php

@@ -1,187 +0,0 @@
-<?php
-
-/*
- * Copyright (C) 2021 Champs-Libres <info@champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace Chill\MainBundle\Entity;
-
-use Chill\MainBundle\Entity\User;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity
- * @ORM\Table(
- *      name="chill_main_notification",
- *      uniqueConstraints={
- *          @ORM\UniqueConstraint(columns={"relatedEntityClass", "relatedEntityId"})
- *      }
- * )
- */
-class Notification
-{
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private int $id;
-
-    /**
-     * @ORM\Column(type="text")
-     */
-    private string $message;
-
-    /**
-     * @ORM\Column(type="datetime_immutable")
-     */
-    private \DateTimeImmutable $date;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private User $sender;
-
-    /**
-     * @ORM\ManyToMany(targetEntity=User::class)
-     * @ORM\JoinTable(name="chill_main_notification_addresses_user")
-     */
-    private Collection $addressees;
-
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
-    private string $relatedEntityClass;
-
-    /**
-     * @ORM\Column(type="integer")
-     */
-    private int $relatedEntityId;
-
-    /**
-     * @ORM\Column(type="json")
-     */
-    private array $read;
-
-    public function __construct()
-    {
-        $this->addressees = new ArrayCollection();
-    }
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getMessage(): ?string
-    {
-        return $this->message;
-    }
-
-    public function setMessage(string $message): self
-    {
-        $this->message = $message;
-
-        return $this;
-    }
-
-    public function getDate(): ?\DateTimeImmutable
-    {
-        return $this->date;
-    }
-
-    public function setDate(\DateTimeImmutable $date): self
-    {
-        $this->date = $date;
-
-        return $this;
-    }
-
-    public function getSender(): ?User
-    {
-        return $this->sender;
-    }
-
-    public function setSender(?User $sender): self
-    {
-        $this->sender = $sender;
-
-        return $this;
-    }
-
-    /**
-     * @return Collection|User[]
-     */
-    public function getAddressees(): Collection
-    {
-        return $this->addressees;
-    }
-
-    public function addAddressee(User $addressee): self
-    {
-        if (!$this->addressees->contains($addressee)) {
-            $this->addressees[] = $addressee;
-        }
-
-        return $this;
-    }
-
-    public function removeAddressee(User $addressee): self
-    {
-        $this->addressees->removeElement($addressee);
-
-        return $this;
-    }
-
-    public function getRelatedEntityClass(): ?string
-    {
-        return $this->relatedEntityClass;
-    }
-
-    public function setRelatedEntityClass(string $relatedEntityClass): self
-    {
-        $this->relatedEntityClass = $relatedEntityClass;
-
-        return $this;
-    }
-
-    public function getRelatedEntityId(): ?int
-    {
-        return $this->relatedEntityId;
-    }
-
-    public function setRelatedEntityId(int $relatedEntityId): self
-    {
-        $this->relatedEntityId = $relatedEntityId;
-
-        return $this;
-    }
-
-    public function getRead(): array
-    {
-        return $this->read;
-    }
-
-    public function setRead(array $read): self
-    {
-        $this->read = $read;
-
-        return $this;
-    }
-}

src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php

@@ -27,7 +27,7 @@ use Chill\MainBundle\Entity\RoleScope;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity()
  * @ORM\Table(name="permission_groups")
  * @ORM\Cache(usage="NONSTRICT_READ_WRITE", region="acl_cache_region")
  *