Tender admin: re-add siae link click & siae detail display counts

gip-inclusion · Feb 23, 2024 · 7a2adca · 7a2adca
1 parent 5d10bba
commit 7a2adca
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/lemarche/tenders/admin.py b/lemarche/tenders/admin.py
@@ -201,6 +201,7 @@ class TenderAdmin(FieldsetsInlineMixin, admin.ModelAdmin):
         "siae_email_send_count_annotated_with_link",
         "siae_email_link_click_count_annotated_with_link",
         "siae_detail_display_count_annotated_with_link",
+        "siae_email_link_click_or_detail_display_count_annotated",
         "siae_email_link_click_or_detail_display_count_annotated_with_link",
         "siae_detail_contact_click_count_annotated_with_link",
         "siae_detail_cocontracting_click_count_annotated_with_link",
@@ -310,9 +311,10 @@ class TenderAdmin(FieldsetsInlineMixin, admin.ModelAdmin):
                 "fields": (
                     "siae_count_annotated_with_link",
                     "siae_email_send_count_annotated_with_link",
-                    # "siae_email_link_click_count_annotated_with_link",
-                    # "siae_detail_display_count_annotated_with_link",
-                    "siae_email_link_click_or_detail_display_count_annotated_with_link",
+                    "siae_email_link_click_count_annotated_with_link",
+                    "siae_detail_display_count_annotated_with_link",
+                    "siae_email_link_click_or_detail_display_count_annotated",
+                    # "siae_email_link_click_or_detail_display_count_annotated_with_link",
                     "siae_detail_contact_click_count_annotated_with_link",
                     "siae_detail_cocontracting_click_count_annotated_with_link",
                     "siae_detail_not_interested_click_count_annotated_with_link",
@@ -543,7 +545,16 @@ def siae_detail_display_count_annotated_with_link(self, tender):
     siae_detail_display_count_annotated_with_link.short_description = "S. vues"
     siae_detail_display_count_annotated_with_link.admin_order_field = "siae_detail_display_count_annotated"
 
+    def siae_email_link_click_or_detail_display_count_annotated(self, tender):
+        return getattr(tender, "siae_email_link_click_or_detail_display_count_annotated", 0)
+
+    siae_email_link_click_or_detail_display_count_annotated.short_description = "S. cliquées ou vues"
+    siae_email_link_click_or_detail_display_count_annotated.admin_order_field = (
+        "siae_email_link_click_or_detail_display_count_annotated"
+    )
+
     def siae_email_link_click_or_detail_display_count_annotated_with_link(self, tender):
+        # TO FIX (if possible ?): wrong url, should be link_click OR detail_display
         url = (
             reverse("admin:siaes_siae_changelist")
             + f"?tenders__in={tender.id}&tendersiae__detail_display_date__isnull=False"