moved the calendar_url to the props

data/compile.py

@@ -61,7 +61,6 @@ def main():
 
     logging.info("-- 34 Infer more props")
     structure.infer_addresses(data)
-    structure.extract_calendar_url(data)
 
     # TODO: Does it make sense to introduce a type 'sub_building' here?
 
@@ -83,6 +82,7 @@ def main():
     images.add_img(data)
 
     logging.info("-- 80 Generate info card")
+    sections.extract_calendar_urls(data)
     sections.compute_props(data)
     sections.localize_links(data)
 

data/processors/export.py

@@ -107,7 +107,8 @@ def export_for_api(data, path):
         if "roomfinder_data" in export_data[_id]:
             del export_data[_id]["roomfinder_data"]
         if "props" in export_data[_id]:
-            to_delete = [e for e in export_data[_id]["props"].keys() if e not in {"computed", "links", "comment"}]
+            prop_keys_to_keep = {"computed", "links", "comment", "calendar_url"}
+            to_delete = [e for e in export_data[_id]["props"].keys() if e not in prop_keys_to_keep]
             for k in to_delete:
                 del export_data[_id]["props"][k]
 

data/processors/sections.py

@@ -1,6 +1,14 @@
 from utils import TranslatableStr as _
 
 
+def extract_calendar_urls(data):
+    """Extracts the calendar from the tumonline data sets it to the proper value."""
+    for k, entry in data.items():
+        if entry.get("tumonline_data", {}).get("calendar", None):
+            url = f"https://campus.tum.de/tumonline/{entry['tumonline_data']['calendar']}"
+            entry["props"]["calendar_url"] = url
+
+
 def compute_props(data):
     """
     Create the "computed" value in "props".

data/processors/structure.py

@@ -111,11 +111,3 @@ def _get_type(_id, _data):
 
     for _id, _data in data.items():
         _data["type_common_name"] = _get_type(_id, _data)
-
-
-def extract_calendar_url(data):
-    """Extracts the calendar from the tumonline data sets it to the proper value. """
-    for k, entry in data.items():
-        if entry.get("tumonline_data", {}).get("calendar", None):
-            url = f"https://campus.tum.de/tumonline/{entry['tumonline_data']['calendar']}"
-            entry["calendar_url"] = url

openapi.yaml

@@ -442,7 +442,7 @@ paths:
                           text: 'Boltzmannstr. 3, EG, 85748 Garching b. München'
                         - name: Sitzplätze
                           text: '522'
-                    calendar_url: "https://campus.tum.de/tumonline/tvKalender.wSicht?cOrg=19691&cRes=12559&cReadonly=J"
+                      calendar_url: 'https://campus.tum.de/tumonline/tvKalender.wSicht?cOrg=19691&cRes=12559&cReadonly=J'
                     ranking_factors:
                       rank_combined: 900
                       rank_type: 100
@@ -1007,6 +1007,13 @@ components:
             It is used in the rare cases, where some aspect about the rooom/.. or its translation are misleading.  
             An example of a room with a comment is MW1801.
           type: string
+        calendar_url:
+          items:
+            type: string
+            description: A link to the calendar of the room
+          example:
+            - 'https://campus.tum.de/tumonline/tvKalender.wSicht?cOrg=19691&cRes=12543&cReadonly=J'
+            - 'https://campus.tum.de/tumonline/tvKalender.wSicht?cOrg=19691&cRes=12559&cReadonly=J'
       required:
         - computed
     ComputedProp:
@@ -1529,13 +1536,6 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/ImageInfo'
-        calendar_url:
-          items:
-            type: string
-            description: A link to the calendar of the room
-          example:
-            - https://campus.tum.de/tumonline/tvKalender.wSicht?cOrg=19691&cRes=12543&cReadonly=J
-            - https://campus.tum.de/tumonline/tvKalender.wSicht?cOrg=19691&cRes=12559&cReadonly=J
         ranking_factors:
           $ref: '#/components/schemas/RankingFactors'
       required:

webclient/src/views/view/view-view.inc

@@ -96,8 +96,8 @@
       <div class="column col-auto col-ml-auto">
         <a
           class="btn btn-link btn-action btn-sm"
-          v-if="view_data.calendar_url"
-          v-bind:href="view_data.calendar_url"
+          v-if="view_data.props?.calendar_url"
+          v-bind:href="view_data.props.calendar_url"
           target="_blank"
           title="${{ _.view_view.header.calendar }}$"
         >