Floke/Brancheneinstufung2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync_manager.py aktualisiert

Browse Source
This commit is contained in:
Floke
2025-08-28 09:33:19 +00:00
parent 10f7965d4c
commit 2c0ad1d0c2
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sync_manager.py
View File

@@ -140,10 +140,13 @@ class SyncManager:
if existing_ids: if existing_ids:
d365_indexed = self.d365_df.set_index('CRM ID') d365_indexed = self.d365_df.set_index('CRM ID')
gsheet_indexed = self.gsheet_df.set_index('CRM ID')
# --- FINALE KORREKTUR DER ITERATIONS-LOGIK ---
# Wir filtern das GSheet-DataFrame, behalten aber den ursprünglichen numerischen Index
gsheet_updates_df = self.gsheet_df[self.gsheet_df['CRM ID'].isin(existing_ids)]
for row_idx, gsheet_row in gsheet_indexed.iterrows(): for original_row_index, gsheet_row in gsheet_updates_df.iterrows():
crm_id = gsheet_row.name crm_id = gsheet_row['CRM ID']
if crm_id not in d365_indexed.index: continue if crm_id not in d365_indexed.index: continue
d365_row = d365_indexed.loc[crm_id] d365_row = d365_indexed.loc[crm_id]
@@ -153,25 +156,20 @@ class SyncManager:
d365_val = str(d365_row[gsheet_col]) d365_val = str(d365_row[gsheet_col])
gsheet_val = str(gsheet_row[gsheet_col]) gsheet_val = str(gsheet_row[gsheet_col])
# --- NEUE SPEZIAL-LOGIK FÜR LÄNDER ---
is_different = False is_different = False
if gsheet_col == 'CRM Land': 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) translated_d365_val = Config.COUNTRY_CODE_MAP.get(d365_val.lower(), d365_val)
if translated_d365_val.lower() != gsheet_val.lower(): if translated_d365_val.lower() != gsheet_val.lower():
is_different = True is_different = True
else: else:
# Standard-Vergleich für alle anderen Spalten
if d365_val != gsheet_val: if d365_val != gsheet_val:
is_different = True is_different = True
# --- ENDE DER SPEZIAL-LOGIK ---
if is_different: if is_different:
row_updates[gsheet_col] = d365_val row_updates[gsheet_col] = d365_val
needs_reeval = True needs_reeval = True
self.logger.debug(f"ReEval für {crm_id} durch '{gsheet_col}': D365='{d365_val}' | GSheet='{gsheet_val}'") 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: for gsheet_col in self.smart_merge_cols:
d365_val = str(d365_row.get(gsheet_col, '')) d365_val = str(d365_row.get(gsheet_col, ''))
gsheet_val = str(gsheet_row.get(gsheet_col, '')) gsheet_val = str(gsheet_row.get(gsheet_col, ''))
@@ -187,7 +185,8 @@ class SyncManager:
if needs_reeval: row_updates["ReEval Flag"] = "x" if needs_reeval: row_updates["ReEval Flag"] = "x"
if row_updates: if row_updates:
sheet_row_number = row_idx + self.sheet_handler._header_rows + 1 # Hier ist 'original_row_index' jetzt die korrekte Integer-Zeilennummer
sheet_row_number = original_row_index + self.sheet_handler._header_rows + 1
for col_name, value in row_updates.items(): for col_name, value in row_updates.items():
updates_to_batch.append({ "range": f"{COLUMN_MAP[col_name]['Titel']}{sheet_row_number}", "values": [[value]] }) updates_to_batch.append({ "range": f"{COLUMN_MAP[col_name]['Titel']}{sheet_row_number}", "values": [[value]] })