@7365admin1/layer-common 3.2.2-staging.188 → 3.2.2-staging.189

package/components/DashboardMain.vue

@@ -2060,7 +2060,7 @@ const customizeWidgets = computed(() => {
         key: "visitors",
         title: "Visitors",
         description:
-          "See today's visitor traffic and who is currently on site.",
+          "See today's visitor traffic, and how many passes are still not checked out.",
       },
       {
         key: "facilityBookings",
@@ -2117,7 +2117,7 @@ const customizeWidgets = computed(() => {
         key: "visitors",
         title: "Visitors",
         description:
-          "See today's visitor traffic and who is currently on site.",
+          "See today's visitor traffic, and how many passes are still not checked out.",
       },
       {
         key: "patrolCompliance",
@@ -2288,7 +2288,7 @@ function getPropertyKpiCards() {
       color: KPI_TONES.info.color,
       tint: KPI_TONES.info.tint,
       value: formatNumber(toNumber(workOrderMetric?.count)),
-      percentage: toNumber(workOrderMetric?.percentage),
+      percentage: toNumberOrNaN(workOrderMetric?.percentage),
       meta: getMetricMeta(workOrderMetric),
       raw: workOrderMetric,
       filter: undefined,
@@ -2300,7 +2300,7 @@ function getPropertyKpiCards() {
       color: KPI_TONES.err.color,
       tint: KPI_TONES.err.tint,
       value: formatNumber(toNumber(incidentMetric?.count)),
-      percentage: toNumber(incidentMetric?.percentage),
+      percentage: toNumberOrNaN(incidentMetric?.percentage),
       meta: getMetricMeta(incidentMetric),
       raw: incidentMetric,
       filter: undefined,
@@ -2312,7 +2312,7 @@ function getPropertyKpiCards() {
       color: KPI_TONES.warn.color,
       tint: KPI_TONES.warn.tint,
       value: formatNumber(toNumber(visitorMetric?.count)),
-      percentage: toNumber(visitorMetric?.percentage),
+      percentage: toNumberOrNaN(visitorMetric?.percentage),
       meta: getMetricMeta(visitorMetric),
       raw: visitorMetric,
       filter: {
@@ -2331,7 +2331,7 @@ function getPropertyKpiCards() {
       color: KPI_TONES.ok.color,
       tint: KPI_TONES.ok.tint,
       value: formatNumber(toNumber(facilityMetric?.count)),
-      percentage: toNumber(facilityMetric?.percentage),
+      percentage: toNumberOrNaN(facilityMetric?.percentage),
       meta: getMetricMeta(facilityMetric),
       raw: facilityMetric,
       filter: undefined,
@@ -2366,7 +2366,7 @@ function getSecurityKpiCards() {
       color: KPI_TONES.info.color,
       tint: KPI_TONES.info.tint,
       value: formatNumber(toNumber(workOrderMetric?.count)),
-      percentage: toNumber(workOrderMetric?.percentage),
+      percentage: toNumberOrNaN(workOrderMetric?.percentage),
       meta: getMetricMeta(workOrderMetric),
       raw: workOrderMetric,
       filter: undefined,
@@ -2378,7 +2378,7 @@ function getSecurityKpiCards() {
       color: KPI_TONES.err.color,
       tint: KPI_TONES.err.tint,
       value: formatNumber(toNumber(incidentMetric?.count)),
-      percentage: toNumber(incidentMetric?.percentage),
+      percentage: toNumberOrNaN(incidentMetric?.percentage),
       meta: getMetricMeta(incidentMetric),
       raw: incidentMetric,
       filter: undefined,
@@ -2390,7 +2390,7 @@ function getSecurityKpiCards() {
       color: KPI_TONES.warn.color,
       tint: KPI_TONES.warn.tint,
       value: formatNumber(toNumber(visitorMetric?.count)),
-      percentage: toNumber(visitorMetric?.percentage),
+      percentage: toNumberOrNaN(visitorMetric?.percentage),
       meta: getMetricMeta(visitorMetric),
       raw: visitorMetric,
       filter: {
@@ -2408,8 +2408,10 @@ function getSecurityKpiCards() {
       icon: "mdi-office-building",
       color: KPI_TONES.ok.color,
       tint: KPI_TONES.ok.tint,
-      value: `${toNumber(patrolMetric?.count)}%`,
-      percentage: toNumber(patrolMetric?.percentage),
+      // Through the shared helper, so a `null` rate (no checkpoint was due)
+      // reads as not-measured here too, not as 0%.
+      value: getMetricValue(patrolMetric, "patrolCompliance"),
+      percentage: toNumberOrNaN(patrolMetric?.percentage),
       meta: getMetricMeta(patrolMetric),
       raw: patrolMetric,
       filter: undefined,
@@ -2436,7 +2438,7 @@ const rawKpiCards = computed(() => {
       tint: getCardTint(mapping.color, index),
       color: mapping.color || getCardColor(index),
       value: typeof value === "string" ? value : formatNumber(value),
-      percentage: toNumber(metric.percentage),
+      percentage: toNumberOrNaN(metric.percentage),
       meta: getMetricMeta(metric),
       raw: metric,
       filter: undefined as any,
@@ -2917,7 +2919,9 @@ function getMetric(keys: string[]): DashboardMetric {
 
 function getMetricValue(metric: DashboardMetric, key?: string) {
   if (key === "patrolCompliance") {
-    return `${formatNumber(toNumber(metric.count))}%`;
+    const rate = toNumberOrNaN(metric.count);
+    // `null` = no checkpoint was due in this period. Not 0%, not 100%.
+    return Number.isFinite(rate) ? `${formatNumber(rate)}%` : "—";
   }
   const completed = toNumber(metric.completed);
   const total = toNumber(metric.total);
@@ -2935,11 +2939,18 @@ function getMetricMeta(metric: DashboardMetric) {
     parts.push(`${formatNumber(toNumber(metric.inProgress))} in progress`);
   if (typeof metric.pending !== "undefined")
     parts.push(`${formatNumber(toNumber(metric.pending))} pending`);
-  if (typeof metric.highSeverity !== "undefined")
+  // `null` here is the API saying incident severity is not recorded at all.
+  // Printing "0 high severity" would answer a question nothing measured.
+  if (metric.highSeverity !== undefined && metric.highSeverity !== null)
     parts.push(`${formatNumber(toNumber(metric.highSeverity))} high severity`);
-  if (typeof metric.currentlyOnSite !== "undefined")
+  // NOT a live occupancy figure. The server counts every visitor transaction
+  // with a check-in and no check-out, with NO date bound, and nothing in the
+  // product ever closes a stale one - so a pass left open years ago is still
+  // in here. Say what it counts. Same wording the Visitor Management screen
+  // already uses for the same filter ("Not Checked Out").
+  if (metric.currentlyOnSite !== undefined && metric.currentlyOnSite !== null)
     parts.push(
-      `${formatNumber(toNumber(metric.currentlyOnSite))} currently on site`
+      `${formatNumber(toNumber(metric.currentlyOnSite))} not checked out (all time)`
     );
   if (
     typeof (metric as any).missedCheckpoints !== "undefined" ||
@@ -3905,6 +3916,21 @@ function toNumber(value: any) {
   return Number.isFinite(n) ? n : 0;
 }
 
+/**
+ * A figure the server may report as "not measured".
+ *
+ * `toNumber()` turns `null` into `0`, which is wrong for anything the API
+ * deliberately sends as `null` - a trend with no prior period to compare
+ * against, a compliance rate with no checkpoint due, a severity the incident
+ * form never records. Those must read as absent, not as zero. `NaN` is what
+ * the tile already treats as "no pill" / "no figure".
+ */
+function toNumberOrNaN(value: any) {
+  if (value === null || value === undefined || value === "") return NaN;
+  const n = Number(value);
+  return Number.isFinite(n) ? n : NaN;
+}
+
 function normalizeStatus(value: any) {
   const text = String(value || "").trim();
   if (!text) return "To-Do";

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.2.2-staging.188",
+  "version": "3.2.2-staging.189",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",