Merge remote-tracking branch 'origin/master' into issue471_activity_socialissue-action

CHANGELOG.md

@@ -47,6 +47,8 @@ and this project adheres to
 * [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)
 * [household] create-edit household composition placed in separate page to avoid confusion (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/505)
 * [blur] Improved positioning of toggle icon (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/486)
+* [thirdparty] Thirdparty view page, english text translated (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/534)
+* [social_action] Translation changed in evaluation section (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/512)
 
 ## Test releases
 

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

@@ -46,7 +46,7 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
 
-    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"

src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php

@@ -118,6 +118,13 @@ class LoadPostalCodesCommand extends Command
 
     private function addPostalCode($row, OutputInterface $output)
     {
+        if($row[2] == 'FR' && strlen($row[0]) == 4) {
+            // CP in FRANCE are on 5 digit
+            // For CP starting with a zero, the starting zero can be remove if stored as number in a csv
+            // add a zero if CP from FR and on 4 digit
+            $row[0] = '0'.$row[0];
+        }
+
         if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
             $output->writeln('handling row: ' . $row[0] . ' | ' . $row[1] . ' | ' . $row[2]);
         }

src/Bundle/ChillPersonBundle/Menu/AccompanyingCourseMenuBuilder.php

@@ -68,12 +68,14 @@ class AccompanyingCourseMenuBuilder implements LocalMenuBuilderInterface
         }
 
         if ($this->security->isGranted(AccompanyingPeriodVoter::SEE_DETAILS, $period)) {
+            /*
                 $menu->addChild($this->translator->trans('Accompanying Course History'), [
                     'route' => 'chill_person_accompanying_course_history',
                     'routeParameters' => [
                         'accompanying_period_id' => $period->getId(),
                     ], ])
                     ->setExtras(['order' => 30]);
+            */
 
             $menu->addChild($this->translator->trans('Accompanying Course Comment'), [
                 'route' => 'chill_person_accompanying_period_comment_list',

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue

@@ -319,7 +319,7 @@ const i18n = {
          add_thirdparties: "Ajouter des tiers",
          choose_thirdparties: "Choisir des tiers",
          fix_these_errors: "Veuillez corriger les erreurs suivantes :",
-         available_evaluations_text: "Évaluations disponibles pour ajout :",
+         available_evaluations_text: "Documents disponibles pour ajout :",
          no_evaluations_available: "Aucune évaluation disponible",
          no_goals_available: "Aucun objectif disponible",
       }

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue

@@ -70,7 +70,7 @@
                <div class="input-group input-group-lg mb-3">
                   <div>
                      <input
-                         class="form-control form-control-lg"
+                         class="form-control"
                          style="font-weight: bold;"
                          type="text"
                          :value="d.title"

src/Bundle/ChillPersonBundle/Resources/views/Workflow/_evaluation_document.html.twig

@@ -1,5 +1,10 @@
+{%- import "@ChillDocStore/Macro/macro.html.twig" as m -%}
+
 <div class="flex-table accompanying_course_work-list">
     <div class="item-bloc evaluation-item bg-chill-llight-gray">
+        <div class="item-row mb-2">
+            <h1>{{ doc.title }}</h1>
+        </div>
         <div class="item-row mb-2">
             <h2 class="badge-title">
                 <span class="title_label"></span>
@@ -20,6 +25,24 @@
                 </span>
             </h2>
         </div>
+        <div class="item-row mb-2">
+            <div class="item-col" style="width: 17%;">
+                <h4 class="title_label">
+                    {{ 'Participants'|trans }}
+                </h4>
+            </div>
+            <div class="item-col list">
+                {% for p in evaluation.accompanyingPeriodWork.persons %}
+                    {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                        targetEntity: { name: 'person', id: p.id },
+                        action: 'show',
+                        displayBadge: true,
+                        buttonText: p|chill_entity_render_string,
+                        isDead: p.deathdate is not null
+                    } %}
+                {% endfor %}
+            </div>
+        </div>
         <div class="item-row column">
             <table class="obj-res-eval my-3" style="font-size: 110% !important;">
                 <thead>
@@ -92,8 +115,14 @@
 </div>
 
 {% if display_action is defined and display_action == true %}
-    {# TODO add acl #}
+    {% if is_granted('CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', evaluation.accompanyingPeriodWork) %}
     <ul class="record_actions">
+        <li>{{ m.download_button(doc.storedObject, doc.title) }}</li>
+        {% if chill_document_is_editable(doc.storedObject) %}
+            <li>
+                {{ doc.storedObject|chill_document_edit_button }}
+            </li>
+        {% endif %}
         <li>
             <a class="btn btn-show" href="{{ path('chill_person_accompanying_period_work_edit', {'id': evaluation.accompanyingPeriodWork.id}) }}">
                 {{ 'Show'|trans }}
@@ -101,3 +130,4 @@
         </li>
     </ul>
     {% endif %}
+{% endif %}

src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php

@@ -61,8 +61,8 @@ class AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler implements EntityW
         return $this->translator->trans(
             'workflow.Doc for evaluation (n°%eval%)',
             ['%eval%' => $entityWorkflow->getRelatedEntityId()]
-        ) . ' - ' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
-            ->getEvaluation()->getTitle());
+        ) . ' (' . $this->translatableStringHelper->localize($doc->getAccompanyingPeriodWorkEvaluation()
+            ->getEvaluation()->getTitle()).') '.$doc->getTitle();
     }
 
     public function getRelatedEntity(EntityWorkflow $entityWorkflow): ?AccompanyingPeriodWorkEvaluationDocument

src/Bundle/ChillPersonBundle/config/routes.yaml

@@ -95,11 +95,6 @@ chill_person_address_update:
 chill_person_timeline:
     path: /{_locale}/person/{person_id}/timeline
     controller: Chill\PersonBundle\Controller\TimelinePersonController::personAction
-    options:
-        menus:
-            person:
-                order: 60
-                label: Timeline
 
 chill_person_admin:
     path: "/{_locale}/admin/person"

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

@@ -60,7 +60,7 @@
                         {% if types|length > 0 %}
                             {{ types|join(', ') }}
                         {% else %}
-                            <p class="chill-no-data-statement">{{ 'thirdParty.Any categories' }}</p>
+                            <p class="chill-no-data-statement">{{ 'thirdparty.no_categories' }}</p>
                         {% endif %}
                     </dd>
 
@@ -110,7 +110,7 @@
                         <dt>{{ 'Contacts'|trans }}</dt>
                         <dd>
                             {% if thirdParty.activeChildren|length == 0 %}
-                            <p class="chill-no-data-statement">{{ 'Any contacts associated'|trans }}</p>
+                            <p class="chill-no-data-statement">{{ 'No contacts associated'|trans }}</p>
                             {% else %}
                                 <div class="flex-table">
                                     {% for tp in thirdParty.activeChildren %}

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

@@ -63,13 +63,13 @@ Show thirdparty: Voir le tiers
 Add a contact: Ajouter un contact
 Remove a contact: Supprimer
 Contacts: Contacts
-Any contact: Aucun contact
+No contacts associated: Aucun contact
 
 No nameCompany given: Aucune raison sociale renseignée
 No acronym given: Aucun sigle renseigné
 No phone given: Aucun téléphone renseigné
 No email given:  Aucune adresse courriel renseignée
-thirdparty.Any categories: Aucune catégorie
+thirdparty.no_categories: Aucune catégorie
 
 The party is visible in those centers: Le tiers est visible dans ces centres
 The party is not visible in any center: Le tiers n'est associé à aucun centre

src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js

@@ -14,7 +14,7 @@ window.addEventListener('DOMContentLoaded', function(e) {
     office_frame.setAttribute('allowfullscreen', 'true');
 
     // The sandbox attribute is needed to allow automatic redirection to the O365 sign-in page in the business user flow
-    office_frame.setAttribute('sandbox', 'allow-scripts allow-same-origin allow-forms allow-popups allow-top-navigation allow-popups-to-escape-sandbox');
+    office_frame.setAttribute('sandbox', 'allow-downloads allow-scripts allow-same-origin allow-forms allow-popups allow-top-navigation allow-popups-to-escape-sandbox');
     frameholder.appendChild(office_frame);
 
     document.getElementById('office_form').submit();