diff --git a/etl/month_end_automation_wave_3_layout.py b/etl/month_end_automation_wave_3_layout.py index 6a9e754..61476f6 100644 --- a/etl/month_end_automation_wave_3_layout.py +++ b/etl/month_end_automation_wave_3_layout.py @@ -22,6 +22,8 @@ class BoardID(Enum): _9641491000 = "WATFORD_WARM_HOMES" _9671463094 = "SEDDON" _9929454382 = "NCHA SHDF Wave 3 Main Operation Board" + _18232420839 = "Powys County Council" + _18380751311 = "Devon County Council" board_ids = [ @@ -32,6 +34,8 @@ board_ids = [ "9641491000", # Watford Warm Homes "9671463094", # Seddon "9929454382", # NCHA SHDF Wave 3 Main Operation Board + "18232420839", # Powys County Council: + "18380751311", # Devon County Council ] empty = "Rate card info missing" @@ -39,6 +43,39 @@ empty = "Rate card info missing" rate_cards = {} check_with_andres = "Check with Andres!!!" +rate_card_data_powys = { + "job_type": [ + "RA", "ATT", "Coordination Stage 1 v1", "Coordination Stage 1 v2 remodel", "Coordination Stage 1 v3 remodel", + "Design Archetype Complex", "Design Archetype Simple", "Design Repetitive Simple", "Design Repetitive Complex", "Coordination Stage 2", "Lodgement phase 1", "Full lodgement phase 2", + "Post EPR", "Post EPC", "Post ATT", "retrofit evaluation", + "RA no show", "ATT no show", "post EPC no show", "Full cost MTP", "measure modelling", "design type not specified" + ], + "rate": [ + 259, 125,280, 125, 125, + 650, check_with_andres, check_with_andres, 225, 175, + 95, 60, empty, empty, 95, + 60, 40, 40, 40, empty, empty, check_with_andres + ] +} +rate_cards.update({"18232420839": pd.DataFrame(rate_card_data_powys)}) + +rate_card_data_devon = { + "job_type": [ + "RA", "ATT", "Coordination Stage 1 v1", "Coordination Stage 1 v2 remodel", "Coordination Stage 1 v3 remodel", + "Design Archetype Complex", "Design Archetype Simple", "Design Repetitive Simple", "Design Repetitive Complex", "Coordination Stage 2", "Lodgement phase 1", "Full lodgement phase 2", + "Post EPR", "Post EPC", "Post ATT", "retrofit evaluation", + "RA no show", "ATT no show", "post EPC no show", "Full cost MTP", "measure modelling", "design type not specified" + ], + "rate": [ + empty, empty,empty, empty, empty, + empty, empty, empty, empty, empty, + empty, empty, empty, empty, empty, + empty, empty, empty, empty, empty, empty, check_with_andres + ] +} +rate_cards.update({"18380751311": pd.DataFrame(rate_card_data_devon)}) + + rate_card_data_watford_warm_homes = { "job_type": [ "RA", "ATT", "Coordination Stage 1 v1", "Coordination Stage 1 v2 remodel", "Coordination Stage 1 v3 remodel", @@ -308,10 +345,10 @@ for board, all_records in board_to_record.items(): # Lodgement Phase 1 lodg1 = get_df(df, "lodgement phase 1 invoicing status", ["to invoice"], "Lodgement Phase 1") if not lodg1.empty: - filtered_dfs(lodg1) + filtered_dfs.append(lodg1) # Full Lodgement Phase - lodg2 = get_df(df, "full lodgement invoicing status", ["to invoice"], "Full lodgement phase 2") + lodg2 = get_df(df, "lodgement phase 2 invoicing status", ["to invoice"], "Full lodgement phase 2") if not lodg2.empty: filtered_dfs.append(lodg2)