Commit 4d197387 authored by Loïc Chapron's avatar Loïc Chapron

Patch error pages

parent c10c6adc
...@@ -32,7 +32,6 @@ name = "RIS To GarganText" ...@@ -32,7 +32,6 @@ name = "RIS To GarganText"
path = "pages/GarganText_Json_To_TSV.py" path = "pages/GarganText_Json_To_TSV.py"
name = "GarganText Json To TSV" name = "GarganText Json To TSV"
[[pages]] [[pages]]
name = "PDF Convert" name = "PDF Convert"
icon = ":twisted_rightwards_arrows:" icon = ":twisted_rightwards_arrows:"
......
...@@ -12,7 +12,7 @@ import src.basic as tmp ...@@ -12,7 +12,7 @@ import src.basic as tmp
tmp.base("MergeTermGarganText") tmp.base("MergeTermGarganText")
def tmp(file1, file2): def fuzeFile(file1, file2):
ngrams1 = file1['NgramsTerms']['data'] ngrams1 = file1['NgramsTerms']['data']
ngrams2 = file2['NgramsTerms']['data'] ngrams2 = file2['NgramsTerms']['data']
...@@ -64,8 +64,7 @@ def tmp(file1, file2): ...@@ -64,8 +64,7 @@ def tmp(file1, file2):
file1['Institutes']['data'] = {} file1['Institutes']['data'] = {}
file1['Sources']['data'] = {} file1['Sources']['data'] = {}
tmp = file1.to_json(orient='columns', indent=4) return file1.to_json(orient='columns', indent=4)
return tmp
st.write(st.session_state.general_text_dict['text']) st.write(st.session_state.general_text_dict['text'])
...@@ -85,7 +84,7 @@ if (file1 and file2): ...@@ -85,7 +84,7 @@ if (file1 and file2):
time = datetime.strftime(datetime.now(), "%d-%m-%Y/%H:%M:%S") time = datetime.strftime(datetime.now(), "%d-%m-%Y/%H:%M:%S")
name = 'output-' + time + '.json' name = 'output-' + time + '.json'
st.download_button( st.download_button(
st.session_state.general_text_dict['new_file'], tmp(df1, df2), name) st.session_state.general_text_dict['new_file'], fuzeFile(df1, df2), name)
except Exception as e: except Exception as e:
st.write("Error : one of the file isn't valid") st.write("Error : one of the file isn't valid")
......
...@@ -16,8 +16,6 @@ def base(page): ...@@ -16,8 +16,6 @@ def base(page):
}} }}
</style> </style>
''', unsafe_allow_html=True) ''', unsafe_allow_html=True)
show_pages_from_config()
add_indentation()
# Load Banner image # Load Banner image
st.image('img/gargantool_banner.jpg') st.image('img/gargantool_banner.jpg')
...@@ -55,15 +53,19 @@ def base(page): ...@@ -55,15 +53,19 @@ def base(page):
st.session_state.general_text_dict = load_bundle('fr') st.session_state.general_text_dict = load_bundle('fr')
st.session_state.general_language = 'fr' st.session_state.general_language = 'fr'
st.session_state.general_session_page = page st.session_state.general_session_page = page
show_pages_from_config()
elif st.session_state.general_session_page != page: elif st.session_state.general_session_page != page:
st.session_state.general_text_dict = load_bundle(st.session_state.general_language) st.session_state.general_text_dict = load_bundle(st.session_state.general_language)
st.session_state.general_session_page = page st.session_state.general_session_page = page
show_pages_from_config()
# Delete every key who aren't fron this file # Delete every key who aren't fron this file
for key in st.session_state.keys(): for key in st.session_state.keys():
if 'general_' not in key: if 'general_' not in key:
del st.session_state[key] del st.session_state[key]
add_indentation()
# select the lang # select the lang
coltitle,col = st.columns([4,1]) coltitle,col = st.columns([4,1])
with coltitle: with coltitle:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment