From 693bf657214c9a16d539edb03351f21b76c4d918 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 21 Nov 2023 10:18:16 +0100
Subject: [PATCH] Add single detail page to view entire article from within
 news item history page

---
 .../Controller/NewsItemHistoryController.php  | 15 ++++++++++
 .../Resources/views/NewsItem/index.html.twig  |  6 ++--
 .../NewsItem/news_items_history.html.twig     | 29 ++++++++++---------
 .../Resources/views/NewsItem/show.html.twig   | 21 ++++++++++++++
 .../translations/messages.fr.yml              | 14 ++++-----
 5 files changed, 62 insertions(+), 23 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig

diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
index d92cd3a6f..8c645828b 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemHistoryController.php
@@ -46,6 +46,21 @@ class NewsItemHistoryController extends AbstractController
         ]);
     }
 
+    /**
+     * @Route("/{_locale}/news-items/{id}", name="chill_main_single_news_item")
+     */
+    public function showSingleItem(int $id, Request $request): Response
+    {
+        $newsItem = $this->newsItemRepository->findOneBy(['id' => $id]);
+
+        return $this->render(
+            '@ChillMain/NewsItem/show.html.twig',
+            [
+                'entity' => $newsItem,
+            ]
+        );
+    }
+
     private function buildFilterOrder($includeFilterByUser = true, $includeMissionType = false): FilterOrderHelper
     {
         $filterBuilder = $this->filterOrderHelperFactory
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
index 307073496..4eb02945b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
@@ -4,8 +4,8 @@
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
         {% block table_entities_thead_tr %}
             <th>{{ 'Title'|trans }}</th>
-            <th>{{ 'dashboard.news.startDate'|trans }}</th>
-            <th>{{ 'dashboard.news.endDate'|trans }}</th>
+            <th>{{ 'news.startDate'|trans }}</th>
+            <th>{{ 'news.endDate'|trans }}</th>
         {% endblock %}
         {% block table_entities_tbody %}
             {% for entity in entities %}
@@ -15,7 +15,7 @@
                     {% if entity.endDate is not null %}
                         <td>{{ entity.endDate|date }}</td>
                     {% else %}
-                        <td>{{ 'dashboard.news.noDate'|trans }}</td>
+                        <td>{{ 'news.noDate'|trans }}</td>
                     {% endif %}
                     <td>
                         <ul class="record_actions">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
index fe5c70828..e462c3302 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
@@ -1,18 +1,18 @@
 {% extends "@ChillMain/layout.html.twig" %}
 
 {% block title %}
-    {{ 'news_history.title'|trans }}
+    {{ 'news.title'|trans }}
 {% endblock title %}
 
 {% block content %}
     <div class="col-md-10 asideactivity-list">
-        <h2>{{ 'news_history.title'|trans }}</h2>
+        <h2>{{ 'news.title'|trans }}</h2>
 
         {{ filter_order|chill_render_filter_order_helper }}
 
         {% if entities|length == 0 %}
             <p class="chill-no-data-statement">
-                {{ "news_history.no_data"|trans }}
+                {{ "news.no_data"|trans }}
             </p>
         {% else %}
 
@@ -39,17 +39,20 @@
                             <div class="item-col" style="justify-content: flex-end;">
                                 <div class="box">
                                     <div>
-                                        {% apply markdown_to_html %}
-                                            {{ entity.content }}
-                                        {% endapply %}
+{#                                        <blockquote class="chill-user-quote">#}
+                                            {{ entity.content|u.truncate(350, '…', false)|chill_markdown_to_html }}
+{#                                            {% if entity.content|length > 350 %}#}
+{#                                                <a href="{{ chill_path_add_return_path('chill_main_news_items_history', {'news_item_id': entity.id}) }}">{{ 'news.read_more'|trans }}</a>#}
+{#                                            {% endif %}#}
+{#                                        </blockquote>#}
+                                        <div class="action">
+                                            <ul class="record_actions">
+                                                <li>
+                                                    <a href="{{ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) }}" class="btn btn-show btn-mini"></a>
+                                                </li>
+                                            </ul>
+                                        </div>
                                     </div>
-{#                                    <div class="action">#}
-{#                                        <ul class="record_actions">#}
-{#                                            <li>#}
-{#                                                <a href="{{ chill_path_add_return_path('chill_crud_news_item_view', { 'id': entity.id } ) }}" class="btn btn-show btn-mini"></a>#}
-{#                                            </li>#}
-{#                                        </ul>#}
-{#                                    </div>#}
                                 </div>
                             </div>
                         </div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
new file mode 100644
index 000000000..b86408183
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
@@ -0,0 +1,21 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title 'news.show_details'|trans %}
+
+{% block content %}
+    <h1>{{ entity.title }}</h1>
+
+    <div class="flex-table">
+            <div class="item-row">
+                <div>
+                    <span>{{ entity.startDate|format_date('long') }}</span>
+                    {% if entity.endDate is not null %}
+                        <span> - {{ entity.endDate|format_date('long') }}</span>
+                    {% endif %}
+                </div>
+            </div>
+            <div class="item-row separator">
+                {{ entity.content|chill_markdown_to_html }}
+            </div>
+    </div>
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 98933f614..5d500f48e 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -75,7 +75,6 @@ Comment: Commentaire
 Comments: Commentaires
 Pinned comment: Commentaire épinglé
 Any comment: Aucun commentaire
-Read more: Lire la suite
 (more...): (suite...)
 
 # comment embeddable
@@ -683,13 +682,14 @@ admin:
         news: Actualités
         description: Configuration du tableau de bord
 
-dashboard:
-    news:
-        noDate: Pas de date de fin
-        startDate: Date de début
-        endDate: Date de fin
 
-news_history:
+news:
+    noDate: Pas de date de fin
+    startDate: Date de début
+    endDate: Date de fin
     title: Historique des actualités
     menu: Actualités
     no_data: Aucune actualité
+    read_more: Lire la suite
+
+