From a5d68f3988e3d76565f849a2edc8354a3509b5fe Mon Sep 17 00:00:00 2001
From: navry <michal@navry.cz>
Date: Tue, 5 Aug 2025 13:07:26 +0200
Subject: [PATCH] opraven sorting

---
 body_easy_exported.xlsx | Bin 5127 -> 5128 bytes
 excel_labels.py         |   2 +-
 test.py                 |  14 +++++++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/body_easy_exported.xlsx b/body_easy_exported.xlsx
index 542c575ce8aec66127dcb70ce2562cbe5e33d252..7858e05b9020e7ac1b7bdd209c5384bdec74c6d8 100644
GIT binary patch
delta 532
zcmZqI=+NK^@MdNaVPIh3VCYDl$a9dhBb7B;bhq5o*AuVF)gSabY{1hNpZaQV>8;#`
zMLOaF>Jui+V0k2Fc`xkZmcXPd@7{WzzSj8QnBhPB`fZ}EaY^DYG)v|&T^A8=&c3B_
zF@F>D=IIQA{7-yzgf1>CxXzkxVS89^&%yG|>ML4yFuCWfNn~DZ@O`tPwWjVlum6Ix
zJQD<0D7x#qYjg|g=>*pod_3Q#IrF6AHRG$_YcJ}n>*a<Vdj0tD=PfmH+b8;VPsvOT
zOj0-;d*QL`KMNDCeWF)0zlArxQSzNo^JUA)b0<%K`j%Hc|D{*R>zF%FlJ@Gh#;i@L
z{A;$W?n`{jy3JqL{cHcIbAhYw@9cjp$icuGJu_yGvH%;y=8ueKY)l=gn>9J+GlA$+
zT-6|YvODi{5Z8b&h7rW=<9`g|77O@*xd#Pp5WzT^O~?$S#!g6v@$TekAtex}9>|fK
zJV!{~78Kl<SU<W2F)=W>b1^XR0;2*38W{HjMJjUii%TkVQj7H}a&rQ_8JR?wVevId
zSccJNvaGNa$V^KhM|E<Tu$%(OOyk#&cdZ2)^qY}^K?-IdkZxdX=AS%|UuN<KVIGjK
SeL!6qlWz;Fv276qDFXnL^2Le(

delta 541
zcmeCsXxHEg@MdNaVPIh3U=Z+`$a9cWz=t*ZbY|zDR}-(v)%*G%HsERdf9gv0>n#@<
zTx0bV{1g-oIgjXi?a^KIGa%{8yZe`?tz|ygoBYSFE=PN9pHq8_zov^%is5>;>pyi$
z?uf82(qPzRw;*_@6sLXL?g?`ieVqACU}{}>bxYeu?E;Te8bJn}r*}wnPrmfRRnk7l
zoV$nZ&4q=_c}hbMx2o3r=>5NGpw4ZXvOA#mez@)YorQ~~;^gJ$J%8%`+E{b_#tCaL
zI;n?<Oq!$Db$ns=!|08+Xa8v}i0l<+kyXy?D*kjR|NXY_tvL~!^=|r}ycS)iTcK=G
zKRd?$m%fvD&)u8#66cw29$H^Nc|LL|utv{}nWHSg#=x-oGovXRlYq}=Espt2Ao?^{
zHHe<<!TTJ<HROw71abTMAA`6h0zP2wAwe5NFivI{G6Six7m{JTGdV^`3B+jta%3mZ
z6;iha1@|S^k8VLs3=HmE3=F)$sDOb6#(hAMiX8polFFRaV!evooB(e|CJ|;>d`)H)
zmSMD>EGH}lGSmvlQJEYrET;f6)cEz|U2B0R{bpofkb;>Aq#GEU_$SZjm*GP*YClkS
O`s6#pYHXVYLCOKES+q$2

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)