Merge remote-tracking branch 'origin/master' into upgrade-php82

src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php

@@ -11,11 +11,13 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\DataFixtures\ORM\LoadCenters;
 use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Household\MembersEditorFactory;
 use DateInterval;
 use DateTime;
@@ -192,14 +194,20 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface
 
     private function preparePersonIds()
     {
+        $centers = LoadCenters::$centers;
+
         // @TODO: Remove this and make this service stateless
         $this->personIds = $this->em
             ->createQuery(
                 'SELECT p.id FROM ' . Person::class . ' p ' .
-                'JOIN p.center c ' .
-                'WHERE c.name = :center '
+                'WHERE EXISTS( ' .
+                    'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch ' .
+                    'JOIN pch.center c ' .
+                    'WHERE pch.person = p.id ' .
+                    'AND c.name IN (:authorized_centers)' .
+                ')'
             )
-            ->setParameter('center', 'Center A')
+            ->setParameter('authorized_centers', $centers)
             ->getScalarResult();
 
         shuffle($this->personIds);

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue

@@ -22,7 +22,12 @@
                <i>{{ $t('course.open_at') }}{{ $d(accompanyingCourse.openingDate.datetime, 'text') }}</i>
             </span>
             <span v-if="accompanyingCourse.user" class="d-md-block ms-3 ms-md-0">
-               <span class="item-key">{{ $t('course.referrer') }}:</span> <b>{{ accompanyingCourse.user.text }}</b>
+               <span class="item-key">{{ $t('course.referrer') }}:</span>&nbsp;
+               <b>{{ accompanyingCourse.user.text }}</b>
+               <template v-if="accompanyingCourse.user.isAbsent">
+                 &nbsp;
+                 <span class="badge bg-danger rounded-pill" title="Absent">A</span>
+               </template>
             </span>
          </span>
       </span>
@@ -59,13 +64,15 @@
 import ToggleFlags from './Banner/ToggleFlags';
 import SocialIssue from './Banner/SocialIssue.vue';
 import PersonsAssociated from './Banner/PersonsAssociated.vue';
+import UserRenderBoxBadge from 'ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue';
 
 export default {
    name: 'Banner',
    components: {
       ToggleFlags,
       SocialIssue,
-      PersonsAssociated
+      PersonsAssociated,
+      UserRenderBoxBadge,
    },
    computed: {
       accompanyingCourse() {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js

@@ -29,7 +29,8 @@ const appMessages = {
          emergency: "urgent",
          confidential: "confidentiel",
          regular: "régulier",
-         occasional: "ponctuel"
+         occasional: "ponctuel",
+         absent: "Absent",
       },
       origin: {
          title: "Origine de la demande",

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue

@@ -1,9 +1,7 @@
 <template>
     <div class="container usercontainer">
       <div class="user-identification">
-        <span class="name">
-           {{ item.result.text }}
-        </span>
+        <user-render-box-badge :user="item.result"></user-render-box-badge>
       </div>
     </div>
     <div class="right_actions">
@@ -16,10 +14,12 @@
 
 <script>
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
+import UserRenderBoxBadge from 'ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue';
 
 export default {
    name: 'SuggestionUser',
    components: {
+     UserRenderBoxBadge,
       BadgeEntity
    },
    props: ['item'],