Merge remote-tracking branch 'origin/master' into calendar/synchro-msgraph

src/Bundle/ChillPersonBundle/Controller/AdminController.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Routing\Annotation\Route;
 
 /**
  * Class AdminController.
@@ -19,13 +20,35 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 class AdminController extends AbstractController
 {
     /**
-     * @param $_locale
-     *
-     * @return \Symfony\Component\HttpFoundation\Response
+     * @Route("/{_locale}/admin/accompanying-course", name="chill_accompanying-course_admin_index")
      */
-    public function indexAction($_locale)
+    public function indexAccompanyingCourseAdminAction()
     {
-        return $this->render('ChillPersonBundle:Admin:layout.html.twig', []);
+        return $this->render('ChillPersonBundle:Admin:indexAccompanyingCourse.html.twig');
+    }
+
+    /**
+     * @Route("/{_locale}/admin/household", name="chill_household_admin_index")
+     */
+    public function indexHouseholdAdminAction()
+    {
+        return $this->render('ChillPersonBundle:Admin:indexHousehold.html.twig');
+    }
+
+    /**
+     * @Route("/{_locale}/admin/person", name="chill_person_admin_index")
+     */
+    public function indexPersonAdminAction()
+    {
+        return $this->render('ChillPersonBundle:Admin:indexPerson.html.twig');
+    }
+
+    /**
+     * @Route("/{_locale}/admin/social-work", name="chill_social-work_admin_index")
+     */
+    public function indexSocialWorkAdminAction()
+    {
+        return $this->render('ChillPersonBundle:Admin:indexSocialWork.html.twig');
     }
 
     /**

src/Bundle/ChillPersonBundle/Controller/AdminMaritalStatusController.php

@@ -1,22 +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\PersonBundle\Controller;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminMaritalStatusController.
- */
-class AdminMaritalStatusController extends CRUDController
-{
-    // for minimal cases, nothing is required here !
-}

src/Bundle/ChillPersonBundle/Controller/ClosingMotiveController.php

@@ -16,13 +16,13 @@ use Chill\MainBundle\Pagination\PaginatorInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Class AdminClosingMotiveController
+ * Class ClosingMotiveController
  * Controller for closing motives.
  */
-class AdminClosingMotiveController extends CRUDController
+class ClosingMotiveController extends CRUDController
 {
     /**
-     * @param \Chill\MainBundle\CRUD\Controller\string|string $action
+     * @param string $action
      */
     protected function createEntity($action, Request $request): object
     {

src/Bundle/ChillPersonBundle/Controller/HouseholdPositionController.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class HouseholdPositionController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/Controller/MaritalStatusController.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class MaritalStatusController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/Controller/OriginController.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class OriginController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/Controller/PersonResourceKindController.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class PersonResourceKindController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/Controller/RelationController.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class RelationController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminEvaluationController.php

@@ -1,22 +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\PersonBundle\Controller\SocialWork;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminSocialIssueController
- * Controller for social issues.
- */
-class AdminEvaluationController extends CRUDController
-{
-}

src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminGoalController.php

@@ -1,22 +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\PersonBundle\Controller\SocialWork;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminSocialIssueController
- * Controller for social issues.
- */
-class AdminGoalController extends CRUDController
-{
-}

src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminResultController.php

@@ -1,22 +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\PersonBundle\Controller\SocialWork;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminSocialIssueController
- * Controller for social issues.
- */
-class AdminResultController extends CRUDController
-{
-}

src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialActionController.php

@@ -1,22 +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\PersonBundle\Controller\SocialWork;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminSocialIssueController
- * Controller for social issues.
- */
-class AdminSocialActionController extends CRUDController
-{
-}

src/Bundle/ChillPersonBundle/Controller/SocialWork/AdminSocialIssueController.php

@@ -1,22 +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\PersonBundle\Controller\SocialWork;
-
-use Chill\MainBundle\CRUD\Controller\CRUDController;
-
-/**
- * Class AdminSocialIssueController
- * Controller for social issues.
- */
-class AdminSocialIssueController extends CRUDController
-{
-}

src/Bundle/ChillPersonBundle/Controller/SocialWork/EvaluationController.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class EvaluationController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/Controller/SocialWork/GoalController.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class GoalController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/Controller/SocialWork/ResultController.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class ResultController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.id', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialActionController.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class SocialActionController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.ordering', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/Controller/SocialWork/SocialIssueController.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Controller\SocialWork;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class SocialIssueController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query->addOrderBy('e.ordering', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}

src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php

@@ -146,13 +146,13 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                 [
                     'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive::class,
                     'name' => 'closing_motive',
-                    'base_path' => '/admin/closing-motive',
+                    'base_path' => '/admin/person/closing-motive',
                     'form_class' => \Chill\PersonBundle\Form\ClosingMotiveType::class,
-                    'controller' => \Chill\PersonBundle\Controller\AdminClosingMotiveController::class,
+                    'controller' => \Chill\PersonBundle\Controller\ClosingMotiveController::class,
                     'actions' => [
                         'index' => [
-                            'template' => '@ChillPerson/ClosingMotive/index.html.twig',
                             'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/ClosingMotive/index.html.twig',
                         ],
                         'new' => [
                             'role' => 'ROLE_ADMIN',
@@ -164,12 +164,33 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                     ],
                 ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\AccompanyingPeriod\Origin::class,
+                    'name' => 'origin',
+                    'base_path' => '/admin/person/origin',
+                    'form_class' => \Chill\PersonBundle\Form\OriginType::class,
+                    'controller' => \Chill\PersonBundle\Controller\OriginController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Origin/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Origin/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Origin/edit.html.twig',
+                        ],
+                    ],
+                ],
                 [
                     'class' => \Chill\PersonBundle\Entity\MaritalStatus::class,
-                    'name' => 'marital_status',
-                    'base_path' => '/admin/marital-status',
+                    'name' => 'person_marital-status',
+                    'base_path' => '/admin/person/marital-status',
                     'form_class' => \Chill\PersonBundle\Form\MaritalStatusType::class,
-                    'controller' => \Chill\PersonBundle\Controller\AdminMaritalStatusController::class,
+                    'controller' => \Chill\PersonBundle\Controller\MaritalStatusController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
@@ -185,12 +206,75 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                     ],
                 ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\Household\Position::class,
+                    'name' => 'person_household_position',
+                    'base_path' => '/admin/person/household/position',
+                    'form_class' => \Chill\PersonBundle\Form\HouseholdPositionType::class,
+                    'controller' => \Chill\PersonBundle\Controller\HouseholdPositionController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/HouseholdPosition/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/HouseholdPosition/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/HouseholdPosition/edit.html.twig',
+                        ],
+                    ],
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\Relationships\Relation::class,
+                    'name' => 'person_relation',
+                    'base_path' => '/admin/person/relation',
+                    'form_class' => \Chill\PersonBundle\Form\RelationType::class,
+                    'controller' => \Chill\PersonBundle\Controller\RelationController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Relation/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Relation/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/Relation/edit.html.twig',
+                        ],
+                    ],
+                ],
+                [
+                    'class' => \Chill\PersonBundle\Entity\Person\PersonResourceKind::class,
+                    'name' => 'person_resource-kind',
+                    'base_path' => '/admin/person/resource-kind',
+                    'form_class' => \Chill\PersonBundle\Form\PersonResourceKindType::class,
+                    'controller' => \Chill\PersonBundle\Controller\PersonResourceKindController::class,
+                    'actions' => [
+                        'index' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/PersonResourceKind/index.html.twig',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/PersonResourceKind/new.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillPerson/PersonResourceKind/edit.html.twig',
+                        ],
+                    ],
+                ],
                 [
                     'class' => \Chill\PersonBundle\Entity\SocialWork\SocialIssue::class,
                     'name' => 'social_issue',
                     'base_path' => '/admin/social-work/social-issue',
                     'form_class' => \Chill\PersonBundle\Form\SocialWork\SocialIssueType::class,
-                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminSocialIssueController::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\SocialIssueController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
@@ -202,7 +286,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillPerson/SocialWork/edit.html.twig',
+                            'template' => '@ChillPerson/SocialWork/SocialIssue/edit.html.twig',
                         ],
                     ],
                 ],
@@ -211,7 +295,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'name' => 'social_action',
                     'base_path' => '/admin/social-work/social-action',
                     'form_class' => \Chill\PersonBundle\Form\SocialWork\SocialActionType::class,
-                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminSocialActionController::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\SocialActionController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
@@ -223,7 +307,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
-                            'template' => '@ChillPerson/SocialWork/edit.html.twig',
+                            'template' => '@ChillPerson/SocialWork/SocialAction/edit.html.twig',
                         ],
                     ],
                 ],
@@ -232,7 +316,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'name' => 'social_goal',
                     'base_path' => '/admin/social-work/goal',
                     'form_class' => \Chill\PersonBundle\Form\SocialWork\GoalType::class,
-                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminGoalController::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\GoalController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
@@ -253,7 +337,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'name' => 'social_result',
                     'base_path' => '/admin/social-work/result',
                     'form_class' => \Chill\PersonBundle\Form\SocialWork\ResultType::class,
-                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminResultController::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\ResultController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',
@@ -274,7 +358,7 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
                     'name' => 'social_evaluation',
                     'base_path' => '/admin/social-work/evaluation',
                     'form_class' => \Chill\PersonBundle\Form\SocialWork\EvaluationType::class,
-                    'controller' => \Chill\PersonBundle\Controller\SocialWork\AdminEvaluationController::class,
+                    'controller' => \Chill\PersonBundle\Controller\SocialWork\EvaluationController::class,
                     'actions' => [
                         'index' => [
                             'role' => 'ROLE_ADMIN',

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -978,6 +978,11 @@ class AccompanyingPeriod implements
         return null !== $this->userPrevious;
     }
 
+    public function hasUser(): bool
+    {
+        return null !== $this->user;
+    }
+
     public function isChangedUser(): bool
     {
         return $this->userIsChanged && $this->user !== $this->userPrevious;

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php

@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\AccompanyingPeriod\SocialIssueConsistency\AccompanyingPeriodLinkedWithSocialIssuesEntityInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -143,6 +144,12 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
      */
     private Collection $persons;
 
+    /**
+     * @ORM\Embedded(class="Chill\MainBundle\Entity\Embeddable\PrivateCommentEmbeddable", columnPrefix="privateComment_")
+     * @Serializer\Groups({"read", "accompanying_period_work:edit"})
+     */
+    private PrivateCommentEmbeddable $privateComment;
+
     /**
      * @ORM\ManyToMany(targetEntity=User::class)
      * @ORM\JoinTable(name="chill_person_accompanying_period_work_referrer")
@@ -202,6 +209,7 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
     public function __construct()
     {
         $this->goals = new ArrayCollection();
+        $this->privateComment = new PrivateCommentEmbeddable();
         $this->results = new ArrayCollection();
         $this->thirdParties = new ArrayCollection();
         $this->persons = new ArrayCollection();
@@ -328,6 +336,11 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this->persons;
     }
 
+    public function getPrivateComment(): PrivateCommentEmbeddable
+    {
+        return $this->privateComment;
+    }
+
     /**
      * @return Collection|User[]
      */
@@ -505,6 +518,13 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
         return $this;
     }
 
+    public function setPrivateComment(PrivateCommentEmbeddable $privateComment): self
+    {
+        $this->privateComment->merge($privateComment);
+
+        return $this;
+    }
+
     public function setSocialAction(?SocialAction $socialAction): self
     {
         $this->socialAction = $socialAction;

src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php

@@ -121,14 +121,14 @@ class Evaluation
         return $this;
     }
 
-    public function setDelay(DateInterval $delay): self
+    public function setDelay(?DateInterval $delay): self
     {
         $this->delay = $delay;
 
         return $this;
     }
 
-    public function setNotificationDelay(DateInterval $notificationDelay): self
+    public function setNotificationDelay(?DateInterval $notificationDelay): self
     {
         $this->notificationDelay = $notificationDelay;
 

src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php

@@ -45,7 +45,7 @@ class Result
     /**
      * @ORM\Column(type="datetime", nullable=true)
      */
-    private DateTime $desactivationDate;
+    private ?DateTime $desactivationDate;
 
     /**
      * @ORM\ManyToMany(targetEntity=Goal::class, mappedBy="results")

src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php

@@ -46,10 +46,8 @@ class SocialAction
     private $desactivationDate;
 
     /**
-     * @ORM\ManyToMany(
-     *     targetEntity=Evaluation::class,
-     *     mappedBy="socialActions"
-     * )
+     * @ORM\ManyToMany(targetEntity=Evaluation::class, inversedBy="socialActions")
+     * @ORM\JoinTable(name="chill_person_social_work_evaluation_action")
      */
     private Collection $evaluations;
 
@@ -110,6 +108,15 @@ class SocialAction
         return $this;
     }
 
+    public function addEvaluation(Evaluation $evaluation): self
+    {
+        if (!$this->evaluations->contains($evaluation)) {
+            $this->evaluations[] = $evaluation;
+        }
+
+        return $this;
+    }
+
     public function addGoal(Goal $goal): self
     {
         if (!$this->goals->contains($goal)) {
@@ -300,6 +307,13 @@ class SocialAction
         return $this;
     }
 
+    public function removeEvaluation(Evaluation $evaluation): self
+    {
+        $this->evaluations->removeElement($evaluation);
+
+        return $this;
+    }
+
     public function removeGoal(Goal $goal): self
     {
         $this->goals->removeElement($goal);

src/Bundle/ChillPersonBundle/Form/HouseholdPositionType.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\Household\Position;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class HouseholdPositionType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('label', TranslatableStringFormType::class)
+            ->add('allowHolder', CheckboxType::class, [
+                'required' => false,
+                'label' => 'household.allowHolder',
+            ])
+            ->add('shareHousehold', CheckboxType::class, [
+                'required' => false,
+                'label' => 'household.shareHousehold',
+            ])
+            ->add('ordering', NumberType::class, [
+                'required' => true,
+                'scale' => 5,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', Position::class);
+    }
+}

src/Bundle/ChillPersonBundle/Form/OriginType.php

@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\AccompanyingPeriod\Origin;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class OriginType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('label', TranslatableStringFormType::class)
+            ->add('noActiveAfter', ChillDateType::class, [
+                'required' => false,
+                'input' => 'datetime_immutable',
+                'label' => 'origin.noActiveAfter',
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', Origin::class);
+    }
+}

src/Bundle/ChillPersonBundle/Form/PersonResourceKindType.php

@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\Person\PersonResourceKind;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class PersonResourceKindType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('title', TranslatableStringFormType::class)
+            ->add('isActive', ChoiceType::class, [
+                'choices' => [
+                    'Active' => true,
+                    'Inactive' => false,
+                ],
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', PersonResourceKind::class);
+    }
+}

src/Bundle/ChillPersonBundle/Form/RelationType.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Form;
+
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\PersonBundle\Entity\Relationships\Relation;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class RelationType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('title', TranslatableStringFormType::class, [
+                'label' => 'relation.title',
+            ])
+            ->add('reverseTitle', TranslatableStringFormType::class, [
+                'label' => 'relation.reverseTitle',
+            ])
+            ->add('isActive', CheckboxType::class, [
+                'required' => false,
+            ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver
+            ->setDefault('class', Relation::class);
+    }
+}

src/Bundle/ChillPersonBundle/Form/SocialWork/EvaluationType.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\DateIntervalType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Evaluation;
@@ -39,9 +40,14 @@ class EvaluationType extends AbstractType
             ->add('title', TranslatableStringFormType::class, [
                 'label' => 'Nom',
             ])
-            ->add('delay')
-
-            ->add('notificationDelay');
+            ->add('delay', DateIntervalType::class, [
+                'label' => 'evaluation.delay',
+                'required' => false,
+            ])
+            ->add('notificationDelay', DateIntervalType::class, [
+                'label' => 'evaluation.notificationDelay',
+                'required' => false,
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)

src/Bundle/ChillPersonBundle/Form/SocialWork/GoalType.php

@@ -11,13 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Goal;
-use Chill\PersonBundle\Entity\SocialWork\SocialAction;
+use Chill\PersonBundle\Entity\SocialWork\Result;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -42,21 +42,18 @@ class GoalType extends AbstractType
             ->add('title', TranslatableStringFormType::class, [
                 'label' => 'Nom',
             ])
-
-            ->add('socialActions', EntityType::class, [
-                'class' => SocialAction::class,
+            ->add('results', EntityType::class, [
+                'class' => Result::class,
                 'required' => false,
                 'multiple' => true,
-                'choice_label' => function (SocialAction $issue) {
-                    return $this->translatableStringHelper->localize($issue->getTitle());
+                'choice_label' => function (Result $r) {
+                    return $this->translatableStringHelper->localize($r->getTitle());
                 },
+                'attr' => ['class' => 'select2 '],
             ])
-
-            ->add('desactivationDate', DateType::class, [
-                'attr' => ['class' => 'datepicker'],
-                'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy',
+            ->add('desactivationDate', ChillDateType::class, [
                 'required' => false,
+                'label' => 'goal.desactivationDate',
             ]);
     }
 

src/Bundle/ChillPersonBundle/Form/SocialWork/ResultType.php

@@ -11,11 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Entity\SocialWork\Result;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -40,13 +40,10 @@ class ResultType extends AbstractType
             ->add('title', TranslatableStringFormType::class, [
                 'label' => 'Nom',
             ])
-            ->add('accompanyingPeriodWorks')
-            ->add('accompanyingPeriodWorkGoals')
-            ->add('desactivationDate', DateType::class, [
-                'attr' => ['class' => 'datepicker'],
-                'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy',
+
+            ->add('desactivationDate', ChillDateType::class, [
                 'required' => false,
+                'label' => 'goal.desactivationDate',
             ]);
     }
 

src/Bundle/ChillPersonBundle/Form/SocialWork/SocialActionType.php

@@ -11,13 +11,18 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\ChillDateType;
+use Chill\MainBundle\Form\Type\DateIntervalType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
+use Chill\PersonBundle\Entity\SocialWork\Evaluation;
+use Chill\PersonBundle\Entity\SocialWork\Goal;
+use Chill\PersonBundle\Entity\SocialWork\Result;
 use Chill\PersonBundle\Entity\SocialWork\SocialAction;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -44,6 +49,7 @@ class SocialActionType extends AbstractType
             ])
             ->add('issue', EntityType::class, [
                 'class' => SocialIssue::class,
+                'label' => 'socialAction.socialIssue',
                 'choice_label' => function (SocialIssue $issue) {
                     return $this->translatableStringHelper->localize($issue->getTitle());
                 },
@@ -55,12 +61,47 @@ class SocialActionType extends AbstractType
                     return $this->translatableStringHelper->localize($issue->getTitle());
                 },
             ])
-            ->add('defaultNotificationDelay')
-            ->add('desactivationDate', DateType::class, [
-                'attr' => ['class' => 'datepicker'],
-                'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy',
+            ->add('ordering', NumberType::class, [
+                'required' => true,
+                'scale' => 6,
+            ])
+            ->add('results', EntityType::class, [
+                'class' => Result::class,
                 'required' => false,
+                'multiple' => true,
+                'attr' => ['class' => 'select2'],
+                'choice_label' => function (Result $r) {
+                    return $this->translatableStringHelper->localize($r->getTitle());
+                },
+            ])
+
+            ->add('goals', EntityType::class, [
+                'class' => Goal::class,
+                'required' => false,
+                'multiple' => true,
+                'attr' => ['class' => 'select2'],
+                'choice_label' => function (Goal $g) {
+                    return $this->translatableStringHelper->localize($g->getTitle());
+                },
+            ])
+
+            ->add('evaluations', EntityType::class, [
+                'class' => Evaluation::class,
+                'required' => false,
+                'multiple' => true,
+                'attr' => ['class' => 'select2'],
+                'choice_label' => function (Evaluation $e) {
+                    return $this->translatableStringHelper->localize($e->getTitle());
+                },
+            ])
+
+            ->add('defaultNotificationDelay', DateIntervalType::class, [
+                'label' => 'socialAction.defaultNotificationDelay',
+                'required' => false,
+            ])
+            ->add('desactivationDate', ChillDateType::class, [
+                'required' => false,
+                'label' => 'goal.desactivationDate',
             ]);
     }
 

src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php

@@ -11,12 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form\SocialWork;
 
+use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -41,10 +42,12 @@ class SocialIssueType extends AbstractType
                 'required' => false,
                 'choice_label' => fn (SocialIssue $issue): ?string => $this->translatableStringHelper->localize($issue->getTitle()),
             ])
-            ->add('desactivationDate', DateType::class, [
-                'attr' => ['class' => 'datepicker'],
-                'widget' => 'single_text',
-                'format' => 'dd-MM-yyyy',
+            ->add('ordering', NumberType::class, [
+                'required' => true,
+                'scale' => 6,
+            ])
+            ->add('desactivationDate', ChillDateType::class, [
+                'label' => 'goal.desactivationDate',
                 'required' => false,
             ]);
     }

src/Bundle/ChillPersonBundle/Menu/AdminAccompanyingCourseMenuBuilder.php

@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminAccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('person_admin.accompanying_period', [
+            'route' => 'chill_accompanying-course_admin_index',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras([
+                'order' => 2200,
+                'icons' => ['random'],
+            ]);
+
+        $menu->addChild('person_admin.closing motives', [
+            'route' => 'chill_crud_closing_motive_index',
+        ])->setExtras(['order' => 2210]);
+
+        $menu->addChild('person_admin.origin', [
+            'route' => 'chill_crud_origin_index',
+        ])->setExtras(['order' => 2210]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section', 'admin_accompanying_course'];
+    }
+}

src/Bundle/ChillPersonBundle/Menu/AdminHouseholdMenuBuilder.php

@@ -15,7 +15,7 @@ use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
 use Knp\Menu\MenuItem;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
-class AdminMenuBuilder implements LocalMenuBuilderInterface
+class AdminHouseholdMenuBuilder implements LocalMenuBuilderInterface
 {
     /**
      * @var AuthorizationCheckerInterface
@@ -33,16 +33,26 @@ class AdminMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild('Person', [
-            'route' => 'chill_person_admin',
+        $menu->addChild('Household', [
+            'route' => 'chill_household_admin_index',
         ])
+            ->setAttribute('class', 'list-group-item-header')
             ->setExtras([
-                'order' => 20,
+                'order' => 2100,
+                'icons' => ['home'],
             ]);
+
+        $menu->addChild('Position', [
+            'route' => 'chill_crud_person_household_position_index',
+        ])->setExtras(['order' => 2110]);
+
+        $menu->addChild('person_admin.relation', [
+            'route' => 'chill_crud_person_relation_index',
+        ])->setExtras(['order' => 2120]);
     }
 
     public static function getMenuIds(): array
     {
-        return ['admin_section'];
+        return ['admin_section', 'admin_household'];
     }
 }

src/Bundle/ChillPersonBundle/Menu/AdminPersonMenuBuilder.php

@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminPersonMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('Person', [
+            'route' => 'chill_person_admin_index',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras([
+                'order' => 2000,
+                'icons' => ['child'],
+            ]);
+
+        $menu->addChild('Civility', [
+            'route' => 'chill_crud_main_civility_index',
+        ])->setExtras(['order' => 2010]);
+
+        $menu->addChild('Marital status', [
+            'route' => 'chill_crud_person_marital-status_index',
+        ])->setExtras(['order' => 2020]);
+
+        $menu->addChild('person_admin.person_resource_kind', [
+            'route' => 'chill_crud_person_resource-kind_index',
+        ])->setExtras(['order' => 2030]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section', 'admin_person'];
+    }
+}

src/Bundle/ChillPersonBundle/Menu/AdminSocialWorkMenuBuilder.php

@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\PersonBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminSocialWorkMenuBuilder implements LocalMenuBuilderInterface
+{
+    /**
+     * @var AuthorizationCheckerInterface
+     */
+    protected $authorizationChecker;
+
+    public function __construct(AuthorizationCheckerInterface $authorizationChecker)
+    {
+        $this->authorizationChecker = $authorizationChecker;
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('person_admin.social_work', [
+            'route' => 'chill_social-work_admin_index',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras([
+                'order' => 2300,
+                'icons' => ['handshake-o'],
+            ]);
+
+        $menu->addChild('person_admin.social_action', [
+            'route' => 'chill_crud_social_action_index',
+        ])->setExtras(['order' => 2301]);
+
+        $menu->addChild('person_admin.social_issue', [
+            'route' => 'chill_crud_social_issue_index',
+        ])->setExtras(['order' => 2302]);
+
+        $menu->addChild('person_admin.social_goal', [
+            'route' => 'chill_crud_social_goal_index',
+        ])->setExtras(['order' => 2310]);
+
+        $menu->addChild('person_admin.social_evaluation', [
+            'route' => 'chill_crud_social_evaluation_index',
+        ])->setExtras(['order' => 2320]);
+
+        $menu->addChild('person_admin.social_result', [
+            'route' => 'chill_crud_social_result_index',
+        ])->setExtras(['order' => 2330]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section', 'admin_social_work'];
+    }
+}

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js

@@ -253,7 +253,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                state.accompanyingCourse.administrativeLocation = value;
             },
             updateReferrer(state, value) {
-               //console.log('value', value);
                state.accompanyingCourse.user = value;
             },
             updateJob(state, value) {
@@ -775,9 +774,7 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      throw error;
                   })
             },
-            updateReferrer({ commit }, payload) {
-               console.log('update referrer', payload);
-               console.log('payload !== null', payload !== null);
+            updateReferrer({ commit, state }, payload) {
                const url = `/api/1.0/person/accompanying-course/${id}.json`;
                let body = { type: "accompanying_period", user: null };
 
@@ -788,7 +785,10 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                return makeFetch('PATCH', url, body)
                   .then((response) => {
                      commit('updateReferrer', response.user);
-                     commit('setFilteredReferrersSuggested');
+                     if (null !== payload.user_job && payload.user_job !== state.accompanyingCourse.job) {
+                        this.dispatch('updateJob', payload.user_job);
+                     }
+                     // commit('setFilteredReferrersSuggested'); // this mutation doesn't exist?
                   })
                   .catch((error) => {
                      commit('catchError', error);
@@ -799,6 +799,8 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                const url = `/api/1.0/person/accompanying-course/${id}.json`;
                let body = { type: "accompanying_period", job: null };
 
+               console.log('update job', payload);
+
                if (payload !== null) {
                   body = { type: "accompanying_period", job: { id: payload.id, type: payload.type } };
                }

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue

@@ -24,6 +24,15 @@
          <input v-model="endDate" type="date" class="form-control" />
       </div>
 
+      <div id="privateComment" class="action-row">
+         <label class="col-form-label">{{ $t('private_comment') }}</label>
+         <ckeditor
+            v-model="privateComment"
+            :editor="editor"
+            tag-name="textarea"
+         ></ckeditor>
+      </div>
+
       <div id="comment" class="action-row">
          <label class="col-form-label">{{ $t('comments') }}</label>
          <ckeditor
@@ -33,6 +42,7 @@
          ></ckeditor>
       </div>
 
+
       <div id="objectives" class="action-row">
          <div aria="hidden" class="title">
             <div><h3>{{ $t('goals_title') }}</h3></div>
@@ -141,12 +151,12 @@
 
          <ul class="list-unstyled">
             <li v-for="p in personsReachables" :key="p.id">
-              <div class="form-check">
-                <input v-model="personsPicked" :value="p.id" type="checkbox" class="me-2 form-check-input" :id="'person_check'+p.id">
-                <label :for="'person_check'+p.id" class="form-check-label">
-                  <person-text :person="p"></person-text>
-               </label>
-              </div>
+               <div class="form-check">
+                  <input v-model="personsPicked" :value="p.id" type="checkbox" class="me-2 form-check-input" :id="'person_check'+p.id">
+                  <label :for="'person_check'+p.id" class="form-check-label">
+                     <person-text :person="p"></person-text>
+                  </label>
+               </div>
             </li>
          </ul>
       </div>
@@ -274,18 +284,18 @@
       </div>
 
    </div>
-  <ul class="record_actions sticky-form-buttons">
-    <li>
-       <list-workflow-modal
-          :workflows="this.work.workflows"
-          :allowCreate="true"
-          relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
-          :relatedEntityId="this.work.id"
-          :workflowsAvailables="this.work.workflows_availables"
-          :preventDefaultMoveToGenerate="true"
-          @go-to-generate-workflow="goToGenerateWorkflow"
-       ></list-workflow-modal>
-    </li>
+   <ul class="record_actions sticky-form-buttons">
+      <li>
+         <list-workflow-modal
+            :workflows="this.work.workflows"
+            :allowCreate="true"
+            relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
+            :relatedEntityId="this.work.id"
+            :workflowsAvailables="this.work.workflows_availables"
+            :preventDefaultMoveToGenerate="true"
+            @go-to-generate-workflow="goToGenerateWorkflow"
+         ></list-workflow-modal>
+      </li>
 
       <li v-if="!isPosting">
          <button class="btn btn-save" @click="submit">
@@ -355,7 +365,8 @@ const i18n = {
          referrers: "Agents traitants",
          no_referrers: "Aucun agent traitant",
          choose_referrers: "Choisir des agents traitants",
-         remove_referrer: "Enlever l'agent"
+         remove_referrer: "Enlever l'agent",
+         private_comment: "Commentaire privé"
       }
    }
 };
@@ -417,8 +428,8 @@ export default {
          },
       };
    },
-  computed: {
-    ...mapState([
+   computed: {
+      ...mapState([
          'work',
          'resultsForAction',
          'evaluationsForAction',
@@ -461,6 +472,14 @@ export default {
             this.$store.commit('setNote', v);
          }
       },
+      privateComment: {
+         get() {
+            return this.$store.state.privateComment;
+         },
+         set(v) {
+            this.$store.commit('setPrivateComment', v);
+         }
+      },
       availableForCheckGoal() {
          let pickedIds = this.$store.state.goalsPicked.map(g => g.goal.id);
 
@@ -573,6 +592,7 @@ div#workEditor {
       "title title"
       "startDate endDate"
       "comment comment"
+      "privateComment privateComment"
       "objectives objectives"
       "evaluations evaluations"
       "persons persons"
@@ -589,6 +609,8 @@ div#workEditor {
       grid-area: endDate; }
    #comment {
       grid-area: comment; }
+   #privateComment {
+      grid-area: privateComment; }
    #objectives {
       grid-area: objectives; }
    #evaluations {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js

@@ -17,6 +17,7 @@ const store = createStore({
     endDate: window.accompanyingCourseWork.endDate !== null ?
         dateToISO(new Date(window.accompanyingCourseWork.endDate.datetime)) : null,
     note: window.accompanyingCourseWork.note,
+    privateComment: window.accompanyingCourseWork.privateComment,
     goalsPicked: window.accompanyingCourseWork.goals,
     goalsForAction: [],
     resultsPicked: window.accompanyingCourseWork.results,
@@ -79,6 +80,7 @@ const store = createStore({
           datetime: datetimeToISO(ISOToDate(state.endDate))
         },
         note: state.note,
+        privateComment: state.privateComment,
         persons: state.personsPicked.map(p => ({id: p.id, type: p.type})),
         handlingThierParty: state.handlingThirdParty === null ? null : {
           id: state.handlingThirdParty.id,
@@ -297,6 +299,9 @@ const store = createStore({
     setNote(state, note) {
       state.note = note;
     },
+    setPrivateComment(state, privateComment) {
+      state.privateComment = privateComment;
+    },
     setHandlingThirdParty(state, thirdParty) {
       state.handlingThirdParty = thirdParty;
     },
@@ -454,6 +459,8 @@ const store = createStore({
       ;
       commit('setIsPosting', true);
 
+      console.log('payload', payload);
+
       return makeFetch('PUT', url, payload)
         .then(data => {
           if (typeof(callback) !== 'undefined') {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue

@@ -305,7 +305,8 @@ export default {
                   if (this.listenPersonFlag === 'normal') {
                      if (person.folded === true) {
                         //console.log('   @@> expand mode event')
-                        this.$store.commit('unfoldPerson', person)
+                        this.$store.commit('unfoldPerson', person);
+                        this.$store.dispatch('fetchInfoForPerson', person);
                      }
                   } else {
                      //console.log('   @@> create link mode event')

src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/store.js

@@ -252,7 +252,6 @@ const store = createStore({
             if (!person.folded) {
                 return;
             }
-            //console.log('unfoldPerson', person)
             person.label = person._label
             delete person._label
             delete person.title

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig

@@ -30,6 +30,19 @@
 <div class="accompanyingcourse-resume">
     <div id="dashboards" class="row g-3" data-masonry='{"percentPosition": true }'>
 
+        {% if 'CLOSED' == accompanyingCourse.step %}
+            <div class="mbloc col col-sm-6 col-lg-4">
+                <div class="warnings">
+                    <div class="alert alert-danger">
+                        <h2>{{ 'This course is closed'|trans }}</h2>
+                        <p>
+                            {{ 'Closing motive'|trans }} : {{ accompanyingCourse.closingMotive.name|localize_translatable_string }}
+                        </p>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
+
         {% if 'DRAFT' == accompanyingCourse.step %}
             <div class="mbloc col col-sm-6 col-lg-4">
                 <div class="warnings">
@@ -197,10 +210,28 @@
                             </a>
                         </div>
                     {% endif %}
-                    <div class="d-grid gap-2">
-                        <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod', 'entityId': accompanyingCourse.id}) }}">
+                    <div class="d-grid gap-2 {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}btn-group{% endif %}" {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}role="group"{% endif %}>
+                        {% if accompanyingCourse.hasUser and accompanyingCourse.user is not same as(app.user) %}
+                        <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                             {{ 'notification.Notify'|trans }}
-                        </a>
+                        </button>
+                        <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+                            <li>
+                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod', 'entityId': accompanyingCourse.id, 'tos': [accompanyingCourse.user.id]}) }}">
+                                    {{ 'notification.Notify referrer'|trans }}
+                                </a>
+                            </li>
+                            <li>
+                                <a class="dropdown-item" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod', 'entityId': accompanyingCourse.id}) }}">
+                                    {{ 'notification.Notify any'|trans }}
+                                </a>
+                            </li>
+                        </ul>
+                        {% else %}
+                            <a class="btn btn-notify" href="{{ chill_path_add_return_path('chill_main_notification_create', {'entityClass': 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod', 'entityId': accompanyingCourse.id}) }}">
+                                {{ 'notification.Notify'|trans }}
+                            </a>
+                        {% endif %}
                     </div>
                 </div>
             </div>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig

@@ -1,5 +1,9 @@
 {% extends "@ChillMain/layoutWithVerticalMenu.html.twig" %}
 
+{% block head_custom %}
+<link rel="preload" href="{{ preload(path('chill_api_single_accompanying_course__entity', {'id': accompanyingCourse.id, '_format': 'json' }), {as: 'fetch'}) }}" as="fetch" />
+{% endblock %}
+
 {% block top_banner %}
     {{ include('@ChillPerson/AccompanyingCourse/banner.html.twig', { title: block('title') }) }}
 {% endblock %}
@@ -17,7 +21,7 @@
         'layout': '@ChillPerson/menu.html.twig',
         'args' : { 'accompanyingCourse': accompanyingCourse }
     }) }}
-    
+
     {% block block_post_menu %}
     {% endblock %}
 

src/Bundle/ChillPersonBundle/Resources/views/Admin/indexAccompanyingCourse.html.twig

@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_accompanying_course', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Accompanying course configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}

src/Bundle/ChillPersonBundle/Resources/views/Admin/indexHousehold.html.twig

@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_household', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Household configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}

src/Bundle/ChillPersonBundle/Resources/views/Admin/indexPerson.html.twig

@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_person', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Person configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}

src/Bundle/ChillPersonBundle/Resources/views/Admin/indexSocialWork.html.twig

@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_social_work', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Social work configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}

src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/edit.html.twig

@@ -1,12 +1,11 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/index.html.twig

@@ -1,6 +1,6 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Ordering'|trans }}</th>
@@ -36,5 +36,11 @@
             </tr>
         {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/ClosingMotive/new.html.twig

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

src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/edit.html.twig

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

src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/index.html.twig

@@ -0,0 +1,49 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Label'|trans }}</th>
+            <th>{{ 'household.allowHolder'|trans }}</th>
+            <th>{{ 'household.shareHousehold'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.label|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.allowHolder -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td style="text-align:center;">
+						{%- if entity.shareHousehold -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_person_household_position_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/HouseholdPosition/new.html.twig

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

src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/edit.html.twig

@@ -1,12 +1,11 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/index.html.twig

@@ -1,6 +1,6 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
@@ -9,19 +9,25 @@
         {% endblock %}
 
         {% block table_entities_tbody %}
-        {% for entity in entities %}
-            <tr>
-                <td>{{ entity.id }}</td>
-                <td>{{ entity.name|localize_translatable_string }}</td>
-                <td>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_marital_status_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        {% endfor %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.name|localize_translatable_string }}</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_person_marital-status_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
         {% endblock %}
     {% endembed %}
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/MaritalStatus/new.html.twig

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

src/Bundle/ChillPersonBundle/Resources/views/Origin/edit.html.twig

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

src/Bundle/ChillPersonBundle/Resources/views/Origin/index.html.twig

@@ -0,0 +1,35 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Label'|trans }}</th>
+            <th>{{ 'origin.noActiveAfter'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+        {% for entity in entities %}
+            <tr>
+                <td>{{ entity.id }}</td>
+                <td>{{ entity.label|localize_translatable_string }}</td>
+                <td>{% if entity.noActiveAfter %}{{ entity.noActiveAfter|date('Y-m-d') }}{% endif %}</td>
+                <td>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_crud_origin_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                        </li>
+                    </ul>
+                </td>
+            </tr>
+        {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Origin/new.html.twig

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

src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig

@@ -149,6 +149,19 @@
                     {% endif %}
                 {% endif %}
 
+                {% if acp.step == 'CLOSED' and acp.closingMotive is not null %}
+                    <div class="wl-row">
+                        <div class="wl-col title">
+                            <h3 class="closingMotive">{{ 'Closing motive'|trans }}</h3>
+                        </div>
+                        <div class="wl-col list">
+                            <div>
+                                {{ acp.closingMotive.name|localize_translatable_string }}
+                            </div>
+                        </div>
+                    </div>
+                {% endif %}
+
                 <ul class="record_actions record_actions_column">
                     <li>
                         <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': acp.id }) }}"
@@ -256,7 +269,7 @@
                                     aria-labelledby="heading_{{ person.id }}"
                                     data-bs-parent="#nonCurrent">
                                     {% for acp in acpsClosed %}
-                                            {{ _self.accompanying_period(acp, person) }}
+                                        {{ _self.accompanying_period(acp, person) }}
                                     {% endfor %}
                                 </div>
                             </div>

src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/edit.html.twig

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

src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/index.html.twig

@@ -0,0 +1,41 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+        {% for entity in entities %}
+            <tr>
+                <td>{{ entity.id }}</td>
+                <td>{{ entity.title|localize_translatable_string }}</td>
+                <td style="text-align:center;">
+                    {%- if entity.isActive -%}
+                        <i class="fa fa-check-square-o"></i>
+                    {%- else -%}
+                        <i class="fa fa-square-o"></i>
+                    {%- endif -%}
+				</td>
+                <td>
+                    <ul class="record_actions">
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_crud_person_resource-kind_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                        </li>
+                    </ul>
+                </td>
+            </tr>
+        {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/PersonResourceKind/new.html.twig

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

src/Bundle/ChillPersonBundle/Resources/views/Relation/edit.html.twig

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

src/Bundle/ChillPersonBundle/Resources/views/Relation/index.html.twig

@@ -0,0 +1,41 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_index.html.twig' %}
+        {% block table_entities_thead_tr %}
+            <th>{{ 'Id'|trans }}</th>
+            <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'Active'|trans }}</th>
+            <th>&nbsp;</th>
+        {% endblock %}
+
+        {% block table_entities_tbody %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.title|localize_translatable_string }} - {{ entity.reverseTitle|localize_translatable_string }}</td>
+                    <td style="text-align:center;">
+						{%- if entity.isActive -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_person_relation_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+             {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Relation/new.html.twig

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

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Evaluation/index.html.twig

@@ -1,27 +1,61 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'evaluation.delay'|trans }}</th>
+            <th>{{ 'evaluation.notificationDelay'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
         {% block table_entities_tbody %}
-        {% for entity in entities %}
-            <tr>
-                <td>{{ entity.id }}</td>
-                <td>{{ entity.title|localize_translatable_string }}</td>
-                <td>
-                    <ul class="record_actions">
-                        <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_evaluation_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
-                        </li>
-                    </ul>
-                </td>
-            </tr>
-        {% endfor %}
+            {% for entity in entities %}
+                <tr>
+                    <td>{{ entity.id }}</td>
+                    <td>{{ entity.title|localize_translatable_string }}</td>
+                    <td>
+                    {% if entity.delay is not null %}
+                        {% if entity.delay.d > 0 %}
+                            {{ entity.delay.d  }} {{'days'|trans}}
+                        {% endif %}
+                        {% if entity.delay.m > 0 %}
+                            {{ entity.delay.m  }} {{'months'|trans}}
+                        {% endif %}
+                        {% if entity.delay.y > 0 %}
+                            {{ entity.delay.y  }} {{'years'|trans}}
+                        {% endif %}
+                    {% endif %}
+                    </td>
+                    <td>
+                    {% if entity.notificationDelay is not null %}
+                        {% if entity.notificationDelay.d > 0 %}
+                            {{ entity.notificationDelay.d  }} {{'days'|trans}}
+                        {% endif %}
+                        {% if entity.notificationDelay.m > 0 %}
+                            {{ entity.notificationDelay.m  }} {{'months'|trans}}
+                        {% endif %}
+                        {% if entity.notificationDelay.y > 0 %}
+                            {{ entity.notificationDelay.y  }} {{'years'|trans}}
+                        {% endif %}
+                    {% endif %}
+                    </td>
+                    <td>
+                        <ul class="record_actions">
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_crud_social_evaluation_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
+        {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
         {% endblock %}
     {% endembed %}
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Goal/index.html.twig

@@ -1,10 +1,12 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'goal.results'|trans }}</th>
+            <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
@@ -13,15 +15,31 @@
             <tr>
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
+                <td>
+                {% for sa in entity.results %}
+                   {{ sa.title|localize_translatable_string }}{% if not loop.last %},{% else %}.{% endif %}
+                {% endfor %}
+                </td>
+                <td>
+                {% if entity.desactivationDate is not null %}
+                    {{ entity.desactivationDate|date('Y-m-d') }}
+                {% endif %}
+                </td>
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_goal_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_social_goal_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
                         </li>
                     </ul>
                 </td>
             </tr>
         {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/Result/index.html.twig

@@ -1,10 +1,11 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
@@ -13,15 +14,26 @@
             <tr>
                 <td>{{ entity.id }}</td>
                 <td>{{ entity.title|localize_translatable_string }}</td>
+                <td>
+                {% if entity.desactivationDate is not null %}
+                    {{ entity.desactivationDate|date('Y-m-d') }}
+                {% endif %}
+                </td>
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_result_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_social_result_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
                         </li>
                     </ul>
                 </td>
             </tr>
         {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/edit.html.twig

@@ -0,0 +1,33 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+
+        {% block crud_content_form_rows %}
+
+            <div class="mb-3 row">
+               <label class="col-form-label col-sm-4 required" for="social_action_ordering">{{ 'Parent'|trans }}</label>
+               <div class="col-sm-8">{{ entity.parent|chill_entity_render_box }}</div>
+            </div>
+
+            <div class="mb-3 row">
+               <label class="col-form-label col-sm-4 required" for="social_action_ordering">{{ 'Social issue'|trans }}</label>
+               <div class="col-sm-8">{{ entity.issue|chill_entity_render_box }}</div>
+            </div>
+
+            {% for f in form %}
+                {% if f.vars.name == 'parent' or f.vars.name == 'issue' %}
+                    {{ form_widget(f, { 'attr':{'hidden':'hidden'}}) }}
+                {% else %}
+                    {{ form_row(f) }}
+                {% endif %}
+            {% endfor %}
+        {% endblock crud_content_form_rows %}
+
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialAction/index.html.twig

@@ -1,10 +1,13 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'Social issue'|trans }}</th>
+            <th>{{ 'Ordering'|trans }}</th>
+            <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
@@ -12,16 +15,29 @@
         {% for entity in entities %}
             <tr>
                 <td>{{ entity.id }}</td>
-                <td>{{ entity.title|localize_translatable_string }}</td>
+                <td>{{ entity|chill_entity_render_box }}</td>
+                <td>{{ entity.issue|chill_entity_render_box }}</td>
+                <td>{{ entity.ordering }}</td>
+                <td>
+                {% if entity.desactivationDate is not null %}
+                    {{ entity.desactivationDate|date('Y-m-d') }}
+                {% endif %}
+                </td>
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_action_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_social_action_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
                         </li>
                     </ul>
                 </td>
             </tr>
         {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/edit.html.twig

@@ -0,0 +1,22 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+
+        {% block crud_content_form_rows %}
+            {% for f in form %}
+                {% if f.vars.name == 'parent' %}
+                    {{ form_row(f, { 'attr':{'disabled':'disabled'}}) }}
+                {% else %}
+                    {{ form_row(f) }}
+                {% endif %}
+            {% endfor %}
+        {% endblock crud_content_form_rows %}
+
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/SocialIssue/index.html.twig

@@ -1,10 +1,12 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
-{% block layout_wvm_content %}
+{% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Title'|trans }}</th>
+            <th>{{ 'Ordering'|trans }}</th>
+            <th>{{ 'goal.desactivationDate'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
 
@@ -12,16 +14,30 @@
         {% for entity in entities %}
             <tr>
                 <td>{{ entity.id }}</td>
-                <td>{{ entity.title|localize_translatable_string }}</td>
+                <td>
+                    {{ entity|chill_entity_render_box }}
+                </td>
+                <td>{{ entity.ordering }}</td>
+                <td>
+                {% if entity.desactivationDate is not null %}
+                    {{ entity.desactivationDate|date('Y-m-d') }}
+                {% endif %}
+                </td>
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ chill_path_add_return_path('chill_crud_social_issue_edit', { 'id': entity.id }) }}" class="sc-button bt-edit"></a>
+                            <a href="{{ chill_path_add_return_path('chill_crud_social_issue_edit', { 'id': entity.id }) }}" class="btn btn-edit"></a>
                         </li>
                     </ul>
                 </td>
             </tr>
         {% endfor %}
         {% endblock %}
+
+        {% block actions_before %}
+            <li class='cancel'>
+                <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
+            </li>
+        {% endblock %}
     {% endembed %}
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/edit.html.twig

@@ -1,12 +1,11 @@
-{% extends '@ChillPerson/Admin/layout.html.twig' %}
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
 
 {% block title %}
-{% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
 {% endblock %}
 
-{% block layout_wvm_content %}
-{% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
-    {% block content_form_actions_view %}{% endblock %}
-    {% block content_form_actions_save_and_show %}{% endblock %}
-{% endembed %}
-{% endblock %}
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock admin_content %}

src/Bundle/ChillPersonBundle/Resources/views/SocialWork/new.html.twig

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

src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php

@@ -17,6 +17,7 @@ use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
 use Chill\DocStoreBundle\Entity\AccompanyingCourseDocument;
+use Chill\DocStoreBundle\Entity\DocumentCategory;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
@@ -132,7 +133,7 @@ class AccompanyingPeriodContext implements
             ])
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
-                'class' => 'ChillDocStoreBundle:DocumentCategory',
+                'class' => DocumentCategory::class,
                 'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->where('c.documentClass = :docClass')

src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php

@@ -15,6 +15,7 @@ use Chill\DocGeneratorBundle\Context\DocGeneratorContextWithAdminFormInterface;
 use Chill\DocGeneratorBundle\Context\Exception\UnexpectedTypeException;
 use Chill\DocGeneratorBundle\Entity\DocGeneratorTemplate;
 use Chill\DocGeneratorBundle\Service\Context\BaseContextData;
+use Chill\DocStoreBundle\Entity\DocumentCategory;
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\DocumentCategoryRepository;
@@ -92,7 +93,7 @@ class PersonContext implements DocGeneratorContextWithAdminFormInterface
         $builder
             ->add('category', EntityType::class, [
                 'placeholder' => 'Choose a document category',
-                'class' => 'ChillDocStoreBundle:DocumentCategory',
+                'class' => DocumentCategory::class,
                 'query_builder' => static function (EntityRepository $er) {
                     return $er->createQueryBuilder('c')
                         ->where('c.documentClass = :docClass')

src/Bundle/ChillPersonBundle/chill.api.specs.yaml

@@ -223,6 +223,8 @@ components:
             - "accompanying_period_work"
         note:
           type: string
+        privateComment:
+          type: string
         startDate:
           $ref: "#/components/schemas/Date"
         endDate:

src/Bundle/ChillPersonBundle/config/routes.yaml

@@ -96,10 +96,6 @@ chill_person_timeline:
     path: /{_locale}/person/{person_id}/timeline
     controller: Chill\PersonBundle\Controller\TimelinePersonController::personAction
 
-chill_person_admin:
-    path: "/{_locale}/admin/person"
-    controller: Chill\PersonBundle\Controller\AdminController::indexAction
-
 chill_person_duplicate_view:
     path: /{_locale}/person/{person_id}/duplicate/view
     controller: Chill\PersonBundle\Controller\PersonDuplicateController::viewAction
@@ -129,72 +125,6 @@ chill_person_admin_redirect_to_admin_index:
                 order: 0
                 label: Main admin menu
 
-chill_person_closingmotive_admin:
-    path:     /{_locale}/admin/closing-motive
-    controller: cscrud_closing_motive_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 90
-                label: 'person_admin.closing motives'
-
-chill_person_maritalstatus_admin:
-    path:     /{_locale}/admin/marital-status
-    controller: cscrud_marital_status_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 120
-                label: 'person_admin.marital status'
-
-chill_person_socialissue_admin:
-    path:     /{_locale}/admin/social-work/social-issue
-    controller: cscrud_social_issue_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 150
-                label: 'person_admin.social_issue'
-
-chill_person_socialaction_admin:
-    path:     /{_locale}/admin/social-work/social-action
-    controller: cscrud_social_action_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 160
-                label: 'person_admin.social_action'
-
-
-chill_person_social_evaluation_admin:
-    path:     /{_locale}/admin/social-work/evaluation
-    controller: cscrud_social_evaluation_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 170
-                label: 'person_admin.social_evaluation'
-
-chill_person_social_goal_admin:
-    path:     /{_locale}/admin/social-work/goal
-    controller: cscrud_social_goal_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 180
-                label: 'person_admin.social_goal'
-
-chill_person_social_result_admin:
-    path:     /{_locale}/admin/social-work/result
-    controller: cscrud_social_result_controller:index
-    options:
-        menus:
-            admin_person:
-                order: 190
-                label: 'person_admin.social_result'
-
-
-
 chill_person_controllers:
     resource: "@ChillPersonBundle/Controller"
     type: annotation

src/Bundle/ChillPersonBundle/config/services/menu.yaml

@@ -12,12 +12,6 @@ services:
               #        tags:
               #            - { name: 'chill.menu_builder' }
               #
-              #    Chill\PersonBundle\Menu\AdminMenuBuilder:
-              #        arguments:
-              #            $authorizationChecker: '@Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface'
-              #        tags:
-              #            - { name: 'chill.menu_builder' }
-              #
     Chill\PersonBundle\Menu\PersonMenuBuilder:
         autowire: true
         autoconfigure: true

src/Bundle/ChillPersonBundle/migrations/Version20220527124737.php

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20220527124737 extends AbstractMigration
+{
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity DROP privateComment_comments');
+    }
+
+    public function getDescription(): string
+    {
+        return 'add private comment on accompanying period work';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD privateComment_comments JSON DEFAULT \'{}\'');
+    }
+}

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

@@ -171,6 +171,7 @@ Update accompanying period: Mettre à jour une période d'accompagnement
 'Period not opened': "La période d'accompagnement n'a pas été ouverte"
 "Period not opened : form is invalid": "La période n'a pas été ouverte: le formulaire est invalide."
 'Closing motive': 'Motif de clôture'
+This course is closed: Ce parcours est clôturé
 Close accompanying course: Clôturer le parcours
 Re-open accompanying course: Ré-ouvrir le parcours
 'Person details': 'Détails de la personne'
@@ -383,12 +384,36 @@ crud:
             add_new: Ajouter un nouveau
         title_new: Nouveau motif de clotûre
         title_edit: Modifier le motif de clotûre
-    marital_status:
+    origin:
+        index:
+            title: Liste des origines de parcours
+            add_new: Ajouter une nouvelle
+        title_new: Nouvelle origine
+        title_edit: Modifier l'origine
+    person_marital-status:
         index:
             title: Liste des états civils
             add_new: Ajouter un nouveau
         title_new: Nouvel état civil
         title_edit: Modifier l'état civil
+    person_resource-kind:
+        index:
+            title: Types de personnes-ressources
+            add_new: Ajouter un nouveau
+        title_new: Nouveau type de personne-ressource
+        title_edit: Modifier le type de personne-ressource
+    person_household_position:
+        index:
+            title: Position
+            add_new: Ajouter un nouveau
+        title_new: Nouvelle position
+        title_edit: Modifier la position
+    person_relation:
+        index:
+            title: Relations de filiations
+            add_new: Ajouter un nouveau
+        title_new: Nouvelle relation de filiation
+        title_edit: Modifier la relation de filiation
     social_issue:
         index:
             title: Liste des problématiques sociales
@@ -398,46 +423,84 @@ crud:
     social_action:
         index:
             title: Liste des actions d'accompagnements
-            add_new: Ajouter une nouvelle action d'accompagnements
-        title_new: Nouvelle action d'accompagnements
-        title_edit: Modifier l'action d'accompagnements
+            add_new: Ajouter une nouvelle action d'accompagnement
+        title_new: Nouvelle action d'accompagnement
+        title_edit: Modifier l'action d'accompagnement
         title_link: Voir l'action d'accompagnement
+    social_evaluation:
+        index:
+            title: Liste des évaluations
+            add_new: Ajouter une nouvelle évaluation
+        title_new: Nouvelle évaluation
+        title_edit: Modifier l'évaluation
     social_goal:
         index:
             title: Liste des objectifs d'action d'accompagnements
-            add_new: Ajouter un nouvel objectif d'action d'accompagnements
+            add_new: Ajouter un nouvel objectif d'action d'accompagnement
         title_new: Nouvel objectif
         title_edit: Modifier l'objectif
     social_result:
         index:
             title: Liste des résultats d'action d'accompagnements
-            add_new: Ajouter un nouveau résultat d'action d'accompagnements
+            add_new: Ajouter un nouveau résultat d'action d'accompagnement
         title_new: Nouveau résultat
         title_edit: Modifier le résultat
 
+origin:
+   noActiveAfter: désactivé après
+
+evaluation:
+    delay: Délai
+    notificationDelay: Délai de notification
+
+goal:
+   desactivationDate: Date de désactivation
+   results: Résultats
+
+socialAction:
+    defaultNotificationDelay: Délai de notification par défaut
+    socialIssue: Problématique sociale
+
+household:
+    allowHolder: Peut être titulaire
+    shareHousehold: Membre du ménage
+
+relation:
+    title: Premier membre
+    reverseTitle: Deuxième membre
+
+days: jours
+months: mois
+years: années
 
 # specific to closing motive
 closing_motive:
     any parent: Aucun parent
     new child: Nouvel enfant
 
+Person configuration: Configuration du module "Personnes"
 Configuration of person bundle: Configuration du module "Personnes"
 person_admin:
+    accompanying_period: Parcours d'accompagnement
     What would you like to configure ?: Que souhaitez-vous configurer ?
     closing motives: Motifs de clotûre
     closing motives list: Liste des motifs de clotûre
     closing motive explanation: >
         Les motifs de clotûre donnent des indications sur la fermeture
         d'une période d'accompagnement.
+    origin: Origines
     marital status: États civils
     marital status list: Liste des états civils
     marital status explanation: >
         Configurer la liste des états civils.
+    person_resource_kind: Type de personne ressource
     social_issue: Problématiques sociales
     social_action: Actions d'accompagnement
-    social_goal: Buts
+    social_goal: Objectifs
     social_result: Résultats
     social_evaluation: Évaluations
+    social_work: Accompagnement social
+    relation: Relations de filiations
 
 # specific to accompanying period
 accompanying_period:
@@ -479,7 +542,9 @@ accompanying_course:
     comment is unpinned: Le commentaire est désépinglé
 show: Montrer
 hide: Masquer
-closed periods: parcours clôturer
+closed periods: parcours clôturés
+Accompanying course configuration: Gestion des parcours d'accompagnement
+Social work configuration: Gestion des actions d'accompagnement social
 
 # Accompanying Course comments
 Accompanying Course Comment: Commentaire
@@ -516,6 +581,7 @@ Budget: Budget
 The composition has been successfully removed.: La composition a été supprimée.
 edit address valid from: Modifier la date du déménagement
 Edit household address valid from: Modifier la date du déménagement
+Household configuration: Gestion des ménages
 
 
 # accompanying course work
@@ -543,6 +609,8 @@ accompanying_course_work:
     Any work: Aucune action d'accompagnement
     remove: Supprimer une action d'accompagnement
     social_evaluation: Évaluation
+    private_comment: Commentaire privé
+
 
 #
 Person addresses: Adresses de résidence
@@ -616,3 +684,7 @@ reassign:
     All periods on this list will be reassigned to this user, excepted the one you manually reassigned before: Tous les parcours visibles sur cette page seront assignés à cet utilisateur, sauf ceux que vous aurez assigné à un utilisateur manuellement.
     Reassign: Assigner le référent
     List periods to be able to reassign them: Choisissez un utilisateur et cliquez sur "Filtrer" pour visualiser ses parcours. Vous pourrez ensuite les réassigner.
+
+notification:
+    Notify referrer: Notifier le référent
+    Notify any: Notifier d'autres utilisateurs