Update app.py

app.py

@@ -698,12 +698,18 @@ elif modus == "Upload csv-Datei":
                         "Wasser-Wasser Wärmepumpe": "Wasser-Wasser Waermepumpe",
                     }
 
-                    csv_spalten = [f"Annuitaet {heizsystem_namensmap.get(hs, hs)}" for hs in alle_heizsysteme]
-                    csv_map = {heizsystem_namensmap.get(hs, hs): spalte for hs, spalte in zip(alle_heizsysteme, csv_spalten)}
-                    df_out = df_out.rename(columns = heizsystem_namensmap)
+                    
+                    # Klarnamen-Liste aus Mapping generieren
+                    heizsysteme_klar = [heizsystem_namensmap.get(hs, hs) for hs in alle_heizsysteme]
+                    spalten_anni = [f"Annuitaet {name}" for name in heizsysteme_klar]
+                    csv_map = {name: spalte for name, spalte in zip(heizsysteme_klar, spalten_anni)}
+                    
+                    # Schritt 1: Spalten korrekt umbenennen
+                    df_out = df_out.rename(columns=heizsystem_namensmap)
                     df_out = df_out.rename(columns=csv_map)
                     df_out["Guenstigste Alternative"] = df_out["Guenstigste Alternative"].replace(heizsystem_namensmap)
-                    heizsysteme_mapped = [heizsystem_namensmap.get(s, s) for s in alle_heizsysteme]
+                    
+                    # Schritt 2: Format-Wandlung nur auf Annuität-Spalten
                     def format_eur(x):
                         try:
                             if pd.isnull(x):
@@ -712,9 +718,27 @@ elif modus == "Upload csv-Datei":
                         except Exception:
                             return str(x)
                     
-                    for hs in heizsysteme_mapped:
-                        if hs in df_out.columns:
-                            df_out[hs] = df_out[hs].apply(format_eur)
+                    for spalte in spalten_anni:
+                        if spalte in df_out.columns:
+                            df_out[spalte] = df_out[spalte].apply(format_eur)
+                    
+                    # csv_spalten = [f"Annuitaet {heizsystem_namensmap.get(hs, hs)}" for hs in alle_heizsysteme]
+                    # csv_map = {heizsystem_namensmap.get(hs, hs): spalte for hs, spalte in zip(alle_heizsysteme, csv_spalten)}
+                    # df_out = df_out.rename(columns = heizsystem_namensmap)
+                    # df_out = df_out.rename(columns=csv_map)
+                    # df_out["Guenstigste Alternative"] = df_out["Guenstigste Alternative"].replace(heizsystem_namensmap)
+                    # heizsysteme_mapped = [heizsystem_namensmap.get(s, s) for s in alle_heizsysteme]
+                    # def format_eur(x):
+                    #     try:
+                    #         if pd.isnull(x):
+                    #             return ""
+                    #         return "{:.2f}".format(float(x)).replace(".", ",")
+                    #     except Exception:
+                    #         return str(x)
+                    
+                    # for hs in heizsysteme_mapped:
+                    #     if hs in df_out.columns:
+                    #         df_out[hs] = df_out[hs].apply(format_eur)
                     # for col in hsystem_colnames:
                     #    df_out[col] = df_out[col].replace(heizsystem_namensmap)