Merge remote-tracking branch 'origin/master' into issue434_endDate_enfantHorsMenage

src/Bundle/ChillPersonBundle/AccompanyingPeriod/Events/UserRefEventSubscriber.php

@@ -60,6 +60,7 @@ class UserRefEventSubscriber implements EventSubscriberInterface
     {
         if ($period->hasPreviousUser()
             && $period->getUser() !== $this->security->getUser()
+            && null !== $period->getUser()
             && $period->getStep() !== AccompanyingPeriod::STEP_DRAFT
         ) {
             $this->generateNotificationToUser($period);

src/Bundle/ChillPersonBundle/Controller/UserAccompanyingPeriodController.php

@@ -30,7 +30,7 @@ class UserAccompanyingPeriodController extends AbstractController
     }
 
     /**
-     * @Route("/{_locale}/accompanying-periods", name="chill_person_accompanying_period_user")
+     * @Route("/{_locale}/person/accompanying-periods/my", name="chill_person_accompanying_period_user")
      */
     public function listAction(Request $request)
     {
@@ -44,13 +44,13 @@ class UserAccompanyingPeriodController extends AbstractController
         );
 
         return $this->render('@ChillPerson/AccompanyingPeriod/user_periods_list.html.twig', [
-            'accompanyingds' => $accompanyingPeriods,
+            'accompanyingPeriods' => $accompanyingPeriods,
             'pagination' => $pagination,
         ]);
     }
 
     /**
-     * @Route("/{_locale}/accompanying-periods/drafts", name="chill_person_accompanying_period_draft_user")
+     * @Route("/{_locale}/person/accompanying-periods/my/drafts", name="chill_person_accompanying_period_draft_user")
      */
     public function listDraftsAction(Request $request)
     {

src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php

@@ -71,7 +71,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         $qb = $this->buildQueryByRecentUserHistory($user, $since);
 
         return $qb->select('a')
-            ->distinct(true)
+            ->addOrderBy('userHistory.startDate', 'DESC')
             ->getQuery()
             ->setMaxResults($limit)
             ->setFirstResult($offset)
@@ -95,6 +95,7 @@ final class AccompanyingPeriodRepository implements ObjectRepository
         $qb
             ->join('a.userHistories', 'userHistory')
             ->where($qb->expr()->eq('a.user', ':user'))
+            ->andWhere($qb->expr()->neq('a.step', "'" . AccompanyingPeriod::STEP_DRAFT . "'"))
             ->andWhere($qb->expr()->gte('userHistory.startDate', ':since'))
             ->andWhere($qb->expr()->isNull('userHistory.endDate'))
             ->setParameter('user', $user)

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

@@ -20,7 +20,6 @@
             <div class="form-check" v-for="p in participationWithoutHousehold" :key="p.id">
                <input type="checkbox"
                   class="form-check-input"
-                  v-model="hasNoHousehold"
                   name="persons[]"
                   checked="checked"
                   :id="p.person.id"

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

@@ -97,16 +97,10 @@ export default {
     ...mapGetters(['isJobValid', 'usersSuggestedFilteredByJob']),
     users: function () {
       let users = this.$store.getters.usersFilteredByJob;
-
-      console.log('users filtered by job', users);
-
       // ensure that the selected user is in the list. add it if necessary
       if (this.$store.state.accompanyingCourse.user !== null && users.find(u => this.$store.state.accompanyingCourse.user.id === u.id) === undefined) {
-        console.log('add user to users');
         users.push(this.$store.state.accompanyingCourse.user);
       }
-
-      console.log('users to return', users);
       return users;
     },
     valueJob: {

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

@@ -6,7 +6,7 @@
    <div v-if="accompanyingCourse.requestor && isAnonymous" class="flex-table">
 
       <label>
-         <input type="checkbox" v-model="isAnonymous" class="me-2" />
+         <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
       <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
@@ -72,7 +72,7 @@
 
    <div v-else-if="accompanyingCourse.requestor && !isAnonymous" class="flex-table">
       <label>
-         <input type="checkbox" v-model="isAnonymous" class="me-2" />
+         <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
 
@@ -199,7 +199,7 @@ export default {
       ...mapState({
          suggestedEntities: state => {
            return [
-               ...state.accompanyingCourse.participations.map(p => p.person),
+               ...state.accompanyingCourse.participations.filter((p) => p.endDate === null).map((p) => p.person),
                ...state.accompanyingCourse.resources.map(r => r.resource)
              ]
                .filter((e) => e !== null)
@@ -218,7 +218,7 @@ export default {
       accompanyingCourse() {
          return this.$store.state.accompanyingCourse
       },
-      isAnonymous: {
+      requestorIsAnonymous: {
          set(value) {
             this.$store.dispatch('requestorIsAnonymous', value);
          },
@@ -287,7 +287,9 @@ export default {
             body.name = payload.data.text;
             body.email = payload.data.email;
             body.telephone = payload.data.phonenumber;
-            body.address = { id: payload.data.address.address_id };
+            if (payload.data.address) {
+                body.address = { id: payload.data.address.address_id };
+            }
 
             makeFetch('PATCH', `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`, body)
                .then(response => {

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

@@ -77,7 +77,7 @@ export default {
       counter: state => state.accompanyingCourse.resources.length,
       suggestedEntities: state => [
             state.accompanyingCourse.requestor,
-            ...state.accompanyingCourse.participations.map(p => p.person),
+            ...state.accompanyingCourse.participations.filter((p) => p.endDate === null).map((p) => p.person),
          ]
          .filter((e) => e !== null)
          .filter(

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

@@ -428,42 +428,6 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                       throw error;
                    })
             },
-            /**
-             * On The Fly
-             */
-            patchOnTheFly({ commit }, payload) {
-               // TODO should be into the dedicated component, no ? JF
-               console.log('## action: patch OnTheFly', payload);
-               let body = { type: payload.type };
-               if (payload.type === 'person') {
-                  body.firstName = payload.data.firstName;
-                  body.lastName = payload.data.lastName;
-                  if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
-                  body.phonenumber = payload.data.phonenumber;
-                  body.mobilenumber = payload.data.mobilenumber;
-                  body.gender = payload.data.gender;
-                  console.log('id', payload.data.id, 'and body', body);
-                  patchPerson(payload.data.id, body)
-                      .then(person => new Promise((resolve, reject) => {
-                         console.log('patch person', person);
-                         commit('updatePerson', { target: payload.target, person: person });
-                         resolve();
-                      }));
-               }
-               else if (payload.type === 'thirdparty') {
-                  body.name = payload.data.text;
-                  body.email = payload.data.email;
-                  body.telephone = payload.data.phonenumber;
-                  body.address = { id: payload.data.address.address_id };
-                  console.log('id', payload.data.id, 'and body', body);
-                  patchThirdparty(payload.data.id, body)
-                      .then(thirdparty => new Promise((resolve, reject) => {
-                          console.log('patch thirdparty', thirdparty);
-                          commit('updateThirdparty', { target: payload.target, thirdparty: thirdparty });
-                          resolve();
-                  }));
-               }
-            },
             /**
              * Update accompanying course intensity/emergency/confidentiality
              */

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

@@ -397,36 +397,6 @@ const store = createStore({
           commit('setErrors', error.violations);
         });
     },
-    patchOnTheFly({ commit }, payload) {
-      let body = { type: payload.type };
-      const id = payload.data.id;
-      let url = `/api/1.0/person/person/${id}.json`;
-      let mutation = "updatePerson";
-
-      if (payload.type === 'person') {
-          body.firstName = payload.data.firstName;
-          body.lastName = payload.data.lastName;
-          if (payload.data.birthdate !== null) { body.birthdate = payload.data.birthdate; }
-            body.phonenumber = payload.data.phonenumber;
-            body.mobilenumber = payload.data.mobilenumber;
-            body.gender = payload.data.gender;
-      } else if (payload.type === 'thirdparty') {
-          body.name = payload.data.text;
-          body.email = payload.data.email;
-          body.telephone = payload.data.phonenumber;
-          body.address = { id: payload.data.address.address_id };
-
-        url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
-        mutation = 'updateThirdparty'
-      }
-      makeFetch('PATCH', url, body)
-        .then((response) => {
-            commit(mutation, {target: payload.target, thirdparty: response});
-        })
-        .catch((error) => {
-            throw error;
-        })
-  },
   }
 });
 

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

@@ -62,8 +62,10 @@
 
                <div class="create-button">
                   <on-the-fly
-                     v-if="query.length >= 3"
+                     v-if="queryLength >= 3 && (options.type.includes('person') || options.type.includes('thirdparty'))"
                      :buttonText="$t('onthefly.create.button', {q: query})"
+                     :allowedTypes="options.type"
+                     :query="query"
                      action="create"
                      @saveFormOnTheFly="saveFormOnTheFly"
                      ref="onTheFly">

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue

@@ -32,6 +32,14 @@
       <label for="lastname">{{ $t('person.lastname') }}</label>
    </div>
 
+   <div v-if="queryItems">
+      <ul class="list-suggest add-items inline">
+         <li v-for="(qi, i) in queryItems" :key="i" @click="addQueryItem('lastName', qi)">
+            <span class="person-text">{{ qi }}</span>
+         </li>
+      </ul>
+   </div>
+
    <div class="form-floating mb-3">
       <input
           class="form-control form-control-lg"
@@ -43,6 +51,14 @@
       <label for="firstname">{{ $t('person.firstname') }}</label>
    </div>
 
+   <div v-if="queryItems">
+      <ul class="list-suggest add-items inline">
+         <li v-for="(qi, i) in queryItems" :key="i" @click="addQueryItem('firstName', qi)">
+            <span class="person-text">{{ qi }}</span>
+         </li>
+      </ul>
+   </div>
+
    <div v-for="(a, i) in config.altNames" :key="a.key" class="form-floating mb-3">
       <input
           class="form-control form-control-lg"
@@ -122,7 +138,7 @@ import PersonRenderBox from '../Entity/PersonRenderBox.vue';
 
 export default {
    name: "OnTheFlyPerson",
-   props: ['id', 'type', 'action'],
+   props: ['id', 'type', 'action', 'query'],
    //emits: ['createAction'],
    components: {
       PersonRenderBox
@@ -203,6 +219,9 @@ export default {
       },
       personAltNamesLabels() {
          return this.person.altNames.map(a => a ? a.label : '');
+      },
+      queryItems() {
+         return this.query ? this.query.split(' ') : null;
       }
    },
    mounted() {
@@ -244,6 +263,16 @@ export default {
          )
          this.person.altNames = updateAltNames;
       },
+      addQueryItem(field, queryItem) {
+         switch (field) {
+            case 'lastName':
+               this.person.lastName = queryItem;
+               break;
+            case 'firstName':
+               this.person.firstName = queryItem;
+               break;
+         }
+      }
    }
 }
 </script>

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/user_periods_list.html.twig

@@ -20,6 +20,8 @@
         <div class="flex-table accompanyingcourse-list">
             {% for period in accompanyingPeriods %}
                 {% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {'period': period, 'recordAction': _self.recordAction(period)} %}
+            {% else %}
+                <p class="chill-no-data-statement">{{ 'Any accompanying period'|trans }}</p>
             {% endfor %}
         </div>
 

src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig

@@ -172,7 +172,7 @@
 
             {%- if options['customButtons']['replace'] is defined -%}
                 {{ options['customButtons']['replace'] }}
-            {%- elseif is_granted('CHILL_PERSON_SEE', person) -%}
+            {%- elseif is_granted('CHILL_PERSON_SEE', person) and options['addLink'] -%}
                 <li>
                     <a class="btn btn-sm btn-show" title="{{ 'Show person'|trans }}"
                     href="{{ path('chill_person_view', { person_id: person.id }) }}"></a>

src/Bundle/ChillPersonBundle/Resources/views/PersonResource/form.html.twig

@@ -56,6 +56,11 @@
 
 {% if action is defined %}
     <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_person_resource_list', { 'person_id': resource.personOwner.id  } ) }}" class="btn btn-cancel">
+                {{ 'Cancel'|trans }}
+            </a>
+        </li>
         <li class="edit">
             <button class="btn btn-edit"
             type="submit" id="newPersonResource">

src/Bundle/ChillPersonBundle/Resources/views/PersonResource/list.html.twig

@@ -22,41 +22,33 @@
     <div class="flex-table">
         {% for resource in personResources %}
             <div class="item-bloc">
-                <div class="item-row">
-                    <div class="item-col" style="width: 50%">
+                {% if resource.kind is not null %}
+                    <div class="item-row">
+                        <section>
+                            <p>{{ resource.kind.title.fr|capitalize }}</p>
+                        </section>
+                    </div>
+                {% endif %}
+                <div class="{% if resource.kind is not null %} separator {% endif %}">
                     {% if resource.person is not null %}
-                        <div class="denomination h3">
-                            <span>
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                    action: 'show', displayBadge: true,
-                                    targetEntity: { name: 'person', id: resource.person.id },
-                                    buttonText: resource.person|chill_entity_render_string,
-                                    isDead: resource.person.deathdate is not null
-                                } %}
-                            </span>
-                        </div>
+                        {{ resource.person|chill_entity_render_box({
+                            'render': 'bloc',
+                            'addLink': true,
+                            'addInfo': true,
+                            'addAge': true
+                        }) }}
                     {% elseif resource.thirdparty is not null %}
-                        <div class="denomination h3">
-                            <span>
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                    action: 'show', displayBadge: true,
-                                    targetEntity: { name: 'thirdparty', id: resource.thirdparty.id },
-                                    buttonText: resource.thirdParty|chill_entity_render_string,
-                                    parent: resource.thirdparty.parent
-                                } %}
-                            </span>
-                        </div>
+                        {{ resource.thirdparty|chill_entity_render_box({
+                            'render': 'bloc',
+                            'showContacts': false,
+                            'addLink': true,
+                            'isConfidential': (resource.thirdparty.contactDataAnonymous ? true : false)
+                        }) }}
                     {% else %}
                         <div class="denomination h3">
                             <span>{{ resource.freetext }}</span>
                         </div>
                     {% endif %}
-                    </div>
-                    <div class="item-col" style="justify-content: flex-end; ">
-                        {% if resource.kind %}
-                        <span>{{ resource.kind.title.fr|capitalize }}</span>
-                        {% endif %}
-                    </div>
                 </div>
                 {% if resource.comment.comment is not empty %}
                     <div class="item-row separator">

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

@@ -161,11 +161,13 @@ class AccompanyingPeriodContext implements
                     'class' => Person::class,
                     'choices' => $persons,
                     'choice_label' => function (Person $p) {
-                        return $this->personRender->renderString($p, []);
+                        return $this->personRender->renderString($p, ['addAge' => true]);
                     },
                     'multiple' => false,
                     'expanded' => true,
+                    'required' => false,
                     'label' => $options[$key . 'Label'],
+                    'placeholder' => $this->translator->trans('Any person selected'),
                 ]);
             }
         }

src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php

@@ -83,6 +83,12 @@ class PersonRender extends AbstractChillEntityRender
             . $this->addAltNames($person, false) . ' (' . $this->translator->trans('years_old', ['age' => $person->getAge()]) . ')';
         }
 
+        if (null !== $person->getDeathDate() && $options['addAge']) {
+            return $person->getFirstName() . ' ' . $person->getLastName()
+            . ' (‡)'
+            . $this->addAltNames($person, false);
+        }
+
         return $person->getFirstName() . ' ' . $person->getLastName()
             . $this->addAltNames($person, false);
     }

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php

@@ -16,14 +16,32 @@ use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodWorkEvaluationVoter;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowHandlerInterface
 {
     private AccompanyingPeriodWorkEvaluationRepository $repository;
 
-    public function __construct(AccompanyingPeriodWorkEvaluationRepository $repository)
+    private TranslatorInterface $translator;
+
+    public function __construct(AccompanyingPeriodWorkEvaluationRepository $repository, TranslatorInterface $translator)
     {
         $this->repository = $repository;
+        $this->translator = $translator;
+    }
+
+    public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
+    {
+        $evaluation = $this->getRelatedEntity($entityWorkflow);
+
+        return [
+            'persons' => $evaluation->getAccompanyingPeriodWork()->getPersons(),
+        ];
+    }
+
+    public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string
+    {
+        return $this->translator->trans('workflow.Evaluation (n°%eval%)', ['%eval%' => $entityWorkflow->getRelatedEntityId()]);
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluation

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php

@@ -15,17 +15,34 @@ use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Workflow\EntityWorkflowHandlerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
 use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInterface
 {
     private AccompanyingPeriodWorkRepository $repository;
 
-    public function __construct(AccompanyingPeriodWorkRepository $repository)
+    private TranslatorInterface $translator;
+
+    public function __construct(AccompanyingPeriodWorkRepository $repository, TranslatorInterface $translator)
     {
         $this->repository = $repository;
+        $this->translator = $translator;
     }
 
-    public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?object
+    public function getEntityData(EntityWorkflow $entityWorkflow, array $options = []): array
+    {
+        return [
+            'persons' => $this->getRelatedEntity($entityWorkflow)
+                ->getPersons(),
+        ];
+    }
+
+    public function getEntityTitle(EntityWorkflow $entityWorkflow, array $options = []): string
+    {
+        return $this->translator->trans('workflow.Work (n°%w%)', ['%w%' => $entityWorkflow->getRelatedEntityId()]);
+    }
+
+    public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWork
     {
         return $this->repository->find($entityWorkflow->getRelatedEntityId());
     }

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

@@ -85,6 +85,7 @@ Course number: Parcours n°
 Civility: Civilité
 choose civility: --
 All genders: tous les genres
+Any person selected: Aucune personne sélectionnée
 
 # dédoublonnage
 Old person: Doublon
@@ -239,6 +240,7 @@ Select a type: "Choisissez un type"
 Select a person: "Choisissez un usager"
 Select a thirdparty: "Choisissez un tiers"
 Contact person: "Personne de contact"
+Kind: "Type"
 
 
 # pickAPersonType