release(2.15.1) : minor fixes

.gitignore

@@ -155,4 +155,5 @@ install_all/install_all.log
 /docs/CHANGELOG.html
 
 /contrib/*/frontend/node_modules
-Makefile.local
+Makefile.local
+geonature.local.env

VERSION

@@ -1 +1 @@
-2.15.0
+2.15.1

backend/geonature/core/gn_meta/models/datasets.py

@@ -139,6 +139,27 @@ def user_actors(self):
     def organism_actors(self):
         return [actor.organism for actor in self.cor_dataset_actor if actor.organism is not None]
 
+    @hybrid_property
+    def obs_count(self):
+        from geonature.core.gn_synthese.models import Synthese
+
+        return db.session.scalar(
+            select(func.count(Synthese.id_synthese))
+            .select_from(Synthese)
+            .where(Synthese.id_dataset == self.id_dataset)
+        )
+
+    @hybrid_property
+    def hab_count(self):
+        from gn_module_occhab.models import OccurenceHabitat, Station
+
+        return db.session.scalar(
+            select(func.count(OccurenceHabitat.id_habitat))
+            .select_from(OccurenceHabitat)
+            .where(Station.id_station == OccurenceHabitat.id_station)
+            .where(Station.id_dataset == self.id_dataset)
+        )
+
     def is_deletable(self):
         return not DB.session.execute(self.synthese_records.exists().select()).scalar()
 

backend/geonature/core/gn_meta/schemas.py

@@ -67,6 +67,8 @@ class Meta:
     cor_territories = MA.Nested(NomenclatureSchema, many=True, unknown=EXCLUDE)
     acquisition_framework = MA.Nested("AcquisitionFrameworkSchema", dump_only=True)
     sources = MA.Nested(SourceSchema, many=True, dump_only=True)
+    obs_count = fields.Int(dump_only=True)
+    hab_count = fields.Int(dump_only=True)
 
     @post_dump(pass_many=False, pass_original=True)
     def module_input(self, item, original, many, **kwargs):

backend/geonature/core/imports/admin.py

@@ -14,7 +14,7 @@
 
 from pypnnomenclature.models import TNomenclatures
 
-from geonature.core.imports.models import FieldMapping, ContentMapping
+from geonature.core.imports.models import Destination, FieldMapping, ContentMapping
 
 from flask_admin.contrib.sqla.form import AdminModelConverter
 from flask_admin.model.form import converts
@@ -25,51 +25,43 @@ class MappingView(CruvedProtectedMixin, ModelView):
     object_code = "MAPPING"
 
     can_view_details = True
-    column_list = (
-        "label",
-        "active",
-        "public",
-    )
+    column_list = ("label", "active", "public", "destination")
     column_searchable_list = ("label",)
     column_filters = (
         "active",
         "public",
     )
-    form_columns = (
-        "label",
-        "active",
-        "public",
-        "owners",
-        "values",
-    )
-    column_details_list = (
-        "label",
-        "active",
-        "public",
-        "owners",
-        "values",
-    )
+    form_columns = ("label", "active", "public", "owners", "values", "destination")
+    column_details_list = ("label", "active", "public", "owners", "values", "destination")
     column_labels = {
         "active": "Actif",
         "owners": "Propriétaires",
         "values": "Correspondances",
+        "destination": "Destinations",
     }
+    column_formatters = {"destination": lambda v, c, m, p: m.destination.label}
     column_export_list = (
         "label",
         "values",
     )
 
 
 def FieldMappingValuesValidator(form, field):
+    destination = db.session.execute(
+        db.select(Destination).where(Destination.id_destination == form.destination.raw_data[0])
+    ).scalar_one_or_none()
     try:
-        FieldMapping.validate_values(field.data)
+        FieldMapping.validate_values(field.data, destination)
     except ValueError as e:
         raise StopValidation(*e.args)
 
 
 def ContentMappingValuesValidator(form, field):
+    destination = db.session.execute(
+        db.select(Destination).where(Destination.id_destination == form.destination.raw_data[0])
+    ).scalar_one_or_none()
     try:
-        ContentMapping.validate_values(field.data)
+        ContentMapping.validate_values(field.data, destination)
     except ValueError as e:
         raise StopValidation(*e.args)
 

backend/geonature/core/imports/models.py

@@ -219,6 +219,9 @@ def has_instance_permission(self, user: Optional[User] = None, action_code: str
         ]
         return max_scope > 0
 
+    def __repr__(self):
+        return self.label
+
 
 @serializable
 class BibThemes(db.Model):
@@ -520,7 +523,7 @@ class MappingTemplate(db.Model):
     __table_args__ = {"schema": "gn_imports"}
 
     id = db.Column(db.Integer, primary_key=True)
-    id_destination = db.Column(db.Integer, ForeignKey(Destination.id_destination))
+    id_destination = db.Column(db.Integer, ForeignKey(Destination.id_destination), nullable=False)
     destination = relationship(Destination)
     label = db.Column(db.Unicode(255), nullable=False)
     type = db.Column(db.Unicode(10), nullable=False)
@@ -667,7 +670,7 @@ class FieldMapping(MappingTemplate):
     }
 
     @staticmethod
-    def validate_values(field_mapping_json):
+    def validate_values(field_mapping_json, destination=None):
         """
         Validate the field mapping values returned by the client form.
 
@@ -689,8 +692,13 @@ def validate_values(field_mapping_json):
             "optional_conditions",
             "mandatory_conditions",
         ]
+        (g.destination if (destination is None) else destination)
         entities_for_destination: List[Entity] = (
-            Entity.query.filter_by(destination=g.destination).order_by(sa.desc(Entity.order)).all()
+            Entity.query.filter_by(
+                destination=(g.destination if (destination is None) else destination)
+            )
+            .order_by(sa.desc(Entity.order))
+            .all()
         )
         fields = []
         for entity in entities_for_destination:
@@ -717,7 +725,9 @@ def validate_values(field_mapping_json):
                         entity,
                         columns=bib_fields_col,
                         optional_where_clause=sa.and_(
-                            BibFields.destination == g.destination, BibFields.display == True
+                            BibFields.destination
+                            == (g.destination if (destination is None) else destination),
+                            BibFields.display == True,
                         ),
                     )
                 )
@@ -771,10 +781,11 @@ class ContentMapping(MappingTemplate):
     }
 
     @staticmethod
-    def validate_values(values):
+    def validate_values(values, destination=None):
         nomenclature_fields = (
             BibFields.query.filter(
-                BibFields.destination == g.destination, BibFields.nomenclature_type != None
+                BibFields.destination == (g.destination if (destination is None) else destination),
+                BibFields.nomenclature_type != None,
             )
             .options(
                 joinedload(BibFields.nomenclature_type).joinedload(

backend/geonature/core/imports/schemas.py

@@ -4,6 +4,7 @@
 from utils_flask_sqla.schema import SmartRelationshipsMixin
 
 from geonature.core.imports.models import Destination, FieldMapping, MappingTemplate
+from pypnusershub.schemas import UserSchema
 from geonature.core.gn_commons.schemas import ModuleSchema
 from marshmallow import fields
 
@@ -27,3 +28,4 @@ class Meta:
 
     cruved = fields.Dict()
     values = fields.Dict()
+    owners = fields.List(fields.Nested(UserSchema(only=["identifiant"])))

backend/geonature/templates/acquisition_framework_template_pdf.html

@@ -187,7 +187,7 @@
                     <p class="info-titre">Territoires concernés</p>
                     <p class="info-contenu">
                         {% if data['id_nomenclature_territorial_level']: %}
-                        Etendue territoriale : {{ data['id_nomenclature_territorial_level'] }}
+                        Étendue territoriale : {{ data['nomenclature_territorial_level']['label_fr'] }}
                         {% endif %}
                         <!-- <br>
                         Territoires : ??
@@ -212,15 +212,14 @@
                 {% endif %}
 
 
-
+                {% if data['target_description']: %}
                 <div class="information">
                     <p class="info-titre">Cible taxonomique</p>
                     <p class="info-contenu">
-                        {% if data['target_description']: %}
                         {{ data['target_description'] }}
-                        {% endif %}
                     </p>
                 </div>
+                {% endif %}
 
                 {% if data.cor_af_actor: %}
                 <div class="information">
@@ -273,7 +272,7 @@
                 </div>
                 {% endif %}
 
-                {% if data.t_datasets: %}
+                {% if data.datasets: %}
                 <div class="jdd">
                     <hr
                         class="ligne-jeux-donnees ligne"
@@ -283,8 +282,8 @@
                         id="ligne-jeux-donnees-defaut"
                         {% endif %}
                     >
-                    <p class="liste-jdd">Liste des jeux de données associés au cadre</p>
-                    {% for dataset in data.t_datasets -%}
+                    <p class="liste-jdd">Liste des jeux de données associés</p>
+                    {% for dataset in data.datasets -%}
                     <div class="jdd-details">
                         <img
                             class="logo-jdd"
@@ -299,6 +298,14 @@
                             {% if dataset['dataset_name']: %}
                             {{ dataset['dataset_name'] }}
                             {% endif %}
+                            <br>
+                            {% if dataset['obs_count'] > 0: %}
+                            Nombre d'observations dans la Synthèse : {{ dataset['obs_count'] }}
+                            {% endif %}
+                            <br>
+                            {% if dataset['hab_count'] > 0: %}
+                            Nombre d'habitats dans occhab : {{ dataset['hab_count'] }}
+                            {% endif %}
                         </p>
                     </div>
                     {%- endfor %}

backend/geonature/tests/imports/jsonschema_definitions.py

@@ -307,6 +307,9 @@
             "values": {
                 "type": ["null", "object"],
             },
+            "owners": {
+                "type": ["null", "array"],
+            },
         },
         "minProperties": 7,
         "additionalProperties": False,

backend/geonature/tests/test_gn_meta.py

@@ -508,6 +508,19 @@ def test_get_export_pdf_acquisition_frameworks(self, users, acquisition_framewor
 
         assert response.status_code == 200
 
+    def test_get_export_pdf_acquisition_frameworks_with_data(
+        self, users, acquisition_frameworks, datasets
+    ):
+        af_id = acquisition_frameworks["af_1"].id_acquisition_framework
+
+        set_logged_user(self.client, users["user"])
+
+        response = self.client.post(
+            url_for("gn_meta.get_export_pdf_acquisition_frameworks", id_acquisition_framework=af_id)
+        )
+
+        assert response.status_code == 200
+
     def test_get_export_pdf_acquisition_frameworks_unauthorized(self, acquisition_frameworks):
         af_id = acquisition_frameworks["own_af"].id_acquisition_framework