From 8a6f29ef79a411cfdedddc744e0f5065d3db5e23 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 20 Sep 2023 14:32:32 +0200
Subject: [PATCH] add crud controller to user job/scope history

---
 .../Controller/UserJobHistoryController.php   | 29 +++++++++++++++++++
 .../Controller/UserScopeHistoryController.php | 29 +++++++++++++++++++
 .../ChillMainExtension.php                    |  6 ++--
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Controller/UserJobHistoryController.php
 create mode 100644 src/Bundle/ChillMainBundle/Controller/UserScopeHistoryController.php

diff --git a/src/Bundle/ChillMainBundle/Controller/UserJobHistoryController.php b/src/Bundle/ChillMainBundle/Controller/UserJobHistoryController.php
new file mode 100644
index 000000000..069ef5385
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/UserJobHistoryController.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class UserJobHistoryController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query
+            ->addOrderBy('e.startDate', 'ASC')
+            ->addOrderBy('e.id', 'ASC')
+        ;
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Controller/UserScopeHistoryController.php b/src/Bundle/ChillMainBundle/Controller/UserScopeHistoryController.php
new file mode 100644
index 000000000..5b4e4cb96
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/UserScopeHistoryController.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class UserScopeHistoryController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        $query
+            ->addOrderBy('e.startDate', 'ASC')
+            ->addOrderBy('e.id', 'ASC')
+        ;
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 236848435..80febcae9 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -23,6 +23,8 @@ use Chill\MainBundle\Controller\RegroupmentController;
 use Chill\MainBundle\Controller\UserController;
 use Chill\MainBundle\Controller\UserJobApiController;
 use Chill\MainBundle\Controller\UserJobController;
+use Chill\MainBundle\Controller\UserJobHistoryController;
+use Chill\MainBundle\Controller\UserScopeHistoryController;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Chill\MainBundle\Doctrine\DQL\Age;
 use Chill\MainBundle\Doctrine\DQL\Extract;
@@ -375,7 +377,7 @@ class ChillMainExtension extends Extension implements
                 ],
                 [
                     'class' => UserJobHistory::class,
-                    //'controller' => UserJobHistoryController::class,
+                    'controller' => UserJobHistoryController::class,
                     'name' => 'admin_user_job_history',
                     'base_path' => '/admin/main/user-job-history',
                     'base_role' => 'ROLE_ADMIN',
@@ -388,7 +390,7 @@ class ChillMainExtension extends Extension implements
                 ],
                 [
                     'class' => UserScopeHistory::class,
-                    //'controller' => UserScopeHistoryController::class,
+                    'controller' => UserScopeHistoryController::class,
                     'name' => 'admin_user_scope_history',
                     'base_path' => '/admin/main/user-scope-history',
                     'base_role' => 'ROLE_ADMIN',