Merge branch 'add-wysiwyg' into 'master'

Applique l'éditeur de texte sur plusieurs instances + rendu des "Comment Embeddable" See merge request Chill-Projet/chill-bundles!7
2025-08-20 14:43:49 +00:00 · 2021-04-02 12:11:39 +00:00
parent 34e5fbedf2 ae81e7be31
commit 36cdf4c220
23 changed files with 393 additions and 64 deletions
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -15,7 +15,6 @@ use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTra
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Chill\ActivityBundle\Form\Type\TranslatableActivityType;
 use Chill\ActivityBundle\Form\Type\TranslatableActivityReason;
 use Chill\MainBundle\Form\Type\UserPickerType;
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
@@ -46,12 +46,7 @@
                <td>{{ activity.durationTime|date('H:i') }}</td>
                <td>
                    {% if activity.comment.comment is not empty %}
-                        <blockquote class="chill-user-quote">
-                            {{ activity.comment.comment|slice(0, 250) }} {#
-                             sf4 check: if 'slice' could replace 'truncate' filter ?
-                             truncate come with twig-extensions, in conflict with twig 3
-                             #}
-                        </blockquote>
+                            {{ activity.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
                    {% endif %}
                    {%- if activity.reasons is empty -%}
                        {{ 'No reason associated'|trans }}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
@@ -13,7 +13,7 @@

        {% if is_granted(constant('Chill\\ActivityBundle\\Security\\Authorization\\ActivityVoter::SEE_DETAILS'), activity) %}
        <dl class="chill_view_data">
-            <dd>{% if activity.comment.comment is empty %}{{ 'No comments'|trans }}{% else %}<blockquote class="chill-user-quote">{{ activity.comment.comment|nl2br }}</blockquote>{% endif %}</dd>
+            <dd>{% if activity.comment.comment is empty %}{{ 'No comments'|trans }}{% else %}{{ activity.comment|chill_entity_render_box({'metadata': false}) }}{% endif %}</dd>

            <dt class="inline">{{ 'Reasons'|trans }}</dt>
            {%- if activity.reasons is empty -%}
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -4,7 +4,6 @@ namespace Chill\DocStoreBundle\Form;


 use Chill\DocStoreBundle\Entity\Document;
-use Chill\DocStoreBundle\Entity\DocumentCategory;
 use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\MainBundle\Entity\User;
 use Symfony\Component\Form\AbstractType;
@@ -12,15 +11,13 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Doctrine\ORM\EntityRepository;
-use Chill\MainBundle\Form\Type\AppendScopeChoiceTypeTrait;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelper;
 use Doctrine\Persistence\ObjectManager;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;


 class PersonDocumentType extends AbstractType
@@ -62,7 +59,7 @@ class PersonDocumentType extends AbstractType
    {
        $builder
            ->add('title', TextType::class)
-            ->add('description', TextareaType::class, [
+            ->add('description', ChillTextareaType::class, [
                'required' => false
            ])
            ->add('object', StoredObjectType::class, [
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js
@@ -1,5 +1,5 @@
 var algo = 'AES-CBC';
-var Dropzone = require('dropzone');
+import Dropzone from 'dropzone';
 var initializeDownload = require('./downloader.js');


@@ -121,7 +121,7 @@ var createZone = (zone, zoneData) => {
    created.classList.add('dropzone');
    initMessage.classList.add('dz-message');
    initMessage.appendChild(document.createTextNode(initContent));
-            
+ console.log(Dropzone);
    dropzoneI = new Dropzone(created, {
            url: function(files) {
                return getUploadUrl(zoneData, files);
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig
@@ -45,7 +45,7 @@
            <span class="chill-no-data-statement">{{ 'Any description'|trans }}</span>
            {% else %}
            <blockquote class="chill-user-quote">
-                {{ document.description }}
+                {{ document.description|chill_markdown_to_html }}
            </blockquote>
            {% endif %}
        </dd>
--- a/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/CommentType.php
@@ -20,7 +20,7 @@ namespace Chill\MainBundle\Form\Type;
 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -44,8 +44,8 @@ class CommentType extends AbstractType
    public function buildForm(FormBuilderInterface $builder, array $options)
    {
        $builder
-            ->add('comment', TextareaType::class, [
-
+            ->add('comment', ChillTextareaType::class, [
+                'disable_editor' => $options['disable_editor']
            ])
        ;

@@ -72,8 +72,12 @@ class CommentType extends AbstractType

    public function configureOptions(OptionsResolver $resolver)
    {
-        $resolver->setDefaults([
-            'data_class' => CommentEmbeddable::class,
-        ]);
+        $resolver
+            ->setDefined('disable_editor')
+            ->setAllowedTypes('disable_editor', 'bool')
+            ->setDefaults([
+                'data_class' => CommentEmbeddable::class,
+                'disable_editor' => false
+            ]);
    }
 }
--- a/src/Bundle/ChillMainBundle/Resources/public/main.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/main.js
@@ -36,6 +36,7 @@ require('./modules/breadcrumb/index.js');
 require('./modules/download-report/index.js');
 require('./modules/select_interactive_loading/index.js');
 require('./modules/export-list/export-list.scss');
+require('./modules/entity/index.js');

 /*
 * load img
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/ckeditor5/index.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/ckeditor5/index.scss
@@ -1,4 +1,8 @@
 // set min height for ckeditor
 .ck-editor__editable {
    min-height: 150px;
+}
+
+.ck-editor.ck-reset {
+    margin-bottom: 1.5em;
 }
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/entity/comment_embeddable.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/entity/comment_embeddable.scss
@@ -0,0 +1,6 @@
+.chill-entity__comment-embeddable {
+    .chill-entity__comment-embeddable__metadata {
+        font-size: smaller;
+        color: var(--chill-light-gray);
+    }
+}
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/entity/index.js
@@ -0,0 +1,2 @@
+// css classes to render entities
+require('./comment_embeddable.scss');
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig
@@ -0,0 +1,36 @@
+{{ opening_box|raw }}
+<div class="">
+    <div class="comment-embeddable_comment">
+        
+        {%- if options['limit_lines'] is not null -%}
+            {% set content = comment.comment|split('\n')|slice(0, options['limit_lines'])|join('\n') %}
+        {%- else -%}
+            {% set content = comment.comment %}
+        {%- endif -%}
+
+        <blockquote class="chill-user-quote">
+        {% if options['disable_markdown'] %}
+            {{ content|nl2br }}
+        {% else %}
+            {{ content|chill_markdown_to_html }}
+        {% endif %}
+        </blockquote>
+    </div>
+</div>
+{% if options['metadata'] %}
+<div class="chill-entity__comment-embeddable__metadata">
+    {% if user is not empty %}
+        <span class="chill-entity__comment-embeddable__user">
+            {{ 'Last updated by'| trans }} {{ user|chill_entity_render_box(options['user']) }}
+        </span>';
+    {% endif %}
+    
+    {% if comment.date is not empty %}
+        <span class="chill-entity__comment-embeddable__date">
+            {% if user is empty %}{{ 'Last updated on'|trans ~ ' ' }}{% else %}{{ 'on'|trans ~ ' ' }}{% endif %}
+            {{ comment.date|format_datetime("medium", "short") }}
+        </span>
+    {% endif %}
+</div>
+{% endif %}
+{{ closing_box|raw }}
--- a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
@@ -21,9 +21,9 @@
 namespace Chill\MainBundle\Templating\Entity;

 use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
-use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Templating\Entity\AbstractChillEntityRender;
+use Symfony\Component\Templating\EngineInterface;

 class CommentRender extends AbstractChillEntityRender
 {
@@ -31,10 +31,19 @@ class CommentRender extends AbstractChillEntityRender
     * @var \Chill\MainBundle\Repository\UserRepository
     */
    private $userRepository;
+    
+    /**
+     * 
+     * @var EngineInterface
+     */
+    private $engine;

-    public function __construct(UserRepository $userRepository)
-    {
+    public function __construct(
+        UserRepository $userRepository,
+        EngineInterface $engine
+    ) {
        $this->userRepository = $userRepository;
+        $this->engine = $engine;
    }

    /**
@@ -45,35 +54,29 @@ class CommentRender extends AbstractChillEntityRender
     */
    public function renderBox($entity, array $options): string
    {
-        $username = '';
-
+        // default options
+        $options = \array_merge([
+                'user' => [],
+                'disable_markdown' => false,
+                'limit_lines' => null,
+                'metadata' => true
+            ], $options);
+        
        if ($entity->getUserId()) {
            $user = $this->userRepository->find($entity->getUserId());
-            if ($user instanceof User) {
-                $username = $user->getUsername();
-            }
        }
-
-        $str = $this->getDefaultOpeningBox('comment-embeddable').
-            '<span class="comment_comment">'.
-            nl2br($entity->getComment()).
-            '</span>';
-
-        if ($entity->getDate() instanceof \DateTime) {
-            $str .= '<span class="comment_date">'.
-            $entity->getDate()->format('d/m/Y H:i');
-            '</span>';
-        }
-
-        if (strlen($username) > 0) {
-            $str .=  '<span class="comment_user">'.
-            $username.
-            '</span>';
-        }
-
-        $str .= $this->getDefaultClosingBox();
-
-        return $str;
+        
+        return $this->engine
+            ->render(
+                '@ChillMain/Entity/CommentEmbeddable.html.twig',
+                [
+                    'opening_box' => $this->getDefaultOpeningBox('comment-embeddable'),
+                    'closing_box' => $this->getDefaultClosingBox(),
+                    'user' => $user ?? NULL,
+                    'comment' => $entity,
+                    'options' => $options
+                ]
+            );
    }

    /**
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -34,6 +34,7 @@ services:
    Chill\MainBundle\Templating\Entity\CommentRender:
        arguments:
            - '@chill.main.user_repository'
+            - '@Symfony\Component\Templating\EngineInterface'
        tags:
            - { name: 'chill.render_entity' }
            
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -35,6 +35,9 @@ This form contains errors: Ce formulaire contient des erreurs
 Choose an user: Choisir un utilisateur
 'You are going to leave a page with unsubmitted data. Are you sure you want to leave ?': "Vous allez quitter la page alors que des données n'ont pas été enregistrées. Êtes vous sûr de vouloir partir ?"
 No value: Aucune information
+Last updated by: Dernière mise à jour par
+Last updated on: Dernière mise à jour le
+on: le

 Edit: Modifier
 Update: Mettre à jour
--- a/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
+++ b/src/Bundle/ChillPersonBundle/Form/AccompanyingPeriodType.php
@@ -6,17 +6,16 @@ use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Symfony\Component\Security\Core\Role\Role;
 use Chill\PersonBundle\Form\Type\ClosingMotivePickerType;

+
 /**
 * Class AccompanyingPeriodType
 *
@@ -89,7 +88,7 @@ class AccompanyingPeriodType extends AbstractType
            ]);
        }

-            $builder->add('remark', TextareaType::class, [
+            $builder->add('remark', ChillTextareaType::class, [
                    'required' => false
            ]);
    }
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
@@ -48,8 +48,13 @@
            </td>
            {% endif %}
            <td>
-
-                {{ accompanying_period.remark|chill_print_or_message('No remark', 'blockquote') }}
+                {% if accompanying_period is not empty %}
+                    <blockquote class="chill-user-quote">
+                    {{ accompanying_period.remark|chill_markdown_to_html }}
+                    </blockquote>
+                {% else %}
+                    {{ null|chill_print_or_message('No remark', 'blockquote') }}
+                {% endif %}
            </td>
            <td>
                <ul class="record_actions">
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
@@ -22,15 +22,12 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Entity\Center;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Chill\MainBundle\Form\Type\UserPickerType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Role\Role;
-use Chill\TaskBundle\Security\Authorization\TaskVoter;
 use Chill\MainBundle\Form\Type\DateIntervalType;
+use Chill\MainBundle\Form\Type\ChillTextareaType;

 /**
 * 
@@ -43,7 +40,7 @@ class SingleTaskType extends AbstractType
    {
        $builder
            ->add('title', TextType::class)
-            ->add('description', TextareaType::class, [
+            ->add('description', ChillTextareaType::class, [
                'required' => false
            ])
            ->add('assignee', UserPickerType::class, [
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig
@@ -37,7 +37,7 @@
            <span class="chill-no-data-statement">{{"No description"|trans}}</span>
            {% else %}
            <blockquote class="chill-user-quote">
-            {{ task.description }}
+            {{ task.description|chill_markdown_to_html }}
            </blockquote>
            {% endif %}
        </dd>
--- a/src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition_person_context.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/Timeline/single_task_transition_person_context.html.twig
@@ -18,7 +18,7 @@
                    <dt class="inline">{{ 'Description'|trans }}</dt>
                    <dd>
                        <blockquote class="chill-user-quote">
-                            {{ event.task.description }}
+                            {{ event.task.description|chill_markdown_to_html }}
                        </blockquote>
                    </dd>
                {% endif %}