Dépôt de besoin : quelques améliorations (fixtures, icon) (#1040)

* Tender: update fixtures with new fields & status * Fix icon * Detail: add cocontracting count info for admin
gip-inclusion · Jan 17, 2024 · a331ee1 · a331ee1
1 parent 7453718
commit a331ee1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/lemarche/fixtures/django/10_tenders.json b/lemarche/fixtures/django/10_tenders.json
@@ -3,7 +3,7 @@
         "model": "tenders.tender",
         "pk": 1,
         "fields": {
-            "title": "Entretien des espaces verts de la commune de Grenoble",
+            "title": "Entretien des espaces verts de la commune de Grenoble (clôturé)",
             "slug": "entretien-espaces-verts-commune-grenoble",
             "kind": "TENDER",
             "presta_type": ["DISP", "PREST"],
@@ -19,8 +19,11 @@
             "contact_last_name": "Dupont",
             "contact_email": "[email protected]",
             "contact_phone": "01 02 03 04 05",
-            "status": "VALIDATED",
+            "status": "SENT",
+            "published_at": "2021-01-02T22:26:47.569Z",
             "validated_at": "2021-01-02T22:26:47.569Z",
+            "first_sent_at": "2021-01-02T22:26:47.569Z",
+            "last_sent_at": "2021-01-02T22:26:47.569Z",
             "created_at": "2021-01-01T12:44:39Z",
             "updated_at": "2021-01-02T22:26:47.569Z"
         }
@@ -36,7 +39,7 @@
             "description": "Une description",
             "external_link": "https://example.com/",
             "amount": "5-10K",
-            "deadline_date": "2023-06-30",
+            "deadline_date": "2026-12-31",
             "response_kind": [
                 "EMAIL", "TEL"
             ],
@@ -45,8 +48,11 @@
             "contact_last_name": "Dupont",
             "contact_email": "[email protected]",
             "contact_phone": "01 02 03 04 05",
-            "status": "VALIDATED",
+            "status": "SENT",
+            "published_at": "2021-01-03T22:26:47.569Z",
             "validated_at": "2021-01-03T22:26:47.569Z",
+            "first_sent_at": "2021-01-03T22:26:47.569Z",
+            "last_sent_at": "2021-01-03T22:26:47.569Z",
             "created_at": "2021-01-01T12:44:39Z",
             "updated_at": "2021-01-03T22:26:47.569Z"
         }

diff --git a/lemarche/templates/tenders/_detail_admin_extra_info.html b/lemarche/templates/tenders/_detail_admin_extra_info.html
@@ -18,13 +18,17 @@ <h2 class="h3">Informations Admin</h2>
                     {{ tender.siae_email_send_date_count }} prestataire{{ tender.siae_email_send_date_count|pluralize }} ciblé{{ tender.siae_email_send_date_count|pluralize }}
                 </li>
                 <li class="mb-2">
-                    <i class="ri-eye"></i>
+                    <i class="ri-eye-line"></i>
                     {{ tender.siae_email_link_click_date_or_detail_display_date_count }} prestataire{{ tender.siae_email_link_click_date_or_detail_display_date_count|pluralize }} qui {{ tender.siae_email_link_click_date_or_detail_display_date_count|pluralize:'a,ont' }} vu
                 </li>
                 <li class="mb-2">
                     <i class="ri-thumb-up-line"></i>
                     {{ tender.siae_detail_contact_click_date_count }} prestataire{{ tender.siae_detail_contact_click_date_count|pluralize }} intéressé{{ tender.siae_detail_contact_click_date_count|pluralize }}
                 </li>
+                <li class="mb-2">
+                    <i class="ri-shake-hands-line"></i>
+                    {{ tender.siae_detail_cocontracting_click_date_count }} prestataire{{ tender.siae_detail_cocontracting_click_date_count|pluralize }} ouvert{{ tender.siae_detail_cocontracting_click_date_count|pluralize }} à la co-traitance
+                </li>
                 <li class="mb-2">
                     <i class="ri-thumb-down-line"></i>
                     {{ tender.siae_detail_not_interested_click_date_count }} prestataire{{ tender.siae_detail_not_interested_click_date_count|pluralize }} pas intéressé{{ tender.siae_detail_not_interested_click_date_count|pluralize }}