78a0ee8d83
Feature work from the 2026-07 session: Settings IA - Replace the flat 27-card settings hub with a persistent two-pane shell (SettingsLayout.vue): grouped, searchable left rail + content pane. - Nest all settings/* routes under the shell via router post-processing; shared nav catalog in settingsNav.js. Group by asset class (PCs, Printers, Equipment, Network) so per-type settings stop scattering. Custom fields (core) - customfields + customfieldvalues tables (migration 7d14), CRUD API at /api/customfields, per-asset value get/save. - Settings management page + reusable CustomFieldsSection (detail) and CustomFieldsInputs (form) wired into all four asset types. Warranty (new plugin) - plugins/warranty: warranties + warrantyassets (migration 7d15), derived coverage status, provider abstraction (manual now; Dell/Lenovo/HP stubs). - API CRUD + per-asset panel + report buckets; WarrantyPanel on all four detail pages; Warranties management page; Warranty report + Reports card. - Seed warranty.* permissions. Printer drivers - printerdrivers table (migration 7d13) linked to printer models; drivers now surface on the matching printer's detail page. Other - PCDetail rebalanced (Network + Status + Warranty + custom fields on the right). - Rename PCs list "Features" column to "Remote Access"; fix badge hover underline. - Drop equipment islocationonly field. - Centralize asset-type label/route maps into utils/assetTypes.js. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
71 lines
2.4 KiB
Python
71 lines
2.4 KiB
Python
"""Location + LocationType models."""
|
|
|
|
from shopdb.extensions import db
|
|
from .base import BaseModel
|
|
|
|
|
|
class LocationType(BaseModel):
|
|
"""Location classification (ADR-001 shared reference data).
|
|
|
|
Seeded values: section, cell, subcell, operation, meetingroom, lab,
|
|
office, storage, hallway, networkcloset, building. Sites can extend.
|
|
"""
|
|
__tablename__ = 'locationtypes'
|
|
|
|
locationtypeid = db.Column(db.Integer, primary_key=True)
|
|
locationtype = db.Column(db.String(50), unique=True, nullable=False)
|
|
description = db.Column(db.Text)
|
|
color = db.Column(db.String(20), comment='CSS color for UI')
|
|
|
|
def __repr__(self):
|
|
return f"<LocationType {self.locationtype}>"
|
|
|
|
|
|
class Location(BaseModel):
|
|
"""Physical location model."""
|
|
__tablename__ = 'locations'
|
|
|
|
locationid = db.Column(db.Integer, primary_key=True)
|
|
locationname = db.Column(db.String(100), unique=True, nullable=False)
|
|
building = db.Column(db.String(100))
|
|
floor = db.Column(db.String(50))
|
|
room = db.Column(db.String(50))
|
|
description = db.Column(db.Text)
|
|
|
|
# Classification + tree (ADR-001)
|
|
locationtypeid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('locationtypes.locationtypeid'),
|
|
nullable=True
|
|
)
|
|
parentlocationid = db.Column(
|
|
db.Integer,
|
|
db.ForeignKey('locations.locationid'),
|
|
nullable=True,
|
|
comment='Parent location for the site location tree'
|
|
)
|
|
|
|
# Map configuration
|
|
mapimage = db.Column(db.String(500), comment='Path to floor map image')
|
|
mapwidth = db.Column(db.Integer)
|
|
mapheight = db.Column(db.Integer)
|
|
|
|
# Location-level position used as fallback when an asset has no own coords
|
|
# and no inheritsposition relationship resolves. ADR-001 position resolution
|
|
# chain priority 3.
|
|
mapx = db.Column(db.Integer, comment='Default X coordinate for assets at this location')
|
|
mapy = db.Column(db.Integer, comment='Default Y coordinate for assets at this location')
|
|
|
|
# Relationships
|
|
locationtype = db.relationship('LocationType')
|
|
parent = db.relationship('Location', remote_side=[locationid])
|
|
|
|
def to_dict(self):
|
|
data = super().to_dict()
|
|
data['locationtypename'] = self.locationtype.locationtype if self.locationtype else None
|
|
data['parentlocationname'] = self.parent.locationname if self.parent else None
|
|
return data
|
|
|
|
def __repr__(self):
|
|
return f"<Location {self.locationname}>"
|