Revize eaf8ace4

Added functionality for creating licenses and teams and connecting them to devices a PCs.

server/requirements.txt

@@ -3 +3 @@
 SQLAlchemy==1.4.32
 uvicorn==0.17.6
 psycopg2-binary==2.8.6
-jinja2==3.1.1
+jinja2==3.1.1
+python-multipart==0.0.5

server/sql_app/api/devices_web.py

@@ -11 +11 @@
 from fastapi.templating import Jinja2Templates
 
 models.Base.metadata.create_all(bind=engine)
-templates = Jinja2Templates(directory="../templates/devices")
+templates = Jinja2Templates(directory="templates/devices")
 
 device_web = APIRouter(prefix="/api/v1")
 
@@ -28 +28 @@
 @device_web.get("/devices-web", response_class=HTMLResponse)
 async def read_devices(request: Request, skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     devices = crud.get_devices(db, skip=skip, limit=limit)
-    return templates.TemplateResponse("devices.html", {"request": request, "devs": devices})
+    statuses = []
+    for i in range(0, len(devices)):
+        statuses.append(devices[i].logs[len(devices[i].logs)-1].status)
+    licenses = crud.get_licenses(db, skip=skip, limit=limit)
+    return templates.TemplateResponse("devices.html", {"request": request, "devs": len(devices), "devices": devices,
+                                                       "statuses": statuses, "licenses": licenses})
 
 
 @device_web.post("/devices-web", response_class=HTMLResponse)
@@ -42 +47 @@
                 def_devices.append(dev)
     if lic == "all":
         def_devices = devices
-    return templates.TemplateResponse("devices.html", {"request": request, "devs": def_devices})
+    statuses = []
+    for i in range(0, len(def_devices)):
+        statuses.append(def_devices[i].logs[len(def_devices[i].logs) - 1].status)
+    licenses = crud.get_licenses(db, skip=skip, limit=limit)
+    return templates.TemplateResponse("devices.html", {"request": request, "devs": len(def_devices), "devices": def_devices,
+                                                       "statuses": statuses, "licenses": licenses})
+
+
+@device_web.get("/device-license/{device_id}", response_class=HTMLResponse)
+async def connect_dev_lic(request: Request, device_id: int, db: Session = Depends(get_db)):
+    device = crud.get_device(db, device_id)
+    licenses = crud.get_licenses(db, 0, 100)
+    return templates.TemplateResponse("devicelicense.html",
+                                      {"request": request, "device": device, "licenses": licenses})
+
+
+@device_web.post("/devices-web/{device_id}", response_class=HTMLResponse)
+async def connect_post(request: Request, device_id: int, lic: str = Form(...), skip: int = 0, limit: int = 100,
+                       db: Session = Depends(get_db)):
+    crud.create_device_license(db, device_id, int(lic), datetime.now())
+    devices = crud.get_devices(db, skip=skip, limit=limit)
+    statuses = []
+    for i in range(0, len(devices)):
+        statuses.append(devices[i].logs[len(devices[i].logs) - 1].status)
+    licenses = crud.get_licenses(db, skip=skip, limit=limit)
+    return templates.TemplateResponse("devices.html", {"request": request, "devs": len(devices), "devices": devices,
+                                                       "statuses": statuses, "licenses": licenses})

server/sql_app/api/licenses_web.py

@@ -11 +11 @@
 from fastapi.templating import Jinja2Templates
 
 models.Base.metadata.create_all(bind=engine)
-templates = Jinja2Templates(directory="../templates/licenses")
+templates = Jinja2Templates(directory="templates/licenses")
+device_templates = Jinja2Templates(directory="templates/devices")
 
 licenses_web = APIRouter(prefix="/api/v1")
 
@@ -42 +43 @@
     db_license = crud.create_license(db, name, expdate)
     if db_license is None:
         print("something went wrong")
+    devices = crud.get_devices(db, skip=skip, limit=limit)
+    statuses = []
+    for i in range(0, len(devices)):
+        statuses.append(devices[i].logs[len(devices[i].logs) - 1].status)
     licenses = crud.get_licenses(db, skip=skip, limit=limit)
-    return templates.TemplateResponse("licenses.html", {"request": request, "licenses": licenses})
+    return device_templates.TemplateResponse("devices.html", {"request": request, "devs": len(devices), "devices": devices,
+                                                       "statuses": statuses, "licenses": licenses})

server/sql_app/api/pcs_web.py

@@ -9 +9 @@
 from fastapi.templating import Jinja2Templates
 
 models.Base.metadata.create_all(bind=engine)
-templates = Jinja2Templates(directory="../templates/pcs")
+templates = Jinja2Templates(directory="templates/pcs")
 
 pcs_web = APIRouter(prefix="/api/v1")
 
@@ -27 +27 @@
 async def read_pcs(request: Request, skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     pcs = crud.get_pcs(db, skip=skip, limit=limit)
     return templates.TemplateResponse("pcs.html", {"request": request, "pcs": pcs})
+
+
+@pcs_web.get("/pc-team/{pc_id}", response_class=HTMLResponse)
+async def connect_pc_team(request: Request, pc_id: int, db: Session = Depends(get_db)):
+    pc = crud.get_pc(db, pc_id)
+    teams = crud.get_teams(db, 0, 100)
+    return templates.TemplateResponse("pcteam.html",
+                                      {"request": request, "pc": pc, "teams": teams})
+
+
+@pcs_web.post("/pcs-web/{pc_id}", response_class=HTMLResponse)
+async def connect_post(request: Request, pc_id: int, team: str = Form(...), skip: int = 0, limit: int = 100,
+                       db: Session = Depends(get_db)):
+    old_pc = crud.update_pc(db, pc_id, team)
+    pcs = crud.get_pcs(db, skip=skip, limit=limit)
+    return templates.TemplateResponse("pcs.html", {"request": request, "pcs": pcs})

server/sql_app/api/teams_web.py

@@ -10 +10 @@
 from fastapi.templating import Jinja2Templates
 
 models.Base.metadata.create_all(bind=engine)
-templates = Jinja2Templates(directory="../templates/teams")
+templates = Jinja2Templates(directory="templates/teams")
 
 teams_web = APIRouter(prefix="/api/v1")
 
@@ -28 +28 @@
 async def read_devices(request: Request, skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     teams = crud.get_teams(db, skip=skip, limit=limit)
     return templates.TemplateResponse("teams.html", {"request": request, "teams": teams})
+
+
+@teams_web.get("/team-create", response_class=HTMLResponse)
+async def team_create_web(request: Request):
+    return templates.TemplateResponse("team_create.html", {"request": request})
+
+
+@teams_web.post("/teams-web", response_class=HTMLResponse)
+def create_team(request: Request, name: str = Form(...), skip: int = 0, limit: int = 100,
+                   db: Session = Depends(get_db)):
+    team = crud.create_team(db, name)
+    if team is None:
+        print("something went wrong")
+    teams = crud.get_teams(db, skip=skip, limit=limit)
+    return templates.TemplateResponse("teams.html", {"request": request, "teams": teams})

server/sql_app/api/usb_logs.py

@@ -32 +32 @@
     print(crud.create_device_logs(db=db, item=log, dev_id=dev.id, pc_id=pc.id, date=dat))
 
 
[e-mail]("/ld-logs", response_model=schemas.LDLog)
+def create_ld_logs(log: schemas.LDTempBase, db: Session = Depends(get_db)):
+    head_dev = crud.find_head_device(db, log.head_device)
+    body_dev = crud.find_body_device(db, log.body_device)
+    if head_dev is None:
+        crud.create_head_device(db, log.head_device)
+    if body_dev is None:
+        crud.create_body_device(db, log.body_device)
+
+    pc = crud.find_pc(db, log.username, log.hostname)
+    if pc is None:
+        pc = crud.create_pc(db=db, user=log.username, host=log.hostname)
+    dat = datetime.strptime(log.timestamp, '%Y-%m-%d %H:%M:%S')
+    print(crud.create_ld_logs(db=db, item=log, head_id=head_dev.id, body_id=body_dev.id, pc_id=pc.id, date=dat))
+
+
 @usblogs.get("/logs", response_model=List[schemas.USBLog])
 def read_logs(skip: int = 0, limit: int = 100, db: Session = Depends(get_db)):
     items = crud.get_logs(db, skip=skip, limit=limit)

server/sql_app/api/usb_logs_web.py

@@ -10 +10 @@
 from fastapi.templating import Jinja2Templates
 
 models.Base.metadata.create_all(bind=engine)
-templates = Jinja2Templates(directory="../templates/usb-logs")
+templates = Jinja2Templates(directory="templates/usb-logs")
 
 usblogs_web = APIRouter(prefix="/api/v1")
 

server/sql_app/crud.py

@@ -134 +134 @@
     return db_team
 
 
+def get_head_device(db: Session, head_id: int):
+    return db.query(models.HeadDevice).filter(models.HeadDevice.id == head_id).first()
+
+
+def get_head_devices(db: Session, skip: int = 0, limit: int = 100):
+    return db.query(models.HeadDevice).offset(skip).limit(limit).all()
+
+
+def find_head_device(db: Session, serial: schemas.HeadDeviceBase):
+    return db.query(models.HeadDevice).filter(models.HeadDevice.serial_number == serial.serial_number).first()
+
+
+def create_head_device(db: Session, log: schemas.HeadDeviceBase):
+    db_head = models.HeadDevice(serial_number=log.serial_number)
+    db.add(db_head)
+    db.commit()
+    db.refresh(db_head)
+    return db_head
+
+
+def get_body_device(db: Session, body_id: int):
+    return db.query(models.BodyDevice).filter(models.BodyDevice.id == body_id).first()
+
+
+def get_body_devices(db: Session, skip: int = 0, limit: int = 100):
+    return db.query(models.BodyDevice).offset(skip).limit(limit).all()
+
+
+def find_body_device(db: Session, serial: schemas.BodyDeviceBase):
+    return db.query(models.BodyDevice).filter(models.BodyDevice.serial_number == serial.serial_number).first()
+
+
+def create_body_device(db: Session, log: schemas.BodyDeviceBase):
+    db_body = models.BodyDevice(serial_number=log.serial_number)
+    db.add(db_body)
+    db.commit()
+    db.refresh(db_body)
+    return db_body
+
+
+def get_ld_logs(db: Session, skip: int = 0, limit: int = 100):
+    return db.query(models.LDLog).offset(skip).limit(limit).all()
+
+
+def create_ld_logs(db: Session, item: schemas.LDTempBase, head_id: int, body_id: int, pc_id: int, date: datetime):
+    db_ld = models.LDLog(pc_id=pc_id, timestamp=date, status=item.status, head_id=head_id, body_id=body_id)
+    db.add(db_ld)
+    db.commit()
+    db.refresh(db_ld)
+    return db_ld
+
+
 def get_logs(db: Session, skip: int = 0, limit: int = 100):
     return db.query(models.USBLog).order_by(desc(models.USBLog.timestamp)).offset(skip).limit(limit).all()
 
@@ -184 +236 @@
     db.commit()
     db.refresh(db_log)
     return db_log
-

server/sql_app/main.py

@@ -28 +28 @@
 '''
 if __name__ == "__main__":
     uvicorn.run(app, host="192.168.0.22", port=8000)
-'''
+'''

server/sql_app/models.py

@@ -63 +63 @@
 
     team = relationship("Team", back_populates="pcs")
     logs_pc = relationship("USBLog", back_populates="pc")
+    ld_pc = relationship("LDLog", back_populates="ldpc")
 
 
 class Team(Base):
@@ -71 +72 @@
     id = Column(Integer, primary_key=True, index=True)
     name = Column(String, index=True, nullable=False)
     pcs = relationship("PC", back_populates="team")
+
+
+class HeadDevice(Base):
+    __tablename__ = "head_devices"
+
+    id = Column(Integer, primary_key=True, index=True)
+    serial_number = Column(String, index=True, nullable=False)
+
+    h_logs = relationship("LDLog", back_populates="head_device")
+
+
+class BodyDevice(Base):
+    __tablename__ = "body_devices"
+
+    id = Column(Integer, primary_key=True, index=True)
+    serial_number = Column(String, index=True, nullable=False)
+
+    b_logs = relationship("LDLog", back_populates="body_device")
+
+
+class LDLog(Base):
+    __tablename__ = "ld_logs"
+
+    id = Column(Integer, primary_key=True, index=True)
+    pc_id = Column(Integer, ForeignKey("pc.id"))
+    timestamp = Column(DateTime(timezone=True), server_default=func.now())
+    status = Column(String, index=True, nullable=False)
+    head_id = Column(Integer, ForeignKey("head_devices.id"))
+    body_id = Column(Integer, ForeignKey("body_devices.id"))
+
+    ldpc = relationship("PC", back_populates="ld_pc")
+    head_device = relationship("HeadDevice", back_populates="h_logs")
+    body_device = relationship("BodyDevice", back_populates="b_logs")

server/sql_app/schemas.py

@@ -58 +58 @@
         orm_mode = True
 
 
+class LDLogBase(BaseModel):
+    timestamp: datetime
+    status: str
+
+
+class LDLogCreate(LDLogBase):
+    pass
+
+
+class LDLog(LDLogCreate):
+    id: int
+    head_id: int
+    body_id: int
+
+    class Config:
+        orm_mode = True
+
+
+class BodyDeviceBase(BaseModel):
+    serial_number: str
+
+
+class BodyDeviceCreate(BodyDeviceBase):
+    pass
+
+
+class BodyDevice(BodyDeviceCreate):
+    id: int
+    logs: List[LDLog] = []
+
+    class Config:
+        orm_mode = True
+
+
+class HeadDeviceBase(BaseModel):
+    serial_number: str
+
+
+class HeadDeviceCreate(HeadDeviceBase):
+    pass
+
+
+class HeadDevice(HeadDeviceCreate):
+    id: int
+    logs: List[LDLog] = []
+
+    class Config:
+        orm_mode = True
+
+
 class PCBase(BaseModel):
     username: str
     hostname: str
@@ -127 +177 @@
 
     class Config:
         orm_mode = True
+
+
+class LDTempBase(BaseModel):
+    username: str
+    hostname: str
+    timestamp: str
+    head_device: HeadDeviceBase
+    body_device: BodyDeviceBase
+    status: str
+
+
+class LDTempCreate(LDTempBase):
+    pass
+
+
+class LDTemp(LDTempCreate):
+    id: int
+    head_id: int
+    body_id: int
+
+    class Config:
+        orm_mode = True

server/templates/devices/devicelicense.html

@@ +1 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Device License Connect</title>
+</head>
+<body>
+<h6><p>Vendor ID: {{device.vendor_id}}</p>
+    <p>Product ID: {{device.product_id}}</p>
+    <p>Serial Number: {{device.serial_number}}</p>
+</h6>
+<form action="/api/v1/devices-web/{{device.id}}" method="post">
+  <label for="lic">Licenses:</label>
+  <select id="lic" name="lic">
+      {% for license in licenses %}
+    <option value={{license.id}}>{{license.name}}</option>
+      {% endfor %}
+  </select>
+  <input type="submit" value="Connect">
+</form>
+</body>
+</html>

server/templates/devices/devices.html

@@ -31 +31 @@
         <TH>Product ID</TH>
         <TH>Serial Number</TH>
         <TH>Licenses</TH>
+        <TH>Status</TH>
     </TR>
-    {% for device in devs %}
+    {% for i in range(devs) %}
     <TR>
-        <TD class="ID">{{device.id}}</TD>
-        <TD class="Vendor ID">{{device.vendor_id}}</TD>
-        <TD class="Product ID">{{device.product_id}}</TD>
-        <TD class="Serial Number">{{device.serial_number}}</TD>
+        <TD class="ID"><a href="/api/v1/device-license/{{devices[i].id}}">{{devices[i].id}}</a></TD>
+        <TD class="Vendor ID">{{devices[i].vendor_id}}</TD>
+        <TD class="Product ID">{{devices[i].product_id}}</TD>
+        <TD class="Serial Number">{{devices[i].serial_number}}</TD>
         <TD class="License">
-            {% for lic in device.licenses %}
+            {% for lic in devices[i].licenses %}
                 {{lic.licenses.name}}<BR>
             {% endfor %}
         </TD>
+        <TD class="Status">{{statuses[i]}}</TD>
     </TR>
     {% endfor %}
+    <TR>
+        <TD class="ID"></TD>
+        <TD class="Vendor ID"></TD>
+        <TD class="Product ID"></TD>
+        <TD class="Serial Number"></TD>
+        <TD class="License">
+            <form action="/api/v1/license-create" method="get">
+                <input type="submit" value="Add">
+            </form>
+        </TD>
+    </TR>
 </table>
 </body>
 </html>

server/templates/pcs/pcs.html

@@ -23 +23 @@
     </TR>
     {% for pc in pcs %}
     <TR>
-        <TD class="ID">{{pc.id}}</TD>
+        <TD class="ID"><a href="/api/v1/pc-team/{{pc.id}}">{{pc.id}}</a></TD>
         <TD class="Vendor ID">{{pc.username}}</TD>
         <TD class="Product ID">{{pc.hostname}}</TD>
         {% if pc.team == None %}

server/templates/pcs/pcteam.html

@@ +1 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>PC Team connect</title>
+</head>
+<body>
+<h6><p>Username: {{pc.username}}</p>
+    <p>Hostname: {{pc.hostname}}</p>
+</h6>
+<form action="/api/v1/pcs-web/{{pc.id}}" method="post">
+  <label for="team">Teams:</label>
+  <select id="team" name="team">
+      {% for team in teams %}
+    <option value={{team.id}}>{{team.name}}</option>
+      {% endfor %}
+  </select>
+  <input type="submit" value="Connect">
+</form>
+</body>
+</html>

server/templates/teams/team_create.html

@@ +1 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Create a Team</title>
+</head>
+<body>
+<form action="/api/v1/teams-web" method="post">
+  <label for="name">Name:</label><br>
+  <input type="text" id="name" name="name"><br><br>
+  <input type="submit" value="Submit">
+</form>
+</body>
+</html>

server/templates/teams/teams.html

@@ -26 +26 @@
     </TR>
     {% endfor %}
 </table>
+<form action="/api/v1/team-create" method="get">
+    <input type="submit" value="Add">
+</form>
 </body>
 </html>