From 236b75e16a409b4a89defbbd5c5f0551dfb49966 Mon Sep 17 00:00:00 2001
From: madjid-asa <madjid-asa@users.noreply.github.com>
Date: Thu, 7 Mar 2024 20:02:54 +0100
Subject: [PATCH] =?UTF-8?q?refactor:=20Am=C3=A9liorer=20le=20badge=20de=20?=
 =?UTF-8?q?cl=C3=B4ture=20du=20DDB=20=20(#1095)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/tenders/_card_list_item.html     |  2 +-
 lemarche/templates/tenders/_closed_badge.html  |  4 ++++
 lemarche/templates/tenders/_detail_card.html   |  8 ++------
 .../templates/tenders/_list_item_buyer.html    |  5 +----
 .../templates/tenders/_list_item_network.html  | 12 +-----------
 lemarche/www/tenders/tests.py                  | 18 ------------------
 6 files changed, 9 insertions(+), 40 deletions(-)
 create mode 100644 lemarche/templates/tenders/_closed_badge.html

diff --git a/lemarche/templates/tenders/_card_list_item.html b/lemarche/templates/tenders/_card_list_item.html
index 93d599d99..edb77c815 100644
--- a/lemarche/templates/tenders/_card_list_item.html
+++ b/lemarche/templates/tenders/_card_list_item.html
@@ -2,7 +2,7 @@
     <time class="fs-sm d-block" aria-label="Date de clôture">
         <span>{{ tender.deadline_date|default:"" }}</span>
         {% if tender.deadline_date_is_outdated_annotated %}
-            <span class="badge badge-xs badge-base badge-pill badge-pilotage float-right">Clôturé</span>
+            <span class="badge badge-xs badge-base badge-pill badge-{{ tender.kind|lower }} float-right">Clôturé</span>
         {% endif %}
         {% if tender.is_draft %}
             <span class="badge badge-xs badge-base badge-pill badge-outline-warning float-right">
diff --git a/lemarche/templates/tenders/_closed_badge.html b/lemarche/templates/tenders/_closed_badge.html
new file mode 100644
index 000000000..2db05dd24
--- /dev/null
+++ b/lemarche/templates/tenders/_closed_badge.html
@@ -0,0 +1,4 @@
+<span class="badge badge-xs badge-base badge-pill badge-{{ tender.kind|lower }}">
+    {{ tender_kind_display|default:tender.get_kind_display }} clôturé{% if tender.kind == "QUOTE" %}e{% endif %}
+    le {{ tender.deadline_date|default:"" }}
+</span>
\ No newline at end of file
diff --git a/lemarche/templates/tenders/_detail_card.html b/lemarche/templates/tenders/_detail_card.html
index 5b16aed13..265e05876 100644
--- a/lemarche/templates/tenders/_detail_card.html
+++ b/lemarche/templates/tenders/_detail_card.html
@@ -1,11 +1,8 @@
 {% load bootstrap4 static humanize array_choices_display %}
 
 <div class="card c-card c-card--marche siae-card rounded-lg shadow-lg">
-    <div class="card-header text-right bg-marche text-white fs-sm rounded-top rounded-lg p-3 mb-0">
-        Date limite de réponse : {{ tender.deadline_date|default:"" }}
-        {% if not source_form and tender.deadline_date_outdated %}
-            <span class="badge badge-xs badge-base badge-pill badge-pilotage">Clôturé</span>
-        {% endif %}
+    <div class="card-header fs-sm rounded-top rounded-lg px-5">
+        {% include "tenders/_closed_badge.html" with tender=tender %}
     </div>
     <div class="card-body pb-5 px-5">
         <!-- title & header -->
@@ -13,7 +10,6 @@
             <div class="col-md-12">
                 <h1>
                     {{ tender.title }}
-                    <span class="fs-sm badge badge-base badge-pill badge-{{ tender.kind|lower }} float-right" aria-hidden="true">{{ tender_kind_display|default:tender.get_kind_display }}</span>
                 </h1>
             </div>
         </div>
diff --git a/lemarche/templates/tenders/_list_item_buyer.html b/lemarche/templates/tenders/_list_item_buyer.html
index 0bc2fdce5..b1edb8fb5 100644
--- a/lemarche/templates/tenders/_list_item_buyer.html
+++ b/lemarche/templates/tenders/_list_item_buyer.html
@@ -5,10 +5,7 @@
         <div class="row">
             <div class="col-md-8" style="border-right:1px solid;">
                 <p class="mb-1">
-                    Date de clôture : {{ tender.deadline_date|default:"" }}
-                    {% if tender.deadline_date_is_outdated_annotated %}
-                        <span class="badge badge-sm badge-base badge-pill badge-pilotage">Clôturé</span>
-                    {% endif %}
+                    {% include "tenders/_closed_badge.html" with tender=tender %}
                     {% if tender.is_draft %}
                         <span class="badge badge-sm badge-base badge-pill badge-outline-warning float-right">
                             <i class="ri-draft-fill"></i>Brouillon
diff --git a/lemarche/templates/tenders/_list_item_network.html b/lemarche/templates/tenders/_list_item_network.html
index 91b3dc27b..6ff762b38 100644
--- a/lemarche/templates/tenders/_list_item_network.html
+++ b/lemarche/templates/tenders/_list_item_network.html
@@ -7,17 +7,7 @@
                 <div class="row">
                     <div class="col-md-12">
                         <p class="mb-1">
-                            Date de clôture : {{ tender.deadline_date|default:"" }}
-                            {% if tender.deadline_date_is_outdated_annotated %}
-                                <span class="badge badge-sm badge-base badge-pill badge-pilotage">Clôturé</span>
-                            {% endif %}
-                            <span class="float-right badge badge-base badge-pill badge-emploi">
-                                {% if tender.kind == "PROJ" %}
-                                    {{ title_kind_sourcing_siae|default:tender.get_kind_display }}
-                                {% else %}
-                                    {{ tender.get_kind_display }}
-                                {% endif %}
-                            </span>
+                            {% include "tenders/_closed_badge.html" with tender=tender %}
                         </p>
                     </div>
                 </div>
diff --git a/lemarche/www/tenders/tests.py b/lemarche/www/tenders/tests.py
index 5b06720c9..3d4bfef09 100644
--- a/lemarche/www/tenders/tests.py
+++ b/lemarche/www/tenders/tests.py
@@ -828,17 +828,6 @@ def test_tender_amount_display(self):
         self.assertContains(response, "Montant du marché")
         self.assertContains(response, tender_constants.ACCEPT_SHARE_AMOUNT_FALSE)
 
-    def test_tender_deadline_date_display(self):
-        # tender is not outdated by default
-        url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug})
-        response = self.client.get(url)
-        self.assertNotContains(response, "Clôturé")
-        # new tender with outdated deadline_date
-        tender_2 = TenderFactory(deadline_date=timezone.now() - timedelta(days=1))
-        url = reverse("tenders:detail", kwargs={"slug": tender_2.slug})
-        response = self.client.get(url)
-        self.assertContains(response, "Clôturé")
-
     def test_tender_author_has_additional_stats(self):
         self.client.force_login(self.user_buyer_1)
         url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug})
@@ -871,7 +860,6 @@ def test_tender_contact_display(self):
         # anonymous user
         url = reverse("tenders:detail", kwargs={"slug": self.tender_1.slug})
         response = self.client.get(url)
-        self.assertNotContains(response, "Clôturé")
         self.assertContains(response, "Cet appel d'offres vous intéresse ?")
         self.assertContains(response, "Répondre en co-traitance ?")
         self.assertContains(response, "Cette demande ne vous intéresse pas ?")
@@ -930,7 +918,6 @@ def test_tender_response_is_anonymous_contact_display(self):
         # anonymous user
         url = reverse("tenders:detail", kwargs={"slug": self.tender_3_response_is_anonymous.slug})
         response = self.client.get(url)
-        self.assertNotContains(response, "Clôturé")
         self.assertContains(response, "Cet appel d'offres vous intéresse ?")
         self.assertContains(response, "Répondre en co-traitance ?")
         self.assertContains(response, "Cette demande ne vous intéresse pas ?")
@@ -992,33 +979,28 @@ def test_tender_outdated_contact_display(self):
         # anonymous user
         url = reverse("tenders:detail", kwargs={"slug": tender_2.slug})
         response = self.client.get(url)
-        self.assertContains(response, "Clôturé")
         self.assertNotContains(response, "Répondre à cette opportunité")
         # siae user interested
         self.client.force_login(self.siae_user_1)
         url = reverse("tenders:detail", kwargs={"slug": tender_2.slug})
         response = self.client.get(url)
-        self.assertContains(response, "Clôturé")
         self.assertNotContains(response, "Contactez le client dès maintenant")
         self.assertNotContains(response, "Répondre à cette opportunité")
         # siae user not concerned
         self.client.force_login(self.siae_user_6)
         url = reverse("tenders:detail", kwargs={"slug": tender_2.slug})
         response = self.client.get(url)
-        self.assertContains(response, "Clôturé")
         self.assertNotContains(response, "Répondre à cette opportunité")
         # siae user without siae
         self.client.force_login(self.siae_user_without_siae)
         url = reverse("tenders:detail", kwargs={"slug": tender_2.slug})
         response = self.client.get(url)
-        self.assertContains(response, "Clôturé")
         self.assertNotContains(response, "veuillez d'abord vous")
         self.assertNotContains(response, "Répondre à cette opportunité")
         # author
         self.client.force_login(self.user_buyer_1)
         url = reverse("tenders:detail", kwargs={"slug": tender_2.slug})
         response = self.client.get(url)
-        self.assertContains(response, "Clôturé")
         self.assertContains(response, "Coordonnées")
         self.assertNotContains(response, "Contactez le client dès maintenant")
         self.assertNotContains(response, "Répondre à cette opportunité")