diff --git a/.idea/Model.iml b/.idea/Model.iml index c6561970..09f2e496 100644 --- a/.idea/Model.iml +++ b/.idea/Model.iml @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 50cad4ca..fb10c6b0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - + diff --git a/asset_list/app.py b/asset_list/app.py index e431f723..1f0fe570 100644 --- a/asset_list/app.py +++ b/asset_list/app.py @@ -59,6 +59,40 @@ def app(): Property UPRN """ + # Dorrington + data_folder = "/Users/khalimconn-kowlessar/Documents/hestia/Customers/Dorrington" + data_filename = "Copy of Eco Funding.xlsx" + sheet_name = "Sheet1" + postcode_column = 'Postcode' + fulladdress_column = "Property Address" + address1_column = None + address1_method = "house_number_extraction" + address_cols_to_concat = [] + missing_postcodes_method = None + landlord_year_built = None + landlord_os_uprn = None + landlord_property_type = None + landlord_built_form = None + landlord_wall_construction = None + landlord_heating_system = None + landlord_existing_pv = None + landlord_property_id = "Row ID" + outcomes_filename = [] + outcomes_sheetname = [] + outcomes_postcode = [] + outcomes_houseno = [] + outcomes_address = [] + outcomes_id = [] + master_filepaths = [] + master_to_asset_list_filepath = None + asset_list_header = 0 + landlord_block_reference = None + master_id_colnames = [] + landlord_roof_construction = None + phase = False + landlord_sap = None + ecosurv_landlords = None + # CDS data_folder = "/Users/khalimconn-kowlessar/Documents/hestia/Customers/CDS" data_filename = "Founder Estates - Asset List.xlsx" diff --git a/backend/Property.py b/backend/Property.py index 22eb2fc3..a8fd925b 100644 --- a/backend/Property.py +++ b/backend/Property.py @@ -1360,4 +1360,4 @@ class Property: 'mechanical, supply and extract' ] - return self.data["mechanical-ventilation"] in ventilation_descriptions + return self.data.get("mechanical-ventilation") in ventilation_descriptions diff --git a/etl/find_my_epc/RetrieveFindMyEpc.py b/etl/find_my_epc/RetrieveFindMyEpc.py index 142d0cea..216a14de 100644 --- a/etl/find_my_epc/RetrieveFindMyEpc.py +++ b/etl/find_my_epc/RetrieveFindMyEpc.py @@ -678,6 +678,9 @@ class RetrieveFindMyEpc: "Internal wall insulation": ["internal_wall_insulation"], "High heat retention storage heaters and dual immersion cylinder and dual rate meter": [ "high_heat_retention_storage_heater" + ], + "High heat retention storage heaters and dual rate meter": [ + "high_heat_retention_storage_heater" ] }