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 bf91d8b6..85f8704d 100644 --- a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py +++ b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py @@ -37,6 +37,15 @@ class DataLoader: "green": "FF92D050", "purple": "FF7030A0", "red": "FFFF0000", "blue": "FF00B0F0" } }, + "ha_14": { + "asset_list": {"red": "FFFF0000", "green": "FF00B050"}, + }, + "ha_39": { + "asset_list": {"red": "FFFF0000", "green": "FF00B050"}, + }, + "ha_107": { + "asset_list": {"red": "FFFF0000", "green": "FF00B050"}, + } } def __init__(self, files, use_cache): @@ -368,6 +377,7 @@ class DataLoader: if file_config.get("survey_list"): logger.info("Loading survey list for {}".format(ha_name)) survey_list, matched_lookup = self.load_survey_list( + asset_list=asset_list, file_path=file_config["survey_list"]["filepath"], ha_name=ha_name, sheet_name=file_config["survey_list"]["sheetname"] @@ -419,9 +429,24 @@ def app(): "sheetname": "HA 6" } }, - "ha_14": {"asset_list": "etl/eligibility/ha_15_32/HA 14 - ASSET LIST.xlsx"}, - "ha_39": {"asset_list": "etl/eligibility/ha_15_32/HA 39 - ASSET LIST.xlsx"}, - "ha_107": {"asset_list": "etl/eligibility/ha_15_32/HA 107 - ASSET LIST.xlsx"} + "ha_14": { + "asset_list": { + "filepath": "etl/eligibility/ha_15_32/HA 14 - ASSET LIST.xlsx", + "sheetname": "HA 14" + } + }, + "ha_39": { + "asset_list": { + "filepath": "etl/eligibility/ha_15_32/HA 39 - ASSET LIST.xlsx", + "sheetname": "Sheet1" + } + }, + "ha_107": { + "asset_list": { + "filepath": "etl/eligibility/ha_15_32/HA 107 - ASSET LIST.xlsx", + "sheetname": "HA 107" + } + } } loader = DataLoader(files, use_cache)