junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-30 13:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix facts and figures bug for ha51

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-03-18 13:21:57 +00:00
parent e6c9dd7074
commit 92193d773d
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
etl/eligibility/ha_15_32/ha_analysis_batch_3.py
View file

@ -3305,11 +3305,18 @@ class DataLoader:
) )
else: else:
# We have some examples, e.g. HA28, where we do not have the installed or cancelled column # We have some examples, e.g. HA28, where we do not have the installed or cancelled column
survey_list["installation_status"] = np.where( if 'INSTALL/ CANCELLATION DATE' in survey_list.columns:
survey_list['INSTALL/ CANCELLATION DATE'].str.lower().str.contains("cancelled"), survey_list["installation_status"] = np.where(
"cancelled", survey_list['INSTALL/ CANCELLATION DATE'].str.lower().str.contains("cancelled"),
"installed", "cancelled",
) "installed",
)
else:
survey_list["installation_status"] = np.where(
survey_list['INSTALL / CANCELLATION DATE'].str.lower().str.contains("cancelled"),
"cancelled",
"installed",
)
# Finally, for other cases, we set the status to "in progress" # Finally, for other cases, we set the status to "in progress"
survey_list["installation_status"] = survey_list["installation_status"].fillna("in progress") survey_list["installation_status"] = survey_list["installation_status"].fillna("in progress")
@ -5800,6 +5807,8 @@ def fml_data_pull(loader):
"HA50", "HA24", "HA15", "HA32", "HA28", "HA6", "HA1", "HA107", "HA41", "HA48", "HA2", "HA63", "HA12", "HA50", "HA24", "HA15", "HA32", "HA28", "HA6", "HA1", "HA107", "HA41", "HA48", "HA2", "HA63", "HA12",
"HA117", "HA35", "HA34", "HA56", "HA19", "HA18", "HA9", "HA27", "HA30", "HA31", "HA54", "HA49", "HA117", "HA35", "HA34", "HA56", "HA19", "HA18", "HA9", "HA27", "HA30", "HA31", "HA54", "HA49",
'HA8', 'HA11', 'HA21', 'HA37', 'HA42', 'HA8', 'HA11', 'HA21', 'HA37', 'HA42',
# NEW - add property type
'HA44', 'HA45', 'HA51', 'HA52'
] ]
# Can't pull from EPC database because it's based in Scotland # Can't pull from EPC database because it's based in Scotland