add person: increase z-index of toast and wait for validation before closing modal

CHANGELOG.md

@@ -11,91 +11,10 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
-* renommer "dossier numéro" en "parcours numéro" dans les résultats de recherche
-* renomme date de début en date d'ouverture dans le formulaire parcours
-
-
-## Test releases
-
-### test release 2021-01-31
-
-[fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
-[homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.  
-* [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)
-* [person] accompanying course: close modal when edit participation (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
-* [person] accompanying course: treat validation error when editing on-the-fly entities (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/420)
-* [activity] show activity attendee (présence) in the activity list (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/412)
-* [activity] admin: change validation rule for social action visible field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/413)
-* [parcours]: component added to change the opening date of a parcours (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/411)
-* [search]: listing of parcours display changed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/410)
-* [user]: page with accompanying periods to which is user is referent (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/408)
-* [person] age added to renderstring + renderbox/ vue component created to display person text (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/389)
-* [household member editor] allow to push to existing household
-* [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal
-
-
-### test release 2021-01-28
-
-* [person] improve filiations vis graph: disable physics, use chill colors for persons-households-course, increase label of relations, remove labels on household arrows and other improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/286, https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/362)
-* [activity] Order activity by date and by id (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/364)
-* [main] increase length of 4 Address fields (change to TEXT, no size limits) (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/277)
-* [main] Add confidential option for address, in edit and view (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/165)
-* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
-* [person] Add residential address entity, form and list for each person
-* [aside_activity]: dynamicUserPickerType used (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/399)
-* dispatching list
-
-
-### test release 2021-01-26
-
-* [parcours] comments truncated if too long + link added (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/406)
-* [person]: possibility to add person resources (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/382)
-* [person ressources]: module added
-
-
-### test release 2022-01-24
-
-* [person] name suggestions within create person form when person is created departing from a search input (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/377)
-* [notification: formulaire création] descend la box avec la description dans le bas du formulaire
-* [notification for activity]: fix link to activity
-* [notification] add "URGENT" before accompanying course with emergency = true
-* [notification] add a "read more" button on system notification
-* [notification] add `[Chill]` in the subject of each notification, automatically
-* [notification] add a counter for notification in activity list and accompanying period list, and search results
-* [parcours] bugfix if deathdate is not defined (eg. for a thirdparty) parcours is still displayed. Gave error before.
-* [workflow] add breadcrumb to show steps
-* [popover] add popover html popup mechanism (used by workflow breadcrumb)
-* [templates] improve updatedBy macro in item metadatas
-* [parcours]: bug fix when comment is pinned all other comments remain in the collection (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/385)
-* [workflow] 
-  * add My workflow section with my opened subscriptions
-  * apply workflow on documents, accompanyingCourseWork and Evaluations
-* [wopi-link] a new vue component allow to open wopi link in a fullscreen chill-themed modal
-
-### test release 2022-01-19
-* vuejs: add dead information on all on-the-fly person render boxes, in vis graph and other templates (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/271)
-* [thirdparty] fix bug in 3rd party view: types was replaced by thirdPartyTypes
-* [main] location form type: fix unmapped address field (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/246)
-* [activity] fix wrong import of js assets for adding and viewing documents in activity (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/83 & https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/176)
-* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
-* [forms] dynamic picker types for user/person/thirdparty types created (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/386)
-
-### test release 2022-01-17
-
-* [main] Add editableByUser field to locationType entity, adapt the admin template and add this condition in the location-type endpoint (see https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/297)
-* [main] Add mainLocation field to User entity and add it in user form type
-* rewrite page which allow to select activity
-* [main] Add mainLocation field to User entity and add it in user form type
-* [course list in person context] show full username/label for ref
-* [accompanying period work] remove the possibility to  generate document from an accompanying period work
 * vuejs: add validation on required fields for AddPerson, Address and Location components
 * vuejs: treat 422 validation errors in locations and AddPerson components
-* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
 
 ## Test releases
-* vuejs: add validation on required fields for AddPerson, Address and Location components
-* vuejs: treat 422 validation errors in locations and AddPerson components
-* [person]: space added between deathdate and age in twig renderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/380)
 
 ### test release 2022-01-12
 

composer.json

@@ -52,6 +52,9 @@
         "twig/string-extra": "^3.3",
         "twig/twig": "^3.0"
     },
+    "conflict": {
+        "symfony/symfony": "*"
+    },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "drupol/php-conventions": "^5",
@@ -68,26 +71,34 @@
         "symfony/var-dumper": "^4.4",
         "symfony/web-profiler-bundle": "^4.4"
     },
-    "conflict": {
-        "symfony/symfony": "*"
+    "config": {
+        "bin-dir": "bin",
+        "optimize-autoloader": true,
+        "sort-packages": true,
+        "vendor-dir": "tests/app/vendor",
+        "allow-plugins": {
+            "composer/package-versions-deprecated": true,
+            "phpstan/extension-installer": true,
+            "ergebnis/composer-normalize": true,
+            "phpro/grumphp": true
+        }
     },
     "autoload": {
         "psr-4": {
             "Chill\\ActivityBundle\\": "src/Bundle/ChillActivityBundle",
-            "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
             "Chill\\BudgetBundle\\": "src/Bundle/ChillBudgetBundle",
-            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
             "Chill\\CustomFieldsBundle\\": "src/Bundle/ChillCustomFieldsBundle",
-            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
             "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle",
             "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
             "Chill\\FamilyMemberBundle\\": "src/Bundle/ChillFamilyMemberBundle",
-            "Chill\\FormTypesBundle\\": "src/Bundle/ChillFormTypesBundle/src",
             "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
+            "Chill\\AsideActivityBundle\\": "src/Bundle/ChillAsideActivityBundle/src",
+            "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
+            "Chill\\CalendarBundle\\": "src/Bundle/ChillCalendarBundle",
             "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src"
         }
     },
@@ -100,10 +111,10 @@
     "config": {
         "allow-plugins": {
             "composer/package-versions-deprecated": true,
+            "phpstan/extension-installer": true,
             "ergebnis/composer-normalize": true,
-            "ocramius/package-versions": true,
             "phpro/grumphp": true,
-            "phpstan/extension-installer": true
+            "ocramius/package-versions": true
         },
         "bin-dir": "bin",
         "optimize-autoloader": true,
@@ -112,8 +123,8 @@
     },
     "scripts": {
         "auto-scripts": {
-            "assets:install %PUBLIC_DIR%": "symfony-cmd",
-            "cache:clear": "symfony-cmd"
+            "cache:clear": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd"
         }
     }
 }

package.json.txt

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

phpstan-baseline.neon

@@ -80,6 +80,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
 
+		-
+			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
 		-
 			message: "#^Foreach overwrites \\$action with its value variable\\.$#"
 			count: 1

phpstan-critical.neon

@@ -30,6 +30,36 @@ parameters:
             count: 2
             path: src/Bundle/ChillPersonBundle/Household/MembersEditorFactory.php
 
+        -
+            message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:countBySocialActionWithDescendants\\(\\) has invalid type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\SocialAction\\.$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$action$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$limit$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$offset$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+        -
+            message: "#^Undefined variable\\: \\$orderBy$#"
+            count: 1
+            path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
         -
             message: "#^Variable variables are not allowed\\.$#"
             count: 4

phpstan-types.neon

@@ -400,6 +400,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
 
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkRepository\\:\\:buildQueryBySocialActionWithDescendants\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\QueryBuilder\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 3

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -31,7 +31,6 @@ use DateTime;
 use Doctrine\ORM\EntityManagerInterface;
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
-use RuntimeException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -39,8 +38,8 @@ use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Role\Role;
-
 use Symfony\Component\Serializer\SerializerInterface;
+
 use function array_key_exists;
 
 final class ActivityController extends AbstractController
@@ -256,7 +255,7 @@ final class ActivityController extends AbstractController
         if ($person instanceof Person) {
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $person);
             $activities = $this->activityACLAwareRepository
-                ->findByPerson($person, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
+                ->findByPerson($person, ActivityVoter::SEE, 0, null);
 
             $event = new PrivacyEvent($person, [
                 'element_class' => Activity::class,
@@ -269,7 +268,7 @@ final class ActivityController extends AbstractController
             $this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
 
             $activities = $this->activityACLAwareRepository
-                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE, 0, null, ['date' => 'DESC', 'id' => 'DESC']);
+                ->findByAccompanyingPeriod($accompanyingPeriod, ActivityVoter::SEE);
 
             $view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
         }
@@ -472,21 +471,20 @@ final class ActivityController extends AbstractController
 
     public function showAction(Request $request, int $id): Response
     {
-        $entity = $this->activityRepository->find($id);
+        $view = null;
 
-        if (null === $entity) {
-            throw $this->createNotFoundException('Unable to find Activity entity.');
-        }
-
-        $accompanyingPeriod = $entity->getAccompanyingPeriod();
-        $person = $entity->getPerson();
+        [$person, $accompanyingPeriod] = $this->getEntity($request);
 
         if ($accompanyingPeriod instanceof AccompanyingPeriod) {
             $view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
         } elseif ($person instanceof Person) {
             $view = 'ChillActivityBundle:Activity:showPerson.html.twig';
-        } else {
-            throw new RuntimeException('the activity should be linked with a period or person');
+        }
+
+        $entity = $this->activityRepository->find($id);
+
+        if (null === $entity) {
+            throw $this->createNotFoundException('Unable to find Activity entity.');
         }
 
         if (null !== $accompanyingPeriod) {
@@ -495,7 +493,8 @@ final class ActivityController extends AbstractController
             $entity->personsNotAssociated = $entity->getPersonsNotAssociated();
         }
 
-        $this->denyAccessUnlessGranted(ActivityVoter::SEE, $entity);
+        // TODO revoir le Voter de Activity pour tenir compte qu'une activité peut appartenir a une période
+        // $this->denyAccessUnlessGranted('CHILL_ACTIVITY_SEE', $entity);
 
         $deleteForm = $this->createDeleteForm($entity->getId(), $person, $accompanyingPeriod);
 

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;
 
 use Chill\ActivityBundle\Validator\Constraints as ActivityValidator;
-use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Entity\Document;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Chill\MainBundle\Entity\HasCenterInterface;
@@ -67,7 +67,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityType")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
      * @SerializedName("activityType")
      * @ORM\JoinColumn(name="type_id")
      */
@@ -75,19 +75,16 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\ActivityBundle\Entity\ActivityPresence")
-     * @Groups({"docgen:read"})
      */
     private ?ActivityPresence $attendee = null;
 
     /**
      * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="comment_")
-     * @Groups({"docgen:read"})
      */
     private CommentEmbeddable $comment;
 
     /**
      * @ORM\Column(type="datetime")
-     * @Groups({"docgen:read"})
      */
     private DateTime $date;
 
@@ -103,7 +100,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\Column(type="boolean", options={"default": false})
-     * @Groups({"docgen:read"})
      */
     private bool $emergency = false;
 
@@ -111,13 +107,13 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
      */
     private ?int $id = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Location")
-     * @groups({"read", "docgen:read"})
+     * @groups({"read"})
      */
     private ?Location $location = null;
 
@@ -128,45 +124,42 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\Person")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
      */
     private ?Collection $persons = null;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ActivityBundle\Entity\ActivityReason")
-     * @Groups({"docgen:read"})
      */
     private Collection $reasons;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\Scope")
-     * @Groups({"docgen:read"})
      */
     private ?Scope $scope = null;
 
     /**
      * @ORM\Column(type="string", options={"default": ""})
-     * @Groups({"docgen:read"})
      */
     private string $sentReceived = '';
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialAction")
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialaction")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
      */
     private Collection $socialActions;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\PersonBundle\Entity\SocialWork\SocialIssue")
      * @ORM\JoinTable(name="chill_activity_activity_chill_person_socialissue")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
      */
     private Collection $socialIssues;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\ThirdPartyBundle\Entity\ThirdParty")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
      */
     private ?Collection $thirdParties = null;
 
@@ -177,13 +170,12 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
 
     /**
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\User")
-     * @Groups({"docgen:read"})
      */
     private User $user;
 
     /**
      * @ORM\ManyToMany(targetEntity="Chill\MainBundle\Entity\User")
-     * @Groups({"read", "docgen:read"})
+     * @Groups({"read"})
      */
     private ?Collection $users = null;
 
@@ -199,7 +191,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         $this->socialActions = new ArrayCollection();
     }
 
-    public function addDocument(StoredObject $document): self
+    public function addDocument(Document $document): self
     {
         $this->documents[] = $document;
 
@@ -310,18 +302,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->documents;
     }
 
-    /**
-     * @Groups({"docgen:read"})
-     */
-    public function getDurationMinute(): int
-    {
-        if (null === $this->durationTime) {
-            return 0;
-        }
-
-        return (int) round(($this->durationTime->getTimestamp() + $this->durationTime->getOffset()) / 60.0, 0);
-    }
-
     public function getDurationTime(): ?DateTime
     {
         return $this->durationTime;
@@ -422,18 +402,6 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->travelTime;
     }
 
-    /**
-     * @Groups({"docgen:read"})
-     */
-    public function getTravelTimeMinute(): int
-    {
-        if (null === $this->travelTime) {
-            return 0;
-        }
-
-        return (int) round(($this->travelTime->getTimestamp() + $this->travelTime->getOffset()) / 60.0, 0);
-    }
-
     /**
      * @deprecated
      */
@@ -457,7 +425,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         return $this->getEmergency();
     }
 
-    public function removeDocument(StoredObject $document): void
+    public function removeDocument(Document $document): void
     {
         $this->documents->removeElement($document);
     }

src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php

@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Serializer\Annotation as Serializer;
 
 /**
  * Class ActivityPresence.
@@ -32,14 +31,11 @@ class ActivityPresence
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
-     * @Serializer\Groups({"docgen:read"})
      */
     private ?int $id;
 
     /**
      * @ORM\Column(type="json")
-     * @Serializer\Groups({"docgen:read"})
-     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
      */
     private array $name = [];
 

src/Bundle/ChillActivityBundle/Entity/ActivityType.php

@@ -13,10 +13,8 @@ namespace Chill\ActivityBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use InvalidArgumentException;
-use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
 
 /**
  * Class ActivityType.
@@ -120,7 +118,6 @@ class ActivityType
      * @ORM\Id
      * @ORM\Column(name="id", type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
-     * @Groups({"docgen:read"})
      */
     private ?int $id;
 
@@ -136,8 +133,7 @@ class ActivityType
 
     /**
      * @ORM\Column(type="json")
-     * @Groups({"read", "docgen:read"})
-     * @Serializer\Context({"is-translatable": true}, groups={"docgen:read"})
+     * @Groups({"read"})
      */
     private array $name = [];
 
@@ -194,6 +190,7 @@ class ActivityType
 
     /**
      * @ORM\Column(type="smallint", nullable=false, options={"default": 1})
+     * @Assert\EqualTo(propertyPath="socialIssuesVisible", message="This parameter must be equal to social issue parameter")
      */
     private int $socialActionsVisible = self::FIELD_INVISIBLE;
 
@@ -263,23 +260,6 @@ class ActivityType
      */
     private int $userVisible = self::FIELD_REQUIRED;
 
-    /**
-     * @Assert\Callback
-     *
-     * @param mixed $payload
-     */
-    public function checkSocialActionsVisibility(ExecutionContextInterface $context, $payload)
-    {
-        if ($this->socialIssuesVisible !== $this->socialActionsVisible) {
-            if (!($this->socialIssuesVisible === 2 && $this->socialActionsVisible === 1)) {
-                $context
-                    ->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value')
-                    ->atPath('socialActionsVisible')
-                    ->addViolation();
-            }
-        }
-    }
-
     /**
      * Get active
      * return true if the type is active.

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -307,7 +307,6 @@ class ActivityType extends AbstractType
                 'allow_add' => true,
                 'button_add_label' => 'activity.Insert a document',
                 'button_remove_label' => 'activity.Remove a document',
-                'empty_collection_explain' => 'No documents',
             ]);
         }
 

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

@@ -9,9 +9,8 @@ div.new-activity-select-type {
       display: flex;
       flex-direction: row;
       flex-wrap: wrap;
-      justify-content: flex-start;
+      justify-content: center;
       gap: 12px;
-      margin-bottom: 30px;
 
       div.bloc {
          width: 200px;
@@ -28,28 +27,26 @@ div.new-activity-select-type {
 // precise dashboard specific details
 
 p.date-label {
-   display: inline-block;
-   margin: 0 0.5em 0 0;
-   font-weight: 700;
-   font-size: 18pt;
+    display: inline-block;
+    margin: 0 0.5em 0 0;
+    font-weight: 700;
+    font-size: 18pt;
 }
 div.dashboard,
-h4.badge-title,
-h3.badge-title,
 h2.badge-title {
-   ul.list-content {
-      font-size: 70%;
-      list-style-type: none;
-      padding-left: 0;
-      margin: 0;
-      li {
-         margin-bottom: 0.2em;
-         // exception: change bg color for action badges above dashboard
-         .bg-light {
-               background-color: $chill-light-gray !important;
-         }
-      }
-   }
+    ul.list-content {
+        font-size: 70%;
+        list-style-type: none;
+        padding-left: 0;
+        margin: 0;
+        li {
+            margin-bottom: 0.2em;
+            // exception: change bg color for action badges above dashboard
+            .bg-light {
+                background-color: $chill-light-gray !important;
+            }
+        }
+    }
 }
 
 //// ACTIVITY SHOW AND FORM PAGES

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

@@ -1,48 +1,45 @@
 <template>
-   <teleport to="#add-persons" v-if="isComponentVisible">
+    <teleport to="#add-persons" v-if="isComponentVisible">
 
-      <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:blocWidth="getBlocWidth"
-               v-bind:setPersonsInBloc="setPersonsInBloc">
-         </persons-bloc>
-      </div>
-      <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
-         <ul class="list-suggest add-items inline">
-               <li v-for="(p, i) in suggestedEntities" @click="addSuggestedEntity(p)" :key="`suggestedEntities-${i}`">
-                  <person-text v-if="p.type === 'person'" :person="p"></person-text>
-                  <span v-else>{{ p.text }}</span>
-               </li>
-         </ul>
-      </div>
+        <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:blocWidth="getBlocWidth"
+                v-bind:setPersonsInBloc="setPersonsInBloc">
+            </persons-bloc>
+        </div>
+        <div v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0">
+            <ul class="list-suggest add-items inline">
+                <li v-for="(p, i) in suggestedEntities" @click="addSuggestedEntity(p)" :key="`suggestedEntities-${i}`">
+                    <span>{{ p.text }}</span>
+                </li>
+            </ul>
+        </div>
 
-      <add-persons
-         buttonTitle="activity.add_persons"
-         modalTitle="activity.add_persons"
-         v-bind:key="addPersons.key"
-         v-bind:options="addPersonsOptions"
-         @addNewPersons="addNewPersons"
-         ref="addPersons">
-      </add-persons>
+        <add-persons
+            buttonTitle="activity.add_persons"
+            modalTitle="activity.add_persons"
+            v-bind:key="addPersons.key"
+            v-bind:options="addPersonsOptions"
+            @addNewPersons="addNewPersons"
+            ref="addPersons">
+        </add-persons>
 
-   </teleport>
+    </teleport>
 </template>
 
 <script>
 import { mapState, mapGetters } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import PersonsBloc from './ConcernedGroups/PersonsBloc.vue';
-import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
 
 export default {
    name: "ConcernedGroups",
    components: {
       AddPersons,
-      PersonsBloc,
-      PersonText
+      PersonsBloc
    },
    data() {
       return {

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

@@ -1,29 +1,21 @@
 <template>
    <li>
       <span :title="person.text">
-         <span class="chill_denomination" @click.prevent="$emit('remove', person)">
-            <person-text :person="person" :isCut="true"></person-text>
-         </span>
+         <span class="chill_denomination" @click.prevent="$emit('remove', person)">{{ textCutted }}</span>
       </span>
    </li>
 </template>
 
 <script>
-import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
-
-
 export default {
    name: "PersonBadge",
    props: ['person'],
-   components: {
-      PersonText
+   computed: {
+      textCutted() {
+         let more = (this.person.text.length > 15) ?'…' : '';
+         return this.person.text.slice(0,15) + more;
+      }
    },
-   // computed: {
-   //    textCutted() {
-   //       let more = (this.person.text.length > 15) ?'…' : '';
-   //       return this.person.text.slice(0,15) + more;
-   //    }
-   // },
    emits: ['remove'],
 }
 </script>

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

@@ -41,17 +41,6 @@
                 </div>
             {% endif %}
 
-            {% if activity.attendee and t.attendeeVisible %}
-                <div class="wl-row">
-                    <div class="wl-col title"><h3>{{ 'Attendee'|trans }}</h3></div>
-                    <div class="wl-col list">
-                        <p class="wl-item">
-                            {{ activity.attendee.name|localize_translatable_string }}
-                        </p>
-                    </div>
-                </div>
-            {% endif %}
-
             {% if activity.sentReceived is not empty and t.sentReceivedVisible %}
                 <div class="wl-row">
                     <div class="wl-col title"><h3>{{ 'Sent received'|trans }}</h3></div>
@@ -154,17 +143,9 @@
     </div>
 
     <div class="item-row separator">
-        <div class="item-col item-meta">
-            {% set notif_counter = chill_count_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) %}
-            {% if notif_counter.total > 0 %}
-                {{ chill_counter_notifications('Chill\\ActivityBundle\\Entity\\Activity', activity.id) }}
-            {% endif %}
-        </div>
-        <div class="item-col">
-            <ul class="record_actions">
-                {{ recordAction }}
-            </ul>
-        </div>
+        <ul class="record_actions">
+            {{ recordAction }}
+        </ul>
     </div>
 
 </div>

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

@@ -8,7 +8,6 @@
         action: 'show', displayBadge: true,
         targetEntity: { name: type, id: entity.id },
         buttonText: entity|chill_entity_render_string,
-        isDead: entity.deathdate is defined and entity.deathdate is not null,
         parent: parent
     } %}
 {% endmacro %}

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

@@ -83,15 +83,15 @@
     {{ form_row(edit_form.comment) }}
 {% endif %}
 
-{%- if edit_form.attendee is defined -%}
-    {{ form_row(edit_form.attendee) }}
-{% endif %}
-
 {%- if edit_form.documents is defined -%}
     {{ form_row(edit_form.documents) }}
 {% endif %}
 
-<div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
+{%- if edit_form.attendee is defined -%}
+    {{ form_row(edit_form.attendee) }}
+{% endif %}
+
+{# TODO .. status #}
 
 {% set person_id = null %}
 {% if entity.person %}

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

@@ -15,7 +15,7 @@
 
 {% block js %}
     {{ parent() }}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
@@ -24,12 +24,10 @@
         window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
-    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
-    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}

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

@@ -30,7 +30,7 @@
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]',
@@ -39,11 +39,9 @@
         window.activity = {{ activity_json|json_encode|raw }};
     </script>
     {{ encore_entry_script_tags('vue_activity') }}
-    {{ encore_entry_script_tags('mod_docgen_picktemplate') }}
 {% endblock %}
 
 {% block css %}
     {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
-    {{ encore_entry_link_tags('mod_docgen_picktemplate') }}
 {% endblock %}

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

@@ -1,61 +1,57 @@
 {% macro recordAction(activity, context = null, person_id = null, accompanying_course_id = null) %}
-    {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
-        {% if no_action is not defined or no_action == false %}
-            <li>
-                <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {
-                    'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity',
-                    'entityId': activity.id
-                }) }}">
-                    <i class="fa fa-paper-plane fa-fw"></i>
-                    {{ 'notification.Notify'|trans }}</a>
-            </li>
-        {% endif %}
-        {% if context == 'person' and activity.accompanyingPeriod is not empty %}
-            {#
-                Disable person_id in following links, for redirect to accompanyingCourse context
-            #}
-            {% set person_id = null %}
-            {% set accompanying_course_id = activity.accompanyingPeriod.id %}
-            <li>
-                <a href="{{ chill_path_add_return_path('chill_activity_activity_list',{
-                        'accompanying_period_id': accompanying_course_id
-                    }) }}"
-                    class="btn btn-primary"
-                    title="{{ 'See activity in accompanying course context'|trans }}">
-                    <i class="fa fa-random fa-fw"></i>
-                    {{ 'Period number %number%'|trans({'%number%': accompanying_course_id}) }}
-                </a>
-            </li>
-        {% endif %}
+    {% if no_action is not defined or no_action == false %}
         <li>
-            <a href="{{ path('chill_activity_activity_show', {'id': activity.id,
-                    'person_id': person_id,
+            <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {
+                'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity',
+                'entityId': activity.id
+            }) }}">{{ 'notification.Notify'|trans }}</a>
+        </li>
+    {% endif %}
+    {% if context == 'person' and activity.accompanyingPeriod is not empty %}
+        {#
+            Disable person_id in following links, for redirect to accompanyingCourse context
+        #}
+        {% set person_id = null %}
+        {% set accompanying_course_id = activity.accompanyingPeriod.id %}
+        <li>
+            <a href="{{ chill_path_add_return_path('chill_activity_activity_list',{
                     'accompanying_period_id': accompanying_course_id
                 }) }}"
-                class="btn btn-show"
-                title="{{ 'Show'|trans }}"></a>
+                class="btn btn-primary"
+                title="{{ 'See activity in accompanying course context'|trans }}">
+                <i class="fa fa-random fa-fw"></i>
+                {{ 'Period number %number%'|trans({'%number%': accompanying_course_id}) }}
+            </a>
         </li>
-        {% if no_action is not defined or no_action == false %}
-            {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
-                <li>
-                    <a href="{{ path('chill_activity_activity_edit', {'id': activity.id,
-                            'person_id': person_id,
-                            'accompanying_period_id': accompanying_course_id
-                        }) }}"
-                        class="btn btn-update"
-                        title="{{ 'Edit'|trans }}"></a>
-                </li>
-            {% endif %}
-            {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
-                <li>
-                    <a href="{{ path('chill_activity_activity_delete', {'id': activity.id,
-                            'person_id': person_id,
-                            'accompanying_period_id': accompanying_course_id
-                        }) }}"
-                        class="btn btn-delete"
-                        title="{{ 'Delete'|trans }}"></a>
-                </li>
-            {% endif %}
+    {% endif %}
+    <li>
+        <a href="{{ path('chill_activity_activity_show', {'id': activity.id,
+                'person_id': person_id,
+                'accompanying_period_id': accompanying_course_id
+            }) }}"
+            class="btn btn-show"
+            title="{{ 'Show'|trans }}"></a>
+    </li>
+    {% if no_action is not defined or no_action == false %}
+        {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
+            <li>
+                <a href="{{ path('chill_activity_activity_edit', {'id': activity.id,
+                        'person_id': person_id,
+                        'accompanying_period_id': accompanying_course_id
+                    }) }}"
+                    class="btn btn-update"
+                    title="{{ 'Edit'|trans }}"></a>
+            </li>
+        {% endif %}
+        {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
+            <li>
+                <a href="{{ path('chill_activity_activity_delete', {'id': activity.id,
+                        'person_id': person_id,
+                        'accompanying_period_id': accompanying_course_id
+                    }) }}"
+                    class="btn btn-delete"
+                    title="{{ 'Delete'|trans }}"></a>
+            </li>
         {% endif %}
     {% endif %}
 {% endmacro %}

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

@@ -48,7 +48,7 @@
                         <li class="associated-persons">
                             <span class="item-key">{{ 'Participants'|trans ~ ' : ' }}</span>
                             {% for p in activity.personsAssociated %}
-                                <span class="badge-person">{{ p|chill_entity_render_box({'addAgeBadge': true}) }}</span>
+                                <span class="badge-person">{{ p|chill_entity_render_box }}</span>
                             {% endfor %}
                         </li>
                     </ul>

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

@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',

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

@@ -25,7 +25,7 @@
                     'activityData': activityData
                 }) }}">
 
-                    <div class="btn btn-primary">
+                    <div class="bloc btn btn-primary btn-lg btn-block">
                         {{ activityType.name|localize_translatable_string }}
                     </div>
                 </a>

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

@@ -86,7 +86,7 @@
 {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
     'context': context,
     'render': 'bloc',
-    'badge_person': true
+    'badge_person': 'true'
 } %}
 
 <h2 class="chill-blue">{{ 'Activity data'|trans }}</h2>
@@ -165,7 +165,11 @@
                 <dt class="inline">{{ 'Attendee'|trans }}</dt>
                 <dd>
                     {% if entity.attendee is not null %}
-                        {{ entity.attendee.name|localize_translatable_string }}
+                        {% if entity.attendee %}
+                            {{ 'present'|trans|capitalize }}
+                        {% else %}
+                            {{ 'not present'|trans|capitalize }}
+                        {% endif %}
                     {% else %}
                         <span class="chill-no-data-statement">{{ 'None'|trans|capitalize }}</span>
                     {% endif %}
@@ -177,13 +181,6 @@
     </div>
 </div>
 
-<div class="notification notification-list">
-    {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
-    {% if notifications is not empty %}
-        {{ notifications|raw }}
-    {% endif %}
-</div>
-
 {% set person_id = null %}
 {% if person %}
     {% set person_id = person.id %}
@@ -200,21 +197,18 @@
             {{ 'Back to the list'|trans }}
         </a>
     </li>
-    <li>
-        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
-            {{ 'notification.Notify'|trans }}
-        </a>
-    </li>
     {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
         <li>
-            <a href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}"
-               class="btn btn-update">{{ 'Edit'|trans }}</a>
-        </li>
+            <a class="btn btn-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person_id, 'accompanying_period_id': accompanying_course_id }) }}">
+            {{ 'Edit'|trans }}
+        </a>
+    </li>
     {% endif %}
     {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
     <li>
-        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}"
-           class="btn btn-delete" title="{{ 'Delete'|trans }}"></a>
+        <a href="{{ path('chill_activity_activity_delete', { 'id': entity.id, 'person_id' : person_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete">
+            {{ 'Delete'|trans }}
+        </a>
     </li>
     {% endif %}
 </ul>

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

@@ -7,13 +7,11 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
-    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
@@ -25,5 +23,19 @@
 {% endblock content %}
 
 {% block block_post_menu %}
-<div class="post-menu pt-4"></div>
+    <div class="post-menu pt-4">
+
+        <div class="d-grid gap-2">
+            <a class="btn btn-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
+                <i class="fa fa-paper-plane fa-fw"></i>
+                {{ 'notification.Notify'|trans }}
+            </a>
+        </div>
+
+        {% set notifications =  chill_list_notifications('Chill\\ActivityBundle\\Entity\\Activity', entity.id) %}
+        {% if notifications is not empty %}
+            {{ notifications|raw }}
+        {% endif %}
+
+    </div>
 {% endblock %}

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

@@ -7,13 +7,11 @@
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_notification_toggle_read_status') }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_notification_toggle_read_status') }}
-    {{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}
 
 {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
@@ -28,7 +26,8 @@
     <div class="post-menu pt-4">
 
         <div class="d-grid gap-2">
-            <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
+            <a class="btn btn-primary" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
+                <i class="fa fa-paper-plane fa-fw"></i>
                 {{ 'notification.Notify'|trans }}
             </a>
         </div>

src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php

@@ -1,220 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\ActivityBundle\Service\DocGenerator;
-
-use Chill\ActivityBundle\Entity\Activity;
-use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
-use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithPublicFormInterface;
-use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
-use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
-use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
-use Chill\DocStoreBundle\Entity\Document;
-use Chill\DocStoreBundle\Entity\StoredObject;
-use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\PersonBundle\Entity\AccompanyingPeriod;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Templating\Entity\PersonRender;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class ActivityContext implements
-    DocGeneratorContextWithAdminFormInterface,
-    DocGeneratorContextWithPublicFormInterface
-{
-    private BaseContextData $baseContextData;
-
-    private DocumentCategoryRepository $documentCategoryRepository;
-
-    private EntityManagerInterface $em;
-
-    private NormalizerInterface $normalizer;
-
-    private PersonRender $personRender;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    private TranslatorInterface $translator;
-
-    public function __construct(
-        DocumentCategoryRepository $documentCategoryRepository,
-        NormalizerInterface $normalizer,
-        TranslatableStringHelperInterface $translatableStringHelper,
-        EntityManagerInterface $em,
-        PersonRender $personRender,
-        TranslatorInterface $translator,
-        BaseContextData $baseContextData
-    ) {
-        $this->documentCategoryRepository = $documentCategoryRepository;
-        $this->normalizer = $normalizer;
-        $this->translatableStringHelper = $translatableStringHelper;
-        $this->em = $em;
-        $this->personRender = $personRender;
-        $this->translator = $translator;
-        $this->baseContextData = $baseContextData;
-    }
-
-    public function adminFormReverseTransform(array $data): array
-    {
-        return $data;
-    }
-
-    public function adminFormTransform(array $data): array
-    {
-        return [
-            'mainPerson' => $data['mainPerson'] ?? false,
-            'mainPersonLabel' => $data['mainPersonLabel'] ?? $this->translator->trans('docgen.Main person'),
-            'person1' => $data['person1'] ?? false,
-            'person1Label' => $data['person1Label'] ?? $this->translator->trans('docgen.person 1'),
-            'person2' => $data['person2'] ?? false,
-            'person2Label' => $data['person2Label'] ?? $this->translator->trans('docgen.person 2'),
-        ];
-    }
-
-    public function buildAdminForm(FormBuilderInterface $builder): void
-    {
-        $builder
-            ->add('mainPerson', CheckboxType::class, [
-                'required' => false,
-                'label' => 'docgen.Ask for main person',
-            ])
-            ->add('mainPersonLabel', TextType::class, [
-                'label' => 'main person label',
-                'required' => true,
-            ])
-            ->add('person1', CheckboxType::class, [
-                'required' => false,
-                'label' => 'docgen.Ask for person 1',
-            ])
-            ->add('person1Label', TextType::class, [
-                'label' => 'person 1 label',
-                'required' => true,
-            ])
-            ->add('person2', CheckboxType::class, [
-                'required' => false,
-                'label' => 'docgen.Ask for person 2',
-            ])
-            ->add('person2Label', TextType::class, [
-                'label' => 'person 2 label',
-                'required' => true,
-            ]);
-    }
-
-    /**
-     * @param Activity $entity
-     */
-    public function buildPublicForm(FormBuilderInterface $builder, DocGeneratorTemplate $template, $entity): void
-    {
-        $options = $template->getOptions();
-        $persons = $entity->getPersons();
-
-        foreach (['mainPerson', 'person1', 'person2'] as $key) {
-            if ($options[$key] ?? false) {
-                $builder->add($key, EntityType::class, [
-                    'class' => Person::class,
-                    'choices' => $persons,
-                    'choice_label' => function (Person $p) {
-                        return $this->personRender->renderString($p, []);
-                    },
-                    'multiple' => false,
-                    'expanded' => true,
-                    'label' => $options[$key . 'Label'],
-                ]);
-            }
-        }
-    }
-
-    public function getData(DocGeneratorTemplate $template, $entity, array $contextGenerationData = []): array
-    {
-        if (!$entity instanceof Activity) {
-            throw new UnexpectedTypeException($entity, Activity::class);
-        }
-        $options = $template->getOptions();
-
-        $data = [];
-        $data = array_merge($data, $this->baseContextData->getData());
-        $data['activity'] = $this->normalizer->normalize($entity, 'docgen', ['docgen:expects' => Activity::class, 'groups' => 'docgen:read']);
-
-        $data['course'] = $this->normalizer->normalize($entity->getAccompanyingPeriod(), 'docgen', ['docgen:expects' => AccompanyingPeriod::class, 'groups' => 'docgen:read']);
-        $data['person'] = $this->normalizer->normalize($entity->getPerson(), 'docgen', ['docgen:expects' => Person::class, 'groups' => 'docgen:read']);
-
-        foreach (['mainPerson', 'person1', 'person2'] as $k) {
-            if ($options[$k]) {
-                $data[$k] = $this->normalizer->normalize($contextGenerationData[$k], 'docgen', [
-                    'docgen:expects' => Person::class,
-                    'groups' => 'docgen:read',
-                    'docgen:person:with-household' => true,
-                    'docgen:person:with-relations' => true,
-                ]);
-            }
-        }
-
-        return $data;
-    }
-
-    public function getDescription(): string
-    {
-        return 'docgen.A basic context for activity';
-    }
-
-    public function getEntityClass(): string
-    {
-        return Activity::class;
-    }
-
-    public function getFormData(DocGeneratorTemplate $template, $entity): array
-    {
-        return [
-            'activity' => $entity,
-        ];
-    }
-
-    public static function getKey(): string
-    {
-        return self::class;
-    }
-
-    public function getName(): string
-    {
-        return 'docgen.Activity basic';
-    }
-
-    public function hasAdminForm(): bool
-    {
-        return true;
-    }
-
-    public function hasPublicForm(DocGeneratorTemplate $template, $entity): bool
-    {
-        $options = $template->getOptions();
-
-        return $options['mainPerson'] || $options['person1'] || $options['person2'];
-    }
-
-    /**
-     * @param Activity $entity
-     */
-    public function storeGenerated(DocGeneratorTemplate $template, StoredObject $storedObject, object $entity, array $contextGenerationData): void
-    {
-        $doc = new StoredObject();
-        // TODO push document to remote
-
-        $this->em->persist($doc);
-
-        $entity->addDocument($doc);
-    }
-}

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Tests\Export\Aggregator;
+namespace Chill\ActivityBundle\Tests\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Tests\Export\Aggregator;
+namespace Chill\ActivityBundle\Tests\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Tests\Export\Aggregator;
+namespace Chill\ActivityBundle\Tests\Aggregator;
 
 use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
 

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Tests\Export\Filter;
+namespace Chill\ActivityBundle\Tests\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\Common\Collections\ArrayCollection;

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

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\ActivityBundle\Tests\Export\Filter;
+namespace Chill\ActivityBundle\Tests\Filter;
 
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use DateTime;

src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php

@@ -29,13 +29,9 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 final class ActivityVoterTest extends KernelTestCase
 {
     use PrepareActivityTrait;
-
     use PrepareCenterTrait;
-
     use PreparePersonTrait;
-
     use PrepareScopeTrait;
-
     use PrepareUserTrait;
 
     /**

src/Bundle/ChillActivityBundle/config/services.yaml

@@ -32,8 +32,3 @@ services:
         autowire: true
         autoconfigure: true
         resource: '../Validator/Constraints/'
-
-    Chill\ActivityBundle\Service\DocGenerator\:
-        autowire: true
-        autoconfigure: true
-        resource: '../Service/DocGenerator/'

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

@@ -76,7 +76,7 @@ activity:
     Insert a document: Insérer un document
     Remove a document: Supprimer le document
     comment: Commentaire
-No documents: Pas de documents
+
 
 #timeline
 '%user% has done an %activity_type%': '%user% a effectué une activité de type "%activity_type%"'
@@ -228,7 +228,3 @@ See activity in accompanying course context: Voir l'activité dans le contexte d
 You get notified of an activity which does not exists any more: Cette notification ne correspond pas à une activité valide.
 you are not allowed to see it details: La notification fait référence à une activité à laquelle vous n'avez pas accès.
 This is the minimal activity data: Activité n°
-
-docgen:
-    Activity basic: Echange
-    A basic context for activity: Contexte pour les échanges

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

@@ -20,4 +20,3 @@ For this type of activity, you must add at least one social action: Pour ce type
 
 # admin
 This parameter must be equal to social issue parameter: Ce paramètre doit être égal au paramètre "Visibilité du champs Problématiques sociales"
-The socialActionsVisible value is not compatible with the socialIssuesVisible value: Cette valeur du paramètre "Visibilité du champs Actions sociales" n'est pas compatible avec la valeur du paramètre "Visibilité du champs Problématiques sociales"

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

@@ -32,8 +32,6 @@ final class AsideActivityController extends CRUDController
     {
         $asideActivity = new AsideActivity();
 
-        $asideActivity->setAgent($this->getUser());
-
         $duration = $request->query->get('duration', '300');
         $duration = DateTime::createFromFormat('U', $duration);
         $asideActivity->setDuration($duration);

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

@@ -14,9 +14,9 @@ namespace Chill\AsideActivityBundle\Form;
 use Chill\AsideActivityBundle\Entity\AsideActivity;
 use Chill\AsideActivityBundle\Entity\AsideActivityCategory;
 use Chill\AsideActivityBundle\Templating\Entity\CategoryRender;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use DateInterval;
 use DateTime;
 use DateTimeImmutable;
@@ -68,10 +68,22 @@ final class AsideActivityFormType extends AbstractType
         ];
 
         $builder
-            ->add('agent', PickUserDynamicType::class, [
-                'label' => 'For agent',
-                'required' => true,
-            ])
+            ->add(
+                'agent',
+                EntityType::class,
+                [
+                    'label' => 'For agent',
+                    'required' => true,
+                    'class' => User::class,
+                    'data' => $this->storage->getToken()->getUser(),
+                    'query_builder' => static function (EntityRepository $er) {
+                        return $er->createQueryBuilder('u')->where('u.enabled = true');
+                    },
+                    'attr' => ['class' => 'select2 '],
+                    'placeholder' => 'Choose the agent for whom this activity is created',
+                    'choice_label' => 'username',
+                ]
+            )
             ->add(
                 'date',
                 ChillDateType::class,

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

@@ -1,15 +1,5 @@
 {% extends '@ChillMain/Admin/layout.html.twig' %}
 
-{% block js %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('mod_pickentity_type') }}
-{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('mod_pickentity_type') }}
-{% endblock %}
-
 {% block title %}
 {% include('@ChillMain/CRUD/_new_title.html.twig') %}
 {% endblock %}
@@ -18,5 +8,4 @@
 {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
     {% block content_form_actions_save_and_show %}{% endblock %}
 {% endembed %}
-{% endblock %}
-
+{% endblock %}

src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\CustomFieldsBundle\Tests\CustomFields;
+namespace Chill\CustomFieldsBundle\Tests;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldChoice;
 use Chill\CustomFieldsBundle\Entity\CustomField;

src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsNumberTest.php

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\CustomFieldsBundle\Tests\CustomFields;
+namespace Chill\CustomFieldsBundle\Tests;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldNumber;
 use Chill\CustomFieldsBundle\Entity\CustomField;

src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsTextTest.php

@@ -9,11 +9,10 @@
 
 declare(strict_types=1);
 
-namespace Chill\CustomFieldsBundle\Tests\CustomFields;
+namespace Chill\CustomFieldsBundle\Tests;
 
 use Chill\CustomFieldsBundle\CustomFields\CustomFieldText;
 use Chill\CustomFieldsBundle\Entity\CustomField;
-use Chill\CustomFieldsBundle\Tests\CustomFieldTestHelper;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 /**

src/Bundle/ChillCustomFieldsBundle/Tests/Routing/RoutingLoaderTest.php

@@ -9,7 +9,7 @@
 
 declare(strict_types=1);
 
-namespace Chill\CustomFieldsBundle\Tests\Routing;
+namespace Chill\CustomFieldsBundle\Tests;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;

src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue

@@ -17,7 +17,7 @@
                             <select class="form-select" v-model="template">
                                 <option disabled selected value="">{{ $t('choose_a_template') }}</option>
                                 <template v-for="t in templates">
-                                    <option v-bind:value="t.id">{{ t.name.fr || 'Aucun nom défini' }}</option>
+                                    <option  v-bind:value="t.id">{{ t.name.fr }}</option>
                                 </template>
                             </select>
                             <button v-if="canGenerate" class="btn btn-update btn-sm change-icon" type="button" @click="generateDocument"><i class="fa fa-fw fa-cog"></i></button>
@@ -48,7 +48,6 @@ export default {
             required: true,
         },
         templates: {
-            type: Array,
             required: true,
         },
         // beforeMove execute "something" before
@@ -74,11 +73,7 @@ export default {
             return true;
         },
         getDescription() {
-            let desc = this.templates.find(t => t.id === this.template);
-            if (null === desc) {
-                return '';
-            }
-            return desc.description || '';
+            return this.templates.find(t => t.id === this.template).description || '';
         },
     },
     methods: {

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.html.twig

@@ -1,61 +0,0 @@
-{% import "@ChillDocStore/Macro/macro.html.twig" as m %}
-
-<div class="flex-table accompanying_course_work-list">
-    <div class="item-bloc document-item bg-chill-llight-gray">
-        <div class="row justify-content-center my-4">
-            <div class="col-2">
-                <i class="fa fa-4x fa-file-text-o text-success"></i>
-            </div>
-            <div class="col-8">
-                <h3>{{ document.title }}</h3>
-                <small>{{ document.object.type }}</small>
-            
-                {% if document.description is not empty %}
-                    <blockquote class="chill-user-quote mt-2">
-                        {{ document.description }}
-                    </blockquote>
-                {% endif %}
-        
-            </div>
-        </div>
-    </div>
-</div>
-
-{% set freezed = false %}
-{% for step in entity_workflow.stepsChained %}
-    {% if loop.last %}
-        {% if step.previous is not null and step.previous.freezeAfter == true %}
-            {% set freezed = true %}
-        {% endif %}
-    {% endif %}
-{% endfor %}
-
-{% if display_action is defined and display_action == true %}
-    <ul class="record_actions">
-        <li>
-            {{ m.download_button(document.object, document.title) }}
-        </li>
-        <li>
-        {% if not freezed %}
-            {% set button = {
-                'changeIcon': 'fa-unlock',
-            } %}{#
-                'changeClass'   string
-                'noText'        boolean
-            #}
-            {# vue component #}
-            <span
-                data-module="wopi-link"
-                data-wopi-url="{{ path('chill_wopi_file_edit', {'fileId': document.object.uuid}) }}"
-                data-doc-title="{{ document.title|e('html_attr') }}"
-                data-doc-type="{{ document.object.type|e('html_attr') }}"
-                data-button="{{ button|json_encode }}"
-            ></span>
-        {% else %}
-            <a class="btn btn-update change-icon disabled" href="#" title="{{ 'workflow.freezed document'|trans }}">
-                <i class="fa fa-lock me-2"></i>{{ 'Update document'|trans }}
-            </a>
-        {% endif %}
-        </li>
-    </ul>
-{% endif %}

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/_workflow.title.html.twig

@@ -1,19 +0,0 @@
-{% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as m %}
-
-<div class="flex-grow-1 {% if add_classes is defined %}{{ add_classes }}{% else %}h2{% endif %}">
-    <div>
-        {% if concerne is defined and concerne == true %}
-            <span class="item-key">{{ 'Concerne'|trans }}: </span>
-        {% endif %}
-    
-        {{ 'workflow.Document (n°%doc%)'|trans({'%doc%': document.id}) }}
-    
-        {% if description is defined and description == true %}
-            {{ ' — ' ~ document.title }}
-        {% endif %}
-    </div>
-    
-    {% if breadcrumb is defined and breadcrumb == true %}
-        {{ m.breadcrumb(_context) }}
-    {% endif %}
-</div>

src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/show.html.twig

@@ -6,72 +6,61 @@
 
 {% block title %}
 	{# {{ 'Detail of document of %name%'|trans({ '%name%': accompanyingCourse|chill_entity_render_string } ) }} #}
-    {{ 'Document %title%' | trans({ '%title%': document.title }) }}
+{% endblock %}
+
+
+{% block js %}
+	{{ parent() }}
+	{{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
     {{ encore_entry_link_tags('mod_async_upload') }}
-    {{ encore_entry_link_tags('mod_entity_workflow_pick') }}
 {% endblock %}
 
 {% block content %}
-<div class="document-show">
-    <h1>{{ block('title') }}</h1>
-    
-    <dl class="chill_view_data">
-        <dt>{{ 'Title'|trans }}</dt>
-        <dd>{{ document.title }}</dd>
-        
+
+	<h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
+
+	<dl class="chill_view_data">
+		<dt>{{ 'Title'|trans }}</dt>
+		<dd>{{ document.title }}</dd>
+
         {% if document.category is not null %}
             <dt>{{ 'Category'|trans }}</dt>
             <dd>{{ document.category.name|localize_translatable_string }}</dd>
         {% endif %}
-        
-        <dt>{{ 'Description' | trans }}</dt>
-        <dd>
-            {% if document.description is empty %}
-                <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
-            {% else %}
-                <blockquote class="chill-user-quote">
-                    {{ document.description|chill_markdown_to_html }}
-                </blockquote>
-            {% endif %}
-        </dd>
-    </dl>
-    
-    <ul class="record_actions sticky-form-buttons">
-        <li class="cancel">
-            <a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
-                {{ 'Back to the list' | trans }}
-            </a>
-        </li>
-        <li>
-            {{ m.download_button(document.object, document.title) }}
-        </li>
-        {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-            <li>
-                <a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}" class="btn btn-edit">
-                    {{ 'Edit' | trans }}
-                </a>
-            </li>
-        {% endif %}
-        {% set workflows_frame = chill_entity_workflow_list('Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument', document.id) %}
-        {% if workflows_frame is not empty %}
-            <li>
-                {{ workflows_frame|raw }}
-            </li>
-        {% endif %}
-    </ul>
-</div>
-{% endblock %}
- 
-{% block block_post_menu %}
-    <div class="post-menu pt-4"></div>
-{% endblock %}
 
-{% block js %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('mod_async_upload') }}
-    {{ encore_entry_script_tags('mod_entity_workflow_pick') }}
-{% endblock %}
+		<dt>{{ 'Description' | trans }}</dt>
+		<dd>
+			{% if document.description is empty %}
+				<span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
+			{% else %}
+				<blockquote class="chill-user-quote">
+					{{ document.description|chill_markdown_to_html }}
+				</blockquote>
+			{% endif %}
+		</dd>
+
+	</dl>
+
+	<ul class="record_actions">
+		<li class="cancel">
+			<a href="{{ path('accompanying_course_document_index', {'course': accompanyingCourse.id}) }}" class="btn btn-cancel">
+				{{ 'Back to the list' | trans }}
+			</a>
+		</li>
+
+		<li>
+			{{ m.download_button(document.object, document.title) }}
+		</li>
+
+		{% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+			<li>
+				<a href="{{ path('accompanying_course_document_edit', {'id': document.id, 'course': accompanyingCourse.id}) }}" class="btn btn-edit">
+					{{ 'Edit' | trans }}
+				</a>
+			</li>
+		{% endif %}
+	{% endblock %}

src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php

@@ -1,74 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\DocStoreBundle\Workflow;
-
-use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
-use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\EntityRepository;
-
-class AccompanyingCourseDocumentWorkflowHandler implements EntityWorkflowHandlerInterface
-{
-    private EntityRepository $repository;
-
-    /**
-     * TODO: injecter le repository directement.
-     */
-    public function __construct(EntityManagerInterface $em)
-    {
-        $this->repository = $em->getRepository(AccompanyingCourseDocument::class);
-    }
-
-    public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingCourseDocument
-    {
-        return $this->repository->find($entityWorkflow->getRelatedEntityId());
-    }
-
-    public function getRoleShow(EntityWorkflow $entityWorkflow): ?string
-    {
-        return null;
-    }
-
-    public function getTemplate(EntityWorkflow $entityWorkflow, array $options = []): string
-    {
-        return '@ChillDocStore/AccompanyingCourseDocument/_workflow.html.twig';
-    }
-
-    public function getTemplateData(EntityWorkflow $entityWorkflow, array $options = []): array
-    {
-        return [
-            'entity_workflow' => $entityWorkflow,
-            'document' => $this->getRelatedEntity($entityWorkflow),
-        ];
-    }
-
-    public function getTemplateTitle(EntityWorkflow $entityWorkflow, array $options = []): string
-    {
-        return '@ChillDocStore/AccompanyingCourseDocument/_workflow.title.html.twig';
-    }
-
-    public function getTemplateTitleData(EntityWorkflow $entityWorkflow, array $options = []): array
-    {
-        return $this->getTemplateData($entityWorkflow, $options);
-    }
-
-    public function supports(EntityWorkflow $entityWorkflow, array $options = []): bool
-    {
-        return $entityWorkflow->getRelatedEntityClass() === AccompanyingCourseDocument::class;
-    }
-
-    public function supportsFreeze(EntityWorkflow $entityWorkflow, array $options = []): bool
-    {
-        return true;
-    }
-}

src/Bundle/ChillDocStoreBundle/config/services.yaml

@@ -27,8 +27,3 @@ services:
     autoconfigure: true
     tags:
       - { name: chill.role }
-
-  Chill\DocStoreBundle\Workflow\:
-      resource: './../Workflow/'
-      autoconfigure: true
-      autowire: true

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

@@ -9,7 +9,6 @@ Create new document: Créer un nouveau document
 New document for %name%: Nouveau document pour %name%
 Editing document for %name%: Modification d'un document pour %name%
 Edit Document: Modification d'un document
-Update document: Modifier le document
 Existing document: Document existant
 No document to download: Aucun document à télécharger
 'Choose a document category': Choisissez une catégorie de document

src/Bundle/ChillFormTypesBundle/.editorconfig

@@ -1,19 +0,0 @@
-; top-most EditorConfig file
-root = true
-
-; Unix-style newlines
-[*]
-charset = utf-8
-end_of_line = LF
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{php,html,twig}]
-indent_style = space
-indent_size = 4
-
-[*.md]
-max_line_length = 80
-
-[COMMIT_EDITMSG]
-max_line_length = 0

src/Bundle/ChillFormTypesBundle/.gitignore

@@ -1,11 +0,0 @@
-composer.lock
-vendor/*
-parameters.yml
-*~
-*.DS_Store
-*.sass-cache
-Resources/node_modules/
-Tests/Fixtures/App/app/config/parameters.yml
-/nbproject/private/
-Resources/test/Fixtures/App/bootstrap.php.cache
-

src/Bundle/ChillFormTypesBundle/LICENSE

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

src/Bundle/ChillFormTypesBundle/README.md

@@ -1,9 +0,0 @@
-ChillPersonBundle
-=================
-
-The chill bundle for dealing with persons
-
-Documentation & installation
-----------------------------
-
-Read documentation here : http://chill.readthedocs.org

src/Bundle/ChillFormTypesBundle/composer.json

@@ -1,39 +0,0 @@
-{
-    "name": "chill-project/form-types-bundle",
-    "type": "symfony-bundle",
-    "description": "TODO",
-    "keywords": [
-        "chill",
-        "social work",
-        "form"
-    ],
-    "homepage": "http://www.champs-libres.coop",
-    "license": "AGPL-3.0",
-    "authors": [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop",
-            "homepage": "http://www.champs-libres.coop"
-        }
-    ],
-    "require": {
-        "php": ">= 7.4",
-        "ext-intl": "*",
-        "odolbeau/phone-number-bundle": "^3.4",
-        "symfony/http-client": "^4.4 || ^5"
-    },
-    "require-dev": {
-        "doctrine/orm": "^2.9",
-        "drupol/php-conventions": "^5.0",
-        "phpspec/phpspec": "^7.0",
-        "phpunit/phpunit": "^9.5",
-        "psr/log": "^1.1",
-        "symfony/form": "^5.2",
-        "symfony/validator": "^5.2"
-    },
-    "autoload": {
-        "psr-4": {
-            "Chill\\FormTypesBundle\\": "src/"
-        }
-    }
-}

src/Bundle/ChillFormTypesBundle/grumphp.yml

@@ -1,9 +0,0 @@
-imports:
-  - { resource: vendor/drupol/php-conventions/config/php73/grumphp.yml }
-
-parameters:
-  tasks.license.holder: Champs-Libres
-  tasks.license.date_from: 2021
-  tasks.license.name: AGPL-3.0
-  extra_tasks:
-    phpunit: ~

src/Bundle/ChillFormTypesBundle/phpunit.xml.dist

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory>src</directory>
-    </include>
-  </coverage>
-  <testsuites>
-    <testsuite name="Chill Form Types Test">
-      <directory>src/Tests</directory>
-    </testsuite>
-  </testsuites>
-</phpunit>

src/Bundle/ChillFormTypesBundle/psalm.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="3"
-    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"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-</psalm>

src/Bundle/ChillFormTypesBundle/spec/Chill/FormTypesBundle/PhoneNumberHelperSpec.php

@@ -1,21 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace spec\Chill\FormTypesBundle;
-
-use Chill\FormTypesBundle\PhoneNumberHelper;
-use PhpSpec\ObjectBehavior;
-
-class PhoneNumberHelperSpec extends ObjectBehavior
-{
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(PhoneNumberHelper::class);
-    }
-}

src/Bundle/ChillFormTypesBundle/spec/Chill/FormTypesBundle/TwilioHttpClientSpec.php

@@ -1,21 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace spec\Chill\FormTypesBundle;
-
-use Chill\FormTypesBundle\TwilioHttpClient;
-use PhpSpec\ObjectBehavior;
-
-class TwilioHttpClientSpec extends ObjectBehavior
-{
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(TwilioHttpClient::class);
-    }
-}

src/Bundle/ChillFormTypesBundle/spec/Chill/FormTypesBundle/Validation/Validator/PhoneNumberValidatorSpec.php

@@ -1,21 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace spec\Chill\FormTypesBundle\Validation\Validator;
-
-use Chill\FormTypesBundle\Validation\Validator\PhoneNumberValidator;
-use PhpSpec\ObjectBehavior;
-
-class PhoneNumberValidatorSpec extends ObjectBehavior
-{
-    public function it_is_initializable()
-    {
-        $this->shouldHaveType(PhoneNumberValidator::class);
-    }
-}

src/Bundle/ChillFormTypesBundle/src/ChillFormTypesBundle.php

@@ -1,16 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\FormTypesBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-final class ChillFormTypesBundle extends Bundle
-{
-}

src/Bundle/ChillFormTypesBundle/src/DependencyInjection/ChillFormTypesExtension.php

@@ -1,64 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\FormTypesBundle\DependencyInjection;
-
-use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-
-final class ChillFormTypesExtension extends Extension implements PrependExtensionInterface
-{
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
-        $loader = new PhpFileLoader($container, new FileLocator(__DIR__ . '/../Resources'));
-        $loader->load('services.php');
-    }
-
-    public function prepend(ContainerBuilder $container)
-    {
-        $configs = $container->getExtensionConfig($this->getAlias());
-        $resolvingBag = $container->getParameterBag();
-        $configs = $resolvingBag->resolveValue($configs);
-        $config = $this->processConfiguration(new Configuration(), $configs);
-
-        $container
-            ->prependExtensionConfig(
-                'framework',
-                [
-                    'http_client' => [
-                        'scoped_clients' => [
-                            'twilio_api' => [
-                                'scope' => 'https://(lookups|api)\.twilio\.com',
-                                'auth_basic' => $config['twilio']['sid'] . ':' . $config['twilio']['secret'],
-                            ],
-                        ],
-                    ],
-                ]
-            );
-
-        $container
-            ->prependExtensionConfig(
-                'doctrine',
-                [
-                    'dbal' => [
-                        'types' => [
-                            'phone_number' => PhoneNumberType::class,
-                        ],
-                    ],
-                ]
-            );
-    }
-}

src/Bundle/ChillFormTypesBundle/src/DependencyInjection/Configuration.php

@@ -1,44 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\FormTypesBundle\DependencyInjection;
-
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-
-final class Configuration implements ConfigurationInterface
-{
-    public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder('chill_form_types');
-
-        if (method_exists($treeBuilder, 'getRootNode')) {
-            $rootNode = $treeBuilder->getRootNode();
-        } else {
-            // BC layer for symfony/config 4.1 and older
-            $rootNode = $treeBuilder->root('chill_form_types');
-        }
-
-        $rootNode
-            ->children()
-            ->arrayNode('twilio')
-            ->addDefaultsIfNotSet()
-            ->children()
-            ->scalarNode('sid')
-            ->defaultValue('%env(resolve:TWILIO_SID)%')
-            ->end()
-            ->scalarNode('secret')
-            ->defaultValue('%env(resolve:TWILIO_SECRET)%')
-            ->end()
-            ->end()
-            ->end();
-
-        return $treeBuilder;
-    }
-}

src/Bundle/ChillFormTypesBundle/src/Form/DataTransformer/PhoneNumberTypeTransformer.php

@@ -1,25 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\FormTypesBundle\Form\DataTransformer;
-
-use Symfony\Component\Form\DataTransformerInterface;
-
-final class PhoneNumberTypeTransformer implements DataTransformerInterface
-{
-    public function reverseTransform($phoneNumber): string
-    {
-        return preg_replace('/[^0-9+]/', '', $phoneNumber);
-    }
-
-    public function transform($phoneNumber)
-    {
-        return $phoneNumber;
-    }
-}

src/Bundle/ChillFormTypesBundle/src/Form/Types/PhoneNumberType.php

@@ -1,37 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\FormTypesBundle\Form\Types;
-
-use Chill\FormTypesBundle\Form\DataTransformer\PhoneNumberTypeTransformer;
-use Misd\PhoneNumberBundle\Form\Type\PhoneNumberType as MisdPhoneNumberType;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-final class PhoneNumberType extends AbstractType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $phoneNumberTypeTransformer = new PhoneNumberTypeTransformer();
-
-        $builder->addViewTransformer(
-            $phoneNumberTypeTransformer
-        );
-    }
-
-    public function getBlockPrefix(): string
-    {
-        return 'chill_formtypes_bundle';
-    }
-
-    public function getParent(): string
-    {
-        return MisdPhoneNumberType::class;
-    }
-}

src/Bundle/ChillFormTypesBundle/src/Resources/services.php

@@ -1,41 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
-
-use Chill\FormTypesBundle\Service\PhoneNumberHelper;
-use Chill\FormTypesBundle\Service\TwilioHttpClient;
-use Symfony\Component\HttpKernel\HttpCache\Store;
-
-return static function (ContainerConfigurator $container) {
-    $services = $container
-        ->services()
-        ->defaults()
-        ->autowire()
-        ->autoconfigure();
-
-    $services
-        ->load('Chill\\FormTypesBundle\\', '../*')
-        ->exclude('../src/{DependencyInjection,Entity,Resources,Tests,Kernel.php}');
-
-    // This can be replaced by http_cache.store in Symfony 5.
-    $services
-        ->set('twilio.http_cache.store', Store::class)
-        ->args([
-            param('kernel.cache_dir') . '/http_cache',
-        ]);
-
-    $services
-        ->set(TwilioHttpClient::class)
-        ->arg('$store', service('twilio.http_cache.store'));
-
-    $services
-        ->set(PhoneNumberHelper::class)
-        ->arg('$client', service(TwilioHttpClient::class));
-};

src/Bundle/ChillFormTypesBundle/src/Service/PhoneNumberHelper.php

@@ -1,193 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\FormTypesBundle\Service;
-
-use libphonenumber\PhoneNumber;
-use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumberUtil;
-use Psr\Log\LoggerInterface;
-use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
-
-use function in_array;
-
-final class PhoneNumberHelper implements PhoneNumberHelperInterface
-{
-    private const FORMAT_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s';
-
-    private const LOOKUP_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s';
-
-    private HttpClientInterface $client;
-
-    private LoggerInterface $logger;
-
-    private PhoneNumberUtil $phoneNumberUtil;
-
-    public function __construct(
-        HttpClientInterface $client,
-        LoggerInterface $logger,
-        PhoneNumberUtil $phoneNumberUtil
-    ) {
-        $this->logger = $logger;
-        $this->client = $client;
-        $this->phoneNumberUtil = $phoneNumberUtil;
-    }
-
-    public function format(string $phonenumber): string
-    {
-        return $this->performTwilioFormat($phonenumber);
-    }
-
-    public function getType(string $phonenumber): string
-    {
-        return $this->performTwilioLookup($phonenumber) ?? 'unknown';
-    }
-
-    public function isTwilioEnabled(): bool
-    {
-        try {
-            $response = $this
-                ->client
-                ->request(
-                    'GET',
-                    'https://api.twilio.com/2010-04-01/Accounts.json'
-                );
-        } catch (TransportExceptionInterface $e) {
-            return false;
-        }
-
-        if (200 !== $response->getStatusCode()) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function isValidPhonenumberAny(PhoneNumber $phonenumber): bool
-    {
-        $phone = $this->phoneNumberUtil->format($phonenumber, PhoneNumberFormat::INTERNATIONAL);
-
-        $validation = $this->performTwilioLookup($phone);
-
-        return in_array($validation, ['landline', 'voip', 'mobile'], true);
-    }
-
-    public function isValidPhonenumberLandOrVoip(PhoneNumber $phonenumber): bool
-    {
-        $phone = $this->phoneNumberUtil->format($phonenumber, PhoneNumberFormat::INTERNATIONAL);
-
-        $validation = $this->performTwilioLookup($phone);
-
-        return in_array($validation, ['landline', 'voip'], true);
-    }
-
-    public function isValidPhonenumberMobile(PhoneNumber $phonenumber): bool
-    {
-        $phone = $this->phoneNumberUtil->format($phonenumber, PhoneNumberFormat::INTERNATIONAL);
-
-        $validation = $this->performTwilioLookup($phone);
-
-        return 'mobile' === $validation;
-    }
-
-    private function performTwilioFormat(string $phonenumber): string
-    {
-        // filter only number
-        $filtered = preg_replace('/[^0-9]/', '', $phonenumber);
-
-        try {
-            $response = $this
-                ->client
-                ->request(
-                    'GET',
-                    sprintf(self::FORMAT_URI, '+' . $filtered),
-                );
-        } catch (TransportExceptionInterface $e) {
-            $this
-                ->logger
-                ->error(
-                    'Could not format number due to server error',
-                    [
-                        'message' => $e->getMessage(),
-                        'status_code' => $e->getCode(),
-                        'phonenumber' => $phonenumber,
-                    ]
-                );
-
-            return $phonenumber;
-        }
-
-        if (200 !== $response->getStatusCode()) {
-            $this
-                ->logger
-                ->error(
-                    'Could not format number due to client error',
-                    [
-                        'message' => $response->getContent(false),
-                        'status_code' => $response->getStatusCode(),
-                        'phonenumber' => $phonenumber,
-                    ]
-                );
-
-            return $phonenumber;
-        }
-
-        return $response->toArray()['national_format'];
-    }
-
-    private function performTwilioLookup(string $phonenumber): ?string
-    {
-        $filtered = preg_replace('/[^0-9]/', '', $phonenumber);
-
-        try {
-            $response = $this
-                ->client
-                ->request(
-                    'GET',
-                    sprintf(self::LOOKUP_URI, '+' . $filtered),
-                    [
-                        'query' => [
-                            'Type' => 'carrier',
-                        ],
-                    ]
-                );
-        } catch (TransportExceptionInterface $e) {
-            $this
-                ->logger
-                ->error(
-                    'Could not lookup number due to server error',
-                    [
-                        'message' => $e->getMessage(),
-                        'status_code' => $e->getCode(),
-                        'phonenumber' => $phonenumber,
-                    ]
-                );
-
-            return $phonenumber;
-        }
-
-        if (200 !== $response->getStatusCode()) {
-            $this
-                ->logger
-                ->error(
-                    'Could not lookup number due to client error',
-                    [
-                        'message' => $response->getContent(false),
-                        'status_code' => $response->getStatusCode(),
-                        'phonenumber' => $phonenumber,
-                    ]
-                );
-
-            return $phonenumber;
-        }
-
-        return $response->toArray()['carrier']['type'];
-    }
-}

src/Bundle/ChillFormTypesBundle/src/Service/PhoneNumberHelperInterface.php

@@ -1,42 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\FormTypesBundle\Service;
-
-use libphonenumber\PhoneNumber;
-
-interface PhoneNumberHelperInterface
-{
-    public function format(string $phonenumber): string;
-
-    /**
-     * Get type (mobile, landline, ...) for phone number.
-     */
-    public function getType(string $phonenumber): string;
-
-    public function isTwilioEnabled(): bool;
-
-    /**
-     * Return true if the phonenumber is a landline or voip phone.  Return always true
-     * if the validation is not configured.
-     */
-    public function isValidPhonenumberAny(PhoneNumber $phonenumber): bool;
-
-    /**
-     * Return true if the phonenumber is a landline or voip phone.  Return always true
-     * if the validation is not configured.
-     */
-    public function isValidPhonenumberLandOrVoip(PhoneNumber $phonenumber): bool;
-
-    /**
-     * Return true if the phoennumber is a mobile phone. Return always true
-     * if the validation is not configured.
-     */
-    public function isValidPhonenumberMobile(PhoneNumber $phonenumber): bool;
-}

src/Bundle/ChillFormTypesBundle/src/Service/TwilioHttpClient.php

@@ -1,48 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\FormTypesBundle\Service;
-
-use Symfony\Component\HttpKernel\HttpCache\StoreInterface;
-use Symfony\Contracts\HttpClient\HttpClientInterface;
-use Symfony\Contracts\HttpClient\ResponseInterface;
-use Symfony\Contracts\HttpClient\ResponseStreamInterface;
-
-final class TwilioHttpClient implements HttpClientInterface
-{
-    private HttpClientInterface $client;
-
-    public function __construct(HttpClientInterface $twilioApi, StoreInterface $store)
-    {
-        // TODO: Use CachingHttpClient when the following bug is fixed.
-        // TODO: https://github.com/symfony/symfony/issues/40644
-        /*
-        $this->client = new CachingHttpClient(
-            $twilioApi,
-            $store
-        );
-         */
-        $this->client = $twilioApi;
-    }
-
-    public function request(string $method, string $url, array $options = []): ResponseInterface
-    {
-        return $this->client->request($method, $url, $options);
-    }
-
-    public function stream($responses, ?float $timeout = null): ResponseStreamInterface
-    {
-        return $this->client->stream($responses, $timeout);
-    }
-
-    public function withOptions($options)
-    {
-        return $this->client->withOptions($options);
-    }
-}

src/Bundle/ChillFormTypesBundle/src/Tests/Form/Types/PhoneNumberTypeTest.php

@@ -1,102 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\FormTypesBundle\Tests\Form\Types;
-
-use Chill\FormTypesBundle\Form\Types\PhoneNumberType;
-use libphonenumber\PhoneNumberFormat;
-use Locale;
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\Form\Forms;
-
-/**
- * @internal
- *
- * @covers \Chill\FormTypesBundle\Form\DataTransformer\PhoneNumberTypeTransformer
- * @covers \Chill\FormTypesBundle\Form\Types\PhoneNumberType
- */
-final class PhoneNumberTypeTest extends TestCase
-{
-    /**
-     * @var FormFactoryInterface
-     */
-    protected $factory;
-
-    protected function setUp(): void
-    {
-        Locale::setDefault('en');
-
-        $this->factory = Forms::createFormFactoryBuilder()->getFormFactory();
-    }
-
-    public function singleFieldProvider()
-    {
-        yield ['0,-03f212@%3g4 g5k 6789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 123456789'];
-
-        yield ['0032 123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 123456789'];
-
-        yield ['0032 123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::NATIONAL], '123456789'];
-
-        yield ['+32 123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 123456789'];
-
-        yield ['+32 123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::NATIONAL], '123456789'];
-
-        yield ['0123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 123456789'];
-
-        yield ['0123456789', ['default_region' => 'BE', 'format' => PhoneNumberFormat::NATIONAL], '123456789'];
-
-        yield ['0486/540660', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 486 54 06 60'];
-
-        yield ['0486/540660', ['default_region' => 'BE', 'format' => PhoneNumberFormat::NATIONAL], '0486 54 06 60'];
-
-        yield ['0486/540.660', ['default_region' => 'BE', 'format' => PhoneNumberFormat::INTERNATIONAL], '+32 486 54 06 60'];
-
-        yield ['0486/540.660', ['default_region' => 'BE', 'format' => PhoneNumberFormat::NATIONAL], '0486 54 06 60'];
-
-        yield ['+441234567890', [], '+44 1234 567890'];
-
-        yield ['+44 1234 567890', ['format' => PhoneNumberFormat::NATIONAL], '+44 1234 567890'];
-
-        yield ['+44 1234 567890', ['default_region' => 'GB', 'format' => PhoneNumberFormat::NATIONAL], '01234 567890'];
-
-        yield ['+1 650-253-0000', ['default_region' => 'GB', 'format' => PhoneNumberFormat::NATIONAL], '00 1 650-253-0000'];
-
-        yield ['01234 567890', ['default_region' => 'GB'], '+44 1234 567890'];
-
-        yield ['', [], ''];
-    }
-
-    public function testGetNameAndBlockPrefixAreTel()
-    {
-        $type = new PhoneNumberType();
-
-        self::assertSame('chill_formtypes_bundle', $type->getBlockPrefix());
-    }
-
-    /**
-     * @dataProvider singleFieldProvider
-     */
-    public function testSingleField(string $input, array $options, string $output)
-    {
-        $form = $this->factory->create(PhoneNumberType::class, null, $options);
-
-        $form->submit($input);
-
-        if (method_exists($form, 'getTransformationFailure') && $failure = $form->getTransformationFailure()) {
-            throw $failure;
-        }
-        self::assertTrue($form->isSynchronized());
-
-        $view = $form->createView();
-
-        self::assertSame('tel', $view->vars['type']);
-        self::assertSame($output, $view->vars['value']);
-    }
-}

src/Bundle/ChillFormTypesBundle/src/Validation/Validator/PhoneNumberValidator.php

@@ -1,75 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\FormTypesBundle\Validation\Validator;
-
-use Chill\FormTypesBundle\Service\PhoneNumberHelperInterface;
-use Chill\FormTypesBundle\Validation\Constraint\PhonenumberConstraint;
-use LogicException;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-
-final class PhoneNumberValidator extends ConstraintValidator
-{
-    protected PhoneNumberHelperInterface $phoneNumberHelper;
-
-    public function __construct(
-        PhoneNumberHelperInterface $phoneNumberHelper
-    ) {
-        $this->phoneNumberHelper = $phoneNumberHelper;
-    }
-
-    /**
-     * @param Constraint|PhonenumberConstraint $constraint
-     * @param mixed $value
-     */
-    public function validate($value, Constraint $constraint)
-    {
-        if (null === $value) {
-            return;
-        }
-
-        if (false === $this->phoneNumberHelper->isTwilioEnabled()) {
-            return;
-        }
-
-        $message = 'The phone number (%phonenumber%) must be of type: %type%';
-        $isValid = true;
-
-        switch ($constraint->type) {
-            case 'landline':
-                $isValid = $this->phoneNumberHelper->isValidPhonenumberLandOrVoip($value);
-
-                break;
-
-            case 'mobile':
-                $isValid = $this->phoneNumberHelper->isValidPhonenumberMobile($value);
-
-                break;
-
-            case 'any':
-                $isValid = $this->phoneNumberHelper->isValidPhonenumberAny($value);
-                $message = 'The phone number (%phonenumber%) is invalid';
-
-                break;
-
-            default:
-                throw new LogicException(
-                    sprintf(
-                        'The phone number type %s is not implemented.',
-                        $constraint->type
-                    )
-                );
-        }
-
-        if (false === $isValid) {
-            $this->context->addViolation($message, ['%type%' => $constraint->type, '%phonenumber%' => $value]);
-        }
-    }
-}

src/Bundle/ChillMainBundle/ChillMainBundle.php

@@ -31,7 +31,6 @@ use Chill\MainBundle\Security\Resolver\ScopeResolverInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface;
 use Chill\MainBundle\Templating\Entity\CompilerPass as RenderEntityCompilerPass;
 use Chill\MainBundle\Templating\UI\NotificationCounterInterface;
-use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -57,8 +56,6 @@ class ChillMainBundle extends Bundle
             ->addTag('chill_main.notification_handler');
         $container->registerForAutoconfiguration(NotificationCounterInterface::class)
             ->addTag('chill.count_notification.user');
-        $container->registerForAutoconfiguration(EntityWorkflowHandlerInterface::class)
-            ->addTag('chill_main.workflow_handler');
 
         $container->addCompilerPass(new SearchableServicesCompilerPass());
         $container->addCompilerPass(new ConfigConsistencyCompilerPass());

src/Bundle/ChillMainBundle/Controller/LocationTypeApiController.php

@@ -24,7 +24,6 @@ class LocationTypeApiController extends ApiController
         $query->andWhere(
             $query->expr()->andX(
                 $query->expr()->eq('e.availableForUsers', "'TRUE'"),
-                $query->expr()->eq('e.editableByUsers', "'TRUE'"),
                 $query->expr()->eq('e.active', "'TRUE'"),
             )
         );

src/Bundle/ChillMainBundle/Controller/NotificationApiController.php

@@ -13,19 +13,13 @@ namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\MainBundle\Repository\NotificationRepository;
 use Chill\MainBundle\Security\Authorization\NotificationVoter;
-use Chill\MainBundle\Serializer\Model\Collection;
-use Chill\MainBundle\Serializer\Model\Counter;
 use Doctrine\ORM\EntityManagerInterface;
 use RuntimeException;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Serializer\SerializerInterface;
 use UnexpectedValueException;
 
 /**
@@ -35,26 +29,12 @@ class NotificationApiController
 {
     private EntityManagerInterface $entityManager;
 
-    private NotificationRepository $notificationRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
     private Security $security;
 
-    private SerializerInterface $serializer;
-
-    public function __construct(
-        EntityManagerInterface $entityManager,
-        NotificationRepository $notificationRepository,
-        PaginatorFactory $paginatorFactory,
-        Security $security,
-        SerializerInterface $serializer
-    ) {
+    public function __construct(EntityManagerInterface $entityManager, Security $security)
+    {
         $this->entityManager = $entityManager;
-        $this->notificationRepository = $notificationRepository;
-        $this->paginatorFactory = $paginatorFactory;
         $this->security = $security;
-        $this->serializer = $serializer;
     }
 
     /**
@@ -73,37 +53,6 @@ class NotificationApiController
         return $this->markAs('unread', $notification);
     }
 
-    /**
-     * @Route("/my/unread")
-     */
-    public function myUnreadNotifications(Request $request): JsonResponse
-    {
-        $total = $this->notificationRepository->countUnreadByUser($this->security->getUser());
-
-        if ($request->query->getBoolean('countOnly')) {
-            return new JsonResponse(
-                $this->serializer->serialize(new Counter($total), 'json', ['groups' => ['read']]),
-                JsonResponse::HTTP_OK,
-                [],
-                true
-            );
-        }
-        $paginator = $this->paginatorFactory->create($total);
-        $notifications = $this->notificationRepository->findUnreadByUser(
-            $this->security->getUser(),
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
-        );
-        $collection = new Collection($notifications, $paginator);
-
-        return new JsonResponse(
-            $this->serializer->serialize($collection, 'json', ['groups' => ['read']]),
-            JsonResponse::HTTP_OK,
-            [],
-            true
-        );
-    }
-
     private function markAs(string $target, Notification $notification): JsonResponse
     {
         if (!$this->security->isGranted(NotificationVoter::NOTIFICATION_TOGGLE_READ_STATUS, $notification)) {

src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php

@@ -1,118 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Controller;
-
-use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
-use Doctrine\ORM\EntityManagerInterface;
-use LogicException;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Security\Core\Security;
-
-class WorkflowApiController
-{
-    private EntityManagerInterface $entityManager;
-
-    private Security $security;
-
-    public function __construct(Security $security, EntityManagerInterface $entityManager)
-    {
-        $this->entityManager = $entityManager;
-        $this->security = $security;
-    }
-
-    /**
-     * @Route("/api/1.0/main/workflow/{id}/subscribe", methods={"POST"})
-     */
-    public function subscribe(EntityWorkflow $entityWorkflow, Request $request): Response
-    {
-        return $this->handleSubscription($entityWorkflow, $request, 'subscribe');
-    }
-
-    /**
-     * @Route("/api/1.0/main/workflow/{id}/unsubscribe", methods={"POST"})
-     */
-    public function unsubscribe(EntityWorkflow $entityWorkflow, Request $request): Response
-    {
-        return $this->handleSubscription($entityWorkflow, $request, 'unsubscribe');
-    }
-
-    private function handleSubscription(EntityWorkflow $entityWorkflow, Request $request, string $action): JsonResponse
-    {
-        if (!$this->security->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
-            throw new AccessDeniedException();
-        }
-
-        if (!$request->query->has('subscribe')) {
-            throw new BadRequestHttpException('missing subscribe parameter');
-        }
-
-        $user = $this->security->getUser();
-
-        switch ($request->query->get('subscribe')) {
-            case 'final':
-                switch ($action) {
-                    case 'subscribe':
-                        $entityWorkflow->addSubscriberToFinal($user);
-
-                        break;
-
-                    case 'unsubscribe':
-                        $entityWorkflow->removeSubscriberToFinal($user);
-
-                        break;
-
-                    default:
-                        throw new LogicException();
-                }
-
-                break;
-
-            case 'step':
-                switch ($action) {
-                    case 'subscribe':
-                        $entityWorkflow->addSubscriberToStep($user);
-
-                        break;
-
-                    case 'unsubscribe':
-                        $entityWorkflow->removeSubscriberToStep($user);
-
-                        break;
-
-                    default:
-                        throw new LogicException();
-                }
-
-                break;
-
-            default:
-                throw new BadRequestHttpException('subscribe parameter must be equal to "step" or "final"');
-        }
-
-        $this->entityManager->flush();
-
-        return new JsonResponse(
-            [
-                'step' => $entityWorkflow->isUserSubscribedToStep($user),
-                'final' => $entityWorkflow->isUserSubscribedToFinal($user),
-            ],
-            JsonResponse::HTTP_OK,
-            [],
-            false
-        );
-    }
-}

src/Bundle/ChillMainBundle/Controller/WorkflowController.php

@@ -1,257 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Controller;
-
-use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflowComment;
-use Chill\MainBundle\Form\EntityWorkflowCommentType;
-use Chill\MainBundle\Form\WorkflowStepType;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\MainBundle\Repository\Workflow\EntityWorkflowRepository;
-use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter;
-use Chill\MainBundle\Workflow\EntityWorkflowManager;
-use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Component\Workflow\Registry;
-use Symfony\Component\Workflow\TransitionBlocker;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
-
-class WorkflowController extends AbstractController
-{
-    private EntityManagerInterface $entityManager;
-
-    private EntityWorkflowManager $entityWorkflowManager;
-
-    private EntityWorkflowRepository $entityWorkflowRepository;
-
-    private PaginatorFactory $paginatorFactory;
-
-    private Registry $registry;
-
-    private TranslatorInterface $translator;
-
-    private ValidatorInterface $validator;
-
-    public function __construct(EntityWorkflowManager $entityWorkflowManager, EntityWorkflowRepository $entityWorkflowRepository, ValidatorInterface $validator, PaginatorFactory $paginatorFactory, Registry $registry, EntityManagerInterface $entityManager, TranslatorInterface $translator)
-    {
-        $this->entityWorkflowManager = $entityWorkflowManager;
-        $this->entityWorkflowRepository = $entityWorkflowRepository;
-        $this->validator = $validator;
-        $this->paginatorFactory = $paginatorFactory;
-        $this->registry = $registry;
-        $this->entityManager = $entityManager;
-        $this->translator = $translator;
-    }
-
-    /**
-     * @Route("/{_locale}/main/workflow/create", name="chill_main_workflow_create")
-     */
-    public function create(Request $request): Response
-    {
-        if (!$request->query->has('entityClass')) {
-            throw new BadRequestHttpException('Missing entityClass parameter');
-        }
-
-        if (!$request->query->has('entityId')) {
-            throw new BadRequestHttpException('missing entityId parameter');
-        }
-
-        if (!$request->query->has('workflow')) {
-            throw new BadRequestHttpException('missing workflow parameter');
-        }
-
-        $entityWorkflow = new EntityWorkflow();
-        $entityWorkflow
-            ->setRelatedEntityClass($request->query->get('entityClass'))
-            ->setRelatedEntityId($request->query->getInt('entityId'))
-            ->setWorkflowName($request->query->get('workflow'));
-
-        $errors = $this->validator->validate($entityWorkflow, null, ['creation']);
-
-        if (count($errors) > 0) {
-            $msg = [];
-
-            foreach ($errors as $error) {
-                /** @var \Symfony\Component\Validator\ConstraintViolationInterface $error */
-                $msg[] = $error->getMessage();
-            }
-
-            return new Response(implode("\n", $msg), Response::HTTP_UNPROCESSABLE_ENTITY);
-        }
-
-        $this->denyAccessUnlessGranted(EntityWorkflowVoter::CREATE, $entityWorkflow);
-
-        $em = $this->getDoctrine()->getManager();
-        $em->persist($entityWorkflow);
-        $em->flush();
-
-        return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]);
-    }
-
-    /**
-     * @Route("/{_locale}/main/workflow/list/dest", name="chill_main_workflow_list_dest")
-     */
-    public function myWorkflowsDest(Request $request): Response
-    {
-        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
-
-        $total = $this->entityWorkflowRepository->countByDest($this->getUser());
-        $paginator = $this->paginatorFactory->create($total);
-
-        $workflows = $this->entityWorkflowRepository->findByDest(
-            $this->getUser(),
-            ['createdAt' => 'DESC'],
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
-        );
-
-        return $this->render(
-            '@ChillMain/Workflow/list.html.twig',
-            [
-                'workflows' => $this->buildHandler($workflows),
-                'paginator' => $paginator,
-                'step' => 'dest',
-            ]
-        );
-    }
-
-    /**
-     * @Route("/{_locale}/main/workflow/list/subscribed", name="chill_main_workflow_list_subscribed")
-     */
-    public function myWorkflowsSubscribed(Request $request): Response
-    {
-        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
-
-        $total = $this->entityWorkflowRepository->countBySubscriber($this->getUser());
-        $paginator = $this->paginatorFactory->create($total);
-
-        $workflows = $this->entityWorkflowRepository->findBySubscriber(
-            $this->getUser(),
-            ['createdAt' => 'DESC'],
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
-        );
-
-        return $this->render(
-            '@ChillMain/Workflow/list.html.twig',
-            [
-                'workflows' => $this->buildHandler($workflows),
-                'paginator' => $paginator,
-                'step' => 'subscribed',
-            ]
-        );
-    }
-
-    /**
-     * @Route("/{_locale}/main/workflow/{id}/show", name="chill_main_workflow_show")
-     */
-    public function show(EntityWorkflow $entityWorkflow, Request $request): Response
-    {
-        $this->denyAccessUnlessGranted(EntityWorkflowVoter::SEE, $entityWorkflow);
-
-        $handler = $this->entityWorkflowManager->getHandler($entityWorkflow);
-        $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
-
-        if (count($workflow->getEnabledTransitions($entityWorkflow)) > 0) {
-            // possible transition
-            $transitionForm = $this->createForm(
-                WorkflowStepType::class,
-                $entityWorkflow->getCurrentStep(),
-                ['transition' => true, 'entity_workflow' => $entityWorkflow]
-            );
-
-            $transitionForm->handleRequest($request);
-
-            if ($transitionForm->isSubmitted() && $transitionForm->isValid()) {
-                if (!$workflow->can($entityWorkflow, $transition = $transitionForm['transition']->getData()->getName())) {
-                    $blockers = $workflow->buildTransitionBlockerList($entityWorkflow, $transition);
-                    $msgs = array_map(function (TransitionBlocker $tb) {
-                        return $this->translator->trans(
-                            $tb->getMessage(),
-                            $tb->getParameters()
-                        );
-                    }, iterator_to_array($blockers));
-
-                    throw $this->createAccessDeniedException(
-                        sprintf(
-                            "not allowed to apply transition {$transition}: %s",
-                            implode(', ', $msgs)
-                        )
-                    );
-                }
-
-                $workflow->apply($entityWorkflow, $transition);
-
-                foreach ($transitionForm['future_dest_users']->getData() as $user) {
-                    $entityWorkflow->getCurrentStep()->addDestUser($user);
-                }
-
-                $this->entityManager->flush();
-
-                return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]);
-            }
-
-            if ($transitionForm->isSubmitted() && !$transitionForm->isValid()) {
-                $this->addFlash('error', $this->translator->trans('This form contains errors'));
-            }
-        }
-
-        /*
-        $commentForm = $this->createForm(EntityWorkflowCommentType::class, $newComment = new EntityWorkflowComment());
-        $commentForm->handleRequest($request);
-
-        if ($commentForm->isSubmitted() && $commentForm->isValid()) {
-            $this->entityManager->persist($newComment);
-            $this->entityManager->flush();
-
-            $this->addFlash('success', $this->translator->trans('workflow.Comment added'));
-
-            return $this->redirectToRoute('chill_main_workflow_show', ['id' => $entityWorkflow->getId()]);
-        } elseif ($commentForm->isSubmitted() && !$commentForm->isValid()) {
-            $this->addFlash('error', $this->translator->trans('This form contains errors'));
-        }
-         */
-
-        return $this->render(
-            '@ChillMain/Workflow/index.html.twig',
-            [
-                'handler_template' => $handler->getTemplate($entityWorkflow),
-                'handler_template_title' => $handler->getTemplateTitle($entityWorkflow),
-                'handler_template_data' => $handler->getTemplateData($entityWorkflow),
-                'transition_form' => isset($transitionForm) ? $transitionForm->createView() : null,
-                'entity_workflow' => $entityWorkflow,
-                //'comment_form' => $commentForm->createView(),
-            ]
-        );
-    }
-
-    private function buildHandler(array $workflows): array
-    {
-        $lines = [];
-
-        foreach ($workflows as $workflow) {
-            $handler = $this->entityWorkflowManager->getHandler($workflow);
-            $lines[] = [
-                'handler' => $handler,
-                'entity_workflow' => $workflow,
-            ];
-        }
-
-        return $lines;
-    }
-}

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -162,12 +162,12 @@ class ChillMainExtension extends Extension implements
         $loader->load('services/notification.yaml');
         $loader->load('services/redis.yaml');
         $loader->load('services/command.yaml');
+        $loader->load('services/phonenumber.yaml');
         $loader->load('services/cache.yaml');
         $loader->load('services/templating.yaml');
         $loader->load('services/timeline.yaml');
         $loader->load('services/search.yaml');
         $loader->load('services/serializer.yaml');
-        $loader->load('services/mailer.yaml');
 
         $this->configureCruds($container, $config['cruds'], $config['apis'], $loader);
     }
@@ -391,26 +391,6 @@ class ChillMainExtension extends Extension implements
                         ],
                     ],
                 ],
-                [
-                    'class' => \Chill\MainBundle\Entity\UserJob::class,
-                    'name' => 'user_job',
-                    'base_path' => '/api/1.0/main/user-job',
-                    'base_role' => 'ROLE_USER',
-                    'actions' => [
-                        '_index' => [
-                            'methods' => [
-                                Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true,
-                            ],
-                        ],
-                        '_entity' => [
-                            'methods' => [
-                                Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true,
-                            ],
-                        ],
-                    ],
-                ],
                 [
                     'controller' => \Chill\MainBundle\Controller\AddressReferenceAPIController::class,
                     'class' => \Chill\MainBundle\Entity\AddressReference::class,

src/Bundle/ChillMainBundle/Doctrine/Model/TrackCreationTrait.php

@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Doctrine\Model;
-
-use Chill\MainBundle\Entity\User;
-use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
-use Doctrine\ORM\Mapping as ORM;
-
-trait TrackCreationTrait
-{
-    /**
-     * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL})
-     */
-    private ?DateTimeImmutable $createdAt = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private ?User $createdBy = null;
-
-    public function getCreatedAt(): ?DateTimeInterface
-    {
-        return $this->createdAt;
-    }
-
-    public function getCreatedBy(): ?User
-    {
-        return $this->createdBy;
-    }
-
-    public function setCreatedAt(DateTimeInterface $datetime): self
-    {
-        $this->createdAt = $datetime instanceof DateTime ? DateTimeImmutable::createFromMutable($datetime) : $datetime;
-
-        return $this;
-    }
-
-    public function setCreatedBy(User $user): self
-    {
-        $this->createdBy = $user;
-
-        return $this;
-    }
-}

src/Bundle/ChillMainBundle/Doctrine/Model/TrackUpdateTrait.php

@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Doctrine\Model;
-
-use Chill\MainBundle\Entity\User;
-use DateTime;
-use DateTimeImmutable;
-use DateTimeInterface;
-use Doctrine\ORM\Mapping as ORM;
-
-trait TrackUpdateTrait
-{
-    /**
-     * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": NULL})
-     */
-    private ?DateTimeImmutable $updatedAt = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private ?User $updatedBy = null;
-
-    public function getUpdatedAt(): ?DateTimeInterface
-    {
-        return $this->updatedAt;
-    }
-
-    public function getUpdatedBy(): ?User
-    {
-        return $this->updatedBy;
-    }
-
-    public function setUpdatedAt(DateTimeInterface $datetime): self
-    {
-        $this->updatedAt = $datetime instanceof DateTime ? DateTimeImmutable::createFromMutable($datetime) : $datetime;
-
-        return $this;
-    }
-
-    public function setUpdatedBy(User $user): self
-    {
-        $this->updatedBy = $user;
-
-        return $this;
-    }
-}

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -42,16 +42,10 @@ class Address
      */
     private $buildingName;
 
-    /**
-     * @ORM\Column(type="boolean")
-     * @Groups({"write"})
-     */
-    private bool $confidential = false;
-
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=255, nullable=true)
+     * @ORM\Column(type="string", length=16, nullable=true)
      * @Groups({"write"})
      */
     private $corridor;
@@ -84,7 +78,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=255, nullable=true)
+     * @ORM\Column(type="string", length=16, nullable=true)
      * @Groups({"write"})
      */
     private $flat;
@@ -92,7 +86,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=255, nullable=true)
+     * @ORM\Column(type="string", length=16, nullable=true)
      * @Groups({"write"})
      */
     private $floor;
@@ -149,7 +143,7 @@ class Address
     /**
      * @var string|null
      *
-     * @ORM\Column(type="string", length=255, nullable=true)
+     * @ORM\Column(type="string", length=16, nullable=true)
      * @Groups({"write"})
      */
     private $steps;
@@ -198,7 +192,6 @@ class Address
         return (new Address())
             ->setAddressReference($original->getAddressReference())
             ->setBuildingName($original->getBuildingName())
-            ->setConfidential($original->getConfidential())
             ->setCorridor($original->getCorridor())
             ->setCustoms($original->getCustoms())
             ->setDistribution($original->getDistribution())
@@ -236,11 +229,6 @@ class Address
         return $this->buildingName;
     }
 
-    public function getConfidential(): bool
-    {
-        return $this->confidential;
-    }
-
     public function getCorridor(): ?string
     {
         return $this->corridor;
@@ -381,13 +369,6 @@ class Address
         return $this;
     }
 
-    public function setConfidential(bool $confidential): self
-    {
-        $this->confidential = $confidential;
-
-        return $this;
-    }
-
     public function setCorridor(?string $corridor): self
     {
         $this->corridor = $corridor;

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

@@ -20,9 +20,10 @@ use Doctrine\ORM\Mapping as ORM;
 class CommentEmbeddable
 {
     /**
+     * @var string
      * @ORM\Column(type="text", nullable=true)
      */
-    private ?string $comment = null;
+    private $comment;
 
     /**
      * @var DateTime
@@ -38,7 +39,10 @@ class CommentEmbeddable
      */
     private $userId;
 
-    public function getComment(): ?string
+    /**
+     * @return string
+     */
+    public function getComment()
     {
         return $this->comment;
     }
@@ -64,6 +68,9 @@ class CommentEmbeddable
         return empty($this->getComment());
     }
 
+    /**
+     * @param string $comment
+     */
     public function setComment(?string $comment)
     {
         $this->comment = $comment;

src/Bundle/ChillMainBundle/Entity/Location.php

@@ -64,7 +64,7 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
 
     /**
      * @ORM\Column(type="string", length=255, nullable=true)
-     * @Serializer\Groups({"read", "write", "docgen:read"})
+     * @Serializer\Groups({"read", "write"})
      */
     private ?string $email = null;
 

src/Bundle/ChillMainBundle/Entity/LocationType.php

@@ -67,12 +67,6 @@ class LocationType
      */
     private ?string $defaultFor = null;
 
-    /**
-     * @ORM\Column(type="boolean")
-     * @Serializer\Groups({"read"})
-     */
-    private bool $editableByUsers = true;
-
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -113,11 +107,6 @@ class LocationType
         return $this->defaultFor;
     }
 
-    public function getEditableByUsers(): ?bool
-    {
-        return $this->editableByUsers;
-    }
-
     public function getId(): ?int
     {
         return $this->id;
@@ -163,13 +152,6 @@ class LocationType
         return $this;
     }
 
-    public function setEditableByUsers(bool $editableByUsers): self
-    {
-        $this->editableByUsers = $editableByUsers;
-
-        return $this;
-    }
-
     public function setTitle(array $title): self
     {
         $this->title = $title;

src/Bundle/ChillMainBundle/Entity/Notification.php

@@ -17,15 +17,11 @@ use DateTimeInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity
  * @ORM\Table(
  *     name="chill_main_notification",
- *     indexes={
- *         @ORM\Index(name="chill_main_notification_related_entity_idx", columns={"relatedentityclass", "relatedentityid"})
- *     }
  * )
  * @ORM\HasLifecycleCallbacks
  */
@@ -36,7 +32,6 @@ class Notification implements TrackUpdateInterface
     /**
      * @ORM\ManyToMany(targetEntity=User::class)
      * @ORM\JoinTable(name="chill_main_notification_addresses_user")
-     * @Assert\Count(min="1", minMessage="notification.At least one addressee")
      */
     private Collection $addressees;
 
@@ -85,7 +80,6 @@ class Notification implements TrackUpdateInterface
 
     /**
      * @ORM\Column(type="text", options={"default": ""})
-     * @Assert\NotBlank(message="notification.Title must be defined")
      */
     private string $title = '';
 
@@ -292,9 +286,9 @@ class Notification implements TrackUpdateInterface
         return $this;
     }
 
-    public function setMessage(?string $message): self
+    public function setMessage(string $message): self
     {
-        $this->message = (string) $message;
+        $this->message = $message;
 
         return $this;
     }
@@ -320,9 +314,9 @@ class Notification implements TrackUpdateInterface
         return $this;
     }
 
-    public function setTitle(?string $title): Notification
+    public function setTitle(string $title): Notification
     {
-        $this->title = (string) $title;
+        $this->title = $title;
 
         return $this;
     }

src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php

@@ -1,166 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Entity;
-
-use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Repository\ResidentialAddressRepository;
-use Chill\PersonBundle\Entity\Person;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use DateTimeImmutable;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity(repositoryClass=ResidentialAddressRepository::class)
- * @ORM\Table(name="chill_main_residential_address")
- */
-class ResidentialAddress
-{
-    /**
-     * @ORM\ManyToOne(targetEntity=Address::class)
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private ?Address $address = null;
-
-    /**
-     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\CommentEmbeddable", columnPrefix="residentialAddressComment_")
-     */
-    private CommentEmbeddable $comment;
-
-    /**
-     * @ORM\Column(type="datetime_immutable", nullable=true)
-     */
-    private ?DateTimeImmutable $endDate = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=Person::class)
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private ?Person $hostPerson = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=ThirdParty::class)
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private ?ThirdParty $hostThirdParty = null;
-
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private $id;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=Person::class)
-     * @ORM\JoinColumn(nullable=false)
-     */
-    private Person $person;
-
-    /**
-     * @ORM\Column(type="datetime_immutable")
-     */
-    private ?DateTimeImmutable $startDate = null;
-
-    public function __construct()
-    {
-        $this->comment = new CommentEmbeddable();
-    }
-
-    public function getAddress(): ?Address
-    {
-        return $this->address;
-    }
-
-    public function getComment(): CommentEmbeddable
-    {
-        return $this->comment;
-    }
-
-    public function getEndDate(): ?DateTimeImmutable
-    {
-        return $this->endDate;
-    }
-
-    public function getHostPerson(): ?Person
-    {
-        return $this->hostPerson;
-    }
-
-    public function getHostThirdParty(): ?ThirdParty
-    {
-        return $this->hostThirdParty;
-    }
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getPerson(): ?Person
-    {
-        return $this->person;
-    }
-
-    public function getStartDate(): ?DateTimeImmutable
-    {
-        return $this->startDate;
-    }
-
-    public function setAddress(?Address $address): self
-    {
-        $this->address = $address;
-
-        return $this;
-    }
-
-    public function setComment(CommentEmbeddable $comment): self
-    {
-        $this->comment = $comment;
-
-        return $this;
-    }
-
-    public function setEndDate(?DateTimeImmutable $endDate): self
-    {
-        $this->endDate = $endDate;
-
-        return $this;
-    }
-
-    public function setHostPerson(?Person $hostPerson): self
-    {
-        $this->hostPerson = $hostPerson;
-
-        return $this;
-    }
-
-    public function setHostThirdParty(?ThirdParty $hostThirdParty): self
-    {
-        $this->hostThirdParty = $hostThirdParty;
-
-        return $this;
-    }
-
-    public function setPerson(?Person $person): self
-    {
-        $this->person = $person;
-
-        return $this;
-    }
-
-    public function setStartDate(DateTimeImmutable $startDate): self
-    {
-        $this->startDate = $startDate;
-
-        return $this;
-    }
-}

src/Bundle/ChillMainBundle/Entity/User.php

@@ -97,11 +97,6 @@ class User implements AdvancedUserInterface
      */
     private ?Center $mainCenter = null;
 
-    /**
-     * @ORM\ManyToOne(targetEntity=Location::class)
-     */
-    private ?Location $mainLocation = null;
-
     /**
      * @ORM\ManyToOne(targetEntity=Scope::class)
      */
@@ -233,11 +228,6 @@ class User implements AdvancedUserInterface
         return $this->mainCenter;
     }
 
-    public function getMainLocation(): ?Location
-    {
-        return $this->mainLocation;
-    }
-
     public function getMainScope(): ?Scope
     {
         return $this->mainScope;
@@ -415,13 +405,6 @@ class User implements AdvancedUserInterface
         return $this;
     }
 
-    public function setMainLocation(?Location $mainLocation): User
-    {
-        $this->mainLocation = $mainLocation;
-
-        return $this;
-    }
-
     public function setMainScope(?Scope $mainScope): User
     {
         $this->mainScope = $mainScope;

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

@@ -1,447 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Entity\Workflow;
-
-use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
-use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Workflow\Validator\EntityWorkflowCreation;
-use DateTimeInterface;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
-use Iterator;
-use RuntimeException;
-use Symfony\Component\Serializer\Annotation as Serializer;
-use function count;
-use function is_array;
-
-/**
- * @ORM\Entity
- * @ORM\Table("chill_main_workflow_entity")
- * @EntityWorkflowCreation(groups={"creation"})
- * @Serializer\DiscriminatorMap(typeProperty="type", mapping={
- *     "entity_workflow": EntityWorkflow::class
- * })
- */
-class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
-{
-    use TrackCreationTrait;
-
-    use TrackUpdateTrait;
-
-    /**
-     * @ORM\OneToMany(targetEntity=EntityWorkflowComment::class, mappedBy="entityWorkflow", orphanRemoval=true)
-     *
-     * @var Collection|EntityWorkflowComment[]
-     */
-    private Collection $comments;
-
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private ?int $id = null;
-
-    /**
-     * @ORM\Column(type="string", length=255)
-     */
-    private string $relatedEntityClass = '';
-
-    /**
-     * @ORM\Column(type="integer")
-     */
-    private int $relatedEntityId;
-
-    /**
-     * @ORM\OneToMany(targetEntity=EntityWorkflowStep::class, mappedBy="entityWorkflow", orphanRemoval=true, cascade={"persist"})
-     * @ORM\OrderBy({"transitionAt": "ASC", "id": "ASC"})
-     *
-     * @var Collection|EntityWorkflowStep[]
-     */
-    private Collection $steps;
-
-    /**
-     * @var null|array|EntityWorkflowStep[]
-     */
-    private ?array $stepsChainedCache = null;
-
-    /**
-     * @ORM\ManyToMany(targetEntity=User::class)
-     * @ORM\JoinTable(name="chill_main_workflow_entity_subscriber_to_final")
-     *
-     * @var Collection|User[]
-     */
-    private Collection $subscriberToFinal;
-
-    /**
-     * @ORM\ManyToMany(targetEntity=User::class)
-     * @ORM\JoinTable(name="chill_main_workflow_entity_subscriber_to_step")
-     *
-     * @var Collection|User[]
-     */
-    private Collection $subscriberToStep;
-
-    /**
-     * a step which will store all the transition data.
-     */
-    private ?EntityWorkflowStep $transitionningStep = null;
-
-    /**
-     * @ORM\Column(type="text")
-     */
-    private string $workflowName;
-
-    public function __construct()
-    {
-        $this->subscriberToFinal = new ArrayCollection();
-        $this->subscriberToStep = new ArrayCollection();
-        $this->comments = new ArrayCollection();
-        $this->steps = new ArrayCollection();
-
-        $initialStep = new EntityWorkflowStep();
-        $initialStep
-            ->setCurrentStep('initial');
-        $this->addStep($initialStep);
-    }
-
-    public function addComment(EntityWorkflowComment $comment): self
-    {
-        if (!$this->comments->contains($comment)) {
-            $this->comments[] = $comment;
-            $comment->setEntityWorkflow($this);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @internal You should prepare a step and run a workflow transition instead of manually adding a step
-     */
-    public function addStep(EntityWorkflowStep $step): self
-    {
-        if (!$this->steps->contains($step)) {
-            $this->steps[] = $step;
-            $step->setEntityWorkflow($this);
-        }
-
-        return $this;
-    }
-
-    public function addSubscriberToFinal(User $user): self
-    {
-        if (!$this->subscriberToFinal->contains($user)) {
-            $this->subscriberToFinal[] = $user;
-        }
-
-        return $this;
-    }
-
-    public function addSubscriberToStep(User $user): self
-    {
-        if (!$this->subscriberToStep->contains($user)) {
-            $this->subscriberToStep[] = $user;
-        }
-
-        return $this;
-    }
-
-    public function getComments(): Collection
-    {
-        return $this->comments;
-    }
-
-    public function getCurrentStep(): ?EntityWorkflowStep
-    {
-        $step = $this->steps->last();
-
-        if (false !== $step) {
-            return $step;
-        }
-
-        return null;
-    }
-
-    public function getCurrentStepCreatedAt(): ?DateTimeInterface
-    {
-        if (null !== $previous = $this->getPreviousStepIfAny()) {
-            return $previous->getTransitionAt();
-        }
-
-        return null;
-    }
-
-    public function getCurrentStepCreatedBy(): ?User
-    {
-        if (null !== $previous = $this->getPreviousStepIfAny()) {
-            return $previous->getTransitionBy();
-        }
-
-        return null;
-    }
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getRelatedEntityClass(): string
-    {
-        return $this->relatedEntityClass;
-    }
-
-    public function getRelatedEntityId(): int
-    {
-        return $this->relatedEntityId;
-    }
-
-    /**
-     * Method used by MarkingStore.
-     *
-     * get a string representation of the step
-     */
-    public function getStep(): string
-    {
-        return $this->getCurrentStep()->getCurrentStep();
-    }
-
-    public function getStepAfter(EntityWorkflowStep $step): ?EntityWorkflowStep
-    {
-        $iterator = $this->steps->getIterator();
-
-        if ($iterator instanceof Iterator) {
-            $iterator->rewind();
-
-            while ($iterator->valid()) {
-                $curStep = $iterator->current();
-
-                if ($curStep === $step) {
-                    $iterator->next();
-
-                    if ($iterator->valid()) {
-                        return $iterator->current();
-                    }
-
-                    return null;
-                }
-                $iterator->next();
-            }
-
-            return null;
-        }
-
-        throw new RuntimeException();
-    }
-
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getSteps()
-    {
-        return $this->steps;
-    }
-
-    public function getStepsChained(): array
-    {
-        if (is_array($this->stepsChainedCache)) {
-            return $this->stepsChainedCache;
-        }
-
-        $iterator = $this->steps->getIterator();
-        $current = null;
-        $steps = [];
-
-        $iterator->rewind();
-
-        do {
-            $previous = $current;
-            $current = $iterator->current();
-            $steps[] = $current;
-
-            $current->setPrevious($previous);
-
-            $iterator->next();
-
-            if ($iterator->valid()) {
-                $current->setNext($iterator->current());
-            } else {
-                $current->setNext(null);
-            }
-        } while ($iterator->valid());
-
-        $this->stepsChainedCache = $steps;
-
-        return $steps;
-    }
-
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getSubscriberToFinal()
-    {
-        return $this->subscriberToFinal;
-    }
-
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getSubscriberToStep()
-    {
-        return $this->subscriberToStep;
-    }
-
-    /**
-     * get the step which is transitionning. Should be called only by event which will
-     * concern the transition.
-     */
-    public function getTransitionningStep(): ?EntityWorkflowStep
-    {
-        return $this->transitionningStep;
-    }
-
-    public function getWorkflowName(): string
-    {
-        return $this->workflowName;
-    }
-
-    public function isFinal(): bool
-    {
-        $steps = $this->getStepsChained();
-
-        if (1 === count($steps)) {
-            // the initial step cannot be finalized
-            return false;
-        }
-
-        /** @var EntityWorkflowStep $last */
-        $last = end($steps);
-
-        return $last->isFinal();
-    }
-
-    public function isFreeze(): bool
-    {
-        $steps = $this->getStepsChained();
-
-        if (1 === count($steps)) {
-            // the initial step cannot be finalized
-            return false;
-        }
-
-        /** @var EntityWorkflowStep $last */
-        $last = end($steps);
-
-        return $last->getPrevious()->isFreezeAfter();
-    }
-
-    public function isUserSubscribedToFinal(User $user): bool
-    {
-        return $this->subscriberToFinal->contains($user);
-    }
-
-    public function isUserSubscribedToStep(User $user): bool
-    {
-        return $this->subscriberToStep->contains($user);
-    }
-
-    public function prepareStepBeforeTransition(EntityWorkflowStep $step): self
-    {
-        $this->transitionningStep = $step;
-
-        return $this;
-    }
-
-    public function removeComment(EntityWorkflowComment $comment): self
-    {
-        if ($this->comments->removeElement($comment)) {
-            $comment->setEntityWorkflow(null);
-        }
-
-        return $this;
-    }
-
-    public function removeStep(EntityWorkflowStep $step): self
-    {
-        if ($this->steps->removeElement($step)) {
-            $step->setEntityWorkflow(null);
-        }
-
-        return $this;
-    }
-
-    public function removeSubscriberToFinal(User $user): self
-    {
-        $this->subscriberToFinal->removeElement($user);
-
-        return $this;
-    }
-
-    public function removeSubscriberToStep(User $user): self
-    {
-        $this->subscriberToStep->removeElement($user);
-
-        return $this;
-    }
-
-    public function setRelatedEntityClass(string $relatedEntityClass): EntityWorkflow
-    {
-        $this->relatedEntityClass = $relatedEntityClass;
-
-        return $this;
-    }
-
-    public function setRelatedEntityId(int $relatedEntityId): EntityWorkflow
-    {
-        $this->relatedEntityId = $relatedEntityId;
-
-        return $this;
-    }
-
-    /**
-     * Method use by marking store.
-     *
-     * @return $this
-     */
-    public function setStep(string $step): self
-    {
-        $newStep = new EntityWorkflowStep();
-        $newStep->setCurrentStep($step);
-
-        // copy the freeze
-        if ($this->getCurrentStep()->isFreezeAfter()) {
-            $newStep->setFreezeAfter(true);
-        }
-
-        $this->addStep($newStep);
-
-        return $this;
-    }
-
-    public function setWorkflowName(string $workflowName): EntityWorkflow
-    {
-        $this->workflowName = $workflowName;
-
-        return $this;
-    }
-
-    private function getPreviousStepIfAny(): ?EntityWorkflowStep
-    {
-        if (1 === count($this->steps)) {
-            return null;
-        }
-
-        return $this->steps->get($this->steps->count() - 2);
-    }
-}

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowComment.php

@@ -1,78 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Entity\Workflow;
-
-use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
-use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
-use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity
- * @ORM\Table("chill_main_workflow_entity_comment")
- */
-class EntityWorkflowComment implements TrackCreationInterface, TrackUpdateInterface
-{
-    use TrackCreationTrait;
-
-    use TrackUpdateTrait;
-
-    /**
-     * @ORM\Column(type="text", options={"default": ""})
-     */
-    private string $comment = '';
-
-    /**
-     * @ORM\ManyToOne(targetEntity=EntityWorkflow::class, inversedBy="comments")
-     */
-    private ?EntityWorkflow $entityWorkflow = null;
-
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private ?int $id = null;
-
-    public function getComment(): string
-    {
-        return $this->comment;
-    }
-
-    public function getEntityWorkflow(): ?EntityWorkflow
-    {
-        return $this->entityWorkflow;
-    }
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function setComment(string $comment): self
-    {
-        $this->comment = $comment;
-
-        return $this;
-    }
-
-    /**
-     * @internal use @see{EntityWorkflow::addComment}
-     */
-    public function setEntityWorkflow(?EntityWorkflow $entityWorkflow): self
-    {
-        $this->entityWorkflow = $entityWorkflow;
-
-        return $this;
-    }
-}

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php

@@ -1,336 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Entity\Workflow;
-
-use Chill\MainBundle\Entity\User;
-use DateTimeImmutable;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use function count;
-use function in_array;
-
-/**
- * @ORM\Entity
- * @ORM\Table("chill_main_workflow_entity_step")
- */
-class EntityWorkflowStep
-{
-    /**
-     * @ORM\Column(type="text", options={"default": ""})
-     */
-    private string $comment = '';
-
-    /**
-     * @ORM\Column(type="text")
-     */
-    private ?string $currentStep = '';
-
-    /**
-     * @ORM\Column(type="json")
-     */
-    private array $destEmail = [];
-
-    /**
-     * @ORM\ManyToMany(targetEntity=User::class)
-     * @ORM\JoinTable(name="chill_main_workflow_entity_step_user")
-     */
-    private Collection $destUser;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=EntityWorkflow::class, inversedBy="steps")
-     */
-    private ?EntityWorkflow $entityWorkflow = null;
-
-    /**
-     * @ORM\Column(type="boolean", options={"default": false})
-     */
-    private bool $freezeAfter = false;
-
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
-    private ?int $id = null;
-
-    /**
-     * @ORM\Column(type="boolean", options={"default": false})
-     */
-    private bool $isFinal = false;
-
-    /**
-     * filled by @see{EntityWorkflow::getStepsChained}.
-     */
-    private ?EntityWorkflowStep $next = null;
-
-    /**
-     * filled by @see{EntityWorkflow::getStepsChained}.
-     */
-    private ?EntityWorkflowStep $previous = null;
-
-    /**
-     * @ORM\Column(type="text", nullable=true, options={"default": null})
-     */
-    private ?string $transitionAfter = null;
-
-    /**
-     * @ORM\Column(type="datetime_immutable")
-     */
-    private ?DateTimeImmutable $transitionAt = null;
-
-    /**
-     * @ORM\ManyToOne(targetEntity=User::class)
-     * @ORM\JoinColumn(nullable=true)
-     */
-    private ?User $transitionBy = null;
-
-    /**
-     * @ORM\Column(type="text", nullable=true)
-     */
-    private ?string $transitionByEmail = null;
-
-    public function __construct()
-    {
-        $this->destUser = new ArrayCollection();
-    }
-
-    public function addDestEmail(string $email): self
-    {
-        if (!in_array($email, $this->destEmail, true)) {
-            $this->destEmail[] = $email;
-        }
-
-        return $this;
-    }
-
-    public function addDestUser(User $user): self
-    {
-        if (!$this->destUser->contains($user)) {
-            $this->destUser[] = $user;
-        }
-
-        return $this;
-    }
-
-    public function getComment(): string
-    {
-        return $this->comment;
-    }
-
-    public function getCurrentStep(): ?string
-    {
-        return $this->currentStep;
-    }
-
-    public function getDestEmail(): array
-    {
-        return $this->destEmail;
-    }
-
-    /**
-     * @return ArrayCollection|Collection
-     */
-    public function getDestUser()
-    {
-        return $this->destUser;
-    }
-
-    public function getEntityWorkflow(): ?EntityWorkflow
-    {
-        return $this->entityWorkflow;
-    }
-
-    public function getId(): ?int
-    {
-        return $this->id;
-    }
-
-    public function getNext(): ?EntityWorkflowStep
-    {
-        return $this->next;
-    }
-
-    public function getPrevious(): ?EntityWorkflowStep
-    {
-        return $this->previous;
-    }
-
-    public function getTransitionAfter(): ?string
-    {
-        return $this->transitionAfter;
-    }
-
-    public function getTransitionAt(): ?DateTimeImmutable
-    {
-        return $this->transitionAt;
-    }
-
-    public function getTransitionBy(): ?User
-    {
-        return $this->transitionBy;
-    }
-
-    public function getTransitionByEmail(): ?string
-    {
-        return $this->transitionByEmail;
-    }
-
-    public function isFinal(): bool
-    {
-        return $this->isFinal;
-    }
-
-    public function isFreezeAfter(): bool
-    {
-        return $this->freezeAfter;
-    }
-
-    public function removeDestEmail(string $email): self
-    {
-        $this->destEmail = array_filter($this->destEmail, static function (string $existing) use ($email) {
-            return $email !== $existing;
-        });
-
-        return $this;
-    }
-
-    public function removeDestUser(User $user): self
-    {
-        $this->destUser->removeElement($user);
-
-        return $this;
-    }
-
-    public function setComment(?string $comment): EntityWorkflowStep
-    {
-        $this->comment = (string) $comment;
-
-        return $this;
-    }
-
-    public function setCurrentStep(?string $currentStep): EntityWorkflowStep
-    {
-        $this->currentStep = $currentStep;
-
-        return $this;
-    }
-
-    public function setDestEmail(array $destEmail): EntityWorkflowStep
-    {
-        $this->destEmail = $destEmail;
-
-        return $this;
-    }
-
-    /**
-     * @internal use @see(EntityWorkflow::addStep} instead
-     */
-    public function setEntityWorkflow(?EntityWorkflow $entityWorkflow): EntityWorkflowStep
-    {
-        $this->entityWorkflow = $entityWorkflow;
-
-        return $this;
-    }
-
-    public function setFreezeAfter(bool $freezeAfter): EntityWorkflowStep
-    {
-        $this->freezeAfter = $freezeAfter;
-
-        return $this;
-    }
-
-    public function setIsFinal(bool $isFinal): EntityWorkflowStep
-    {
-        $this->isFinal = $isFinal;
-
-        return $this;
-    }
-
-    /**
-     * @return EntityWorkflowStep
-     *
-     * @internal
-     */
-    public function setNext(?EntityWorkflowStep $next): self
-    {
-        $this->next = $next;
-
-        return $this;
-    }
-
-    /**
-     * @return EntityWorkflowStep
-     *
-     * @internal
-     */
-    public function setPrevious(?EntityWorkflowStep $previous): self
-    {
-        $this->previous = $previous;
-
-        return $this;
-    }
-
-    public function setTransitionAfter(?string $transitionAfter): EntityWorkflowStep
-    {
-        $this->transitionAfter = $transitionAfter;
-
-        return $this;
-    }
-
-    public function setTransitionAt(?DateTimeImmutable $transitionAt): EntityWorkflowStep
-    {
-        $this->transitionAt = $transitionAt;
-
-        return $this;
-    }
-
-    public function setTransitionBy(?User $transitionBy): EntityWorkflowStep
-    {
-        $this->transitionBy = $transitionBy;
-
-        return $this;
-    }
-
-    public function setTransitionByEmail(?string $transitionByEmail): EntityWorkflowStep
-    {
-        $this->transitionByEmail = $transitionByEmail;
-
-        return $this;
-    }
-
-    /**
-     * @Assert\Callback
-     *
-     * @param mixed $payload
-     */
-    public function validateOnCreation(ExecutionContextInterface $context, $payload): void
-    {
-        return;
-
-        if ($this->isFinalizeAfter()) {
-            if (0 !== count($this->getDestUser())) {
-                $context->buildViolation('workflow.No dest users when the workflow is finalized')
-                    ->atPath('finalizeAfter')
-                    ->addViolation();
-            }
-        } else {
-            if (0 === count($this->getDestUser())) {
-                $context->buildViolation('workflow.The next step must count at least one dest')
-                    ->atPath('finalizeAfter')
-                    ->addViolation();
-            }
-        }
-    }
-}

src/Bundle/ChillMainBundle/Form/EntityWorkflowCommentType.php

@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Form;
-
-use Chill\MainBundle\Form\Type\ChillTextareaType;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class EntityWorkflowCommentType extends AbstractType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add('comment', ChillTextareaType::class, [
-                'required' => false,
-            ]);
-    }
-}

src/Bundle/ChillMainBundle/Form/LocationFormType.php

@@ -54,6 +54,7 @@ final class LocationFormType extends AbstractType
                 'label' => 'Address',
                 'use_valid_from' => false,
                 'use_valid_to' => false,
+                'mapped' => false,
             ])
             ->add(
                 'active',

src/Bundle/ChillMainBundle/Form/LocationTypeType.php

@@ -39,17 +39,6 @@ final class LocationTypeType extends AbstractType
                     'expanded' => true,
                 ]
             )
-            ->add(
-                'editableByUsers',
-                ChoiceType::class,
-                [
-                    'choices' => [
-                        'Yes' => true,
-                        'No' => false,
-                    ],
-                    'expanded' => true,
-                ]
-            )
             ->add(
                 'addressRequired',
                 ChoiceType::class,

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php

@@ -15,7 +15,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
-final class ObjectToIdTransformer implements DataTransformerInterface
+class ObjectToIdTransformer implements DataTransformerInterface
 {
     private ?string $class;
 
@@ -38,7 +38,7 @@ final class ObjectToIdTransformer implements DataTransformerInterface
      */
     public function reverseTransform($id)
     {
-        if (null === $id) {
+        if (!$id) {
             return null;
         }
 

src/Bundle/ChillMainBundle/Form/Type/DataTransformer/UserToJsonTransformer.php

@@ -12,18 +12,14 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form\Type\DataTransformer;
 
 use Chill\MainBundle\Entity\User;
-use Chill\PersonBundle\Entity\Person;
-use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\SerializerInterface;
-use UnexpectedValueException;
-
 use function array_key_exists;
 
-class EntityToJsonTransformer implements DataTransformerInterface
+class UserToJsonTransformer implements DataTransformerInterface
 {
     private DenormalizerInterface $denormalizer;
 
@@ -31,36 +27,23 @@ class EntityToJsonTransformer implements DataTransformerInterface
 
     private SerializerInterface $serializer;
 
-    private string $type;
-
-    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, bool $multiple, string $type)
+    public function __construct(DenormalizerInterface $denormalizer, SerializerInterface $serializer, bool $multiple)
     {
         $this->denormalizer = $denormalizer;
         $this->serializer = $serializer;
         $this->multiple = $multiple;
-        $this->type = $type;
     }
 
     public function reverseTransform($value)
     {
-        $denormalized = json_decode($value, true);
-
         if ($this->multiple) {
-            if (null === $denormalized) {
-                return [];
-            }
-
             return array_map(
                 function ($item) { return $this->denormalizeOne($item); },
-                $denormalized
+                json_decode($value, true)
             );
         }
 
-        if ('' === $value) {
-            return null;
-        }
-
-        return $this->denormalizeOne($denormalized);
+        return $this->denormalizeOne(json_decode($value, true));
     }
 
     /**
@@ -77,7 +60,7 @@ class EntityToJsonTransformer implements DataTransformerInterface
         ]);
     }
 
-    private function denormalizeOne(array $item)
+    private function denormalizeOne(array $item): User
     {
         if (!array_key_exists('type', $item)) {
             throw new TransformationFailedException('the key "type" is missing on element');
@@ -87,30 +70,10 @@ class EntityToJsonTransformer implements DataTransformerInterface
             throw new TransformationFailedException('the key "id" is missing on element');
         }
 
-        switch ($this->type) {
-            case 'user':
-                $class = User::class;
-
-                break;
-
-            case 'person':
-                $class = Person::class;
-
-                break;
-
-            case 'thirdparty':
-                $class = ThirdParty::class;
-
-                break;
-
-            default:
-                throw new UnexpectedValueException('This type is not supported');
-        }
-
         return
             $this->denormalizer->denormalize(
                 ['type' => $item['type'], 'id' => $item['id']],
-                $class,
+                User::class,
                 'json',
                 [AbstractNormalizer::GROUPS => ['read']],
             );

src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php

@@ -12,7 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form\Type;
 
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer;
+use Chill\MainBundle\Form\Type\DataTransformer\UserToJsonTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
@@ -38,7 +38,7 @@ class PickUserDynamicType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addViewTransformer(new EntityToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple'], 'user'));
+        $builder->addViewTransformer(new UserToJsonTransformer($this->denormalizer, $this->serializer, $options['multiple']));
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options)
@@ -58,6 +58,6 @@ class PickUserDynamicType extends AbstractType
 
     public function getBlockPrefix()
     {
-        return 'pick_entity_dynamic';
+        return 'pick_user_dynamic';
     }
 }

src/Bundle/ChillMainBundle/Form/Type/ResidentialAddressType.php

@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Form\Type;
-
-use Chill\MainBundle\Entity\ResidentialAddress;
-use Chill\PersonBundle\Form\Type\PickPersonDynamicType;
-use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-final class ResidentialAddressType extends AbstractType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add('startDate', DateType::class, [
-                'required' => true,
-                'input' => 'datetime_immutable',
-                'widget' => 'single_text',
-            ])
-            ->add('endDate', DateType::class, [
-                'required' => false,
-                'input' => 'datetime_immutable',
-                'widget' => 'single_text',
-            ])
-            ->add('comment', CommentType::class, [
-                'required' => false,
-            ]);
-
-        if ('person' === $options['kind']) {
-            $builder
-                ->add('hostPerson', PickPersonDynamicType::class, [
-                    'label' => 'Person',
-                ]);
-        }
-
-        if ('thirdparty' === $options['kind']) {
-            $builder
-                ->add('hostThirdParty', PickThirdpartyDynamicType::class, [
-                    'label' => 'Third party',
-                ]);
-        }
-
-        if ('address' === $options['kind']) {
-            $builder
-                ->add('address', PickAddressType::class, [
-                    'required' => false,
-                    'label' => 'Address',
-                    'use_valid_from' => false,
-                    'use_valid_to' => false,
-                ]);
-        }
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults([
-            'data_class' => ResidentialAddress::class,
-            'kind' => null,
-        ]);
-    }
-}

src/Bundle/ChillMainBundle/Form/UserType.php

@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Form;
 
 use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
@@ -76,22 +75,6 @@ class UserType extends AbstractType
                 'choice_label' => function (UserJob $c) {
                     return $this->translatableStringHelper->localize($c->getLabel());
                 },
-            ])
-            ->add('mainLocation', EntityType::class, [
-                'label' => 'Main location',
-                'required' => false,
-                'placeholder' => 'choose a location',
-                'class' => Location::class,
-                'choice_label' => function (Location $l) {
-                    return $this->translatableStringHelper->localize($l->getLocationType()->getTitle()) . ' - ' . $l->getName();
-                },
-                'query_builder' => static function (EntityRepository $er) {
-                    $qb = $er->createQueryBuilder('l');
-                    $qb->orderBy('l.locationType');
-                    $qb->where('l.availableForUsers = TRUE');
-
-                    return $qb;
-                },
             ]);
 
         if ($options['is_creation']) {

src/Bundle/ChillMainBundle/Form/WorkflowStepType.php

@@ -1,141 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Form;
-
-use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflowStep;
-use Chill\MainBundle\Form\Type\ChillTextareaType;
-use Chill\MainBundle\Form\Type\PickUserDynamicType;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\MainBundle\Workflow\EntityWorkflowManager;
-use LogicException;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Workflow\Registry;
-use Symfony\Component\Workflow\Transition;
-use function array_key_exists;
-
-class WorkflowStepType extends AbstractType
-{
-    private EntityWorkflowManager $entityWorkflowManager;
-
-    private Registry $registry;
-
-    private TranslatableStringHelperInterface $translatableStringHelper;
-
-    public function __construct(EntityWorkflowManager $entityWorkflowManager, Registry $registry, TranslatableStringHelperInterface $translatableStringHelper)
-    {
-        $this->entityWorkflowManager = $entityWorkflowManager;
-        $this->registry = $registry;
-        $this->translatableStringHelper = $translatableStringHelper;
-    }
-
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        /** @var \Chill\MainBundle\Entity\Workflow\EntityWorkflow $entityWorkflow */
-        $entityWorkflow = $options['entity_workflow'];
-        $handler = $this->entityWorkflowManager->getHandler($entityWorkflow);
-        $workflow = $this->registry->get($entityWorkflow, $entityWorkflow->getWorkflowName());
-
-        if (true === $options['transition']) {
-            if (null === $options['entity_workflow']) {
-                throw new LogicException('if transition is true, entity_workflow should be defined');
-            }
-
-            $transitions = $this->registry
-                ->get($options['entity_workflow'], $entityWorkflow->getWorkflowName())
-                ->getEnabledTransitions($entityWorkflow);
-
-            $choices = array_combine(
-                array_map(
-                    static function (Transition $transition) {
-                        return $transition->getName();
-                    },
-                    $transitions
-                ),
-                $transitions
-            );
-
-            $builder
-                ->add('transition', ChoiceType::class, [
-                    'label' => 'workflow.Transition to apply',
-                    'mapped' => false,
-                    'multiple' => false,
-                    'expanded' => true,
-                    'choices' => $choices,
-                    'choice_label' => function (Transition $transition) use ($workflow) {
-                            $meta = $workflow->getMetadataStore()->getTransitionMetadata($transition);
-
-                            if (array_key_exists('label', $meta)) {
-                                return $this->translatableStringHelper->localize($meta['label']);
-                            }
-
-                            return $transition->getName();
-                        },
-                    'choice_attr' => static function (Transition $transition) use ($workflow) {
-                            $toFinal = true;
-
-                            foreach ($transition->getTos() as $to) {
-                                $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
-
-                                if (
-                                    !array_key_exists('isFinal', $meta) || false === $meta['isFinal']
-                                ) {
-                                    $toFinal = false;
-                                }
-                            }
-
-                            return [
-                                'data-is-transition' => 'data-is-transition',
-                                'data-to-final' => $toFinal ? '1' : '0',
-                            ];
-                        },
-                ])
-                ->add('future_dest_users', PickUserDynamicType::class, [
-                    'label' => 'workflow.dest for next steps',
-                    'multiple' => true,
-                    'mapped' => false,
-                ]);
-        }
-
-        if (
-            $handler->supportsFreeze($entityWorkflow)
-            && !$entityWorkflow->isFreeze()
-        ) {
-            $builder
-                ->add('freezeAfter', CheckboxType::class, [
-                    'required' => false,
-                    'label' => 'workflow.Freeze',
-                    'help' => 'workflow.The associated element will be freezed',
-                ]);
-        }
-
-        $builder
-            ->add('comment', ChillTextareaType::class, [
-                'required' => false,
-                'label' => 'Comment',
-            ]);
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver
-            ->setDefined('class', EntityWorkflowStep::class)
-            ->setRequired('transition')
-            ->setAllowedTypes('transition', 'bool')
-            ->setRequired('entity_workflow')
-            ->setAllowedTypes('entity_workflow', EntityWorkflow::class);
-    }
-}

src/Bundle/ChillMainBundle/Form/WorkflowTransitionType.php

@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Chill\MainBundle\Form;
-
-use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class WorkflowTransitionType extends AbstractType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add('current_step', WorkflowStepType::class, [
-                'transition' => true,
-                'entity_workflow' => $options['entity_workflow'],
-            ]);
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver
-            ->setRequired('entity_workflow')
-            ->setAllowedTypes('entity_workflow', EntityWorkflow::class);
-    }
-}