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

correcting override in walls and roof

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-04-12 15:27:58 +01:00
parent 1c5ccb2c8c
commit adcd31c8f4
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
recommendations/RoofRecommendations.py
View file

@ -207,7 +207,7 @@ class RoofRecommendations:
floor_area=self.property.insulation_floor_area, floor_area=self.property.insulation_floor_area,
material=material material=material
) )
is_override = "loft_insulation" in cost_result is_override = "loft_insulation" in self.property.override
if is_override: if is_override:
cost_result = override_costs(cost_result) cost_result = override_costs(cost_result)
elif material["type"] == "flat_roof_insulation": elif material["type"] == "flat_roof_insulation":
@ -216,7 +216,7 @@ class RoofRecommendations:
material=material, material=material,
non_insulation_materials=non_insulation_materials non_insulation_materials=non_insulation_materials
) )
is_override = "flat_roof_insulation" in cost_result is_override = "flat_roof_insulation" in self.property.override
if is_override: if is_override:
cost_result = override_costs(cost_result) cost_result = override_costs(cost_result)
else: else:

4
recommendations/VentilationRecommendations.py
View file

@ -56,6 +56,10 @@ class VentilationRecommendations(Definitions):
part[0]["quantity"] = n_units part[0]["quantity"] = n_units
part[0]["quantity_unit"] = "part" part[0]["quantity_unit"] = "part"
is_override = "cavity_wall_insulation" in cost_result
if is_override:
cost_result = override_costs(cost_result)
# We recommend installing two mechanical ventilation systems # We recommend installing two mechanical ventilation systems
self.recommendation = [ self.recommendation = [
{ {

6
recommendations/WallRecommendations.py
View file

@ -221,7 +221,7 @@ class WallRecommendations(Definitions):
material=material.to_dict(), material=material.to_dict(),
) )
is_override = "cavity_wall_insulation" in cost_result is_override = "cavity_wall_insulation" in self.property.override
if is_override: if is_override:
cost_result = override_costs(cost_result) cost_result = override_costs(cost_result)
@ -282,7 +282,7 @@ class WallRecommendations(Definitions):
material=material.to_dict(), material=material.to_dict(),
non_insulation_materials=non_insulation_materials non_insulation_materials=non_insulation_materials
) )
is_override = "internal_wall_insulation" in cost_result is_override = "internal_wall_insulation" in self.property.override
if is_override: if is_override:
cost_result = override_costs(cost_result) cost_result = override_costs(cost_result)
@ -292,7 +292,7 @@ class WallRecommendations(Definitions):
material=material.to_dict(), material=material.to_dict(),
non_insulation_materials=non_insulation_materials non_insulation_materials=non_insulation_materials
) )
is_override = "external_wall_insulation" in cost_result is_override = "external_wall_insulation" in self.property.override
if is_override: if is_override:
cost_result = override_costs(cost_result) cost_result = override_costs(cost_result)
else: else: