mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-07-12 13:29:04 +00:00
ha27 complete
This commit is contained in:
parent
5b39cf138d
commit
efbda5cece
1 changed files with 9 additions and 3 deletions
|
|
@ -280,6 +280,12 @@ class DataLoader:
|
||||||
asset_list["matching_postcode"] = asset_list['matching_address'].apply(
|
asset_list["matching_postcode"] = asset_list['matching_address'].apply(
|
||||||
lambda x: ' '.join(x.split()[-2:]) if pd.notnull(x) else x
|
lambda x: ' '.join(x.split()[-2:]) if pd.notnull(x) else x
|
||||||
)
|
)
|
||||||
|
elif ha_name == "HA27":
|
||||||
|
asset_list["matching_address"] = (
|
||||||
|
asset_list[" Address"].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 == "HA28":
|
elif ha_name == "HA28":
|
||||||
asset_list["matching_address"] = (
|
asset_list["matching_address"] = (
|
||||||
asset_list["House Number"].astype(str).str.lower().str.strip() + ", " +
|
asset_list["House Number"].astype(str).str.lower().str.strip() + ", " +
|
||||||
|
|
@ -582,7 +588,7 @@ class DataLoader:
|
||||||
# For HA1 and HA25, there is an exception in the structure of the data. We don't have any survey or ciga
|
# For HA1 and HA25, there is an exception in the structure of the data. We don't have any survey or ciga
|
||||||
# lists, and so
|
# lists, and so
|
||||||
# we can return the asset list now
|
# we can return the asset list now
|
||||||
if ha_name in ["HA1"]:
|
if ha_name in ["HA1", "HA27"]:
|
||||||
return asset_list, pd.DataFrame(), pd.DataFrame(), pd.DataFrame()
|
return asset_list, pd.DataFrame(), pd.DataFrame(), pd.DataFrame()
|
||||||
|
|
||||||
# If we have ECO3 surveys, we need to match them, because any properties treated under ECO3 won't be
|
# If we have ECO3 surveys, we need to match them, because any properties treated under ECO3 won't be
|
||||||
|
|
@ -4966,13 +4972,13 @@ def app():
|
||||||
# Add in:
|
# Add in:
|
||||||
priority_has = [
|
priority_has = [
|
||||||
"HA1", "HA2", "HA6", "HA7", "HA9", "HA12", "HA13", "HA14", "HA15", "HA16", "HA18",
|
"HA1", "HA2", "HA6", "HA7", "HA9", "HA12", "HA13", "HA14", "HA15", "HA16", "HA18",
|
||||||
"HA19", "HA24", "HA25", "HA28", "HA32",
|
"HA19", "HA24", "HA25", "HA27", "HA28", "HA32",
|
||||||
# "HA34",
|
# "HA34",
|
||||||
"HA35", "HA39", "HA41", "HA48", "HA50", "HA56", "HA63", "HA107", "HA117"
|
"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
|
# 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],
|
# back on this], 28 [DONE], 41 [DONE], 50 [DONE], 48 [DONE], 2 [DONE], 63 [DONE], 12 [DONE], 117 [DONE], 13 [DONE],
|
||||||
# 35 [DONE], 56 [DONE], 19 [DONE]
|
# 35 [DONE], 56 [DONE], 19 [DONE], 18 [DONE], 9 [DONE], 27 DONE
|
||||||
#
|
#
|
||||||
# Consider for ECO4:
|
# Consider for ECO4:
|
||||||
# Consider for GBIS:
|
# Consider for GBIS:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue