+
{% translate "Asset" %}
@@ -847,7 +847,7 @@
-
+
{% translate "Localisation" %}
@@ -857,6 +857,16 @@
+
+
+
{% translate "Zone de gestion" %}
+
+
+
+
+
{% translate "Aucune thématique éditable n'est disponible pour la création." %}
diff --git a/loko/assets/tests_management_zones.py b/loko/assets/tests_management_zones.py
index 81d1605..7101dfe 100644
--- a/loko/assets/tests_management_zones.py
+++ b/loko/assets/tests_management_zones.py
@@ -486,3 +486,108 @@ class ManagementZonesPermissionAndCRUDTests(TestCase):
data = res.json()
self.assertEqual(len(data['types']), 1)
self.assertEqual(data['types'][0]['code'], 'fauche_eco')
+
+
+class ManagementZoneUnifiedViewIntegrationTests(TestCase):
+ def setUp(self):
+ self.thematic_nature = Thematic.objects.create(name_fr="Nature", name_nl="Natuur", code="nature")
+ self.thematic_roads = Thematic.objects.create(name_fr="Voirie", name_nl="Wegen", code="roads")
+
+ self.user_editor = User.objects.create_user(username="editor_unified", password="password")
+ self.user_viewer = User.objects.create_user(username="viewer_unified", password="password")
+
+ self.config_editor = UserConfig.objects.create(user=self.user_editor)
+ self.config_viewer = UserConfig.objects.create(user=self.user_viewer)
+
+ UserThematics.objects.create(
+ user_config=self.config_editor,
+ thematic=self.thematic_nature,
+ can_view_assets=True,
+ can_edit_assets=True,
+ can_edit_management_zones=True,
+ )
+
+ UserThematics.objects.create(
+ user_config=self.config_viewer,
+ thematic=self.thematic_nature,
+ can_view_assets=True,
+ can_edit_assets=False,
+ can_edit_management_zones=False,
+ )
+
+ self.zone_type = ManagementZoneType.objects.create(
+ thematic=self.thematic_nature,
+ code="fauche_eco",
+ name_fr="Fauche tardive",
+ name_nl="Laat maaien",
+ default_color="#27ae60",
+ )
+
+ poly = Polygon(((149000, 170000), (149100, 170000), (149100, 170100), (149000, 170100), (149000, 170000)))
+ multi_poly = MultiPolygon([poly], srid=3812)
+ self.zone = ManagementZone.objects.create(
+ thematic=self.thematic_nature,
+ zone_type=self.zone_type,
+ code="ZN-TEST-001",
+ name_fr="Pelouse A",
+ name_nl="Grasveld A",
+ geom=multi_poly,
+ is_active=True,
+ created_by=self.user_editor,
+ )
+
+ def test_build_thematic_config_includes_management_zones_url(self):
+ from assets.views.core import build_thematic_config
+ config = build_thematic_config([self.thematic_nature, self.thematic_roads])
+ self.assertIn("nature", config)
+ self.assertIn("management_zones_geojson_url", config["nature"])
+ self.assertEqual(config["nature"]["management_zones_geojson_url"], reverse("assets:management_zones_geojson"))
+
+ def test_build_unified_add_modal_config_permissions(self):
+ from assets.views.core import build_unified_add_modal_config
+ # Editor can edit management zones in nature
+ editor_config = build_unified_add_modal_config([self.thematic_nature], user=self.user_editor)
+ self.assertIn("management_zone_thematics", editor_config)
+ editor_codes = [t["code"] for t in editor_config["management_zone_thematics"]]
+ self.assertIn("nature", editor_codes)
+
+ # Viewer cannot edit management zones
+ viewer_config = build_unified_add_modal_config([self.thematic_nature], user=self.user_viewer)
+ viewer_codes = [t["code"] for t in viewer_config["management_zone_thematics"]]
+ self.assertNotIn("nature", viewer_codes)
+
+ def test_management_zones_geojson_properties_for_unified_table(self):
+ self.client.login(username="editor_unified", password="password")
+ url = reverse("assets:management_zones_geojson") + f"?thematic={self.thematic_nature.code}"
+ res = self.client.get(url)
+ self.assertEqual(res.status_code, 200)
+ data = res.json()
+ self.assertEqual(len(data["features"]), 1)
+ feat = data["features"][0]
+ props = feat["properties"]
+
+ self.assertTrue(props["is_management_zone"])
+ self.assertFalse(props["is_location"])
+ self.assertEqual(props["asset_type"], "managementzone")
+ self.assertIn(props["element_type"], ["Zone de gestion", "Management zone"])
+ self.assertEqual(props["category"], "Fauche tardive")
+ self.assertEqual(props["status"], "active")
+ self.assertIsNotNone(props["lon"])
+ self.assertIsNotNone(props["lat"])
+ self.assertIsNotNone(props["area"])
+ self.assertEqual(props["detail_url"], reverse("assets:management_zone_detail", kwargs={"pk": self.zone.pk}))
+
+ def test_unified_index_page_contains_management_zone_elements(self):
+ self.client.login(username="editor_unified", password="password")
+ url = reverse("assets:index")
+ res = self.client.get(url)
+ self.assertEqual(res.status_code, 200)
+
+ # Check filter modal checkboxes
+ self.assertContains(res, 'id="type-cb-assets"')
+ self.assertContains(res, 'id="type-cb-locations"')
+ self.assertContains(res, 'id="type-cb-management-zones"')
+
+ # Check add modal card
+ self.assertContains(res, 'id="unified-add-management-zone-thematic"')
+ self.assertContains(res, 'id="unified-add-management-zone-open"')
diff --git a/loko/assets/views/core.py b/loko/assets/views/core.py
index f19f646..4d517c9 100644
--- a/loko/assets/views/core.py
+++ b/loko/assets/views/core.py
@@ -470,6 +470,8 @@ ELEMENT_TYPE_LABELS = {
# --- Espaces plein air ---
'outdoorlocation': _('Espace public plein air'),
'outdoorasset': _('Équipement plein air'),
+ # --- Zones de gestion ---
+ 'managementzone': _('Zone de gestion'),
}
@@ -553,6 +555,7 @@ def build_thematic_config(thematics):
},
}
+ management_zones_url = reverse('assets:management_zones_geojson')
result = {}
for thematic in thematics:
code = thematic.code
@@ -560,6 +563,7 @@ def build_thematic_config(thematics):
entry = dict(_THEMATIC_URLS[code])
entry['name'] = thematic.get_name() if hasattr(thematic, 'get_name') else str(thematic)
entry['icon'] = thematic.icon if hasattr(thematic, 'icon') else ''
+ entry['management_zones_geojson_url'] = management_zones_url
result[code] = entry
return result
@@ -936,6 +940,7 @@ def build_unified_add_modal_config(accessible_thematics, user=None):
from assets.permissions import (
can_edit_location_for_thematic,
get_allowed_actions_for_thematic,
+ can_edit_management_zones,
)
location_type_by_thematic = {
@@ -948,6 +953,7 @@ def build_unified_add_modal_config(accessible_thematics, user=None):
asset_thematics = []
location_thematics = []
+ management_zone_thematics = []
for thematic in accessible_thematics:
thematic_name = thematic.get_name() if hasattr(thematic, 'get_name') else str(thematic)
@@ -974,9 +980,18 @@ def build_unified_add_modal_config(accessible_thematics, user=None):
'location_label': location_meta['label'],
})
+ if can_edit_management_zones(user, thematic):
+ management_zone_thematics.append({
+ 'code': thematic.code,
+ 'name': thematic_name,
+ 'icon': thematic_icon,
+ })
+
return {
'asset_thematics': asset_thematics,
'location_thematics': location_thematics,
+ 'management_zone_thematics': management_zone_thematics,
+ 'management_zone_create_url': reverse('assets:management_zone_create'),
}
diff --git a/loko/assets/views/management_zones.py b/loko/assets/views/management_zones.py
index 442aae3..70657cf 100644
--- a/loko/assets/views/management_zones.py
+++ b/loko/assets/views/management_zones.py
@@ -39,7 +39,7 @@ def management_zones_geojson(request):
if not thematic:
return JsonResponse({'type': 'FeatureCollection', 'features': []})
- can_view, _ = get_user_asset_thematic_access(user, thematic)
+ can_view, _can_edit = get_user_asset_thematic_access(user, thematic)
if not can_view:
return HttpResponseForbidden("Access denied to this thematic management zones.")
@@ -77,6 +77,18 @@ def management_zones_geojson(request):
if not geom_json:
continue
+ centroid = zone.geom.centroid.clone() if zone.geom else None
+ if centroid:
+ if centroid.srid and centroid.srid != 4326:
+ centroid.transform(4326)
+ lon = round(centroid.x, 7)
+ lat = round(centroid.y, 7)
+ else:
+ lon = None
+ lat = None
+ area = round(zone.geom.area, 1) if getattr(zone.geom, 'area', None) is not None else None
+ category_name = zone.zone_type.get_name() if zone.zone_type else ""
+
features.append({
'type': 'Feature',
'id': zone.id,
@@ -87,12 +99,22 @@ def management_zones_geojson(request):
'thematic': zone.thematic.code,
'thematic_name': zone.thematic.name,
'zone_type_code': zone.zone_type.code if zone.zone_type else None,
- 'zone_type_name': zone.zone_type.get_name() if zone.zone_type else "",
+ 'zone_type_name': category_name,
+ 'category': category_name,
'color': zone.get_color(),
'instructions': zone.instructions or "",
'description': zone.description or "",
'seasonality_notes': zone.seasonality_notes or "",
'target_frequency_days': zone.target_frequency_days,
+ 'status': 'active' if zone.is_active else 'inactive',
+ 'element_type': str(_('Zone de gestion')),
+ 'asset_type': 'managementzone',
+ 'detail_url': reverse('assets:management_zone_detail', kwargs={'pk': zone.pk}),
+ 'lon': lon,
+ 'lat': lat,
+ 'area': area,
+ 'is_location': False,
+ 'is_management_zone': True,
},
'geometry': geom_json
})