The equipment plugin is now the machines plugin, ending the UI-vs-code vocabulary split while the contract is pre-1.0 and nothing external depends on the old names. - plugins/equipment -> plugins/machines: manifest, class, /api/machines, machines.* permissions, registry key (with an auto-migrating load shim for existing installs). - Tables: equipment -> machines (equipmentid -> machineid) and equipmenttypes -> machinetypes, renamed in the plugin's own migration chain (machines0002rename), idempotent for both upgrading and fresh installs. - The legacy core machinetypes lookup actually types the vendor MODELS catalog, so it is renamed losslessly to modeltypes (models.modeltypeid, /api/modeltypes, Model Types settings page) rather than collapsed, freeing the machinetypes name. Core migration 7d17_machines_rename also flips data in place: assettypes row equipment -> machine, auditlog entitytype, identifier_/search_ settings keys, permission rows, and renames alembic_version_equipment. - Frontend: machinesApi/modeltypesApi, item.machine response shape, assettype value compares 'equipment' -> 'machine' (map, search, custom fields, relationships), routes machines.js with plugin gating retagged, /print/machine-badge, Machine Types (subtypes) and Model Types (catalog) settings pages, machines-by-type report id. - Docs swept; ADRs left as history per the authoring rule. Upgrade: flask db upgrade then flask plugin upgrade-all. Verified: dev DB flipped live (262 machines, 35 modeltypes, 95 models retyped, zero equipment tables remain); fresh scratch-MySQL install produces the new names; 341 tests green; naming/style green; frontend builds; live E2E on machines list/detail, PC relationships, map, reports, and both settings pages. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
134 lines
4.0 KiB
Python
134 lines
4.0 KiB
Python
"""Machines plugin models."""
|
|
|
|
from shopdb.api import db, BaseModel
|
|
|
|
|
|
class MachineType(BaseModel):
|
|
"""
|
|
Machine type classification.
|
|
|
|
Examples: CNC, CMM, Lathe, Grinder, EDM, Part Marker, etc.
|
|
"""
|
|
__tablename__ = 'machinetypes'
|
|
|
|
machinetypeid = db.Column(db.Integer, primary_key=True)
|
|
machinetype = db.Column(db.String(100), unique=True, nullable=False)
|
|
description = db.Column(db.Text)
|
|
icon = db.Column(db.String(50), comment='Icon name for UI')
|
|
color = db.Column(db.String(20), comment='CSS color for UI/map markers')
|
|
|
|
def __repr__(self):
|
|
return f"<MachineType {self.machinetype}>"
|
|
|
|
|
|
class Machine(BaseModel):
|
|
"""
|
|
Machine-specific extension data.
|
|
|
|
Links to core Asset table via assetid.
|
|
Stores machine-specific fields like type, model, vendor, etc.
|
|
"""
|
|
__tablename__ = 'machines'
|
|
|
|
machineid = db.Column(db.Integer, primary_key=True)
|
|
|
|
# Link to core asset
|
|
assetid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('assets.assetid', ondelete='CASCADE'),
|
|
unique=True,
|
|
nullable=False,
|
|
index=True
|
|
)
|
|
|
|
# Machine classification
|
|
machinetypeid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('machinetypes.machinetypeid'),
|
|
nullable=True
|
|
)
|
|
|
|
# Vendor and model
|
|
vendorid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('vendors.vendorid'),
|
|
nullable=True
|
|
)
|
|
modelnumberid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('models.modelnumberid'),
|
|
nullable=True
|
|
)
|
|
|
|
# Machine-specific fields
|
|
requiresmanualconfig = db.Column(
|
|
db.Boolean,
|
|
default=False,
|
|
comment='Multi-PC machine needs manual configuration'
|
|
)
|
|
islocationonly = db.Column(
|
|
db.Boolean,
|
|
default=False,
|
|
comment='Virtual location marker (not actual machine)'
|
|
)
|
|
|
|
# Maintenance tracking
|
|
lastmaintenancedate = db.Column(db.DateTime, nullable=True)
|
|
nextmaintenancedate = db.Column(db.DateTime, nullable=True)
|
|
maintenanceintervaldays = db.Column(db.Integer, nullable=True)
|
|
|
|
# Controller info (for CNC machines)
|
|
controllervendorid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('vendors.vendorid'),
|
|
nullable=True,
|
|
comment='Controller vendor (e.g., FANUC)'
|
|
)
|
|
controllermodelid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('models.modelnumberid'),
|
|
nullable=True,
|
|
comment='Controller model (e.g., 31B)'
|
|
)
|
|
|
|
# Relationships
|
|
asset = db.relationship(
|
|
'Asset',
|
|
backref=db.backref('machine', uselist=False, lazy='joined')
|
|
)
|
|
machinetype = db.relationship('MachineType', backref='machines')
|
|
vendor = db.relationship('Vendor', foreign_keys=[vendorid], backref='machine_items')
|
|
model = db.relationship('Model', foreign_keys=[modelnumberid], backref='machine_items')
|
|
controllervendor = db.relationship('Vendor', foreign_keys=[controllervendorid], backref='machine_controllers')
|
|
controllermodel = db.relationship('Model', foreign_keys=[controllermodelid], backref='machine_controller_models')
|
|
|
|
__table_args__ = (
|
|
db.Index('idx_machine_type', 'machinetypeid'),
|
|
db.Index('idx_machine_vendor', 'vendorid'),
|
|
)
|
|
|
|
def __repr__(self):
|
|
return f"<Machine {self.assetid}>"
|
|
|
|
def to_dict(self):
|
|
"""Convert to dictionary with related names."""
|
|
result = super().to_dict()
|
|
|
|
# Add related object names
|
|
if self.machinetype:
|
|
result['machinetypename'] = self.machinetype.machinetype
|
|
if self.vendor:
|
|
result['vendorname'] = self.vendor.vendor
|
|
if self.model:
|
|
result['modelname'] = self.model.modelnumber
|
|
if self.model.imageurl:
|
|
result['imageurl'] = self.model.imageurl
|
|
|
|
# Add controller info
|
|
if self.controllervendor:
|
|
result['controllervendorname'] = self.controllervendor.vendor
|
|
if self.controllermodel:
|
|
result['controllermodelname'] = self.controllermodel.modelnumber
|
|
|
|
return result
|