- {% for id, name in project_choices %}
-
-
-
+
+
+ {% for project in selected_projects_objs %}
+
+
+ {{ project.name }}
+
+
+
+ {% empty %}
+
{% translate "Aucun projet sélectionné (tous les projets sont inclus)" %}
{% endfor %}
- {% endif %}
@@ -273,6 +284,7 @@
const controlsgeojsonUrl = "{% url 'controls:controls_geojson' %}";
const controlsIndexUrl = "{% url 'controls:controls_index' %}";
const controlsExportExcelUrl = "{% url 'controls:controls_export_excel' %}";
+ const projectsAutocompleteUrl = "{% url 'controls:projects_autocomplete' %}";
const savePreferencesUrl = "{% url 'common:save_control_list_preferences' %}";
const projectsDetailBaseUrl = "{% url 'projects:projects_index' %}";
const SAVED_SORT = {{ saved_sort|default:"{}"|safe }};
diff --git a/loko/controls/tests.py b/loko/controls/tests.py
index 0a017cb..265962d 100644
--- a/loko/controls/tests.py
+++ b/loko/controls/tests.py
@@ -216,3 +216,22 @@ class ControlsIndexTests(TestCase):
self.internal_config.refresh_from_db()
self.assertEqual(self.internal_config.control_list_filters, payload["filters"])
self.assertEqual(self.internal_config.control_list_sort, payload["sort"])
+
+ def test_projects_autocomplete(self):
+ self.client.login(username="admin_user", password="password123")
+ response = self.client.get(reverse("controls:projects_autocomplete"), {"q": "Test"})
+ self.assertEqual(response.status_code, 200)
+ data = response.json()
+ self.assertTrue(len(data) >= 1)
+ self.assertEqual(data[0]["id"], self.project.id)
+ self.assertEqual(data[0]["name"], "Projet Test")
+
+ def test_controls_index_selected_projects_objs(self):
+ self.client.login(username="admin_user", password="password123")
+ response = self.client.get(reverse("controls:controls_index"), {"project": [str(self.project.id)]})
+ self.assertEqual(response.status_code, 200)
+ self.assertIn("selected_projects_objs", response.context)
+ selected_objs = response.context["selected_projects_objs"]
+ self.assertEqual(len(selected_objs), 1)
+ self.assertEqual(selected_objs[0].id, self.project.id)
+
diff --git a/loko/controls/urls.py b/loko/controls/urls.py
index a559ce7..8888818 100644
--- a/loko/controls/urls.py
+++ b/loko/controls/urls.py
@@ -8,6 +8,7 @@ urlpatterns = [
path("", views.controls_index, name="controls_index"),
path("geojson/", views.controls_geojson, name="controls_geojson"),
path("export-excel/", views.controls_export_excel, name="controls_export_excel"),
+ path("projects-autocomplete/", views.projects_autocomplete, name="projects_autocomplete"),
path("service-worker.js", views.controls_service_worker, name="controls_service_worker"),
path("offline/", views.controls_offline, name="controls_offline"),
path('/', views.controls_detail, name='controls_detail'),
diff --git a/loko/controls/views.py b/loko/controls/views.py
index 157f7d9..81d57b2 100644
--- a/loko/controls/views.py
+++ b/loko/controls/views.py
@@ -391,6 +391,9 @@ def controls_index(request):
}
return render(request, 'controls/controls_index_mobile.html', context)
+ valid_selected_project_ids = [int(x) for x in selected_projects if str(x).isdigit()]
+ selected_projects_objs = list(viewable_projects.filter(id__in=valid_selected_project_ids)) if valid_selected_project_ids else []
+
context = {
'thematic_choices': [(t.code, t.name, t.icon) for t in thematics],
'selected_thematics': selected_thematics,
@@ -405,6 +408,7 @@ def controls_index(request):
'selected_types': selected_types,
'project_choices': [(p.id, p.name) for p in viewable_projects],
'selected_projects': selected_projects,
+ 'selected_projects_objs': selected_projects_objs,
'search_query': search_query,
'show_mine_only': show_mine_only,
'date_from': date_from,
@@ -416,6 +420,40 @@ def controls_index(request):
return render(request, 'controls/controls_index.html', context)
+@require_GET
+@login_required
+def projects_autocomplete(request):
+ """
+ API endpoint pour l'autocomplétion des projets dans les filtres des contrôles.
+ Renvoie les projets consultables filtrés par nom ou code.
+ """
+ q = request.GET.get('q', '').strip()
+ if not q:
+ return JsonResponse([], safe=False)
+
+ viewable_projects = filter_viewable_projects_for_user(request.user)
+
+ search_terms = q.split()
+ query = Q()
+ for term in search_terms:
+ if term:
+ query &= (Q(name__icontains=term) | Q(code__icontains=term))
+
+ projects = viewable_projects.filter(query).order_by('name')[:30]
+
+ results = []
+ for p in projects:
+ code_prefix = f"[{p.code}] " if p.code else ""
+ results.append({
+ 'id': p.id,
+ 'code': p.code or '',
+ 'name': p.name,
+ 'label': f"{code_prefix}{p.name}",
+ })
+
+ return JsonResponse(results, safe=False)
+
+
@require_GET
@login_required
def controls_geojson(request):