@cyc-seattle/platform 1.38.0 → 1.38.1

package/dist/planning/activities.js

@@ -32,7 +32,10 @@ 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} has an activity on ${activity.date}, a closed day: ${closedFor}`, activity.key, { version_id: activity.version_id, date: activity.date });
+            ctx.warn("closed_date", `${offering.name}'s ${activity.kind} falls on ${closedFor}, a closed day`, activity.key, {
+                version_id: activity.version_id,
+                date: activity.date,
+            });
         }
         const usesBoats = activity.kind !== "travel" && activity.uses_boats;
         result.push({

package/dist/planning/staffing.js

@@ -10,6 +10,22 @@ function sum(values) {
         total += v;
     return total;
 }
+/**
+ * `n` of something, in words: "9 Sailqubes", "1 Opti". Only a one-word name is made plural, and not one that already
+ * 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}`;
+}
+/** Names as a sentence lists them: `a`, `a and b`, or `a, b, and c`. */
+function listOf(names) {
+    return names.length <= 2 ? names.join(" and ") : `${names.slice(0, -1).join(", ")}, and ${names.at(-1)}`;
+}
+/** The offerings a block holds, by name, so a warning about it says whose it is. */
+function offeringsOf(block) {
+    return listOf([...new Set(block.members.map((a) => a.offering.name))]);
+}
 function groupBy(rows, key) {
     const groups = new Map();
     for (const row of rows)
@@ -71,7 +87,7 @@ export class Staffing {
                 continue;
             }
             if (row.date !== a.date) {
-                this.ctx.warn("block_date_mismatch", `${a.offering.name}'s activity on ${a.date} 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 ${row.date}`, a.stored.key, { version_id: a.stored.version_id, date: a.date });
             }
             members.set(id, [...(members.get(id) ?? []), a]);
         }
@@ -114,7 +130,7 @@ export class Staffing {
             const block = a.stored.block_id == null ? undefined : blocks.get(a.stored.block_id);
             if (block !== undefined && sum(block.staff.map((s) => s.count)) > 0)
                 continue;
-            this.ctx.warn("unallocated_activity", `${a.offering.name}'s ${a.kind} on ${a.date} has no staff`, a.stored.key, {
+            this.ctx.warn("unallocated_activity", `${a.offering.name}'s ${a.kind} has no staff`, a.stored.key, {
                 version_id: a.stored.version_id,
                 date: a.date,
             });
@@ -146,7 +162,7 @@ export class Staffing {
         if (sailors <= 0)
             return;
         const scope = { version_id: block.row.version_id, date: block.row.date };
-        const where = `${block.row.date}, ${block.row.name}`;
+        const where = offeringsOf(block);
         let load = 0;
         let counted = 0;
         const required = [];
@@ -172,7 +188,7 @@ 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 its staff can take ${Math.floor((qualified * counted) / load + 1e-9)}`, block.row.key, scope);
+                ctx.warn("over_capacity", `${where}: ${counted} sailors, but the staff can take ${Math.floor((qualified * counted) / load + 1e-9)}`, block.row.key, scope);
             }
         }
         if (!block.members.some((a) => a.uses_boats))
@@ -188,7 +204,7 @@ export class Staffing {
             seats += (b.count + (b.sailor_owned ?? 0)) * perBoat;
         }
         if (sailors > seats) {
-            ctx.warn("over_capacity", `${where}: ${sailors} sailors, but its boats can take ${seats}`, block.row.key, scope);
+            ctx.warn("over_capacity", `${where}: ${sailors} sailors, but the boats can take ${seats}`, block.row.key, scope);
         }
     }
     /**
@@ -201,6 +217,7 @@ export class Staffing {
         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 organization = ctx.data.organization.name;
         for (const [date, list] of dates) {
             const check = (code, what, have, used) => {
                 if (have == null)
@@ -209,9 +226,12 @@ export class Staffing {
                 const peak = mostAtOnce(out);
                 if (peak.total <= have)
                     return;
-                const names = peak.at.map(({ block, n }) => `${block.row.name} ${n}`).join(", ");
+                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}`;
                 for (const version of new Set(peak.at.map(({ block }) => block.row.version_id))) {
-                    ctx.warn(code, `${date}: ${peak.total} ${what} out, but the organization has ${have} (${names})`, what, {
+                    ctx.warn(code, message, what, {
                         version_id: version,
                         date: date,
                     });
@@ -258,7 +278,7 @@ export class Staffing {
             const total = result.get(key) ?? { hours: 0, dates: 0 };
             result.set(key, { hours: total.hours + hours, dates: total.dates + 1 });
             for (const version of new Set(list.map((b) => b.row.version_id))) {
-                this.ctx.warn("position_double_booked", `${names.get(key) ?? key} coaches ${clash[0].row.name} and ${clash[1].row.name} at the same time on ${date}` +
+                this.ctx.warn("position_double_booked", `${names.get(key) ?? key} coaches ${clash[0].row.name} and ${clash[1].row.name} at the same time` +
                     (hours > 0 ? `, so another coach is needed for ${round2(hours)} hours` : ""), key, { version_id: version, date });
             }
         }

package/package.json

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