Same for tender display for Siae & Network

gip-inclusion · Oct 16, 2023 · 0158bf2 · 0158bf2
1 parent 1019e7e
commit 0158bf2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/lemarche/templates/tenders/_list_item_network.html b/lemarche/templates/tenders/_list_item_network.html
@@ -23,19 +23,25 @@ <h2 class="py-2">{{ tender.title }}</h2>
                 <hr />
 
                 <div class="row">
+                    {% if tender.contact_company_name_display %}
+                        <div class="col-md-4" title="Entreprise">
+                            <i class="ri-building-4-line"></i>
+                            {{ tender.contact_company_name_display }}
+                        </div>
+                    {% endif %}
+                    <div class="col-md-4" title="{% get_verbose_name tender 'location' %}">
+                        {% if tender.perimeters_list_string %}
+                            <i class="ri-map-pin-2-line"></i>
+                            {{ tender.location_display|safe }}
+                        {% endif %}
+                    </div>
                     <div class="col-md-4" title="{% get_verbose_name tender 'sectors' %} : {{ tender.sectors_full_list_string|safe }}">
                         {% if tender.sectors.count %}
                             <i class="ri-award-line"></i>
                             {{ tender.sectors_list_string|safe }}
                         {% endif %}
                     </div>
-                    <div class="col-md-4 text-center" title="{% get_verbose_name tender 'location' %}">
-                        {% if tender.perimeters_list_string %}
-                            <i class="ri-map-pin-2-line"></i>
-                            {{ tender.location_display|safe }}
-                        {% endif %}
-                    </div>
-                    <div class="col-md-4 text-center" title="{% get_verbose_name tender 'amount' %}">
+                    <div class="col-md-4" title="{% get_verbose_name tender 'amount' %}">
                         {% if tender.amount %}
                             <i class="ri-money-euro-circle-line"></i>
                             {{ tender.get_amount_display|default:"-" }}

diff --git a/lemarche/templates/tenders/_list_item_siae.html b/lemarche/templates/tenders/_list_item_siae.html
@@ -23,26 +23,30 @@
             </div>
         </div>
 
-        <a href="{% url 'tenders:detail' tender.slug %}" class="text-decoration-none">
-            <h2 class="py-2">{{ tender.title }}</h2>
-        </a>
+        <h2 class="py-2">{{ tender.title }}</h2>
 
         <hr />
 
         <div class="row">
+            {% if tender.contact_company_name_display %}
+                <div class="col-md-4" title="Entreprise">
+                    <i class="ri-building-4-line"></i>
+                    {{ tender.contact_company_name_display }}
+                </div>
+            {% endif %}
+            <div class="col-md-4" title="{% get_verbose_name tender 'location' %}">
+                {% if tender.perimeters_list_string %}
+                    <i class="ri-map-pin-2-line"></i>
+                    {{ tender.location_display|safe }}
+                {% endif %}
+            </div>
             <div class="col-md-4" title="{% get_verbose_name tender 'sectors' %} : {{ tender.sectors_full_list_string|safe }}">
                 {% if tender.sectors.count %}
                     <i class="ri-award-line"></i>
                     {{ tender.sectors_list_string|safe }}
                 {% endif %}
             </div>
-            <div class="col-md-4 text-center" title="{% get_verbose_name tender 'location' %}">
-                {% if tender.perimeters_list_string %}
-                    <i class="ri-map-pin-2-line"></i>
-                    {{ tender.location_display|safe }}
-                {% endif %}
-            </div>
-            <div class="col-md-4 text-center" title="{% get_verbose_name tender 'amount' %}">
+            <div class="col-md-4" title="{% get_verbose_name tender 'amount' %}">
                 {% if tender.amount %}
                     <i class="ri-money-euro-circle-line"></i>
                     {{ tender.get_amount_display|default:"-" }}