Hide communes that are not of type COM

mesadsfr · Jul 19, 2024 · 3e7a120 · 3e7a120
1 parent 71065bf
commit 3e7a120
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/mesads/app/admin/ads_manager_administrator.py b/mesads/app/admin/ads_manager_administrator.py
@@ -80,5 +80,5 @@ def ads_managers_link(self, obj):
             reverse("admin:app_adsmanager_changelist") + "?administrator=" + str(obj.id)
         )
         return mark_safe(
-            f'<a href="{ads_managers_url}">Voir les {obj.adsmanager_set.count()} gestionnaires ADS</a>'
+            f'<a href="{ads_managers_url}">Voir les {obj.ordered_adsmanager_set().count()} gestionnaires ADS</a>'
         )
diff --git a/mesads/app/models.py b/mesads/app/models.py
@@ -289,9 +289,11 @@ def __str__(self):
     def ordered_adsmanager_set(self):
         """Function helper to get the adsmanager set order by the administration
         name."""
-        return self.adsmanager_set.prefetch_related(
-            "content_object", "ads_set"
-        ).order_by("commune__libelle", "epci__name", "prefecture__libelle")
+        return (
+            self.adsmanager_set.prefetch_related("content_object", "ads_set")
+            .filter(Q(commune__type_commune="COM") | Q(commune__isnull=True))
+            .order_by("commune__libelle", "epci__name", "prefecture__libelle")
+        )
 
 
 def validate_siret(value):

diff --git a/mesads/app/views/ads_manager_admin.py b/mesads/app/views/ads_manager_admin.py
@@ -52,7 +52,7 @@ def add_sheets(self, workbook):
         sheet.set_row(0, None, bold_format)
 
         for idx, ads_manager in enumerate(
-            self.ads_manager_administrator.adsmanager_set.all()
+            self.ads_manager_administrator.ordered_adsmanager_set()
         ):
             status = ""
             if ads_manager.no_ads_declared:

diff --git a/mesads/templates/webpack/pages/ads_register/ads_manager_request.html b/mesads/templates/webpack/pages/ads_register/ads_manager_request.html
@@ -98,10 +98,10 @@ <h4>{{ ads_manager_administrator.prefecture.display_text|capfirst }}</h4>
               </td>
             </tr>
             {% endfor %}
-            <tr x-show="{{ ads_manager_administrator.adsmanager_set.count }} > 5 && !displayExtra">
+            <tr x-show="{{ ads_manager_administrator.ordered_adsmanager_set.count }} > 5 && !displayExtra">
               <td colspan="3">
                 <button class="fr-btn fr-btn--secondary fr-btn--sm" x-on:click="displayExtra = true">
-                  Afficher les {{ ads_manager_administrator.adsmanager_set.count|add:"-5" }} autres entrées du tableau...
+                  Afficher les {{ ads_manager_administrator.ordered_adsmanager_set.count|add:"-5" }} autres entrées du tableau...
                 </button>
               </td>
             </tr>