upd CHANGELOG

CHANGELOG.md

@@ -18,6 +18,16 @@ and this project adheres to
 
 
 <!-- write down unreleased development here -->
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+
+## Test releases
+
+### test release 2022-02-14
+
+* AddPersons: remove ul-li html tags from AddPersons (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/419)
+* [doc-generator] do not set required fields for mainPerson, person1, person2 (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement#456)
+* [doc-generation] add age and obele in the mainPerson, person1 and person2 list + add obele in person renderString if addAge (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/370)
+* [person] accompanying course work: fix on-the-fly update of thirdParty
 * fix normalisation of accompanying course requestor api (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/378)
 * [person] add a returnPath when clicking on some Person or ThirdParty badge (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/427)
 * [person] accompanying course work: fix on-the-fly update of thirdParty
@@ -35,8 +45,8 @@ and this project adheres to
 * display full address in address.text in normalization. Adapt AddressRenderBox
 * [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
 * [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
-
+* [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
-## Test releases
+* [homepage_widget]: If no sender then display as 'notification automatique' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/435)
 
 ### test release 2021-02-01
 
@@ -56,8 +66,7 @@ and this project adheres to
 * [workflow][notification] improve how notifications and workflows are 'attached' to entities: contextual list, counter, buttons and vue modal
 * [AddAddress] disable multiselect search, and rely only on most pertinent Cities and Street computed backend
 * [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
-<<<<<<< HEAD
+* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
-* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.  
 * [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
 
 
@@ -66,6 +75,11 @@ and this project adheres to
 * [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
 >>>>>>> issue422_and_others_on_AddPersons
 
+=======
+* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
+
+>>>>>>> b0d50d315c8e00959a967badac9cf5057ab2b4bc
 ### test release 2021-01-31
 
 * [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)

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/ChillMainBundle/chill.api.specs.yaml

@@ -781,6 +781,16 @@ paths:
                     description: "accepted"
                 403:
                     description: "unauthorized"
+    /1.0/main/civility.json:
+        get:
+            tags:
+            - civility
+            summary: Return all civility types
+            responses:
+                200:
+                    description: "ok"
+                401:
+                    description: "Unauthorized"
     /1.0/main/user-job.json:
         get:
             tags:

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>