Tobi-ewl commited on
Commit
00fb30d
·
verified ·
1 Parent(s): 2eb3f2e

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +8 -3
app.py CHANGED
@@ -613,7 +613,7 @@ elif modus == "Upload csv-Datei":
613
  if do_calc:
614
  try:
615
  df_out = df_input.copy()
616
- df_out["Günstigste Alternative"] = None
617
  for sys in alle_heizsysteme:
618
  df_out[sys] = None
619
  annuitaeten_gesamt = []
@@ -672,8 +672,8 @@ elif modus == "Upload csv-Datei":
672
  df["Annuität"] = df["Annuität_NK"] + df["Annuität_NV"] + df["Annuität_NB"] + df["Annuität_NS"]
673
 
674
  ann_dict = dict(zip(df["Name"], df["Annuität"]))
675
- günstigstes_sys = min(ann_dict.items(), key=lambda x: x[1])[0] if ann_dict else ""
676
- df_out.at[idx, "Günstigste Alternative"] = günstigstes_sys
677
  for sys in alle_heizsysteme:
678
  wert = ann_dict.get(sys, None)
679
  df_out.at[idx, sys] = wert
@@ -698,7 +698,12 @@ elif modus == "Upload csv-Datei":
698
  "Wasser-Wasser Wärmepumpe": "Wasser-Wasser Waermepumpe",
699
  }
700
 
 
 
 
 
701
  df_out = df_out.rename(columns = heizsystem_namensmap)
 
702
  heizsysteme_mapped = [heizsystem_namensmap.get(s, s) for s in alle_heizsysteme]
703
  def format_eur(x):
704
  try:
 
613
  if do_calc:
614
  try:
615
  df_out = df_input.copy()
616
+ df_out["Guenstigste Alternative"] = None
617
  for sys in alle_heizsysteme:
618
  df_out[sys] = None
619
  annuitaeten_gesamt = []
 
672
  df["Annuität"] = df["Annuität_NK"] + df["Annuität_NV"] + df["Annuität_NB"] + df["Annuität_NS"]
673
 
674
  ann_dict = dict(zip(df["Name"], df["Annuität"]))
675
+ guenstigstes_sys = min(ann_dict.items(), key=lambda x: x[1])[0] if ann_dict else ""
676
+ df_out.at[idx, "Guenstigste Alternative"] = guenstigstes_sys
677
  for sys in alle_heizsysteme:
678
  wert = ann_dict.get(sys, None)
679
  df_out.at[idx, sys] = wert
 
698
  "Wasser-Wasser Wärmepumpe": "Wasser-Wasser Waermepumpe",
699
  }
700
 
701
+ csv_spalten = [f"Annuitaet {heizsystem_namensmap.get(hs, hs)}" for hs in alle_heizsysteme_roh]
702
+ csv_map = {heizsystem_namensmap.get(hs, hs): spalte for hs, spalte in zip(alle_heizsysteme_roh, csv_spalten)}
703
+ df_out = df_out.rename(columns=csv_map)
704
+
705
  df_out = df_out.rename(columns = heizsystem_namensmap)
706
+ df_out["Guenstigste Alternative"] = df_out["Guenstigste Alternative"].replace(heizsystem_namensmap)
707
  heizsysteme_mapped = [heizsystem_namensmap.get(s, s) for s in alle_heizsysteme]
708
  def format_eur(x):
709
  try: