Merge branch 'feat/monitoring_models' of github.com:PnX-SI/GeoNature …

…into feat/monitoring_models

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

@@ -121,14 +121,21 @@ def user_actors(self):
     def organism_actors(self):
         return [actor.organism for actor in self.cor_af_actor if actor.organism]
 
-    def is_deletable(self):
-        return not (
-            db.session.scalar(
-                exists()
-                .select_from()
-                .where(TDatasets.id_acquisition_framework == self.id_acquisition_framework)
-                .select()
+    def has_datasets(self):
+        return db.session.scalar(
+            exists(TDatasets)
+            .where(TDatasets.id_acquisition_framework == self.id_acquisition_framework)
+            .select()
+        )
+
+    def has_child_acquisition_framework(self):
+        return db.session.scalar(
+            exists(TAcquisitionFramework)
+            .where(
+                TAcquisitionFramework.acquisition_framework_parent_id
+                == self.id_acquisition_framework
             )
+            .select()
         )
 
     def has_instance_permission(self, scope, _through_ds=True):

backend/geonature/core/gn_meta/routes.py

@@ -1,5 +1,5 @@
 """
-    Routes for gn_meta 
+    Routes for gn_meta
 """
 
 import datetime as dt
@@ -772,11 +772,17 @@ def delete_acquisition_framework(scope, af_id):
         raise Forbidden(
             f"User {g.current_user} cannot delete acquisition framework {af.id_acquisition_framework}"
         )
-    if not af.is_deletable():
+    if af.has_datasets():
         raise Conflict(
-            "La suppression du cadre d’acquisition n'est pas possible "
+            "La suppression du cadre d’acquisition est impossible "
             "car celui-ci contient des jeux de données."
         )
+
+    if af.has_child_acquisition_framework():
+        raise Conflict(
+            "La suppression du cadre d’acquisition est impossible "
+            "car celui-ci est le parent d'autre(s) cadre(s) d'acquisition."
+        )
     db.session.delete(af)
     db.session.commit()
 

backend/geonature/core/gn_synthese/routes.py

@@ -957,11 +957,11 @@ def general_stats(permissions):
     return data
 
 
-@routes.route("/species_stats/<int:cd_ref>", methods=["GET"])
+@routes.route("/taxon_stats/<int:cd_ref>", methods=["GET"])
 @permissions.check_cruved_scope("R", get_scope=True, module_code="SYNTHESE")
 @json_resp
-def species_stats(scope, cd_ref):
-    """Return stats about distinct species."""
+def taxon_stats(scope, cd_ref):
+    """Return stats for a specific taxon"""
 
     area_type = request.args.get("area_type")
 

backend/geonature/core/gn_synthese/synthese_config.py

@@ -100,77 +100,3 @@
     {"prop": "dataset_name", "name": "JDD", "max_width": 200},
     {"prop": "observers", "name": "observateur", "max_width": 200},
 ]
-
-
-class DefaultProfile:
-    ENABLED = True
-    ## DEFAULT PROFILE INDICATORS
-    LIST_INDICATORS = [
-        {
-            "name": "observation(s) valide(s)",
-            "matIcon": "search",
-            "field": "count_valid_data",
-            "type": "number",
-        },
-        {
-            "name": "Première observation",
-            "matIcon": "schedule",
-            "field": "first_valid_data",
-            "type": "date",
-        },
-        {
-            "name": "Dernière observation",
-            "matIcon": "search",
-            "field": "last_valid_data",
-            "type": "date",
-        },
-        {
-            "name": "Plage d'altitude(s)",
-            "matIcon": "terrain",
-            "field": ["altitude_min", "altitude_max"],
-            "unit": "m",
-            "type": "number",
-        },
-    ]
-
-
-class DefaultGeographicOverview:
-    pass
-
-
-class DefaultSpeciesSheet:
-    ## DEFAULT SPECIES SHEET INDICATORS
-    LIST_INDICATORS = [
-        {
-            "name": "observation(s)",
-            "matIcon": "search",
-            "field": "observation_count",
-            "type": "number",
-        },
-        {
-            "name": "observateur(s)",
-            "matIcon": "people",
-            "field": "observer_count",
-            "type": "number",
-        },
-        {
-            "name": "commune(s)",
-            "matIcon": "location_on",
-            "field": "area_count",
-            "type": "number",
-        },
-        {
-            "name": "Plage d'altitude(s)",
-            "matIcon": "terrain",
-            "unit": "m",
-            "type": "number",
-            "field": ["altitude_min", "altitude_max"],
-        },
-        {
-            "name": "Plage d'observation(s)",
-            "matIcon": "date_range",
-            "type": "date",
-            "field": ["date_min", "date_max"],
-            "separator": "-",
-        },
-    ]

backend/geonature/core/sensitivity/routes.py

@@ -52,11 +52,10 @@ def info():
         q = (
             select(
                 SensitivityRule.source,
-                func.count(SensitivityRule.id)
-                .where(SensitivityRule.active == True)
-                .label("active_count"),
+                func.count(SensitivityRule.id).label("active_count"),
                 func.count(SensitivityRule.id).label("total_count"),
             )
+            .where(SensitivityRule.active == True)
             .group_by(SensitivityRule.source)
             .order_by(SensitivityRule.source)
         )
@@ -70,6 +69,8 @@ def info():
                 select(func.count("*"))
                 .select_from(SensitivityRule)
                 .distinct(SensitivityRule.cd_nom)
+                .group_by(SensitivityRule.cd_nom)
+                .order_by(SensitivityRule.cd_nom)
             )
         )
     )
@@ -80,13 +81,15 @@ def info():
                 .select_from(SensitivityRule)
                 .filter_by(active=True)
                 .distinct(SensitivityRule.cd_nom)
+                .group_by(SensitivityRule.cd_nom)
+                .order_by(SensitivityRule.cd_nom)
             )
         )
     )
     click.echo(
         "\tRègles actives extrapolées aux taxons enfants : {}".format(
             db.session.scalar(
-                func.count(func.distinct(SensitivityRuleCache.c.cd_nom)).label("count")
+                select(func.count(func.distinct(SensitivityRuleCache.c.cd_nom)).label("count"))
             )
         )
     )

backend/geonature/core/taxonomie/admin.py

@@ -15,7 +15,7 @@
 
 class CruvedProtectedBibListesView(CruvedProtectedMixin, BibListesView):
     module_code = "TAXHUB"
-    object_code = "LISTE"
+    object_code = "LISTES"
     extra_actions_perm = {".import_cd_nom_view": "C"}
 
 
@@ -31,12 +31,12 @@ class CruvedProtectedTMediasView(CruvedProtectedMixin, TMediasView):
 
 class CruvedProtectedBibAttributsView(CruvedProtectedMixin, BibAttributsView):
     module_code = "TAXHUB"
-    object_code = "ATTRIBUT"
+    object_code = "ATTRIBUTS"
 
 
 class CruvedProtectedBibThemes(CruvedProtectedMixin, BibThemesView):
     module_code = "TAXHUB"
-    object_code = "THEME"
+    object_code = "THEMES"
 
 
 def load_admin_views(app, admin):