deactivate fonction
This commit is contained in:
parent
8461cd7202
commit
7962574136
@ -32,6 +32,7 @@ def _get_typ_milieux(ids=None, nom=None):
|
|||||||
def _get_typo_sdage(ids=None, nom=None):
|
def _get_typo_sdage(ids=None, nom=None):
|
||||||
table = 'typo_sdage'
|
table = 'typo_sdage'
|
||||||
df = _get_table(con, schema, table, ids=ids, nom=nom)
|
df = _get_table(con, schema, table, ids=ids, nom=nom)
|
||||||
|
df['libelle'] = df['id'] + ' - ' + df['nom']
|
||||||
return df
|
return df
|
||||||
|
|
||||||
def _get_typ_site(ids=None, nom=None):
|
def _get_typ_site(ids=None, nom=None):
|
||||||
@ -78,7 +79,7 @@ def get_sitesInfos(ids=None, nom=None, columns=None, with_nameOrga=False, detail
|
|||||||
if 'id_typo_sdage' in df.columns:
|
if 'id_typo_sdage' in df.columns:
|
||||||
df = merge(df, typo_sdage, how='left', left_on='id_typo_sdage', right_on='id', suffixes=('','_y') ) \
|
df = merge(df, typo_sdage, how='left', left_on='id_typo_sdage', right_on='id', suffixes=('','_y') ) \
|
||||||
.drop(columns=['id_typo_sdage', 'id_y']) \
|
.drop(columns=['id_typo_sdage', 'id_y']) \
|
||||||
.rename(columns={'nom_y': 'typo_sdage', 'description': 'desc_typo_sdage'})
|
.rename(columns={'nom_y': 'typo_sdage', 'description': 'desc_typo_sdage','libelle':'lib_typo_sdage'})
|
||||||
drop += ['desc_typo_sdage']
|
drop += ['desc_typo_sdage']
|
||||||
# merge type_milieu
|
# merge type_milieu
|
||||||
if 'id_type_milieu' in df.columns:
|
if 'id_type_milieu' in df.columns:
|
||||||
@ -133,10 +134,10 @@ def get_sitesGeom(id_site=None, nom_site=None, columns=None, last_update=False,
|
|||||||
|
|
||||||
return df
|
return df
|
||||||
|
|
||||||
def new_site(df):
|
# def new_site(df):
|
||||||
from ..tools.sites import tab_sites
|
# from ..tools.sites import tab_sites
|
||||||
final_col = [col['name'] for col in columns_sitetab]
|
# final_col = [col['name'] for col in columns_sitetab]
|
||||||
aut = df['auteur']
|
# aut = df['auteur']
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user