From 88f43bcc822b4550540c88e7363d920937563072 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Thu, 11 Apr 2024 16:49:44 +0100 Subject: [PATCH] fixed the combi boiler logic --- recommendations/HeatingControlRecommender.py | 3 ++- recommendations/HeatingRecommender.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/recommendations/HeatingControlRecommender.py b/recommendations/HeatingControlRecommender.py index 95b5e3b1..76eaba4f 100644 --- a/recommendations/HeatingControlRecommender.py +++ b/recommendations/HeatingControlRecommender.py @@ -215,7 +215,8 @@ class HeatingControlRecommender: { "type": "heating_control", "parts": [], - "description": "Upgrade heating controls to Smart Thermostats, room sensors and smart radiator valves", + "description": "Upgrade heating controls to Smart Thermostats, room sensors and smart radiator valves " + "(time & temperature zone control)", **self.costs.time_and_temperature_zone_control( number_heated_rooms=int(self.property.data["number-heated-rooms"]) ), diff --git a/recommendations/HeatingRecommender.py b/recommendations/HeatingRecommender.py index 1813e5e8..bd4d87a2 100644 --- a/recommendations/HeatingRecommender.py +++ b/recommendations/HeatingRecommender.py @@ -295,7 +295,7 @@ class HeatingRecommender: # Otherwise, we recommend a gas condensing boiler, which will server a larger property, that has multiple # bathrooms is_combi = ( - (self.property.data["number-heated-rooms"] <= 4) or + (self.property.data["number-heated-rooms"] <= 4) and (self.property.n_bathrooms in [None, 0, 1]) ) if is_combi: @@ -370,7 +370,7 @@ class HeatingRecommender: combined_recommendations.extend(combined_recommendation) # Overwrite the existing boiler recommendation - self.recommendations = combined_recommendations + self.recommendations.extend(combined_recommendations) else: # We increment the recommendation phase, since the heating controls are separate from the boiler upgrade # but we'll only upgrade if we have a heating recommendation