Revize 35168e5f

Fixed minor issues. View on keyman devices changed. Changed database for new keyman x license connection.

server/sql_app/api/devices_web.py

@@ -8 +8 @@
 from pydantic import BaseModel
 from sqlalchemy.orm import Session
 from sql_app.api.auth import fake_users_db
-from sql_app import crud, models
+from sql_app import crud, models, schemas
 from ..database import SessionLocal, engine
 
 models.Base.metadata.create_all(bind=engine)
@@ -38 +38 @@
     Authorize.jwt_optional()
     current_user = Authorize.get_jwt_subject()
 
+    device_dict = []
     devices = crud.get_devices(db, skip=skip, limit=limit)
-    statuses = []
-    # adding state for each device in list
-    for i in range(0, len(devices)):
-        statuses.append(devices[i].logs[len(devices[i].logs) - 1].status)
+    teams = crud.get_teams(db, skip=skip, limit=limit)
+    # adding dictionary entry with all inforamtions needed in template
+    for dev in devices:
+        if len(dev.licenses) > 0:
+            for lic in dev.licenses:
+                device_dict.append({"device": dev, "license": lic.licenses, "log": dev.logs[len(dev.logs) - 1]})
+        else:
+            device_dict.append({"device": dev, "license": dev.licenses, "log": dev.logs[len(dev.logs) - 1]})
     licenses = crud.get_licenses(db, skip=skip, limit=limit)
     if current_user == "admin":
-        return templates.TemplateResponse("devices.html", {"request": request, "devs": len(devices), "devices": devices,
-                                                           "statuses": statuses, "licenses": licenses, "user": current_user})
+        return templates.TemplateResponse("devices.html", {"request": request, "devices": device_dict,
+                                                           "licenses": licenses, "devs": devices,
+                                                           "teams": teams, "user": current_user})
     else:
         current_user = "guest"
-        return templates.TemplateResponse("devices_normal.html", {"request": request, "devs": len(devices), "devices": devices,
-                                                                  "statuses": statuses, "licenses": licenses, "user": current_user})
+        return templates.TemplateResponse("devices_normal.html", {"request": request, "devices": device_dict,
+                                                                  "licenses": licenses, "user": current_user})
 
 
 @device_web.post("/devices-web", response_class=HTMLResponse)
-async def filter_devices(request: Request, skip: int = 0, limit: int = 100, lic: str = Form("all"),
+async def filter_devices(request: Request, skip: int = 0, limit: int = 100,
+                         keyman_id: str = Form("all"), lic_name: str = Form("all"),
+                         lic_id: str = Form("all"), team: str = Form("all"),
                          db: Session = Depends(get_db), Authorize: AuthJWT = Depends()):
     """
     Endpoint used for filtering devices by license. returns html template with only
@@ -62 +70 @@
     """
     Authorize.jwt_optional()
     current_user = Authorize.get_jwt_subject()
-    devices = crud.get_devices(db, skip=skip, limit=limit)
-    def_devices = []
+    device_dict = []
+    devices_f = crud.get_filtered_devices(db, keyman_id, lic_name, lic_id, team)
+    ids = []
+    for d in devices_f:
+        ids.append(d[0])
+    devices = crud.get_devices_with_ids(db, ids)
+    teams = crud.get_teams(db, skip=skip, limit=limit)
+    # adding dictionary entry with all inforamtions needed in template
     for dev in devices:
-        for l in dev.licenses:
-            if dev not in def_devices and l.licenses.name == lic:
-                def_devices.append(dev)
-    # if input was default all
-    if lic == "all":
-        def_devices = devices
-    statuses = []
-    for i in range(0, len(def_devices)):
-        statuses.append(def_devices[i].logs[len(def_devices[i].logs) - 1].status)
+        if len(dev.licenses) > 0:
+            for lic in dev.licenses:
+                device_dict.append({"device": dev, "license": lic.licenses, "log": dev.logs[len(dev.logs) - 1]})
+        else:
+            device_dict.append({"device": dev, "license": dev.licenses, "log": dev.logs[len(dev.logs) - 1]})
     licenses = crud.get_licenses(db, skip=skip, limit=limit)
     if current_user == "admin":
-        return templates.TemplateResponse("devices.html",
-                                          {"request": request, "devs": len(def_devices), "devices": def_devices,
-                                           "statuses": statuses, "licenses": licenses, "user": current_user})
+        return templates.TemplateResponse("devices.html", {"request": request, "devices": device_dict,
+                                                           "licenses": licenses, "devs": devices,
+                                                           "teams": teams, "user": current_user})
     else:
         current_user = "guest"
-        return templates.TemplateResponse("devices_normal.html",
-                                          {"request": request, "devs": len(def_devices), "devices": def_devices,
-                                           "statuses": statuses, "licenses": licenses, "user": current_user})
+        return templates.TemplateResponse("devices_normal.html", {"request": request, "devices": device_dict,
+                                                                  "licenses": licenses, "user": current_user})
 
 
 @device_web.get("/device-license/{device_id}", response_class=HTMLResponse)
@@ -98 +107 @@
         return RedirectResponse(url=f"/logs-web", status_code=303)
     device = crud.get_device(db, device_id)
     dev_licenses = crud.get_device_licenses(db, device_id)
-    lic_names = []
+    lic_ids = []
     dev_lics = []
     for dev_lic in dev_licenses:
         dev_lics.append(dev_lic.licenses)
     for dev_lic in dev_licenses:
-        lic_names.append(dev_lic.licenses.name)
+        lic_ids.append(dev_lic.licenses.license_id)
     licenses = crud.get_licenses(db, 0, 100)
     lic_left = []
     for lic in licenses:
-        if lic.name not in lic_names and lic not in lic_left:
+        if lic.license_id not in lic_ids and lic not in lic_left:
             lic_left.append(lic)
+    teams = crud.get_teams(db, 0, 100)
     return templates.TemplateResponse("devicelicense.html",
-                                      {"request": request, "device": device, "licenses": lic_left, "dev_lic": dev_lics})
+                                      {"request": request, "device": device, "licenses": lic_left, "dev_lic": dev_lics,
+                                       "teams": teams})
 
 
 @device_web.post("/devices-web/{device_id}")
@@ -141 +152 @@
         return RedirectResponse(url=f"/logs-web", status_code=303)
     crud.delete_device_license(db, device_id, int(lic_del))
     return RedirectResponse(url=f"/devices-web", status_code=303)
+
+@device_web.post("/devices-web-team/{device_id}")
+async def dev_team_con(device_id: int, team_con: str = Form(...), db: Session = Depends(get_db),
+                      Authorize: AuthJWT = Depends()):
+    """
+    Endpoint called from template for deleting device-license connection. Adds entry to bodydevices_licenses
+    table and redirects to devices-web endpoint
+    """
+    Authorize.jwt_optional()
+    current_user = Authorize.get_jwt_subject()
+    if current_user != "admin":
+        return RedirectResponse(url=f"/logs-web", status_code=303)
+    crud.update_device(db, device_id, team_con)
+    return RedirectResponse(url=f"/devices-web", status_code=303)
+
+@device_web.post("/devices-web-inv/{device_id}")
+async def dev_inv_new(device_id: int, dev_inv: str = Form(...), db: Session = Depends(get_db),
+                      Authorize: AuthJWT = Depends()):
+    """
+    Endpoint called from template for deleting device-license connection. Adds entry to bodydevices_licenses
+    table and redirects to devices-web endpoint
+    """
+    Authorize.jwt_optional()
+    current_user = Authorize.get_jwt_subject()
+    if current_user != "admin":
+        return RedirectResponse(url=f"/logs-web", status_code=303)
+    crud.update_device_inv(db, device_id, dev_inv)
+    return RedirectResponse(url=f"/devices-web", status_code=303)
+
+@device_web.post("/devices-web-comment/{device_id}")
+async def dev_comm_new(device_id: int, dev_com: str = Form(...), db: Session = Depends(get_db),
+                      Authorize: AuthJWT = Depends()):
+    """
+    Endpoint called from template for deleting device-license connection. Adds entry to bodydevices_licenses
+    table and redirects to devices-web endpoint
+    """
+    Authorize.jwt_optional()
+    current_user = Authorize.get_jwt_subject()
+    if current_user != "admin":
+        return RedirectResponse(url=f"/logs-web", status_code=303)
+    crud.update_device_com(db, device_id, dev_com)
+    return RedirectResponse(url=f"/devices-web", status_code=303)