Merge remote-tracking branch 'origin/ticket-app-master' into migrate_to_sf72

# Conflicts:
#	.gitlab-ci.yml
#	composer.json
#	config/services.yaml
#	phpunit.xml.dist
#	src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
#	src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
#	src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
#	src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
#	src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
#	src/Bundle/ChillJobBundle/src/Entity/Immersion.php
#	src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
#	src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
#	src/Bundle/ChillMainBundle/Entity/Location.php
#	src/Bundle/ChillMainBundle/Routing/MenuComposer.php
#	src/Bundle/ChillMainBundle/Routing/MenuTwig.php
#	src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
#	src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
#	src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
#	src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
#	src/Bundle/ChillPersonBundle/Controller/PersonController.php
#	src/Bundle/ChillPersonBundle/Entity/Person.php
#	src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
#	src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
#	src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
#	src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
#	src/Bundle/ChillTaskBundle/Form/SingleTaskType.php

src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php

@@ -90,7 +90,7 @@ class AdminDocGeneratorTemplateController extends CRUDController
     #[\Override]
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator): QueryBuilder
     {
-        return $query->addSelect('JSON_EXTRACT(e.name, :lang) AS HIDDEN name_lang')
+        return $query->addSelect('REPLACE(JSON_EXTRACT(e.name, :lang), \' \', \'~\') AS HIDDEN name_lang')
             ->setParameter('lang', $request->getLocale())
             ->addOrderBy('name_lang', 'ASC');
     }

src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php

@@ -20,4 +20,9 @@ use Doctrine\Persistence\ObjectRepository;
 interface DocGeneratorTemplateRepositoryInterface extends ObjectRepository
 {
     public function countByEntity(string $entity): int;
+
+    /**
+     * @return array|DocGeneratorTemplate[]
+     */
+    public function findByEntity(string $entity, ?int $start = 0, ?int $limit = 50): array;
 }

src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue

@@ -1,59 +1,54 @@
 <template>
-    <div>
-        <template v-if="templates.length > 0">
-            <slot name="title">
-                <h2>{{ $t("generate_document") }}</h2>
-            </slot>
+  <div>
+    <template v-if="templates.length > 0">
+      <slot name="title">
+        <h2>{{ $t("generate_document") }}</h2>
+      </slot>
 
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-4">
-                        <slot name="label">
-                            <label>{{ $t("select_a_template") }}</label>
-                        </slot>
-                    </div>
-                    <div class="col-md-8">
-                        <div class="input-group mb-3">
-                            <select class="form-select" v-model="template">
-                                <option disabled selected value="">
-                                    {{ $t("choose_a_template") }}
-                                </option>
-                                <template v-for="t in templates" :key="t.id">
-                                    <option :value="t.id">
-                                        {{
-                                            localizeString(t.name) ||
-                                            "Aucun nom défini"
-                                        }}
-                                    </option>
-                                </template>
-                            </select>
-                            <a
-                                v-if="canGenerate"
-                                class="btn btn-update btn-sm change-icon"
-                                :href="buildUrlGenerate"
-                                @click.prevent="
-                                    clickGenerate($event, buildUrlGenerate)
-                                "
-                                ><i class="fa fa-fw fa-cog"
-                            /></a>
-                            <a
-                                v-else
-                                class="btn btn-update btn-sm change-icon"
-                                href="#"
-                                disabled
-                                ><i class="fa fa-fw fa-cog"
-                            /></a>
-                        </div>
-                    </div>
-                </div>
-                <div class="row" v-if="hasDescription">
-                    <div class="col-md-8 align-self-end">
-                        <p>{{ getDescription }}</p>
-                    </div>
-                </div>
+      <div class="container">
+        <div class="row">
+          <div class="col-md-4">
+            <slot name="label">
+              <label>{{ $t("select_a_template") }}</label>
+            </slot>
+          </div>
+          <div class="col-md-8">
+            <div class="input-group mb-3">
+              <select class="form-select" v-model="template">
+                <option disabled selected value="">
+                  {{ $t("choose_a_template") }}
+                </option>
+                <template v-for="t in templates" :key="t.id">
+                  <option :value="t.id">
+                    {{ localizeString(t.name) || "Aucun nom défini" }}
+                  </option>
+                </template>
+              </select>
+              <a
+                v-if="canGenerate"
+                class="btn btn-update btn-sm change-icon"
+                :href="buildUrlGenerate"
+                @click.prevent="clickGenerate($event, buildUrlGenerate)"
+                ><i class="fa fa-fw fa-cog"
+              /></a>
+              <a
+                v-else
+                class="btn btn-update btn-sm change-icon"
+                href="#"
+                disabled
+                ><i class="fa fa-fw fa-cog"
+              /></a>
             </div>
-        </template>
-    </div>
+          </div>
+        </div>
+        <div class="row" v-if="hasDescription">
+          <div class="col-md-8 align-self-end">
+            <p>{{ getDescription }}</p>
+          </div>
+        </div>
+      </div>
+    </template>
+  </div>
 </template>
 
 <script>
@@ -61,83 +56,83 @@ import { buildLink } from "ChillDocGeneratorAssets/lib/document-generator";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export default {
-    name: "PickTemplate",
-    props: {
-        entityId: [String, Number],
-        entityClass: {
-            type: String,
-            required: false,
-        },
-        templates: {
-            type: Array,
-            required: true,
-        },
-        preventDefaultMoveToGenerate: {
-            type: Boolean,
-            required: false,
-            default: false,
-        },
+  name: "PickTemplate",
+  props: {
+    entityId: [String, Number],
+    entityClass: {
+      type: String,
+      required: false,
     },
-    emits: ["goToGenerateDocument"],
-    data() {
-        return {
-            template: null,
-        };
+    templates: {
+      type: Array,
+      required: true,
     },
-    computed: {
-        canGenerate() {
-            return this.template != null;
-        },
-        hasDescription() {
-            if (this.template == null) {
-                return false;
-            }
+    preventDefaultMoveToGenerate: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  emits: ["goToGenerateDocument"],
+  data() {
+    return {
+      template: null,
+    };
+  },
+  computed: {
+    canGenerate() {
+      return this.template != null;
+    },
+    hasDescription() {
+      if (this.template == null) {
+        return false;
+      }
 
-            return true;
-        },
-        getDescription() {
-            if (null === this.template) {
-                return "";
-            }
-            let desc = this.templates.find((t) => t.id === this.template);
-            if (null === desc) {
-                return "";
-            }
-            return desc.description || "";
-        },
-        buildUrlGenerate() {
-            if (null === this.template) {
-                return "#";
-            }
+      return true;
+    },
+    getDescription() {
+      if (null === this.template) {
+        return "";
+      }
+      let desc = this.templates.find((t) => t.id === this.template);
+      if (null === desc) {
+        return "";
+      }
+      return desc.description || "";
+    },
+    buildUrlGenerate() {
+      if (null === this.template) {
+        return "#";
+      }
 
-            return buildLink(this.template, this.entityId, this.entityClass);
-        },
+      return buildLink(this.template, this.entityId, this.entityClass);
     },
-    methods: {
-        localizeString(str) {
-            return localizeString(str);
-        },
-        clickGenerate(event, link) {
-            if (!this.preventDefaultMoveToGenerate) {
-                window.location.assign(link);
-            }
+  },
+  methods: {
+    localizeString(str) {
+      return localizeString(str);
+    },
+    clickGenerate(event, link) {
+      if (!this.preventDefaultMoveToGenerate) {
+        window.location.assign(link);
+      }
 
-            this.$emit("goToGenerateDocument", {
-                event,
-                link,
-                template: this.template,
-            });
-        },
+      this.$emit("goToGenerateDocument", {
+        event,
+        link,
+        template: this.template,
+      });
     },
-    i18n: {
-        messages: {
-            fr: {
-                generate_document: "Générer un document",
-                select_a_template: "Choisir un modèle",
-                choose_a_template: "Choisir",
-            },
-        },
+  },
+  i18n: {
+    messages: {
+      fr: {
+        generate_document: "Générer un document",
+        select_a_template: "Choisir un modèle",
+        choose_a_template: "Choisir",
+      },
     },
+  },
 };
 </script>
 

src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig

@@ -25,12 +25,24 @@
                             <div class="item-bloc">
                                 <div class="item-row">
                                     <div class="item-col" style="flex-basis:100%;">
-                                        <h2>{{ entity.name|localize_translatable_string }}</h2>
+                                        <h2>{{ entity.name|localize_translatable_string }} </h2>
+                                        <p style="margin-left: 1rem;"><span class="badge bg-chill-gray">
+                                            {% if entity.active %}
+                                                {{ 'admin.active'|trans }}
+                                            {% else %}
+                                                {{ 'admin.not active'|trans }}
+                                            {% endif %}
+                                        </span></p>
                                     </div>
                                 </div>
                                 <div class="item-row">
                                     <p><span class="badge bg-chill-green-dark">{{ contextManager.getContextByKey(entity.context).name|trans }}</span></p>
                                 </div>
+{#                                <div class="item-row">#}
+{#                                    <div class="item-col" style="flex-basis:100%;">#}
+{##}
+{#                                    </div>#}
+{#                                </div>#}
                                 <div class="item-row">
                                     <div class="item-col"></div>
                                     <ul class="record_actions item-col flex-shrink-1">

src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php

@@ -25,6 +25,8 @@ use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+// use Symfony\Component\Translation\LocaleSwitcher;
+
 /**
  * @see OnGenerationFailsTest for test suite
  */
@@ -40,6 +42,7 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
         private StoredObjectRepositoryInterface $storedObjectRepository,
         private TranslatorInterface $translator,
         private UserRepositoryInterface $userRepository,
+        // private LocaleSwitcher $localeSwitcher,
     ) {}
 
     public static function getSubscribedEvents(): array
@@ -118,7 +121,26 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
             return;
         }
 
-        $email = new TemplatedEmail()
+        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
+        /*
+        $this->localeSwitcher->runWithLocale($creator->getLocale(), function () use ($message, $errors, $template, $creator) {
+            $email = (new TemplatedEmail())
+                ->to($message->getSendResultToEmail())
+                ->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))
+                ->textTemplate('@ChillDocGenerator/Email/on_generation_failed_email.txt.twig')
+                ->context([
+                    'errors' => $errors,
+                    'template' => $template,
+                    'creator' => $creator,
+                    'stored_object_id' => $message->getDestinationStoredObjectId(),
+                ]);
+
+            $this->mailer->send($email);
+        });
+        */
+
+        // Current implementation:
+        $email = (new TemplatedEmail())
             ->to($message->getSendResultToEmail())
             ->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))
             ->textTemplate('@ChillDocGenerator/Email/on_generation_failed_email.txt.twig')

src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php

@@ -26,6 +26,8 @@ use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+// use Symfony\Component\Translation\LocaleSwitcher;
+
 /**
  * Handle the request of document generation.
  */
@@ -45,6 +47,7 @@ class RequestGenerationHandler
         private readonly MailerInterface $mailer,
         private readonly TranslatorInterface $translator,
         private readonly StoredObjectManagerInterface $storedObjectManager,
+        // private readonly LocaleSwitcher $localeSwitcher,
     ) {}
 
     public function __invoke(RequestGenerationMessage $message): void
@@ -121,6 +124,30 @@ class RequestGenerationHandler
 
     private function sendDataDump(StoredObject $destinationStoredObject, RequestGenerationMessage $message): void
     {
+        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
+        // Note: This method sends emails to admin addresses, not user addresses, so locale switching may not be needed
+        /*
+        $this->localeSwitcher->runWithLocale('fr', function () use ($destinationStoredObject, $message) {
+            // Get the content of the document
+            $content = $this->storedObjectManager->read($destinationStoredObject);
+            $filename = $destinationStoredObject->getFilename();
+            $contentType = $destinationStoredObject->getType();
+
+            // Create the email with the document as an attachment
+            $email = (new TemplatedEmail())
+                ->to($message->getSendResultToEmail())
+                ->textTemplate('@ChillDocGenerator/Email/send_data_dump_to_admin.txt.twig')
+                ->context([
+                    'filename' => $filename,
+                ])
+                ->subject($this->translator->trans('docgen.data_dump_email.subject'))
+                ->attach($content, $filename, $contentType);
+
+            $this->mailer->send($email);
+        });
+        */
+
+        // Current implementation:
         // Get the content of the document
         $content = $this->storedObjectManager->read($destinationStoredObject);
         $filename = $destinationStoredObject->getFilename();

src/Bundle/ChillDocGeneratorBundle/translations/messages+intl-icu.nl.yml

@@ -0,0 +1,2 @@
+docgen:
+    # Geen ICU berichten nodig voor data_dump_email meer

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

@@ -49,3 +49,7 @@ crud:
 
 
 Template file: Fichier modèle
+
+admin:
+    active: Actif
+    not active: Non-actif

src/Bundle/ChillDocGeneratorBundle/translations/messages.nl.yml

@@ -0,0 +1,51 @@
+docgen:
+    Generate a document: Document genereren
+    Generate: Genereren
+    Document generation: Documentgeneratie
+    Manage templates and document generation: Beheer van gegenereerde documenten en hun sjablonen
+    Pick template context: Context kiezen
+    Context: Context
+    New template: Nieuw sjabloon
+    Edit template: Sjabloon bewerken
+    test generate: Generatie testen
+    With context %name%: 'Met context "%name%"'
+
+    Doc generation failed: Het genereren van dit document is mislukt
+    Doc generation is pending: Het genereren van dit document is bezig
+    Come back later: Kom later terug
+
+    Send report to: Rapport verzenden naar
+    Send report errors to this email address: Foutrapporten worden verzonden naar het opgegeven e-mailadres
+    Generate as creator: Genereren als
+    The document will be generated as the given creator: Het document wordt gegenereerd namens de opgegeven gebruiker
+    Show data instead of generating: Gegevens tonen in plaats van document genereren
+
+    Any template configured: Geen documentsjabloon geconfigureerd
+
+    entity_id_placeholder: Identificatie van de entiteit
+
+    failure_email:
+        The generation of a document failed: Het genereren van een document is mislukt
+        The generation of the document %template_name% failed: Het genereren van een document op basis van sjabloon {{ template_name }} is mislukt.
+        The following errors were encoutered: De volgende fouten zijn opgetreden
+        Forward this email to your administrator for solving: Stuur dit bericht door naar uw beheerder voor probleemoplossing.
+        References: Referenties
+
+    data_dump_email:
+        subject: Inhoud van documentgeneratiegegevens beschikbaar
+        Dear: Beste
+        data_dump_ready_and_attached: >-
+            De inhoud van de gegevens is beschikbaar. U vindt deze als bijlage bij deze e-mail.
+        filename: >-
+            Bestandsnaam: %filename%
+
+
+
+crud:
+    docgen_template:
+        index:
+            title: Documentgeneratie
+            add_new: Aanmaken
+
+
+Template file: Sjabloonbestand