diff --git a/src/app/components/StatusBadge.tsx b/src/app/components/StatusBadge.tsx
index db0f4de8..ec66279d 100644
--- a/src/app/components/StatusBadge.tsx
+++ b/src/app/components/StatusBadge.tsx
@@ -55,8 +55,8 @@ const statusColor: {
propertyHoverText: "This property is currently in scoping",
},
assessment: {
- class: "bg-emerald-500 hover:bg-emerald-500",
- text: "assessment",
+ class: "bg-emerald-400 hover:bg-emerald-500",
+ text: "Non-invasive Assessment",
hoverText: "This portfolio is currently in the assessment stage",
propertyHoverText: "This property is currently in the assessment stage",
},
diff --git a/src/app/portfolio/[slug]/(portfolio)/page.tsx b/src/app/portfolio/[slug]/(portfolio)/page.tsx
index 77305a2a..c131ab79 100644
--- a/src/app/portfolio/[slug]/(portfolio)/page.tsx
+++ b/src/app/portfolio/[slug]/(portfolio)/page.tsx
@@ -133,85 +133,80 @@ function SummaryBox({
Portfolio Summary
-
-
+
+
Work Package
- | Total Budget |
- {budgetFormatted} |
+ Total Budget |
+ {budgetFormatted} |
- | Total Cost |
- {totalCostFormatted} |
+ Total Cost |
+ {totalCostFormatted} |
- {/*
- | Annual rental yield Increase |
- {"-"} |
-
*/}
-
- | Estimated Duration |
-
+ | Estimated Duration |
+
{estimatedDurationFormatted}
|
- | Total properties |
- {numProperties} |
+ Total properties |
+ {numProperties} |
-
+
{/* Environmental Impact */}
-
+
Environmental Impact
- |
+ |
Annual{" "}
CO2
{" "}
Savings
|
-
+ |
{co2EquivalentSavingsFormatted}
|
- | Annual Energy Savings |
-
+ | Annual Energy Savings |
+
{energySavingsFormatted}
|
-
+
{/* Financial Impact table */}
-
+
Financial Impact
- | Annual Energy Bill Reduction |
-
+ | Annual Energy Bill Reduction |
+
{energyCostSavingsFormatted}
|
- | Total Value Increase |
-
+ | Total Value Increase |
+
{totalValueIncreaseFormatted}
|
diff --git a/src/app/portfolio/[slug]/components/propertyTableColumns.tsx b/src/app/portfolio/[slug]/components/propertyTableColumns.tsx
index 732f1b62..08136f87 100644
--- a/src/app/portfolio/[slug]/components/propertyTableColumns.tsx
+++ b/src/app/portfolio/[slug]/components/propertyTableColumns.tsx
@@ -28,6 +28,39 @@ interface DataTableColumnHeaderProps
title: string;
}
+const EpcLetterBubble = ({ letter }: { letter: string }) => {
+ const getColorClass = (letter: string) => {
+ switch (letter.toUpperCase()) {
+ case "A":
+ return "bg-epc_a";
+ case "B":
+ return "bg-epc_b";
+ case "C":
+ return "bg-epc_c";
+ case "D":
+ return "bg-epc_d";
+ case "E":
+ return "bg-epc_e";
+ case "F":
+ return "bg-epc_f";
+ case "G":
+ return "bg-epc_d";
+ default:
+ return "bg-gray-500";
+ }
+ };
+
+ return (
+
+ {letter}
+
+ );
+};
+
export function DataTableFilterHeader({
column,
title,
@@ -89,7 +122,7 @@ export const columns: ColumnDef[] = [
return (
-
+
[] = [
accessorKey: "currentEpc",
header: () => Current EPC Rating
,
cell: ({ row }) => {
+ console.log(row.original.currentEpcRating);
+
return (
- {row.original.currentEpcRating || ""}
+ {}
);
},
@@ -161,7 +196,7 @@ export const columns: ColumnDef[] = [
return (
- {expectedEpc || ""}
+ {}
);
},
diff --git a/tailwind.config.js b/tailwind.config.js
index f70ada24..65cc116f 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -23,6 +23,13 @@ module.exports = {
"conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))",
},
colors: {
+ epc_a: "#117d58",
+ epc_b: "#2da55c",
+ epc_c: "#8dbd40",
+ epc_d: "#f7cd14",
+ epc_e: "#f3a96a",
+ epc_f: "#ef8026",
+ epc_g: "#e41e3b",
brandblue: "#14163d",
hoverblue: "#3e4073",
brandtan: "#d3b488",