3f320fcc8b
An asset that carries a model but no vendor was showing a blank the database could already answer: the model records its vendor, and both sides reference the same vendors table. Machines, PCs, printers and network devices now fall back to it. The fallback is FLAGGED, not merged silently. to_dict sets vendorfrommodel and the detail pages render "(from model)" beside the value, because the record itself is still empty: the edit form shows an empty vendor box, and a page implying the vendor is stored would be lying about where it came from. The model's type is exposed under its own name, modeltypename, and shown as a separate "Model type" row. It is deliberately NOT used to fill in the asset's own type. modeltypes is the catalog-wide list covering every kind of asset - it holds "Access Point", "Camera" and "Desktop PC" alongside the machine entries - so it is a different taxonomy from machinetypes. Only about two thirds of the names overlap, and mapping one onto the other would mistype the remainder, with the failure mode being a machine labelled "Desktop PC". scripts/backfill_vendor_from_model.py writes the derived vendor down for real, since the display fallback leaves reports that read vendorid still seeing nothing. It is a dry run unless given --commit, fills only rows where the asset's vendor is NULL and the model names one, and never overwrites a vendor somebody chose. It skips a table lacking either column, so it runs against a server whose network migration has not been applied yet. Verified against the development database by nulling one machine's vendor inside a transaction: it was detected as fillable, restored to exactly its original value, and the rollback left the row untouched. FLASK_ENV is not forced by the script. The app already reads it from .env, and overriding it demanded a SECRET_KEY the environment had no reason to supply.
136 lines
4.3 KiB
Python
136 lines
4.3 KiB
Python
"""Printer plugin models - new Asset-based architecture."""
|
|
|
|
from shopdb.api import db, BaseModel
|
|
|
|
|
|
class PrinterType(BaseModel):
|
|
"""
|
|
Printer type classification.
|
|
|
|
Examples: Laser, Inkjet, Label, MFP, Plotter, etc.
|
|
"""
|
|
__tablename__ = 'printertypes'
|
|
|
|
printertypeid = db.Column(db.Integer, primary_key=True)
|
|
printertype = 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"<PrinterType {self.printertype}>"
|
|
|
|
|
|
class Printer(BaseModel):
|
|
"""
|
|
Printer-specific extension data (new Asset architecture).
|
|
|
|
Links to core Asset table via assetid.
|
|
Stores printer-specific fields like type, Windows name, share name, etc.
|
|
"""
|
|
__tablename__ = 'printers'
|
|
|
|
printerid = 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
|
|
)
|
|
|
|
# Printer classification
|
|
printertypeid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('printertypes.printertypeid'),
|
|
nullable=True
|
|
)
|
|
|
|
# Vendor
|
|
vendorid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('vendors.vendorid'),
|
|
nullable=True
|
|
)
|
|
modelnumberid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('models.modelnumberid'),
|
|
nullable=True
|
|
)
|
|
|
|
# Network identity
|
|
hostname = db.Column(
|
|
db.String(100),
|
|
comment='Network hostname'
|
|
)
|
|
|
|
# Windows/Network naming
|
|
windowsname = db.Column(
|
|
db.String(255),
|
|
comment='Windows printer name (e.g., \\\\server\\printer)'
|
|
)
|
|
sharename = db.Column(
|
|
db.String(100),
|
|
comment='CSF/share name'
|
|
)
|
|
|
|
# Installation
|
|
iscsf = db.Column(db.Boolean, default=False, comment='Is CSF printer')
|
|
installpath = db.Column(db.String(255), comment='Driver install path')
|
|
|
|
# Printer PIN (for secure print)
|
|
pin = db.Column(db.String(20))
|
|
|
|
# Features
|
|
iscolor = db.Column(db.Boolean, default=False, comment='Color capable')
|
|
isduplex = db.Column(db.Boolean, default=False, comment='Duplex capable')
|
|
isnetwork = db.Column(db.Boolean, default=True, comment='Network connected')
|
|
|
|
# Relationships
|
|
asset = db.relationship(
|
|
'Asset',
|
|
backref=db.backref('printer', uselist=False, lazy='joined')
|
|
)
|
|
printertype = db.relationship('PrinterType', backref='printers')
|
|
vendor = db.relationship('Vendor', backref='printer_items')
|
|
model = db.relationship('Model', backref='printer_items')
|
|
|
|
__table_args__ = (
|
|
db.Index('idx_printer_type', 'printertypeid'),
|
|
db.Index('idx_printer_hostname', 'hostname'),
|
|
db.Index('idx_printer_windowsname', 'windowsname'),
|
|
)
|
|
|
|
def __repr__(self):
|
|
return f"<Printer {self.hostname or self.assetid}>"
|
|
|
|
def to_dict(self):
|
|
"""Convert to dictionary with related names."""
|
|
result = super().to_dict()
|
|
|
|
# Add related object names
|
|
if self.printertype:
|
|
result['printertypename'] = self.printertype.printertype
|
|
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
|
|
# The catalog model already knows its maker, so an asset that has a
|
|
# model but no vendor of its own is showing a blank the database can
|
|
# fill. Flagged rather than merged silently: the edit form still has
|
|
# an empty vendor box, and a page implying otherwise would be lying.
|
|
if not self.vendor and self.model.vendor:
|
|
result['vendorname'] = self.model.vendor.vendor
|
|
result['vendorfrommodel'] = True
|
|
# Exposed under its OWN name. modeltypes is the catalog-wide list
|
|
# covering every kind of asset, so it is not interchangeable with
|
|
# this asset's own type and must never be substituted for it.
|
|
if self.model.modeltype:
|
|
result['modeltypename'] = self.model.modeltype.modeltype
|
|
|
|
return result
|