mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-06-30 13:10:47 +00:00
HA54 done
This commit is contained in:
parent
e15b977930
commit
41c17aa1da
1 changed files with 19 additions and 3 deletions
|
|
@ -168,9 +168,17 @@ class DataLoader:
|
||||||
"address": "A_Address",
|
"address": "A_Address",
|
||||||
"postcode": "A_Postcode"
|
"postcode": "A_Postcode"
|
||||||
},
|
},
|
||||||
|
"HA31": {
|
||||||
|
"address": "A_Address",
|
||||||
|
"postcode": "matching_postcode"
|
||||||
|
},
|
||||||
"HA48": {
|
"HA48": {
|
||||||
"address": "Full Address",
|
"address": "Full Address",
|
||||||
"postcode": "Postcode"
|
"postcode": "Postcode"
|
||||||
|
},
|
||||||
|
"HA54": {
|
||||||
|
"address": "Postal Address",
|
||||||
|
"postcode": "matching_postcode"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -211,7 +219,7 @@ class DataLoader:
|
||||||
|
|
||||||
def create_asset_list_matching_address(self, ha_name, asset_list):
|
def create_asset_list_matching_address(self, ha_name, asset_list):
|
||||||
|
|
||||||
if ha_name in ["HA1", "HA6", "HA12", "HA16", "HA24", "HA30", "HA48"]:
|
if ha_name in ["HA1", "HA6", "HA12", "HA16", "HA24", "HA30", "HA31", "HA48", "HA54"]:
|
||||||
asset_list["matching_address"] = asset_list[
|
asset_list["matching_address"] = asset_list[
|
||||||
self.COLUMN_CONFIG[ha_name]["address"]
|
self.COLUMN_CONFIG[ha_name]["address"]
|
||||||
].astype(str).str.lower().str.strip()
|
].astype(str).str.lower().str.strip()
|
||||||
|
|
@ -559,6 +567,12 @@ class DataLoader:
|
||||||
if ha_name == "HA25":
|
if ha_name == "HA25":
|
||||||
asset_sheet_colnames[11] = "matching_postcode"
|
asset_sheet_colnames[11] = "matching_postcode"
|
||||||
|
|
||||||
|
if ha_name == "HA31":
|
||||||
|
asset_sheet_colnames[2] = "matching_postcode"
|
||||||
|
|
||||||
|
if ha_name == "HA54":
|
||||||
|
asset_sheet_colnames[10] = "matching_postcode"
|
||||||
|
|
||||||
rows_data = []
|
rows_data = []
|
||||||
|
|
||||||
for row in asset_sheet.iter_rows(min_row=2, values_only=False):
|
for row in asset_sheet.iter_rows(min_row=2, values_only=False):
|
||||||
|
|
@ -2568,6 +2582,7 @@ class DataLoader:
|
||||||
"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)",
|
"eco4 (subject to archetype/ciga)": "eco4 (subject to ciga) (subject to archetype)",
|
||||||
"eco4( subject to ciga/archetype)": "eco4 (subject to ciga) (subject to archetype)",
|
"eco4( subject to ciga/archetype)": "eco4 (subject to ciga) (subject to archetype)",
|
||||||
|
"eco4 (subject to ciga/ archetype)": "eco4 (subject to ciga) (subject to archetype)"
|
||||||
}
|
}
|
||||||
|
|
||||||
ha_facts_and_figures = []
|
ha_facts_and_figures = []
|
||||||
|
|
@ -5065,11 +5080,12 @@ def app():
|
||||||
# Add in:
|
# Add in:
|
||||||
priority_has = [
|
priority_has = [
|
||||||
"HA1", "HA2", "HA6", "HA7", "HA9", "HA12", "HA13", "HA14", "HA15", "HA16", "HA18", "HA19", "HA24", "HA25",
|
"HA1", "HA2", "HA6", "HA7", "HA9", "HA12", "HA13", "HA14", "HA15", "HA16", "HA18", "HA19", "HA24", "HA25",
|
||||||
"HA27", "HA28", "HA30", "HA32", "HA34", "HA35", "HA39", "HA41", "HA48", "HA50", "HA56", "HA63", "HA107", "HA117"
|
"HA27", "HA28", "HA30", "HA31", "HA32", "HA34", "HA35", "HA39", "HA41", "HA48", "HA50", "HA54", "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], 18 [DONE], 9 [DONE], 27 [DONE], 34 [DONE], 30 [DONE]
|
# 35 [DONE], 56 [DONE], 19 [DONE], 18 [DONE], 9 [DONE], 27 [DONE], 34 [DONE], 30 [DONE], 31 [DONE], 54 [DONE]
|
||||||
#
|
#
|
||||||
# Consider for ECO4:
|
# Consider for ECO4:
|
||||||
# Consider for GBIS:
|
# Consider for GBIS:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue