From 382f37531cb9150947496a163541c804037e5077 Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Fri, 5 Sep 2025 16:46:59 +0100 Subject: [PATCH] finsih review with typhain --- etl/month_end_automation_wave_2_no_12.py | 7 ++----- etl/month_end_automation_wave_2_no_7.py | 5 +---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/etl/month_end_automation_wave_2_no_12.py b/etl/month_end_automation_wave_2_no_12.py index 54469d9..aa7bd7e 100644 --- a/etl/month_end_automation_wave_2_no_12.py +++ b/etl/month_end_automation_wave_2_no_12.py @@ -119,10 +119,7 @@ filtered_dfs.append(v2) # filtered_dfs.append(v3) # Coordination stage 2 Please complete -cors2 = df[ - df["rc stage 2 invoice"].str.lower().isin(["to invoice"]) -].copy() -cors2["job_type"] = "Coordination Stage 2" +cors2 = get_df(df, "rc stage 2 invoice", ["to invoice"], "Coordination Stage 2") filtered_dfs.append(cors2) # Design stage 1 @@ -163,7 +160,7 @@ post_epr["job_type"] = "POST epr" filtered_dfs.append(post_epr) # Post ATT -post_att = get_df(df, "post-att", ["uploaded", "completed", "to invoice"], "POST ATT") +post_att = get_df(df, "post-att", ["uploaded", "completed", "to invoice", "uploaded to client"], "POST ATT") filtered_dfs.append(post_att) # Retrofit Evaluation diff --git a/etl/month_end_automation_wave_2_no_7.py b/etl/month_end_automation_wave_2_no_7.py index 3c4b6ef..5cdf8f0 100644 --- a/etl/month_end_automation_wave_2_no_7.py +++ b/etl/month_end_automation_wave_2_no_7.py @@ -153,10 +153,7 @@ v3 = get_df(df, "v3 rc status", ["rc completed"], "Coordination Stage 1 v3 remod filtered_dfs.append(v3) # Coordination stage 2 Please complete -cors2 = df[ - df["rc stage 2"].str.lower().isin(["to invoice"]) -] -cors2["job_type"] = "Coordination Stage 2" +cors2 = get_df(df, "rc stage 2",["to invoice"], "Coordination Stage 2") filtered_dfs.append(cors2) # Design stage Archetype