diff --git a/lemarche/static/itou_marche/itou_marche.scss b/lemarche/static/itou_marche/itou_marche.scss index d6dd56cfe..1f87a85e5 100644 --- a/lemarche/static/itou_marche/itou_marche.scss +++ b/lemarche/static/itou_marche/itou_marche.scss @@ -204,3 +204,11 @@ ul.summary-grid-list { box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1); padding: 8px; } + +.text-center { + text-align: center; +} + +.bg-gray { + background-color: var(--g300); +} diff --git a/lemarche/templates/tenders/_closed_badge.html b/lemarche/templates/tenders/_closed_badge.html index 8233e9048..cfa875737 100644 --- a/lemarche/templates/tenders/_closed_badge.html +++ b/lemarche/templates/tenders/_closed_badge.html @@ -1,7 +1,8 @@ - {% if tender.deadline_date_is_outdated_annotated %} -

- {{ tender_kind_display|default:tender.get_kind_display }} clôturé{% if tender.kind == "QUOTE" %}e{% endif %} + {% if tender.deadline_date_is_outdated_annotated or tender.deadline_date_is_outdated %} +

+ {{ tender_kind_display|default:tender.get_kind_display }} clôturé + {% if tender.kind == "QUOTE" %}e{% endif %} le {{ tender.deadline_date|default:"" }}

{% else %} @@ -12,9 +13,6 @@ {{ tender.get_kind_display }} {% endif %}

- Disponible jusqu'au : {{ tender.deadline_date|default:"" }} - {% if is_new_for_siaes %} -

Nouveau

- {% endif %} + {% if is_new_for_siaes %}

Nouveau

{% endif %} {% endif %}
diff --git a/lemarche/templates/tenders/_detail_card.html b/lemarche/templates/tenders/_detail_card.html index 33c1e9244..f7157eab3 100644 --- a/lemarche/templates/tenders/_detail_card.html +++ b/lemarche/templates/tenders/_detail_card.html @@ -1,21 +1,7 @@ {% load static humanize %} - -
+
-
-
- {% include "tenders/_closed_badge.html" with tender=tender is_new_for_siaes=is_new_for_siaes %} -
-
- -
-
-

- {{ tender.title }} -

-
-
-
+
{% if tender.contact_company_name_display %}
@@ -26,19 +12,31 @@

{{ tender.location_display|safe }}

-
+
{{ tender.sectors_list_string|safe }}
+
+
+ {% include "tenders/_closed_badge.html" with tender=tender is_new_for_siaes=is_new_for_siaes %} +
+
+ +
+
+

{{ tender.title }}

+
+
{% if not source_form %} {% if user.is_authenticated %} {% if user == tender.author %} -
+
{% include "tenders/_detail_contact.html" with tender=tender %} {% elif user_partner_can_display_tender_contact_details %} -
+
{% include "tenders/_detail_contact.html" with tender=tender %} {% elif siae_has_detail_contact_click_date and not tender.deadline_date_outdated %} @@ -46,17 +44,17 @@

{% endif %} {% endif %} -
-

- Description -

{% if tender.start_working_date %} -

Début d'intervention : {{ tender.start_working_date }}

+

+ Disponible jusqu'au {{ tender.deadline_date|default:"" }} +
+ Début d'intervention : {{ tender.start_working_date }} +

{% endif %} -

{{ tender.description|safe|linebreaks }}

+

{{ tender.description|safe }}

{% if source_form or not source_form and tender.questions_list|length %} -
+

{% if source_form or user == tender.author %} Questions à poser aux prestataires ciblés @@ -70,13 +68,13 @@

{% endif %} {% if tender.constraints %} -
+

Comment répondre à cette demande ?

-

{{ tender.constraints|default:"-"|safe|linebreaks }}

+

{{ tender.constraints|safe }}

{% endif %} {% if source_form or user == tender.author or tender.accept_share_amount %} -
+

{% if source_form or user == tender.author %} Montant du marché diff --git a/lemarche/tenders/models.py b/lemarche/tenders/models.py index f15f2ddc8..855df4227 100644 --- a/lemarche/tenders/models.py +++ b/lemarche/tenders/models.py @@ -993,6 +993,10 @@ def get_admin_url(self): def is_draft(self) -> bool: return self.status == tender_constants.STATUS_DRAFT + @property + def deadline_date_is_outdated(self, limit_date=datetime.today().date()): + return self.deadline_date < limit_date + @property def is_pending_validation(self) -> bool: return self.status == tender_constants.STATUS_PUBLISHED