diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyTable.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyTable.tsx index e206587b..d91ff6d3 100644 --- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyTable.tsx +++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyTable.tsx @@ -52,6 +52,10 @@ const COLUMN_LABELS: Record = { approvedPackage: "Approved Package", actualMeasuresInstalled: "Installed Measures", preSapScore: "Pre-SAP", + eiScore: "EI Score", + eiScorePotential: "EI Score (Potential)", + epcSapScore: "EPC SAP Score", + epcSapScorePotential: "EPC SAP (Potential)", lodgementStatus: "Lodgement Status", designDate: "Design Date", fullLodgementDate: "Lodgement Date", @@ -82,6 +86,10 @@ const CSV_FIELDS: { key: keyof ClassifiedDeal; label: string }[] = [ { key: "approvedPackage", label: "Approved Package" }, { key: "actualMeasuresInstalled", label: "Installed Measures" }, { key: "preSapScore", label: "Pre-SAP" }, + { key: "eiScore", label: "EI Score" }, + { key: "eiScorePotential", label: "EI Score (Potential)" }, + { key: "epcSapScore", label: "EPC SAP Score" }, + { key: "epcSapScorePotential", label: "EPC SAP (Potential)" }, { key: "lodgementStatus", label: "Lodgement Status" }, { key: "designDate", label: "Design Date" }, { key: "fullLodgementDate", label: "Lodgement Date" }, @@ -115,6 +123,10 @@ export default function PropertyTable({ data, onOpenDrawer, onOpenDetail, showDo approvedPackage: false, actualMeasuresInstalled: false, preSapScore: false, + eiScore: false, + eiScorePotential: false, + epcSapScore: false, + epcSapScorePotential: false, lodgementStatus: false, designDate: false, fullLodgementDate: false, diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyTableColumns.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyTableColumns.tsx index ed18a7c1..63e62dd2 100644 --- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyTableColumns.tsx +++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/PropertyTableColumns.tsx @@ -240,6 +240,54 @@ export function createPropertyTableColumns( }, + // ── EI score ───────────────────────────────────────────────────────── + { + accessorKey: "eiScore", + id: "eiScore", + header: ({ column }) => , + cell: ({ row }) => ( + + {row.original.eiScore ?? } + + ), + }, + + // ── EI score (potential) ────────────────────────────────────────────── + { + accessorKey: "eiScorePotential", + id: "eiScorePotential", + header: ({ column }) => , + cell: ({ row }) => ( + + {row.original.eiScorePotential ?? } + + ), + }, + + // ── EPC SAP score ───────────────────────────────────────────────────── + { + accessorKey: "epcSapScore", + id: "epcSapScore", + header: ({ column }) => , + cell: ({ row }) => ( + + {row.original.epcSapScore ?? } + + ), + }, + + // ── EPC SAP score (potential) ───────────────────────────────────────── + { + accessorKey: "epcSapScorePotential", + id: "epcSapScorePotential", + header: ({ column }) => , + cell: ({ row }) => ( + + {row.original.epcSapScorePotential ?? } + + ), + }, + // ── Lodgement status ───────────────────────────────────────────────── { accessorKey: "lodgementStatus", diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx index 82b4a846..a4bdc827 100644 --- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx +++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/page.tsx @@ -60,6 +60,10 @@ function mapDbRowToHubspotDeal(row: DbDeal): HubspotDeal { confirmedSurveyDate: row.confirmedSurveyDate, surveyedDate: row.surveyedDate, designType: row.dealType, + eiScore: row.eiScore, + eiScorePotential: row.eiScorePotential, + epcSapScore: row.epcSapScore, + epcSapScorePotential: row.epcSapScorePotential, createdAt: row.createdAt, updatedAt: row.updatedAt, }; diff --git a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts index f9810353..5e0aa063 100644 --- a/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts +++ b/src/app/portfolio/[slug]/(portfolio)/your-projects/live/types.ts @@ -46,6 +46,10 @@ export type HubspotDeal = { confirmedSurveyDate: Date | null; surveyedDate: Date | null; designType: string | null; + eiScore: string | null; + eiScorePotential: string | null; + epcSapScore: string | null; + epcSapScorePotential: string | null; createdAt: Date; updatedAt: Date;