Merge dfc82ed into 31f96d0

geotrek/api/v2/serializers.py

@@ -990,7 +990,7 @@ class Meta:
 
     class SensitiveAreaSerializer(DynamicFieldsMixin, TimeStampedSerializer):
         url = HyperlinkedIdentityField(view_name='apiv2:sensitivearea-detail')
-        name = serializers.SerializerMethodField()
+        name = serializers.CharField(source='area_name')
         elevation = serializers.SerializerMethodField()
         description = serializers.SerializerMethodField()
         period = serializers.SerializerMethodField()
@@ -1005,7 +1005,7 @@ class SensitiveAreaSerializer(DynamicFieldsMixin, TimeStampedSerializer):
         attachments = AttachmentSerializer(many=True)
 
         def get_name(self, obj):
-            return get_translation_or_dict('name', self, obj.species)
+            return get_translation_or_dict('name', self, obj)
 
         def get_description(self, obj):
             return get_translation_or_dict('description', self, obj)

geotrek/diving/templates/diving/dive_public_pdf_base.html

@@ -157,7 +157,7 @@ <h2>{% trans "Environmental sensitive areas" %}</h2>
           {% for area in object.published_sensitive_areas %}
             <div class="text-content">
               {% if area.species.pictogram %}<img src="file://{{ area.species.pictogram.path }}">{% endif %}
-              <h3>{{ area.species.name }}</h3>
+              <h3>{{ area.name }}</h3>
               <p>{% trans "Sensitivity period:" %} {{ area.pretty_period }}</p>
               {% if area.contact %}<p>{% trans "Contact:" %} {{ area.contact|safe }}</p>{% endif %}
               <p>{{ area.description|safe }}</p>

geotrek/sensitivity/forms.py

@@ -20,11 +20,12 @@ class PolygonMapWidget(MapWidget):
 
 class SensitiveAreaForm(CommonForm):
     geomfields = ['geom']
+    name = forms.CharField(max_length=250, label=_("Name"), required=False)
     species = forms.ModelChoiceField(queryset=Species.objects.filter(category=Species.SPECIES),
                                      label=pgettext("Singular", "Species"))
 
     class Meta:
-        fields = ['structure', 'species', 'published', 'description', 'contact', 'geom']
+        fields = ['structure', 'species', 'name', 'published', 'description', 'contact', 'geom']
         model = SensitiveArea
         widgets = {'geom': BubbleMapWidget()}
 
@@ -60,7 +61,7 @@ def __init__(self, *args, **kwargs):
         if instance:
             species = instance.species
             kwargs['initial'] = {
-                'name': species.name,
+                # 'name': species.name,
                 'elevation': species.radius,
                 'pictogram': species.pictogram,
                 'practices': species.practices.all(),
@@ -79,7 +80,6 @@ def save(self, **kwargs):
         else:
             species = self.instance.species
         species.category = Species.REGULATORY
-        species.name = self.cleaned_data['name']
         species.radius = self.cleaned_data['elevation']
         species.pictogram = self.cleaned_data['pictogram']
         species.url = self.cleaned_data['url']

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

@@ -112,6 +112,9 @@ msgstr ""
 msgid "Species"
 msgstr ""
 
+msgid "Area name"
+msgstr ""
+
 msgid "Species or regulatory area"
 msgstr ""
 
@@ -133,6 +136,9 @@ msgstr ""
 msgid "Sensitive areas"
 msgstr ""
 
+msgid "Published name"
+msgstr ""
+
 msgid "Radius"
 msgstr ""
 

geotrek/sensitivity/locale/en/LC_MESSAGES/django.po

@@ -112,9 +112,12 @@ msgstr ""
 msgid "Species"
 msgstr ""
 
-msgid "Species or regulatory area"
+msgid "Area name"
 msgstr ""
 
+msgid "Species or regulatory area"
+msgstr "Specie"
+
 msgid "Published"
 msgstr ""
 
@@ -133,6 +136,9 @@ msgstr ""
 msgid "Sensitive areas"
 msgstr ""
 
+msgid "Published name"
+msgstr ""
+
 msgid "Radius"
 msgstr ""
 

geotrek/sensitivity/locale/es/LC_MESSAGES/django.po

@@ -112,6 +112,9 @@ msgstr ""
 msgid "Species"
 msgstr ""
 
+msgid "Area name"
+msgstr ""
+
 msgid "Species or regulatory area"
 msgstr ""
 
@@ -133,6 +136,9 @@ msgstr ""
 msgid "Sensitive areas"
 msgstr ""
 
+msgid "Published name"
+msgstr ""
+
 msgid "Radius"
 msgstr ""
 

geotrek/sensitivity/locale/fr/LC_MESSAGES/django.po

@@ -113,8 +113,11 @@ msgstr "ID externe"
 msgid "Species"
 msgstr "Espèces"
 
+msgid "Area name"
+msgstr "Nom de la zone"
+
 msgid "Species or regulatory area"
-msgstr "Espèce ou zone réglementaire"
+msgstr "Espèce"
 
 msgid "Published"
 msgstr "Publiée"
@@ -134,6 +137,11 @@ msgstr "Zone de sensibilité"
 msgid "Sensitive areas"
 msgstr "Zones sensibles"
 
+#, fuzzy
+#| msgid "Published"
+msgid "Published name"
+msgstr "Publiée"
+
 msgid "Radius"
 msgstr "Rayon"
 

geotrek/sensitivity/locale/it/LC_MESSAGES/django.po

@@ -112,6 +112,9 @@ msgstr ""
 msgid "Species"
 msgstr ""
 
+msgid "Area name"
+msgstr ""
+
 msgid "Species or regulatory area"
 msgstr ""
 
@@ -133,6 +136,9 @@ msgstr ""
 msgid "Sensitive areas"
 msgstr ""
 
+msgid "Published name"
+msgstr ""
+
 msgid "Radius"
 msgstr ""
 

geotrek/sensitivity/locale/nl/LC_MESSAGES/django.po

@@ -112,6 +112,9 @@ msgstr ""
 msgid "Species"
 msgstr ""
 
+msgid "Area name"
+msgstr ""
+
 msgid "Species or regulatory area"
 msgstr ""
 
@@ -133,6 +136,9 @@ msgstr ""
 msgid "Sensitive areas"
 msgstr ""
 
+msgid "Published name"
+msgstr ""
+
 msgid "Radius"
 msgstr ""
 

geotrek/sensitivity/migrations/0029_sensitivearea_name.py

@@ -0,0 +1,40 @@
+from django.db import migrations, models
+from django.conf import settings
+from geotrek.sensitivity.models import SensitiveArea, Species
+
+
+def generate_name(apps, schema_editor):
+    """Populate SensitiveAreas name from Species"""
+
+    sensitive_area = SensitiveArea
+    languages = settings.MODELTRANSLATION_LANGUAGES
+    update_fields = [
+        "name",
+    ]
+    update_fields += [f"name_{lang}" for lang in languages]
+    for row in sensitive_area.objects.existing().filter(species__category=2):
+        for field in update_fields:
+            setattr(row, field, getattr(row.species, field))
+        row.save(update_fields=update_fields)
+        for field in update_fields:
+            print(f"species.manager {row.species._meta.managers}")
+            print(f"row {row.species} | field {field}")
+            setattr(row.species, field, "")
+        row.species.save(update_fields=update_fields)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sensitivity", "0028_alter_sensitivearea_structure"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="sensitivearea",
+            name="name",
+            field=models.CharField(default="", max_length=250, verbose_name="Name"),
+        ),
+        # migrations.RunPython(update_translation_fields_func, reverse_code=migrations.RunPython.noop),
+        migrations.RunPython(generate_name, reverse_code=migrations.RunPython.noop),
+    ]

geotrek/sensitivity/migrations/0030_sensitivearea_name_populate.py.off

@@ -0,0 +1,35 @@
+from django.db import migrations, models
+from modeltranslation.translator import translator
+from django.conf import settings
+from geotrek.sensitivity.models import SensitiveArea, Species
+
+def generate_name(apps, schema_editor):
+    """Populate SensitiveAreas name from Species"""
+
+    sensitive_area = SensitiveArea
+    species = Species
+    languages = settings.MODELTRANSLATION_LANGUAGES
+    update_fields = [
+        "name",
+    ]
+    update_fields += [f"name_{lang}" for lang in languages]
+    for row in sensitive_area.objects.filter(deleted=False, species__category=2):
+        sp = species.objects.filter(pk=row.species.pk)
+        values_dict = sp.values(*update_fields)[0] 
+        print(values_dict)
+        # print({field: getattr(sp.first(), field) or "" for field in update_fields})
+        sensitive_area.objects.filter(pk=row.pk).update(**values_dict)
+        sp.update(**{field:"" for field in update_fields})
+        # row.save(update_fields=update_fields)
+        # row.species.save(update_fields=update_fields)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sensitivity", "0029_sensitivearea_name"),
+    ]
+
+    operations = [
+        migrations.RunPython(generate_name, reverse_code=migrations.RunPython.noop),
+    ]

geotrek/sensitivity/models.py

@@ -92,6 +92,7 @@ def pretty_practices(self):
 
 class SensitiveArea(GeotrekMapEntityMixin, StructureRelated, TimeStampedModelMixin, NoDeleteMixin,
                     AddPropertyMixin):
+    name = models.CharField(max_length=250, verbose_name=_("Name"), default='undefined')
     geom = models.GeometryField(srid=settings.SRID)
     geom_buffered = models.GeometryField(srid=settings.SRID, editable=False)
     species = models.ForeignKey(Species, verbose_name=_("Species or regulatory area"), on_delete=models.PROTECT)
@@ -120,7 +121,7 @@ class Meta:
         )
 
     def __str__(self):
-        return self.species.name
+        return self.name
 
     @property
     def radius(self):
@@ -185,15 +186,27 @@ def published_langs(self):
             return []
 
     @property
-    def species_display(self):
-        s = '<a data-pk="%s" href="%s" title="%s">%s</a>' % (self.pk,
-                                                             self.get_detail_url(),
-                                                             self.species.name,
-                                                             self.species.name)
+    def area_name(self):
+        if self.species.category == 1:
+            return self.species.name if self.name == "" else self.name
+        else:
+            return self.name
+
+    @classproperty
+    def area_name_verbose_name(cls):
+        return _("Published name")
+
+    @property
+    def name_display(self):
+        s = f'<a data-pk="{self.pk}" href="{self.get_detail_url()}" title="{self.area_name}">{self.area_name}</a>'
         if self.published:
-            s = '<span class="badge badge-success" title="%s">&#x2606;</span> ' % _("Published") + s
+            s = f"""<span class="badge badge-success" title="{_('Published')}">&#x2606;</span> {s}"""
         return s
 
+    @property
+    def species_display(self):
+        return self.species.name
+
     @property
     def extent(self):
         return self.geom.transform(settings.API_SRID, clone=True).extent if self.geom else None
@@ -211,7 +224,7 @@ def kml(self):
                 geometry += (coords, )
             geom = GEOSGeometry(Polygon(geometry), srid=settings.SRID)
         geom = geom.transform(4326, clone=True)  # KML uses WGS84
-        line = kml.newpolygon(name=self.species.name,
+        line = kml.newpolygon(name=self.name,
                               description=plain_text(self.description),
                               altitudemode=simplekml.AltitudeMode.relativetoground,
                               outerboundaryis=simplify_coords(geom.coords[0]))

geotrek/sensitivity/serializers.py

@@ -8,7 +8,8 @@
 class SensitiveAreaSerializer(DynamicFieldsMixin, rest_serializers.ModelSerializer):
     category = rest_serializers.CharField(source='category_display')
     structure = rest_serializers.SlugRelatedField('name', read_only=True)
-    species = rest_serializers.CharField(source='species_display')
+    species = rest_serializers.CharField(source='species.name')
+    name = rest_serializers.CharField(source='name_display')
 
     class Meta:
         model = sensitivity_models.SensitiveArea

geotrek/sensitivity/templates/sensitivity/sensitivearea_detail_attributes.html

@@ -15,17 +15,16 @@
             <th>{{ sensitivearea|verbose:"structure" }}</th>
             <td>{{ sensitivearea.structure }}</td>
         </tr>
-        {% if sensitivearea.species.category == 2 %}
+        {% if sensitivearea.species.category == 1 %}
             <tr>
-                <th>{{ sensitivearea.species|verbose:"name" }}</th>
-                <td>{{ sensitivearea.species.name }}</td>
-            </tr>
-        {% else %}
-            <tr>
-                <th>{{ sensitivearea|verbose:"species" }}</th>
-                <td>{{ sensitivearea.species }}</td>
+                <th>{{ sensitivearea|verbose:"area_name" }}</th>
+                <td>{{ sensitivearea.area_name }}</td>
             </tr>
         {% endif %}
+        <tr>
+            <th>{{ sensitivearea|verbose:"name" }}</th>
+            <td>{{ sensitivearea.name }}</td>
+        </tr>
         <tr>
             <th>{% trans "Period" %}</th>
             <td>{{ sensitivearea.species.pretty_period }}</td>

geotrek/sensitivity/tests/factories.py

@@ -59,6 +59,7 @@ class SensitiveAreaFactory(StructureRelatedDefaultFactory):
     class Meta:
         model = models.SensitiveArea
 
+    name = "Sensitive area"
     species = factory.SubFactory(SpeciesFactory)
     geom = 'POLYGON((700000 6600000, 700000 6600003, 700003 6600003, 700003 6600000, 700000 6600000))'
     published = True

geotrek/sensitivity/tests/test_views.py

@@ -70,7 +70,7 @@ def setUp(self):
     def test_species_name_shown_in_detail_page(self):
         url = reverse("sensitivity:sensitivearea_detail", kwargs={"pk": self.area.pk})
         response = self.client.get(url)
-        self.assertContains(response, self.area.species.name)
+        self.assertContains(response, self.area.name)
 
 
 class SensitiveAreaOpenAirViewsTest(TestCase):

geotrek/sensitivity/translation.py

@@ -16,7 +16,7 @@ class SpeciesTO(TranslationOptions):
 
 
 class SensitiveAreaTO(TranslationOptions):
-    fields = ('description', )
+    fields = ('name', 'description', )
 
 
 translator.register(Rule, RuleTO)

geotrek/sensitivity/views.py

@@ -26,8 +26,8 @@
 
 class SensitiveAreaList(CustomColumnsMixin, MapEntityList):
     queryset = SensitiveArea.objects.existing()
-    mandatory_columns = ['id', 'species']
-    default_extra_columns = ['category']
+    mandatory_columns = ['id', 'name']
+    default_extra_columns = ['species','category']
 
 
 class SensitiveAreaFilter(MapEntityFilter):