junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-07-12 13:29:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added in rest of solar

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-01-05 13:04:07 +00:00
parent 74a4cc1068
commit 49b0a1d901
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
backend/app/plan/utils.py
View file

@ -194,12 +194,15 @@ def create_recommendation_scoring_data(
else: else:
raise ValueError("Invalid glazing type - implement me") raise ValueError("Invalid glazing type - implement me")
if recommendation["type"] == "solar_pv":
scoring_dict["PHOTO_SUPPLY_ENDING"] = property.solar_pv_percentage
if recommendation["type"] not in [ if recommendation["type"] not in [
"mechanical_ventilation", "sealing_open_fireplace", "low_energy_lighting", "mechanical_ventilation", "sealing_open_fireplace", "low_energy_lighting",
"internal_wall_insulation", "external_wall_insulation", "cavity_wall_insulation", "internal_wall_insulation", "external_wall_insulation", "cavity_wall_insulation",
"loft_insulation", "room_roof_insulation", "flat_roof_insulation", "loft_insulation", "room_roof_insulation", "flat_roof_insulation",
"solid_floor_insulation", "suspended_floor_insulation", "exposed_floor_insulation", "solid_floor_insulation", "suspended_floor_insulation", "exposed_floor_insulation",
"windows_glazing" "windows_glazing", "solar_pv"
]: ]:
raise NotImplementedError("Implement me") raise NotImplementedError("Implement me")

2
etl/testing_data/solar_research.py
View file

@ -35,7 +35,7 @@ def app():
data = df[ data = df[
["UPRN", "PROPERTY_TYPE", "TENURE", "BUILT_FORM", "ROOF_DESCRIPTION", "PHOTO_SUPPLY", "TOTAL_FLOOR_AREA", ["UPRN", "PROPERTY_TYPE", "TENURE", "BUILT_FORM", "ROOF_DESCRIPTION", "PHOTO_SUPPLY", "TOTAL_FLOOR_AREA",
"CONSTRUCTION_AGE_BAND"] "CONSTRUCTION_AGE_BAND", "SOLAR_WATER_HEATING_FLAG"]
].copy() ].copy()
data["PHOTO_SUPPLY"] = data["PHOTO_SUPPLY"].fillna(0) data["PHOTO_SUPPLY"] = data["PHOTO_SUPPLY"].fillna(0)
data = data[data["PHOTO_SUPPLY"] != 0] data = data[data["PHOTO_SUPPLY"] != 0]

5
recommendations/Costs.py
View file

@ -840,7 +840,10 @@ class Costs:
The data in the dashboard is filtered on domestic building installations and then the data across the The data in the dashboard is filtered on domestic building installations and then the data across the
various regions is manually collected. There is currently no automated way to get the data from the MCS various regions is manually collected. There is currently no automated way to get the data from the MCS
dashboard dashboard
:param wattage:
Price can also be benchmarked against this checkatrade article:
https://www.checkatrade.com/blog/cost-guides/cost-of-solar-panel-installation/
:param wattage: Peak wattage of the solar PV system
:return: :return:
""" """

1
recommendations/SolarPvRecommendations.py
View file

@ -57,5 +57,6 @@ class SolarPvRecommendations:
"new_u_value": None, "new_u_value": None,
"sap_points": None, "sap_points": None,
**cost_result, **cost_result,
"photo_supply": self.property.solar_pv_percentage # This is required for simulating the SAP impact
} }
] ]