@cyc-seattle/platform 1.48.0 → 1.50.0

package/dist/planning/context.d.ts

@@ -18,7 +18,7 @@ export interface Entry {
     line_name: string;
     explanation: string;
     stage: Stage;
-    /** How much of the amount MTDC counts: 0 when excluded, a fraction for a mix of rented and owned RIBs. */
+    /** How much of the amount MTDC counts: 1, or 0 when it leaves MTDC, such as a boat charter. */
     mtdc_share: number;
     /** Whether it's wages, which payroll tax is charged on. */
     wages: boolean;

package/dist/planning/context.js

@@ -1,7 +1,6 @@
 /** 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",
-    "over_inventory_resource",
     "over_capacity",
     "unallocated_activity",
     "closed_date",
@@ -12,9 +11,9 @@ const COST_TYPES = {
     coach_wages: "coach wages",
     salaries: "salaries",
     payroll_tax: "payroll tax",
-    ribs: "RIBs",
+    ribs: "coach boats",
     boat_maintenance: "boat maintenance",
-    resources: "resources",
+    resources: "boat charters",
     travel: "travel",
     cogs: "cost of goods sold",
 };

package/dist/planning/staffing.d.ts

@@ -43,9 +43,17 @@ export declare class Staffing {
      * Boats count the ones sailors bring.
      */
     private checkCapacity;
+    /** Books a cost on a block, split among its activities by their offerings' sailors. */
+    private book;
     /**
-     * Warns when the organization's boats of one class, or a resource such as RIBs, are given to more
-     * blocks at once on a date than it has. Boats sailors bring don't count.
+     * Charges each boat class's charter rate once a day, for the most of its boats chartered at once
+     * that day, shared among the blocks that charter them by how many each does. A charter is a rental,
+     * so it's left out of MTDC (2 CFR 200.1).
+     */
+    private bookCharters;
+    /**
+     * Warns when more of the organization's boats of one class are given to blocks at once on a date
+     * than it has that day on the asset list. Boats it charters, or sailors bring, don't count.
      */
     private checkInventory;
     /**
@@ -53,7 +61,7 @@ export declare class Staffing {
      * both. Returns each position's double-booked hours and dates.
      */
     private checkDoubleBooked;
-    /** Costs every block's staff, RIBs, boats and resources, and checks them against the limits. */
+    /** Costs every block's staff and boats, and checks them against the limits. */
     run(scheduled: ScheduledActivity[]): {
         activities: ComputedActivity[];
         coaching: SalariedCoaching[];

package/dist/planning/staffing.js

@@ -61,7 +61,6 @@ export class Staffing {
     blocks(scheduled) {
         const { data } = this.ctx;
         const staff = groupBy(data.plan_block_staff, (r) => r.block_id);
-        const resources = groupBy(data.plan_block_resources, (r) => r.block_id);
         const boats = groupBy(data.plan_block_boats, (r) => r.block_id);
         const rows = new Map(data.plan_activity_blocks.map((b) => [b.id, b]));
         const members = new Map();
@@ -103,7 +102,6 @@ export class Staffing {
                     Math.max(0, ...list.map((a) => a.stored.putaway_minutes ?? 0)),
                 on_water_minutes: set.length > 0 ? Math.max(...set) : sailingMinutes,
                 staff: staff.get(id) ?? [],
-                resources: resources.get(id) ?? [],
                 boats: boats.get(id) ?? [],
                 shares: new Map(list.map((a) => [a, share(a)])),
             });
@@ -171,12 +169,13 @@ export class Staffing {
         const classes = new Map(ctx.data.boat_classes.map((c) => [c.id, c]));
         let seats = 0;
         for (const b of block.boats) {
-            const perBoat = classes.get(b.boat_class_id)?.sailors_per_boat;
-            if (perBoat == null || perBoat <= 0) {
-                this.warnOnce("no_sailors_per_boat", `${classes.get(b.boat_class_id)?.name ?? b.boat_class_id} has no sailors per boat. Add it to check that the boats hold every sailor`, b.boat_class_id, scope);
+            // A coach boat's class takes 0, without a warning.
+            const perBoat = classes.get(b.boat_class_id)?.max_capacity;
+            if (perBoat == null) {
+                this.warnOnce("no_max_capacity", `${classes.get(b.boat_class_id)?.name ?? b.boat_class_id} has no max capacity. Add it to check that the boats hold every sailor`, b.boat_class_id, scope);
                 continue;
             }
-            seats += (b.count + (b.sailor_owned ?? 0)) * perBoat;
+            seats += (b.count + (b.chartered ?? 0) + (b.sailor_owned ?? 0)) * perBoat;
         }
         if (sailors > seats) {
             ctx.warn("over_capacity", seats === 0
@@ -184,28 +183,79 @@ export class Staffing {
                 : `${has} ${countOf(sailors, "sailor")}, but the boats hold only ${seats}`, block.row.key, scope);
         }
     }
+    /** Books a cost on a block, split among its activities by their offerings' sailors. */
+    book(block, account, amount, line, name, explanation, mtdcShare = 1, wages = false) {
+        if (amount === 0 || account === undefined)
+            return;
+        for (const [a, share] of block.shares) {
+            this.ctx.book({
+                cost_center_type: "offering",
+                cost_center_key: a.offering.key,
+                account_id: account,
+                function: this.ctx.functionFor(account, null, "offering"),
+                amount: amount * share,
+                line_key: `${line}:${a.offering.key}`,
+                line_name: name,
+                explanation,
+                mtdc_share: mtdcShare,
+                wages,
+            });
+        }
+    }
+    /**
+     * Charges each boat class's charter rate once a day, for the most of its boats chartered at once
+     * that day, shared among the blocks that charter them by how many each does. A charter is a rental,
+     * so it's left out of MTDC (2 CFR 200.1).
+     */
+    bookCharters(blocks) {
+        const { ctx } = this;
+        const rates = new Map(ctx.data.plan_boat_rates.map((r) => [r.boat_class_id, r]));
+        const classes = new Map(ctx.data.boat_classes.map((c) => [c.id, c]));
+        for (const list of groupBy(blocks, (b) => b.row.date).values()) {
+            const chartered = list.flatMap((block) => block.boats.flatMap((b) => ((b.chartered ?? 0) > 0 ? [{ block, id: b.boat_class_id, n: b.chartered }] : [])));
+            for (const [id, uses] of groupBy(chartered, (c) => c.id)) {
+                const name = classes.get(id)?.name ?? id;
+                const rate = rates.get(id)?.charter_per_day_cents;
+                if (rate == null) {
+                    for (const { block } of uses) {
+                        this.warnOnce("no_charter_rate", `${block.row.name} charters ${pluralOf(name)}, but the Operations Plan has no charter rate for them, so they cost nothing`, id, { version_id: block.row.version_id, date: block.row.date });
+                    }
+                    continue;
+                }
+                const day = mostAtOnce(uses).total * rate;
+                const total = sum(uses.map((u) => u.n));
+                for (const { block, n } of uses) {
+                    this.book(block, ctx.costAccount("resources"), (day * n) / total, `charters:${id}`, `Boat charters: ${name}`, "The most boats of the class chartered at once that day × the class's charter rate", 0);
+                }
+            }
+        }
+    }
     /**
-     * Warns when the organization's boats of one class, or a resource such as RIBs, are given to more
-     * blocks at once on a date than it has. Boats sailors bring don't count.
+     * Warns when more of the organization's boats of one class are given to blocks at once on a date
+     * than it has that day on the asset list. Boats it charters, or sailors bring, don't count.
      */
     checkInventory(blocks) {
         const { ctx } = this;
         const dates = groupBy(blocks, (b) => b.row.date);
         const classes = new Map(ctx.data.boat_classes.map((c) => [c.id, c]));
-        const fleet = new Map(ctx.data.plan_boat_rates.map((r) => [r.boat_class_id, r.quantity]));
-        const resources = new Map(ctx.data.plan_resources.map((r) => [r.key, r]));
+        const assets = new Map(ctx.data.assets.map((a) => [a.id, a]));
+        const boats = ctx.data.boats.flatMap((b) => {
+            const asset = assets.get(b.asset_id);
+            return asset === undefined ? [] : [{ asset, boat_class_id: b.boat_class_id }];
+        });
         const organization = ctx.data.organization.name;
         for (const [date, list] of dates) {
+            const has = (a) => (a.acquired_on == null || a.acquired_on <= date) && (a.disposed_on == null || date < a.disposed_on);
             const check = (code, what, have, used) => {
-                if (have == null)
-                    return;
                 const out = list.flatMap((b) => (used(b) > 0 ? [{ block: b, n: used(b) }] : []));
                 const peak = mostAtOnce(out);
                 if (peak.total <= have)
                     return;
+                const only = have === 0 ? "none" : `only ${have}`;
+                const count = countOf(peak.total, what);
                 const message = peak.at.length === 1
-                    ? `${countOf(peak.total, what)} out at once for ${offeringsOf(peak.at[0].block)}, but ${organization} has only ${have}`
-                    : `${countOf(peak.total, what)} out at once, but ${organization} has only ${have}: ${listOf(peak.at.map(({ block, n }) => `${n} for ${offeringsOf(block)}`))}`;
+                    ? `${count} out at once for ${offeringsOf(peak.at[0].block)}, but ${organization} has ${only}`
+                    : `${count} out at once, but ${organization} has ${only}: ${listOf(peak.at.map(({ block, n }) => `${n} for ${offeringsOf(block)}`))}`;
                 for (const version of new Set(peak.at.map(({ block }) => block.row.version_id))) {
                     ctx.warn(code, message, what, {
                         version_id: version,
@@ -215,17 +265,8 @@ export class Staffing {
             };
             const classIds = new Set(list.flatMap((b) => b.boats.filter((x) => x.count > 0).map((x) => x.boat_class_id)));
             for (const id of classIds) {
-                if (fleet.get(id) == null) {
-                    for (const b of list.filter((x) => x.boats.some((y) => y.boat_class_id === id && y.count > 0))) {
-                        this.warnOnce("no_fleet_quantity", `The Operations Plan doesn't say how many ${pluralOf(classes.get(id)?.name ?? id)} ${organization} has. Add it to check that there are enough`, id, { version_id: b.row.version_id, date });
-                    }
-                }
-                check("over_inventory_boats", classes.get(id)?.name ?? id, fleet.get(id), (b) => sum(b.boats.filter((x) => x.boat_class_id === id).map((x) => x.count)));
-            }
-            const resourceKeys = new Set(list.flatMap((b) => b.resources.map((x) => x.resource_key)));
-            for (const key of resourceKeys) {
-                const resource = resources.get(key);
-                check("over_inventory_resource", resource?.name ?? key, resource?.quantity, (b) => sum(b.resources.filter((x) => x.resource_key === key).map((x) => x.quantity)));
+                const have = boats.filter((b) => b.boat_class_id === id && has(b.asset)).length;
+                check("over_inventory_boats", classes.get(id)?.name ?? id, have, (b) => sum(b.boats.filter((x) => x.boat_class_id === id).map((x) => x.count)));
             }
         }
     }
@@ -260,7 +301,7 @@ export class Staffing {
         }
         return result;
     }
-    /** Costs every block's staff, RIBs, boats and resources, and checks them against the limits. */
+    /** Costs every block's staff and boats, and checks them against the limits. */
     run(scheduled) {
         const { ctx } = this;
         const blocks = this.blocks(scheduled);
@@ -274,37 +315,14 @@ export class Staffing {
         const coaching = [];
         const levels = new Map(ctx.data.plan_staff_levels.map((l) => [l.key, l]));
         const positions = new Map(ctx.data.plan_salaried_positions.map((p) => [p.key, p]));
-        const resources = new Map(ctx.data.plan_resources.map((r) => [r.key, r]));
         const boatClasses = new Map(ctx.data.boat_classes.map((c) => [c.id, c]));
         const boatRates = new Map(ctx.data.plan_boat_rates.map((r) => [r.boat_class_id, r]));
-        const ribKind = ctx.data.rib_resource_kind_id;
         const given = new Map();
         for (const block of byDate(blocks)) {
             const scope = { version_id: block.row.version_id, date: block.row.date };
             const paidHours = block.paid_minutes / 60;
             const waterHours = block.on_water_minutes / 60;
-            // Each cost is split among the block's activities by their offerings' sailors.
-            const book = (type, amount, line, name, explanation, mtdcShare = 1) => {
-                if (amount === 0)
-                    return;
-                const account = ctx.costAccount(type);
-                if (account === undefined)
-                    return;
-                for (const [a, share] of block.shares) {
-                    ctx.book({
-                        cost_center_type: "offering",
-                        cost_center_key: a.offering.key,
-                        account_id: account,
-                        function: ctx.functionFor(account, null, "offering"),
-                        amount: amount * share,
-                        line_key: `${line}:${a.offering.key}`,
-                        line_name: name,
-                        explanation,
-                        mtdc_share: mtdcShare,
-                        wages: type === "coach_wages",
-                    });
-                }
-            };
+            const book = (type, amount, line, name, explanation) => this.book(block, ctx.costAccount(type), amount, line, name, explanation, 1, type === "coach_wages");
             let wages = 0;
             for (const s of block.staff) {
                 if (s.count <= 0)
@@ -350,32 +368,20 @@ export class Staffing {
                     wages += s.count * paidHours * (level.hourly_rate_cents ?? 0);
             }
             book("coach_wages", wages, "coach_wages", "Coach wages", "Staff × paid hours × each one's hourly rate");
-            let ribs = 0;
-            for (const use of block.resources) {
-                const resource = resources.get(use.resource_key);
-                if (resource === undefined) {
-                    this.warnOnce("unknown_resource", `${block.row.name} uses resource ${use.resource_key}, which isn't in the plan`, use.resource_key, scope);
-                    continue;
-                }
-                const rib = ribKind != null && resource.resource_kind_id === ribKind;
-                if (rib)
-                    ribs += use.quantity;
-                const hours = use.hours ?? (rib ? waterHours : paidHours);
-                const cost = use.quantity * (hours * hourlyCost(resource) + (resource.cost_per_day_cents ?? 0));
-                book(rib ? "ribs" : "resources", cost, rib ? "ribs" : `resource:${resource.key}`, rib ? "RIBs" : resource.name, `${resource.name}: quantity × hours × hourly cost, plus a day rate`, resource.excluded_from_mtdc ? 0 : 1);
-            }
             for (const b of block.boats) {
                 const rate = boatRates.get(b.boat_class_id);
                 if (rate === undefined || b.count <= 0 || waterHours <= 0)
                     continue;
-                book("boat_maintenance", b.count * waterHours * rate.maintenance_per_boat_hour_cents, `boats:${b.boat_class_id}`, `Boat maintenance: ${boatClasses.get(b.boat_class_id)?.name ?? "boats"}`, "The organization's boats × on-water hours × the class's maintenance rate");
+                const boatClass = boatClasses.get(b.boat_class_id);
+                this.book(block, boatClass?.account_id ?? ctx.costAccount("boat_maintenance"), b.count * waterHours * (rate.maintenance_per_boat_hour_cents + (rate.fuel_per_hour_cents ?? 0)), `boats:${b.boat_class_id}`, `Boats: ${boatClass?.name ?? "boats"}`, "The organization's boats × on-water hours × the class's fuel and upkeep");
             }
             const coaches = sum(block.staff.map((s) => s.count));
-            const boats = sum(block.boats.map((b) => b.count));
+            const boats = sum(block.boats.map((b) => b.count + (b.chartered ?? 0)));
             for (const [a, share] of block.shares) {
-                given.set(a, { coaches: coaches * share, ribs: ribs * share, boats: boats * share });
+                given.set(a, { coaches: coaches * share, boats: boats * share });
             }
         }
+        this.bookCharters(byDate(blocks));
         this.bookTrips(blocks, scheduled);
         return {
             coaching,
@@ -391,7 +397,6 @@ export class Staffing {
                 on_water_minutes: a.on_water_minutes,
                 uses_boats: a.uses_boats,
                 coaches: given.get(a)?.coaches ?? 0,
-                ribs: given.get(a)?.ribs ?? 0,
                 boats: given.get(a)?.boats ?? 0,
                 block_id: blocks.has(a.stored.block_id ?? "") ? a.stored.block_id : null,
             })),
@@ -508,9 +513,6 @@ function extraCoachMinutes(list) {
     }
     return minutes;
 }
-function hourlyCost(r) {
-    return (r.cost_per_hour_cents ?? 0) + (r.fuel_per_hour_cents ?? 0) + (r.maintenance_per_hour_cents ?? 0);
-}
 export function round2(n) {
     return Math.round(n * 100) / 100;
 }

package/dist/planning/types.d.ts

@@ -52,12 +52,27 @@ export interface QualificationCover {
 export interface BoatClass {
     id: Id;
     name: string;
-    sailors_per_boat: number | null;
+    /** The most sailors one boat can safely take. */
+    max_capacity: number | null;
     footprint_sq_ft: number | null;
+    /** Where its own boats' fuel and upkeep are booked; empty for the boat maintenance cost type's. */
+    account_id?: Id | null;
 }
-export interface ResourceKind {
+/** Something the organization owns: a sailboat, a powerboat, a motor, or other equipment. */
+export interface Asset {
     id: Id;
-    name: string;
+    kind: "sailboat" | "powerboat" | "motor" | "other";
+    name: string | null;
+    /** The day the organization got it, or expects to; empty counts it from the start. */
+    acquired_on: DateString | null;
+    /** The day it stopped being the organization's; empty while it still is. */
+    disposed_on: DateString | null;
+}
+/** A sailboat or powerboat asset's class. */
+export interface Boat {
+    id: Id;
+    asset_id: Id;
+    boat_class_id: Id;
 }
 export interface Organization {
     id: Id;
@@ -88,7 +103,8 @@ export type ActivityKind = "practice" | "regatta" | "clinic" | "travel";
 export interface PlanOffering extends Versioned {
     product_id: Id;
     name: string;
-    season_term: string | null;
+    /** A `plan_terms` key in the Operations Plan, or none. */
+    term_key: Id | null;
     starts_on: DateString;
     ends_on: DateString;
     capacity: number | null;
@@ -133,7 +149,7 @@ export interface PlanActivity extends Versioned {
     /** The block it's staffed in, if any. */
     block_id: Id | null;
 }
-/** Activities on one date that share their staff, RIBs and boats. */
+/** Activities on one date that share their staff and boats. */
 export interface PlanActivityBlock extends Versioned {
     date: DateString;
     name: string;
@@ -149,21 +165,13 @@ export interface PlanBlockStaff extends Versioned {
     /** How a salaried position is paid for the block: out of its salary (the default), or by the hour at its own rate. */
     pay: "salary" | "hourly" | null;
 }
-/** A resource on a block, such as RIBs. */
-export interface PlanBlockResource extends Versioned {
-    block_id: Id;
-    /** A `plan_resources` key. */
-    resource_key: Id;
-    quantity: number;
-    /** Hours each is used; empty for the block's time on the water (RIBs) or its paid time (the rest). */
-    hours: number | null;
-}
-/** Boats of one class on a block: the organization's, and the ones sailors bring. */
+/** Boats of one class on a block: the organization's, the ones it charters, and the ones sailors bring. */
 export interface PlanBlockBoats extends Versioned {
     block_id: Id;
     boat_class_id: Id;
     count: number;
     sailor_owned: number | null;
+    chartered?: number | null;
 }
 export interface PlanLaborLine extends Versioned {
     name: string;
@@ -230,22 +238,15 @@ export interface PlanSalariedBooking extends Versioned {
     kind: "management";
     hours: number;
 }
-export interface PlanResource extends Versioned {
-    resource_kind_id: Id;
-    name: string;
-    quantity: number | null;
-    cost_per_hour_cents: number | null;
-    cost_per_day_cents: number | null;
-    fuel_per_hour_cents: number | null;
-    maintenance_per_hour_cents: number | null;
-    /** Set for a rental, whose cost leaves MTDC. */
-    excluded_from_mtdc: boolean;
-}
+/** A boat class's rates for the year. */
 export interface PlanBoatRate extends Versioned {
     boat_class_id: Id;
+    /** Upkeep for each hour one of the organization's boats of the class is on the water. */
     maintenance_per_boat_hour_cents: number;
-    /** How many boats of the class the organization has. */
-    quantity: number | null;
+    /** Fuel for each hour one is on the water. */
+    fuel_per_hour_cents?: number | null;
+    /** What one costs to charter for a day. */
+    charter_per_day_cents?: number | null;
 }
 /** A group of shared costs, such as G&A, divided among all of the plan's offerings by MTDC. */
 export interface PlanPool extends Versioned {
@@ -281,21 +282,27 @@ export interface PlanClosedDate extends Versioned {
     date: DateString;
     name: string;
 }
+/** A planning period in the Operations Plan, such as Summer 2027, which an offering can be in. */
+export interface PlanTerm extends Versioned {
+    name: string;
+    starts_on: DateString;
+    ends_on: DateString;
+}
 /** The catalog plus every row of the plan versions being calculated. */
 export interface PlanData {
     /** The plan year. Fiscal year N ends in calendar year N. */
     fiscal_year: number;
     organization: Organization;
     organization_cost_accounts: OrganizationCostAccount[];
-    /** The resource kind whose `plan_resources` price RIB hours. */
-    rib_resource_kind_id: Id | null;
     products: Product[];
     program_areas: ProgramArea[];
     accounts: Account[];
     qualifications: Qualification[];
     qualification_covers: QualificationCover[];
     boat_classes: BoatClass[];
-    resource_kinds: ResourceKind[];
+    /** The asset list, with its boats, which the engine counts by class on each day. */
+    assets: Asset[];
+    boats: Boat[];
     /** The plans and versions being calculated, so the engine can tell which plan each offering is in. */
     plans: Plan[];
     plan_versions: PlanVersion[];
@@ -305,7 +312,6 @@ export interface PlanData {
     plan_activities: PlanActivity[];
     plan_activity_blocks: PlanActivityBlock[];
     plan_block_staff: PlanBlockStaff[];
-    plan_block_resources: PlanBlockResource[];
     plan_block_boats: PlanBlockBoats[];
     plan_labor_lines: PlanLaborLine[];
     plan_budget_lines: PlanBudgetLine[];
@@ -314,13 +320,13 @@ export interface PlanData {
     plan_staff_levels: PlanStaffLevel[];
     plan_salaried_positions: PlanSalariedPosition[];
     plan_salaried_bookings: PlanSalariedBooking[];
-    plan_resources: PlanResource[];
     plan_boat_rates: PlanBoatRate[];
     plan_pools: PlanPool[];
     plan_bonus_owners: PlanBonusOwner[];
     plan_bonus_owner_products: PlanBonusOwnerProduct[];
     plan_closed_dates?: PlanClosedDate[];
     plan_capital_items?: PlanCapitalItem[];
+    plan_terms?: PlanTerm[];
 }
 /** One line of cost or revenue for the plan year, on one offering, product, pool or the organization. */
 export interface CostLine {
@@ -370,9 +376,8 @@ export interface ComputedActivity {
     paid_minutes: number;
     on_water_minutes: number;
     uses_boats: boolean;
-    /** Its share of its block's staff, RIBs and boats, by its sailors. */
+    /** Its share of its block's staff and boats, the organization's and chartered, by its sailors. */
     coaches: number;
-    ribs: number;
     boats: number;
     block_id: Id | null;
 }

package/dist/schema/index.d.ts

@@ -1,6 +1,7 @@
 /** Every collection, for `createDirectus<Schema>()`. */
 export interface Schema {
     accounts: Accounts[];
+    assets: Assets[];
     audit_findings: AuditFindings[];
     boat_classes: BoatClasses[];
     boats: Boats[];
@@ -33,7 +34,6 @@ export interface Schema {
     plan_activities: PlanActivities[];
     plan_activity_blocks: PlanActivityBlocks[];
     plan_block_boats: PlanBlockBoats[];
-    plan_block_resources: PlanBlockResources[];
     plan_block_staff: PlanBlockStaff[];
     plan_boat_rates: PlanBoatRates[];
     plan_bonus_owner_products: PlanBonusOwnerProducts[];
@@ -46,7 +46,6 @@ export interface Schema {
     plan_pools: PlanPools[];
     plan_programs: PlanPrograms[];
     plan_rates: PlanRates[];
-    plan_resources: PlanResources[];
     plan_result_capital: PlanResultCapital[];
     plan_result_lines: PlanResultLines[];
     plan_result_pnl: PlanResultPnl[];
@@ -57,6 +56,7 @@ export interface Schema {
     plan_salaried_bookings: PlanSalariedBookings[];
     plan_salaried_positions: PlanSalariedPositions[];
     plan_staff_levels: PlanStaffLevels[];
+    plan_terms: PlanTerms[];
     plan_trips: PlanTrips[];
     plan_versions: PlanVersions[];
     plans: Plans[];
@@ -69,7 +69,6 @@ export interface Schema {
     qualification_covers: QualificationCovers[];
     qualifications: Qualifications[];
     registrations: Registrations[];
-    resource_kinds: ResourceKinds[];
     schools: Schools[];
     sync_leases: SyncLeases[];
     sync_runs: SyncRuns[];
@@ -114,6 +113,31 @@ export interface Accounts {
     /** Kept for history, and closed to new lines. */
     retired: boolean;
 }
+/** Each boat, motor and piece of equipment CSC owns: sailboats, powerboats such as the coach boats, motors, and others such as trailers. Planning counts the boats of each class CSC has on each day. */
+export interface Assets {
+    id: string;
+    /** A sailboat or powerboat also needs a row in Boats. Directus can't check that, so keep them matching. */
+    kind: "sailboat" | "powerboat" | "motor" | "other";
+    /** Its name, if it has one, such as Scooter or the van. */
+    name: string | null;
+    /** This asset's boat details, if it is a sailboat or powerboat. */
+    boats: (string | Boats)[];
+    /** Who made it, such as Zodiac or Yamaha. */
+    make: string | null;
+    /** Its model. A boat's model is its boat class, in Boats. */
+    model: string | null;
+    /** The number that identifies it: a boat's hull number (HIN), a vehicle's VIN, or a serial number. */
+    identifier: string | null;
+    /** The state registration number, such as WN 1234 AB, if it has one. */
+    registration_number: string | null;
+    /** Its book value, as in QuickBooks account 1500. In cents: 12500 is $125.00. */
+    value_cents: number | null;
+    /** The day CSC got it, or expects to. Planning counts it from this day; empty counts it from the start. */
+    acquired_on: string | null;
+    /** The day CSC sold, scrapped, or gave it away. Planning stops counting it on this day. Empty while CSC still has it. */
+    disposed_on: string | null;
+    note: string | null;
+}
 /** Something a sync noticed but didn't fix. A dismissed finding stays dismissed on later runs. */
 export interface AuditFindings {
     id: string;
@@ -132,28 +156,22 @@ export interface AuditFindings {
 export interface BoatClasses {
     id: string;
     name: string;
-    sailors_per_boat: number;
+    /** The most sailors one boat can safely take, such as 4 in an FJ. 0 for a coach boat. */
+    max_capacity: number;
     /** Dry-storage area one boat takes. */
     footprint_sq_ft: string | null;
+    /** Where the fuel and upkeep of CSC's own boats of the class are booked, such as Coach boats for a RIB. Empty books them to boat maintenance. */
+    account_id: string | Accounts | null;
 }
-/** Each boat CSC owns, for planning the year. Sailors' own boats aren't listed here. */
+/** A boat's own details, sail or power: its class and sail number. Sailors' own boats aren't listed here. */
 export interface Boats {
     id: string;
+    /** The asset this boat is. Its kind must be Sailboat or Powerboat. */
+    asset_id: string | Assets;
+    /** Such as Opti, 420, or RIB. */
     boat_class_id: string | BoatClasses;
-    /** The boat's name, if it has one. */
-    name: string | null;
+    /** A sailboat's, if it has one. */
     sail_number: string | null;
-    /** The hull identification number on the transom, if it's known. */
-    hull_number: string | null;
-    /** What the boat is worth. In cents: 12500 is $125.00. */
-    value_cents: number | null;
-    /** The day CSC got the boat. */
-    acquired_on: string | null;
-    /** The day the boat first sailed in a program. */
-    in_service_on: string | null;
-    /** The day CSC stopped using the boat. Empty while it's still in use. */
-    retired_on: string | null;
-    note: string | null;
 }
 /** An offering of a program that plans and Clubspot both point to, such as "J-Pod · fall practices" or "Summer camp · week 3". Each Financial Plan sets its own price, schedule, and size for it, and Clubspot's offerings are linked to it. */
 export interface CatalogOfferings {
@@ -557,20 +575,8 @@ export interface PlanBlockBoats {
     count: number;
     /** How many boats sailors bring. They cost nothing and don't count against the organization's. */
     sailor_owned: number | null;
-}
-/** RIBs and other equipment a block uses. */
-export interface PlanBlockResources {
-    id: string;
-    /** The version this row belongs to. */
-    version_id: string | PlanVersions;
-    /** Stays the same across versions. Copy it where another row asks for this one's Key. */
-    key: string;
-    block_id: string | PlanActivityBlocks;
-    /** The resource it uses: copy the Key from a resource in the Operations Plan. */
-    resource_key: string;
-    quantity: string;
-    /** Hours each is used. Leave it empty for the block's time on the water (RIBs) or its paid time (other equipment). */
-    hours: string | null;
+    /** How many boats of the class the block charters. They cost the class's charter rate for each day, and don't count against the organization's. */
+    chartered: number | null;
 }
 /** Who coaches a block: a number of staff at one staff level, or a salaried position. */
 export interface PlanBlockStaff {
@@ -597,10 +603,12 @@ export interface PlanBoatRates {
     /** Stays the same across versions. Copy it where another row asks for this one's Key. */
     key: string;
     boat_class_id: string | BoatClasses;
-    /** In cents: 12500 is $125.00. */
+    /** Upkeep for each hour one of CSC's boats of the class is on the water. In cents: 12500 is $125.00. */
     maintenance_per_boat_hour_cents: number;
-    /** How many boats of the class the organization has. */
-    quantity: number | null;
+    /** Fuel for each hour one of CSC's boats of the class is on the water. In cents: 12500 is $125.00. */
+    fuel_per_hour_cents: number | null;
+    /** What one boat of the class costs to charter for a day. In cents: 12500 is $125.00. */
+    charter_per_day_cents: number | null;
 }
 /** The products a bonus owner owns. */
 export interface PlanBonusOwnerProducts {
@@ -706,7 +714,8 @@ export interface PlanOfferings {
     key: string;
     product_id: string | Products;
     name: string;
-    season_term: string | null;
+    /** The term it runs in: copy the Key from a term in the Operations Plan. Leave it empty for an offering in no term. */
+    term_key: string | null;
     starts_on: string;
     ends_on: string;
     capacity: number | null;
@@ -758,29 +767,6 @@ export interface PlanRates {
     lodging_per_night_cents: number | null;
     /** In cents: 12500 is $125.00. */
     mileage_rate_cents: number | null;
-    /** The kind of resource whose cost prices coach boat (RIB) hours. */
-    rib_resource_kind_id: string | ResourceKinds | null;
-}
-/** Equipment programs share, such as coach boats, and what an hour or a day of it costs. */
-export interface PlanResources {
-    id: string;
-    /** The version this row belongs to. */
-    version_id: string | PlanVersions;
-    /** Stays the same across versions. Copy it where another row asks for this one's Key. */
-    key: string;
-    resource_kind_id: string | ResourceKinds;
-    name: string;
-    quantity: number | null;
-    /** In cents: 12500 is $125.00. */
-    cost_per_hour_cents: number | null;
-    /** In cents: 12500 is $125.00. */
-    cost_per_day_cents: number | null;
-    /** In cents: 12500 is $125.00. */
-    fuel_per_hour_cents: number | null;
-    /** In cents: 12500 is $125.00. */
-    maintenance_per_hour_cents: number | null;
-    /** Set for a rental, whose cost is left out of modified total direct costs (MTDC). */
-    excluded_from_mtdc: boolean;
 }
 /** The capital list in rank order, in a Financial Plan, with what the year's money covers. A draft's are worked out again a moment after each change to it, and a saved one's when it's saved, and then never change. */
 export interface PlanResultCapital {
@@ -971,6 +957,20 @@ export interface PlanStaffLevels {
     /** In cents: 12500 is $125.00. */
     hourly_rate_cents: number | null;
 }
+/** A planning period, such as Summer 2027, with its start and end dates. An offering in a Program Plan can be in one of its Financial Plan's terms. */
+export interface PlanTerms {
+    id: string;
+    /** The version this row belongs to. */
+    version_id: string | PlanVersions;
+    /** Stays the same across versions. Copy it where another row asks for this one's Key. */
+    key: string;
+    /** What it's called, such as Summer 2027. */
+    name: string;
+    /** Its first day. */
+    starts_on: string;
+    /** Its last day. */
+    ends_on: string;
+}
 /** A trip an offering travels for, such as an away regatta. */
 export interface PlanTrips {
     id: string;
@@ -1105,11 +1105,6 @@ export interface Registrations {
     status: "confirmed" | "waitlist" | "cancelled";
     clubspot_entry_id: string | ClubspotRegistrationEntries;
 }
-/** A kind of shared resource, such as RIB or trailer. */
-export interface ResourceKinds {
-    id: string;
-    name: string;
-}
 /** The schools a sailor can sail for, which families pick from. A school's other names match what families typed on their Clubspot forms. */
 export interface Schools {
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyc-seattle/platform",
-  "version": "1.48.0",
+  "version": "1.50.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",