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

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -357,7 +357,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
         if (null !== $this->accompanyingPeriod) {
             $personsAssociated = [];
 
-            foreach ($this->accompanyingPeriod->getParticipations() as $participation) {
+            foreach ($this->accompanyingPeriod->getOpenParticipations() as $participation) {
                 if ($this->persons->contains($participation->getPerson())) {
                     $personsAssociated[] = $participation->getPerson();
                 }

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

@@ -1,7 +1,7 @@
 <template>
    <li>
-      <span :title="person.text">
-         <span class="chill_denomination" @click.prevent="$emit('remove', person)">
+      <span :title="person.text" @click.prevent="$emit('remove', person)">
+         <span class="chill_denomination">
             <person-text :person="person" :isCut="true"></person-text>
          </span>
       </span>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue

@@ -17,7 +17,8 @@
                   <a :href="getNotificationUrl(n)">{{ n.title }}</a>
                </span>
             </td>
-            <td>{{ n.sender.text }}</td>
+            <td v-if="n.sender != null">{{ n.sender.text }}</td>
+            <td v-else>{{ $t('automatic_notification')}}</td>
             <td>
                <a class="btn btn-sm btn-show"
                   :href="getEntityUrl(n)">

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js

@@ -53,6 +53,7 @@ const appMessages = {
         },
         emergency: "Urgent",
         confidential: "Confidentiel",
+        automatic_notification: "Notification automatique"
     }
 };
 

src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig

@@ -11,7 +11,6 @@
     * buttonText    string
     * displayBadge  boolean (default: false)  replace button by badge, need to define buttonText for content
     * parent        object  (optional)        pass parent context of the targetEntity (used for course resource comment)
-    * isDead        boolean (default: false)  is the person dead
 
 #}
 <span class="onthefly-container"
@@ -29,10 +28,6 @@
         data-button-text="{{ buttonText|e('html_attr') }}"
     {% endif %}
 
-    {% if isDead is defined and isDead == 1  %}
-        data-is-dead="true"
-    {% endif %}
-
     {% if displayBadge is defined and displayBadge == 1 %}
         data-display-badge="true"
     {% endif %}

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/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/Security/Authorization/AccompanyingPeriodWorkVoter.php

@@ -62,7 +62,6 @@ class AccompanyingPeriodWorkVoter extends Voter
                 case self::UPDATE:
                     return $this->security->isGranted(AccompanyingPeriodVoter::EDIT, $subject->getAccompanyingPeriod());
 
-
                 default:
                     throw new UnexpectedValueException("attribute {$attribute} is not supported");
             }

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/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

src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig

@@ -115,7 +115,7 @@
                                 <div class="flex-table">
                                     {% for tp in thirdParty.activeChildren %}
                                     <div class="item-bloc">
-                                        {{ tp|chill_entity_render_box({'render': 'bloc', 'addLink': false}) }}
+                                        {{ tp|chill_entity_render_box({'render': 'bloc', 'addLink': false, 'isConfidential': tp.contactDataAnonymous ? true : false }) }}
                                     </div>
                                     {% endfor %}
                                 </div>