diff --git a/.github/workflows/months_end.yml b/.github/workflows/months_end.yml index 5c833de..850034e 100644 --- a/.github/workflows/months_end.yml +++ b/.github/workflows/months_end.yml @@ -6,6 +6,7 @@ on: - cron: '0 7 23 * *' # On the 23th of every month at 07:00 UTC - cron: '0 7 25 * *' # On the 25th of every month at 07:00 UTC - cron: '0 7 26 * *' # On the 26th of every month at 07:00 UTC + - cron: '0 7 27 * *' # On the 26th of every month at 07:00 UTC - cron: '0 7 29 * *' # On the 29th of every month at 07:00 UTC - cron: '0 7 19 * *' # On the 29th of every month at 07:00 UTC workflow_dispatch: diff --git a/etl/month_end_automation_wave_3_layout.py b/etl/month_end_automation_wave_3_layout.py index 133a634..27006d6 100644 --- a/etl/month_end_automation_wave_3_layout.py +++ b/etl/month_end_automation_wave_3_layout.py @@ -27,15 +27,15 @@ class BoardID(Enum): board_ids = [ - "9349630181", # WCHG Walkups-Operations - "8830772914", # "L&Q London" - "9601691730", # Cardo Wales & West - Wave 3 - "9660895490", # Northumberland County SHDF Wave 3 - "9641491000", # Watford Warm Homes - "9671463094", # Seddon + # "9349630181", # WCHG Walkups-Operations + # "8830772914", # "L&Q London" + # "9601691730", # Cardo Wales & West - Wave 3 + # "9660895490", # Northumberland County SHDF Wave 3 + # "9641491000", # Watford Warm Homes + # "9671463094", # Seddon "9929454382", # NCHA SHDF Wave 3 Main Operation Board - "18232420839", # Powys County Council: - "18380751311", # Devon County Council + # "18232420839", # Powys County Council: + # "18380751311", # Devon County Council ] empty = "Rate card info missing" @@ -345,22 +345,22 @@ for board, all_records in board_to_record.items(): filtered_dfs.append(design) # Lodgement - lodg1 = get_df(df, "TM Phase 1", ["measures lodged"], "Lodgement") + lodg1 = get_df(df, "lodgement invoicing status", ["to invoice"], "Lodgement") if not lodg1.empty: filtered_dfs.append(lodg1) # Retrofit Evaluation - re = get_df(df, "Retrofit Evaluation Status", ["uploaded"], "retrofit evaluation") + re = get_df(df, "evaluation invoicing status", ["to invoice"], "retrofit evaluation") if not re.empty: filtered_dfs.append(re) # POST EPC - post_epc = get_df(df, "Post EPC/EPR Status", ["epc uploaded"], "POST EPC") + post_epc = get_df(df, "Post EPC invoicing status", ["epc to invoice"], "POST EPC") if not post_epc.empty: filtered_dfs.append(post_epc) # POST EPR - post_epr = get_df(df, "Post EPC/EPR Status", ["epr uploaded"], "POST EPR") + post_epr = get_df(df, "Post EPR invoicing status", ["epr to invoice"], "POST EPR") if not post_epr.empty: filtered_dfs.append(post_epr) diff --git a/etl/month_end_automation_wave_accent_housing.py b/etl/month_end_automation_wave_accent_housing.py index c3e97e4..42f02ba 100644 --- a/etl/month_end_automation_wave_accent_housing.py +++ b/etl/month_end_automation_wave_accent_housing.py @@ -148,21 +148,21 @@ if not rc.empty: filtered_dfs.append(rc) # Retrofit Evaluation -re = get_df(df, "Retrofit Evaluation Status", ["uploaded"], "re") +re = get_df(df, "Retrofit Evaluation Status", ["to invoice"], "re") if not re.empty: filtered_dfs.append(re) # POST EPC -post_epc = get_df(df, "Post EPC/EPR Status", ["epc uploaded"], "POST EPC") +post_epc = get_df(df, "Post EPC invoicing status", ["epc to invoice"], "POST EPC") if not post_epc.empty: filtered_dfs.append(post_epc) # POST EPR -post_epr = get_df(df, "POST EPC/EPR Status", ["epr uploaded"], "POST EPR") +post_epr = get_df(df, "Post EPR invoicing status", ["epr to invoice"], "POST EPR") if not post_epr.empty: filtered_dfs.append(post_epr) -lodg1 = get_df(df, "TM Phase 1", ["measures lodged"], "Lodgement") +lodg1 = get_df(df, "lodgement invoicing status", ["to invoice"], "Lodgement") if not lodg1.empty: filtered_dfs.append(lodg1)