Revize 6ad54e2e

Changed looks of tables with simple css. Added inventory number and comment to Lauterbach devices. Changed connection between lauterbach devices and license.

server/sql_app/models.py

@@ -25 +25 @@
     licenses = relationship("DeviceLicense", back_populates="device_lic")
     team = relationship("Team", back_populates="devices")
 
+
 class USBLog(Base):
     """
     Class defining database table usb_logs
@@ -50 +51 @@
     __tablename__ = "licenses"
 
     id = Column(Integer, primary_key=True, index=True)
-    name = Column(String, index=True, nullable=False)
+    name = Column(String, index=True, nullable=True)
     license_id = Column(String, index=True, nullable=False)
     expiration_date = Column(DateTime(timezone=True), nullable=True)
 
     # relationships for foreign keys, thus connecting table with devices table
     devices = relationship("DeviceLicense", back_populates="licenses")
-    body_devices = relationship("BodyDeviceLicense", back_populates="b_licenses")
+    bodydevice_lic = relationship("BodyDevice", back_populates="license")
+    headdevice_lic = relationship("HeadDevice", back_populates="license")
+
 
 class DeviceLicense(Base):
     """
@@ -75 +78 @@
     licenses = relationship("License", back_populates="devices")
 
 
-class BodyDeviceLicense(Base):
-    """
-    Class defining database table bodydevices_licenses
-    """
-    __tablename__ = "bodydevices_licenses"
-
-    id = Column(Integer, primary_key=True, index=True)
-    bodydevice_id = Column(Integer, ForeignKey("body_devices.id"))
-    license_id = Column(Integer, ForeignKey("licenses.id"))
-    assigned_datetime = Column(String, index=True, nullable=False)
-
-    # relationships for foreign keys, thus connecting table with devices and licenses
-    # tables
-    bodydevice_lic = relationship("BodyDevice", back_populates="debug_licenses")
-    b_licenses = relationship("License", back_populates="body_devices")
-
-
 class PC(Base):
     """
     Class defining database table pc
@@ -118 +104 @@
     name = Column(String, index=True, nullable=False)
 
     devices = relationship("Device", back_populates="team")
+    body_devices = relationship("BodyDevice", back_populates="team")
+    head_devices = relationship("HeadDevice", back_populates="team")
+
 
 class HeadDevice(Base):
     """
@@ -127 +116 @@
 
     id = Column(Integer, primary_key=True, index=True)
     serial_number = Column(String, index=True, nullable=False)
+    inventory_number = Column(String, index=True, nullable=True)
+    comment = Column(String, index=True, nullable=True)
+
+    team_id = Column(Integer, ForeignKey("teams.id"))
+    license_id = Column(Integer, ForeignKey("licenses.id"))
 
     # relationships for foreign keys, thus connecting table with ld_logs table
     h_logs = relationship("LDLog", back_populates="head_device")
+    license = relationship("License", back_populates="headdevice_lic")
+    team = relationship("Team", back_populates="head_devices")
 
 
 class BodyDevice(Base):
@@ -140 +136 @@
 
     id = Column(Integer, primary_key=True, index=True)
     serial_number = Column(String, index=True, nullable=False)
+    inventory_number = Column(String, index=True, nullable=True)
+    comment = Column(String, index=True, nullable=True)
+
+    team_id = Column(Integer, ForeignKey("teams.id"))
+    license_id = Column(Integer, ForeignKey("licenses.id"))
 
     # relationships for foreign keys, thus connecting table with ld_logs table
     b_logs = relationship("LDLog", back_populates="body_device")
-    debug_licenses = relationship("BodyDeviceLicense", back_populates="bodydevice_lic")
+    license = relationship("License", back_populates="bodydevice_lic")
+    team = relationship("Team", back_populates="body_devices")
 
 
 class LDLog(Base):
@@ -165 +167 @@
     head_device = relationship("HeadDevice", back_populates="h_logs")
     body_device = relationship("BodyDevice", back_populates="b_logs")
 
+
 class User(Base):
     """
     Class defining user in database with its own role