update

backend/app/main.py

@@ -577,6 +577,53 @@ def _dashboard_period_bounds_utc(period: str) -> Optional[tuple[datetime, dateti
     return None
 
 
+def _previous_period_bounds_utc(period: str) -> Optional[tuple[datetime, datetime]]:
+    """Calendar window immediately before the current preset (month → prior month, etc.)."""
+    p = (period or "all").strip().lower()
+    if p in ("", "all"):
+        return None
+    now = datetime.utcnow()
+    if p == "month":
+        if now.month == 1:
+            y, m = now.year - 1, 12
+        else:
+            y, m = now.year, now.month - 1
+        start = datetime(y, m, 1)
+        last = monthrange(y, m)[1]
+        end = datetime(y, m, last, 23, 59, 59)
+        return start, end
+    if p == "quarter":
+        qi = (now.month - 1) // 3
+        if qi == 0:
+            y = now.year - 1
+            sm = 10
+        else:
+            y = now.year
+            sm = (qi - 1) * 3 + 1
+        start = datetime(y, sm, 1)
+        em = sm + 2
+        if em == 12:
+            end = datetime(y, 12, 31, 23, 59, 59)
+        else:
+            end = datetime(y, em + 1, 1) - timedelta(microseconds=1)
+        return start, end
+    if p == "year":
+        py = now.year - 1
+        return datetime(py, 1, 1), datetime(py, 12, 31, 23, 59, 59)
+    return None
+
+
+def _comparison_period_label(period: str) -> str:
+    p = (period or "all").strip().lower()
+    if p == "month":
+        return "Last month"
+    if p == "quarter":
+        return "Last quarter"
+    if p == "year":
+        return "Last year"
+    return ""
+
+
 def _won_at_within_bounds(won_at: Optional[datetime], bounds: Optional[tuple[datetime, datetime]]) -> bool:
     if bounds is None:
         return True
@@ -2849,7 +2896,8 @@ async def quarterly_recurring_metrics(
 ):
     """
     Won deals → ARR (USD) roll-forward by calendar quarter from PO lines (interval per line + one-time lines).
-    Optional period=all|month|quarter|year filters by won_at (same presets as the sales dashboard).
+    Optional period=all|month|quarter|year filters by won_at.
+    When period is not all, includes comparison roll-forward for the prior calendar period (last month / quarter / year).
     """
     db = t.db
     q = db.query(CrmDeal).filter(
@@ -2876,7 +2924,35 @@ async def quarterly_recurring_metrics(
                 "won_at": wa,
             }
         )
-    return build_quarterly_board(deals_payload, max_quarters=max_quarters)
+    base = build_quarterly_board(deals_payload, max_quarters=max_quarters)
+    pnorm = (period or "all").strip().lower()
+    if pnorm in ("", "all"):
+        return {**base, "comparison": None}
+
+    bounds_prev = _previous_period_bounds_utc(period)
+    deals_prev: list[dict] = []
+    if bounds_prev:
+        for r in rows:
+            wa = getattr(r, "won_at", None)
+            if not _won_at_within_bounds(wa, bounds_prev):
+                continue
+            deals_prev.append(
+                {
+                    "id": r.id,
+                    "name": r.name or "",
+                    "revenue_type": (getattr(r, "revenue_type", None) or "arr"),
+                    "won_line_items": _won_line_items_list(r),
+                    "won_at": wa,
+                }
+            )
+    comp = build_quarterly_board(deals_prev, max_quarters=max_quarters)
+    return {
+        **base,
+        "comparison": {
+            "period_label": _comparison_period_label(period),
+            "quarters": comp.get("quarters", []),
+        },
+    }
 
 
 @app.post("/api/deals")

frontend/src/pages/SalesDashboard.jsx

@@ -49,6 +49,27 @@ function startOfQuarter(d) {
 }
 
 /** Dashboard date filter: open pipeline deals by created_at; Won deals by won_at when present. */
+/** Latest roll-forward row + merged one-time from quarterly API payload. */
+function revenueSnapshotFromQuarters(quarters) {
+    const qs = quarters || [];
+    const cols = qs.length <= 6 ? qs : qs.slice(-6);
+    const row = cols.length ? cols[cols.length - 1] : null;
+    let oneTimeSum = 0;
+    const mergedDeals = [];
+    const seen = new Set();
+    for (const q of cols) {
+        oneTimeSum += Number(q.one_time_usd_quarter) || 0;
+        for (const d of q.one_time_deals || []) {
+            const id = d.deal_id;
+            if (id != null && !seen.has(id)) {
+                seen.add(id);
+                mergedDeals.push(d);
+            }
+        }
+    }
+    return { row, oneTimeSum, mergedDeals, hasData: Boolean(row) };
+}
+
 function dealInDashboardPeriod(deal, period) {
     if (period === DASHBOARD_PERIOD_ALL) return true;
     const iso =
@@ -599,26 +620,19 @@ export default function SalesDashboard() {
                 ? 'This year'
                 : 'All time';
 
-    /** Latest roll-forward row from API + merged one-time (calendar buckets); UI labels column by date filter, not Q2 2026. */
-    const revenueBoardSnapshot = useMemo(() => {
-        const qs = quarterlyBoard?.quarters || [];
-        const cols = qs.length <= 6 ? qs : qs.slice(-6);
-        const row = cols.length ? cols[cols.length - 1] : null;
-        let oneTimeSum = 0;
-        const mergedDeals = [];
-        const seen = new Set();
-        for (const q of cols) {
-            oneTimeSum += Number(q.one_time_usd_quarter) || 0;
-            for (const d of q.one_time_deals || []) {
-                const id = d.deal_id;
-                if (id != null && !seen.has(id)) {
-                    seen.add(id);
-                    mergedDeals.push(d);
-                }
-            }
-        }
-        return { row, oneTimeSum, mergedDeals, hasData: Boolean(row) };
-    }, [quarterlyBoard]);
+    const revenueBoardSnapshot = useMemo(
+        () => revenueSnapshotFromQuarters(quarterlyBoard?.quarters),
+        [quarterlyBoard]
+    );
+    const previousBoardSnapshot = useMemo(
+        () => revenueSnapshotFromQuarters(quarterlyBoard?.comparison?.quarters),
+        [quarterlyBoard]
+    );
+    const showPeriodComparison =
+        dashboardPeriod !== DASHBOARD_PERIOD_ALL && Boolean(quarterlyBoard?.comparison?.period_label);
+    const comparisonPeriodLabel = quarterlyBoard?.comparison?.period_label || '';
+
+    const revenueSectionHasData = revenueBoardSnapshot.hasData || previousBoardSnapshot.hasData;
 
     const dateRangeSub =
         dashboardPeriod === DASHBOARD_PERIOD_ALL
@@ -732,10 +746,19 @@ export default function SalesDashboard() {
                             <Loader2 className="h-5 w-5 animate-spin shrink-0" aria-hidden />
                             Loading quarterly metrics…
                         </div>
-                    ) : revenueBoardSnapshot.hasData ? (
+                    ) : revenueSectionHasData ? (
                         <div className="space-y-4">
                             <p className="text-xs text-slate-500">
                                 Values reflect <strong className="font-medium text-slate-700">{dashboardPeriodLabel}</strong>
+                                {showPeriodComparison ? (
+                                    <>
+                                        {' '}
+                                        vs{' '}
+                                        <strong className="font-medium text-slate-700">
+                                            {comparisonPeriodLabel}
+                                        </strong>
+                                    </>
+                                ) : null}
                                 {isAdmin && ownerFilter !== 'all' ? (
                                     <>
                                         {' '}
@@ -745,7 +768,7 @@ export default function SalesDashboard() {
                                 . ARR roll-forward row is the latest period in range; one-time total sums wins across that
                                 range.
                             </p>
-                            <div className="grid grid-cols-1 gap-4 xl:grid-cols-2">
+                            <div className="grid grid-cols-1 gap-4 xl:grid-cols-3">
                                 <CardShell
                                     title="Annual recurring revenue (ARR)"
                                     hint="USD ($). PO lines: monthly ×12, quarterly ×4, annual ×1; one-time lines excluded. Column matches your date + team filters."
@@ -759,6 +782,11 @@ export default function SalesDashboard() {
                                                     <th className="px-2 py-2 text-right whitespace-nowrap">
                                                         {dashboardPeriodLabel}
                                                     </th>
+                                                    {showPeriodComparison ? (
+                                                        <th className="px-2 py-2 text-right whitespace-nowrap">
+                                                            {comparisonPeriodLabel}
+                                                        </th>
+                                                    ) : null}
                                                 </tr>
                                             </thead>
                                             <tbody className="tabular-nums">
@@ -767,18 +795,33 @@ export default function SalesDashboard() {
                                                     <td className="px-2 py-2 text-right font-semibold">
                                                         {fmtMoney(revenueBoardSnapshot.row?.arr?.total)}
                                                     </td>
+                                                    {showPeriodComparison ? (
+                                                        <td className="px-2 py-2 text-right font-semibold">
+                                                            {fmtMoney(previousBoardSnapshot.row?.arr?.total)}
+                                                        </td>
+                                                    ) : null}
                                                 </tr>
                                                 <tr className="border-b border-slate-100">
                                                     <td className="py-2 pr-3 text-slate-600">EXISTING</td>
                                                     <td className="px-2 py-2 text-right text-slate-700">
                                                         {fmtMoney(revenueBoardSnapshot.row?.arr?.existing)}
                                                     </td>
+                                                    {showPeriodComparison ? (
+                                                        <td className="px-2 py-2 text-right text-slate-700">
+                                                            {fmtMoney(previousBoardSnapshot.row?.arr?.existing)}
+                                                        </td>
+                                                    ) : null}
                                                 </tr>
                                                 <tr>
                                                     <td className="py-2 pr-3 text-slate-600">NEW</td>
                                                     <td className="px-2 py-2 text-right text-slate-700">
                                                         {fmtMoney(revenueBoardSnapshot.row?.arr?.new)}
                                                     </td>
+                                                    {showPeriodComparison ? (
+                                                        <td className="px-2 py-2 text-right text-slate-700">
+                                                            {fmtMoney(previousBoardSnapshot.row?.arr?.new)}
+                                                        </td>
+                                                    ) : null}
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -797,6 +840,11 @@ export default function SalesDashboard() {
                                                     <th className="px-2 py-2 text-right whitespace-nowrap">
                                                         {dashboardPeriodLabel}
                                                     </th>
+                                                    {showPeriodComparison ? (
+                                                        <th className="px-2 py-2 text-right whitespace-nowrap">
+                                                            {comparisonPeriodLabel}
+                                                        </th>
+                                                    ) : null}
                                                 </tr>
                                             </thead>
                                             <tbody className="tabular-nums">
@@ -805,72 +853,111 @@ export default function SalesDashboard() {
                                                     <td className="px-2 py-2 text-right font-semibold">
                                                         {revenueBoardSnapshot.row?.contracts?.total ?? '—'}
                                                     </td>
+                                                    {showPeriodComparison ? (
+                                                        <td className="px-2 py-2 text-right font-semibold">
+                                                            {previousBoardSnapshot.row?.contracts?.total ?? '—'}
+                                                        </td>
+                                                    ) : null}
                                                 </tr>
                                                 <tr className="border-b border-slate-100">
                                                     <td className="py-2 pr-3 text-slate-600">EXISTING</td>
                                                     <td className="px-2 py-2 text-right text-slate-700">
                                                         {revenueBoardSnapshot.row?.contracts?.existing ?? '—'}
                                                     </td>
+                                                    {showPeriodComparison ? (
+                                                        <td className="px-2 py-2 text-right text-slate-700">
+                                                            {previousBoardSnapshot.row?.contracts?.existing ?? '—'}
+                                                        </td>
+                                                    ) : null}
                                                 </tr>
                                                 <tr>
                                                     <td className="py-2 pr-3 text-slate-600">NEW</td>
                                                     <td className="px-2 py-2 text-right text-slate-700">
                                                         {revenueBoardSnapshot.row?.contracts?.new ?? '—'}
                                                     </td>
+                                                    {showPeriodComparison ? (
+                                                        <td className="px-2 py-2 text-right text-slate-700">
+                                                            {previousBoardSnapshot.row?.contracts?.new ?? '—'}
+                                                        </td>
+                                                    ) : null}
                                                 </tr>
                                             </tbody>
                                         </table>
                                     </div>
                                 </CardShell>
-                            </div>
-                            <CardShell
-                                title="One-time revenue"
-                                hint="PO lines marked One-time; USD ($). Total summed for the filtered date range."
-                                className="min-h-0"
-                            >
-                                <div className="overflow-x-auto -m-1 p-1">
-                                    <table className="w-full min-w-[260px] text-sm">
-                                        <thead>
-                                            <tr className="border-b border-slate-200 text-left text-xs font-semibold text-slate-600">
-                                                <th className="py-2 pr-3">Scope</th>
-                                                <th className="py-2 text-right">One-time ($)</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody className="tabular-nums">
-                                            <tr className="border-b border-slate-100">
-                                                <td className="py-2 pr-3 text-slate-800">{dashboardPeriodLabel}</td>
-                                                <td className="py-2 text-right">
-                                                    {fmtMoney(revenueBoardSnapshot.oneTimeSum)}
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                                {revenueBoardSnapshot.mergedDeals.length === 0 ? (
-                                    <p className="mt-3 text-xs text-slate-500">
-                                        No one-time revenue in this scope.
-                                    </p>
-                                ) : (
-                                    <div className="mt-4 rounded-lg border border-slate-100 bg-slate-50/80 px-3 py-2 text-xs text-slate-700">
-                                        <p className="font-semibold text-slate-800">
-                                            Detail ({dashboardPeriodLabel}
-                                            {isAdmin && ownerFilter !== 'all'
-                                                ? ` · ${ownerFilterLabel}`
-                                                : ''}
-                                            )
-                                        </p>
-                                        <ul className="mt-2 list-disc space-y-1 pl-5">
-                                            {revenueBoardSnapshot.mergedDeals.map((d) => (
-                                                <li key={d.deal_id}>
-                                                    <span className="font-medium">{d.name || 'Deal'}</span>
-                                                    {' · '}
-                                                    {fmtMoney(d.amount_usd)}
-                                                </li>
-                                            ))}
-                                        </ul>
+                                <CardShell
+                                    title="One-time revenue"
+                                    hint="PO lines marked One-time; USD ($). Total summed for the filtered date range."
+                                    className="min-h-0"
+                                >
+                                    <div className="overflow-x-auto -m-1 p-1">
+                                        <table className="w-full min-w-[260px] text-sm">
+                                            <thead>
+                                                <tr className="border-b border-slate-200 text-left text-xs font-semibold text-slate-600">
+                                                    <th className="py-2 pr-3">Scope</th>
+                                                    {showPeriodComparison ? (
+                                                        <>
+                                                            <th className="py-2 px-2 text-right whitespace-nowrap">
+                                                                {dashboardPeriodLabel}
+                                                            </th>
+                                                            <th className="py-2 px-2 text-right whitespace-nowrap">
+                                                                {comparisonPeriodLabel}
+                                                            </th>
+                                                        </>
+                                                    ) : (
+                                                        <th className="py-2 text-right">One-time ($)</th>
+                                                    )}
+                                                </tr>
+                                            </thead>
+                                            <tbody className="tabular-nums">
+                                                <tr className="border-b border-slate-100">
+                                                    <td className="py-2 pr-3 text-slate-800">
+                                                        {showPeriodComparison ? 'One-time' : dashboardPeriodLabel}
+                                                    </td>
+                                                    <td
+                                                        className={
+                                                            showPeriodComparison
+                                                                ? 'py-2 px-2 text-right'
+                                                                : 'py-2 text-right'
+                                                        }
+                                                    >
+                                                        {fmtMoney(revenueBoardSnapshot.oneTimeSum)}
+                                                    </td>
+                                                    {showPeriodComparison ? (
+                                                        <td className="py-2 px-2 text-right">
+                                                            {fmtMoney(previousBoardSnapshot.oneTimeSum)}
+                                                        </td>
+                                                    ) : null}
+                                                </tr>
+                                            </tbody>
+                                        </table>
                                     </div>
-                                )}
-                            </CardShell>
+                                    {revenueBoardSnapshot.mergedDeals.length === 0 ? (
+                                        <p className="mt-3 text-xs text-slate-500">
+                                            No one-time revenue in this scope.
+                                        </p>
+                                    ) : (
+                                        <div className="mt-4 rounded-lg border border-slate-100 bg-slate-50/80 px-3 py-2 text-xs text-slate-700">
+                                            <p className="font-semibold text-slate-800">
+                                                Detail ({dashboardPeriodLabel}
+                                                {isAdmin && ownerFilter !== 'all'
+                                                    ? ` · ${ownerFilterLabel}`
+                                                    : ''}
+                                                )
+                                            </p>
+                                            <ul className="mt-2 list-disc space-y-1 pl-5">
+                                                {revenueBoardSnapshot.mergedDeals.map((d) => (
+                                                    <li key={d.deal_id}>
+                                                        <span className="font-medium">{d.name || 'Deal'}</span>
+                                                        {' · '}
+                                                        {fmtMoney(d.amount_usd)}
+                                                    </li>
+                                                ))}
+                                            </ul>
+                                        </div>
+                                    )}
+                                </CardShell>
+                            </div>
                         </div>
                     ) : (
                         <p className="rounded-xl border border-dashed border-slate-200 bg-slate-50/50 px-4 py-8 text-center text-sm text-slate-600">