diff --git a/backend/app/plan/router.py b/backend/app/plan/router.py index db0ff552..769b13f7 100644 --- a/backend/app/plan/router.py +++ b/backend/app/plan/router.py @@ -737,17 +737,6 @@ async def trigger_plan(body: PlanTriggerRequest): ] recommendations[property_id] = final_recommendations - # df = [] - # for rec in recommendations[list(recommendations.keys())[0]]: - # df.append( - # { - # "id": rec["recommendation_id"], - # "description": rec["description"], - # "sap": rec["sap_points"], - # } - # ) - # df = pd.DataFrame(df) - # 1) the property data # 2) the property details (epc) # 3) the recommendations diff --git a/etl/customers/newhaven/newhaven_study.py b/etl/customers/newhaven/newhaven_study.py index 1f3e858f..b10a8bf0 100644 --- a/etl/customers/newhaven/newhaven_study.py +++ b/etl/customers/newhaven/newhaven_study.py @@ -152,6 +152,11 @@ def make_asset_list(): cost_testing["ewi_cost_per_m2"] = cost_testing["Insulation - External Wall - Total"] / cost_testing[ "Wall Area [m^2]"] + cost_testing["li_cost_per_m2"] = cost_testing["Insulation - Loft - Total"] / cost_testing["Building Area [m^2]"] + + cost_testing["underfloor_cost_per_m2"] = cost_testing["Insulation - Under Floor- Total"] / cost_testing[ + "Building Area [m^2]"] + final_asset_list = asset_list.rename( columns={"UPRN": "uprn", "address1": "address", "floor_area": "insulation_floor_area"} )[["uprn", "address", "postcode", "insulation_wall_area", "insulation_floor_area", "number_of_floors"]]