merge master into branch

2025-06-07 18:44:08 +00:00 · 2022-03-09 20:48:30 +01:00 · 2022-03-09 20:48:30 +01:00 · e153fa34e9
commit e153fa34e9
parent 388b666b5d d6933fce35
17 changed files with 64 additions and 63 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -34,6 +34,10 @@ and this project adheres to
 * [person] email added to twig personRenderbox (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/490)
 * [person] Add link to current household in person banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/484)
 * [address] person badge in address history changed to open OnTheFly with all person info (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/489)
+* [person] Change 'personne' with 'usager' and '&' with 'ET' (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/499)
+* [thirdparty] Add parameter condition to display centers or not (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/500)
+* [phonenumber] Remove placeholder in phonenumber field (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/496)
+* [contact] add contact button color changed plus the pipe at the side removed (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/506)

 ## Test releases

--- a/phpstan-types.neon
+++ b/phpstan-types.neon
@ -350,11 +350,6 @@ parameters:
 			count: 6
 			path: src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php

-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
-
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
@ -192,7 +192,7 @@ class EntityWorkflowStep
     * You should **not** rely on this method to get all users which are able to
     * apply a transition on this step. Use @see{EntityWorkflowStep::getAllDestUser} instead.
     */
-    public function getDestUser(): collection
+    public function getDestUser(): Collection
    {
        return $this->destUser;
    }
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
@ -16,9 +16,7 @@ use libphonenumber\PhoneNumberUtil;
 use Misd\PhoneNumberBundle\Form\Type\PhoneNumberType;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use function array_key_exists;

 class ChillPhoneNumberType extends AbstractType
 {
@ -37,21 +35,7 @@ class ChillPhoneNumberType extends AbstractType
        $resolver
            ->setDefault('default_region', $this->defaultCarrierCode)
            ->setDefault('format', PhoneNumberFormat::NATIONAL)
-            ->setDefault('type', \libphonenumber\PhoneNumberType::FIXED_LINE_OR_MOBILE)
-            ->setNormalizer('attr', function (Options $options, $value) {
-                if (array_key_exists('placeholder', $value)) {
-                    return $value;
-                }
-
-                $examplePhoneNumber = $this->phoneNumberUtil->getExampleNumberForType($this->defaultCarrierCode, $options['type']);
-
-                return array_merge(
-                    $value,
-                    [
-                        'placeholder' => PhoneNumberUtil::getInstance()->format($examplePhoneNumber, $options['format']),
-                    ]
-                );
-            });
+            ->setDefault('type', \libphonenumber\PhoneNumberType::FIXED_LINE_OR_MOBILE);
    }

    public function getParent()
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
@ -25,7 +25,7 @@ $chill-theme-buttons: (
   "notify":        $chill-blue,
   "search":        $gray-300,
   "unlink":        $chill-red,
-   "tpchild":       $chill-pink,
+   "tpchild":       $chill-green,
 );

@each $button, $color in $chill-theme-buttons {
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
@ -9,6 +9,12 @@
                <span class="item-key">{{ 'Le'|trans ~ ' : ' }}</span>
                <b>{{ step.previous.transitionAt|format_datetime('short', 'short') }}</b>
            </li>
+            <li>
+                <span class="item-key">{{ 'workflow.For'|trans ~ ' : ' }}</span>
+                <b>
+                    {% for d in step.destUser %}{{ d|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
+                </b>
+            </li>
        {% else %}
            <li>
                <span class="item-key">{{ 'workflow.Created by'|trans ~ ' : ' }}</span>
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
@ -113,6 +113,7 @@ class AddressNormalizer implements ContextAwareNormalizerInterface, NormalizerAw
                [
                    'postcode' => $helper->normalize(self::NULL_POSTCODE_COUNTRY, $format, $context),
                    'country' => $helper->normalize(self::NULL_POSTCODE_COUNTRY, $format, $context),
+                    'lines' => [],
                ]
            );
        }
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@ -413,6 +413,7 @@ workflow:
    Previous workflow without reaction help: Liste des workflows où vous avez été cité comme pouvant réagir à une étape, mais où un autre utilisateur a exécuté une action avant vous.
    Previous transitionned: Anciens workflows
    Previous workflow transitionned help: Workflows où vous avez exécuté une action.
+    For: Pour


 Subscribe final: Recevoir une notification à l'étape finale
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list_item.html.twig
@ -117,12 +117,15 @@
        </div>
    {% endif %}
    <div class="item-row separator">
-        <div class="item-col item-meta">
        {% set notif_counter = chill_count_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', period.id) %}
        {% if notif_counter.total > 0 %}
+            <div class="item-col item-meta">
                    {{ chill_counter_notifications('Chill\\PersonBundle\\Entity\\AccompanyingPeriod', period.id) }}
-            {% endif %}
            </div>
+        {% endif %}
+        {% if itemMeta is defined %}
+            {{ itemMeta }}
+        {% endif %}
        <div class="item-col">
            {% if recordAction is defined %}
                <ul class="record_actions">
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@ -167,7 +167,7 @@
                    <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                </li>
            {% endif %}
-            {% if person.email is not null %}
+            {% if person.email is not empty %}
                <li>
                    <i class="fa fa-li fa-envelope-o"></i><a href="{{ 'mailto:' ~ person.email }}">
                        {{ person.email }}
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
@ -179,7 +179,8 @@ class AccompanyingPeriodWorkEvaluationContext implements
        $doc = new AccompanyingPeriodWorkEvaluationDocument();
        $doc->setStoredObject($storedObject)
            ->setAccompanyingPeriodWorkEvaluation($entity)
-            ->setTemplate($template);
+            ->setTemplate($template)
+            ->setTitle($this->translatableStringHelper->localize($template->getName()));
        $this->em->persist($doc);
    }
 }
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
@ -72,6 +72,7 @@ class AccompanyingPeriodWorkEvaluationWorkflowHandler implements EntityWorkflowH
     */
    public function getRelatedObjects(object $object): array
    {
+        $relateds = [];
        $relateds[] = ['entityClass' => AccompanyingPeriodWorkEvaluation::class, 'entityId' => $object->getId()];

        foreach ($object->getDocuments() as $doc) {
--- a/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
+++ b/src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
@ -71,6 +71,7 @@ class AccompanyingPeriodWorkWorkflowHandler implements EntityWorkflowHandlerInte
     */
    public function getRelatedObjects(object $object): array
    {
+        $relateds = [];
        $relateds[] = ['entityClass' => AccompanyingPeriodWork::class, 'entityId' => $object->getId()];

        foreach ($object->getAccompanyingPeriodWorkEvaluations() as $evaluation) {
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@ -124,8 +124,8 @@ address_country_code: Code pays

 'Alreay existing person': 'Dossiers déjà encodés'
 'Add the person': 'Ajouter la personne'
-'Add the person and create an accompanying period': "Créer la personne & créer une période d'accompagnement"
-'Add the person and create a household': "Créer la personne & créer un ménage"
+'Add the person and create an accompanying period': "Créer l'usager ET créer une période d'accompagnement"
+'Add the person and create a household': "Créer l'usager' ET créer un ménage"
 Show person: Voir le dossier de la personne
 'Confirm the creation': 'Confirmer la création'
 'You will create this person': 'Vous allez créer le dossier suivant'
--- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
@ -20,6 +20,7 @@ use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Repository\ThirdPartyACLAwareRepositoryInterface;
 use Chill\ThirdPartyBundle\Security\Voter\ThirdPartyVoter;
 use LogicException;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@ -31,37 +32,39 @@ use function array_merge;

 final class ThirdPartyController extends CRUDController
 {
-    /**
-     * @var AuthorizationHelper
-     */
-    protected $authorizationHelper;
+    protected AuthorizationHelper $authorizationHelper;

-    /**
-     * @var PaginatorFactory
-     */
-    protected $paginatorFactory;
+    protected PaginatorFactory $paginatorFactory;

    protected RequestStack $requestStack;

    protected ThirdPartyACLAwareRepositoryInterface $thirdPartyACLAwareRepository;

-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
+    protected TranslatorInterface $translator;
+
+    private bool $askCenter;

    public function __construct(
        AuthorizationHelper $authorizationHelper,
        TranslatorInterface $translator,
        PaginatorFactory $paginatorFactory,
        RequestStack $requestStack,
-        ThirdPartyACLAwareRepositoryInterface $thirdPartyACLAwareRepository
+        ThirdPartyACLAwareRepositoryInterface $thirdPartyACLAwareRepository,
+        ParameterBagInterface $parameterBag
    ) {
        $this->authorizationHelper = $authorizationHelper;
        $this->translator = $translator;
        $this->paginatorFactory = $paginatorFactory;
        $this->requestStack = $requestStack;
        $this->thirdPartyACLAwareRepository = $thirdPartyACLAwareRepository;
+        $this->askCenter = $parameterBag->get('chill_main')['acl']['form_show_centers'];
+    }
+
+    public function generateTemplateParameter(string $action, $entity, Request $request, array $defaultTemplateParameters = [])
+    {
+        $defaultTemplateParameters['askCenter'] = $this->askCenter;
+
+        return $defaultTemplateParameters;
    }

    protected function buildFilterOrderHelper(string $action, Request $request): ?FilterOrderHelper
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@ -36,7 +36,7 @@
                <ul class="list-content fa-ul">
                    <li v-if="getProfession.length > 0">
                        <i class="fa fa-li fa-id-card"></i>
-                        <p><span v-for="p in getProfession" :key="p" class="list-item">{{ p[0].toUpperCase() + p.slice(1).toLowerCase() }}</span></p>
+                        <p><span v-for="p in getProfession" :key="p" class="list-item list-professions">{{ p[0].toUpperCase() + p.slice(1).toLowerCase() }}</span></p>
                    </li>
                    <li v-if="hasParent">
                        <i class="fa fa-li fa-hand-o-right"></i>
@ -165,7 +165,7 @@ export default {
    }
 }

-.list-item {
+.list-professions {
    &::after {
        content: " | ";
    }
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/view.html.twig
@ -123,6 +123,7 @@
                        </dd>
                    {% endif %}

+                    {% if askCenter %}
                        <dt>{{ 'Centers'|trans }}</dt>
                        <dd>
                            {% set centers = thirdParty|chill_resolve_center %}
@ -135,7 +136,7 @@
                                {{ 'The party is visible in those centers'|trans }}&nbsp;: {{ centers }}
                            {% endif %}
                        </dd>
-
+                    {% endif %}
                </dl>
            {% endblock %}
            {% block content_form_actions_delete %}{% endblock %}