Post rebase

PnX-SI · Jul 29, 2024 · f541bb0 · f541bb0
1 parent 56c7f09
commit f541bb0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/backend/gn_module_monitoring/config/generic/site.json b/backend/gn_module_monitoring/config/generic/site.json
@@ -110,10 +110,8 @@
       "definition": "Permet de n'avoir que les types de site lié au module"
     },
     "id_sites_group": {
-      "type_widget": "integer",
-      "attribut_label": "ID Sites Groups",
       "hidden": true,
-      "schema_dot_table": "gn_monitoring.t_base_sites"
+      "required": false
     }
   }
 }
diff --git a/backend/gn_module_monitoring/config/utils.py b/backend/gn_module_monitoring/config/utils.py
@@ -27,6 +27,7 @@
     "application": "GeoNature",
 }
 
+
 def monitoring_module_config_path(module_code):
     return SUB_MODULE_CONFIG_DIR / module_code
 

diff --git a/backend/gn_module_monitoring/monitoring/models.py b/backend/gn_module_monitoring/monitoring/models.py
@@ -285,12 +285,7 @@ class TMonitoringSites(TBaseSites, PermissionModel, SitesQuery):
         .scalar_subquery()
     )
 
-    geom_geojson = column_property(
-        select(func.st_asgeojson(TBaseSites.geom))
-        .where(TBaseSites.id_base_site == id_base_site)
-        .correlate_except(TBaseSites)
-        .scalar_subquery()
-    )
+    geom_geojson = column_property(func.ST_AsGeoJSON(TBaseSites.geom), deferred=True)
     types_site = DB.relationship("BibTypeSite", secondary=cor_site_type, overlaps="sites")
 
     @hybrid_property
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ @@
         "application": "GeoNature",
     }
     def monitoring_module_config_path(module_code):
         return SUB_MODULE_CONFIG_DIR / module_code
@@ Expand Down @@