@cyc-seattle/platform 1.39.1 → 1.39.3

package/dist/planning/activities.js

@@ -9,7 +9,7 @@ export function scheduleActivities(ctx) {
     for (const c of ctx.data.plan_closed_dates ?? []) {
         // The closed days are the Operations Plan's, not an area's.
         if (ctx.planOfVersion.get(c.version_id)?.kind === "program_area") {
-            ctx.warn("closed_date_in_area_plan", `${c.name} is a closed day in a program area's plan, so it's ignored`, c.key);
+            ctx.warn("closed_date_in_area_plan", `${c.name} is a closed day in a Program Plan. Only the Operations Plan's closed days count`, c.key);
             continue;
         }
         closed.set(c.date, c.name);
@@ -18,7 +18,7 @@ export function scheduleActivities(ctx) {
     for (const activity of ctx.data.plan_activities) {
         const offering = ctx.offeringsById.get(activity.offering_id);
         if (offering === undefined) {
-            ctx.warn("unknown_offering", `Activity ${activity.key} names a missing offering`, activity.key);
+            ctx.warn("unknown_offering", `Activity ${activity.key} is for an offering that isn't in the plan`, activity.key);
             continue;
         }
         if (!ctx.inYear(offering))
@@ -32,7 +32,7 @@ export function scheduleActivities(ctx) {
         const span = start !== null && end !== null ? end - start : 0;
         const closedFor = closed.get(activity.date);
         if (closedFor !== undefined && activity.kind !== "travel") {
-            ctx.warn("closed_date", `${offering.name}'s ${activity.kind} falls on ${closedFor}, a closed day`, activity.key, {
+            ctx.warn("closed_date", `${offering.name}'s ${activity.kind} is on ${closedFor}, when ${ctx.data.organization.name} is closed`, activity.key, {
                 version_id: activity.version_id,
                 date: activity.date,
             });

package/dist/planning/bonus.js

@@ -79,7 +79,7 @@ function baseOf(ctx, owner) {
             continue;
         const product = ctx.products.get(row.product_id);
         if (plan?.kind === "program_area" && product?.program_area_id !== plan.program_area_id) {
-            ctx.warn("bonus_outside_area", `${owner.role_name}'s bonus names ${product?.name ?? row.product_id}, which isn't in its plan's program area, so it's left out`, owner.key);
+            ctx.warn("bonus_outside_area", `${owner.role_name}'s bonus names ${product?.name ?? row.product_id}, which isn't in this plan's program area, so it's left out`, owner.key);
             continue;
         }
         products.add(row.product_id);

package/dist/planning/context.js

@@ -8,6 +8,17 @@ const ALLOCATION_WARNINGS = new Set([
     "closed_date",
     "position_double_booked",
 ]);
+/** Each cost type as a warning names it. */
+const COST_TYPES = {
+    coach_wages: "coach wages",
+    salaries: "salaries",
+    payroll_tax: "payroll tax",
+    ribs: "RIBs",
+    boat_maintenance: "boat maintenance",
+    resources: "resources",
+    travel: "travel",
+    cogs: "cost of goods sold",
+};
 /** 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. */
@@ -43,7 +54,7 @@ export class Context {
         this.offeringsByKey = new Map(data.plan_offerings.map((o) => [o.key, o]));
         this.rates = data.plan_rates[0];
         if (data.plan_rates.length > 1)
-            this.warn("many_rates", "More than one plan_rates row, so the first is used");
+            this.warn("many_rates", "The Operations Plan has more than one set of rates. Only the first one counts");
         this.costAccounts = new Map(data.organization_cost_accounts
             .filter((c) => c.organization_id === data.organization.id)
             .map((c) => [c.cost_type, c.account_id]));
@@ -52,7 +63,7 @@ export class Context {
     costAccount(type) {
         const account = this.costAccounts.get(type);
         if (account === undefined) {
-            this.warn("no_cost_account", `The organization has no account set for ${type}, so that cost is left out`, type);
+            this.warn("no_cost_account", `${this.data.organization.name} has no account for ${COST_TYPES[type]}, so that cost is left out`, type);
         }
         return account;
     }
@@ -109,7 +120,7 @@ export class Context {
         if (area === undefined)
             return product.revenue_account_id;
         if (product.revenue_account_id != null && product.revenue_account_id !== area.revenue_account_id) {
-            this.warn("revenue_account_differs", `Product ${product.name} has its own revenue account, but its program area ${area.name}'s is used`, product.id);
+            this.warn("revenue_account_differs", `${product.name} has its own revenue account, but its revenue goes to ${area.name}'s account`, product.id);
         }
         return area.revenue_account_id;
     }

package/dist/planning/engine.js

@@ -50,10 +50,10 @@ function checkAreas(ctx) {
         if (product === undefined)
             continue;
         if (product.kind === "program" && product.program_area_id == null) {
-            ctx.warn("program_without_area", `Program ${product.name} has no program area`, product.id);
+            ctx.warn("program_without_area", `${product.name} is a program but has no program area`, product.id);
         }
         else if (product.kind !== "program" && product.program_area_id != null) {
-            ctx.warn("area_on_non_program", `Product ${product.name} isn't a program, but has a program area`, product.id);
+            ctx.warn("area_on_non_program", `${product.name} isn't a program but has a program area`, product.id);
         }
         const plan = ctx.planOfVersion.get(offering.version_id);
         if (plan === undefined)
@@ -62,8 +62,10 @@ function checkAreas(ctx) {
             ? product.program_area_id != null
             : product.program_area_id != null && product.program_area_id !== plan.program_area_id;
         if (wrong) {
-            const where = plan.kind === "operations" ? "the Operations Plan" : "another program area's plan";
-            ctx.warn("offering_in_wrong_plan", `Offering ${offering.name} of ${product.name} is in ${where}`, offering.key);
+            const message = plan.kind === "operations"
+                ? `${offering.name} is in the Operations Plan, but its program is in a program area`
+                : `${offering.name} is in the Program Plan for another program area`;
+            ctx.warn("offering_in_wrong_plan", message, offering.key);
         }
     }
 }
@@ -77,7 +79,7 @@ function summarizePositions(ctx, coaching, charged, bonuses, doubleBooked) {
     ];
     for (const key of new Set(named)) {
         if (!known.has(key)) {
-            ctx.warn("unknown_position", `A block or bonus names missing salaried position ${key}`, key);
+            ctx.warn("unknown_position", `A block or bonus names salaried position ${key}, which isn't in the plan`, key);
         }
     }
     return ctx.data.plan_salaried_positions.map((position) => {

package/dist/planning/lines.js

@@ -31,8 +31,11 @@ export class CostCenterBooker {
         pending.forEach((entry, i) => {
             const w = weights[i] ?? null;
             if (w === null) {
-                const what = entry.cost_center_type === "product" ? "Product" : "Program area";
-                this.ctx.warn(`${entry.cost_center_type}_without_offerings`, `${what} ${entry.cost_center_key} has no offering in the plan year, so ${entry.line_key} stays there`, entry.cost_center_key ?? undefined);
+                const key = entry.cost_center_key ?? "";
+                const name = entry.cost_center_type === "product"
+                    ? (this.ctx.products.get(key)?.name ?? key)
+                    : (this.ctx.areas.get(key)?.name ?? key);
+                this.ctx.warn(`${entry.cost_center_type}_without_offerings`, `${name} has no offerings this year, so ${entry.line_name} isn't split among offerings`, entry.cost_center_key ?? undefined);
                 this.ctx.book(entry);
                 return;
             }
@@ -49,7 +52,7 @@ function checkCostCenter(ctx, type, key, line) {
         (type === "program_area" && key != null && ctx.areas.has(key)) ||
         (type === "pool" && key != null && ctx.data.plan_pools.some((p) => p.key === key));
     if (!known)
-        ctx.warn("unknown_cost_center", `Line ${line} is on a missing ${type} ${key ?? ""}`, line);
+        ctx.warn("unknown_cost_center", `Line ${line} is charged to ${type.replace("_", " ")} ${key ?? ""}, which isn't in the plan`, line);
     return known;
 }
 /**
@@ -65,7 +68,7 @@ export function bookBudgetLines(ctx, booker) {
         const capital = ctx.accountType(line.account_id) === "asset";
         const onOrg = line.cost_center_type === "org" || capital;
         if (capital && line.cost_center_type !== "org") {
-            ctx.warn("capital_off_org", `Line ${line.name} is capital, which only the organization pays for, so it's moved there`, line.key);
+            ctx.warn("capital_off_org", `${line.name} is capital, so it's charged to ${ctx.data.organization.name}, which pays for all capital`, line.key);
         }
         booker.add({
             cost_center_type: onOrg ? "org" : line.cost_center_type,
@@ -88,7 +91,7 @@ export function bookLaborLines(ctx, booker) {
             continue;
         const level = levels.get(line.staff_level_key);
         if (level === undefined) {
-            ctx.warn("unknown_staff_level", `Labor line ${line.key} names a missing staff level`, line.key);
+            ctx.warn("unknown_staff_level", `Labor line ${line.key} has a staff level that isn't in the Operations Plan, so it's left out`, line.key);
             continue;
         }
         booker.add({

package/dist/planning/pools.js

@@ -16,7 +16,7 @@ export function allocatePools(ctx) {
         return;
     ctx.entries.splice(0, ctx.entries.length, ...kept);
     if (total <= 0) {
-        ctx.warn("no_mtdc", "No offering in the plan year has MTDC, so the shared costs stay with the organization");
+        ctx.warn("no_mtdc", `No offering this year has costs that count toward MTDC, so ${ctx.data.organization.name} keeps all the shared costs`);
     }
     for (const e of pooled) {
         const pool = pools.get(e.cost_center_key ?? "");

package/dist/planning/revenue.js

@@ -18,7 +18,7 @@ export function bookRevenue(ctx) {
     for (const offering of ctx.fyOfferings()) {
         const product = ctx.products.get(offering.product_id);
         if (product === undefined) {
-            ctx.warn("unknown_product", `Offering ${offering.key} names a missing product`, offering.key);
+            ctx.warn("unknown_product", `Offering ${offering.key} is for a product that doesn't exist`, offering.key);
             continue;
         }
         const enrollment = ctx.enrollment.get(offering.id) ?? 0;
@@ -28,7 +28,7 @@ export function bookRevenue(ctx) {
             continue;
         const revenueAccount = ctx.revenueAccount(product);
         if (revenueAccount == null) {
-            ctx.warn("no_revenue_account", `Product ${product.name} has no revenue account`, product.id);
+            ctx.warn("no_revenue_account", `${product.name} has no revenue account, so its revenue is left out`, product.id);
             continue;
         }
         const book = (account, amount, line, name, explanation, mtdc_share = 1) => ctx.book({

package/dist/planning/salaried.js

@@ -29,7 +29,7 @@ export function bookSalaries(ctx, coaching, booker) {
                 .filter((b) => b.position_id === position.id)
                 .flatMap((b) => {
                 if ((b.product_id == null) === (b.program_area_id == null)) {
-                    ctx.warn("booking_cost_center", `Booking ${b.key} must name a product or a program area, not both or neither, so it's left out`, b.key);
+                    ctx.warn("booking_cost_center", `Booking ${b.key} needs a product or a program area, but not both. It's left out`, b.key);
                     return [];
                 }
                 return [
@@ -45,13 +45,13 @@ export function bookSalaries(ctx, coaching, booker) {
             }),
         ];
         if (rate === null && charges.length > 0) {
-            ctx.warn("no_paid_hours", `${position.name} has hours charged to programs but no paid_hours_per_year, so they cost nothing`, position.key);
+            ctx.warn("no_paid_hours", `${position.name} has hours charged to programs but no paid hours per year, so those hours cost nothing`, position.key);
         }
         const available = salary * (1 - (position.ga_share ?? 0));
         const demand = charges.reduce((t, c) => t + c.hours * (rate ?? 0), 0);
         const scale = demand > available && demand > 0 ? available / demand : 1;
         if (scale < 1) {
-            ctx.warn("position_overbooked", `${position.name}'s hours charged to programs cost more than its salary after ga_share, so they're scaled down`, position.key);
+            ctx.warn("position_overbooked", `${position.name}'s hours charged to programs cost more than its salary less its G&A share, so they're cut to fit`, position.key);
         }
         const sums = { coaching_hours: 0, coaching_cents: 0, booking_hours: 0, booking_cents: 0 };
         for (const c of charges) {

package/dist/planning/staffing.js

@@ -15,8 +15,15 @@ function sum(values) {
  * ends in "s", such as RIBs; any other name is used as given, since adding an "s" to "Laser Radial" reads wrong.
  */
 function countOf(n, name) {
-    const plural = n !== 1 && /^\S+$/.test(name) && !/s$/i.test(name);
-    return `${n} ${plural ? `${name}s` : name}`;
+    return `${n} ${n === 1 ? name : pluralOf(name)}`;
+}
+function pluralOf(name) {
+    return /^\S+$/.test(name) && !/s$/i.test(name) ? `${name}s` : name;
+}
+const day = new Intl.DateTimeFormat("en-US", { month: "long", day: "numeric", timeZone: "UTC" });
+/** A date as a person says it: "July 13". */
+function dayOf(date) {
+    return day.format(new Date(`${date}T00:00:00Z`));
 }
 /** Names as a sentence lists them: `a`, `a and b`, or `a, b, and c`. */
 function listOf(names) {
@@ -83,11 +90,11 @@ export class Staffing {
                 continue;
             const row = rows.get(id);
             if (row === undefined) {
-                this.ctx.warn("unknown_block", `Activity ${a.stored.key} names a missing block`, a.stored.key);
+                this.ctx.warn("unknown_block", `${a.offering.name}'s ${a.kind} is in a block that isn't in the plan`, a.stored.key);
                 continue;
             }
             if (row.date !== a.date) {
-                this.ctx.warn("block_date_mismatch", `${a.offering.name}'s ${a.kind} is in ${row.name}, which is on ${row.date}`, a.stored.key, { version_id: a.stored.version_id, date: a.date });
+                this.ctx.warn("block_date_mismatch", `${a.offering.name}'s ${a.kind} is in ${row.name}, which is on ${dayOf(row.date)}`, a.stored.key, { version_id: a.stored.version_id, date: a.date });
             }
             members.set(id, [...(members.get(id) ?? []), a]);
         }
@@ -162,14 +169,15 @@ export class Staffing {
         if (sailors <= 0)
             return;
         const scope = { version_id: block.row.version_id, date: block.row.date };
-        const where = offeringsOf(block);
+        // 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"}`;
         let load = 0;
         let counted = 0;
         const required = [];
         for (const o of offerings) {
             const settings = programs.get(o.product_id);
             if (settings?.staff_level_key == null || settings.sailors_per_coach == null || settings.sailors_per_coach <= 0) {
-                this.warnOnce("no_program_settings", `${o.name}'s program has no staff level or sailors per coach, so its sailors aren't checked against its staff`, o.product_id, { version_id: o.version_id, date: block.row.date });
+                this.warnOnce("no_program_settings", `${o.name}'s program has no staff level or sailors per coach. Add both to check that it has enough coaches`, o.product_id, { version_id: o.version_id, date: block.row.date });
                 continue;
             }
             const n = ctx.enrollment.get(o.id) ?? 0;
@@ -188,7 +196,9 @@ export class Staffing {
                 return required.some((r) => this.qualifiedFor(held, level, r)) ? s.count : 0;
             }));
             if (load > qualified + 1e-9) {
-                ctx.warn("over_capacity", `${where}: ${counted} sailors, but the staff can take ${Math.floor((qualified * counted) / load + 1e-9)}`, block.row.key, scope);
+                ctx.warn("over_capacity", qualified === 0
+                    ? `${has} ${countOf(counted, "sailor")} and no coach`
+                    : `${has} ${countOf(counted, "sailor")}, but enough coaches for only ${Math.floor((qualified * counted) / load + 1e-9)}`, block.row.key, scope);
             }
         }
         if (!block.members.some((a) => a.uses_boats))
@@ -198,13 +208,15 @@ export class Staffing {
         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", `Boat class ${classes.get(b.boat_class_id)?.name ?? b.boat_class_id} has no sailors per boat, so its boats take no sailors`, b.boat_class_id, scope);
+                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);
                 continue;
             }
             seats += (b.count + (b.sailor_owned ?? 0)) * perBoat;
         }
         if (sailors > seats) {
-            ctx.warn("over_capacity", `${where}: ${sailors} sailors, but the boats can take ${seats}`, block.row.key, scope);
+            ctx.warn("over_capacity", seats === 0
+                ? `${has} ${countOf(sailors, "sailor")} and no boats`
+                : `${has} ${countOf(sailors, "sailor")}, but the boats hold only ${seats}`, block.row.key, scope);
         }
     }
     /**
@@ -226,10 +238,9 @@ export class Staffing {
                 const peak = mostAtOnce(out);
                 if (peak.total <= have)
                     return;
-                const whose = peak.at.length === 1
-                    ? `, for ${offeringsOf(peak.at[0].block)}`
-                    : `: ${listOf(peak.at.map(({ block, n }) => `${n} for ${offeringsOf(block)}`))}`;
-                const message = `${countOf(peak.total, what)} out, but ${organization} has ${have}${whose}`;
+                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)}`))}`;
                 for (const version of new Set(peak.at.map(({ block }) => block.row.version_id))) {
                     ctx.warn(code, message, what, {
                         version_id: version,
@@ -241,7 +252,7 @@ export class Staffing {
             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 ${classes.get(id)?.name ?? id} the organization has, so they aren't checked`, id, { version_id: b.row.version_id, date });
+                        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)));
@@ -339,7 +350,7 @@ export class Staffing {
                     if (s.pay === "hourly") {
                         const rate = position?.hourly_coaching_rate_cents;
                         if (position !== undefined && rate == null) {
-                            this.warnOnce("no_hourly_rate", `${position.name} is paid by the hour to coach but has no hourly rate, so those hours cost nothing`, position.key, scope);
+                            this.warnOnce("no_hourly_rate", `${position.name} is paid by the hour to coach but has no own hourly coaching rate, so those hours cost nothing`, position.key, scope);
                         }
                         wages += hours * (rate ?? 0);
                         for (const [a, share] of block.shares) {
@@ -367,7 +378,7 @@ export class Staffing {
                 }
                 const level = s.staff_level_key == null ? undefined : levels.get(s.staff_level_key);
                 if (level === undefined) {
-                    this.warnOnce("unknown_staff_level", `${block.row.name} has staff at a missing staff level, so they cost nothing`, s.staff_level_key ?? s.key, scope);
+                    this.warnOnce("unknown_staff_level", `${block.row.name} has staff at a staff level that isn't in the Operations Plan, so they cost nothing`, s.staff_level_key ?? s.key, scope);
                     continue;
                 }
                 if (level.pay_type !== "volunteer")
@@ -378,7 +389,7 @@ export class Staffing {
             for (const use of block.resources) {
                 const resource = resources.get(use.resource_key);
                 if (resource === undefined) {
-                    this.warnOnce("unknown_resource", `${block.row.name} uses missing resource ${use.resource_key}`, use.resource_key, scope);
+                    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;
@@ -439,15 +450,15 @@ export class Staffing {
                     .filter(travel)
                     .map((a) => a.date)
                     .sort()[0];
-                this.warnOnce("trip_without_staff", `${trip.name} has no staff on a travel day's block, so no coach's airfare or lodging is charged`, trip.key, { version_id: trip.version_id, ...(first !== undefined && { date: first }) });
+                this.warnOnce("trip_without_staff", `${trip.name} has no staff on its travel days, so the plan has no airfare or lodging for its coaches`, trip.key, { version_id: trip.version_id, ...(first !== undefined && { date: first }) });
             }
             const lodging = ctx.rates?.lodging_per_night_cents ?? null;
             const mileage = ctx.rates?.mileage_rate_cents ?? null;
             if ((trip.nights ?? 0) > 0 && lodging === null) {
-                this.warnOnce("no_rate", "Trips have nights but no lodging_per_night_cents rate", "lodging_per_night_cents");
+                this.warnOnce("no_rate", "Trips have nights, but the Operations Plan has no lodging per night", "lodging_per_night_cents");
             }
             if ((trip.miles ?? 0) > 0 && mileage === null) {
-                this.warnOnce("no_rate", "Trips have miles but no mileage_rate_cents rate", "mileage_rate_cents");
+                this.warnOnce("no_rate", "Trips have miles, but the Operations Plan has no mileage rate", "mileage_rate_cents");
             }
             const amount = coaches * (trip.airfare_cents ?? 0) +
                 coaches * (trip.nights ?? 0) * (lodging ?? 0) +

package/package.json

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