Merge pull request #19 from entrepreneur-interet-general/sp7

Sp7

Author: Ash-Crow

core/services/context_data.py

@@ -120,8 +120,12 @@ def format_table(self, table, format_for_web: bool = True) -> None:
 
             row.append(label)
             for siren_id in self.list_sirens():
-                if prop["type"] == "numeric" and format_for_web:
-                    row.append(format_number(self.context_data[siren_id][field]))
+                if prop["type"] == "numeric":
+                    row.append(
+                        format_number(
+                            self.context_data[siren_id][field], format_for_web
+                        )
+                    )
                 elif prop["type"] == "boolean":
                     row.append(self.format_boolean(siren_id, prop))
                 else:

core/services/utils.py

@@ -31,12 +31,19 @@ def init_payload(page_title: str, links: list = []):
     return {"context": context, "title": page_title, "breadcrumb_data": breadcrumb_data}
 
 
-def format_number(n):
+def format_number(n, format_for_web):
     """
-    Format the number with French locale and rounds to one decimal place if needed
+    Rounds a number to one decimal place if needed.
+
+    If format_for_web is True, then it also applies French locale (comma
+    for decimal separator, narrow no-break space for thousands separator)
     """
     if type(n) in [int, float]:
-        return format_decimal(n, locale="fr_FR", format="#,##0.#")
+        if format_for_web:
+            return format_decimal(n, locale="fr_FR", format="#,##0.#")
+        else:
+            # Useful for csv export
+            return format_decimal(n, locale="en_US", format="###0.#")
     elif n is None:
         return ""
     else:

core/templates/core/commune_compare.html

@@ -19,7 +19,7 @@ <h2 id="donnees-contexte">Données de contexte</h2>
       href="{{ data.export_link }}"
       target="_blank"
       rel="noopener"
-      class="fr-link fr-fi-arrow-right-line fr-link--icon-right"
+      class="fr-link fr-fi-download-line fr-link--icon-right"
     >
       Télécharger le comparatif des communes sélectionnées au format csv
     </a>

core/templates/core/commune_detail.html

@@ -16,7 +16,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="fr-container">
+<div class="fr-container oc-padding-top-2em oc-padding-bottom-3em">
 {% include "core/dsfr/breadcrumb.html" with breadcrumb_data=breadcrumb_data %}
 
 {# Intro #}
@@ -101,6 +101,18 @@ <h2 id="ressources-financieres-fiscales">
       Plus d’informations sur le site dotations de la DGCL
     </a>
 
+    <p class="oc-padding-top-2em">
+        <a
+        title="Export données de la commune"
+        href="{% url 'core:csv_commune_export' slug %}"
+        target="_blank"
+        rel="noopener"
+        class="fr-link fr-fi-download-line fr-link--icon-right"
+      >
+        Télécharger les données de la commune au format csv
+      </a>
+    </p>
+
     <h2 id="comparaison-autres-communes">
       Comparaison avec d’autres communes
     </h2>

core/templates/core/departement_detail.html

@@ -69,7 +69,7 @@ <h2 id="perimetre">Périmètre</h2>
         href="{% url 'core:csv_departement_compare_communes' slug %}"
         target="_blank"
         rel="noopener"
-        class="fr-link fr-fi-arrow-right-line fr-link--icon-right"
+        class="fr-link fr-fi-download-line fr-link--icon-right"
       >
         Télécharger le comparatif des {{ data.communes_count }} communes au format csv
       </a>

core/templates/core/epci_detail.html

@@ -137,7 +137,7 @@ <h3 id="perimetre">Périmètre</h3>
       href="{% url 'core:csv_epci_compare_communes' slug %}"
       target="_blank"
       rel="noopener"
-      class="fr-link fr-fi-arrow-right-line fr-link--icon-right"
+      class="fr-link fr-fi-download-line fr-link--icon-right"
     >
       Télécharger le comparatif des {{ data.members.count }} communes au format csv
     </a>

core/urls.py

@@ -53,6 +53,11 @@
         views.page_commune_compare,
         name="page_commune_compare",
     ),
+    path(
+        "export/commune/<slug:slug>",
+        views.csv_commune_export,
+        name="csv_commune_export",
+    ),
     re_path(
         r"^compare_export\/commune\/(?P<slug1>[-\w]+)\/(?P<slug2>[-\w]+)\/?(?P<slug3>[-\w]+)?\/?(?P<slug4>[-\w]+)?\/?",
         views.csv_compare_communes_from_list,

core/views.py

@@ -69,6 +69,7 @@ def page_commune_detail(request, slug):
     commune = get_object_or_404(Commune, slug=slug)
 
     payload = init_payload(f"Fiche commune : {commune.name}")
+    payload["slug"] = slug
     payload["siren"] = commune.siren
     payload["commune_name"] = commune.name
     payload["data"] = commune_data(commune.siren)
@@ -404,6 +405,14 @@ def page_sitemap(request):
 ###############
 # CSV exports #
 ###############
+@require_safe
+def csv_commune_export(request, slug):
+    commune = Commune.objects.filter(slug=slug)
+    # Commune.objects.filter is used instead of get_object_or_404 because
+    # compare_communes_for_export expects a QuerySet
+    filename = f"export-commune-{slug}"
+    response = compare_communes_for_export(commune, filename)
+    return response
 
 
 @require_safe