diff --git a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py index b1eda326..676bd613 100644 --- a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py +++ b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py @@ -249,6 +249,20 @@ class DataLoader: asset_list["Postcode"].astype(str).str.lower().str.strip() ) asset_list["matching_postcode"] = asset_list["Postcode"].astype(str).str.lower().str.strip() + elif ha_name == "HA18": + asset_list["matching_address"] = ( + asset_list["Address"].astype(str).str.lower().str.strip() + ", " + + asset_list["Post Code"].astype(str).str.lower().str.strip() + ) + asset_list["matching_postcode"] = asset_list["Post Code"].astype(str).str.lower().str.strip() + elif ha_name == "HA19": + asset_list["matching_address"] = ( + asset_list["Address1"].astype(str).str.lower().str.strip() + ", " + + asset_list["Address2"].astype(str).str.lower().str.strip() + ", " + + asset_list["Address3"].astype(str).str.lower().str.strip() + ", " + + asset_list["Postcode"].astype(str).str.lower().str.strip() + ) + asset_list["matching_postcode"] = asset_list["Postcode"].astype(str).str.lower().str.strip() elif ha_name == "HA25": asset_list["matching_address"] = asset_list[ self.COLUMN_CONFIG[ha_name]["address"] @@ -495,6 +509,8 @@ class DataLoader: return "CIGA checks" elif "CIGA check" in workbook.sheetnames: return "CIGA check" + elif "CIGA Check" in workbook.sheetnames: + return "CIGA Check" elif "CIGA requested" in workbook.sheetnames: return "CIGA requested" else: @@ -1733,6 +1749,10 @@ class DataLoader: return survey_list + @staticmethod + def correct_ha18_survey_list(survey_list): + return survey_list + @staticmethod def correct_ha35_survey_list(survey_list): return survey_list @@ -2435,6 +2455,7 @@ class DataLoader: "eco4 (subject to ciga)": "eco4 (subject to ciga)", "eco4(subject to ciga)": "eco4 (subject to ciga)", "eco4 subject to ciga": "eco4 (subject to ciga)", + "eco4 (subject to archetype/ciga)": "eco4 (subject to ciga) (subject to archetype)", } ha_facts_and_figures = [] @@ -4933,14 +4954,15 @@ def app(): # Add in: priority_has = [ - "HA1", "HA2", "HA6", "HA7", "HA12", "HA13", "HA14", "HA15", "HA16", "HA24", "HA25", "HA28", "HA32", + "HA1", "HA2", "HA6", "HA7", "HA12", "HA13", "HA14", "HA15", "HA16", "HA18", + "HA19", "HA24", "HA25", "HA28", "HA32", # "HA34", "HA35", "HA39", "HA41", "HA48", "HA50", "HA56", "HA63", "HA107", "HA117" ] # Next HAs to do: 14 [DONE], 15[DONE], 32 [DONE], 33 [Input format is 4 parts and no eco4 jobs identified - come # back on this], 28 [DONE], 41 [DONE], 50 [DONE], 48 [DONE], 2 [DONE], 63 [DONE], 12 [DONE], 117 [DONE], 13 [DONE], - # 35 [DONE] - # 56 [WIP] + # 35 [DONE], 56 [DONE], 19 [DONE] + # # Consider for ECO4: # Consider for GBIS: # 34 [bug in the results so leaving out for the moment]