From c61c01da9a54b29824c27219e05513964cadb97f Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Tue, 27 Jan 2026 10:33:10 +0000 Subject: [PATCH 1/6] save --- etl/month_end_automation_wave_3_layout.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/etl/month_end_automation_wave_3_layout.py b/etl/month_end_automation_wave_3_layout.py index 27006d6..0ab5533 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" From eeae0ed3f6ce8d3516f3453d4bad6a15d5f3f359 Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Tue, 27 Jan 2026 13:48:56 +0000 Subject: [PATCH 2/6] final one? --- etl/month_end_automation_wave_accent_housing.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/etl/month_end_automation_wave_accent_housing.py b/etl/month_end_automation_wave_accent_housing.py index 42f02ba..28100d7 100644 --- a/etl/month_end_automation_wave_accent_housing.py +++ b/etl/month_end_automation_wave_accent_housing.py @@ -21,10 +21,10 @@ rate_card_data_2502_accent_housing = { "First half of MTP", "Second half of MTP", "full cost mtp", "Design Archetype Complex", "Design Archetype Simple", "Design Repetitive Complex", "Design Repetitive Simple", "Design Revision", "design type not specified", "Coordination Stage 2", "POST EPC", "POST EPR", "POST ATT", "post EPC NO SHOW", "RE", - "Lodgement" + "Lodgement", "RA" ], "rate": [ - 150, 130, 280, junte, junte, junte, junte, junte, "please ask andreas", junte, junte, junte, junte, junte, junte, junte + 150, 130, 280, 650, 415, 225, 195, 195, "please ask andreas", 175, 150, 60, 125, 45, 60, 255, 259 ] } # ToDO @@ -83,6 +83,10 @@ def get_df(df, column_name, success_critera, job_name=None): return _ +# RA +ra = get_df(df, "ra invoicing status", ["to invoice"], "RA") +if not ra.empty: + filtered_dfs.append(ra) modeling = get_df(df, "mtp invoicing status", ["modelling to invoice"], "First half of mtp") From e12b2aa3cee80967f554b7a7e6059a5ee2d3be59 Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Tue, 27 Jan 2026 14:48:15 +0000 Subject: [PATCH 3/6] typhaine will fix later --- etl/month_end_automation_wave_3_layout.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/etl/month_end_automation_wave_3_layout.py b/etl/month_end_automation_wave_3_layout.py index 0ab5533..25bd623 100644 --- a/etl/month_end_automation_wave_3_layout.py +++ b/etl/month_end_automation_wave_3_layout.py @@ -28,13 +28,14 @@ class BoardID(Enum): board_ids = [ "9349630181", # WCHG Walkups-Operations + "18232420839", # Powys County Council: "8830772914", # "L&Q London" - "9601691730", # Cardo Wales & West - Wave 3 - "9660895490", # Northumberland County SHDF Wave 3 "9641491000", # Watford Warm Homes + "9601691730", # Cardo Wales & West - Wave 3 + + "9660895490", # Northumberland County SHDF Wave 3 "9671463094", # Seddon "9929454382", # NCHA SHDF Wave 3 Main Operation Board - "18232420839", # Powys County Council: "18380751311", # Devon County Council ] @@ -344,10 +345,18 @@ for board, all_records in board_to_record.items(): if not design.empty: filtered_dfs.append(design) - # Lodgement - lodg1 = get_df(df, "lodgement invoicing status", ["to invoice"], "Lodgement") - if not lodg1.empty: - filtered_dfs.append(lodg1) + ignore = [ + "9349630181", # WCHG Walkups-Operations + "18232420839", # Powys County Council: + "8830772914", # "L&Q London" + "9641491000", # Watford Warm Homes + "9601691730", + ] + if board not in ignore: + # 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, "evaluation invoicing status", ["to invoice"], "retrofit evaluation") From ef21ff56fb8f300cccbd39fd9bf301ef19a9cd48 Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Tue, 27 Jan 2026 15:11:29 +0000 Subject: [PATCH 4/6] month end ignore some --- etl/month_end_automation_wave_3_layout.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/etl/month_end_automation_wave_3_layout.py b/etl/month_end_automation_wave_3_layout.py index 25bd623..bf25fc1 100644 --- a/etl/month_end_automation_wave_3_layout.py +++ b/etl/month_end_automation_wave_3_layout.py @@ -27,11 +27,16 @@ class BoardID(Enum): board_ids = [ + # Ignore these for hubspot + "9349630181", # WCHG Walkups-Operations "18232420839", # Powys County Council: "8830772914", # "L&Q London" - "9641491000", # Watford Warm Homes "9601691730", # Cardo Wales & West - Wave 3 + + "9641491000", # Watford Warm Homes ( Will add to hubspot) + + # Added to hubspot "9660895490", # Northumberland County SHDF Wave 3 "9671463094", # Seddon From 80b6008b131829db58fd741579485a92298d3755 Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Tue, 27 Jan 2026 15:27:50 +0000 Subject: [PATCH 5/6] month end ignore some --- etl/month_end_automation_wave_3_layout.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etl/month_end_automation_wave_3_layout.py b/etl/month_end_automation_wave_3_layout.py index bf25fc1..0f37c77 100644 --- a/etl/month_end_automation_wave_3_layout.py +++ b/etl/month_end_automation_wave_3_layout.py @@ -364,9 +364,10 @@ for board, all_records in board_to_record.items(): filtered_dfs.append(lodg1) # Retrofit Evaluation - re = get_df(df, "evaluation invoicing status", ["to invoice"], "retrofit evaluation") - if not re.empty: - filtered_dfs.append(re) + if board not in ignore: + 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 invoicing status", ["epc to invoice"], "POST EPC") From 6f5223682c926ee962f6e56e4a340d1cb4a20541 Mon Sep 17 00:00:00 2001 From: Jun-te Kim Date: Tue, 27 Jan 2026 16:17:32 +0000 Subject: [PATCH 6/6] re run --- etl/month_end_automation_wave_3_layout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etl/month_end_automation_wave_3_layout.py b/etl/month_end_automation_wave_3_layout.py index 0f37c77..1a1d9cf 100644 --- a/etl/month_end_automation_wave_3_layout.py +++ b/etl/month_end_automation_wave_3_layout.py @@ -33,13 +33,12 @@ board_ids = [ "18232420839", # Powys County Council: "8830772914", # "L&Q London" "9601691730", # Cardo Wales & West - Wave 3 - + "9671463094", # Seddon "9641491000", # Watford Warm Homes ( Will add to hubspot) # Added to hubspot "9660895490", # Northumberland County SHDF Wave 3 - "9671463094", # Seddon "9929454382", # NCHA SHDF Wave 3 Main Operation Board "18380751311", # Devon County Council ] @@ -356,6 +355,7 @@ for board, all_records in board_to_record.items(): "8830772914", # "L&Q London" "9641491000", # Watford Warm Homes "9601691730", + "9671463094", # Seddon ] if board not in ignore: # Lodgement