diff --git a/composer.json b/composer.json index e20a528..e51052c 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "ext-ctype": "*", "ext-iconv": "*", "ext-simplexml": "*", - "beberlei/doctrineextensions": "^1.3", + "beberlei/doctrineextensions": "^1.5", "doctrine/doctrine-bundle": "^2.10", "doctrine/doctrine-migrations-bundle": "^3.2", "doctrine/orm": "^2.15", diff --git a/composer.lock b/composer.lock index 86c14ea..e7fdbe5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "18ff369a6df51ed294b3946625466f92", + "content-hash": "1e48d4a4ffe643c14cf370b7083adddb", "packages": [ { "name": "beberlei/doctrineextensions", diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 2a3a002..45975e9 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -22,6 +22,7 @@ doctrine: dql: string_functions: DATE_FORMAT: DoctrineExtensions\Query\Mysql\DateFormat + FIELD: DoctrineExtensions\Query\Mysql\Field datetime_functions: DATEDIFF: DoctrineExtensions\Query\Mysql\DateDiff when@test: diff --git a/src/Controller/Administrative/Document/IndexController.php b/src/Controller/Administrative/Document/IndexController.php index 940792e..b7440d4 100644 --- a/src/Controller/Administrative/Document/IndexController.php +++ b/src/Controller/Administrative/Document/IndexController.php @@ -30,11 +30,7 @@ class IndexController extends AbstractController $pagination = $this->paginator->paginate( $query, $request->query->getInt('page', 1), - 10, - [ - 'defaultSortFieldName' => 'upload.createdAt', - 'defaultSortDirection' => 'asc', - ] + 10 ); return $this->render('administrative/document/index.html.twig', [ diff --git a/src/Repository/UploadRepository.php b/src/Repository/UploadRepository.php index 554d02c..b8547de 100644 --- a/src/Repository/UploadRepository.php +++ b/src/Repository/UploadRepository.php @@ -89,6 +89,9 @@ class UploadRepository extends ServiceEntityRepository ->innerJoin('assignment.jobProfile', 'job_profile') ->innerJoin('assignment.destination', 'destination') ->innerJoin('disposition.teamer', 'teamer') + ->addOrderBy('FIELD(upload.status, :new, :checked)', 'ASC') + ->setParameter('new', Upload::STATUS_NEW) + ->setParameter('checked', Upload::STATUS_CHECKED) ->getQuery() ; } diff --git a/templates/administrative/document/index.html.twig b/templates/administrative/document/index.html.twig index b568c42..44be4f5 100644 --- a/templates/administrative/document/index.html.twig +++ b/templates/administrative/document/index.html.twig @@ -27,7 +27,7 @@ {{ knp_pagination_sortable(pagination, 'Teamer:in', 'teamer.lastName') }} - {{ knp_pagination_sortable(pagination, 'Status', 'disposition.status') }} + {{ knp_pagination_sortable(pagination, 'Status', 'upload.status') }}