diff --git a/src/app/portfolio/[slug]/(portfolio)/reporting/ReportingClientArea.tsx b/src/app/portfolio/[slug]/(portfolio)/reporting/ReportingClientArea.tsx index 8a01f17..ce72dfa 100644 --- a/src/app/portfolio/[slug]/(portfolio)/reporting/ReportingClientArea.tsx +++ b/src/app/portfolio/[slug]/(portfolio)/reporting/ReportingClientArea.tsx @@ -80,7 +80,6 @@ export function ReportingClientArea({ // ---------------------------------------- // Build overlay for Dashboard Summary cards // ---------------------------------------- - console.log("scenarioData", scenarioData); const scenarioOverlay = scenarioData ? { @@ -107,16 +106,17 @@ export function ReportingClientArea({ : null; // ---------------------------------------- - // Financial drawer values (from API) + // Scenario specific metrics that appear in the drawer (from API) and cannot be overlayed on baseline // ---------------------------------------- - const scenarioFinancial = scenarioData + const scenarioSpecific = scenarioData ? { totalCost: scenarioData.total_cost, contingency: scenarioData.contingency, funding: scenarioData.total_funding, costPerSap: scenarioData.total_cost > 0 - ? scenarioData.total_cost / scenarioData.avg_sap + ? scenarioData.gross_per_unit / + (scenarioData.avg_sap - (baseline.averages.avg_sap ?? 0)) : 0, costPerCo2: scenarioData.total_cost > 0 @@ -125,6 +125,16 @@ export function ReportingClientArea({ netCost: scenarioData.net_cost, grossPerUnit: scenarioData.gross_per_unit, nUnits: scenarioData.n_units_upgraded, + totalCarbonSaved: + (baseline.totals.total_carbon ?? 0) - scenarioData.total_carbon, + totalBillsSaved: + (baseline.totals.total_bills ?? 0) - scenarioData.total_bills, + averageCaribonSaved: + ((baseline.totals.total_carbon ?? 0) - scenarioData.total_carbon) / + scenarioData.n_units_upgraded, + averageBillsSaved: + ((baseline.totals.total_bills ?? 0) - scenarioData.total_bills) / + scenarioData.n_units_upgraded, } : null; @@ -156,7 +166,7 @@ export function ReportingClientArea({ subtitle="High-level insights on performance, energy, and EPC quality." /> - +
+ + + +