From a4026ebc4f2df91d61cf5c70f2a95f59c705ec93 Mon Sep 17 00:00:00 2001 From: Benoit Frisque Date: Thu, 24 Oct 2024 15:58:12 +0200 Subject: [PATCH] updated data module path --- Dashboards/dashboard.py | 10 +++------- Dashboards/my_data/computed_datasets.py | 2 +- Dashboards/my_data/model.py | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Dashboards/dashboard.py b/Dashboards/dashboard.py index 4f432a5..df6b9a5 100644 --- a/Dashboards/dashboard.py +++ b/Dashboards/dashboard.py @@ -226,10 +226,6 @@ def update_dashboard2(species_id_selected, relayoutData): species_poleo = TRANSLATIONS_EN_FR.get(species_poleo, species_poleo) species_thallus = TRANSLATIONS_EN_FR.get(species_thallus, species_thallus) - # Pluralize the thallus - if not species_thallus.endswith("x") or species_thallus.endswith("s"): - species_thallus += "s" - return fig_map, hist4_species, species_name, species_img_path, species_acid, species_eutro, species_poleo, species_thallus, species_rarity @@ -472,19 +468,19 @@ def histogram_card(title, tooltip_text, graph_id, height="330px"): ), dmc.Text( children=[ - "Ce lichen fait partie de la famille des ", + "Ce lichen ", dmc.Text( id="species-thallus", c="blue", style={"display": "inline"}, ), - " et est classé comme ", + " est ", dmc.Text( id="species-rarity", c="blue", style={"display": "inline"}, ), - ".", + " en milieu urbain.", ], mt="sm", c="dimmed", diff --git a/Dashboards/my_data/computed_datasets.py b/Dashboards/my_data/computed_datasets.py index d6f93f2..a554375 100644 --- a/Dashboards/my_data/computed_datasets.py +++ b/Dashboards/my_data/computed_datasets.py @@ -128,7 +128,7 @@ def count_species_per_observation(lichen_df, observation_df): return observation_with_species_count_df -# Group by species' type and count them (but only count there presence in the table, not the frequency in each observation) +# Group by species' type and count them (but only count their presence in the table, not the frequency in each observation) def count_lichen_per_species(lichen_df, lichen_species_df): # Group by species' type and count them diff --git a/Dashboards/my_data/model.py b/Dashboards/my_data/model.py index bcbe330..5bba3d0 100644 --- a/Dashboards/my_data/model.py +++ b/Dashboards/my_data/model.py @@ -1,6 +1,6 @@ from sqlalchemy import Column, BigInteger, Integer, String, ForeignKey, ARRAY, Boolean, Date, Text, Float from sqlalchemy.orm import declarative_base, relationship -from my_data.db_connect import engine +from Dashboards.my_data.db_connect import engine Base = declarative_base() @@ -103,7 +103,7 @@ class LichenEcology(Base): # Vue pour les fréquences class LichenFrequency(Base): __tablename__ = 'lichen_frequency' - __table_args__ = {'autoload_with': engine} + __table_args__ = {'autoload_with': engine} id = Column(BigInteger, primary_key=True, autoincrement=True) id_site = Column(BigInteger) @@ -112,5 +112,3 @@ class LichenFrequency(Base): freq = Column(Integer) eutrophication = Column(String(255)) poleotolerance = Column(String(255)) - - \ No newline at end of file