@cyc-seattle/platform 1.46.0 → 1.48.0

package/dist/planning/activities.d.ts

@@ -15,7 +15,7 @@ export interface ScheduledActivity {
     uses_boats: boolean;
 }
 /**
- * The plan year's activities. Paid time is start to end plus setup and put-away; on-water time is
+ * The plan's activities. Paid time is start to end plus setup and put-away; on-water time is
  * `on_water_minutes` if set, otherwise the whole span, and zero when the activity uses no boats.
  */
 export declare function scheduleActivities(ctx: Context): ScheduledActivity[];

package/dist/planning/activities.js

@@ -1,6 +1,6 @@
 import { minutesOf } from "./dates.js";
 /**
- * The plan year's activities. Paid time is start to end plus setup and put-away; on-water time is
+ * The plan's activities. Paid time is start to end plus setup and put-away; on-water time is
  * `on_water_minutes` if set, otherwise the whole span, and zero when the activity uses no boats.
  */
 export function scheduleActivities(ctx) {
@@ -21,8 +21,6 @@ export function scheduleActivities(ctx) {
             ctx.warn("unknown_offering", `Activity ${activity.key} is for an offering that isn't in the plan`, activity.key);
             continue;
         }
-        if (!ctx.inYear(offering))
-            continue;
         const timed = activity.start_time != null && activity.end_time != null;
         const start = timed ? minutesOf(activity.start_time) : null;
         let end = timed ? minutesOf(activity.end_time) : null;

package/dist/planning/bonus.js

@@ -84,10 +84,7 @@ function baseOf(ctx, owner) {
         }
         products.add(row.product_id);
     }
-    const offeringKeys = new Set(ctx
-        .fyOfferings()
-        .filter((o) => products.has(o.product_id))
-        .map((o) => o.key));
+    const offeringKeys = new Set(ctx.data.plan_offerings.filter((o) => products.has(o.product_id)).map((o) => o.key));
     const afterPools = (owner.basis ?? "after_shared_costs") === "after_shared_costs";
     let net = 0;
     for (const e of ctx.entries) {

package/dist/planning/context.d.ts

@@ -26,11 +26,6 @@ export interface Entry {
 export type EntryInput = Omit<Entry, "stage" | "mtdc_share" | "wages"> & Partial<Pick<Entry, "stage" | "mtdc_share" | "wages">>;
 /** Lookups over the input, and the entries recorded so far, shared by every step. */
 export declare class Context {
-    /** The plan year's first and last days. */
-    readonly fy: {
-        from: DateString;
-        to: DateString;
-    };
     readonly entries: Entry[];
     readonly warnings: EngineWarning[];
     readonly accounts: Map<Id, Account>;
@@ -62,8 +57,4 @@ export declare class Context {
     accountUnder(accountId: Id, ancestorId: Id): boolean;
     /** The account a product's sales are booked to: its program area's, or its own outside an area. */
     revenueAccount(product: Product): Id | null;
-    /** Whether the offering counts in the plan year: it does, whole, in the year it starts. */
-    inYear(offering: PlanOffering): boolean;
-    /** The plan year's offerings. */
-    fyOfferings(): PlanOffering[];
 }

package/dist/planning/context.js

@@ -1,4 +1,3 @@
-import { fiscalYearDates, within } from "./dates.js";
 /** The warnings about what the blocks are given, or when they run. The rest are about the data. */
 const ALLOCATION_WARNINGS = new Set([
     "over_inventory_boats",
@@ -21,8 +20,6 @@ const COST_TYPES = {
 };
 /** Lookups over the input, and the entries recorded so far, shared by every step. */
 export class Context {
-    /** The plan year's first and last days. */
-    fy;
     entries = [];
     warnings = [];
     accounts;
@@ -41,7 +38,6 @@ export class Context {
     data;
     constructor(data) {
         this.data = data;
-        this.fy = fiscalYearDates(data.fiscal_year, data.organization.fiscal_year_start_month);
         this.accounts = new Map(data.accounts.map((a) => [a.id, a]));
         this.products = new Map(data.products.map((p) => [p.id, p]));
         this.areas = new Map(data.program_areas.map((a) => [a.id, a]));
@@ -124,12 +120,4 @@ export class Context {
         }
         return area.revenue_account_id;
     }
-    /** Whether the offering counts in the plan year: it does, whole, in the year it starts. */
-    inYear(offering) {
-        return within(offering.starts_on, this.fy.from, this.fy.to);
-    }
-    /** The plan year's offerings. */
-    fyOfferings() {
-        return this.data.plan_offerings.filter((o) => this.inYear(o));
-    }
 }

package/dist/planning/dates.d.ts

@@ -1,12 +1,4 @@
 import type { DateString, TimeString } from "./types.ts";
-export declare function addDays(date: DateString, days: number): DateString;
 /** ISO weekday, 1 = Monday. */
 export declare function isoWeekday(date: DateString): number;
-/** Fiscal year N ends in calendar year N, so a July start makes FY2027 2026-07-01 to 2027-06-30. */
-export declare function fiscalYearDates(fiscalYear: number, startMonth: number): {
-    from: DateString;
-    to: DateString;
-};
 export declare function minutesOf(time: TimeString): number;
-/** Whether `date` falls in a window whose open ends are unbounded. */
-export declare function within(date: DateString, from: DateString | null | undefined, to: DateString | null | undefined): boolean;

package/dist/planning/dates.js

@@ -1,31 +1,12 @@
 function toUtc(date) {
     return new Date(`${date}T00:00:00Z`);
 }
-function fromUtc(d) {
-    return d.toISOString().slice(0, 10);
-}
-export function addDays(date, days) {
-    const d = toUtc(date);
-    d.setUTCDate(d.getUTCDate() + days);
-    return fromUtc(d);
-}
 /** ISO weekday, 1 = Monday. */
 export function isoWeekday(date) {
     const day = toUtc(date).getUTCDay();
     return day === 0 ? 7 : day;
 }
-/** Fiscal year N ends in calendar year N, so a July start makes FY2027 2026-07-01 to 2027-06-30. */
-export function fiscalYearDates(fiscalYear, startMonth) {
-    const startYear = startMonth === 1 ? fiscalYear : fiscalYear - 1;
-    const from = `${startYear}-${String(startMonth).padStart(2, "0")}-01`;
-    const nextYear = `${startYear + 1}-${String(startMonth).padStart(2, "0")}-01`;
-    return { from, to: addDays(nextYear, -1) };
-}
 export function minutesOf(time) {
     const [h, m] = time.split(":").map(Number);
     return h * 60 + m;
 }
-/** Whether `date` falls in a window whose open ends are unbounded. */
-export function within(date, from, to) {
-    return (from == null || date >= from) && (to == null || date <= to);
-}

package/dist/planning/engine.js

@@ -28,7 +28,7 @@ export function computePlan(data) {
     const charged = bookSalaries(ctx, coaching, booker);
     booker.flush();
     bookPayrollTax(ctx);
-    const mtdcByOffering = new Map(ctx.fyOfferings().map((o) => [o.key, mtdc(ctx, o.key)]));
+    const mtdcByOffering = new Map(ctx.data.plan_offerings.map((o) => [o.key, mtdc(ctx, o.key)]));
     allocatePools(ctx);
     const bonuses = bookBonuses(ctx);
     const lines = sumLines(ctx);
@@ -49,7 +49,7 @@ export function computePlan(data) {
  * products in no area. The catalog stays live, so the database can't check these.
  */
 function checkAreas(ctx) {
-    for (const offering of ctx.fyOfferings()) {
+    for (const offering of ctx.data.plan_offerings) {
         const product = ctx.products.get(offering.product_id);
         if (product === undefined)
             continue;
@@ -200,7 +200,7 @@ function summarize(ctx, lines, mtdcByOffering) {
             ...counts,
         };
     };
-    const offerings = ctx.fyOfferings().sort((a, b) => a.key.localeCompare(b.key));
+    const offerings = [...ctx.data.plan_offerings].sort((a, b) => a.key.localeCompare(b.key));
     const offeringPnl = offerings.map((o) => {
         const enrollment = ctx.enrollment.get(o.id) ?? 0;
         const days = ctx.days.get(o.key) ?? 0;

package/dist/planning/measures.d.ts

@@ -4,7 +4,7 @@ import type { Id } from "./types.ts";
 export declare function mtdc(ctx: Context, offeringKey: Id): number;
 export declare function revenue(ctx: Context, offeringKey: Id): number;
 /**
- * How an amount on a product or program area divides among its plan-year offerings, by MTDC. Null
+ * How an amount on a product or program area divides among its offerings, by MTDC. Null
  * when it has none.
  */
 export declare function spreadWeights(ctx: Context, type: "product" | "program_area", key: Id): Map<Id, number> | null;

package/dist/planning/measures.js

@@ -19,13 +19,11 @@ export function revenue(ctx, offeringKey) {
     return sumEntries(ctx, offeringKey, (e) => (ctx.accountType(e.account_id) === "revenue" ? 1 : 0));
 }
 /**
- * How an amount on a product or program area divides among its plan-year offerings, by MTDC. Null
+ * How an amount on a product or program area divides among its offerings, by MTDC. Null
  * when it has none.
  */
 export function spreadWeights(ctx, type, key) {
-    const offerings = ctx
-        .fyOfferings()
-        .filter((o) => type === "product" ? o.product_id === key : ctx.products.get(o.product_id)?.program_area_id === key);
+    const offerings = ctx.data.plan_offerings.filter((o) => type === "product" ? o.product_id === key : ctx.products.get(o.product_id)?.program_area_id === key);
     if (offerings.length === 0)
         return null;
     const weights = new Map(offerings.map((o) => [o.key, Math.max(0, mtdc(ctx, o.key))]));

package/dist/planning/pools.d.ts

@@ -1,6 +1,6 @@
 import type { Context } from "./context.ts";
 /**
- * Divides everything in each pool among the plan year's programs' offerings by MTDC, keeping each
+ * Divides everything in each pool among the plan's programs' offerings by MTDC, keeping each
  * amount's account and function. Non-program's net offsets the pools first (cyc-seattle/platform#242):
  * that part of each pooled amount stays with the organization, so a gain shrinks every program's
  * share and a loss grows it. Shared costs never count toward MTDC, so one pool's split never shifts

package/dist/planning/pools.js

@@ -5,10 +5,7 @@ function isProgram(ctx, productId) {
 }
 /** Non-program's net before the pools: its offerings' revenue less their own costs. */
 function nonProgramNet(ctx) {
-    const keys = new Set(ctx
-        .fyOfferings()
-        .filter((o) => !isProgram(ctx, o.product_id))
-        .map((o) => o.key));
+    const keys = new Set(ctx.data.plan_offerings.filter((o) => !isProgram(ctx, o.product_id)).map((o) => o.key));
     let net = 0;
     for (const e of ctx.entries) {
         if (e.cost_center_type !== "offering" || !keys.has(e.cost_center_key ?? ""))
@@ -22,15 +19,14 @@ function nonProgramNet(ctx) {
     return net;
 }
 /**
- * Divides everything in each pool among the plan year's programs' offerings by MTDC, keeping each
+ * Divides everything in each pool among the plan's programs' offerings by MTDC, keeping each
  * amount's account and function. Non-program's net offsets the pools first (cyc-seattle/platform#242):
  * that part of each pooled amount stays with the organization, so a gain shrinks every program's
  * share and a loss grows it. Shared costs never count toward MTDC, so one pool's split never shifts
  * another's.
  */
 export function allocatePools(ctx) {
-    const weights = new Map(ctx
-        .fyOfferings()
+    const weights = new Map(ctx.data.plan_offerings
         .filter((o) => isProgram(ctx, o.product_id))
         .map((o) => [o.key, Math.max(0, mtdc(ctx, o.key))]));
     const total = [...weights.values()].reduce((t, w) => t + w, 0);

package/dist/planning/revenue.js

@@ -15,7 +15,7 @@ export function countDays(ctx, activities) {
  * account, a cost.
  */
 export function bookRevenue(ctx) {
-    for (const offering of ctx.fyOfferings()) {
+    for (const offering of ctx.data.plan_offerings) {
         const product = ctx.products.get(offering.product_id);
         if (product === undefined) {
             ctx.warn("unknown_product", `Offering ${offering.key} is for a product that doesn't exist`, offering.key);

package/dist/planning/staffing.d.ts

@@ -38,9 +38,9 @@ export declare class Staffing {
     private programs;
     /**
      * Warns when a block's sailors are more than its staff or its boats can safely take. Each program's
-     * sailors count against its own sailors per coach, and need coaches at its own staff level. A
-     * salaried position on the block counts as a coach for any of its programs, since the plan trusts
-     * the planner's allocation (#208). Boats count the ones sailors bring.
+     * sailors count against its own sailors per coach, and every coach on the block counts, at any
+     * staff level or salaried: the ratio is required, a coach's level isn't (cyc-seattle/sail-team#82).
+     * Boats count the ones sailors bring.
      */
     private checkCapacity;
     /**

package/dist/planning/staffing.js

@@ -130,9 +130,9 @@ export class Staffing {
     }
     /**
      * Warns when a block's sailors are more than its staff or its boats can safely take. Each program's
-     * sailors count against its own sailors per coach, and need coaches at its own staff level. A
-     * salaried position on the block counts as a coach for any of its programs, since the plan trusts
-     * the planner's allocation (#208). Boats count the ones sailors bring.
+     * sailors count against its own sailors per coach, and every coach on the block counts, at any
+     * staff level or salaried: the ratio is required, a coach's level isn't (cyc-seattle/sail-team#82).
+     * Boats count the ones sailors bring.
      */
     checkCapacity(block, programs) {
         const { ctx } = this;
@@ -145,8 +145,8 @@ export class Staffing {
         const scope = { version_id: block.row.version_id, date: block.row.date };
         // The block's offerings, with the verb that agrees with them: "Guppies Week 2 has".
         const has = `${offeringsOf(block)} ${new Set(block.members.map((a) => a.offering.id)).size > 1 ? "have" : "has"}`;
-        // Coaches each level needs, from the sailors of the programs coached at it.
-        const needed = new Map();
+        // Coaches the block needs: each program's sailors over its sailors per coach.
+        let load = 0;
         let counted = 0;
         for (const o of offerings) {
             const settings = programs.get(o.product_id);
@@ -155,21 +155,11 @@ export class Staffing {
                 continue;
             }
             const n = ctx.enrollment.get(o.id) ?? 0;
-            needed.set(settings.staff_level_key, (needed.get(settings.staff_level_key) ?? 0) + n / settings.sailors_per_coach);
+            load += n / settings.sailors_per_coach;
             counted += n;
         }
         if (counted > 0) {
-            const load = sum(needed.values());
-            // Each level's staff cover only its own programs; salaried positions cover what's left.
-            let short = 0;
-            let covered = 0;
-            for (const [level, need] of needed) {
-                const have = sum(block.staff.filter((s) => s.position_key == null && s.staff_level_key === level).map((s) => s.count));
-                covered += Math.min(need, have);
-                short += Math.max(0, need - have);
-            }
-            const salaried = sum(block.staff.filter((s) => s.position_key != null).map((s) => s.count));
-            covered += Math.min(short, salaried);
+            const covered = Math.min(load, sum(block.staff.map((s) => s.count)));
             if (load > covered + 1e-9) {
                 ctx.warn("over_capacity", covered === 0
                     ? `${has} ${countOf(counted, "sailor")} and no coach`
@@ -415,7 +405,7 @@ export class Staffing {
         const { ctx } = this;
         for (const trip of ctx.data.plan_trips) {
             const offering = ctx.offeringsById.get(trip.offering_id);
-            if (offering === undefined || !ctx.inYear(offering))
+            if (offering === undefined)
                 continue;
             const travel = (a) => a.kind === "travel" && a.trip?.id === trip.id;
             const staffed = [...blocks.values()].filter((b) => b.members.some(travel));

package/dist/planning/types.d.ts

@@ -247,7 +247,7 @@ export interface PlanBoatRate extends Versioned {
     /** How many boats of the class the organization has. */
     quantity: number | null;
 }
-/** A group of shared costs, such as G&A, divided among all of the plan year's offerings by MTDC. */
+/** A group of shared costs, such as G&A, divided among all of the plan's offerings by MTDC. */
 export interface PlanPool extends Versioned {
     name: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyc-seattle/platform",
-  "version": "1.46.0",
+  "version": "1.48.0",
   "description": "Pulumi components for CYC's shared Google Cloud platform: WebService, the platform outputs reader, and the stacks that build the platform",
   "author": "CYC Community Sailing Center",
   "license": "Apache-2.0",