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/api/devices.py

@@ -21 +21 @@
 
 
 @device.post("/device", response_model=schemas.Device)
-def create_device(device: schemas.DeviceCreate, db: Session = Depends(get_db)):
+def create_device(device: schemas.DeviceTemp, db: Session = Depends(get_db)):
     """
     Endpoint used for creating new device
     """

server/sql_app/api/licenses_web.py

@@ -60 +60 @@
                                                             "user": current_user})
 
 @licenses_web.post("/licenses-web")
-def create_license(name: str = Form(...), lic_id: str = Form(...), expdate: Optional[date] = Form(None),
+def create_license(name: Optional[str] = Form(""), lic_id: str = Form(...), expdate: Optional[date] = Form(None),
                    db: Session = Depends(get_db), Authorize: AuthJWT = Depends()):
     """
     Endpoint called from create license form. Creates new license and redirects to devices-web endpoint

server/sql_app/crud.py

@@ -376 +376 @@
     return db.query(models.HeadDevice).offset(skip).limit(limit).all()
 
 
-def find_head_device(db: Session, serial: schemas.HeadDeviceBase):
+def find_head_device(db: Session, serial: schemas.HeadDeviceTemp):
     """
     Finds one head device by its serial number
     """
     return db.query(models.HeadDevice).filter(models.HeadDevice.serial_number == serial.serial_number).first()
 
 
-def create_head_device(db: Session, log: schemas.HeadDeviceBase):
+def create_head_device(db: Session, log: schemas.HeadDeviceTemp):
     """
     Creates new head device
     """
@@ -408 +408 @@
     return db.query(models.BodyDevice).offset(skip).limit(limit).all()
 
 
-def find_body_device(db: Session, serial: schemas.BodyDeviceBase):
+def find_body_device(db: Session, serial: schemas.BodyDeviceTemp):
     """
     Finds one body device by its serial number
     """
     return db.query(models.BodyDevice).filter(models.BodyDevice.serial_number == serial.serial_number).first()
 
 
-def create_body_device(db: Session, log: schemas.BodyDeviceBase):
+def create_body_device(db: Session, log: schemas.BodyDeviceTemp):
     """
     Creates new Body device
     """

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

server/sql_app/schemas.py

@@ -97 +97 @@
 
 class BodyDeviceBase(BaseModel):
     serial_number: str
+    inventory_number: str
+    comment: str
 
 
 class BodyDeviceCreate(BodyDeviceBase):
@@ -114 +116 @@
         orm_mode = True
 
 
+class BodyDeviceTemp(BaseModel):
+    serial_number: str
+
+
 class HeadDeviceBase(BaseModel):
     serial_number: str
+    inventory_number: str
+    comment: str
 
 
 class HeadDeviceCreate(HeadDeviceBase):
@@ -133 +141 @@
         orm_mode = True
 
 
+class HeadDeviceTemp(BaseModel):
+    serial_number: str
+
+
 class PCBase(BaseModel):
     username: str
     hostname: str
@@ -189 +201 @@
     """
     id: int
     devices: List[DeviceLicense] = []
+    head_devices: List[HeadDevice] = []
+    body_devices: List[BodyDevice] = []
 
     class Config:
         orm_mode = True
@@ -224 +238 @@
     username: str
     hostname: str
     timestamp: str
-    head_device: HeadDeviceBase
-    body_device: BodyDeviceBase
+    head_device: HeadDeviceTemp
+    body_device: BodyDeviceTemp
     status: str
 
 
@@ -260 +274 @@
 
     class Config:
         orm_mode = True
-

server/templates/body-devices/body_devices.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Devices Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web" selected>Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web" selected>Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>
@@ -43 +67 @@
     </datalist>
   <input type="submit" value="Filter">
 </form>
-<table>
+<table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>Lauterbach Body ID</TH>

server/templates/body-devices/body_devices_normal.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Devices Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web" selected>Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web" selected>Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>
@@ -42 +66 @@
     </datalist>
   <input type="submit" value="Filter">
 </form>
-<table>
+<table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>Lauterbach Body ID</TH>

server/templates/devices/devices.html

@@ -48 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web" selected>Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web" selected>Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>
@@ -65 +65 @@
         <option value="{{dev.serial_number}}"></option>
         {% endfor %}
     </datalist>
-    <label for="lic_name">License Name:</label>
+    <label for="lic_name">License Type:</label>
     <input id="lic_name" name="lic_name" type="text" list="licenses_names" value="" placeholder="all">
     <datalist id="licenses_names">
         {% for license in licenses %}

server/templates/devices/devices_normal.html

@@ -48 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web" selected>Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web" selected>Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>

server/templates/ld-logs/ldlogs.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title> LD Logs Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web" selected>Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>
@@ -57 +81 @@
     </datalist>
   <input type="submit" value="Filter">
 </form>
-    <table>
+    <table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>PC Username</TH>

server/templates/ld-logs/ldlogs_normal.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title> LD Logs Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web" selected>Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>
@@ -56 +80 @@
     </datalist>
   <input type="submit" value="Filter">
 </form>
-    <table>
+    <table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>PC Username</TH>

server/templates/licenses/licenses.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Licenses Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web" selected>Licenses</option>
@@ -33 +57 @@
   </select>
   <input type="submit" value="OK">
 </form>
-<table>
+<table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>License Type</TH>

server/templates/licenses/licenses_normal.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Licenses Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web" selected>Licenses</option>
   </select>
   <input type="submit" value="OK">
 </form>
-<table>
+<table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>Name</TH>

server/templates/pcs/pcs.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Pcs Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web" selected>PCs</option>
       <option value="/licenses-web">Licenses</option>
@@ -33 +57 @@
   </select>
   <input type="submit" value="OK">
 </form>
-<table>
+<table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>Username</TH>

server/templates/pcs/pcs_normal.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Pcs Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web" selected>PCs</option>
       <option value="/licenses-web">Licenses</option>
   </select>
   <input type="submit" value="OK">
 </form>
-<table>
+<table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>Username</TH>

server/templates/teams/teams.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Teams Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web" selected>Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>
@@ -33 +57 @@
   </select>
   <input type="submit" value="OK">
 </form>
-<table>
+<table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>Name</TH>

server/templates/teams/teams_normal.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Teams Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web" selected>Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>
   </select>
   <input type="submit" value="OK">
 </form>
-<table>
+<table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>Name</TH>

server/templates/usb-logs/crossroad.html

@@ -9 +9 @@
   <label for="view">Choose view:</label>
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value=""></option>
-      <option value="/logs-web">Logs</option>
-      <option value="/ldlogs-web">LD Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/logs-web">Vector Logs</option>
+      <option value="/ldlogs-web">Lauterbach Logs</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>

server/templates/usb-logs/logs.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Logs Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web" selected>Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>
@@ -57 +81 @@
     </datalist>
   <input type="submit" value="Filter">
 </form>
-    <table>
+    <table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>PC Username</TH>

server/templates/usb-logs/logs_normal.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Logs Details</title>
 </head>
 <body>
@@ -24 +48 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web" selected>Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>
@@ -56 +80 @@
     </datalist>
   <input type="submit" value="Filter">
 </form>
-    <table>
+    <table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>PC Username</TH>

server/templates/users/users.html

@@ -1 +1 @@
 <html>
 <head>
+    <style>
+        #devices {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#devices td, #devices th {
+  border: 1px solid #ddd;
+  padding: 8px;
+}
+
+#devices tr:nth-child(even){background-color: #f2f2f2;}
+
+#devices tr:hover {background-color: #ddd;}
+
+#devices th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  background-color: #47BBF5;
+  color: black;
+}
+    </style>
     <title>Users Details</title>
 </head>
 <body>
@@ -21 +45 @@
   <select id="view" name="view" onchange="this.form.action=this.value;">
       <option value="/logs-web">Vector Logs</option>
       <option value="/ldlogs-web">Lauterbach Logs</option>
-      <option value="/devices-web">Devices</option>
-      <option value="/body-devices-web">Body Devices</option>
+      <option value="/devices-web">Keyman Devices</option>
+      <option value="/body-devices-web">Lauterbach Devices</option>
       <option value="/teams-web">Teams</option>
       <option value="/pcs-web">PCs</option>
       <option value="/licenses-web">Licenses</option>
@@ -30 +54 @@
   </select>
   <input type="submit" value="OK">
 </form>
-<table>
+<table id="devices">
     <TR>
         <TH>ID</TH>
         <TH>Username</TH>