Merge branch 'main' into json-db

TUM-Dev · May 7, 2024 · ba4255a · ba4255a
2 parents 7cec603 + 1941e5f
commit ba4255a
Show file tree

Hide file tree

Showing 4 changed files with 292 additions and 387 deletions.
diff --git a/data/processors/tumonline.py b/data/processors/tumonline.py
@@ -104,6 +104,7 @@ def merge_tumonline_rooms(data: dict[str, dict[str, Any]]) -> None:
             "name": f"{room_code} ({room.alt_name})",
             "parents": data[b_id]["parents"] + [b_id],
             "tumonline_data": {
+                "tumonline_id": room.tumonline_id,
                 "roomcode": room_code,
                 "arch_name": room.arch_name,
                 "alt_name": room.alt_name,
@@ -151,9 +152,6 @@ def merge_tumonline_rooms(data: dict[str, dict[str, Any]]) -> None:
             logging.error(f"Unknown usage for room '{room['roomcode']}': Id '{room['usage']}'")
             continue
 
-        if "extended" in room:
-            r_data["tumonline_data"]["extended"] = room.extended
-
         # TUMonline data does not overwrite the existing data when merged
         recursively_merge(data, {r_data["id"]: r_data}, overwrite=False)
 

diff --git a/server/Cargo.lock b/server/Cargo.lock
diff --git a/webclient/package.json b/webclient/package.json
@@ -25,17 +25,17 @@
     "nightwind": "1.1.13",
     "nuxt": "3.11.2",
     "sharp": "0.33.3",
-    "swagger-ui": "5.17.3",
+    "swagger-ui": "5.17.6",
     "swaggerdark": "github:octycs/SwaggerDark#f02d394c8ff698cdd93e09c2188b058d2d686ca3",
-    "vue": "3.4.26",
+    "vue": "3.4.27",
     "vue-router": "4.3.2",
     "vue3-carousel": "0.3.3"
   },
   "devDependencies": {
     "@nuxt/eslint": "0.3.10",
     "@nuxtjs/i18n": "8.3.1",
     "@nuxtjs/tailwindcss": "6.12.0",
-    "@types/node": "20.12.8",
+    "@types/node": "20.12.10",
     "@types/swagger-ui": "3.52.4",
     "@vue/tsconfig": "0.5.1",
     "autoprefixer": "10.4.19",