thatcher 1.0.85 → 1.0.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thatcher",
-  "version": "1.0.85",
+  "version": "1.0.86",
   "description": "A config-driven application framework for building data-intensive web apps without code.",
   "main": "src/index.js",
   "type": "module",

package/src/lib/demand-forecast.js

@@ -0,0 +1,58 @@
+// Single source of truth for CRM demand-planning math, shared with any
+// future forecast summary view -- the same small pure-computation module
+// shape as contract-expiry.js and inventory-forecast.js. Forward-looking
+// (open pipeline -> future revenue), the mirror image of
+// inventory-forecast.js's backward-looking (movement history -> stockout).
+const OPEN_STAGE_EXCLUSIONS = new Set(['won', 'lost']);
+
+function monthBucketKey(dateSeconds) {
+  const d = new Date(dateSeconds * 1000);
+  return `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, '0')}`;
+}
+
+// The stage field alone decides "still open" -- not the presence of a
+// weighted_value or any date math, so a caller can't accidentally count a
+// won/lost opportunity by omission.
+function isOpenStage(opportunity) {
+  return !OPEN_STAGE_EXCLUSIONS.has(opportunity.stage);
+}
+
+// A record already carries weighted_value if it passed through
+// busybase/store.js's list()/get() (which now computes formula fields on
+// every read) -- reused directly rather than recomputed, so this module
+// never drifts from the same formula the opportunity entity itself defines.
+// Falls back to computing value*probability/100 independently only if the
+// field is genuinely absent (e.g. a deployment whose opportunity entity
+// doesn't define weighted_value), never silently treating a present-but-null
+// value as "compute it myself" -- null still means the formula ran and
+// legitimately produced nothing.
+function weightedValueOf(opportunity) {
+  if (opportunity.weighted_value !== undefined) return opportunity.weighted_value ?? 0;
+  const value = Number(opportunity.value) || 0;
+  const probability = Number(opportunity.probability) || 0;
+  return (value * probability) / 100;
+}
+
+export function projectDemandByMonth(opportunities, nowSeconds = Math.floor(Date.now() / 1000)) {
+  const currentBucketKey = monthBucketKey(nowSeconds);
+  const buckets = new Map();
+
+  for (const opp of opportunities) {
+    if (!isOpenStage(opp)) continue;
+    if (opp.expected_close_date == null) continue;
+
+    const bucketKey = monthBucketKey(Number(opp.expected_close_date));
+    // A future bucket sorts >= the current month's key lexicographically
+    // (YYYY-MM strings compare correctly as dates); a past-due open
+    // opportunity's bucket key is strictly less than the current one and is
+    // excluded entirely rather than folded into the nearest future bucket --
+    // silently reassigning it would misrepresent when the demand was
+    // actually expected.
+    if (bucketKey < currentBucketKey) continue;
+
+    const weighted = weightedValueOf(opp);
+    buckets.set(bucketKey, (buckets.get(bucketKey) || 0) + weighted);
+  }
+
+  return [...buckets.entries()].sort((a, b) => a[0].localeCompare(b[0]));
+}

package/src/ui/page-handler.js

@@ -9,7 +9,7 @@ import { renderEngagementGrid } from '@/ui/engagement-grid-renderer.js';
 import { renderBoardView } from '@/ui/board-view-renderer.js';
 import { renderGridView } from '@/ui/grid-view-renderer.js';
 import { renderCalendarView, renderTimelineView } from '@/ui/calendar-view-renderer.js';
-import { renderCountByFieldReport, renderCountOverTimeReport, renderSumByFieldReport, renderRollupReport, renderInventoryForecastReport } from '@/ui/report-renderer.js';
+import { renderCountByFieldReport, renderCountOverTimeReport, renderSumByFieldReport, renderRollupReport, renderInventoryForecastReport, renderDemandForecastReport } from '@/ui/report-renderer.js';
 import { renderClientProgress } from '@/ui/client-progress-renderer.js';
 import { renderLetterWorkflow } from '@/ui/letter-workflow-renderer.js';
 import { renderAdvancedSearch } from '@/ui/advanced-search-renderer.js';
@@ -392,6 +392,16 @@ export async function handlePage(pathname, req, res) {
       }
       return renderInventoryForecastReport(user, spec, forecastRows);
     }
+    if (report === 'demand-forecast' && entityName === 'opportunity') {
+      // items is already the {user}-scoped opportunity list fetched at the
+      // top of this route (same list(entityName,{},{user}) every other
+      // entity route uses) -- no new unscoped query, and each item already
+      // carries a computed weighted_value from list()'s own formula-field
+      // pass, reused directly rather than recomputed.
+      const { projectDemandByMonth } = await import('@/lib/demand-forecast.js');
+      const buckets = projectDemandByMonth(items);
+      return renderDemandForecastReport(user, spec, buckets, items.length);
+    }
     const view = params.get('view');
     if (view === 'board') return renderBoardView(user, entityName, spec, items);
     if (view === 'grid') return renderGridView(user, entityName, spec, items);

package/src/ui/report-renderer.js

@@ -237,3 +237,23 @@ export function renderInventoryForecastReport(user, spec, forecastRows) {
     </table></div>`;
   return page(user, `Inventory Forecast | Thatcher`, null, content);
 }
+
+// Reuses sumBarChart (already built for sum-by-field's currency-aware bar
+// rendering) rather than inventing a third chart type -- a demand-by-month
+// bucket is the exact same [label, numericValue] shape sum-by-field already
+// renders, just currency-formatted since weighted_value derives from a
+// currency field.
+export function renderDemandForecastReport(user, spec, buckets, totalOpportunities) {
+  const label = getEntityLabel(spec, true) || 'Opportunities';
+  const valueFieldDef = spec.fields?.value || { type: 'currency' };
+  const totalProjected = buckets.reduce((sum, [, v]) => sum + v, 0);
+  const notice = !buckets.length
+    ? `<div class="report-notice">No open opportunities with a future expected close date</div>`
+    : '';
+  const content = `<div class="page-header">
+      <div><h1 class="page-title">${esc(label)}: Demand Forecast</h1><p class="page-subtitle">${totalOpportunities} total opportunities, ${esc(formatSumValue(totalProjected, valueFieldDef))} projected across ${buckets.length} future month${buckets.length === 1 ? '' : 's'}</p></div>
+    </div>
+    ${notice}
+    ${sumBarChart(buckets, valueFieldDef)}`;
+  return page(user, `Demand Forecast | Thatcher`, null, content);
+}