Improve performances by using select2 and dynamic form field for large select data

Makefile

@@ -107,10 +107,10 @@ coverage:
 	rm ./var/.coverage*
 
 test:
-	$(docker_compose) run -e ENV=tests --rm web ./manage.py test --shuffle --noinput --parallel
+	$(docker_compose) run -e ENV=tests --rm web ./manage.py test $(test_name) --shuffle --noinput --parallel
 
 test_nds:
-	$(docker_compose) run -e ENV=tests_nds --rm web ./manage.py test --shuffle --noinput --parallel
+	$(docker_compose) run -e ENV=tests_nds --rm web ./manage.py test $(test_name) --shuffle --noinput --parallel
 
 tests: test test_nds
 

cypress/integration/nav_create_signage.js

@@ -34,7 +34,7 @@ describe('Create signage', () => {
         cy.get("input[name='name_en']").type('Signage number 1')
         cy.get("a[href='#name_fr']").click()
         cy.get("input[name='name_fr']").type('Signalétique numéro 1')
-        cy.get("select[id='id_type']").select("Service")
+        cy.get("select[id='id_type']").select("Service", { force: true })
         cy.get('#save_changes').click()
         cy.url().should('not.include', '/signage/add/')
     })

cypress/integration/nav_create_trek.js

@@ -38,9 +38,9 @@ describe('Create trek', () => {
         cy.get("a[href='#arrival_fr']").click();
         cy.get("input[id='id_arrival_fr']").type('Arrivée');
         cy.get("input[id='id_duration']").type('100');
-        cy.get("select[id='id_practice']").select("Cycling");
-        cy.get("select[id='id_difficulty']").select("Very hard");
-        cy.get("select[id='id_route']").select("Loop");
+        cy.get("select[id='id_practice']").select("Cycling", { force: true });
+        cy.get("select[id='id_difficulty']").select("Very hard", { force: true });
+        cy.get("select[id='id_route']").select("Loop", { force: true });
         cy.setTinyMceContent('id_access_en', 'Access number 1');;
         cy.setTinyMceContent('id_description_teaser_en', 'Description teaser number 1');
         cy.setTinyMceContent('id_ambiance_en', 'Ambiance number 1');

cypress/integration/nav_reports_workflow.js

@@ -23,22 +23,22 @@ describe('Nav reports workflow', () => {
         cy.get("#id_message_administrators").should("not.be.visible")
         cy.get("#id_message_supervisor").should("not.be.visible")
         // Change selected status to resolved
-        cy.get("#id_status").select("3")
+        cy.get("#id_status").select("3", { force: true })
         // Can use selectors for sentinel messages
         cy.get("#id_message_sentinel_predefined").should("be.visible")
         cy.get("#id_message_sentinel").should("be.visible")
         cy.get("#id_message_administrators").should("be.visible")
         cy.get("#id_message_supervisor").should("not.be.visible")
         // Select a predefined email
-        cy.get("#id_message_sentinel_predefined").select("1")
+        cy.get("#id_message_sentinel_predefined").select("1", { force: true })
         cy.get("#id_message_sentinel").should("have.value", "Pris en charge par Comm des Comm des Arbres Binaires le 17/05/2022")
         cy.get("#id_message_administrators").should("have.value", "Pris en charge par Comm des Comm des Arbres Binaires le 17/05/2022")
         // Remove predefined email
-        cy.get("#id_message_sentinel_predefined").select("")
+        cy.get("#id_message_sentinel_predefined").select("", { force: true })
         cy.get("#id_message_sentinel").should("have.value", "")
         cy.get("#id_message_administrators").should("have.value", "")
         // Change selected status back to initial one
-        cy.get("#id_status").select("1")
+        cy.get("#id_status").select("1", { force: true })
         // Cannot use selectors for sentinel and supervisor messages anymore
         cy.get("#id_message_sentinel_predefined").should("not.be.visible")
         cy.get("#id_message_sentinel").should("not.be.visible")
@@ -55,37 +55,37 @@ describe('Nav reports workflow', () => {
         cy.get("#id_message_administrators").should("not.be.visible")
         cy.get("#id_message_supervisor").should("not.be.visible")
         // Change selected status to waiting
-        cy.get("#id_status").select("4")
+        cy.get("#id_status").select("4", { force: true })
         // Select an assigned user
-        cy.get("#id_current_user").select("5")
+        cy.get("#id_current_user").select("5", { force: true })
         // Can use selectors for sentinel and supervisor messages
         cy.get("#id_message_sentinel_predefined").scrollIntoView().should("be.visible")
         cy.get("#id_message_sentinel").scrollIntoView().should("be.visible")
         cy.get("#id_message_administrators").scrollIntoView().should("be.visible")
         cy.get("#id_message_supervisor").scrollIntoView().should("be.visible")
         cy.get("#modelfields").scrollTo('bottom').get("#id_message_supervisor").should("be.visible")
         // Select a predefined email
-        cy.get("#id_message_sentinel_predefined").select("2")
+        cy.get("#id_message_sentinel_predefined").select("2", { force: true })
         cy.get("#id_message_sentinel").should("have.value", "Faire attention a la marche")
         cy.get("#id_message_administrators").should("have.value", "Faire attention a la marche")
         cy.get("#id_message_supervisor").should("have.value", "")
         // Select another predefined email
-        cy.get("#id_message_sentinel_predefined").select("3")
+        cy.get("#id_message_sentinel_predefined").select("3", { force: true })
         cy.get("#id_message_sentinel").should("have.value", "Ce probleme n'en sera bientot plus un")
         cy.get("#id_message_administrators").should("have.value", "Ce probleme n'en sera bientot plus un")
         // Select another assigned user
-        cy.get("#id_current_user").select("1")
+        cy.get("#id_current_user").select("1", { force: true })
         // Can use selectors for sentinel and supervisor messages
         cy.get("#id_message_sentinel_predefined").scrollIntoView().should("be.visible")
         cy.get("#id_message_sentinel").scrollIntoView().should("be.visible")
         cy.get("#id_message_administrators").scrollIntoView().should("be.visible")
         cy.get("#modelfields").scrollTo('bottom').get("#id_message_supervisor").should("be.visible")
         // Remove predefined email
-        cy.get("#id_message_sentinel_predefined").select("")
+        cy.get("#id_message_sentinel_predefined").select("", { force: true })
         cy.get("#id_message_sentinel").should("have.value", "")
         cy.get("#id_message_administrators").should("have.value", "")
         // Change status back
-        cy.get("#id_status").select("2")
+        cy.get("#id_status").select("2", { force: true })
         // Cannot use selectors for sentinel and supervisor messages anymore
         cy.get("#id_message_sentinel_predefined").should("not.be.visible")
         cy.get("#id_message_sentinel").should("not.be.visible")

docker/Dockerfile

@@ -78,12 +78,13 @@ FROM base AS build
 
 USER root
 
-RUN apt-get update -qq && apt-get install -y -qq  \
-    git \
-    build-essential \
-    graphviz \
-    libpq-dev &&\
-    apt-get clean all && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/*
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    apt-get update -qq && apt-get install -y -qq  \
+        git \
+        build-essential \
+        graphviz \
+        libpq-dev
 
 USER geotrek
 

geotrek/altimetry/filters.py

@@ -1,10 +1,10 @@
 from django.utils.translation import gettext_lazy as _
-from django_filters import FilterSet
+from mapentity.filters import MapEntityFilterSet
 
 from geotrek.common.filters import OptionalRangeFilter
 
 
-class AltimetryPointFilterSet(FilterSet):
+class AltimetryPointFilterSet(MapEntityFilterSet):
     elevation = OptionalRangeFilter(label=_("elevation"), method="filter_elevation")
 
     def filter_elevation(self, qs, name, value):

geotrek/api/v2/serializers.py

@@ -1293,7 +1293,10 @@ def get_elevation(self, obj):
             return obj.species.radius
 
         def get_species_id(self, obj):
-            if obj.species.category == sensitivity_models.Species.SPECIES:
+            if (
+                obj.species.category
+                == sensitivity_models.Species.CategoryChoices.SPECIES
+            ):
                 return obj.species_id
             return None
 
@@ -1346,7 +1349,8 @@ class BubbleSensitiveAreaSerializer(SensitiveAreaSerializer):
 
         def get_radius(self, obj):
             if (
-                obj.species.category == sensitivity_models.Species.SPECIES
+                obj.species.category
+                == sensitivity_models.Species.CategoryChoices.SPECIES
                 and obj.geom.geom_typeid == 0
             ):
                 return obj.species.radius

geotrek/common/filters/fields.py

@@ -19,4 +19,6 @@ def to_python(self, value):
 
 
 class OneLineRangeField(RangeField):
-    widget = OneLineRangeWidget(attrs={"class": "minmax-field"})
+    widget = OneLineRangeWidget(
+        attrs={"class": "minmax-field form-control form-control-sm"}
+    )

geotrek/common/mixins/models.py

@@ -5,9 +5,10 @@
 import uuid
 
 from django.conf import settings
+from django.contrib.gis.db import models
+from django.contrib.gis.db.models.functions import Envelope, Transform
 from django.core.files.storage import default_storage
 from django.core.mail import mail_managers
-from django.db import models
 from django.db.models import Count, Max
 from django.template import Context, Template
 from django.template.defaultfilters import slugify
@@ -512,3 +513,18 @@ def get_eid(self):
                 "{% load i18n  %} <span class='none'>{% trans 'None' %}</span>"
             )
             return mark_safe(tmpl.render(Context({})))
+
+
+class BBoxMixin(models.Model):
+    envelope = models.GeneratedField(
+        expression=Envelope(Transform("geom", settings.API_SRID)),
+        db_persist=True,
+        output_field=models.GeometryField(),
+    )
+
+    @property
+    def bbox(self):
+        return self.envelope.extent
+
+    class Meta:
+        abstract = True

geotrek/common/static/common/style.css

@@ -1,5 +1,12 @@
 #mainfilter input.minmax-field {
     width: calc(60% - 1.9rem);
+    border-radius: 1px !important;
+
+}
+
+#mainfilter .form-row {
+    margin-right: 0 !important;
+    margin-left: 0 !important;
 }
 
 .caption-detail {

geotrek/common/templates/common/range_widget.html

@@ -1 +1 @@
-{% for widget in widget.subwidgets %}{% include widget.template_name %}{% if forloop.first %}- {% endif %}{% endfor %}
+<div class="form-row align-items-center">{% for widget in widget.subwidgets %}{% include widget.template_name %}{% if forloop.first %}&nbsp;-&nbsp;{% endif %}{% endfor %}</div>

geotrek/core/filters.py

@@ -1,9 +1,10 @@
+from dal import autocomplete
 from django.conf import settings
 from django.db.models import Count, F, Q
+from django.forms import widgets
 from django.utils.translation import gettext_lazy as _
 from django_filters import (
     BooleanFilter,
-    CharFilter,
     FilterSet,
     ModelMultipleChoiceFilter,
 )
@@ -27,10 +28,18 @@ class ValidTopologyFilterSet(FilterSet):
 
     if settings.TREKKING_TOPOLOGY_ENABLED:
         is_valid_topology = BooleanFilter(
-            label=_("Valid topology"), method="filter_valid_topology"
+            label=_("Valid topology"),
+            method="filter_valid_topology",
+            widget=widgets.NullBooleanSelect(
+                attrs={"class": "form-control form-control-sm"}
+            ),
         )
     is_valid_geometry = BooleanFilter(
-        label=_("Valid geometry"), method="filter_valid_geometry"
+        label=_("Valid geometry"),
+        method="filter_valid_geometry",
+        widget=widgets.NullBooleanSelect(
+            attrs={"class": "form-control form-control-sm"}
+        ),
     )
 
     def filter_valid_topology(self, qs, name, value):
@@ -124,26 +133,30 @@ def _topology_filter(self, qs, edges):
 class PathFilterSet(
     AltimetryAllGeometriesFilterSet, ZoningFilterSet, StructureRelatedFilterSet
 ):
-    name = CharFilter(label=_("Name"), lookup_expr="icontains")
-    comments = CharFilter(label=_("Comments"), lookup_expr="icontains")
     provider = ModelMultipleChoiceFilter(
         label=_("Provider"),
         queryset=Provider.objects.filter(path__isnull=False).distinct(),
+        widget=autocomplete.Select2Multiple(),
     )
     networks = ModelMultipleChoiceFilter(
-        queryset=Network.objects.all().select_related("structure")
+        queryset=Network.objects.all().select_related("structure"),
+        widget=autocomplete.Select2Multiple(),
     )
     usages = ModelMultipleChoiceFilter(
-        queryset=Usage.objects.all().select_related("structure")
+        queryset=Usage.objects.all().select_related("structure"),
+        widget=autocomplete.Select2Multiple(),
     )
     comfort = ModelMultipleChoiceFilter(
-        queryset=Comfort.objects.all().select_related("structure")
+        queryset=Comfort.objects.all().select_related("structure"),
+        widget=autocomplete.Select2Multiple(),
     )
 
     class Meta(StructureRelatedFilterSet.Meta):
         model = Path
         fields = [
             *StructureRelatedFilterSet.Meta.fields,
+            "name",
+            "comments",
             "valid",
             "networks",
             "usages",
@@ -160,20 +173,16 @@ class TrailFilterSet(
     ZoningFilterSet,
     StructureRelatedFilterSet,
 ):
-    """Trail filter set"""
-
-    name = CharFilter(label=_("Name"), lookup_expr="icontains")
-    departure = CharFilter(label=_("Departure"), lookup_expr="icontains")
-    arrival = CharFilter(label=_("Arrival"), lookup_expr="icontains")
-    comments = CharFilter(label=_("Comments"), lookup_expr="icontains")
     certification_labels = ModelMultipleChoiceFilter(
         field_name="certifications__certification_label",
         label=_("Certification labels"),
         queryset=CertificationLabel.objects.all(),
+        widget=autocomplete.Select2Multiple(),
     )
     provider = ModelMultipleChoiceFilter(
         label=_("Provider"),
         queryset=Provider.objects.filter(trail__isnull=False).distinct(),
+        widget=autocomplete.Select2Multiple(),
     )
 
     class Meta(StructureRelatedFilterSet.Meta):
@@ -197,5 +206,11 @@ class TopologyFilterTrail(TopologyFilter):
 if settings.TRAIL_MODEL_ENABLED:
     for filterset in (PathFilterSet, InterventionFilterSet, ProjectFilterSet):
         filterset.add_filters(
-            {"trail": TopologyFilterTrail(label=_("Trail"), required=False)}
+            {
+                "trail": TopologyFilterTrail(
+                    label=_("Trail"),
+                    required=False,
+                    widget=autocomplete.Select2Multiple(),
+                )
+            }
         )

geotrek/core/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-23 11:11+0200\n"
+"POT-Creation-Date: 2025-11-17 09:32+0000\n"
 "PO-Revision-Date: 2025-10-22 09:00+0000\n"
 "Last-Translator: Anonymous <[email protected]>\n"
 "Language-Team: German <https://weblate.makina-corpus.net/projects/geotrek-admin/core/de/>\n"
@@ -43,21 +43,9 @@ msgstr ""
 msgid "Valid geometry"
 msgstr ""
 
-msgid "Name"
-msgstr ""
-
-msgid "Comments"
-msgstr ""
-
 msgid "Provider"
 msgstr ""
 
-msgid "Departure"
-msgstr ""
-
-msgid "Arrival"
-msgstr ""
-
 msgid "Certification labels"
 msgstr ""
 
@@ -115,15 +103,27 @@ msgstr ""
 msgid "Shown in lists and maps"
 msgstr ""
 
+msgid "Name"
+msgstr ""
+
 msgid "Official name"
 msgstr ""
 
+msgid "Comments"
+msgstr ""
+
 msgid "Remarks"
 msgstr ""
 
+msgid "Departure"
+msgstr ""
+
 msgid "Departure place"
 msgstr ""
 
+msgid "Arrival"
+msgstr ""
+
 msgid "Arrival place"
 msgstr ""