Tri des avenants par date de signature (#1480)

MTES-MCT · Jul 10, 2024 · fdbc6a4 · fdbc6a4
1 parent 206f49a
commit fdbc6a4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/conventions/services/avenants.py b/conventions/services/avenants.py
@@ -85,7 +85,7 @@ def upload_avenants_for_avenant(
         .get(uuid=convention_uuid)
     )
     avenant_search_service = AvenantListSearchService(
-        parent_convention, order_by_numero=True
+        parent_convention, order_by="numero"
     )
 
     if request.method == "POST":
@@ -134,9 +134,7 @@ def complete_avenants_for_avenant(
 ) -> dict[str, Any]:
     avenant = Convention.objects.get(uuid=convention_uuid)
     convention_parent = avenant.parent
-    avenant_search_service = AvenantListSearchService(
-        avenant.parent, order_by_numero=True
-    )
+    avenant_search_service = AvenantListSearchService(avenant.parent, order_by="numero")
 
     avenant_numero = avenant.get_default_convention_number()
 

diff --git a/conventions/services/conventions.py b/conventions/services/conventions.py
@@ -110,7 +110,9 @@ def convention_post_action(request, convention_uuid):
         resiliation_date_form = ConventionDateResiliationForm
 
     upform = UploadForm()
-    avenant_search_service = AvenantListSearchService(convention, order_by_numero=True)
+    avenant_search_service = AvenantListSearchService(
+        convention, order_by="televersement_convention_signee_le"
+    )
     total_avenants = convention.avenants.without_denonciation_and_resiliation().count()
     denonciation = convention.avenants.filter(avenant_types__nom__in=["denonciation"])
     resiliation = convention.avenants.filter(avenant_types__nom__in=["resiliation"])

diff --git a/conventions/services/search.py b/conventions/services/search.py
@@ -62,13 +62,13 @@ def paginate(self, size: int | None = None) -> Paginator:
 class AvenantListSearchService(ConventionSearchServiceBase):
     prefetch = ["programme", "lot"]
 
-    def __init__(self, convention: Convention, order_by_numero: bool = False):
+    def __init__(self, convention: Convention, order_by: str | None = None):
         self.convention: Convention = (
             convention.parent if convention.is_avenant() else convention
         )
 
-        if order_by_numero:
-            self.order_by = "numero"
+        if order_by:
+            self.order_by = order_by
 
     def _get_base_queryset(self) -> QuerySet:
         return self.convention.avenants.without_denonciation_and_resiliation()