From 2e06690cfa8a3d6e91bc214032af546cf2891aa1 Mon Sep 17 00:00:00 2001
From: "madjid.asa" <madjid.asa@gmail.com>
Date: Wed, 21 Feb 2024 12:10:13 +0100
Subject: [PATCH 1/6] add component to closed badge

---
 lemarche/templates/tenders/_closed_badge.html | 3 +++
 lemarche/templates/tenders/_detail_card.html  | 8 ++------
 2 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 lemarche/templates/tenders/_closed_badge.html

diff --git a/lemarche/templates/tenders/_closed_badge.html b/lemarche/templates/tenders/_closed_badge.html
new file mode 100644
index 000000000..1dddb2eab
--- /dev/null
+++ b/lemarche/templates/tenders/_closed_badge.html
@@ -0,0 +1,3 @@
+<span class="badge badge-xs badge-base badge-pill badge-{{ tender.kind|lower }}">
+    {{ tender_kind_display|default:tender.get_kind_display }} clôturé 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>

From 19581afccc7d34d02beabb5f04389886b1abb0cc Mon Sep 17 00:00:00 2001
From: "madjid.asa" <madjid.asa@gmail.com>
Date: Wed, 21 Feb 2024 12:10:30 +0100
Subject: [PATCH 2/6] update list item

---
 lemarche/templates/tenders/_card_list_item.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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">

From f04a5d937585c21b107253641fdf077b3703f260 Mon Sep 17 00:00:00 2001
From: "madjid.asa" <madjid.asa@gmail.com>
Date: Wed, 21 Feb 2024 12:18:30 +0100
Subject: [PATCH 3/6] add component of closed badge

---
 lemarche/templates/tenders/_list_item_buyer.html   |  5 +----
 lemarche/templates/tenders/_list_item_network.html | 12 +-----------
 2 files changed, 2 insertions(+), 15 deletions(-)

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>

From f7a4bd3b2f96308d0b0e87fc14cf95f2596136a8 Mon Sep 17 00:00:00 2001
From: "madjid.asa" <madjid.asa@gmail.com>
Date: Wed, 21 Feb 2024 14:36:34 +0100
Subject: [PATCH 4/6] fix tests

---
 lemarche/www/tenders/tests.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/lemarche/www/tenders/tests.py b/lemarche/www/tenders/tests.py
index 4ec6ba13a..013061c42 100644
--- a/lemarche/www/tenders/tests.py
+++ b/lemarche/www/tenders/tests.py
@@ -1,4 +1,5 @@
 import json
+import locale
 from datetime import timedelta
 from unittest import mock
 
@@ -680,6 +681,12 @@ def setUpTestData(cls):
             detail_display_date=timezone.now(),
             detail_not_interested_click_date=timezone.now(),
         )
+        # set local in french for datetime human dispaly
+        locale.setlocale(locale.LC_TIME, "fr_FR")
+
+    @classmethod
+    def get_closed_verbatim(cls, tender: Tender):
+        return f"{tender.get_kind_display()} clôturé le {tender.deadline_date.strftime('%d %B %Y')}"
 
     def test_anyone_can_view_sent_tenders(self):
         for tender in Tender.objects.all():
@@ -810,12 +817,12 @@ 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é")
+        self.assertNotContains(response, self.get_closed_verbatim(tender=self.tender_1))
         # 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é")
+        self.assertContains(response, self.get_closed_verbatim(tender=tender_2))
 
     def test_tender_author_has_additional_stats(self):
         self.client.force_login(self.user_buyer_1)
@@ -849,7 +856,7 @@ 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.assertNotContains(response, self.get_closed_verbatim(tender=self.tender_1))
         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 ?")
@@ -908,7 +915,7 @@ 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.assertNotContains(response, self.get_closed_verbatim(tender=self.tender_3_response_is_anonymous))
         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 ?")
@@ -970,33 +977,33 @@ 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.assertContains(response, self.get_closed_verbatim(tender=tender_2))
         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.assertContains(response, self.get_closed_verbatim(tender=tender_2))
         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.assertContains(response, self.get_closed_verbatim(tender=tender_2))
         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.assertContains(response, self.get_closed_verbatim(tender=tender_2))
         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, self.get_closed_verbatim(tender=tender_2))
         self.assertContains(response, "Coordonnées")
         self.assertNotContains(response, "Contactez le client dès maintenant")
         self.assertNotContains(response, "Répondre à cette opportunité")

From 8b65e1666e30485234268014e259758fa09b7102 Mon Sep 17 00:00:00 2001
From: "madjid.asa" <madjid.asa@gmail.com>
Date: Wed, 21 Feb 2024 17:06:23 +0100
Subject: [PATCH 5/6] remove closed verbatim in tests because local is not
 supported in ci

---
 lemarche/www/tenders/tests.py | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/lemarche/www/tenders/tests.py b/lemarche/www/tenders/tests.py
index 013061c42..628ab29ec 100644
--- a/lemarche/www/tenders/tests.py
+++ b/lemarche/www/tenders/tests.py
@@ -1,5 +1,4 @@
 import json
-import locale
 from datetime import timedelta
 from unittest import mock
 
@@ -681,12 +680,6 @@ def setUpTestData(cls):
             detail_display_date=timezone.now(),
             detail_not_interested_click_date=timezone.now(),
         )
-        # set local in french for datetime human dispaly
-        locale.setlocale(locale.LC_TIME, "fr_FR")
-
-    @classmethod
-    def get_closed_verbatim(cls, tender: Tender):
-        return f"{tender.get_kind_display()} clôturé le {tender.deadline_date.strftime('%d %B %Y')}"
 
     def test_anyone_can_view_sent_tenders(self):
         for tender in Tender.objects.all():
@@ -813,17 +806,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, self.get_closed_verbatim(tender=self.tender_1))
-        # 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, self.get_closed_verbatim(tender=tender_2))
-
     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})
@@ -856,7 +838,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, self.get_closed_verbatim(tender=self.tender_1))
         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 ?")
@@ -915,7 +896,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, self.get_closed_verbatim(tender=self.tender_3_response_is_anonymous))
         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 ?")
@@ -977,33 +957,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, self.get_closed_verbatim(tender=tender_2))
         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, self.get_closed_verbatim(tender=tender_2))
         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, self.get_closed_verbatim(tender=tender_2))
         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, self.get_closed_verbatim(tender=tender_2))
         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, self.get_closed_verbatim(tender=tender_2))
         self.assertContains(response, "Coordonnées")
         self.assertNotContains(response, "Contactez le client dès maintenant")
         self.assertNotContains(response, "Répondre à cette opportunité")

From adca3587464bb86e182170501ea9f4c4f38d7bf3 Mon Sep 17 00:00:00 2001
From: "madjid.asa" <madjid.asa@gmail.com>
Date: Wed, 6 Mar 2024 21:05:06 +0100
Subject: [PATCH 6/6] fix from review

---
 lemarche/templates/tenders/_closed_badge.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lemarche/templates/tenders/_closed_badge.html b/lemarche/templates/tenders/_closed_badge.html
index 1dddb2eab..2db05dd24 100644
--- a/lemarche/templates/tenders/_closed_badge.html
+++ b/lemarche/templates/tenders/_closed_badge.html
@@ -1,3 +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é le {{ tender.deadline_date|default:"" }}
+    {{ 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