Draw a dual-bay secondary where it actually is, and make two counts add up

Three map and aggregation defects. The first is a behaviour change you asked
for; the other two are the 2026-09-03 run's findings.

A dualpath secondary bay was excluded from /api/assets/map unconditionally
while the collapse setting is on, so positioning it was a silent no-op: the
form took the pin, stored mapx/mapy, and the map never drew it. One marker per
pair is right when the pair sits in one place, and that stays the default - but
a dual-bay machine whose second bay is physically elsewhere is exactly what
positioning it separately means. Now: a secondary with its own position draws
its own marker; one without is represented by the primary's, which carries the
combined '2007 / 2008' label. Nothing extra is needed for the fallback, because
the feed already requires mapx/mapy - an unpositioned bay never reaches the
loop.

The combined label is now suppressed when the partner draws its own marker.
Labelling two separate pins '2007 / 2008' would say one machine is in two
places, which is worse than either bay being unlabelled.

Verified against a live instance: unpositioned secondary gives one marker
labelled with both bays; positioned gives two markers each with its own name;
clearing the position puts it back to one. That third case matters - a
one-way door would be its own bug.

machines/dashboard/summary applied the dualpath exclusion to total and bytype
but not to bystatus, so the status bars summed to more than the headline above
them, by exactly the number of secondary bays. A breakdown that does not add up
to its own total is an afternoon of reconciling.

The measuring-tool calibrationstatus filter ran AFTER pagination. It is a
derived value so it cannot be a SQL filter, but applying it to the current
page meant asking for 'overdue' with one overdue tool in sixteen returned an
empty page 1, a total of 16, eight pages, and the row itself on page 3. When
that filter is in play the matching set is now built and filtered before
paging - the same tradeoff the old comment named, spent on correct answers
instead of a cheaper query.

Seven tests. The pagination one verified against the committed version, which
fails it.

Scope: product

plugins/machines/api/routes.py

@@ -553,16 +553,22 @@ def dashboard_summary():
         by_type_query = by_type_query.filter(Asset.assetid.notin_(secondaryassetids))
     by_type = by_type_query.group_by(MachineType.machinetype).all()
 
-    # Count by status
+    # Count by status. The dualpath exclusion applies here too: it was applied
+    # to total and bytype and NOT to this one, so the status bars summed to
+    # more than the total they sit under - by exactly the number of dualpath
+    # secondaries. A breakdown that does not add up to its own headline is the
+    # kind of thing somebody spends an afternoon reconciling.
     from shopdb.api import AssetStatus
-    by_status = db.session.query(
+    by_status_query = db.session.query(
         AssetStatus.status,
         db.func.count(Machine.machineid)
     ).join(Asset, Asset.assetid == Machine.assetid
     ).join(AssetStatus, AssetStatus.statusid == Asset.statusid
-    ).filter(Asset.isactive == True
-    ).group_by(AssetStatus.status
-    ).all()
+    ).filter(Asset.isactive == True)
+    if secondaryassetids:
+        by_status_query = by_status_query.filter(
+            Asset.assetid.notin_(secondaryassetids))
+    by_status = by_status_query.group_by(AssetStatus.status).all()
 
     return success_response({
         'total': total,

plugins/measuringtools/api/routes.py

@@ -182,19 +182,32 @@ def list_tools():
         query = query.filter(Asset.statusid == status_id)
 
     query = query.order_by(Asset.assetnumber)
-    items, total = paginate_query(query, page, per_page)
-
     today = date.today()
-    data = [_merged(tool, today) for tool in items]
 
-    # Calibration status is derived, so it cannot be a SQL filter - apply it
-    # to the built rows. Filtering post-pagination is acceptable here because
-    # the dataset is a gage lab's worth of tools, not a fleet.
+    # Calibration status is DERIVED (see derive_status), so it cannot be a SQL
+    # filter. It used to be applied to the rows of the current page, which
+    # meant the page showed the matches that happened to fall on it while
+    # meta.pagination.total counted the unfiltered set: asking for 'overdue'
+    # with one overdue tool in sixteen returned an empty page 1, a total of 16
+    # and eight pages, with the actual row on page 3. A filter that hides
+    # matching rows and miscounts the rest is worse than no filter.
+    #
+    # So when this filter is in play the whole matching set is built and
+    # filtered before paging. That is the same tradeoff the previous comment
+    # named - a gage lab's worth of tools, not a fleet - spent where it buys
+    # correct answers rather than a cheaper query.
     calibrationstatus = request.args.get('calibrationstatus')
     if calibrationstatus:
-        data = [d for d in data
-                if d['measuringtool']['calibrationstatus'] == calibrationstatus]
+        matched = [_merged(tool, today) for tool in query.all()]
+        matched = [row for row in matched
+                   if row['measuringtool']['calibrationstatus'] == calibrationstatus]
+        total = len(matched)
+        start = (page - 1) * per_page
+        data = matched[start:start + per_page]
+        return paginated_response(data, page, per_page, total)
 
+    items, total = paginate_query(query, page, per_page)
+    data = [_merged(tool, today) for tool in items]
     return paginated_response(data, page, per_page, total)