Merge pull request #69 from naturalsolutions/fix/bug_river_basin_name

fix bugs river basin names
PnX-SI · Jul 1, 2024 · 3e027e5 · 3e027e5
2 parents 88593e6 + d8659cc
commit 3e027e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/backend/gn_module_zh/model/cards.py b/backend/gn_module_zh/model/cards.py
@@ -499,7 +499,7 @@ def __str__(self):
     def __get_river_basins(self):
         return [
             name
-            for name in DB.session.execute(
+            for (name,) in DB.session.execute(
                 select(TRiverBasin.name).where(
                     TRiverBasin.id_rb == CorZhRb.id_rb, CorZhRb.id_zh == self.id_zh
                 )

diff --git a/backend/gn_module_zh/model/zh_schema.py b/backend/gn_module_zh/model/zh_schema.py
@@ -306,7 +306,7 @@ def delims(self):
     def bassin_versant(self):
         bassin_versant = [
             name
-            for name in DB.session.execute(
+            for name in DB.session.scalars(
                 select(TRiverBasin.name).where(
                     TRiverBasin.id_rb == CorZhRb.id_rb, CorZhRb.id_zh == self.id_zh
                 )

diff --git a/frontend/app/zh-details/hierarchy/hierarchy.component.html b/frontend/app/zh-details/hierarchy/hierarchy.component.html
@@ -1,4 +1,4 @@
-<h4 class="tabsSubtitle">Bassin versant : {{ hierarchy.rb_name }}</h4>
+<h4 class="tabsSubtitle">Bassin versant : {{ data.river_basin_name }}</h4>
 <zh-table
   [tableCols]="hierarchy.hierTableCols"
   [data]="hierarchy.items"