Merge branch 'master' into interface_propositions

CHANGELOG.md

@@ -13,6 +13,10 @@ and this project adheres to
 <!-- write down unreleased development here -->
 * [workflow]: added pagination to workflow list page
 * [homepage_widget]: null error on tasks widget fixed
+* [person-thirdparty]: fix quick-add of names that consist of multiple parts (eg. De Vlieger) within onthefly modal person/thirdparty
+* [search]: Order of birthdate fields changed in advanced search to avoid confusion.
+* [workflow]: Constraint added to workflow (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/675)
+* [action]: Agents traitants should be prefilled with referrer of the parcours or left empty if there is no referrer (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/696)
 
 ## Test releases
 

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

@@ -2,12 +2,30 @@
     {% if is_granted('CHILL_ACTIVITY_SEE_DETAILS', activity) %}
         {% if no_action is not defined or no_action == false %}
             <li>
-                <a class="btn btn-misc" href="{{ chill_path_add_return_path('chill_main_notification_create', {
+                {% set showGroup = activity.accompanyingPeriod is not null and activity.accompanyingPeriod.hasUser and activity.accompanyingPeriod.user is not same as(app.user)  %}
-                    'entityClass': 'Chill\\ActivityBundle\\Entity\\Activity',
+                <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
-                    'entityId': activity.id
+                    {% if showGroup %}
-                }) }}">
+                        <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-                    <i class="fa fa-paper-plane fa-fw"></i>
+                            {{ 'notification.Notify'|trans }}
-                    {{ '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\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id, 'tos': [activity.accompanyingPeriod.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\\ActivityBundle\\Entity\\Activity', 'entityId': activity.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\\ActivityBundle\\Entity\\Activity', 'entityId': activity.id}) }}">
+                            {{ 'notification.Notify'|trans }}
+                        </a>
+                    {% endif %}
+                </div>
             </li>
         {% endif %}
         {% if context == 'person' and activity.accompanyingPeriod is not empty %}

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

@@ -217,9 +217,30 @@
         </a>
     </li>
     <li>
+        {% set showGroup = entity.accompanyingPeriod is not null and entity.accompanyingPeriod.hasUser and entity.accompanyingPeriod.user is not same as(app.user)  %}
+        <div class="{% if showGroup %}btn-group{% endif %}" {% if showGroup %}role="group"{% endif %}>
+            {% if showGroup %}
+                <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                    {{ 'notification.Notify'|trans }}
+                </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\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id, 'tos': [entity.accompanyingPeriod.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\\ActivityBundle\\Entity\\Activity', 'entityId': entity.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\\ActivityBundle\\Entity\\Activity', 'entityId': entity.id}) }}">
                     {{ 'notification.Notify'|trans }}
                 </a>
+            {% endif %}
+        </div>
     </li>
     {% if is_granted('CHILL_ACTIVITY_UPDATE', entity) %}
         <li>

src/Bundle/ChillMainBundle/Form/WorkflowStepType.php

@@ -109,6 +109,7 @@ class WorkflowStepType extends AbstractType
                     'multiple' => false,
                     'expanded' => true,
                     'choices' => $choices,
+                    'constraints' => [new NotNull()],
                     'choice_label' => function (Transition $transition) use ($workflow) {
                         $meta = $workflow->getMetadataStore()->getTransitionMetadata($transition);
 
@@ -208,6 +209,10 @@ class WorkflowStepType extends AbstractType
                         $transition = $form['transition']->getData();
                         $toFinal = true;
 
+                        if (null === $transition) {
+                            $context
+                                ->buildViolation('workflow.You must select a next step, pick another decision if no next steps are available');
+                        } else {
                             foreach ($transition->getTos() as $to) {
                                 $meta = $workflow->getMetadataStore()->getPlaceMetadata($to);
     
@@ -217,7 +222,6 @@ class WorkflowStepType extends AbstractType
                                     $toFinal = false;
                                 }
                             }
-
                             $destUsers = $form['future_dest_users']->getData();
                             $destEmails = $form['future_dest_emails']->getData();
     
@@ -228,6 +232,7 @@ class WorkflowStepType extends AbstractType
                                     ->addViolation();
                             }
                         }
+                    }
                 ),
             ]);
     }

src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue

@@ -15,18 +15,17 @@
          <span v-if="forceRedirect">{{ $t('wait_redirection') }}</span>
       </div>
 
-      <div v-if="showMessageWhenNoAddress" class="mt-5">
+      <div v-if="(!this.context.edit && !this.flag.success && this.context.target.name !== 'household')" class="mt-5">
+         <div class="no-address-yet">
+            <i class="fa fa-map-marker" aria-hidden="true"></i>
             <p class="chill-no-data-statement">
                {{ $t('not_yet_address') }}
             </p>
-      </div>
-
-      <address-render-box :address="address" :useDatePane="useDatePane"></address-render-box>
-   </div>
 
             <action-buttons
                :options="this.options"
-      :defaultz="this.defaultz">
+               :defaultz="this.defaultz"
+               class="add-address-btn">
                <template v-slot:action>
                   <button @click.prevent="$emit('openEditPane')"
                      class="btn" :class="getClassButton"
@@ -35,6 +34,41 @@
                   </button>
                </template>
             </action-buttons>
+         </div>
+      </div>
+
+      <div v-else-if="this.context.target.name === 'household' || this.context.edit">
+         <action-buttons
+            :options="this.options"
+            :defaultz="this.defaultz"
+            class="add-address-btn">
+            <template v-slot:action>
+               <button @click.prevent="$emit('openEditPane')"
+                  class="btn" :class="getClassButton"
+                  type="button" name="button" :title="$t(getTextButton)">
+                  <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+               </button>
+            </template>
+         </action-buttons>
+      </div>
+
+      <address-render-box :address="address" :useDatePane="useDatePane"></address-render-box>
+   </div>
+
+   <div v-if="onlyButton">
+      <action-buttons
+         :options="this.options"
+         :defaultz="this.defaultz"
+         class="add-address-btn">
+         <template v-slot:action>
+            <button @click.prevent="$emit('openEditPane')"
+               class="btn" :class="getClassButton"
+               type="button" name="button" :title="$t(getTextButton)">
+               <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+            </button>
+         </template>
+      </action-buttons>
+   </div>
 
 </template>
 
@@ -58,6 +92,9 @@ export default {
       'useDatePane'
    ],
    emits: ['openEditPane'],
+   mounted() {
+      console.log('context', this.context)
+   },
    computed: {
       address() {
          return this.entity.address;
@@ -91,13 +128,29 @@ export default {
       forceRedirect() {
          return (!(this.context.backUrl === null || typeof this.context.backUrl === 'undefined'));
       },
-      showMessageWhenNoAddress() {
+      // showMessageWhenNoAddress() {
-          let showMessageWhenNoAddress = this.options.showMessageWhenNoAddress === undefined ? this.defaultz.showMessageWhenNoAddress : this.options.showMessageWhenNoAddress;
+      //     let showMessageWhenNoAddress = this.options.showMessageWhenNoAddress === undefined ? this.defaultz.showMessageWhenNoAddress : this.options.showMessageWhenNoAddress;
-          if (showMessageWhenNoAddress === true || showMessageWhenNoAddress === false) {
+      //     if (showMessageWhenNoAddress === true || showMessageWhenNoAddress === false) {
-              return !this.context.edit && !this.address.id && showMessageWhenNoAddress;
+      //         return !this.context.edit && !this.address.id && showMessageWhenNoAddress;
-          }
+      //     }
-         return !this.context.edit && !this.address.id && this.options.stickyActions;
+      //    return !this.context.edit && !this.address.id && this.options.stickyActions;
-      }
+      // }
    }
 };
 </script>
+
+<style lang="scss">
+
+.no-address-yet {
+   text-align: center;
+   box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
+   padding:1.5rem;
+   i {
+      font-size:2rem;
+      margin-bottom:2rem;
+   }
+   .add-address-btn {
+      display: block
+   }
+}
+</style>

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

@@ -463,6 +463,7 @@ workflow:
     Previous transitionned: Anciens workflows
     Previous workflow transitionned help: Workflows où vous avez exécuté une action.
     For: Pour
+    You must select a next step, pick another decision if no next steps are available: Il faut une prochaine étape. Choissisez une autre décision si nécessaire.
 
 
 Subscribe final: Recevoir une notification à l'étape finale

src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php

@@ -26,8 +26,9 @@ class AccompanyingPeriodWorkEventListener
 
     public function prePersistAccompanyingPeriodWork(AccompanyingPeriodWork $work): void
     {
-        if ($this->security->getUser() instanceof User) {
+        $referrer = $work->getAccompanyingPeriod()->getUser();
-            $work->addReferrer($this->security->getUser());
+        if (null !== $referrer) {
+            $work->addReferrer($referrer);
         }
     }
 }

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

@@ -333,10 +333,10 @@ export default {
       addQueryItem(field, queryItem) {
          switch (field) {
             case 'lastName':
-               this.person.lastName ? this.person.lastName += ` ${queryItem}` : this.person.lastName = queryItem;
+               this.person.lastName = this.person.lastName ? this.person.lastName += ` ${queryItem}` : queryItem;
                break;
             case 'firstName':
-               this.person.firstName ? this.person.firstName += ` ${queryItem}` : this.person.firstName = queryItem;
+               this.person.firstName = this.person.firstName ? this.person.firstName += ` ${queryItem}` : queryItem;
                break;
          }
       },

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

@@ -45,7 +45,7 @@ const personMessages = {
          },
          address: {
             create_address: "Ajouter une adresse",
-            show_address_form: "Créer un ménage et ajouter une adresse",
+            show_address_form: "Ajouter une adresse pour un usager non suivi et seul dans un ménage",
             warning: "Un nouveau ménage va être créé. L'usager sera membre de ce ménage."
          }
       },

src/Bundle/ChillPersonBundle/Search/PersonSearch.php

@@ -86,6 +86,10 @@ class PersonSearch extends AbstractSearch implements HasAdvancedSearchFormInterf
                 'label' => 'Birthdate',
                 'required' => false,
             ])
+            ->add('birthdate-after', ChillDateType::class, [
+                'label' => 'Birthdate after',
+                'required' => false,
+            ])
             ->add('birthdate-before', ChillDateType::class, [
                 'label' => 'Birthdate before',
                 'required' => false,

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

@@ -86,7 +86,7 @@ Civility: Civilité
 choose civility: --
 All genders: tous les genres
 Any person selected: Aucune personne sélectionnée
-Create a household and add an address: Créer un ménage et ajouter une adresse
+Create a household and add an address: Ajouter une adresse pour un usager non suivi et seul dans un ménage
 A new household will be created. The person will be member of this household.: Un nouveau ménage va être créé. L'usager sera membre de ce ménage.
 
 # dédoublonnage