From 124e8a054a9bb86fc7e892f0fa8aedb3e7d3488d Mon Sep 17 00:00:00 2001 From: Floke Date: Thu, 28 Aug 2025 09:22:55 +0000 Subject: [PATCH] sync_manager.py aktualisiert --- sync_manager.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/sync_manager.py b/sync_manager.py index 2d1b4938..d5a57eb7 100644 --- a/sync_manager.py +++ b/sync_manager.py @@ -138,15 +138,12 @@ class SyncManager: new_row_data[col_idx] = row[gsheet_col] rows_to_append.append(new_row_data) - # 'deleted_ids' Block bleibt leer - if existing_ids: - # Wir arbeiten direkt mit dem GSheet DataFrame, um den korrekten Index zu behalten - gsheet_updates = self.gsheet_df[self.gsheet_df['CRM ID'].isin(existing_ids)] d365_indexed = self.d365_df.set_index('CRM ID') + gsheet_indexed = self.gsheet_df.set_index('CRM ID') - for row_idx, gsheet_row in gsheet_updates.iterrows(): - crm_id = gsheet_row['CRM ID'] + for row_idx, gsheet_row in gsheet_indexed.iterrows(): + crm_id = gsheet_row.name if crm_id not in d365_indexed.index: continue d365_row = d365_indexed.loc[crm_id] @@ -155,11 +152,26 @@ class SyncManager: for gsheet_col in self.d365_wins_cols: d365_val = str(d365_row[gsheet_col]) gsheet_val = str(gsheet_row[gsheet_col]) - if d365_val != gsheet_val: + + # --- NEUE SPEZIAL-LOGIK FÜR LÄNDER --- + is_different = False + if gsheet_col == 'CRM Land': + # Vergleiche den übersetzten Wert, nicht den Code + translated_d365_val = Config.COUNTRY_CODE_MAP.get(d365_val.lower(), d365_val) + if translated_d365_val.lower() != gsheet_val.lower(): + is_different = True + else: + # Standard-Vergleich für alle anderen Spalten + if d365_val != gsheet_val: + is_different = True + # --- ENDE DER SPEZIAL-LOGIK --- + + if is_different: row_updates[gsheet_col] = d365_val needs_reeval = True self.logger.debug(f"ReEval für {crm_id} durch '{gsheet_col}': D365='{d365_val}' | GSheet='{gsheet_val}'") + # (Rest der Funktion bleibt unverändert) for gsheet_col in self.smart_merge_cols: d365_val = str(d365_row.get(gsheet_col, '')) gsheet_val = str(gsheet_row.get(gsheet_col, '')) @@ -175,8 +187,6 @@ class SyncManager: if needs_reeval: row_updates["ReEval Flag"] = "x" if row_updates: - # KORREKTUR: Wir nutzen 'row_idx' direkt, das ist der Original-Index aus dem DataFrame - # Und addieren die Anzahl der Header-Zeilen + 1 (weil 1-basiert) sheet_row_number = row_idx + self.sheet_handler._header_rows + 1 for col_name, value in row_updates.items(): updates_to_batch.append({ "range": f"{COLUMN_MAP[col_name]['Titel']}{sheet_row_number}", "values": [[value]] })