Merge pull request #668 from MTES-MCT/fix/maplibre-htmx-and-template

Correctifs carte zonages d'urbanisme
MTES-MCT · Oct 24, 2024 · a56482e · a56482e
2 parents 3f195d1 + 27c6af7
commit a56482e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 54 deletions.
diff --git a/assets/scripts/map_libre/events.js b/assets/scripts/map_libre/events.js
@@ -1,3 +1,4 @@
+import htmx from 'htmx.org'
 import { formatData } from './utils.js'
 
 export default class Events

diff --git a/project/static/project/scripts/fr-callout-read-more.js b/project/static/project/scripts/fr-callout-read-more.js
diff --git a/project/static/project/scripts/highcharts-custom-buttons.js b/project/static/project/scripts/highcharts-custom-buttons.js
diff --git a/project/templates/project/components/charts/artif_zone_urba.html b/project/templates/project/components/charts/artif_zone_urba.html
@@ -55,13 +55,13 @@ <h2>Détails de l'artificialisation entre {{ diagnostic.first_year_ocsge|stringf
 
     <h3>Grandes familles de couverture des sols des surfaces artificialisées</h3>
 
-    <div hx-get="{% url 'project:artif-detail-couv-chart' diagnostic.id %}?zone_urba_id={{ zone_urba.checksum|stringformat:"s" }}" hx-trigger="load 2s" hx-swap="outerHTML">
+    <div hx-get="{% url 'project:artif-detail-couv-chart' diagnostic.id %}?zone_urba_id={{ zone_urba.checksum|stringformat:"s" }}" hx-trigger="load" hx-swap="outerHTML">
         <div class="fr-custom-loader"></div>
     </div>
 
     <h3 class="fr-mt-4w">Grandes familles d'usages du sol des surfaces artificialisées</h3>
 
-    <div hx-get="{% url 'project:artif-detail-usa-chart' diagnostic.id %}?zone_urba_id={{ zone_urba.checksum|stringformat:"s" }}" hx-trigger="load 4s" hx-swap="outerHTML">
+    <div hx-get="{% url 'project:artif-detail-usa-chart' diagnostic.id %}?zone_urba_id={{ zone_urba.checksum|stringformat:"s" }}" hx-trigger="load" hx-swap="outerHTML">
         <div class="fr-custom-loader"></div>
     </div>
 </div>
diff --git a/templates/index.html b/templates/index.html
@@ -41,7 +41,7 @@
             {% include "header.html" %}
 
             <!-- Page content-->
-            <main id="contenu" class="h-100 {% if request.resolver_match.url_name not in 'home,home_rapport_local' %}fr-py-7w {% endif %}">
+            <main id="contenu" class="h-100 {% if request.resolver_match.url_name not in 'home,home_rapport_local,map-urban-zones' %}fr-py-7w {% endif %}">
                 {% if messages %}
                     <div class="row justify-content-center w-100 my-0 pt-3 pb-4">
                         <div class="col-12 col-md-8 col-lg-6">