From 6e74b4ddd7eba5ba04a3fdb8c287b252000f8626 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sat, 23 Sep 2023 01:03:06 +0200
Subject: [PATCH 1/9] improve validate_color()

---
 var.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/var.py b/var.py
index 56f11b4..d024281 100644
--- a/var.py
+++ b/var.py
@@ -17,7 +17,7 @@ def validate_bool(elem):
 
 
 def validate_color(elem):
-    if not re.search(r'^#(?:[0-9a-fA-F]{3}){1,2}$', elem):
+    if not re.fullmatch(r'^#(?:[0-9a-fA-F]{3}){1,2}$', elem):
         return False
     return True
 

From be328c85e0ee2f2abbd42ef70e8bf7b04d125216 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Mon, 25 Sep 2023 16:07:26 +0200
Subject: [PATCH 2/9] fix #170

---
 client/src/SchoolManager.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/SchoolManager.svelte b/client/src/SchoolManager.svelte
index 982a292..022bd1b 100644
--- a/client/src/SchoolManager.svelte
+++ b/client/src/SchoolManager.svelte
@@ -118,7 +118,7 @@
     function get_school_name_by_id(school_id) {
         for (let school of schools) {
             if (school.id === school_id.toString()) {
-                return school.name
+                return school["display_name"]
             }
         }
         return ""

From a130b75259090b533d3750389488687b3aaee326 Mon Sep 17 00:00:00 2001
From: OfficialFreak <npfreak@t-online.de>
Date: Mon, 25 Sep 2023 16:07:59 +0200
Subject: [PATCH 3/9] removed unused meta variable + renamed all_meta

---
 client/src/App.svelte  | 12 ++++--------
 client/src/Plan.svelte | 10 +++++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/client/src/App.svelte b/client/src/App.svelte
index eab6af9..5b39e95 100644
--- a/client/src/App.svelte
+++ b/client/src/App.svelte
@@ -35,7 +35,6 @@
     let api_base;
     let selected_revision;
     let meta;
-    let all_meta;
     let enabled_dates;
     let grouped_rooms;
     let course_lists;
@@ -62,7 +61,6 @@
         api_base = null;
         selected_revision = ".newest";
         meta = {};
-        all_meta = {};
         enabled_dates = [];
         grouped_rooms = [];
         course_lists = {};
@@ -83,8 +81,7 @@
         let data = localStorage.getItem(`${school_num}_meta`);
         if (data !== "undefined" && data) {
             data = JSON.parse(data);
-            all_meta = data;
-            meta = data.meta;
+            meta = data;
             all_rooms = data.rooms;
             teacher_list = Object.keys(data.teachers);
             grouped_forms = data.forms.grouped_forms;
@@ -105,8 +102,7 @@
                         throw error;
                     }
                 }
-                all_meta = data;
-                meta = data.meta;
+                meta = data;
                 all_rooms = data.rooms;
                 teacher_list = Object.keys(data.teachers);
                 grouped_forms = data.forms.grouped_forms;
@@ -284,7 +280,7 @@
     $: school_num && (api_base = `/api/v69.420/${school_num}`);
     $: school_num && reset_plan_vars();
     $: school_num && get_meta();
-    $: all_revisions = [".newest"].concat((all_meta?.dates || {})[date] || []);
+    $: all_revisions = [".newest"].concat((meta?.dates || {})[date] || []);
     $: school_num && get_preferences();
     $: all_rooms && (grouped_rooms = group_rooms(all_rooms));
     $: $logged_in && get_settings();
@@ -386,7 +382,7 @@
                     </div>
                 </div>
                 {#if $current_page.substring(0, 4) === "plan"}
-                    <Plan bind:api_base bind:school_num bind:date bind:plan_type bind:plan_value bind:all_rooms bind:all_meta bind:selected_revision bind:enabled_dates external_times={$settings.external_times} />
+                    <Plan bind:api_base bind:school_num bind:date bind:plan_type bind:plan_value bind:all_rooms bind:meta bind:selected_revision bind:enabled_dates external_times={$settings.external_times} />
                 {:else}
                     <Weekplan bind:api_base bind:week_start={date} bind:plan_type bind:plan_value />
                 {/if}
diff --git a/client/src/Plan.svelte b/client/src/Plan.svelte
index 9d87c10..6ee3805 100644
--- a/client/src/Plan.svelte
+++ b/client/src/Plan.svelte
@@ -12,7 +12,7 @@
     export let date;
     export let plan_type;
     export let plan_value;
-    export let all_meta;
+    export let meta;
     export let show_title = true;
     export let extra_height = true;
     export let week_letter = "";
@@ -57,10 +57,10 @@
             return;
         }
         // Check the validity of the plan value
-        if((plan_type === "rooms" || plan_type === "teachers") && (!Object.keys(all_meta[plan_type]).includes(entity))) {
+        if((plan_type === "rooms" || plan_type === "teachers") && (!Object.keys(meta[plan_type]).includes(entity))) {
             reset_plan_vars();
             return;
-        } else if((plan_type === "forms") && !Object.keys(all_meta.forms.forms).includes(entity)) {
+        } else if((plan_type === "forms") && !Object.keys(meta.forms.forms).includes(entity)) {
             reset_plan_vars();
             return;
         }
@@ -205,8 +205,8 @@
     let full_teacher_name = null;
     let teacher_contact_link = null;
     $: if (plan_type === "teachers") {
-        full_teacher_name = all_meta.teachers[plan_value]?.surname || null;
-        teacher_contact_link = all_meta.teachers[plan_value]?.contact_link || null;
+        full_teacher_name = meta.teachers[plan_value]?.surname || null;
+        teacher_contact_link = meta.teachers[plan_value]?.contact_link || null;
     }
 
     let preferences_apply = true;

From 6c938e45434d4336a6def6183c20b30377fea043 Mon Sep 17 00:00:00 2001
From: OfficialFreak <npfreak@t-online.de>
Date: Mon, 25 Sep 2023 16:25:38 +0200
Subject: [PATCH 4/9] Update SchoolManager.svelte

---
 client/src/SchoolManager.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/SchoolManager.svelte b/client/src/SchoolManager.svelte
index 022bd1b..6c3db80 100644
--- a/client/src/SchoolManager.svelte
+++ b/client/src/SchoolManager.svelte
@@ -118,7 +118,7 @@
     function get_school_name_by_id(school_id) {
         for (let school of schools) {
             if (school.id === school_id.toString()) {
-                return school["display_name"]
+                return school.display_name
             }
         }
         return ""

From 4b9a1333aa4573a4c7ace6207392f1edda209891 Mon Sep 17 00:00:00 2001
From: OfficialFreak <npfreak@t-online.de>
Date: Mon, 25 Sep 2023 16:37:01 +0200
Subject: [PATCH 5/9] Create 10000000.png

---
 .../images/school_icons/10000000.png            | Bin 0 -> 15552 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 client/public/base_static/images/school_icons/10000000.png

diff --git a/client/public/base_static/images/school_icons/10000000.png b/client/public/base_static/images/school_icons/10000000.png
new file mode 100644
index 0000000000000000000000000000000000000000..eeb05014d3a27a4afe8adbdc8d44d25a0aa2cb0d
GIT binary patch
literal 15552
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
I=sUju2kq^rpa1{>

literal 0
HcmV?d00001


From 390bdddb9cd39589b78938dd4328047b7e1b54d3 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Mon, 25 Sep 2023 16:40:43 +0200
Subject: [PATCH 6/9] fix substitution plan processing

---
 backend/cache.py          | 17 ++++++++---------
 backend/plan_processor.py |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/backend/cache.py b/backend/cache.py
index b3df9c6..b6d6c99 100644
--- a/backend/cache.py
+++ b/backend/cache.py
@@ -56,23 +56,22 @@ def get_plan_file(self,
         """Return the contents of a plan file from the cache."""
         # self._logger.debug(f"get_plan_file({day!r}, {timestamp!r}, {filename!r})")
 
-        if newest_before:
+        if newest_before and not isinstance(timestamp, str):
             timestamps = self.get_timestamps(day)
-            if not isinstance(timestamp, str):
-                timestamps = [t for t in timestamps if t <= timestamp]
+            timestamps = [t for t in timestamps if t <= timestamp]
 
-            for timestamp in timestamps:
+            for older_timestamp in timestamps:
                 try:
-                    return self.get_plan_file(day, timestamp, filename, newest_before=False)
+                    return self.get_plan_file(day, older_timestamp, filename, newest_before=False)
                 except OSError:
                     pass
             else:
                 raise FileNotFoundError
+        else:
+            path = self.get_plan_path(day, timestamp) / filename
 
-        path = self.get_plan_path(day, timestamp) / filename
-
-        with open(path, "r", encoding="utf-8") as f:
-            return f.read()
+            with open(path, "r", encoding="utf-8") as f:
+                return f.read()
 
     def store_meta_file(self, content: str, filename: str):
         """Store a meta file in the cache such as "meta.json"."""
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 53a0bda..8f2f4bc 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -14,7 +14,7 @@
 
 
 class PlanProcessor:
-    VERSION = "74"
+    VERSION = "75"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger
@@ -67,7 +67,7 @@ def compute_plans(self, date: datetime.date, timestamp: datetime.datetime):
             self._logger.warning(f"=> Could not find Indiware form plan for date {date!s} and timestamp {timestamp!s}.")
         else:
             try:
-                vplan_kl = self.cache.get_plan_file(date, timestamp, "VPlanKl.xml", newest_before=True)
+                vplan_kl = self.cache.get_plan_file(date, timestamp, "VplanKl.xml", newest_before=True)
             except FileNotFoundError:
                 vplan_kl = None
             plan_extractor = PlanExtractor(plan_kl, vplan_kl, self.teachers.abbreviation_by_surname(),

From e60d61c2134397cff5a0285f0f54507fb85531bc Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Mon, 25 Sep 2023 16:53:39 +0200
Subject: [PATCH 7/9] MetaExtractor: remove warning when revision does not
 contain plankl file

---
 backend/meta_extractor.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/backend/meta_extractor.py b/backend/meta_extractor.py
index ceea89f..883a7f8 100644
--- a/backend/meta_extractor.py
+++ b/backend/meta_extractor.py
@@ -90,9 +90,6 @@ def iterate_daily_extractors(self) -> typing.Generator[DailyMetaExtractor, None,
                     try:
                         plan_kl = self.cache.get_plan_file(day, timestamp, "PlanKl.xml")
                     except FileNotFoundError:
-                        self._logger.warning(
-                            f"Timestamp {timestamp!s} for day {day!s} has no PlanKl.xml file."
-                        )
                         continue
 
                     extractor = DailyMetaExtractor(plan_kl)

From 09b22c08a74d5781d84f56ddb2935e1073305ae5 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Mon, 25 Sep 2023 17:08:36 +0200
Subject: [PATCH 8/9] fix period parsing issue from substitution plan

---
 backend/vplan_utils.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/vplan_utils.py b/backend/vplan_utils.py
index 82e9557..555bc95 100644
--- a/backend/vplan_utils.py
+++ b/backend/vplan_utils.py
@@ -226,13 +226,16 @@ def periods_to_block_label(periods: list[int]) -> str:
 
 
 def _parse_periods(period_str: str) -> list[int]:
+    def period_str_to_int(string: str) -> int:
+        return int(string.replace("Stunde", "").replace(".", ""))
+
     if not period_str:
         return []
     elif "-" not in period_str:
-        return [int(period_str)]
+        return [period_str_to_int(period_str)]
     else:
         begin, end = period_str.split("-")
-        return list(range(int(begin), int(end) + 1))
+        return list(range(period_str_to_int(begin), period_str_to_int(end) + 1))
 
 
 def parse_periods(period_str: str) -> list[int]:

From e19165ff7b9593a045f412ac269ccc8f172a9d10 Mon Sep 17 00:00:00 2001
From: OfficialFreak <npfreak@t-online.de>
Date: Mon, 25 Sep 2023 18:29:02 +0200
Subject: [PATCH 9/9] #87 #68 Frontend Links in Additional Info

---
 client/src/Plan.svelte | 148 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 142 insertions(+), 6 deletions(-)

diff --git a/client/src/Plan.svelte b/client/src/Plan.svelte
index 6ee3805..81c83c5 100644
--- a/client/src/Plan.svelte
+++ b/client/src/Plan.svelte
@@ -6,6 +6,7 @@
     import { swipe } from 'svelte-gestures';
     import {preferences, settings, title} from './stores.js';
     import {arraysEqual, customFetch, format_date, navigate_page, should_date_be_cached} from "./utils.js";
+    import Dropdown from './Components/Dropdown.svelte';
 
     export let api_base;
     export let school_num;
@@ -126,6 +127,7 @@
                 }
         });
         location.hash = gen_location_hash();
+        console.log(info);
     }
 
     function periods_to_block_label(periods) {
@@ -316,11 +318,43 @@
         {#if info}
             {#if info.additional_info.length > 0}
                 <div class="additional-info">
-                    {#each info.additional_info as cur_info}
-                        {#if cur_info !== null}
-                            {cur_info}
+                    {#each info.processed_additional_info as info_paragraph}
+                        {#if info_paragraph.length > 0}
+                            <div class="inline-wrapper">
+                                {#each info_paragraph as text_segment}
+                                    {#if text_segment.link?.value.length === 1}
+                                        <button class="no-btn-visuals" on:click={() => {
+                                            date = text_segment.link.date;
+                                            plan_type = text_segment.link.type;
+                                            plan_value = text_segment.link.value[0];
+                                        }}>
+                                            <div class="clickable">{text_segment.text}</div>
+                                        </button>
+                                    {:else if text_segment.link?.value.length >= 2}
+                                        <div class="fit-content-width">
+                                            <Dropdown let:toggle small={true} transform_origin_x="50%">
+                                                <button slot="toggle_button" on:click={toggle} class="toggle-button">
+                                                    <span class="grow">{text_segment.text}</span>
+                                                    <span class="material-symbols-outlined dropdown-arrow">arrow_drop_down</span>
+                                                </button>
+    
+                                                {#each text_segment.link.value as item}
+                                                    <button on:click={() => {
+                                                        date=text_segment.link.date;
+                                                        plan_type = text_segment.link.type;
+                                                        plan_value = item;
+                                                    }}>{item}</button>
+                                                {/each}
+                                            </Dropdown>
+                                        </div>
+                                    {:else}
+                                        <button class="no-btn-visuals">{text_segment.text}</button>
+                                    {/if}
+                                {/each}
+                            </div>
+                        {:else}
+                            <div class="info-spacer"></div>
                         {/if}
-                        <br>
                     {/each}
                 </div>
             {/if}
@@ -352,6 +386,106 @@
 </div>
 
 <style lang="scss">
+    .inline-wrapper {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        row-gap: .1em;
+    }
+
+    .info-spacer {
+        height: 5px;
+    }
+
+    .dropdown-arrow {
+        font-size: 1.4em;
+        display: block;
+        transition: transform .2s ease;
+        pointer-events: none;
+
+        @media only screen and (min-width: 1501px) {
+            font-size: 1em;
+            margin-left: .2em;
+         
+            &.centered_txt {
+                position: absolute;
+                right: 10px;
+            }
+        }
+    }
+
+    :global(.open) .dropdown-arrow {
+        transform: rotate(180deg);
+    }
+
+    .fit-content-width {
+        width: fit-content;
+    }
+
+    .fit-content-width .dropdown-wrapper button, .max-width .dropdown-wrapper button {
+        border: none;
+        background: transparent;
+        color: var(--text-color);
+        transition: background-color .2s ease;
+        width: 100%;
+        padding: 2px 0px 2px 5px;
+        font-size: inherit;
+
+        &:hover, &:focus-visible {
+            background-color: rgba(0, 0, 0, 0.5);
+        }
+
+        &.toggle-button {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-between;
+            background: rgba(255, 255, 255, 0.08);
+            border-radius: 5px;
+            overflow: hidden;
+            text-align: left;
+            font-size: inherit;
+            font-weight: inherit;
+            color: var(--text-color);
+
+            span.grow {
+                flex: 1;
+                white-space: nowrap;
+            }
+            
+            &.center-align {
+                text-align: center;
+            }
+
+            &:hover, &:focus-visible {
+                background-color: rgba(255, 255, 255, 0.15);
+            }
+        }
+    }
+
+    .no-btn-visuals {
+        border: 0;
+        background: none;
+        padding: 0;
+        margin: 0;
+        text-align: start;
+        font-size: inherit;
+        color: var(--text-color);
+        white-space: pre;
+        word-break: break-all;
+    }
+
+    .clickable {
+        background: rgba(255, 255, 255, 0.08);
+        border-radius: 5px;
+        padding: 2px 5px;
+        transition: background-color 0.2s ease;
+
+        &:hover, &:focus-visible {
+            background-color: rgba(255, 255, 255, 0.2);
+        }
+    }
+
     .day-controls {
         position: fixed;
         bottom: 0;
@@ -484,16 +618,18 @@
 
     .additional-info {
         position: relative;
-        font-size: clamp(0.938rem, 3vmin, 1.875rem);
+        font-size: var(--font-size-base);
         line-height: 1.5;
         border: clamp(1px, .3vmax, 3px) solid rgba(255, 255, 255, 0.2);
         padding: 10px;
-        padding-top: calc(1vmax + .5rem);
+        padding-top: calc(10px + var(--font-size-md) / 2);
+        padding-bottom: calc(5px + var(--font-size-md) / 2);
         margin-top: 30px;
         border-radius: 5px;
 
         &::before {
             content: "Informationen";
+            font-size: var(--font-size-md);
             color: rgba(255, 255, 255, 0.2);
             background: var(--background);
             padding: 0px 5px;