@7365admin1/layer-common 3.2.2-staging.157 → 3.2.2-staging.158

package/components/DashboardMain.vue

@@ -66,7 +66,7 @@
             :y="label.y"
             text-anchor="end"
             alignment-baseline="middle"
-            style="fill: #7e8b96; font-size: 11px; font-weight: 500"
+            style="fill: #64748b; font-size: 11px; font-weight: 500"
           >
             {{ label.text }}
           </text>
@@ -112,14 +112,15 @@
             :x="label.x"
             y="246"
             text-anchor="middle"
-            style="fill: #7e8b96; font-size: 12px; font-weight: 600"
+            style="fill: #64748b; font-size: 12px; font-weight: 600"
           >
             {{ label.text }}
           </text>
         </svg>
         <div class="d-flex align-center justify-center ga-5 mt-2">
           <span
-            class="d-inline-flex align-center ga-2 text-caption font-weight-bold text-blue-grey"
+            class="d-inline-flex align-center ga-2 text-caption font-weight-bold"
+            style="color: #64748b"
           >
             <span
               class="rounded-circle"
@@ -133,7 +134,8 @@
             {{ primaryLegendLabel }}
           </span>
           <span
-            class="d-inline-flex align-center ga-2 text-caption font-weight-bold text-blue-grey"
+            class="d-inline-flex align-center ga-2 text-caption font-weight-bold"
+            style="color: #64748b"
           >
             <span
               class="rounded-circle"
@@ -1621,14 +1623,23 @@ const finalDashboardData = computed<Record<string, any>>(() => {
     ];
   }
 
+  // `weekly-activity` returns each interval twice over: `openWorkOrder` and
+  // `workOrder` are the same not-yet-completed count, `closedWorkOrder` and
+  // `taskCompleted` the same completed count. Carry BOTH names - the Word export
+  // reads `workOrders`/`taskCompleted`, and the open/closed pair is what tells
+  // the chart legend these are work orders and not checklist tasks.
+  const openSeries = weeklyActivity.map(
+    (item: any) => item.workOrder ?? item.openWorkOrder
+  );
+  const closedSeries = weeklyActivity.map(
+    (item: any) => item.taskCompleted ?? item.closedWorkOrder
+  );
   const activityChart = {
     labels: weeklyActivity.map((item: any) => item.day || item.label),
-    workOrders: weeklyActivity.map(
-      (item: any) => item.workOrder ?? item.openWorkOrder
-    ),
-    taskCompleted: weeklyActivity.map(
-      (item: any) => item.taskCompleted ?? item.closedWorkOrder
-    ),
+    workOrders: openSeries,
+    taskCompleted: closedSeries,
+    openWorkOrder: openSeries,
+    closedWorkOrder: closedSeries,
   };
 
   if (isHygieneMode.value) {
@@ -2387,8 +2398,12 @@ const primarySeries = computed(() =>
 const secondarySeries = computed(() =>
   normalizeSeries(activityChart.value.secondary, chartLabels.value.length)
 );
-const primaryLegendLabel = computed(() => "Closed Work Order");
-const secondaryLegendLabel = computed(() => "Open Work Order");
+// The legend must name the series it is drawn beside. These were hard-coded, and
+// hard-coded the wrong way round: the primary line is the OPEN work orders and
+// was labelled "Closed Work Order". `normalizeActivityChart()` already works out
+// what each series is from the payload it found - read that instead of guessing.
+const primaryLegendLabel = computed(() => activityChart.value.primaryLabel);
+const secondaryLegendLabel = computed(() => activityChart.value.secondaryLabel);
 const chartMax = computed(() =>
   Math.max(1, ...primarySeries.value, ...secondarySeries.value)
 );

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.2.2-staging.157",
+  "version": "3.2.2-staging.158",
   "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.",