diff --git a/inventory/models/inventory.py b/inventory/models/inventory.py index d25e8bd..6250edd 100644 --- a/inventory/models/inventory.py +++ b/inventory/models/inventory.py @@ -25,7 +25,7 @@ class Inventory(db.Model): serial: Mapped[Optional[str]] = mapped_column(Unicode(255)) model: Mapped[Optional[str]] = mapped_column(Unicode(255)) notes: Mapped[Optional[str]] = mapped_column(Unicode(255)) - owner_id = mapped_column(Integer, ForeignKey('Users.ID')) + owner_id = mapped_column(Integer, ForeignKey('Users.id')) brand_id: Mapped[Optional[int]] = mapped_column(Integer, ForeignKey("Brands.id")) # Photo: Mapped[Optional[str]] = mapped_column(String(8000)) Will be replacing with something that actually works. location_id: Mapped[Optional[str]] = mapped_column(ForeignKey("Rooms.id")) diff --git a/inventory/models/users.py b/inventory/models/users.py index 4631873..ec9b0e7 100644 --- a/inventory/models/users.py +++ b/inventory/models/users.py @@ -12,13 +12,13 @@ from . import db class User(db.Model): __tablename__ = 'Users' - id: Mapped[int] = mapped_column("ID", Integer, Identity(start=1, increment=1), primary_key=True) - staff: Mapped[Optional[bool]] = mapped_column("Staff", Boolean, server_default=text('((0))')) - active: Mapped[Optional[bool]] = mapped_column("Active", Boolean, server_default=text('((0))')) - last_name: Mapped[Optional[str]] = mapped_column("Last", Unicode(255), nullable=True) - first_name: Mapped[Optional[str]] = mapped_column("First", Unicode(255), nullable=True) + id: Mapped[int] = mapped_column(Integer, Identity(start=1, increment=1), primary_key=True) + staff: Mapped[Optional[bool]] = mapped_column(Boolean, server_default=text('((0))')) + active: Mapped[Optional[bool]] = mapped_column(Boolean, server_default=text('((0))')) + last_name: Mapped[Optional[str]] = mapped_column(Unicode(255), nullable=True) + first_name: Mapped[Optional[str]] = mapped_column(Unicode(255), nullable=True) location_id: Mapped[Optional[int]] = mapped_column(ForeignKey("Rooms.id"), nullable=True) - supervisor_id: Mapped[Optional[int]] = mapped_column("Supervisor", Integer, ForeignKey("Users.ID")) + supervisor_id: Mapped[Optional[int]] = mapped_column(Integer, ForeignKey("Users.id")) supervisor: Mapped[Optional['User']] = relationship('User', remote_side='User.id', back_populates='subordinates') subordinates: Mapped[List['User']] = relationship('User', back_populates='supervisor') diff --git a/inventory/models/work_log.py b/inventory/models/work_log.py index 0b7b675..92e2533 100644 --- a/inventory/models/work_log.py +++ b/inventory/models/work_log.py @@ -12,14 +12,14 @@ from . import db class WorkLog(db.Model): __tablename__ = 'Work Log' - id: Mapped[int] = mapped_column("ID", Integer, Identity(start=1, increment=1), primary_key=True) - start_time: Mapped[Optional[datetime.datetime]] = mapped_column('Start Timestamp', DateTime) - end_time: Mapped[Optional[datetime.datetime]] = mapped_column('End Timestamp', DateTime) - notes: Mapped[Optional[str]] = mapped_column('Description & Notes', Unicode()) - complete: Mapped[Optional[bool]] = mapped_column("Complete", Boolean, server_default=text('((0))')) - followup: Mapped[Optional[bool]] = mapped_column('Needs Follow-Up', Boolean, server_default=text('((0))')) - contact_id: Mapped[Optional[int]] = mapped_column('Point of Contact', Integer, ForeignKey("Users.ID")) - analysis: Mapped[Optional[bool]] = mapped_column('Needs Quick Analysis', Boolean, server_default=text('((0))')) + id: Mapped[int] = mapped_column(Integer, Identity(start=1, increment=1), primary_key=True) + start_time: Mapped[Optional[datetime.datetime]] = mapped_column(DateTime) + end_time: Mapped[Optional[datetime.datetime]] = mapped_column(DateTime) + notes: Mapped[Optional[str]] = mapped_column(Unicode()) + complete: Mapped[Optional[bool]] = mapped_column(Boolean, server_default=text('((0))')) + followup: Mapped[Optional[bool]] = mapped_column(Boolean, server_default=text('((0))')) + contact_id: Mapped[Optional[int]] = mapped_column(Integer, ForeignKey("Users.id")) + analysis: Mapped[Optional[bool]] = mapped_column(Boolean, server_default=text('((0))')) work_item_id: Mapped[Optional[int]] = mapped_column(Integer, ForeignKey("Inventory.id")) work_item: Mapped[Optional['Inventory']] = relationship('Inventory', back_populates='work_logs')