Dashboard corrections

shopdb/core/api/dashboard.py

@@ -37,6 +37,32 @@ def _count_by_type(assettype):
     return query.count()
 
 
+COUNTEDTYPES = ('machine', 'computer', 'network_device', 'printer',
+                'measuring_tool')
+
+
+def _countedassets():
+    """Base query for the assets the dashboard totals describe.
+
+    The status tiles and the type tiles MUST count the same population. They
+    did not: the totals summed five specific types and subtracted dual-bay
+    secondaries, while the status counts took every asset row of any type with
+    no collapse. So "all assets 704" sat beside "in use 737", and both were
+    correct about different things - which makes them worse than either alone.
+    """
+    from shopdb.core.services.dualpath import (
+        resolve_dualpath_pairs, dualpath_single_machine_enabled)
+
+    query = (db.session.query(Asset).join(AssetType)
+             .filter(Asset.isactive == True,
+                     AssetType.assettype.in_(COUNTEDTYPES)))
+    if dualpath_single_machine_enabled():
+        secondaryassetids = resolve_dualpath_pairs().secondaryassetids
+        if secondaryassetids:
+            query = query.filter(Asset.assetid.notin_(secondaryassetids))
+    return query
+
+
 @dashboard_bp.route('/summary', methods=['GET'])
 @dashboard_bp.route('', methods=['GET'])
 @jwt_required(optional=True)
@@ -49,15 +75,12 @@ def get_dashboard():
     measuringtool_count = _count_by_type('measuring_tool')
     total = machine_count + pc_count + network_count + printer_count + measuringtool_count
 
-    # Count by status
-    status_counts = db.session.query(
-        AssetStatus.status,
-        db.func.count(Asset.assetid)
-    ).outerjoin(
-        Asset,
-        db.and_(Asset.statusid == AssetStatus.statusid, Asset.isactive == True)
-    ).group_by(AssetStatus.status).all()
-    status_dict = {status: count for status, count in status_counts}
+    # Count by status over the SAME population as the totals above, so the
+    # tiles can be read against each other.
+    status_dict = {}
+    for asset in _countedassets().all():
+        name = asset.status.status if asset.status else 'Unknown'
+        status_dict[name] = status_dict.get(name, 0) + 1
 
     # Recent assets
     recent = Asset.query.filter_by(isactive=True).order_by(