shawn/canteen-asset-tracker
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: show '— No report yet' for assets without dex_report_date

Browse Source
This commit is contained in:
Shawn
2026-05-23 18:46:58 -04:00
parent 6016f6a5e6
commit a305766d65
5 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classify_makes.py
+5 -5
View File
@@ -88,13 +88,13 @@ DN_PREFIXES = [
'112206', '112510',
# Other DN 11-prefixed: 11 + 4-digit year/week code
]
DN_RULE = _make_rule(DN_PREFIXES, 'DN', 'BevMax/5800/3800/200E', 'GF Bev',
DN_RULE = _make_rule(DN_PREFIXES, 'DN', 'BevMax/5800/3800/200E', 'Bev',
min_len=10, max_len=14)
# Broader DN catch: any 12-13 digit serial starting with '11'
def _dn_broad(sn_clean):
return len(sn_clean) >= 11 and sn_clean.startswith('11') and sn_clean.isdigit()
DN_BROAD = (_dn_broad, 'DN', 'Unknown', 'GF Bev', 'medium')
DN_BROAD = (_dn_broad, 'DN', 'Unknown', 'Bev', 'medium')
# ─── CRANE ─────────────────────────────────────────────────────────────────
# Multiple serial formats for Crane/National machines
@@ -119,12 +119,12 @@ CRANE_222 = (_crane_222, 'Crane', 'Merchant Media', 'Snack', 'high')
# 12-digit: 221XXXXXXXXX (Crane Merchant Media, 472)
def _crane_221(sn_clean):
return len(sn_clean) >= 11 and sn_clean.startswith('221') and sn_clean.isdigit()
CRANE_221 = (_crane_221, 'Crane', 'Merchant Media', 'Snack/GF Food', 'high')
CRANE_221 = (_crane_221, 'Crane', 'Merchant Media', 'Snack/Food', 'high')
# 471/472: dash or 9-digit
def _crane_47(sn_clean):
return (sn_clean.startswith('471') or sn_clean.startswith('472')) and len(sn_clean) >= 8
CRANE_47 = (_crane_47, 'Crane', '471/472', 'GF Food', 'high')
CRANE_47 = (_crane_47, 'Crane', '471/472', 'Food', 'high')
# Dash format: 168-XXXXXX, 167-XXXXXX
def _crane_dash(orig_sn):
@@ -220,7 +220,7 @@ def _dn_8digit_short(sn_clean):
return (len(sn_clean) == 8 and sn_clean.isdigit() and
(sn_clean.startswith('114') or sn_clean.startswith('241') or
sn_clean.startswith('1149') or sn_clean.startswith('2411')))
DN_SHORT_8 = (_dn_8digit_short, 'DN', 'BevMax/5800/3800/200E', 'GF Bev', 'medium')
DN_SHORT_8 = (_dn_8digit_short, 'DN', 'BevMax/5800/3800/200E', 'Bev', 'medium')
# 10-digit 76/77 prefix → DN (e.g., 76820565BD, 76920191BD, 77090262AE)
def _dn_76_77(sn_clean):