From caa2bc1f3c6f0085d3b1e73d741896626657a603 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 20 Nov 2023 15:52:08 +0100
Subject: [PATCH] Add admin translations and order items differently in admin

---
 src/Bundle/ChillMainBundle/Controller/NewsItemController.php  | 3 ++-
 .../Resources/views/Admin/indexDashboard.html.twig            | 2 +-
 .../Routing/MenuBuilder/AdminNewsMenuBuilder.php              | 4 ++--
 src/Bundle/ChillMainBundle/translations/messages.fr.yml       | 4 ++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/NewsItemController.php b/src/Bundle/ChillMainBundle/Controller/NewsItemController.php
index fadaba494..a94dd55b9 100644
--- a/src/Bundle/ChillMainBundle/Controller/NewsItemController.php
+++ b/src/Bundle/ChillMainBundle/Controller/NewsItemController.php
@@ -19,7 +19,8 @@ class NewsItemController extends CRUDController
 {
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        $query->addOrderBy('e.startDate', 'ASC');
+        $query->addOrderBy('e.startDate', 'DESC');
+        $query->addOrderBy('e.id', 'DESC');
 
         return parent::orderQuery($action, $query, $request, $paginator);
     }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Admin/indexDashboard.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Admin/indexDashboard.html.twig
index 8049f3430..9c7513d4c 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Admin/indexDashboard.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Admin/indexDashboard.html.twig
@@ -8,6 +8,6 @@
 
 {% block layout_wvm_content %}
     {% block admin_content %}<!-- block content empty -->
-        <h1>{{ 'News configuration' | trans }}</h1>
+        <h1>{{ 'admin.dashboard.description' | trans }}</h1>
     {% endblock %}
 {% endblock  %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminNewsMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminNewsMenuBuilder.php
index 7d89d59f1..08e72884f 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminNewsMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminNewsMenuBuilder.php
@@ -25,7 +25,7 @@ class AdminNewsMenuBuilder implements LocalMenuBuilderInterface
             return;
         }
 
-        $menu->addChild('News', [
+        $menu->addChild('admin.dashboard.title', [
             'route' => 'chill_main_dashboard_admin',
         ])
             ->setAttribute('class', 'list-group-item-header')
@@ -33,7 +33,7 @@ class AdminNewsMenuBuilder implements LocalMenuBuilderInterface
                 'order' => 9000,
             ]);
 
-        $menu->addChild('NewsItem', [
+        $menu->addChild('admin.dashboard.news', [
             'route' => 'chill_crud_news_item_index',
         ])->setExtras(['order' => 9000]);
     }
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index a3b772081..cd220de37 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -678,6 +678,10 @@ admin:
                     undefined: non défini
                     user: Utilisateur
                     scope: Service
+    dashboard:
+        title: Tableau de bord
+        news: Actualités
+        description: Configuration du tableau de bord
 
 dashboard:
     news: