diff --git a/body_easy_exported.xlsx b/body_easy_exported.xlsx index 542c575..7858e05 100644 Binary files a/body_easy_exported.xlsx and b/body_easy_exported.xlsx differ diff --git a/excel_labels.py b/excel_labels.py index 2dc5a39..ed6c803 100644 --- a/excel_labels.py +++ b/excel_labels.py @@ -1,7 +1,7 @@ import pandas as pd -df = pd.read_excel('body_easy.xlsx', sheet_name='List1') +df = pd.read_excel('body_easy.xlsx', sheet_name='List1', dtype={'Název': str, 'x': float, 'y': float}) df_deduplicated = df.drop_duplicates(subset=['Název'], keep='first') diff --git a/test.py b/test.py index a98a30e..8e1138f 100644 --- a/test.py +++ b/test.py @@ -39,13 +39,21 @@ def upload_file(): file_name = request.form['excel_output_file'] - df = pd.read_excel(file, sheet_name='List1') + df = pd.read_excel(file, sheet_name='List1', index_col=False, names=['Název', 'x', 'y'], dtype={'Název': str, 'x': str, 'y': str}) + df['x'] = df['x'].str.replace(',', '.') + df['y'] = df['y'].str.replace(',', '.') + df['x'] = df['x'].str.strip() + df['y'] = df['y'].str.strip() + + df['x'] = pd.to_numeric(df['x'], errors='coerce') + df['y'] = pd.to_numeric(df['y'], errors='coerce') + print(df) df_deduplicated = df.drop_duplicates(subset=['Název'], keep='first') - df_final = pd.concat([df, df_deduplicated]).sort_values(by=['x', 'y'], ascending=request.form.get('select')== '1') - df_final = df_final['Název'].reset_index(drop=True) + df_final = pd.concat([df, df_deduplicated]).sort_values(by=['x', 'y'], ascending=request.form.get('select')== '0') + df_final = df_final['Název'] df_final.to_excel(file_data, sheet_name='List1', index=False, header=False)