diff --git a/src/app/components/building-passport/RecommendationCard.tsx b/src/app/components/building-passport/RecommendationCard.tsx index 2a4b614..7310f36 100644 --- a/src/app/components/building-passport/RecommendationCard.tsx +++ b/src/app/components/building-passport/RecommendationCard.tsx @@ -36,6 +36,7 @@ const TitleMap = { // Heating heating: "Heating Systems", heating_control: "Heating Controls", + secondary_heating: "Secondary Heating System", // Hot water tank hot_water_tank_insulation: "Hot Water Tank Insulation", // Default options when no recommendation is selected diff --git a/src/app/components/building-passport/RecommendationContainer.tsx b/src/app/components/building-passport/RecommendationContainer.tsx index fa63afb..68d1ca4 100644 --- a/src/app/components/building-passport/RecommendationContainer.tsx +++ b/src/app/components/building-passport/RecommendationContainer.tsx @@ -117,6 +117,11 @@ export default function RecommendationContainer({ (rec: Recommendation) => rec.default ) || emptyImpactState; + const defaultSecondaryHeatingRecommendations = + categorizedRecommendations.secondary_heating?.find( + (rec: Recommendation) => rec.default + ) || emptyImpactState; + const [costMap, setCostMap] = useState({ wall_insulation: defaultWallsRecommendations.estimatedCost || 0, floor_insulation: defaultFloorRecommendations.estimatedCost || 0, @@ -131,6 +136,8 @@ export default function RecommendationContainer({ hot_water_tank_insulation: defaultHotWaterTankRecommendations.estimatedCost || 0, heating_control: defaultHeatingControlRecommendations.estimatedCost || 0, + secondary_heating: + defaultSecondaryHeatingRecommendations.estimatedCost || 0, }); const [sapMap, setSapMap] = useState({ @@ -146,6 +153,7 @@ export default function RecommendationContainer({ hot_water_tank_insulation: defaultHotWaterTankRecommendations.sapPoints || 0, heating_control: defaultHeatingControlRecommendations.sapPoints || 0, + secondary_heating: defaultSecondaryHeatingRecommendations.sapPoints || 0, }); const [labourDaysMap, setLabourDaysMap] = useState({ @@ -161,6 +169,7 @@ export default function RecommendationContainer({ hot_water_tank_insulation: defaultHotWaterTankRecommendations.labourDays || 0, heating_control: defaultHeatingControlRecommendations.labourDays || 0, + secondary_heating: defaultSecondaryHeatingRecommendations.labourDays || 0, }); const [co2SavingsMap, setCo2SavingsMap] = useState({ @@ -180,6 +189,8 @@ export default function RecommendationContainer({ defaultHotWaterTankRecommendations.co2EquivalentSavings || 0, heating_control: defaultHeatingControlRecommendations.co2EquivalentSavings || 0, + secondary_heating: + defaultSecondaryHeatingRecommendations.co2EquivalentSavings || 0, }); const [energyCostSavingsMap, setEnergyCostSavingsMap] = @@ -200,6 +211,8 @@ export default function RecommendationContainer({ defaultHotWaterTankRecommendations.energyCostSavings || 0, heating_control: defaultHeatingControlRecommendations.energyCostSavings || 0, + secondary_heating: + defaultSecondaryHeatingRecommendations.energyCostSavings || 0, }); const [heatDemandMap, setHeatDemandMap] = useState({ @@ -218,6 +231,8 @@ export default function RecommendationContainer({ defaultHotWaterTankRecommendations.adjustedHeatDemand || 0, heating_control: defaultHeatingControlRecommendations.adjustedHeatDemand || 0, + secondary_heating: + defaultSecondaryHeatingRecommendations.adjustedHeatDemand || 0, }); const [totalEstimatedCost, setTotalEstimatedCost] = useState( diff --git a/src/app/db/schema/recommendations.ts b/src/app/db/schema/recommendations.ts index bf2ed17..ef48b09 100644 --- a/src/app/db/schema/recommendations.ts +++ b/src/app/db/schema/recommendations.ts @@ -122,7 +122,8 @@ export type RecommendationType = | "solar_pv" | "heating" | "hot_water_tank_insulation" - | "heating_control"; + | "heating_control" + | "secondary_heating"; export type UnnestedRecommendation = { quantity: number; diff --git a/src/app/portfolio/[slug]/building-passport/[propertyId]/page.tsx b/src/app/portfolio/[slug]/building-passport/[propertyId]/page.tsx index 15d0f5c..29c0f2d 100644 --- a/src/app/portfolio/[slug]/building-passport/[propertyId]/page.tsx +++ b/src/app/portfolio/[slug]/building-passport/[propertyId]/page.tsx @@ -21,8 +21,6 @@ export default async function BuildingPassportHome({ // the response is cached so we just gain access to the data const propertyMeta = await getPropertyMeta(params.propertyId); - console.log(propertyMeta); - return (
diff --git a/src/types/recommendations.ts b/src/types/recommendations.ts index 960e464..db41c2f 100644 --- a/src/types/recommendations.ts +++ b/src/types/recommendations.ts @@ -10,4 +10,5 @@ export interface RecommendationMetricMap { heating: number; hot_water_tank_insulation: number; heating_control: number; + secondary_heating: number; }