From 28e3b64780e3439eae737198b40fa7899be1b9e1 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sat, 30 Sep 2023 00:44:02 +0200
Subject: [PATCH 01/61] Favourites work-in-progress in frontend

---
 client/src/App.svelte               |  60 ++-----
 client/src/Favourites.svelte        | 254 ++++++++++++++++++++++++++++
 client/src/components/Navbar.svelte |   1 +
 client/src/components/Plan.svelte   |  24 ++-
 client/src/utils.js                 |  30 +++-
 5 files changed, 316 insertions(+), 53 deletions(-)
 create mode 100644 client/src/Favourites.svelte

diff --git a/client/src/App.svelte b/client/src/App.svelte
index bbf8c4d..5b9f9e8 100644
--- a/client/src/App.svelte
+++ b/client/src/App.svelte
@@ -6,17 +6,18 @@
     import Navbar from "./components/Navbar.svelte";
     import Settings from "./components/Settings.svelte";
     import AboutUs from "./components/AboutUs.svelte";
+    import Favourites from "./Favourites.svelte";
     import SveltyPicker from 'svelty-picker';
     import {get_settings, group_rooms, update_colors, navigate_page, init_indexed_db, clear_plan_cache} from "./utils.js";
     import {notifications} from './notifications.js';
     import {logged_in, title, current_page, preferences, settings, active_modal, pwa_prompt, indexed_db} from './stores.js'
-    import {customFetch, format_revision_date} from "./utils.js";
     import SchoolManager from "./components/SchoolManager.svelte";
     import Preferences from "./components/Preferences.svelte";
     import Changelog from "./components/Changelog.svelte";
     import Select from "./base_components/Select.svelte";
     import Contact from "./components/Contact.svelte";
     import Impressum from "./components/Impressum.svelte";
+    import {customFetch, format_revision_date, load_meta} from "./utils.js";
     import {de} from 'svelty-picker/i18n';
     import PwaInstallHelper from "./components/PWAInstallHelper.svelte";
     import Dropdown from "./base_components/Dropdown.svelte";
@@ -84,51 +85,22 @@
     }
 
     function get_meta() {
-        let data_from_cache = false;
-        let data = localStorage.getItem(`${school_num}_meta`);
-        if (data !== "undefined" && data) {
-            data = JSON.parse(data);
-            meta = data;
-            all_rooms = data.rooms;
-            teacher_list = Object.keys(data.teachers);
-            grouped_forms = data.forms.grouped_forms;
-            enabled_dates = Object.keys(data.dates);
-            if(!date) {
-                date = data.date;
-            }
-            course_lists = data.forms.forms;
-            data_from_cache = true;
-        }
-        customFetch(`${api_base}/meta`)
+        load_meta(school_num)
             .then(data => {
-                // console.log("Meta geladen");
-                try {
-                    localStorage.setItem(`${school_num}_meta`, JSON.stringify(data));
-                } catch (error) {
-                    if (error.name === 'QuotaExceededError' ) {
-                        notifications.danger("Die Schulmetadaten konnten nicht gecached werden.")
-                    } else {
-                        throw error;
-                    }
+                if (!data) {
+                    return
                 }
-                meta = data;
-                all_rooms = data.rooms;
-                teacher_list = Object.keys(data.teachers);
-                grouped_forms = data.forms.grouped_forms;
-                enabled_dates = Object.keys(data.dates);
+                meta = data[0];
+                all_rooms = meta.rooms;
+                teacher_list = Object.keys(meta.teachers);
+                grouped_forms = meta.forms.grouped_forms;
+                enabled_dates = Object.keys(meta.dates);
                 if(!date) {
-                    date = data.date;
+                    date = meta.date;
                 }
-                course_lists = data.forms.forms;
+                course_lists = meta.forms.forms;
+                //data_from_cache = data[1];
             })
-            .catch(error => {
-                if (data_from_cache) {
-                    // notifications.info("Metadaten aus Cache geladen", 2000);
-                    console.log("Metadaten aus Cache geladen");
-                } else {
-                    notifications.danger(error.message);
-                }
-            });
     }
 
     function check_login_status() {
@@ -293,7 +265,7 @@
             plan_type = decodeURI(tmp_variables[3]);
             plan_value = decodeURI(tmp_variables[4]);
         }
-    }  
+    }
 
     $logged_in = localStorage.getItem('logged_in') === 'true';
     init_vars();
@@ -311,7 +283,7 @@
     $: (Object.keys($settings).length !== 0) && localStorage.setItem("settings", `${JSON.stringify($settings)}`);
     $: update_colors($settings);
     $: $logged_in && get_greeting();
-    
+
     $: selected_form && set_plan("forms", selected_form);
     $: gen_form_arr(grouped_forms);
     $: selected_teacher && set_plan("teachers", selected_teacher);
@@ -372,6 +344,8 @@
             <AboutUs />
         {:else if $current_page === "impressum"}
             <Impressum />
+        {:else if $current_page === "favourites"}
+            <Favourites />
         {:else if $logged_in}
             {#if $current_page.substring(0, 4) === "plan" || $current_page === "weekplan"}
                 <h1 class="responsive-heading">{emoji} {greeting}</h1>
diff --git a/client/src/Favourites.svelte b/client/src/Favourites.svelte
new file mode 100644
index 0000000..8fd6a4f
--- /dev/null
+++ b/client/src/Favourites.svelte
@@ -0,0 +1,254 @@
+<script>
+    import {load_meta} from "./utils.js";
+    import Select from "./base_components/Select.svelte";
+    import Button from "./base_components/Button.svelte";
+    import {onMount} from "svelte";
+    import {title} from "./stores.js";
+
+    let favourites = [
+        //{"school_num": "10001329", "name": "Arthur", "priority": 0, "plan_type": "forms", "plan_value": "JG12", "preferences": {}}
+    ]
+    $: console.log(favourites);
+    let school_nums = [];
+    $: school_nums = [...new Set(favourites.map(obj => obj.school_num))];
+    let all_meta = {};
+    let duplicated_courses_match = {};
+    $: update_meta(school_nums);
+
+    let preferences = {};
+
+    onMount(() => {
+        load_favourites();
+    });
+
+    function get_pseudo_favourites_from_server() {
+        return [
+            //{"school_num": "10001329", "name": "Arthur", "priority": 0, "plan_type": "forms", "plan_value": "JG12", "preferences": [607, 609, 616]},
+            {"school_num": "10001329", "name": "Leo", "priority": 1, "plan_type": "forms", "plan_value": "6/4", "preferences": ["494", "434"]},
+        ]
+    }
+
+    /*
+    preferences procedure:
+        - from server: list of courses that are not checked
+        - list converted to object ([462, 412] -> {462: false, 412: false})
+        - all other courses of form later set to true
+        - saving: all courses are extracted that have the false value
+
+        - duplicated courses are unified: for each course c1 that already exists as course c0, the pair c1: c0 is put into an object -> later, the check-value of c1 is set to that of c0
+    */
+    function load_favourites() {
+        // change preferences to dict
+        let temp_fav = get_pseudo_favourites_from_server();
+        temp_fav = temp_fav.map(item => ({ ...item, preferences: item.preferences.reduce((obj, preference) => ({ ...obj, [preference]: false }), {}) }));
+        console.log(temp_fav)
+        favourites = temp_fav;
+    }
+    function save_favourites() {
+        let new_favourites = [];
+        for (let favourite = 0; favourite < favourites.length; favourite++) {
+            let cur_favourite = {...favourites[favourite]};
+            for (const cur_key of Object.keys(duplicated_courses_match[favourite])) {
+                cur_favourite.preferences[cur_key] = cur_favourite.preferences[duplicated_courses_match[favourite][cur_key]];
+            }
+            cur_favourite.preferences = Object.keys(cur_favourite.preferences).filter(key => cur_favourite.preferences[key] === false);
+            new_favourites.push(cur_favourite);
+        }
+        console.log(new_favourites);
+    }
+
+    // FAVOURITE MANAGEMENT
+    function add_favourite() {
+        favourites = [...favourites, {"school_num": "test", "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}];
+    }
+    // clear everything except for the school num of a favourite
+    function clear_favourite(favourite) {
+        favourites[favourite] = {"school_num": favourites[favourite].school_num, "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}
+    }
+    // delete a favourite
+    function delete_favourite(favourite) {
+        let new_array = favourites;
+        new_array.splice(favourite, 1);
+        favourites = new_array;
+    }
+
+
+    // load all metadata for all schools needed
+    function update_meta(school_nums) {
+        for (let i = 0; i < school_nums.length; i++) {
+            if (all_meta.hasOwnProperty(school_nums[i])) {
+                continue;
+            }
+            load_meta(school_nums[i])
+                .then(meta => {
+                    all_meta[school_nums[i]] = meta[0];
+                })
+        }
+    }
+    // getting available teachers/rooms/forms
+    function get_values(school_num, plan_type, stored_meta) {
+        if (!stored_meta.hasOwnProperty(school_num)) {
+            return []
+        }
+        let meta = stored_meta[school_num];
+        let return_lst = [];
+        if (plan_type === "teachers") {
+            for (const teacher of Object.keys(meta.teachers)) {
+                return_lst.push({"id": teacher, "display_name": teacher})
+            }
+            return return_lst
+        } else if (plan_type === "rooms") {
+            for (const room of Object.keys(meta.rooms)) {
+                return_lst.push({"id": room, "display_name": room})
+            }
+            return return_lst
+        } else if (plan_type === "forms") {
+            for (const [form_group, forms] of Object.entries(meta.forms.grouped_forms)) {
+                let converted_forms = [];
+                for(let form of forms) {
+                    converted_forms.push({"id": form, "display_name": form});
+                }
+                return_lst.push([form_group, converted_forms]);
+            }
+            return return_lst
+        }
+        return [];
+    }
+    // get subjects for one form
+    function get_subjects(favourite, stored_meta) {
+        let school_num = favourites[favourite].school_num;
+        let form = favourites[favourite].plan_value;
+        if (!stored_meta.hasOwnProperty(school_num)) {
+            return []
+        }
+        if (!stored_meta[school_num].forms.forms.hasOwnProperty(form)) {
+            return []
+        }
+        duplicated_courses_match[favourite] = {};
+        for (const class_group of Object.keys(stored_meta[school_num].forms.forms[form].class_groups)) {
+            if (favourites[favourite].preferences[class_group] === undefined) {
+                favourites[favourite].preferences[class_group] = true;
+            }
+        }
+
+        return sort_courses_by_subject(favourite, stored_meta[school_num].forms.forms[form].class_groups)
+        //return Object.entries(stored_meta[school_num].forms.forms[form].class_groups);
+    }
+
+    function sort_courses_by_subject(favourite, obj) {
+        const courses_by_subject = {};
+
+        Object.entries(obj).forEach(([class_number, class_data]) => {
+            const subject = class_data.subject;
+            if (courses_by_subject[subject] === undefined) {
+                courses_by_subject[subject] = [];
+            }
+            class_data.class_number = class_number;
+
+            // this is for the duplicated forms
+            let object_exists = false;
+            for (const obj of courses_by_subject[subject]) {
+                if (
+                    Object.keys(class_data)
+                        .filter(key => key !== "class_number")
+                        .every(key => obj[key] === class_data[key])
+                ) {
+                    duplicated_courses_match[favourite][class_number] = obj.class_number;
+                    object_exists = true;
+                    break;
+                }
+            }
+            if (!object_exists) {
+                courses_by_subject[subject].push(class_data);
+            }
+        });
+
+        Object.values(courses_by_subject).map(class_datas => class_datas.sort((data1, data2) => data2.group?.localeCompare(data1.group)));
+
+        return courses_by_subject;
+    }
+
+</script>
+
+<button on:click={save_favourites}>Speichern</button>
+<button on:click={add_favourite}>Favorit hinzufügen</button>
+{#each favourites as _, favourite}
+    <p>
+        <input type="text" bind:value={favourites[favourite].name}>
+        <!-- TODO: GET AUTHORIZED SCHOOLS -->
+        <select name="school_select" id="" bind:value={favourites[favourite].school_num} on:change={() => clear_favourite(favourite)}>
+            <option value="10001329">Ostwald</option>
+            <option value="10000000">Beispielschule</option>
+        </select>
+        <select name="plan_type_select" id="" bind:value={favourites[favourite].plan_type} on:change={() => favourites[favourite].plan_value = ""}>
+            <option value="forms">Klassenplan</option>
+            <option value="teachers">Lehrerplan</option>
+            <option value="rooms">Raumplan</option>
+            <option value="free_rooms">Freie Räume</option>
+        </select>
+        {#if favourites[favourite].plan_type === "forms"}
+            <Select data={get_values(favourites[favourite].school_num, favourites[favourite].plan_type, all_meta)} grouped={true} bind:selected_id={favourites[favourite].plan_value} data_name="{favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
+            <!--choosable courses-->
+            {#each Object.entries(
+                get_subjects(favourite, all_meta)
+            ).sort(([subj1, _], [subj2, __]) => subj1.localeCompare(subj2)).sort(([_, courses1], [__, courses2]) => courses2.length - courses1.length) as [subject, courses]}
+                {#if courses.length === 1}
+                    <li>{subject}:<input
+                            type="checkbox"
+                            bind:checked={favourites[favourite].preferences[courses[0].class_number]}
+                    />
+                        {courses[0].class_number}
+                        {courses[0].teacher} |
+                        {courses[0].subject}
+                        {#if courses[0].group != null}
+                            ({courses[0].group})
+                        {/if}
+                    </li>
+                {:else}
+                    <li>
+                        {subject}
+                        {#if courses.length > 2}
+                            <Button class="inline-flex" on:click={() => {
+                                for (const course of courses) {
+                                    favourites[favourite].preferences[course.class_number] = true;
+                                }
+                            }}>Alle Auswählen</Button>
+                            <Button class="inline-flex" on:click={() => {
+                                for (const course of courses) {
+                                    favourites[favourite].preferences[course.class_number] = false;
+                                }
+                            }}>Keinen Auswählen</Button>
+                        {/if}
+                    </li>
+                    <ul>
+                        {#each courses as course}
+                            <li>
+                                <input
+                                        type="checkbox"
+                                        bind:checked={favourites[favourite].preferences[course.class_number]}
+                                />
+                                {course.class_number}
+                                {course.teacher} |
+                                {course.subject}
+                                {#if course.group != null}
+                                    ({course.group})
+                                {/if}
+                            </li>
+                        {/each}
+                    </ul>
+                {/if}
+            {/each}
+
+
+
+        {:else if favourites[favourite].plan_type !== "free_rooms"}
+            <Select data={get_values(favourites[favourite].school_num, favourites[favourite].plan_type, all_meta)} grouped={false} bind:selected_id={favourites[favourite].plan_value} data_name="{favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
+        {/if}
+        <button on:click={() => {delete_favourite(favourite)}}>Favorit löschen</button>
+    </p>
+{/each}
+
+
+<style lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/client/src/components/Navbar.svelte b/client/src/components/Navbar.svelte
index f6e8408..e340482 100644
--- a/client/src/components/Navbar.svelte
+++ b/client/src/components/Navbar.svelte
@@ -32,6 +32,7 @@
                 <button class="nav-button" on:click={() => navigate_page("school_manager")}><span class="material-symbols-outlined">school</span> Schule wechseln</button>
                 <button class="nav-button" on:click={() => $active_modal = "preferences"}><span class="material-symbols-outlined">account_circle</span> Unterricht wählen</button>
                 <button class="nav-button" on:click={() => $active_modal = "changelog"}><span class="material-symbols-outlined" class:new_notification={$new_changelogs_available}>assignment</span> Changelog {#if $new_changelogs_available}✨{/if}</button>
+                <button class="nav-button" on:click={() => navigate_page("favourites")}><span class="material-symbols-outlined">account_circle</span> Favoriten wählen</button>
                 <button class="nav-button" on:click={() => navigate_page("contact")}><span class="material-symbols-outlined">contact_page</span> Kontaktiere uns</button>
                 <button on:click={logout} class="nav-button"><span class="material-symbols-outlined">logout</span> Logout</button>
             </Dropdown>
diff --git a/client/src/components/Plan.svelte b/client/src/components/Plan.svelte
index 4e917b1..2ab8ec6 100644
--- a/client/src/components/Plan.svelte
+++ b/client/src/components/Plan.svelte
@@ -94,7 +94,10 @@
         week_letter = info.week;
     }
 
-    function load_plan(date, revision=".newest") {
+    function load_plan(date, revision=".newest", enabled_dates) {
+        if (enabled_dates === null || enabled_dates === undefined) {
+            return;
+        }
         if (date === null || date === undefined || !enabled_dates.includes(date)) {
             return;
         }
@@ -139,6 +142,7 @@
                 data_from_cache = false;
             })
             .catch(error => {
+                console.error(error);
                 loading = false;
                 network_loading_failed = true;
         });
@@ -253,7 +257,7 @@
     function load_lessons_check_plan(plan_data, plan_type, plan_value, use_grouped_form_plans) {
         let curr_time = new Date();
         if(!last_updated || curr_time - last_updated > 30_000) {
-            load_plan(date, selected_revision);
+            load_plan(date, selected_revision, enabled_dates);
             last_updated = new Date();
         }
 
@@ -269,16 +273,18 @@
         // console.log("Mounted Plan.svelte");
     });
 
-    $: $indexed_db, load_plan(date, selected_revision);
+    $: $indexed_db, load_plan(date, selected_revision, enabled_dates);
     $: load_lessons_check_plan(plan_data, plan_type, plan_value, $settings.use_grouped_form_plans);
 
     $: if (plan_type === "teachers") {
-        full_teacher_name = meta.teachers[plan_value]?.surname || null;
-        teacher_contact_link = meta.teachers[plan_value]?.contact_link || null;
-        teacher_image_path = "/public/base_static/images/teachers/" + school_num + "/" + meta.teachers[plan_value]?.image_path || null;
-        teacher_image_path = meta.teachers[plan_value]?.image_path || null;
-        if (teacher_image_path) {
-            teacher_image_path = `/public/base_static/images/teachers/${school_num}/${teacher_image_path}`;
+        if (meta.teachers) {
+            full_teacher_name = meta.teachers[plan_value]?.surname || null;
+            teacher_contact_link = meta.teachers[plan_value]?.contact_link || null;
+            teacher_image_path = "/public/base_static/images/teachers/" + school_num + "/" + meta.teachers[plan_value]?.image_path || null;
+            teacher_image_path = meta.teachers[plan_value]?.image_path || null;
+            if (teacher_image_path) {
+                teacher_image_path = `/public/base_static/images/teachers/${school_num}/${teacher_image_path}`;
+            }
         }
     }
     
diff --git a/client/src/utils.js b/client/src/utils.js
index e28b953..c389744 100644
--- a/client/src/utils.js
+++ b/client/src/utils.js
@@ -417,4 +417,32 @@ export function arraysEqual(a, b) {
         if (a[i] !== b[i]) return false;
     }
     return true;
-}
\ No newline at end of file
+}
+
+export async function load_meta(school_num) {
+    let meta_data;
+    return customFetch(`/api/v69.420/${school_num}/meta`)
+        .then(data => {
+            try {
+                localStorage.setItem(`${school_num}_meta`, JSON.stringify(data));
+            } catch (error) {
+                if (error.name === 'QuotaExceededError' ) {
+                    notifications.danger("Die Schulmetadaten konnten nicht gecached werden.")
+                } else {
+                    throw error;
+                }
+            }
+            meta_data = data;
+            return [meta_data, false]
+        })
+        .catch(error => {
+            meta_data = localStorage.getItem(`${school_num}_meta`);
+            if (meta_data !== "undefined" && meta_data) {
+                console.log("Metadaten aus Cache geladen");
+                return [JSON.parse(meta_data), true];
+            } else {
+                console.log("Metadaten konnten nicht geladen werden.");
+                notifications.danger(error.message);
+            }
+        })
+}

From fe5148940460d99a5faa688bc5500b4cd6537717 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 03:47:57 +0200
Subject: [PATCH 02/61] favourits now usable in frontend

---
 client/src/App.svelte               |  40 ++++++++--
 client/src/Favourites.svelte        | 115 +++++++++++++++++-----------
 client/src/components/Navbar.svelte |  13 +++-
 client/src/components/Plan.svelte   |  15 ++--
 client/src/stores.js                |   9 ++-
 5 files changed, 135 insertions(+), 57 deletions(-)

diff --git a/client/src/App.svelte b/client/src/App.svelte
index 5b9f9e8..3637fcb 100644
--- a/client/src/App.svelte
+++ b/client/src/App.svelte
@@ -10,7 +10,7 @@
     import SveltyPicker from 'svelty-picker';
     import {get_settings, group_rooms, update_colors, navigate_page, init_indexed_db, clear_plan_cache} from "./utils.js";
     import {notifications} from './notifications.js';
-    import {logged_in, title, current_page, preferences, settings, active_modal, pwa_prompt, indexed_db} from './stores.js'
+    import {logged_in, title, current_page, preferences, settings, active_modal, pwa_prompt, indexed_db, selected_favourite, favourites} from './stores.js'
     import SchoolManager from "./components/SchoolManager.svelte";
     import Preferences from "./components/Preferences.svelte";
     import Changelog from "./components/Changelog.svelte";
@@ -118,7 +118,7 @@
         );
     }
 
-    function get_preferences() {
+    /*function get_preferences() {
         customFetch(`${api_base}/preferences`)
             .then(data => {
                 preferences.set(data);
@@ -126,7 +126,7 @@
             .catch(error => {
                 console.error("Preferences konnten nicht geladen werden.");
             })
-    }
+    }*/
 
     function choose(choices) {
         var index = Math.floor(Math.random() * choices.length);
@@ -226,7 +226,7 @@
     function gen_revision_arr(all_revisions) {
         revision_arr = [];
         for(const [index, revision] of Object.entries(all_revisions)) {
-            if(index == 1) {continue;}
+            if (index == 1) {continue;}
             revision_arr.push({
                 "id": revision,
                 "display_name": format_revision_date(revision, all_revisions[1])
@@ -267,6 +267,32 @@
         }
     }
 
+    function select_plan(favourites, selected_favourite) {
+        // check if selected_favourite is in favourites (selected_favourite is the index)
+        if (selected_favourite === -1) {
+            plan_type = "";
+            plan_value = "";
+        }
+        if (selected_favourite !== null && favourites[selected_favourite]) {
+            selected_favourite = favourites[selected_favourite];
+            school_num = selected_favourite.school_num;
+            localStorage.setItem('school_num', school_num);
+            plan_type = selected_favourite.plan_type;
+            plan_value = selected_favourite.plan_value;
+        }
+
+    }
+
+    $: select_plan($favourites, $selected_favourite);
+    $: if ($selected_favourite !== -1) {
+        if ($favourites[$selected_favourite].plan_value !== plan_value) {
+            selected_favourite.set(-1);
+        } else if ($favourites[$selected_favourite].plan_type !== plan_type) {
+            selected_favourite.set(-1);
+        }
+    }
+
+
     $logged_in = localStorage.getItem('logged_in') === 'true';
     init_vars();
     check_login_status();
@@ -277,7 +303,7 @@
     $: school_num && (api_base = `/api/v69.420/${school_num}`);
     $: school_num && get_meta();
     $: all_revisions = [".newest"].concat((meta?.dates || {})[date] || []);
-    $: school_num && get_preferences();
+    //$: school_num && get_preferences();
     $: all_rooms && (grouped_rooms = group_rooms(all_rooms));
     $: $logged_in && get_settings();
     $: (Object.keys($settings).length !== 0) && localStorage.setItem("settings", `${JSON.stringify($settings)}`);
@@ -349,6 +375,10 @@
         {:else if $logged_in}
             {#if $current_page.substring(0, 4) === "plan" || $current_page === "weekplan"}
                 <h1 class="responsive-heading">{emoji} {greeting}</h1>
+                {#if $selected_favourite !== -1 && $favourites[$selected_favourite]}
+                    Gewählter Favorit: {$favourites[$selected_favourite].name}
+                    <br>
+                {/if}
                 <div class="controls-wrapper">
                     <!-- Datepicker -->
                     <div class="control" id="c1">
diff --git a/client/src/Favourites.svelte b/client/src/Favourites.svelte
index 8fd6a4f..02e8345 100644
--- a/client/src/Favourites.svelte
+++ b/client/src/Favourites.svelte
@@ -1,33 +1,49 @@
 <script>
-    import {load_meta} from "./utils.js";
+    import {customFetch, load_meta} from "./utils.js";
     import Select from "./base_components/Select.svelte";
     import Button from "./base_components/Button.svelte";
     import {onMount} from "svelte";
-    import {title} from "./stores.js";
+    import {notifications} from "./notifications.js";
 
-    let favourites = [
-        //{"school_num": "10001329", "name": "Arthur", "priority": 0, "plan_type": "forms", "plan_value": "JG12", "preferences": {}}
-    ]
-    $: console.log(favourites);
+    import {favourites} from "./stores.js";
+
+    let cur_favourites = [];
+    let all_schools = {};
+    let authorized_school_ids = [];
     let school_nums = [];
-    $: school_nums = [...new Set(favourites.map(obj => obj.school_num))];
+    $: school_nums = [...new Set(cur_favourites.map(obj => obj.school_num).filter(school_num => school_num !== ""))];
     let all_meta = {};
     let duplicated_courses_match = {};
     $: update_meta(school_nums);
 
-    let preferences = {};
-
     onMount(() => {
+        get_schools();
+        get_authorized_schools();
         load_favourites();
     });
 
-    function get_pseudo_favourites_from_server() {
-        return [
-            //{"school_num": "10001329", "name": "Arthur", "priority": 0, "plan_type": "forms", "plan_value": "JG12", "preferences": [607, 609, 616]},
-            {"school_num": "10001329", "name": "Leo", "priority": 1, "plan_type": "forms", "plan_value": "6/4", "preferences": ["494", "434"]},
-        ]
+
+    // duplicate from school manager but hard to simplify
+    function get_schools() {
+        customFetch("/api/v69.420/schools")
+            .then(data => {
+                all_schools = Object.fromEntries(data.map(obj => [obj._id, obj]));
+            })
+            .catch(error => {
+                notifications.danger(error.message);
+            })
+    }
+    function get_authorized_schools() {
+        customFetch("/auth/authorized_schools")
+            .then(data => {
+                authorized_school_ids = data;
+            })
+            .catch(error => {
+                console.error("Autorisierte Schulen konnten nicht ermittelt werden.");
+            });
     }
 
+
     /*
     preferences procedure:
         - from server: list of courses that are not checked
@@ -39,37 +55,43 @@
     */
     function load_favourites() {
         // change preferences to dict
-        let temp_fav = get_pseudo_favourites_from_server();
+        let temp_fav = $favourites;
+        favourites.set(temp_fav);
         temp_fav = temp_fav.map(item => ({ ...item, preferences: item.preferences.reduce((obj, preference) => ({ ...obj, [preference]: false }), {}) }));
-        console.log(temp_fav)
-        favourites = temp_fav;
+        cur_favourites = temp_fav;
     }
     function save_favourites() {
         let new_favourites = [];
-        for (let favourite = 0; favourite < favourites.length; favourite++) {
-            let cur_favourite = {...favourites[favourite]};
-            for (const cur_key of Object.keys(duplicated_courses_match[favourite])) {
-                cur_favourite.preferences[cur_key] = cur_favourite.preferences[duplicated_courses_match[favourite][cur_key]];
+        for (let favourite = 0; favourite < cur_favourites.length; favourite++) {
+            let cur_favourite = {...cur_favourites[favourite]};
+            console.log(duplicated_courses_match, favourite);
+            // check if favourite in duplicated_courses_match
+            if (duplicated_courses_match.hasOwnProperty(favourite)) {
+                for (const cur_key of Object.keys(duplicated_courses_match[favourite])) {
+                    cur_favourite.preferences[cur_key] = cur_favourite.preferences[duplicated_courses_match[favourite][cur_key]];
+                }
             }
             cur_favourite.preferences = Object.keys(cur_favourite.preferences).filter(key => cur_favourite.preferences[key] === false);
             new_favourites.push(cur_favourite);
         }
         console.log(new_favourites);
+        favourites.set(new_favourites);
+        // now the post request
     }
 
     // FAVOURITE MANAGEMENT
     function add_favourite() {
-        favourites = [...favourites, {"school_num": "test", "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}];
+        cur_favourites = [...cur_favourites, {"school_num": "", "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}];
     }
     // clear everything except for the school num of a favourite
     function clear_favourite(favourite) {
-        favourites[favourite] = {"school_num": favourites[favourite].school_num, "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}
+        cur_favourites[favourite] = {"school_num": cur_favourites[favourite].school_num, "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}
     }
     // delete a favourite
     function delete_favourite(favourite) {
-        let new_array = favourites;
+        let new_array = cur_favourites;
         new_array.splice(favourite, 1);
-        favourites = new_array;
+        cur_favourites = new_array;
     }
 
 
@@ -116,8 +138,8 @@
     }
     // get subjects for one form
     function get_subjects(favourite, stored_meta) {
-        let school_num = favourites[favourite].school_num;
-        let form = favourites[favourite].plan_value;
+        let school_num = cur_favourites[favourite].school_num;
+        let form = cur_favourites[favourite].plan_value;
         if (!stored_meta.hasOwnProperty(school_num)) {
             return []
         }
@@ -126,8 +148,8 @@
         }
         duplicated_courses_match[favourite] = {};
         for (const class_group of Object.keys(stored_meta[school_num].forms.forms[form].class_groups)) {
-            if (favourites[favourite].preferences[class_group] === undefined) {
-                favourites[favourite].preferences[class_group] = true;
+            if (cur_favourites[favourite].preferences[class_group] === undefined) {
+                cur_favourites[favourite].preferences[class_group] = true;
             }
         }
 
@@ -172,22 +194,27 @@
 
 <button on:click={save_favourites}>Speichern</button>
 <button on:click={add_favourite}>Favorit hinzufügen</button>
-{#each favourites as _, favourite}
+<br><br><br><br><br>
+{#each cur_favourites as _, favourite}
     <p>
-        <input type="text" bind:value={favourites[favourite].name}>
+        <label for="favourite_name">Name des Favoriten</label>
+        <input name="favourite_name" type="text" bind:value={cur_favourites[favourite].name}>
         <!-- TODO: GET AUTHORIZED SCHOOLS -->
-        <select name="school_select" id="" bind:value={favourites[favourite].school_num} on:change={() => clear_favourite(favourite)}>
-            <option value="10001329">Ostwald</option>
-            <option value="10000000">Beispielschule</option>
+        <select name="school_select" id="" bind:value={cur_favourites[favourite].school_num} on:change={() => clear_favourite(favourite)}>
+            {#each authorized_school_ids as school_id}
+                {#if all_schools.hasOwnProperty(school_id)}
+                    <option value={school_id}>{all_schools[school_id].display_name}</option>
+                {/if}
+            {/each}
         </select>
-        <select name="plan_type_select" id="" bind:value={favourites[favourite].plan_type} on:change={() => favourites[favourite].plan_value = ""}>
+        <select name="plan_type_select" id="" bind:value={cur_favourites[favourite].plan_type} on:change={() => {cur_favourites[favourite].plan_value = ""; cur_favourites[favourite].preferences = {}}}>
             <option value="forms">Klassenplan</option>
             <option value="teachers">Lehrerplan</option>
             <option value="rooms">Raumplan</option>
-            <option value="free_rooms">Freie Räume</option>
+            <option value="room_overview">Freie Räume</option>
         </select>
-        {#if favourites[favourite].plan_type === "forms"}
-            <Select data={get_values(favourites[favourite].school_num, favourites[favourite].plan_type, all_meta)} grouped={true} bind:selected_id={favourites[favourite].plan_value} data_name="{favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
+        {#if cur_favourites[favourite].plan_type === "forms"}
+            <Select data={get_values(cur_favourites[favourite].school_num, cur_favourites[favourite].plan_type, all_meta)} grouped={true} bind:selected_id={cur_favourites[favourite].plan_value} data_name="{cur_favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
             <!--choosable courses-->
             {#each Object.entries(
                 get_subjects(favourite, all_meta)
@@ -195,7 +222,7 @@
                 {#if courses.length === 1}
                     <li>{subject}:<input
                             type="checkbox"
-                            bind:checked={favourites[favourite].preferences[courses[0].class_number]}
+                            bind:checked={cur_favourites[favourite].preferences[courses[0].class_number]}
                     />
                         {courses[0].class_number}
                         {courses[0].teacher} |
@@ -210,12 +237,12 @@
                         {#if courses.length > 2}
                             <Button class="inline-flex" on:click={() => {
                                 for (const course of courses) {
-                                    favourites[favourite].preferences[course.class_number] = true;
+                                    cur_favourites[favourite].preferences[course.class_number] = true;
                                 }
                             }}>Alle Auswählen</Button>
                             <Button class="inline-flex" on:click={() => {
                                 for (const course of courses) {
-                                    favourites[favourite].preferences[course.class_number] = false;
+                                    cur_favourites[favourite].preferences[course.class_number] = false;
                                 }
                             }}>Keinen Auswählen</Button>
                         {/if}
@@ -225,7 +252,7 @@
                             <li>
                                 <input
                                         type="checkbox"
-                                        bind:checked={favourites[favourite].preferences[course.class_number]}
+                                        bind:checked={cur_favourites[favourite].preferences[course.class_number]}
                                 />
                                 {course.class_number}
                                 {course.teacher} |
@@ -241,8 +268,8 @@
 
 
 
-        {:else if favourites[favourite].plan_type !== "free_rooms"}
-            <Select data={get_values(favourites[favourite].school_num, favourites[favourite].plan_type, all_meta)} grouped={false} bind:selected_id={favourites[favourite].plan_value} data_name="{favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
+        {:else if cur_favourites[favourite].plan_type !== "free_rooms"}
+            <Select data={get_values(cur_favourites[favourite].school_num, cur_favourites[favourite].plan_type, all_meta)} grouped={false} bind:selected_id={cur_favourites[favourite].plan_value} data_name="{cur_favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
         {/if}
         <button on:click={() => {delete_favourite(favourite)}}>Favorit löschen</button>
     </p>
diff --git a/client/src/components/Navbar.svelte b/client/src/components/Navbar.svelte
index e340482..134c1bd 100644
--- a/client/src/components/Navbar.svelte
+++ b/client/src/components/Navbar.svelte
@@ -4,6 +4,7 @@
     import Dropdown from '../base_components/Dropdown.svelte';
     import { fly } from 'svelte/transition';
     import {customFetch, navigate_page} from "../utils.js";
+    import {selected_favourite, favourites} from "../stores.js";
 
     function logout() {
         customFetch('/auth/logout')
@@ -17,11 +18,21 @@
 </script>
 
 <nav transition:fly={{y:-64}}>
-    <button class="logo-button" on:click={() => {navigate_page("plan")}}>
+    <button class="logo-button" on:click={() => {navigate_page("plan"); selected_favourite.set(-1)}}>
         <img class="logo" src="/public/base_static/images/better_vp_white.svg" alt="Better VPlan Logo">
     </button>
     <ul class="nav-element-wrapper">
         <li><button on:click={() => {navigate_page("about_us")}} class="nav-button">Über uns</button></li>
+        <li>
+            <Dropdown let:toggle>
+                <button slot="toggle_button" on:click={toggle} class="nav-button">
+                    <span class="material-symbols-outlined">star</span>
+                </button>
+                {#each $favourites as favourite, index}
+                    <button class="nav-button" on:click={() => {selected_favourite.set(index); navigate_page("plan")}}><span class="material-symbols-outlined">star</span> {favourite.name}</button>
+                {/each}
+            </Dropdown>
+        </li>
         <li>
             <Dropdown let:toggle>
                 <button slot="toggle_button" on:click={toggle} class="nav-button">
diff --git a/client/src/components/Plan.svelte b/client/src/components/Plan.svelte
index 2ab8ec6..0fc433c 100644
--- a/client/src/components/Plan.svelte
+++ b/client/src/components/Plan.svelte
@@ -4,7 +4,7 @@
     import Rooms from "./Rooms.svelte";
     import {notifications} from '../notifications.js';
     import { swipe } from 'svelte-gestures';
-    import {indexed_db, preferences, settings, title} from '../stores.js';
+    import {indexed_db, preferences, settings, title, selected_favourite, favourites} from '../stores.js';
     import {arraysEqual, cache_plan, customFetch, format_date, get_from_db, get_school_plan_count, navigate_page} from "../utils.js";
     import Dropdown from '../base_components/Dropdown.svelte';
 
@@ -94,7 +94,7 @@
         week_letter = info.week;
     }
 
-    function load_plan(date, revision=".newest", enabled_dates) {
+    function load_plan(school_num, date, revision=".newest", enabled_dates) {
         if (enabled_dates === null || enabled_dates === undefined) {
             return;
         }
@@ -204,10 +204,13 @@
         if (!preferences_apply) {
             return lessons
         }
-        if (!(plan_value in $preferences)) {
+        //if (!(plan_value in $preferences)) {
+        //    return lessons
+        //}
+        if ($selected_favourite === -1) {
             return lessons
         }
-        let cur_preferences = $preferences[plan_value] || [];
+        let cur_preferences = $favourites[$selected_favourite].preferences || [];
         let new_lessons = [];
         for (const lesson of lessons) {
             if (!(cur_preferences.includes(lesson.class_number))) {
@@ -273,7 +276,7 @@
         // console.log("Mounted Plan.svelte");
     });
 
-    $: $indexed_db, load_plan(date, selected_revision, enabled_dates);
+    $: $indexed_db, load_plan(school_num, date, selected_revision, enabled_dates);
     $: load_lessons_check_plan(plan_data, plan_type, plan_value, $settings.use_grouped_form_plans);
 
     $: if (plan_type === "teachers") {
@@ -301,7 +304,7 @@
 <div class:plan={plan_type !== "room_overview"} class:extra-height={extra_height}>
     {#if plan_type !== "room_overview"}
         {#if show_title && info && plan_type && plan_value}
-            {#if plan_type === "forms" && (plan_value in $preferences)}
+            {#if plan_type === "forms" && ($selected_favourite !== -1)}
                 <button on:click={() => {preferences_apply = !preferences_apply}} class="plus-btn">{preferences_apply ? "+" : "-"}</button>
             {/if}
                 <h1 class="plan-heading">
diff --git a/client/src/stores.js b/client/src/stores.js
index 3a01f89..9cca4e8 100644
--- a/client/src/stores.js
+++ b/client/src/stores.js
@@ -9,4 +9,11 @@ export const preferences = writable({});
 export const active_modal = writable("");
 export const notifications_list = writable([]);
 export const pwa_prompt = writable();
-export const new_changelogs_available = writable(false);
\ No newline at end of file
+export const new_changelogs_available = writable(false);
+// TODO: as soon as this is connected to the endpoint, this needs to be cached and there needs to be a fallback
+export const favourites = writable([
+    {"school_num": "10000000", "name": "Mein Plan", "priority": 0, "plan_type": "forms", "plan_value": "5a", "preferences": ["166"]},
+    {"school_num": "10000000", "name": "Plan von Freund", "priority": 0, "plan_type": "forms", "plan_value": "5b", "preferences": []},
+    {"school_num": "10000000", "name": "Klassenlehrerplan", "priority": 0, "plan_type": "teachers", "plan_value": "Sipp", "preferences": []},
+]);
+export const selected_favourite = writable(0);

From bad892c766ff64dfe33e74c0ee885d7700d5c95c Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:22:43 +0200
Subject: [PATCH 03/61] extract Teacher, Teachers and Room classes from
 models.py

---
 backend/lesson_info.py      |  49 ++++++++-------
 backend/load_plans.py       |   4 +-
 backend/meta_extractor.py   |   3 +-
 backend/models.py           | 116 ++----------------------------------
 backend/plan_extractor.py   |   3 +-
 backend/plan_processor.py   |  11 +++-
 backend/room.py             |  31 ++++++++++
 backend/schools/__init__.py |   3 +-
 backend/schools/taro.py     |  10 +++-
 backend/stats.py            |   2 +-
 backend/teacher.py          |  83 ++++++++++++++++++++++++++
 11 files changed, 170 insertions(+), 145 deletions(-)
 create mode 100644 backend/room.py
 create mode 100644 backend/teacher.py

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index f49d52e..780bc99 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -7,8 +7,11 @@
 import re
 import typing
 
-from .vplan_utils import periods_to_block_label, parse_periods, _parse_form_pattern, ParsedForm, parsed_forms_to_str, \
+from .vplan_utils import (
+    periods_to_block_label, parse_periods, _parse_form_pattern, ParsedForm, parsed_forms_to_str,
     MajorMinorParsedForm, AlphanumParsedForm, forms_to_str, _loose_parse_form_pattern
+)
+from . import teacher as teacher_model
 from . import models
 
 
@@ -188,10 +191,10 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
 
     def is_groupable(self, other: MovedFrom):
         return (
-                self.before == other.before and
-                self.after == other.after and
-                self.date == other.date and
-                self.plan_type == other.plan_type
+            self.before == other.before and
+            self.after == other.after and
+            self.date == other.date and
+            self.plan_type == other.plan_type
         )
 
 
@@ -298,10 +301,10 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
 
     def is_groupable(self, other: MovedTo):
         return (
-                self.course == other.course and
-                self.original_other_info_value == other.original_other_info_value and
-                self.date == other.date and
-                self.plan_type == other.plan_type
+            self.course == other.course and
+            self.original_other_info_value == other.original_other_info_value and
+            self.date == other.date and
+            self.plan_type == other.plan_type
         )
 
 
@@ -554,7 +557,7 @@ class LessonInfoMessage:
     index: int
 
     @classmethod
-    def from_str(cls, message: str, lesson: models.Lesson, index: int, 
+    def from_str(cls, message: str, lesson: models.Lesson, index: int,
                  plan_type: typing.Literal["forms", "teachers", "rooms"]) -> LessonInfoMessage:
         parsed = _parse_message(message, lesson, plan_type)
 
@@ -588,9 +591,9 @@ def from_str(cls, paragraph: str, lesson: models.Lesson, index: int,
         new_messages = []
         for message in messages:
             can_merge = (
-                    new_messages
-                    and isinstance(new_messages[-1].parsed, FailedToParse)
-                    and isinstance(message.parsed, FailedToParse)
+                new_messages
+                and isinstance(new_messages[-1].parsed, FailedToParse)
+                and isinstance(message.parsed, FailedToParse)
             )
             if can_merge:
                 new_messages[-1].parsed.original_messages += message.parsed.original_messages
@@ -676,8 +679,8 @@ def __add__(self, other: ParsedLessonInfo):
 
 
 def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
-                     logger: logging.Logger) -> dict[str, models.Teacher]:
-    out: dict[str, models.Teacher] = {}
+                     logger: logging.Logger) -> dict[str, teacher_model.Teacher]:
+    out: dict[str, teacher_model.Teacher] = {}
 
     if lesson._is_scheduled:
         return out
@@ -685,9 +688,9 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
     for paragraph in lesson.parsed_info.paragraphs:
         for message in paragraph.messages:
             if (
-                    getattr(message.parsed, "other_info_value", -1) is None and
-                    hasattr(message.parsed, "course") and
-                    getattr(message.parsed, "_teachers", None) is not None
+                getattr(message.parsed, "other_info_value", -1) is None and
+                hasattr(message.parsed, "course") and
+                getattr(message.parsed, "_teachers", None) is not None
             ):
                 # noinspection PyUnresolvedReferences
                 surname = next(iter(message.parsed._teachers))
@@ -700,8 +703,8 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
                 _class: dict[str, models.Class] = {
                     class_nr: class_ for class_nr, class_ in classes.items()
                     if (
-                            course == (class_.group or class_.subject)
-                            and lesson.forms.issubset(class_.forms)
+                        course == (class_.group or class_.subject)
+                        and lesson.forms.issubset(class_.forms)
                     )
                 }
 
@@ -709,8 +712,8 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
                     _class = {
                         class_nr: class_ for class_nr, class_ in classes.items()
                         if (
-                                course == class_.subject
-                                and lesson.forms.issubset(class_.forms)
+                            course == class_.subject
+                            and lesson.forms.issubset(class_.forms)
                         )
                     }
 
@@ -731,7 +734,7 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
                     continue
 
                 abbreviation = list(_class.values())[0].teacher
-                teacher = models.Teacher(abbreviation, None, surname, None, [])
+                teacher = teacher_model.Teacher(abbreviation, None, surname, None, [])
 
                 out[teacher.abbreviation] = teacher
 
diff --git a/backend/load_plans.py b/backend/load_plans.py
index e2a160f..e848616 100644
--- a/backend/load_plans.py
+++ b/backend/load_plans.py
@@ -2,16 +2,16 @@
 from __future__ import annotations
 
 import argparse
+import aiohttp
 import asyncio
 import logging
 from pathlib import Path
 
-from backend.creds_provider import creds_provider_factory
 from stundenplan24_py import (
     IndiwareStundenplanerClient, Hosting, proxies
 )
-import aiohttp
 
+from .creds_provider import creds_provider_factory
 from .plan_downloader import PlanDownloader
 from .plan_processor import PlanProcessor
 from .cache import Cache
diff --git a/backend/meta_extractor.py b/backend/meta_extractor.py
index 883a7f8..0cb9d92 100644
--- a/backend/meta_extractor.py
+++ b/backend/meta_extractor.py
@@ -9,7 +9,8 @@
 from stundenplan24_py import indiware_mobil
 
 from .cache import Cache
-from .models import DefaultTimesInfo, Teacher
+from .models import DefaultTimesInfo
+from .teacher import Teacher
 
 
 class DailyMetaExtractor:
diff --git a/backend/models.py b/backend/models.py
index a902289..1579669 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -1,14 +1,13 @@
-# coding=utf-8
 from __future__ import annotations
 
 import copy
 import dataclasses
 import datetime
+import typing
 from collections import defaultdict
 
-import typing
-from stundenplan24_py import indiware_mobil
 import stundenplan24_py
+from stundenplan24_py import indiware_mobil
 
 from .lesson_info import ParsedLessonInfo, LessonInfoParagraph, LessonInfoMessage
 from . import vplan_utils, lesson_info
@@ -530,7 +529,9 @@ def group_blocks_and_lesson_info(self, plan_type: typing.Literal["forms", "teach
                 )
 
                 for remaining_plan_value in {"forms", "teachers", "rooms"} - {plan_type}:
-                    can_get_grouped &= getattr(lesson, remaining_plan_value) == getattr(previous_lesson, remaining_plan_value)
+                    can_get_grouped &= (
+                        getattr(lesson, remaining_plan_value) == getattr(previous_lesson, remaining_plan_value)
+                    )
 
                 grouped_additional_info = self._group_lesson_info(lesson.parsed_info, previous_lesson.parsed_info)
 
@@ -939,113 +940,6 @@ class Class(indiware_mobil.Class):
     forms: set[str]
 
 
-@dataclasses.dataclass
-class Teacher:
-    abbreviation: str | None
-    full_name: str | None = None
-    surname: str | None = None
-    info: str | None = None
-    subjects: list[str] = dataclasses.field(default_factory=list)
-    contact_link: str | None = None
-    image_path: str | None = None
-
-    def serialize(self) -> dict:
-        return {
-            "abbreviation": self.abbreviation,
-            "full_name": self.full_name,
-            "surname": self.surname,
-            "info": self.info,
-            "subjects": self.subjects,
-            "contact_link": self.contact_link,
-            "image_path": self.image_path
-        }
-
-    @classmethod
-    def deserialize(cls, data: dict) -> Teacher:
-        return cls(
-            abbreviation=data["abbreviation"],
-            full_name=data["full_name"],
-            surname=data["surname"],
-            info=data["info"],
-            subjects=data["subjects"],
-            contact_link=data.get("contact_link"),
-            image_path=data.get("image_path"),
-        )
-
-    def merge(self, other: Teacher) -> Teacher:
-        return Teacher(
-            full_name=self.full_name or other.full_name,
-            surname=self.surname or other.surname,
-            info=self.info or other.info,
-            abbreviation=self.abbreviation or other.abbreviation,
-            subjects=list(set(self.subjects + other.subjects)),
-            contact_link=self.contact_link or other.contact_link,
-            image_path=self.image_path or other.image_path,
-        )
-
-    def surname_no_titles(self):
-        """Strip parts of self.surname like "Dr." and return it."""
-        if self.surname is not None:
-            return " ".join(filter(lambda x: "." not in x, self.surname.split(" ")))
-        else:
-            return None
-
-
-@dataclasses.dataclass
-class Teachers:
-    teachers: list[Teacher] = dataclasses.field(default_factory=list)
-    scrape_timestamp: datetime.datetime = datetime.datetime.min
-
-    def serialize(self) -> dict:
-        return {
-            "teachers": {teacher.abbreviation: teacher.serialize() for teacher in self.teachers},
-            "timestamp": self.scrape_timestamp.isoformat()
-        }
-
-    @classmethod
-    def deserialize(cls, data: dict) -> Teachers:
-        return cls(
-            teachers=[Teacher.deserialize(teacher) for teacher in data["teachers"].values()],
-            scrape_timestamp=datetime.datetime.fromisoformat(data["timestamp"])
-        )
-
-    def to_dict(self) -> dict[str, Teacher]:
-        return {teacher.abbreviation: teacher for teacher in self.teachers}
-
-    def abbreviation_by_surname(self) -> dict[str, str]:
-        return {teacher.surname_no_titles(): teacher.abbreviation
-                for teacher in self.teachers
-                if teacher.surname is not None}
-
-
-@dataclasses.dataclass
-class Room:
-    house: int | str
-    floor: int | None
-    room_nr: int | None
-    appendix: str = ""
-
-    def to_short(self) -> str:
-        if isinstance(self.house, str):
-            assert self.floor is None
-            return self.house + (str(self.room_nr) if self.room_nr else "") + self.appendix
-
-        if self.floor < 0:
-            return f"-{self.house}{abs(self.floor)}{self.room_nr:02}{self.appendix}"
-        elif self.floor == 0:
-            return f"{self.house}{self.room_nr:02}{self.appendix}"
-        else:
-            return f"{self.house}{self.floor}{self.room_nr:02}{self.appendix}"
-
-    def to_dict(self) -> dict:
-        return {
-            "house": self.house,
-            "floor": self.floor,
-            "room_nr": self.room_nr,
-            "appendix": self.appendix
-        }
-
-
 @dataclasses.dataclass
 class DefaultTimesInfo:
     data: dict[int, tuple[datetime.time, datetime.time]]
diff --git a/backend/plan_extractor.py b/backend/plan_extractor.py
index 95a1eca..d245212 100644
--- a/backend/plan_extractor.py
+++ b/backend/plan_extractor.py
@@ -10,7 +10,8 @@
 
 from . import lesson_info
 from .lesson_info import process_additional_info
-from .models import Plan, Teacher, Teachers, Lesson, Lessons
+from .teacher import Teacher, Teachers
+from .models import Lesson, Lessons, Plan
 from .vplan_utils import parse_absent_element, ParsedForm
 
 
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 53f496b..c53cef8 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -8,7 +8,8 @@
 from .cache import Cache
 from .plan_extractor import StudentsPlanExtractor, TeachersPlanExtractor
 from .meta_extractor import MetaExtractor
-from .models import Teachers, Exam, Teacher, PlanLesson
+from .teacher import Teacher, Teachers
+from .models import PlanLesson, Exam
 from .vplan_utils import group_forms, ParsedForm
 from .stats import LessonsStatistics
 
@@ -175,8 +176,12 @@ def compute_plans(self, date: datetime.date, timestamp: datetime.datetime):
                 )
 
                 teachers_rooms_data = {
-                    "used_rooms_by_period": (used_rooms := teachers_plan_extractor.teacher_plan_extractor.used_rooms_by_period()),
-                    "free_rooms_by_period": (free_rooms := teachers_plan_extractor.teacher_plan_extractor.free_rooms_by_period(all_rooms)),
+                    "used_rooms_by_period": (
+                        used_rooms := teachers_plan_extractor.teacher_plan_extractor.used_rooms_by_period()
+                    ),
+                    "free_rooms_by_period": (
+                        free_rooms := teachers_plan_extractor.teacher_plan_extractor.free_rooms_by_period(all_rooms)
+                    ),
                     "used_rooms_by_block": teachers_plan_extractor.teacher_plan_extractor.rooms_by_block(used_rooms),
                     "free_rooms_by_block": teachers_plan_extractor.teacher_plan_extractor.rooms_by_block(free_rooms)
                 }
diff --git a/backend/room.py b/backend/room.py
new file mode 100644
index 0000000..311809e
--- /dev/null
+++ b/backend/room.py
@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+import dataclasses
+
+
+@dataclasses.dataclass
+class Room:
+    house: int | str
+    floor: int | None
+    room_nr: int | None
+    appendix: str = ""
+
+    def to_short(self) -> str:
+        if isinstance(self.house, str):
+            assert self.floor is None
+            return self.house + (str(self.room_nr) if self.room_nr else "") + self.appendix
+
+        if self.floor < 0:
+            return f"-{self.house}{abs(self.floor)}{self.room_nr:02}{self.appendix}"
+        elif self.floor == 0:
+            return f"{self.house}{self.room_nr:02}{self.appendix}"
+        else:
+            return f"{self.house}{self.floor}{self.room_nr:02}{self.appendix}"
+
+    def to_dict(self) -> dict:
+        return {
+            "house": self.house,
+            "floor": self.floor,
+            "room_nr": self.room_nr,
+            "appendix": self.appendix
+        }
diff --git a/backend/schools/__init__.py b/backend/schools/__init__.py
index c7ff1df..60622ba 100644
--- a/backend/schools/__init__.py
+++ b/backend/schools/__init__.py
@@ -1,7 +1,8 @@
 import typing
 
 from . import ostwald, taro, rudolf_hildebrandt
-from ..models import Teacher, Room
+from ..room import Room
+from ..teacher import Teacher
 
 teacher_scrapers: dict[str, typing.Callable[[], list[Teacher]]] = {
     "10001329": ostwald.scrape_teachers,
diff --git a/backend/schools/taro.py b/backend/schools/taro.py
index cc7c031..b41ef7e 100644
--- a/backend/schools/taro.py
+++ b/backend/schools/taro.py
@@ -23,10 +23,16 @@ def get_teachers() -> list[Teacher]:
         if teacher_data[1] and teacher_data[2]:
             for name in teacher_images:
                 if name[:-4].startswith(teacher_data[2]) and name[:-4].endswith(teacher_data[1]):
-                    teacher_lst.append(Teacher(abbreviation=teacher_data[0], surname=name[:-4].replace("_", " "), image_path=name))
+                    teacher_lst.append(Teacher(
+                        abbreviation=teacher_data[0],
+                        surname=name[:-4].replace("_", " "),
+                        image_path=name
+                    ))
                     break
             else:
-                teacher_lst.append(Teacher(abbreviation=teacher_data[0], surname=f"{teacher_data[2]} {teacher_data[1]}"))
+                teacher_lst.append(
+                    Teacher(abbreviation=teacher_data[0], surname=f"{teacher_data[2]} {teacher_data[1]}")
+                )
     return teacher_lst
 
 
diff --git a/backend/stats.py b/backend/stats.py
index 9931a1f..867bd74 100644
--- a/backend/stats.py
+++ b/backend/stats.py
@@ -1,7 +1,7 @@
 import dataclasses
 from collections import defaultdict
 
-from backend import models
+from . import models
 
 
 @dataclasses.dataclass
diff --git a/backend/teacher.py b/backend/teacher.py
new file mode 100644
index 0000000..cc42d78
--- /dev/null
+++ b/backend/teacher.py
@@ -0,0 +1,83 @@
+from __future__ import annotations
+
+import dataclasses
+import datetime
+
+
+@dataclasses.dataclass
+class Teacher:
+    abbreviation: str | None
+    full_name: str | None = None
+    surname: str | None = None
+    info: str | None = None
+    subjects: list[str] = dataclasses.field(default_factory=list)
+    contact_link: str | None = None
+    image_path: str | None = None
+
+    def serialize(self) -> dict:
+        return {
+            "abbreviation": self.abbreviation,
+            "full_name": self.full_name,
+            "surname": self.surname,
+            "info": self.info,
+            "subjects": self.subjects,
+            "contact_link": self.contact_link,
+            "image_path": self.image_path
+        }
+
+    @classmethod
+    def deserialize(cls, data: dict) -> Teacher:
+        return cls(
+            abbreviation=data["abbreviation"],
+            full_name=data["full_name"],
+            surname=data["surname"],
+            info=data["info"],
+            subjects=data["subjects"],
+            contact_link=data.get("contact_link"),
+            image_path=data.get("image_path"),
+        )
+
+    def merge(self, other: Teacher) -> Teacher:
+        return Teacher(
+            full_name=self.full_name or other.full_name,
+            surname=self.surname or other.surname,
+            info=self.info or other.info,
+            abbreviation=self.abbreviation or other.abbreviation,
+            subjects=list(set(self.subjects + other.subjects)),
+            contact_link=self.contact_link or other.contact_link,
+            image_path=self.image_path or other.image_path,
+        )
+
+    def surname_no_titles(self):
+        """Strip parts of self.surname like "Dr." and return it."""
+        if self.surname is not None:
+            return " ".join(filter(lambda x: "." not in x, self.surname.split(" ")))
+        else:
+            return None
+
+
+@dataclasses.dataclass
+class Teachers:
+    teachers: list[Teacher] = dataclasses.field(default_factory=list)
+    scrape_timestamp: datetime.datetime = datetime.datetime.min
+
+    def serialize(self) -> dict:
+        return {
+            "teachers": {teacher.abbreviation: teacher.serialize() for teacher in self.teachers},
+            "timestamp": self.scrape_timestamp.isoformat()
+        }
+
+    @classmethod
+    def deserialize(cls, data: dict) -> Teachers:
+        return cls(
+            teachers=[Teacher.deserialize(teacher) for teacher in data["teachers"].values()],
+            scrape_timestamp=datetime.datetime.fromisoformat(data["timestamp"])
+        )
+
+    def to_dict(self) -> dict[str, Teacher]:
+        return {teacher.abbreviation: teacher for teacher in self.teachers}
+
+    def abbreviation_by_surname(self) -> dict[str, str]:
+        return {teacher.surname_no_titles(): teacher.abbreviation
+                for teacher in self.teachers
+                if teacher.surname is not None}

From 872ab077f9296af7f016329e5363a6cab3f2ae57 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:22:59 +0200
Subject: [PATCH 04/61] improve taro room parsing

---
 backend/schools/taro.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/schools/taro.py b/backend/schools/taro.py
index b41ef7e..883d9f5 100644
--- a/backend/schools/taro.py
+++ b/backend/schools/taro.py
@@ -48,7 +48,9 @@ def parse_room(room_str: str) -> Room:
 
     for exception in exceptions:
         if room_str.startswith(exception):
-            return Room(exception, None, int(room_str[len(exception):]), "")
+            _num_after = room_str[len(exception):]
+            num_after = int(_num_after) if _num_after else None
+            return Room(exception, None, num_after, "")
 
     if room_str.startswith("E"):
         house = "Anbau"

From c118109a41fd31b5991241e6ec8fb12f5e388fd5 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:23:31 +0200
Subject: [PATCH 05/61] fix TeacherPlanProcessor has no attribute
 room_plan_extractor

---
 backend/plan_extractor.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/plan_extractor.py b/backend/plan_extractor.py
index d245212..d814b0b 100644
--- a/backend/plan_extractor.py
+++ b/backend/plan_extractor.py
@@ -266,6 +266,9 @@ def teacher_plan(self):
         return lessons_grouped.make_plan("teachers", plan_type="teachers")
 
     def room_plan(self):
-        lessons_grouped = self.room_plan_extractor.plan.lessons.group_blocks_and_lesson_info("rooms")
-        SubPlanExtractor.extrapolate_lesson_times(lessons_grouped)
-        return lessons_grouped.make_plan("rooms", plan_type="rooms")
\ No newline at end of file
+        if not hasattr(self, "room_plan_extractor"):
+            return {}
+        else:
+            lessons_grouped = self.room_plan_extractor.plan.lessons.group_blocks_and_lesson_info("rooms")
+            SubPlanExtractor.extrapolate_lesson_times(lessons_grouped)
+            return lessons_grouped.make_plan("rooms", plan_type="rooms")

From fbb4dd15950efb3e3ee9aa7e0e5010c24749d484 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:26:34 +0200
Subject: [PATCH 06/61] fix imports in school parsers

---
 backend/schools/ostwald.py            | 3 ++-
 backend/schools/rudolf_hildebrandt.py | 2 +-
 backend/schools/taro.py               | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/schools/ostwald.py b/backend/schools/ostwald.py
index 553cb24..6e1c076 100644
--- a/backend/schools/ostwald.py
+++ b/backend/schools/ostwald.py
@@ -4,7 +4,8 @@
 import requests
 from bs4 import BeautifulSoup
 
-from backend.models import Teacher, Room
+from backend.teacher import Teacher
+from backend.room import Room
 
 
 def scrape_teachers() -> List[Teacher]:
diff --git a/backend/schools/rudolf_hildebrandt.py b/backend/schools/rudolf_hildebrandt.py
index 2788a58..65730b7 100644
--- a/backend/schools/rudolf_hildebrandt.py
+++ b/backend/schools/rudolf_hildebrandt.py
@@ -1,4 +1,4 @@
-from backend.models import Room
+from backend.room import Room
 
 
 def parse_room(room: str) -> Room:
diff --git a/backend/schools/taro.py b/backend/schools/taro.py
index 883d9f5..d5315fb 100644
--- a/backend/schools/taro.py
+++ b/backend/schools/taro.py
@@ -1,6 +1,7 @@
 import os
 
-from backend.models import Teacher, Room
+from backend.teacher import Teacher
+from backend.room import Room
 
 
 # teachers and images from: https://taroschule.de/lehrerinnen/

From d954c4089692ff1fcb438f6390b41117080156d3 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:39:37 +0200
Subject: [PATCH 07/61] fix circular import

---
 backend/load_plans.py     | 2 +-
 backend/plan_processor.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/load_plans.py b/backend/load_plans.py
index e848616..564f3f0 100644
--- a/backend/load_plans.py
+++ b/backend/load_plans.py
@@ -13,8 +13,8 @@
 
 from .creds_provider import creds_provider_factory
 from .plan_downloader import PlanDownloader
-from .plan_processor import PlanProcessor
 from .cache import Cache
+from .plan_processor import PlanProcessor
 
 
 class PlanCrawler:
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index c53cef8..2f6715b 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -6,12 +6,12 @@
 
 from . import schools
 from .cache import Cache
-from .plan_extractor import StudentsPlanExtractor, TeachersPlanExtractor
 from .meta_extractor import MetaExtractor
 from .teacher import Teacher, Teachers
 from .models import PlanLesson, Exam
 from .vplan_utils import group_forms, ParsedForm
 from .stats import LessonsStatistics
+from .plan_extractor import StudentsPlanExtractor, TeachersPlanExtractor
 
 
 class PlanProcessor:

From f1b963808db7d0fb2683075e78ba8bdaaccce3f2 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:39:54 +0200
Subject: [PATCH 08/61] improve school parsers

---
 backend/schools/ostwald.py            | 3 +--
 backend/schools/rudolf_hildebrandt.py | 2 ++
 backend/schools/taro.py               | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/schools/ostwald.py b/backend/schools/ostwald.py
index 6e1c076..6b201c9 100644
--- a/backend/schools/ostwald.py
+++ b/backend/schools/ostwald.py
@@ -1,5 +1,4 @@
 from __future__ import annotations
-from typing import List
 
 import requests
 from bs4 import BeautifulSoup
@@ -8,7 +7,7 @@
 from backend.room import Room
 
 
-def scrape_teachers() -> List[Teacher]:
+def scrape_teachers() -> list[Teacher]:
     r = requests.post("https://www.ostwaldgymnasium.de/index.php/schule/lehrer", data={"limit": "0"})
 
     soup = BeautifulSoup(r.text, features="html.parser")
diff --git a/backend/schools/rudolf_hildebrandt.py b/backend/schools/rudolf_hildebrandt.py
index 65730b7..974dfc3 100644
--- a/backend/schools/rudolf_hildebrandt.py
+++ b/backend/schools/rudolf_hildebrandt.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from backend.room import Room
 
 
diff --git a/backend/schools/taro.py b/backend/schools/taro.py
index d5315fb..4425c0e 100644
--- a/backend/schools/taro.py
+++ b/backend/schools/taro.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 
 from backend.teacher import Teacher

From c19e53c0bccaf5911f95f24129febccda3da6490 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:40:15 +0200
Subject: [PATCH 09/61] add number to updating teachers log message

---
 backend/plan_processor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 2f6715b..2f7a454 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -240,7 +240,7 @@ def scrape_teachers(self):
         self.store_teachers()
 
     def add_teachers(self, new_teachers: dict[str, Teacher], update_timestamp: bool = False):
-        self._logger.debug("=> Updating teachers...")
+        self._logger.debug(f"=> Updating teachers... ({len(new_teachers)})")
 
         old_teachers = self.teachers.to_dict()
         all_abbreviations = set(old_teachers.keys()) | set(new_teachers.keys())

From 3183f44c3e4f00af390201574c3f6f6c55efb4bd Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 13:23:04 +0200
Subject: [PATCH 10/61] sort lessons and filter rooms

---
 backend/models.py         | 7 ++++---
 backend/plan_processor.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/models.py b/backend/models.py
index 1579669..e0df233 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -414,7 +414,7 @@ def make_plan(self, *group_attrs: str, plan_type: typing.Literal["forms", "teach
         grouped_lessons = self.group_by(*group_attrs)
 
         return {
-            group: lessons.to_plan_lessons(plan_type, {group})
+            group: sorted(lessons.to_plan_lessons(plan_type, {group}), key=lambda l: (min(l.periods), -len(l.periods)))
             for group, lessons in grouped_lessons.items()
         }
 
@@ -464,6 +464,7 @@ def _group_lesson_info(
                         return None
 
                 # periods not groupable, so, to group, info string must be the same
+                # TODO: Refactor this, ParsedLessonInfo.original_messages is not reliable/a set
                 elif message1.parsed.original_messages == message2.parsed.original_messages:
                     new_paragraph.append(message1)
 
@@ -634,7 +635,7 @@ def from_form_plan(cls, form_plan: indiware_mobil.IndiwareMobilPlan) -> Plan:
                     forms={form.short_name},
                     teachers=set(lesson.teacher().split()) if lesson.teacher() else set(),
                     # TODO: Some schools use rooms with spaces
-                    rooms=set(lesson.room().split(" ")) if lesson.room() else set(),
+                    rooms={r for r in lesson.room().split(" ") if r} if lesson.room() else set(),
                     course=lesson.subject(),
 
                     # see below
@@ -750,7 +751,7 @@ def from_teacher_plan(cls, teacher_plan: indiware_mobil.IndiwareMobilPlan) -> Pl
                     forms=set(lesson.teacher().split(",")) if lesson.teacher() else set(),
                     teachers={teacher.short_name},
                     # TODO: Some schools use rooms with spaces
-                    rooms=set(lesson.room().split(" ")) if lesson.room() else set(),
+                    rooms={r for r in lesson.room().split(" ") if r} if lesson.room() else set(),
                     course=lesson.subject(),
 
                     # see below
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 2f7a454..e8f74b8 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "88"
+    VERSION = "89"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger

From e110093ecac5b61cf68c6d2e2a640c681722436b Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 15:10:22 +0200
Subject: [PATCH 11/61] fix #197, favourite backend start

---
 client/src/components/Navbar.svelte        | 18 ++++++-
 client/src/components/SchoolManager.svelte | 62 +++++++++++++---------
 endpoints/api.py                           | 14 +++--
 utils.py                                   | 47 ++++++++++++++--
 4 files changed, 105 insertions(+), 36 deletions(-)

diff --git a/client/src/components/Navbar.svelte b/client/src/components/Navbar.svelte
index 134c1bd..b6011da 100644
--- a/client/src/components/Navbar.svelte
+++ b/client/src/components/Navbar.svelte
@@ -15,6 +15,7 @@
                 notifications.danger(error.message);
             });
     }
+    $: console.log(selected_favourite);
 </script>
 
 <nav transition:fly={{y:-64}}>
@@ -26,11 +27,24 @@
         <li>
             <Dropdown let:toggle>
                 <button slot="toggle_button" on:click={toggle} class="nav-button">
-                    <span class="material-symbols-outlined">star</span>
+                    {#if $selected_favourite !== -1}
+                        <!-- TODO: make different if some favourite selected -->
+                        <span class="material-symbols-outlined">star</span>
+                    {:else}
+                        <span class="material-symbols-outlined">star</span>
+                    {/if}
                 </button>
                 {#each $favourites as favourite, index}
-                    <button class="nav-button" on:click={() => {selected_favourite.set(index); navigate_page("plan")}}><span class="material-symbols-outlined">star</span> {favourite.name}</button>
+                    <button class="nav-button" on:click={() => {selected_favourite.set(index); navigate_page("plan")}}>
+                        {#if $selected_favourite === index}
+                            <!-- TODO: make different if selected -->
+                            <span class="material-symbols-outlined">star</span>
+                        {:else}
+                            <span class="material-symbols-outlined">star</span>
+                        {/if}
+                    ({index}) {favourite.name}</button>
                 {/each}
+                <button class="nav-button" on:click={() => navigate_page("favourites")}><span class="material-symbols-outlined">account_circle</span> Favoriten wählen</button>
             </Dropdown>
         </li>
         <li>
diff --git a/client/src/components/SchoolManager.svelte b/client/src/components/SchoolManager.svelte
index e129373..3f61b58 100644
--- a/client/src/components/SchoolManager.svelte
+++ b/client/src/components/SchoolManager.svelte
@@ -13,6 +13,7 @@
     export let plan_value;
 
     let authorize_school_id;
+    let authorize_school_data = {};
     let username = "schueler";
     let password = "";
     let schools = [];
@@ -68,18 +69,22 @@
 
     function authorize_school() {
         get_authorized_schools();
-        console.log(username, password);
         if (!isObjectInList(authorize_school_id, school_id_arr)) {
             notifications.danger("Schule unbekannt (kontaktiere uns, um deine Schule hinzuzufügen)")
             return
         }
-        if (username === "") {
-            notifications.danger("Bitte gib einen Nutzernamen an");
-            return
-        }
-        if (password === "") {
-            notifications.danger("Bitte gib ein Passwort an");
-            return
+        if (authorize_school_data.creds_needed) {
+            if (username === "") {
+                notifications.danger("Bitte gib einen Nutzernamen an");
+                return
+            }
+            if (password === "") {
+                notifications.danger("Bitte gib ein Passwort an");
+                return
+            }
+        } else {
+            username = "";
+            password = "";
         }
         let formData = new FormData();
         formData.append('username', username);
@@ -107,13 +112,13 @@
         );
     }
 
-    function get_school_name_by_id(school_id) {
+    function get_school_by_id(school_id) {
         for (let school of schools) {
             if (school.id === school_id.toString()) {
-                return school.display_name;
+                return school
             }
         }
-        return "";
+        return {};
     }
 
     get_schools();
@@ -132,6 +137,7 @@
         ["Autorisiert", authorized_schools],
         ["Unautorisiert", unauthorized_schools]
     ];
+    $: authorize_school_data = get_school_by_id(authorize_school_id);
 </script>
 
 <main>
@@ -173,21 +179,25 @@
         <button on:click={() => {school_auth_visible = false;}} type="reset" id="back_button">
             <span class="material-symbols-outlined">keyboard_backspace</span>
         </button>
-        <h1 class="responsive-heading">{authorize_school_id ? get_school_name_by_id(authorize_school_id) : "Schul"}-Login</h1>
-        <span class="responsive-text">Trage hier die Zugangsdaten <strong>für deine Schule</strong> ein, <strong>nicht die deines Accounts</strong>.<br>(dieselben wie in der <div title="🤢" style="display: inline-block;">VpMobil24-App</div>)</span>
-        <label for="school_username">Nutzername</label>
-        <div class="input_icon">
-            <img src="/public/base_static/images/user-solid-white.svg" alt="User Icon">
-            <input disabled={!school_auth_visible} autocomplete="off" name="school_username" bind:value={username} type="text" required class="textfield" placeholder="Nutzername"/>
-        </div>
-        <label for="school_password">Schul-Passwort</label>
-        <div class="input_icon password_field">
-            <img src="/public/base_static/images/lock-solid-white.svg" alt="Lock Icon">
-            <button type="button" on:click={() => {password_visible = !password_visible}} tabindex="-1">
-                <span class="material-symbols-outlined">{password_visible ? "visibility_off" : "visibility"}</span>
-            </button>
-            <input disabled={!school_auth_visible} autocomplete="off" name="school_password" on:input={(event) => {password = event.target.value}} type={password_visible ? "text" : "password"} required class="textfield" placeholder="Schul-Passwort"/>
-        </div>
+        <h1 class="responsive-heading">{authorize_school_id ? authorize_school_data.display_name : "Schul"}-Login</h1>
+        {#if authorize_school_data.creds_needed}
+            <span class="responsive-text">Trage hier die Zugangsdaten <strong>für deine Schule</strong> ein, <strong>nicht die deines Accounts</strong>.<br>(dieselben wie in der <div title="🤢" style="display: inline-block;">VpMobil24-App</div>)</span>
+            <label for="school_username">Nutzername</label>
+            <div class="input_icon">
+                <img src="/public/base_static/images/user-solid-white.svg" alt="User Icon">
+                <input disabled={!school_auth_visible} autocomplete="off" name="school_username" bind:value={username} type="text" required class="textfield" placeholder="Nutzername"/>
+            </div>
+            <label for="school_password">Schul-Passwort</label>
+            <div class="input_icon password_field">
+                <img src="/public/base_static/images/lock-solid-white.svg" alt="Lock Icon">
+                <button type="button" on:click={() => {password_visible = !password_visible}} tabindex="-1">
+                    <span class="material-symbols-outlined">{password_visible ? "visibility_off" : "visibility"}</span>
+                </button>
+                <input disabled={!school_auth_visible} autocomplete="off" name="school_password" on:input={(event) => {password = event.target.value}} type={password_visible ? "text" : "password"} required class="textfield" placeholder="Schul-Passwort"/>
+            </div>
+        {:else}
+            <span class="responsive-text">(Für diese Schule benötigst du keine Zugangsdaten)</span>
+        {/if}
         <Button type="submit" background="var(--accent-color)">Autorisieren</Button>
     </form>
     {/if}
diff --git a/endpoints/api.py b/endpoints/api.py
index 4c31d4e..9fd8e0b 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -90,7 +90,8 @@ def plan(school_num: str) -> Response:
             "exams": json.loads(cache.get_plan_file(date, revision, "exams.json")),
             "grouped_form_plans": json.loads(cache.get_plan_file(date, revision, "grouped_form_plans.json")),
         }
-    except FileNotFoundError:
+    except FileNotFoundError as e:
+        print(e)
         return send_error("Invalid date or revision.")
 
     return send_success(data)
@@ -113,6 +114,9 @@ def authorize(school_num: str) -> Response:
         f.write(f"New auth attempt for {request.form.get('school_num')}\nargs: {request.args}\nbody: {request.form}")
     if not school_data:
         return send_error("Schulnummer unbekannt, falls du eine Schule hinzufügen möchtest, nimm bitte Kontakt mit uns auf")
+    if school_data["hosting"]["creds"] == {}:
+        current_user.authorize_school(school_num)
+        return send_success()
     username = request.form.get("username")
     if username is None:
         return send_error("Kein Nutzername für die Schule angegeben")
@@ -179,9 +183,13 @@ def preferences(school_num: str) -> Response:
 
         current_preferences.setdefault(school_num, {})[request.args["form"]] = stored_classes
 
-        current_user.set_user_preferences(current_preferences)
+        return current_user.set_user_preferences(current_preferences)
 
-        return send_success()
+
+@api.route(f"/favourites", methods=["GET", "POST"])
+@login_required
+def favourites(school_num):
+    return ""
 
 
 @api.route(f"/api/v69.420/changelog", methods=["GET", "POST"])
diff --git a/utils.py b/utils.py
index 9a52853..9abd94a 100644
--- a/utils.py
+++ b/utils.py
@@ -1,4 +1,5 @@
 import threading
+from pathlib import Path
 from typing import List
 
 import pymongo
@@ -14,6 +15,7 @@
 from dotenv import load_dotenv
 from discord_webhook import DiscordWebhook, DiscordEmbed
 
+import backend.cache
 from var import *
 
 load_dotenv()
@@ -95,15 +97,47 @@ def update_settings(self, user_settings=DEFAULT_SETTINGS) -> Response:
         users.update_one({'_id': ObjectId(self.mongo_id)}, {"$set": {'settings': new_settings}})
         return send_success()
 
-    def set_user_preferences(self, preferences):
+    def set_user_preferences(self, preferences) -> Response:
         users.update_one({'_id': ObjectId(self.mongo_id)}, {'$set': {'preferences': preferences}})
-        return "Success"
+        return send_success()
 
     # get setting for user, if setting not set get default setting
     def get_setting(self, setting_key):
         self.get_user()
         return self.user.get("settings", {}).get(setting_key, DEFAULT_SETTINGS.get(setting_key, None))
 
+    def get_favourites(self) -> Response:
+        return send_success(self.user.get("favourites", {}))
+    """
+        what does a favourite need:
+            -> name by user (default "Favourit {n}")
+            -> priority
+            -> school_id, plan_type, plan_value
+    """
+
+    def set_favourites(self, favourites) -> Response:
+        new_favourites = []
+        for cur_favourite in favourites:
+            favourite = {elem: cur_favourite.get(elem) for elem in ["school_num", "name", "priority", "plan_type", "plan_value"]}
+            for key in favourite:
+                if not favourite[key]:
+                    return send_error(f"{key} nicht angegeben")
+            if favourite["school_num"] not in self.get_authorized_schools():
+                return send_error("Schule nicht autorisiert")
+            if len(favourite["name"]) > 40:
+                return send_error("Name zu lang")
+            if favourite["plan_type"] not in ["forms", "teachers", "rooms", "free_rooms"]:
+                return send_error("invalide Planart")
+            cache = backend.cache.Cache(Path(".cache") / favourite["school_num"])
+            if favourite["plan_type"] == "free_rooms":
+                favourite["plan_value"] = None
+            else:
+                if favourite["plan_value"] not in json.loads(cache.get_meta_file(f"{favourite['plan_type']}.json"))[favourite["plan_type"]]:
+                    return send_error("invalider Plan")
+            new_favourites.append(favourite)
+        users.update_one({'_id': ObjectId(self.mongo_id)}, {"$set": {'favourites': new_favourites}})
+        return send_success(new_favourites)
+
 
 def get_user(user_id):
     try:
@@ -169,13 +203,16 @@ def get_all_schools():
             "$project": {
                 #"_id": False,
                 "count": False,
-                "hosting": False,
+                #"hosting": False,
                 "comment": False,
             }
         }
     ]
-
-    return list(creds.aggregate(pipeline))
+    schools_list = list(creds.aggregate(pipeline))
+    for ind, elem in enumerate(schools_list):
+        schools_list[ind]["creds_needed"] = True if elem["hosting"]["creds"] else False
+        del schools_list[ind]["hosting"]
+    return schools_list
 
 
 def get_all_schools_by_number():

From 7e48425c3a4e6ec7320baf6b6310a902c2eebe41 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 15:41:34 +0200
Subject: [PATCH 12/61] bug fix for 2 favourites with same plan_value

---
 client/src/components/Plan.svelte | 2 +-
 client/src/stores.js              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Plan.svelte b/client/src/components/Plan.svelte
index 0fc433c..5d80eb1 100644
--- a/client/src/components/Plan.svelte
+++ b/client/src/components/Plan.svelte
@@ -292,7 +292,7 @@
     }
     
     $: date && enabled_dates && update_date_btns();
-    $: preferences_apply, lessons = render_lessons(all_lessons);
+    $: preferences_apply, $selected_favourite, lessons = render_lessons(all_lessons);
     $: loading_failed = (cache_loading_failed && network_loading_failed && !loading);
     $: available_plan_version = data_from_cache ? "cached" : !network_loading_failed ? caching_successful ? "network_cached" : "network_uncached" : null;
     $: location.hash = gen_location_hash(school_num, date, plan_type, plan_value);
diff --git a/client/src/stores.js b/client/src/stores.js
index 9cca4e8..1e82d61 100644
--- a/client/src/stores.js
+++ b/client/src/stores.js
@@ -12,8 +12,8 @@ export const pwa_prompt = writable();
 export const new_changelogs_available = writable(false);
 // TODO: as soon as this is connected to the endpoint, this needs to be cached and there needs to be a fallback
 export const favourites = writable([
-    {"school_num": "10000000", "name": "Mein Plan", "priority": 0, "plan_type": "forms", "plan_value": "5a", "preferences": ["166"]},
-    {"school_num": "10000000", "name": "Plan von Freund", "priority": 0, "plan_type": "forms", "plan_value": "5b", "preferences": []},
+    {"school_num": "10000000", "name": "Mein Plan", "priority": 0, "plan_type": "forms", "plan_value": "12", "preferences": ["140", "97", "157", "96", "131", "88"]},
+    {"school_num": "10000000", "name": "Plan von Freund", "priority": 0, "plan_type": "forms", "plan_value": "12", "preferences": ["140", "97", "157", "96", "130", "88"]},
     {"school_num": "10000000", "name": "Klassenlehrerplan", "priority": 0, "plan_type": "teachers", "plan_value": "Sipp", "preferences": []},
 ]);
 export const selected_favourite = writable(0);

From 797da15ec6b68413df9e68f152cce334f0f1b111 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:22:43 +0200
Subject: [PATCH 13/61] extract Teacher, Teachers and Room classes from
 models.py

---
 backend/lesson_info.py      |  49 ++++++++-------
 backend/load_plans.py       |   4 +-
 backend/meta_extractor.py   |   3 +-
 backend/models.py           | 116 ++----------------------------------
 backend/plan_extractor.py   |   3 +-
 backend/plan_processor.py   |  11 +++-
 backend/room.py             |  31 ++++++++++
 backend/schools/__init__.py |   3 +-
 backend/schools/taro.py     |  10 +++-
 backend/stats.py            |   2 +-
 backend/teacher.py          |  83 ++++++++++++++++++++++++++
 11 files changed, 170 insertions(+), 145 deletions(-)
 create mode 100644 backend/room.py
 create mode 100644 backend/teacher.py

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index f49d52e..780bc99 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -7,8 +7,11 @@
 import re
 import typing
 
-from .vplan_utils import periods_to_block_label, parse_periods, _parse_form_pattern, ParsedForm, parsed_forms_to_str, \
+from .vplan_utils import (
+    periods_to_block_label, parse_periods, _parse_form_pattern, ParsedForm, parsed_forms_to_str,
     MajorMinorParsedForm, AlphanumParsedForm, forms_to_str, _loose_parse_form_pattern
+)
+from . import teacher as teacher_model
 from . import models
 
 
@@ -188,10 +191,10 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
 
     def is_groupable(self, other: MovedFrom):
         return (
-                self.before == other.before and
-                self.after == other.after and
-                self.date == other.date and
-                self.plan_type == other.plan_type
+            self.before == other.before and
+            self.after == other.after and
+            self.date == other.date and
+            self.plan_type == other.plan_type
         )
 
 
@@ -298,10 +301,10 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
 
     def is_groupable(self, other: MovedTo):
         return (
-                self.course == other.course and
-                self.original_other_info_value == other.original_other_info_value and
-                self.date == other.date and
-                self.plan_type == other.plan_type
+            self.course == other.course and
+            self.original_other_info_value == other.original_other_info_value and
+            self.date == other.date and
+            self.plan_type == other.plan_type
         )
 
 
@@ -554,7 +557,7 @@ class LessonInfoMessage:
     index: int
 
     @classmethod
-    def from_str(cls, message: str, lesson: models.Lesson, index: int, 
+    def from_str(cls, message: str, lesson: models.Lesson, index: int,
                  plan_type: typing.Literal["forms", "teachers", "rooms"]) -> LessonInfoMessage:
         parsed = _parse_message(message, lesson, plan_type)
 
@@ -588,9 +591,9 @@ def from_str(cls, paragraph: str, lesson: models.Lesson, index: int,
         new_messages = []
         for message in messages:
             can_merge = (
-                    new_messages
-                    and isinstance(new_messages[-1].parsed, FailedToParse)
-                    and isinstance(message.parsed, FailedToParse)
+                new_messages
+                and isinstance(new_messages[-1].parsed, FailedToParse)
+                and isinstance(message.parsed, FailedToParse)
             )
             if can_merge:
                 new_messages[-1].parsed.original_messages += message.parsed.original_messages
@@ -676,8 +679,8 @@ def __add__(self, other: ParsedLessonInfo):
 
 
 def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
-                     logger: logging.Logger) -> dict[str, models.Teacher]:
-    out: dict[str, models.Teacher] = {}
+                     logger: logging.Logger) -> dict[str, teacher_model.Teacher]:
+    out: dict[str, teacher_model.Teacher] = {}
 
     if lesson._is_scheduled:
         return out
@@ -685,9 +688,9 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
     for paragraph in lesson.parsed_info.paragraphs:
         for message in paragraph.messages:
             if (
-                    getattr(message.parsed, "other_info_value", -1) is None and
-                    hasattr(message.parsed, "course") and
-                    getattr(message.parsed, "_teachers", None) is not None
+                getattr(message.parsed, "other_info_value", -1) is None and
+                hasattr(message.parsed, "course") and
+                getattr(message.parsed, "_teachers", None) is not None
             ):
                 # noinspection PyUnresolvedReferences
                 surname = next(iter(message.parsed._teachers))
@@ -700,8 +703,8 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
                 _class: dict[str, models.Class] = {
                     class_nr: class_ for class_nr, class_ in classes.items()
                     if (
-                            course == (class_.group or class_.subject)
-                            and lesson.forms.issubset(class_.forms)
+                        course == (class_.group or class_.subject)
+                        and lesson.forms.issubset(class_.forms)
                     )
                 }
 
@@ -709,8 +712,8 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
                     _class = {
                         class_nr: class_ for class_nr, class_ in classes.items()
                         if (
-                                course == class_.subject
-                                and lesson.forms.issubset(class_.forms)
+                            course == class_.subject
+                            and lesson.forms.issubset(class_.forms)
                         )
                     }
 
@@ -731,7 +734,7 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
                     continue
 
                 abbreviation = list(_class.values())[0].teacher
-                teacher = models.Teacher(abbreviation, None, surname, None, [])
+                teacher = teacher_model.Teacher(abbreviation, None, surname, None, [])
 
                 out[teacher.abbreviation] = teacher
 
diff --git a/backend/load_plans.py b/backend/load_plans.py
index e2a160f..e848616 100644
--- a/backend/load_plans.py
+++ b/backend/load_plans.py
@@ -2,16 +2,16 @@
 from __future__ import annotations
 
 import argparse
+import aiohttp
 import asyncio
 import logging
 from pathlib import Path
 
-from backend.creds_provider import creds_provider_factory
 from stundenplan24_py import (
     IndiwareStundenplanerClient, Hosting, proxies
 )
-import aiohttp
 
+from .creds_provider import creds_provider_factory
 from .plan_downloader import PlanDownloader
 from .plan_processor import PlanProcessor
 from .cache import Cache
diff --git a/backend/meta_extractor.py b/backend/meta_extractor.py
index 883a7f8..0cb9d92 100644
--- a/backend/meta_extractor.py
+++ b/backend/meta_extractor.py
@@ -9,7 +9,8 @@
 from stundenplan24_py import indiware_mobil
 
 from .cache import Cache
-from .models import DefaultTimesInfo, Teacher
+from .models import DefaultTimesInfo
+from .teacher import Teacher
 
 
 class DailyMetaExtractor:
diff --git a/backend/models.py b/backend/models.py
index a902289..1579669 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -1,14 +1,13 @@
-# coding=utf-8
 from __future__ import annotations
 
 import copy
 import dataclasses
 import datetime
+import typing
 from collections import defaultdict
 
-import typing
-from stundenplan24_py import indiware_mobil
 import stundenplan24_py
+from stundenplan24_py import indiware_mobil
 
 from .lesson_info import ParsedLessonInfo, LessonInfoParagraph, LessonInfoMessage
 from . import vplan_utils, lesson_info
@@ -530,7 +529,9 @@ def group_blocks_and_lesson_info(self, plan_type: typing.Literal["forms", "teach
                 )
 
                 for remaining_plan_value in {"forms", "teachers", "rooms"} - {plan_type}:
-                    can_get_grouped &= getattr(lesson, remaining_plan_value) == getattr(previous_lesson, remaining_plan_value)
+                    can_get_grouped &= (
+                        getattr(lesson, remaining_plan_value) == getattr(previous_lesson, remaining_plan_value)
+                    )
 
                 grouped_additional_info = self._group_lesson_info(lesson.parsed_info, previous_lesson.parsed_info)
 
@@ -939,113 +940,6 @@ class Class(indiware_mobil.Class):
     forms: set[str]
 
 
-@dataclasses.dataclass
-class Teacher:
-    abbreviation: str | None
-    full_name: str | None = None
-    surname: str | None = None
-    info: str | None = None
-    subjects: list[str] = dataclasses.field(default_factory=list)
-    contact_link: str | None = None
-    image_path: str | None = None
-
-    def serialize(self) -> dict:
-        return {
-            "abbreviation": self.abbreviation,
-            "full_name": self.full_name,
-            "surname": self.surname,
-            "info": self.info,
-            "subjects": self.subjects,
-            "contact_link": self.contact_link,
-            "image_path": self.image_path
-        }
-
-    @classmethod
-    def deserialize(cls, data: dict) -> Teacher:
-        return cls(
-            abbreviation=data["abbreviation"],
-            full_name=data["full_name"],
-            surname=data["surname"],
-            info=data["info"],
-            subjects=data["subjects"],
-            contact_link=data.get("contact_link"),
-            image_path=data.get("image_path"),
-        )
-
-    def merge(self, other: Teacher) -> Teacher:
-        return Teacher(
-            full_name=self.full_name or other.full_name,
-            surname=self.surname or other.surname,
-            info=self.info or other.info,
-            abbreviation=self.abbreviation or other.abbreviation,
-            subjects=list(set(self.subjects + other.subjects)),
-            contact_link=self.contact_link or other.contact_link,
-            image_path=self.image_path or other.image_path,
-        )
-
-    def surname_no_titles(self):
-        """Strip parts of self.surname like "Dr." and return it."""
-        if self.surname is not None:
-            return " ".join(filter(lambda x: "." not in x, self.surname.split(" ")))
-        else:
-            return None
-
-
-@dataclasses.dataclass
-class Teachers:
-    teachers: list[Teacher] = dataclasses.field(default_factory=list)
-    scrape_timestamp: datetime.datetime = datetime.datetime.min
-
-    def serialize(self) -> dict:
-        return {
-            "teachers": {teacher.abbreviation: teacher.serialize() for teacher in self.teachers},
-            "timestamp": self.scrape_timestamp.isoformat()
-        }
-
-    @classmethod
-    def deserialize(cls, data: dict) -> Teachers:
-        return cls(
-            teachers=[Teacher.deserialize(teacher) for teacher in data["teachers"].values()],
-            scrape_timestamp=datetime.datetime.fromisoformat(data["timestamp"])
-        )
-
-    def to_dict(self) -> dict[str, Teacher]:
-        return {teacher.abbreviation: teacher for teacher in self.teachers}
-
-    def abbreviation_by_surname(self) -> dict[str, str]:
-        return {teacher.surname_no_titles(): teacher.abbreviation
-                for teacher in self.teachers
-                if teacher.surname is not None}
-
-
-@dataclasses.dataclass
-class Room:
-    house: int | str
-    floor: int | None
-    room_nr: int | None
-    appendix: str = ""
-
-    def to_short(self) -> str:
-        if isinstance(self.house, str):
-            assert self.floor is None
-            return self.house + (str(self.room_nr) if self.room_nr else "") + self.appendix
-
-        if self.floor < 0:
-            return f"-{self.house}{abs(self.floor)}{self.room_nr:02}{self.appendix}"
-        elif self.floor == 0:
-            return f"{self.house}{self.room_nr:02}{self.appendix}"
-        else:
-            return f"{self.house}{self.floor}{self.room_nr:02}{self.appendix}"
-
-    def to_dict(self) -> dict:
-        return {
-            "house": self.house,
-            "floor": self.floor,
-            "room_nr": self.room_nr,
-            "appendix": self.appendix
-        }
-
-
 @dataclasses.dataclass
 class DefaultTimesInfo:
     data: dict[int, tuple[datetime.time, datetime.time]]
diff --git a/backend/plan_extractor.py b/backend/plan_extractor.py
index 95a1eca..d245212 100644
--- a/backend/plan_extractor.py
+++ b/backend/plan_extractor.py
@@ -10,7 +10,8 @@
 
 from . import lesson_info
 from .lesson_info import process_additional_info
-from .models import Plan, Teacher, Teachers, Lesson, Lessons
+from .teacher import Teacher, Teachers
+from .models import Lesson, Lessons, Plan
 from .vplan_utils import parse_absent_element, ParsedForm
 
 
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 53f496b..c53cef8 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -8,7 +8,8 @@
 from .cache import Cache
 from .plan_extractor import StudentsPlanExtractor, TeachersPlanExtractor
 from .meta_extractor import MetaExtractor
-from .models import Teachers, Exam, Teacher, PlanLesson
+from .teacher import Teacher, Teachers
+from .models import PlanLesson, Exam
 from .vplan_utils import group_forms, ParsedForm
 from .stats import LessonsStatistics
 
@@ -175,8 +176,12 @@ def compute_plans(self, date: datetime.date, timestamp: datetime.datetime):
                 )
 
                 teachers_rooms_data = {
-                    "used_rooms_by_period": (used_rooms := teachers_plan_extractor.teacher_plan_extractor.used_rooms_by_period()),
-                    "free_rooms_by_period": (free_rooms := teachers_plan_extractor.teacher_plan_extractor.free_rooms_by_period(all_rooms)),
+                    "used_rooms_by_period": (
+                        used_rooms := teachers_plan_extractor.teacher_plan_extractor.used_rooms_by_period()
+                    ),
+                    "free_rooms_by_period": (
+                        free_rooms := teachers_plan_extractor.teacher_plan_extractor.free_rooms_by_period(all_rooms)
+                    ),
                     "used_rooms_by_block": teachers_plan_extractor.teacher_plan_extractor.rooms_by_block(used_rooms),
                     "free_rooms_by_block": teachers_plan_extractor.teacher_plan_extractor.rooms_by_block(free_rooms)
                 }
diff --git a/backend/room.py b/backend/room.py
new file mode 100644
index 0000000..311809e
--- /dev/null
+++ b/backend/room.py
@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+import dataclasses
+
+
+@dataclasses.dataclass
+class Room:
+    house: int | str
+    floor: int | None
+    room_nr: int | None
+    appendix: str = ""
+
+    def to_short(self) -> str:
+        if isinstance(self.house, str):
+            assert self.floor is None
+            return self.house + (str(self.room_nr) if self.room_nr else "") + self.appendix
+
+        if self.floor < 0:
+            return f"-{self.house}{abs(self.floor)}{self.room_nr:02}{self.appendix}"
+        elif self.floor == 0:
+            return f"{self.house}{self.room_nr:02}{self.appendix}"
+        else:
+            return f"{self.house}{self.floor}{self.room_nr:02}{self.appendix}"
+
+    def to_dict(self) -> dict:
+        return {
+            "house": self.house,
+            "floor": self.floor,
+            "room_nr": self.room_nr,
+            "appendix": self.appendix
+        }
diff --git a/backend/schools/__init__.py b/backend/schools/__init__.py
index c7ff1df..60622ba 100644
--- a/backend/schools/__init__.py
+++ b/backend/schools/__init__.py
@@ -1,7 +1,8 @@
 import typing
 
 from . import ostwald, taro, rudolf_hildebrandt
-from ..models import Teacher, Room
+from ..room import Room
+from ..teacher import Teacher
 
 teacher_scrapers: dict[str, typing.Callable[[], list[Teacher]]] = {
     "10001329": ostwald.scrape_teachers,
diff --git a/backend/schools/taro.py b/backend/schools/taro.py
index cc7c031..b41ef7e 100644
--- a/backend/schools/taro.py
+++ b/backend/schools/taro.py
@@ -23,10 +23,16 @@ def get_teachers() -> list[Teacher]:
         if teacher_data[1] and teacher_data[2]:
             for name in teacher_images:
                 if name[:-4].startswith(teacher_data[2]) and name[:-4].endswith(teacher_data[1]):
-                    teacher_lst.append(Teacher(abbreviation=teacher_data[0], surname=name[:-4].replace("_", " "), image_path=name))
+                    teacher_lst.append(Teacher(
+                        abbreviation=teacher_data[0],
+                        surname=name[:-4].replace("_", " "),
+                        image_path=name
+                    ))
                     break
             else:
-                teacher_lst.append(Teacher(abbreviation=teacher_data[0], surname=f"{teacher_data[2]} {teacher_data[1]}"))
+                teacher_lst.append(
+                    Teacher(abbreviation=teacher_data[0], surname=f"{teacher_data[2]} {teacher_data[1]}")
+                )
     return teacher_lst
 
 
diff --git a/backend/stats.py b/backend/stats.py
index 9931a1f..867bd74 100644
--- a/backend/stats.py
+++ b/backend/stats.py
@@ -1,7 +1,7 @@
 import dataclasses
 from collections import defaultdict
 
-from backend import models
+from . import models
 
 
 @dataclasses.dataclass
diff --git a/backend/teacher.py b/backend/teacher.py
new file mode 100644
index 0000000..cc42d78
--- /dev/null
+++ b/backend/teacher.py
@@ -0,0 +1,83 @@
+from __future__ import annotations
+
+import dataclasses
+import datetime
+
+
+@dataclasses.dataclass
+class Teacher:
+    abbreviation: str | None
+    full_name: str | None = None
+    surname: str | None = None
+    info: str | None = None
+    subjects: list[str] = dataclasses.field(default_factory=list)
+    contact_link: str | None = None
+    image_path: str | None = None
+
+    def serialize(self) -> dict:
+        return {
+            "abbreviation": self.abbreviation,
+            "full_name": self.full_name,
+            "surname": self.surname,
+            "info": self.info,
+            "subjects": self.subjects,
+            "contact_link": self.contact_link,
+            "image_path": self.image_path
+        }
+
+    @classmethod
+    def deserialize(cls, data: dict) -> Teacher:
+        return cls(
+            abbreviation=data["abbreviation"],
+            full_name=data["full_name"],
+            surname=data["surname"],
+            info=data["info"],
+            subjects=data["subjects"],
+            contact_link=data.get("contact_link"),
+            image_path=data.get("image_path"),
+        )
+
+    def merge(self, other: Teacher) -> Teacher:
+        return Teacher(
+            full_name=self.full_name or other.full_name,
+            surname=self.surname or other.surname,
+            info=self.info or other.info,
+            abbreviation=self.abbreviation or other.abbreviation,
+            subjects=list(set(self.subjects + other.subjects)),
+            contact_link=self.contact_link or other.contact_link,
+            image_path=self.image_path or other.image_path,
+        )
+
+    def surname_no_titles(self):
+        """Strip parts of self.surname like "Dr." and return it."""
+        if self.surname is not None:
+            return " ".join(filter(lambda x: "." not in x, self.surname.split(" ")))
+        else:
+            return None
+
+
+@dataclasses.dataclass
+class Teachers:
+    teachers: list[Teacher] = dataclasses.field(default_factory=list)
+    scrape_timestamp: datetime.datetime = datetime.datetime.min
+
+    def serialize(self) -> dict:
+        return {
+            "teachers": {teacher.abbreviation: teacher.serialize() for teacher in self.teachers},
+            "timestamp": self.scrape_timestamp.isoformat()
+        }
+
+    @classmethod
+    def deserialize(cls, data: dict) -> Teachers:
+        return cls(
+            teachers=[Teacher.deserialize(teacher) for teacher in data["teachers"].values()],
+            scrape_timestamp=datetime.datetime.fromisoformat(data["timestamp"])
+        )
+
+    def to_dict(self) -> dict[str, Teacher]:
+        return {teacher.abbreviation: teacher for teacher in self.teachers}
+
+    def abbreviation_by_surname(self) -> dict[str, str]:
+        return {teacher.surname_no_titles(): teacher.abbreviation
+                for teacher in self.teachers
+                if teacher.surname is not None}

From 4e00b1742d061c492d8e176d4d84757494c6c93c Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:22:59 +0200
Subject: [PATCH 14/61] improve taro room parsing

---
 backend/schools/taro.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/schools/taro.py b/backend/schools/taro.py
index b41ef7e..883d9f5 100644
--- a/backend/schools/taro.py
+++ b/backend/schools/taro.py
@@ -48,7 +48,9 @@ def parse_room(room_str: str) -> Room:
 
     for exception in exceptions:
         if room_str.startswith(exception):
-            return Room(exception, None, int(room_str[len(exception):]), "")
+            _num_after = room_str[len(exception):]
+            num_after = int(_num_after) if _num_after else None
+            return Room(exception, None, num_after, "")
 
     if room_str.startswith("E"):
         house = "Anbau"

From 37b51eba76d51efa79e3a63d031490ac9d40556d Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:23:31 +0200
Subject: [PATCH 15/61] fix TeacherPlanProcessor has no attribute
 room_plan_extractor

---
 backend/plan_extractor.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/backend/plan_extractor.py b/backend/plan_extractor.py
index d245212..d814b0b 100644
--- a/backend/plan_extractor.py
+++ b/backend/plan_extractor.py
@@ -266,6 +266,9 @@ def teacher_plan(self):
         return lessons_grouped.make_plan("teachers", plan_type="teachers")
 
     def room_plan(self):
-        lessons_grouped = self.room_plan_extractor.plan.lessons.group_blocks_and_lesson_info("rooms")
-        SubPlanExtractor.extrapolate_lesson_times(lessons_grouped)
-        return lessons_grouped.make_plan("rooms", plan_type="rooms")
\ No newline at end of file
+        if not hasattr(self, "room_plan_extractor"):
+            return {}
+        else:
+            lessons_grouped = self.room_plan_extractor.plan.lessons.group_blocks_and_lesson_info("rooms")
+            SubPlanExtractor.extrapolate_lesson_times(lessons_grouped)
+            return lessons_grouped.make_plan("rooms", plan_type="rooms")

From a51de14332f194b074bc0d3627836b0108287056 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:26:34 +0200
Subject: [PATCH 16/61] fix imports in school parsers

---
 backend/schools/ostwald.py            | 3 ++-
 backend/schools/rudolf_hildebrandt.py | 2 +-
 backend/schools/taro.py               | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/schools/ostwald.py b/backend/schools/ostwald.py
index 553cb24..6e1c076 100644
--- a/backend/schools/ostwald.py
+++ b/backend/schools/ostwald.py
@@ -4,7 +4,8 @@
 import requests
 from bs4 import BeautifulSoup
 
-from backend.models import Teacher, Room
+from backend.teacher import Teacher
+from backend.room import Room
 
 
 def scrape_teachers() -> List[Teacher]:
diff --git a/backend/schools/rudolf_hildebrandt.py b/backend/schools/rudolf_hildebrandt.py
index 2788a58..65730b7 100644
--- a/backend/schools/rudolf_hildebrandt.py
+++ b/backend/schools/rudolf_hildebrandt.py
@@ -1,4 +1,4 @@
-from backend.models import Room
+from backend.room import Room
 
 
 def parse_room(room: str) -> Room:
diff --git a/backend/schools/taro.py b/backend/schools/taro.py
index 883d9f5..d5315fb 100644
--- a/backend/schools/taro.py
+++ b/backend/schools/taro.py
@@ -1,6 +1,7 @@
 import os
 
-from backend.models import Teacher, Room
+from backend.teacher import Teacher
+from backend.room import Room
 
 
 # teachers and images from: https://taroschule.de/lehrerinnen/

From 212e8a5f16de9265f87215bc412109d22ec5f566 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:39:37 +0200
Subject: [PATCH 17/61] fix circular import

---
 backend/load_plans.py     | 2 +-
 backend/plan_processor.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/load_plans.py b/backend/load_plans.py
index e848616..564f3f0 100644
--- a/backend/load_plans.py
+++ b/backend/load_plans.py
@@ -13,8 +13,8 @@
 
 from .creds_provider import creds_provider_factory
 from .plan_downloader import PlanDownloader
-from .plan_processor import PlanProcessor
 from .cache import Cache
+from .plan_processor import PlanProcessor
 
 
 class PlanCrawler:
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index c53cef8..2f6715b 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -6,12 +6,12 @@
 
 from . import schools
 from .cache import Cache
-from .plan_extractor import StudentsPlanExtractor, TeachersPlanExtractor
 from .meta_extractor import MetaExtractor
 from .teacher import Teacher, Teachers
 from .models import PlanLesson, Exam
 from .vplan_utils import group_forms, ParsedForm
 from .stats import LessonsStatistics
+from .plan_extractor import StudentsPlanExtractor, TeachersPlanExtractor
 
 
 class PlanProcessor:

From 1c3650690fa0a6eed735bb870a669bbc12b316fc Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:39:54 +0200
Subject: [PATCH 18/61] improve school parsers

---
 backend/schools/ostwald.py            | 3 +--
 backend/schools/rudolf_hildebrandt.py | 2 ++
 backend/schools/taro.py               | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/schools/ostwald.py b/backend/schools/ostwald.py
index 6e1c076..6b201c9 100644
--- a/backend/schools/ostwald.py
+++ b/backend/schools/ostwald.py
@@ -1,5 +1,4 @@
 from __future__ import annotations
-from typing import List
 
 import requests
 from bs4 import BeautifulSoup
@@ -8,7 +7,7 @@
 from backend.room import Room
 
 
-def scrape_teachers() -> List[Teacher]:
+def scrape_teachers() -> list[Teacher]:
     r = requests.post("https://www.ostwaldgymnasium.de/index.php/schule/lehrer", data={"limit": "0"})
 
     soup = BeautifulSoup(r.text, features="html.parser")
diff --git a/backend/schools/rudolf_hildebrandt.py b/backend/schools/rudolf_hildebrandt.py
index 65730b7..974dfc3 100644
--- a/backend/schools/rudolf_hildebrandt.py
+++ b/backend/schools/rudolf_hildebrandt.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from backend.room import Room
 
 
diff --git a/backend/schools/taro.py b/backend/schools/taro.py
index d5315fb..4425c0e 100644
--- a/backend/schools/taro.py
+++ b/backend/schools/taro.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 
 from backend.teacher import Teacher

From 16de7582433a20a630958b604e9b44de44aa173b Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 04:40:15 +0200
Subject: [PATCH 19/61] add number to updating teachers log message

---
 backend/plan_processor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 2f6715b..2f7a454 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -240,7 +240,7 @@ def scrape_teachers(self):
         self.store_teachers()
 
     def add_teachers(self, new_teachers: dict[str, Teacher], update_timestamp: bool = False):
-        self._logger.debug("=> Updating teachers...")
+        self._logger.debug(f"=> Updating teachers... ({len(new_teachers)})")
 
         old_teachers = self.teachers.to_dict()
         all_abbreviations = set(old_teachers.keys()) | set(new_teachers.keys())

From 181fd186043210641ddc313f68d4c03bdceb61e9 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 13:23:04 +0200
Subject: [PATCH 20/61] sort lessons and filter rooms

---
 backend/models.py         | 7 ++++---
 backend/plan_processor.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/models.py b/backend/models.py
index 1579669..e0df233 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -414,7 +414,7 @@ def make_plan(self, *group_attrs: str, plan_type: typing.Literal["forms", "teach
         grouped_lessons = self.group_by(*group_attrs)
 
         return {
-            group: lessons.to_plan_lessons(plan_type, {group})
+            group: sorted(lessons.to_plan_lessons(plan_type, {group}), key=lambda l: (min(l.periods), -len(l.periods)))
             for group, lessons in grouped_lessons.items()
         }
 
@@ -464,6 +464,7 @@ def _group_lesson_info(
                         return None
 
                 # periods not groupable, so, to group, info string must be the same
+                # TODO: Refactor this, ParsedLessonInfo.original_messages is not reliable/a set
                 elif message1.parsed.original_messages == message2.parsed.original_messages:
                     new_paragraph.append(message1)
 
@@ -634,7 +635,7 @@ def from_form_plan(cls, form_plan: indiware_mobil.IndiwareMobilPlan) -> Plan:
                     forms={form.short_name},
                     teachers=set(lesson.teacher().split()) if lesson.teacher() else set(),
                     # TODO: Some schools use rooms with spaces
-                    rooms=set(lesson.room().split(" ")) if lesson.room() else set(),
+                    rooms={r for r in lesson.room().split(" ") if r} if lesson.room() else set(),
                     course=lesson.subject(),
 
                     # see below
@@ -750,7 +751,7 @@ def from_teacher_plan(cls, teacher_plan: indiware_mobil.IndiwareMobilPlan) -> Pl
                     forms=set(lesson.teacher().split(",")) if lesson.teacher() else set(),
                     teachers={teacher.short_name},
                     # TODO: Some schools use rooms with spaces
-                    rooms=set(lesson.room().split(" ")) if lesson.room() else set(),
+                    rooms={r for r in lesson.room().split(" ") if r} if lesson.room() else set(),
                     course=lesson.subject(),
 
                     # see below
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 2f7a454..e8f74b8 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "88"
+    VERSION = "89"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger

From 3c0fb0bdec56d75f818899a2de8e37c53f86b54a Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 15:49:34 +0200
Subject: [PATCH 21/61] fix #203

---
 backend/lesson_info.py    | 20 ++++++++++----------
 backend/models.py         |  2 +-
 backend/plan_processor.py |  2 +-
 backend/vplan_utils.py    | 12 +++++++-----
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index 780bc99..eff2337 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -156,7 +156,7 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
 class MovedFrom(SerializeMixin, ParsedLessonInfoMessage):
     plan_type: typing.Literal["forms", "teachers", "rooms"]
     plan_value: set[str]
-    periods: list[int]
+    periods: set[int]
     date: datetime.date | None
 
     def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSegment]:
@@ -170,7 +170,7 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
                         type=self.plan_type,
                         value=sorted(self.plan_value),
                         date=lesson_date,
-                        periods=self.periods
+                        periods=sorted(self.periods)
                     )
                 )
             ]
@@ -184,7 +184,7 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
                         type=self.plan_type,
                         value=sorted(self.plan_value),
                         date=self.date,
-                        periods=self.periods
+                        periods=sorted(self.periods)
                     )
                 )
             ]
@@ -251,7 +251,7 @@ def _course_text_segments(self, date: datetime.date, periods: list[int] | None)
 @dataclasses.dataclass
 class MovedTo(SerializeMixin, AbstractParsedLessonInfoMessageWithCourseInfo):
     date: datetime.date | None
-    periods: list[int]
+    periods: set[int]
 
     def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSegment]:
         if self.date is None:
@@ -264,13 +264,13 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
                         type=self.plan_type,
                         value=sorted(self.plan_value),
                         date=lesson_date,
-                        periods=self.periods
+                        periods=sorted(self.periods)
                     )
                 )
             ]
         elif self.date < lesson_date:
             return [
-                *self._course_text_segments(self.date, self.periods),
+                *self._course_text_segments(self.date, sorted(self.periods)),
                 LessonInfoTextSegment(" gehalten am "),
                 LessonInfoTextSegment(
                     f"{de_weekday_to_str(self.date.weekday())} ({self.date.strftime('%d.%m.%Y')}) "
@@ -279,13 +279,13 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
                         type=self.plan_type,
                         value=sorted(self.plan_value),
                         date=self.date,
-                        periods=self.periods
+                        periods=sorted(self.periods)
                     )
                 )
             ]
         else:
             return [
-                *self._course_text_segments(self.date, self.periods),
+                *self._course_text_segments(self.date, sorted(self.periods)),
                 LessonInfoTextSegment(" verlegt nach "),
                 LessonInfoTextSegment(
                     f"{de_weekday_to_str(self.date.weekday())} ({self.date.strftime('%d.%m.%Y')}) "
@@ -294,7 +294,7 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
                         type=self.plan_type,
                         value=sorted(self.plan_value),
                         date=self.date,
-                        periods=self.periods
+                        periods=sorted(self.periods)
                     )
                 )
             ]
@@ -433,7 +433,7 @@ def _parse_form_plan_message(info: str, lesson: models.Lesson) -> tuple[ParsedLe
         return MovedFrom(
             plan_type="forms",
             plan_value=lesson.forms,
-            periods=[int(match.group("period_begin"))],
+            periods={int(match.group("period_begin"))},
             date=None
         ), match
     elif match := _InfoParsers.instead_of.match(info):
diff --git a/backend/models.py b/backend/models.py
index e0df233..fae798d 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -456,7 +456,7 @@ def _group_lesson_info(
                         new_message = copy.deepcopy(message1)
                         # noinspection PyTypeHints
                         new_message.parsed: lesson_info.MovedFrom | lesson_info.MovedTo
-                        new_message.parsed.periods += parsed2.periods
+                        new_message.parsed.periods |= parsed2.periods
                         new_message.parsed.original_messages += parsed2.original_messages
                         new_message.parsed.plan_value |= parsed2.plan_value
                         new_paragraph.append(new_message)
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index e8f74b8..6d1a88b 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "89"
+    VERSION = "90"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger
diff --git a/backend/vplan_utils.py b/backend/vplan_utils.py
index 5fe9631..7927b71 100644
--- a/backend/vplan_utils.py
+++ b/backend/vplan_utils.py
@@ -216,7 +216,9 @@ def forms_to_str(forms: typing.Iterable[str]) -> str:
     return parsed_forms_to_str([ParsedForm.from_str(form) for form in forms])
 
 
-def periods_to_block_label(periods: list[int]) -> str:
+def periods_to_block_label(periods: typing.Iterable[int]) -> str:
+    periods = list(set(periods))
+
     periods.sort()
 
     rests = {
@@ -246,11 +248,11 @@ def period_str_to_int(string: str) -> int:
         return list(range(period_str_to_int(begin), period_str_to_int(end) + 1))
 
 
-def parse_periods(period_str: str) -> list[int]:
-    return sum([_parse_periods(p) for p in period_str.split(",")], [])
+def parse_periods(period_str: str) -> set[int]:
+    return set(sum([_parse_periods(p) for p in period_str.split(",")], []))
 
 
-def parse_absent_element(element: str) -> tuple[str, list[int]]:
+def parse_absent_element(element: str) -> tuple[str, set[int]]:
     """Parse a string like the following: "label (1-2,4)" into label and periods."""
 
     segments = element.rsplit("(", 1)
@@ -258,7 +260,7 @@ def parse_absent_element(element: str) -> tuple[str, list[int]]:
     label = segments[0].strip()
 
     if len(segments) == 1:
-        periods = []
+        periods = set()
     else:
         periods = parse_periods(segments[1][:-1])
 

From beaa42912f6976e15554936961570015cb661ee9 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 16:08:38 +0200
Subject: [PATCH 22/61] fix teacher extraction

---
 backend/lesson_info.py    | 3 +++
 backend/plan_processor.py | 9 ++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index eff2337..3f512c7 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -682,6 +682,9 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
                      logger: logging.Logger) -> dict[str, teacher_model.Teacher]:
     out: dict[str, teacher_model.Teacher] = {}
 
+    for teacher_abbreviation in lesson.teachers or ():
+        out[teacher_abbreviation] = teacher_model.Teacher(teacher_abbreviation)
+
     if lesson._is_scheduled:
         return out
 
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 6d1a88b..04a3e0e 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "90"
+    VERSION = "91"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger
@@ -133,10 +133,8 @@ def compute_plans(self, date: datetime.date, timestamp: datetime.datetime):
 
             all_forms = self.meta_extractor.forms()
             all_forms_parsed = [ParsedForm.from_str(f) for f in all_forms]
-            students_plan_extractor.teacher_abbreviation_by_surname |= (
-                {-i: t.abbreviation for i, t in enumerate(self.meta_extractor.teachers())} |
-                self.teachers.abbreviation_by_surname()
-            )
+            students_plan_extractor.teacher_abbreviation_by_surname = self.teachers.abbreviation_by_surname()
+
             self.cache.store_plan_file(
                 date, timestamp,
                 json.dumps(students_plan_extractor.info_data(all_forms_parsed)),
@@ -210,6 +208,7 @@ def update_meta(self):
         self.cache.store_meta_file(json.dumps(data), "meta.json")
         self.cache.store_meta_file(json.dumps(self.meta_extractor.dates_data()), "dates.json")
 
+        self.add_teachers({t.abbreviation: t for t in self.meta_extractor.teachers()})
         self.scrape_teachers()
         self.update_forms()
         self.update_rooms()

From e844e63c1ee7eda78a898e1684577202f6a226d6 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sat, 30 Sep 2023 00:44:02 +0200
Subject: [PATCH 23/61] Favourites work-in-progress in frontend

---
 client/src/App.svelte               |  60 ++-----
 client/src/Favourites.svelte        | 254 ++++++++++++++++++++++++++++
 client/src/components/Navbar.svelte |   1 +
 client/src/components/Plan.svelte   |  24 ++-
 client/src/utils.js                 |  30 +++-
 5 files changed, 316 insertions(+), 53 deletions(-)
 create mode 100644 client/src/Favourites.svelte

diff --git a/client/src/App.svelte b/client/src/App.svelte
index bbf8c4d..5b9f9e8 100644
--- a/client/src/App.svelte
+++ b/client/src/App.svelte
@@ -6,17 +6,18 @@
     import Navbar from "./components/Navbar.svelte";
     import Settings from "./components/Settings.svelte";
     import AboutUs from "./components/AboutUs.svelte";
+    import Favourites from "./Favourites.svelte";
     import SveltyPicker from 'svelty-picker';
     import {get_settings, group_rooms, update_colors, navigate_page, init_indexed_db, clear_plan_cache} from "./utils.js";
     import {notifications} from './notifications.js';
     import {logged_in, title, current_page, preferences, settings, active_modal, pwa_prompt, indexed_db} from './stores.js'
-    import {customFetch, format_revision_date} from "./utils.js";
     import SchoolManager from "./components/SchoolManager.svelte";
     import Preferences from "./components/Preferences.svelte";
     import Changelog from "./components/Changelog.svelte";
     import Select from "./base_components/Select.svelte";
     import Contact from "./components/Contact.svelte";
     import Impressum from "./components/Impressum.svelte";
+    import {customFetch, format_revision_date, load_meta} from "./utils.js";
     import {de} from 'svelty-picker/i18n';
     import PwaInstallHelper from "./components/PWAInstallHelper.svelte";
     import Dropdown from "./base_components/Dropdown.svelte";
@@ -84,51 +85,22 @@
     }
 
     function get_meta() {
-        let data_from_cache = false;
-        let data = localStorage.getItem(`${school_num}_meta`);
-        if (data !== "undefined" && data) {
-            data = JSON.parse(data);
-            meta = data;
-            all_rooms = data.rooms;
-            teacher_list = Object.keys(data.teachers);
-            grouped_forms = data.forms.grouped_forms;
-            enabled_dates = Object.keys(data.dates);
-            if(!date) {
-                date = data.date;
-            }
-            course_lists = data.forms.forms;
-            data_from_cache = true;
-        }
-        customFetch(`${api_base}/meta`)
+        load_meta(school_num)
             .then(data => {
-                // console.log("Meta geladen");
-                try {
-                    localStorage.setItem(`${school_num}_meta`, JSON.stringify(data));
-                } catch (error) {
-                    if (error.name === 'QuotaExceededError' ) {
-                        notifications.danger("Die Schulmetadaten konnten nicht gecached werden.")
-                    } else {
-                        throw error;
-                    }
+                if (!data) {
+                    return
                 }
-                meta = data;
-                all_rooms = data.rooms;
-                teacher_list = Object.keys(data.teachers);
-                grouped_forms = data.forms.grouped_forms;
-                enabled_dates = Object.keys(data.dates);
+                meta = data[0];
+                all_rooms = meta.rooms;
+                teacher_list = Object.keys(meta.teachers);
+                grouped_forms = meta.forms.grouped_forms;
+                enabled_dates = Object.keys(meta.dates);
                 if(!date) {
-                    date = data.date;
+                    date = meta.date;
                 }
-                course_lists = data.forms.forms;
+                course_lists = meta.forms.forms;
+                //data_from_cache = data[1];
             })
-            .catch(error => {
-                if (data_from_cache) {
-                    // notifications.info("Metadaten aus Cache geladen", 2000);
-                    console.log("Metadaten aus Cache geladen");
-                } else {
-                    notifications.danger(error.message);
-                }
-            });
     }
 
     function check_login_status() {
@@ -293,7 +265,7 @@
             plan_type = decodeURI(tmp_variables[3]);
             plan_value = decodeURI(tmp_variables[4]);
         }
-    }  
+    }
 
     $logged_in = localStorage.getItem('logged_in') === 'true';
     init_vars();
@@ -311,7 +283,7 @@
     $: (Object.keys($settings).length !== 0) && localStorage.setItem("settings", `${JSON.stringify($settings)}`);
     $: update_colors($settings);
     $: $logged_in && get_greeting();
-    
+
     $: selected_form && set_plan("forms", selected_form);
     $: gen_form_arr(grouped_forms);
     $: selected_teacher && set_plan("teachers", selected_teacher);
@@ -372,6 +344,8 @@
             <AboutUs />
         {:else if $current_page === "impressum"}
             <Impressum />
+        {:else if $current_page === "favourites"}
+            <Favourites />
         {:else if $logged_in}
             {#if $current_page.substring(0, 4) === "plan" || $current_page === "weekplan"}
                 <h1 class="responsive-heading">{emoji} {greeting}</h1>
diff --git a/client/src/Favourites.svelte b/client/src/Favourites.svelte
new file mode 100644
index 0000000..8fd6a4f
--- /dev/null
+++ b/client/src/Favourites.svelte
@@ -0,0 +1,254 @@
+<script>
+    import {load_meta} from "./utils.js";
+    import Select from "./base_components/Select.svelte";
+    import Button from "./base_components/Button.svelte";
+    import {onMount} from "svelte";
+    import {title} from "./stores.js";
+
+    let favourites = [
+        //{"school_num": "10001329", "name": "Arthur", "priority": 0, "plan_type": "forms", "plan_value": "JG12", "preferences": {}}
+    ]
+    $: console.log(favourites);
+    let school_nums = [];
+    $: school_nums = [...new Set(favourites.map(obj => obj.school_num))];
+    let all_meta = {};
+    let duplicated_courses_match = {};
+    $: update_meta(school_nums);
+
+    let preferences = {};
+
+    onMount(() => {
+        load_favourites();
+    });
+
+    function get_pseudo_favourites_from_server() {
+        return [
+            //{"school_num": "10001329", "name": "Arthur", "priority": 0, "plan_type": "forms", "plan_value": "JG12", "preferences": [607, 609, 616]},
+            {"school_num": "10001329", "name": "Leo", "priority": 1, "plan_type": "forms", "plan_value": "6/4", "preferences": ["494", "434"]},
+        ]
+    }
+
+    /*
+    preferences procedure:
+        - from server: list of courses that are not checked
+        - list converted to object ([462, 412] -> {462: false, 412: false})
+        - all other courses of form later set to true
+        - saving: all courses are extracted that have the false value
+
+        - duplicated courses are unified: for each course c1 that already exists as course c0, the pair c1: c0 is put into an object -> later, the check-value of c1 is set to that of c0
+    */
+    function load_favourites() {
+        // change preferences to dict
+        let temp_fav = get_pseudo_favourites_from_server();
+        temp_fav = temp_fav.map(item => ({ ...item, preferences: item.preferences.reduce((obj, preference) => ({ ...obj, [preference]: false }), {}) }));
+        console.log(temp_fav)
+        favourites = temp_fav;
+    }
+    function save_favourites() {
+        let new_favourites = [];
+        for (let favourite = 0; favourite < favourites.length; favourite++) {
+            let cur_favourite = {...favourites[favourite]};
+            for (const cur_key of Object.keys(duplicated_courses_match[favourite])) {
+                cur_favourite.preferences[cur_key] = cur_favourite.preferences[duplicated_courses_match[favourite][cur_key]];
+            }
+            cur_favourite.preferences = Object.keys(cur_favourite.preferences).filter(key => cur_favourite.preferences[key] === false);
+            new_favourites.push(cur_favourite);
+        }
+        console.log(new_favourites);
+    }
+
+    // FAVOURITE MANAGEMENT
+    function add_favourite() {
+        favourites = [...favourites, {"school_num": "test", "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}];
+    }
+    // clear everything except for the school num of a favourite
+    function clear_favourite(favourite) {
+        favourites[favourite] = {"school_num": favourites[favourite].school_num, "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}
+    }
+    // delete a favourite
+    function delete_favourite(favourite) {
+        let new_array = favourites;
+        new_array.splice(favourite, 1);
+        favourites = new_array;
+    }
+
+
+    // load all metadata for all schools needed
+    function update_meta(school_nums) {
+        for (let i = 0; i < school_nums.length; i++) {
+            if (all_meta.hasOwnProperty(school_nums[i])) {
+                continue;
+            }
+            load_meta(school_nums[i])
+                .then(meta => {
+                    all_meta[school_nums[i]] = meta[0];
+                })
+        }
+    }
+    // getting available teachers/rooms/forms
+    function get_values(school_num, plan_type, stored_meta) {
+        if (!stored_meta.hasOwnProperty(school_num)) {
+            return []
+        }
+        let meta = stored_meta[school_num];
+        let return_lst = [];
+        if (plan_type === "teachers") {
+            for (const teacher of Object.keys(meta.teachers)) {
+                return_lst.push({"id": teacher, "display_name": teacher})
+            }
+            return return_lst
+        } else if (plan_type === "rooms") {
+            for (const room of Object.keys(meta.rooms)) {
+                return_lst.push({"id": room, "display_name": room})
+            }
+            return return_lst
+        } else if (plan_type === "forms") {
+            for (const [form_group, forms] of Object.entries(meta.forms.grouped_forms)) {
+                let converted_forms = [];
+                for(let form of forms) {
+                    converted_forms.push({"id": form, "display_name": form});
+                }
+                return_lst.push([form_group, converted_forms]);
+            }
+            return return_lst
+        }
+        return [];
+    }
+    // get subjects for one form
+    function get_subjects(favourite, stored_meta) {
+        let school_num = favourites[favourite].school_num;
+        let form = favourites[favourite].plan_value;
+        if (!stored_meta.hasOwnProperty(school_num)) {
+            return []
+        }
+        if (!stored_meta[school_num].forms.forms.hasOwnProperty(form)) {
+            return []
+        }
+        duplicated_courses_match[favourite] = {};
+        for (const class_group of Object.keys(stored_meta[school_num].forms.forms[form].class_groups)) {
+            if (favourites[favourite].preferences[class_group] === undefined) {
+                favourites[favourite].preferences[class_group] = true;
+            }
+        }
+
+        return sort_courses_by_subject(favourite, stored_meta[school_num].forms.forms[form].class_groups)
+        //return Object.entries(stored_meta[school_num].forms.forms[form].class_groups);
+    }
+
+    function sort_courses_by_subject(favourite, obj) {
+        const courses_by_subject = {};
+
+        Object.entries(obj).forEach(([class_number, class_data]) => {
+            const subject = class_data.subject;
+            if (courses_by_subject[subject] === undefined) {
+                courses_by_subject[subject] = [];
+            }
+            class_data.class_number = class_number;
+
+            // this is for the duplicated forms
+            let object_exists = false;
+            for (const obj of courses_by_subject[subject]) {
+                if (
+                    Object.keys(class_data)
+                        .filter(key => key !== "class_number")
+                        .every(key => obj[key] === class_data[key])
+                ) {
+                    duplicated_courses_match[favourite][class_number] = obj.class_number;
+                    object_exists = true;
+                    break;
+                }
+            }
+            if (!object_exists) {
+                courses_by_subject[subject].push(class_data);
+            }
+        });
+
+        Object.values(courses_by_subject).map(class_datas => class_datas.sort((data1, data2) => data2.group?.localeCompare(data1.group)));
+
+        return courses_by_subject;
+    }
+
+</script>
+
+<button on:click={save_favourites}>Speichern</button>
+<button on:click={add_favourite}>Favorit hinzufügen</button>
+{#each favourites as _, favourite}
+    <p>
+        <input type="text" bind:value={favourites[favourite].name}>
+        <!-- TODO: GET AUTHORIZED SCHOOLS -->
+        <select name="school_select" id="" bind:value={favourites[favourite].school_num} on:change={() => clear_favourite(favourite)}>
+            <option value="10001329">Ostwald</option>
+            <option value="10000000">Beispielschule</option>
+        </select>
+        <select name="plan_type_select" id="" bind:value={favourites[favourite].plan_type} on:change={() => favourites[favourite].plan_value = ""}>
+            <option value="forms">Klassenplan</option>
+            <option value="teachers">Lehrerplan</option>
+            <option value="rooms">Raumplan</option>
+            <option value="free_rooms">Freie Räume</option>
+        </select>
+        {#if favourites[favourite].plan_type === "forms"}
+            <Select data={get_values(favourites[favourite].school_num, favourites[favourite].plan_type, all_meta)} grouped={true} bind:selected_id={favourites[favourite].plan_value} data_name="{favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
+            <!--choosable courses-->
+            {#each Object.entries(
+                get_subjects(favourite, all_meta)
+            ).sort(([subj1, _], [subj2, __]) => subj1.localeCompare(subj2)).sort(([_, courses1], [__, courses2]) => courses2.length - courses1.length) as [subject, courses]}
+                {#if courses.length === 1}
+                    <li>{subject}:<input
+                            type="checkbox"
+                            bind:checked={favourites[favourite].preferences[courses[0].class_number]}
+                    />
+                        {courses[0].class_number}
+                        {courses[0].teacher} |
+                        {courses[0].subject}
+                        {#if courses[0].group != null}
+                            ({courses[0].group})
+                        {/if}
+                    </li>
+                {:else}
+                    <li>
+                        {subject}
+                        {#if courses.length > 2}
+                            <Button class="inline-flex" on:click={() => {
+                                for (const course of courses) {
+                                    favourites[favourite].preferences[course.class_number] = true;
+                                }
+                            }}>Alle Auswählen</Button>
+                            <Button class="inline-flex" on:click={() => {
+                                for (const course of courses) {
+                                    favourites[favourite].preferences[course.class_number] = false;
+                                }
+                            }}>Keinen Auswählen</Button>
+                        {/if}
+                    </li>
+                    <ul>
+                        {#each courses as course}
+                            <li>
+                                <input
+                                        type="checkbox"
+                                        bind:checked={favourites[favourite].preferences[course.class_number]}
+                                />
+                                {course.class_number}
+                                {course.teacher} |
+                                {course.subject}
+                                {#if course.group != null}
+                                    ({course.group})
+                                {/if}
+                            </li>
+                        {/each}
+                    </ul>
+                {/if}
+            {/each}
+
+
+
+        {:else if favourites[favourite].plan_type !== "free_rooms"}
+            <Select data={get_values(favourites[favourite].school_num, favourites[favourite].plan_type, all_meta)} grouped={false} bind:selected_id={favourites[favourite].plan_value} data_name="{favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
+        {/if}
+        <button on:click={() => {delete_favourite(favourite)}}>Favorit löschen</button>
+    </p>
+{/each}
+
+
+<style lang="scss">
+
+</style>
\ No newline at end of file
diff --git a/client/src/components/Navbar.svelte b/client/src/components/Navbar.svelte
index f6e8408..e340482 100644
--- a/client/src/components/Navbar.svelte
+++ b/client/src/components/Navbar.svelte
@@ -32,6 +32,7 @@
                 <button class="nav-button" on:click={() => navigate_page("school_manager")}><span class="material-symbols-outlined">school</span> Schule wechseln</button>
                 <button class="nav-button" on:click={() => $active_modal = "preferences"}><span class="material-symbols-outlined">account_circle</span> Unterricht wählen</button>
                 <button class="nav-button" on:click={() => $active_modal = "changelog"}><span class="material-symbols-outlined" class:new_notification={$new_changelogs_available}>assignment</span> Changelog {#if $new_changelogs_available}✨{/if}</button>
+                <button class="nav-button" on:click={() => navigate_page("favourites")}><span class="material-symbols-outlined">account_circle</span> Favoriten wählen</button>
                 <button class="nav-button" on:click={() => navigate_page("contact")}><span class="material-symbols-outlined">contact_page</span> Kontaktiere uns</button>
                 <button on:click={logout} class="nav-button"><span class="material-symbols-outlined">logout</span> Logout</button>
             </Dropdown>
diff --git a/client/src/components/Plan.svelte b/client/src/components/Plan.svelte
index 4e917b1..2ab8ec6 100644
--- a/client/src/components/Plan.svelte
+++ b/client/src/components/Plan.svelte
@@ -94,7 +94,10 @@
         week_letter = info.week;
     }
 
-    function load_plan(date, revision=".newest") {
+    function load_plan(date, revision=".newest", enabled_dates) {
+        if (enabled_dates === null || enabled_dates === undefined) {
+            return;
+        }
         if (date === null || date === undefined || !enabled_dates.includes(date)) {
             return;
         }
@@ -139,6 +142,7 @@
                 data_from_cache = false;
             })
             .catch(error => {
+                console.error(error);
                 loading = false;
                 network_loading_failed = true;
         });
@@ -253,7 +257,7 @@
     function load_lessons_check_plan(plan_data, plan_type, plan_value, use_grouped_form_plans) {
         let curr_time = new Date();
         if(!last_updated || curr_time - last_updated > 30_000) {
-            load_plan(date, selected_revision);
+            load_plan(date, selected_revision, enabled_dates);
             last_updated = new Date();
         }
 
@@ -269,16 +273,18 @@
         // console.log("Mounted Plan.svelte");
     });
 
-    $: $indexed_db, load_plan(date, selected_revision);
+    $: $indexed_db, load_plan(date, selected_revision, enabled_dates);
     $: load_lessons_check_plan(plan_data, plan_type, plan_value, $settings.use_grouped_form_plans);
 
     $: if (plan_type === "teachers") {
-        full_teacher_name = meta.teachers[plan_value]?.surname || null;
-        teacher_contact_link = meta.teachers[plan_value]?.contact_link || null;
-        teacher_image_path = "/public/base_static/images/teachers/" + school_num + "/" + meta.teachers[plan_value]?.image_path || null;
-        teacher_image_path = meta.teachers[plan_value]?.image_path || null;
-        if (teacher_image_path) {
-            teacher_image_path = `/public/base_static/images/teachers/${school_num}/${teacher_image_path}`;
+        if (meta.teachers) {
+            full_teacher_name = meta.teachers[plan_value]?.surname || null;
+            teacher_contact_link = meta.teachers[plan_value]?.contact_link || null;
+            teacher_image_path = "/public/base_static/images/teachers/" + school_num + "/" + meta.teachers[plan_value]?.image_path || null;
+            teacher_image_path = meta.teachers[plan_value]?.image_path || null;
+            if (teacher_image_path) {
+                teacher_image_path = `/public/base_static/images/teachers/${school_num}/${teacher_image_path}`;
+            }
         }
     }
     
diff --git a/client/src/utils.js b/client/src/utils.js
index e28b953..c389744 100644
--- a/client/src/utils.js
+++ b/client/src/utils.js
@@ -417,4 +417,32 @@ export function arraysEqual(a, b) {
         if (a[i] !== b[i]) return false;
     }
     return true;
-}
\ No newline at end of file
+}
+
+export async function load_meta(school_num) {
+    let meta_data;
+    return customFetch(`/api/v69.420/${school_num}/meta`)
+        .then(data => {
+            try {
+                localStorage.setItem(`${school_num}_meta`, JSON.stringify(data));
+            } catch (error) {
+                if (error.name === 'QuotaExceededError' ) {
+                    notifications.danger("Die Schulmetadaten konnten nicht gecached werden.")
+                } else {
+                    throw error;
+                }
+            }
+            meta_data = data;
+            return [meta_data, false]
+        })
+        .catch(error => {
+            meta_data = localStorage.getItem(`${school_num}_meta`);
+            if (meta_data !== "undefined" && meta_data) {
+                console.log("Metadaten aus Cache geladen");
+                return [JSON.parse(meta_data), true];
+            } else {
+                console.log("Metadaten konnten nicht geladen werden.");
+                notifications.danger(error.message);
+            }
+        })
+}

From a4931122dec6ffae5ac47baefcbd712b28ea091a Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 03:47:57 +0200
Subject: [PATCH 24/61] favourits now usable in frontend

---
 client/src/App.svelte               |  40 ++++++++--
 client/src/Favourites.svelte        | 115 +++++++++++++++++-----------
 client/src/components/Navbar.svelte |  13 +++-
 client/src/components/Plan.svelte   |  15 ++--
 client/src/stores.js                |   9 ++-
 5 files changed, 135 insertions(+), 57 deletions(-)

diff --git a/client/src/App.svelte b/client/src/App.svelte
index 5b9f9e8..3637fcb 100644
--- a/client/src/App.svelte
+++ b/client/src/App.svelte
@@ -10,7 +10,7 @@
     import SveltyPicker from 'svelty-picker';
     import {get_settings, group_rooms, update_colors, navigate_page, init_indexed_db, clear_plan_cache} from "./utils.js";
     import {notifications} from './notifications.js';
-    import {logged_in, title, current_page, preferences, settings, active_modal, pwa_prompt, indexed_db} from './stores.js'
+    import {logged_in, title, current_page, preferences, settings, active_modal, pwa_prompt, indexed_db, selected_favourite, favourites} from './stores.js'
     import SchoolManager from "./components/SchoolManager.svelte";
     import Preferences from "./components/Preferences.svelte";
     import Changelog from "./components/Changelog.svelte";
@@ -118,7 +118,7 @@
         );
     }
 
-    function get_preferences() {
+    /*function get_preferences() {
         customFetch(`${api_base}/preferences`)
             .then(data => {
                 preferences.set(data);
@@ -126,7 +126,7 @@
             .catch(error => {
                 console.error("Preferences konnten nicht geladen werden.");
             })
-    }
+    }*/
 
     function choose(choices) {
         var index = Math.floor(Math.random() * choices.length);
@@ -226,7 +226,7 @@
     function gen_revision_arr(all_revisions) {
         revision_arr = [];
         for(const [index, revision] of Object.entries(all_revisions)) {
-            if(index == 1) {continue;}
+            if (index == 1) {continue;}
             revision_arr.push({
                 "id": revision,
                 "display_name": format_revision_date(revision, all_revisions[1])
@@ -267,6 +267,32 @@
         }
     }
 
+    function select_plan(favourites, selected_favourite) {
+        // check if selected_favourite is in favourites (selected_favourite is the index)
+        if (selected_favourite === -1) {
+            plan_type = "";
+            plan_value = "";
+        }
+        if (selected_favourite !== null && favourites[selected_favourite]) {
+            selected_favourite = favourites[selected_favourite];
+            school_num = selected_favourite.school_num;
+            localStorage.setItem('school_num', school_num);
+            plan_type = selected_favourite.plan_type;
+            plan_value = selected_favourite.plan_value;
+        }
+
+    }
+
+    $: select_plan($favourites, $selected_favourite);
+    $: if ($selected_favourite !== -1) {
+        if ($favourites[$selected_favourite].plan_value !== plan_value) {
+            selected_favourite.set(-1);
+        } else if ($favourites[$selected_favourite].plan_type !== plan_type) {
+            selected_favourite.set(-1);
+        }
+    }
+
+
     $logged_in = localStorage.getItem('logged_in') === 'true';
     init_vars();
     check_login_status();
@@ -277,7 +303,7 @@
     $: school_num && (api_base = `/api/v69.420/${school_num}`);
     $: school_num && get_meta();
     $: all_revisions = [".newest"].concat((meta?.dates || {})[date] || []);
-    $: school_num && get_preferences();
+    //$: school_num && get_preferences();
     $: all_rooms && (grouped_rooms = group_rooms(all_rooms));
     $: $logged_in && get_settings();
     $: (Object.keys($settings).length !== 0) && localStorage.setItem("settings", `${JSON.stringify($settings)}`);
@@ -349,6 +375,10 @@
         {:else if $logged_in}
             {#if $current_page.substring(0, 4) === "plan" || $current_page === "weekplan"}
                 <h1 class="responsive-heading">{emoji} {greeting}</h1>
+                {#if $selected_favourite !== -1 && $favourites[$selected_favourite]}
+                    Gewählter Favorit: {$favourites[$selected_favourite].name}
+                    <br>
+                {/if}
                 <div class="controls-wrapper">
                     <!-- Datepicker -->
                     <div class="control" id="c1">
diff --git a/client/src/Favourites.svelte b/client/src/Favourites.svelte
index 8fd6a4f..02e8345 100644
--- a/client/src/Favourites.svelte
+++ b/client/src/Favourites.svelte
@@ -1,33 +1,49 @@
 <script>
-    import {load_meta} from "./utils.js";
+    import {customFetch, load_meta} from "./utils.js";
     import Select from "./base_components/Select.svelte";
     import Button from "./base_components/Button.svelte";
     import {onMount} from "svelte";
-    import {title} from "./stores.js";
+    import {notifications} from "./notifications.js";
 
-    let favourites = [
-        //{"school_num": "10001329", "name": "Arthur", "priority": 0, "plan_type": "forms", "plan_value": "JG12", "preferences": {}}
-    ]
-    $: console.log(favourites);
+    import {favourites} from "./stores.js";
+
+    let cur_favourites = [];
+    let all_schools = {};
+    let authorized_school_ids = [];
     let school_nums = [];
-    $: school_nums = [...new Set(favourites.map(obj => obj.school_num))];
+    $: school_nums = [...new Set(cur_favourites.map(obj => obj.school_num).filter(school_num => school_num !== ""))];
     let all_meta = {};
     let duplicated_courses_match = {};
     $: update_meta(school_nums);
 
-    let preferences = {};
-
     onMount(() => {
+        get_schools();
+        get_authorized_schools();
         load_favourites();
     });
 
-    function get_pseudo_favourites_from_server() {
-        return [
-            //{"school_num": "10001329", "name": "Arthur", "priority": 0, "plan_type": "forms", "plan_value": "JG12", "preferences": [607, 609, 616]},
-            {"school_num": "10001329", "name": "Leo", "priority": 1, "plan_type": "forms", "plan_value": "6/4", "preferences": ["494", "434"]},
-        ]
+
+    // duplicate from school manager but hard to simplify
+    function get_schools() {
+        customFetch("/api/v69.420/schools")
+            .then(data => {
+                all_schools = Object.fromEntries(data.map(obj => [obj._id, obj]));
+            })
+            .catch(error => {
+                notifications.danger(error.message);
+            })
+    }
+    function get_authorized_schools() {
+        customFetch("/auth/authorized_schools")
+            .then(data => {
+                authorized_school_ids = data;
+            })
+            .catch(error => {
+                console.error("Autorisierte Schulen konnten nicht ermittelt werden.");
+            });
     }
 
+
     /*
     preferences procedure:
         - from server: list of courses that are not checked
@@ -39,37 +55,43 @@
     */
     function load_favourites() {
         // change preferences to dict
-        let temp_fav = get_pseudo_favourites_from_server();
+        let temp_fav = $favourites;
+        favourites.set(temp_fav);
         temp_fav = temp_fav.map(item => ({ ...item, preferences: item.preferences.reduce((obj, preference) => ({ ...obj, [preference]: false }), {}) }));
-        console.log(temp_fav)
-        favourites = temp_fav;
+        cur_favourites = temp_fav;
     }
     function save_favourites() {
         let new_favourites = [];
-        for (let favourite = 0; favourite < favourites.length; favourite++) {
-            let cur_favourite = {...favourites[favourite]};
-            for (const cur_key of Object.keys(duplicated_courses_match[favourite])) {
-                cur_favourite.preferences[cur_key] = cur_favourite.preferences[duplicated_courses_match[favourite][cur_key]];
+        for (let favourite = 0; favourite < cur_favourites.length; favourite++) {
+            let cur_favourite = {...cur_favourites[favourite]};
+            console.log(duplicated_courses_match, favourite);
+            // check if favourite in duplicated_courses_match
+            if (duplicated_courses_match.hasOwnProperty(favourite)) {
+                for (const cur_key of Object.keys(duplicated_courses_match[favourite])) {
+                    cur_favourite.preferences[cur_key] = cur_favourite.preferences[duplicated_courses_match[favourite][cur_key]];
+                }
             }
             cur_favourite.preferences = Object.keys(cur_favourite.preferences).filter(key => cur_favourite.preferences[key] === false);
             new_favourites.push(cur_favourite);
         }
         console.log(new_favourites);
+        favourites.set(new_favourites);
+        // now the post request
     }
 
     // FAVOURITE MANAGEMENT
     function add_favourite() {
-        favourites = [...favourites, {"school_num": "test", "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}];
+        cur_favourites = [...cur_favourites, {"school_num": "", "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}];
     }
     // clear everything except for the school num of a favourite
     function clear_favourite(favourite) {
-        favourites[favourite] = {"school_num": favourites[favourite].school_num, "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}
+        cur_favourites[favourite] = {"school_num": cur_favourites[favourite].school_num, "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}
     }
     // delete a favourite
     function delete_favourite(favourite) {
-        let new_array = favourites;
+        let new_array = cur_favourites;
         new_array.splice(favourite, 1);
-        favourites = new_array;
+        cur_favourites = new_array;
     }
 
 
@@ -116,8 +138,8 @@
     }
     // get subjects for one form
     function get_subjects(favourite, stored_meta) {
-        let school_num = favourites[favourite].school_num;
-        let form = favourites[favourite].plan_value;
+        let school_num = cur_favourites[favourite].school_num;
+        let form = cur_favourites[favourite].plan_value;
         if (!stored_meta.hasOwnProperty(school_num)) {
             return []
         }
@@ -126,8 +148,8 @@
         }
         duplicated_courses_match[favourite] = {};
         for (const class_group of Object.keys(stored_meta[school_num].forms.forms[form].class_groups)) {
-            if (favourites[favourite].preferences[class_group] === undefined) {
-                favourites[favourite].preferences[class_group] = true;
+            if (cur_favourites[favourite].preferences[class_group] === undefined) {
+                cur_favourites[favourite].preferences[class_group] = true;
             }
         }
 
@@ -172,22 +194,27 @@
 
 <button on:click={save_favourites}>Speichern</button>
 <button on:click={add_favourite}>Favorit hinzufügen</button>
-{#each favourites as _, favourite}
+<br><br><br><br><br>
+{#each cur_favourites as _, favourite}
     <p>
-        <input type="text" bind:value={favourites[favourite].name}>
+        <label for="favourite_name">Name des Favoriten</label>
+        <input name="favourite_name" type="text" bind:value={cur_favourites[favourite].name}>
         <!-- TODO: GET AUTHORIZED SCHOOLS -->
-        <select name="school_select" id="" bind:value={favourites[favourite].school_num} on:change={() => clear_favourite(favourite)}>
-            <option value="10001329">Ostwald</option>
-            <option value="10000000">Beispielschule</option>
+        <select name="school_select" id="" bind:value={cur_favourites[favourite].school_num} on:change={() => clear_favourite(favourite)}>
+            {#each authorized_school_ids as school_id}
+                {#if all_schools.hasOwnProperty(school_id)}
+                    <option value={school_id}>{all_schools[school_id].display_name}</option>
+                {/if}
+            {/each}
         </select>
-        <select name="plan_type_select" id="" bind:value={favourites[favourite].plan_type} on:change={() => favourites[favourite].plan_value = ""}>
+        <select name="plan_type_select" id="" bind:value={cur_favourites[favourite].plan_type} on:change={() => {cur_favourites[favourite].plan_value = ""; cur_favourites[favourite].preferences = {}}}>
             <option value="forms">Klassenplan</option>
             <option value="teachers">Lehrerplan</option>
             <option value="rooms">Raumplan</option>
-            <option value="free_rooms">Freie Räume</option>
+            <option value="room_overview">Freie Räume</option>
         </select>
-        {#if favourites[favourite].plan_type === "forms"}
-            <Select data={get_values(favourites[favourite].school_num, favourites[favourite].plan_type, all_meta)} grouped={true} bind:selected_id={favourites[favourite].plan_value} data_name="{favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
+        {#if cur_favourites[favourite].plan_type === "forms"}
+            <Select data={get_values(cur_favourites[favourite].school_num, cur_favourites[favourite].plan_type, all_meta)} grouped={true} bind:selected_id={cur_favourites[favourite].plan_value} data_name="{cur_favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
             <!--choosable courses-->
             {#each Object.entries(
                 get_subjects(favourite, all_meta)
@@ -195,7 +222,7 @@
                 {#if courses.length === 1}
                     <li>{subject}:<input
                             type="checkbox"
-                            bind:checked={favourites[favourite].preferences[courses[0].class_number]}
+                            bind:checked={cur_favourites[favourite].preferences[courses[0].class_number]}
                     />
                         {courses[0].class_number}
                         {courses[0].teacher} |
@@ -210,12 +237,12 @@
                         {#if courses.length > 2}
                             <Button class="inline-flex" on:click={() => {
                                 for (const course of courses) {
-                                    favourites[favourite].preferences[course.class_number] = true;
+                                    cur_favourites[favourite].preferences[course.class_number] = true;
                                 }
                             }}>Alle Auswählen</Button>
                             <Button class="inline-flex" on:click={() => {
                                 for (const course of courses) {
-                                    favourites[favourite].preferences[course.class_number] = false;
+                                    cur_favourites[favourite].preferences[course.class_number] = false;
                                 }
                             }}>Keinen Auswählen</Button>
                         {/if}
@@ -225,7 +252,7 @@
                             <li>
                                 <input
                                         type="checkbox"
-                                        bind:checked={favourites[favourite].preferences[course.class_number]}
+                                        bind:checked={cur_favourites[favourite].preferences[course.class_number]}
                                 />
                                 {course.class_number}
                                 {course.teacher} |
@@ -241,8 +268,8 @@
 
 
 
-        {:else if favourites[favourite].plan_type !== "free_rooms"}
-            <Select data={get_values(favourites[favourite].school_num, favourites[favourite].plan_type, all_meta)} grouped={false} bind:selected_id={favourites[favourite].plan_value} data_name="{favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
+        {:else if cur_favourites[favourite].plan_type !== "free_rooms"}
+            <Select data={get_values(cur_favourites[favourite].school_num, cur_favourites[favourite].plan_type, all_meta)} grouped={false} bind:selected_id={cur_favourites[favourite].plan_value} data_name="{cur_favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
         {/if}
         <button on:click={() => {delete_favourite(favourite)}}>Favorit löschen</button>
     </p>
diff --git a/client/src/components/Navbar.svelte b/client/src/components/Navbar.svelte
index e340482..134c1bd 100644
--- a/client/src/components/Navbar.svelte
+++ b/client/src/components/Navbar.svelte
@@ -4,6 +4,7 @@
     import Dropdown from '../base_components/Dropdown.svelte';
     import { fly } from 'svelte/transition';
     import {customFetch, navigate_page} from "../utils.js";
+    import {selected_favourite, favourites} from "../stores.js";
 
     function logout() {
         customFetch('/auth/logout')
@@ -17,11 +18,21 @@
 </script>
 
 <nav transition:fly={{y:-64}}>
-    <button class="logo-button" on:click={() => {navigate_page("plan")}}>
+    <button class="logo-button" on:click={() => {navigate_page("plan"); selected_favourite.set(-1)}}>
         <img class="logo" src="/public/base_static/images/better_vp_white.svg" alt="Better VPlan Logo">
     </button>
     <ul class="nav-element-wrapper">
         <li><button on:click={() => {navigate_page("about_us")}} class="nav-button">Über uns</button></li>
+        <li>
+            <Dropdown let:toggle>
+                <button slot="toggle_button" on:click={toggle} class="nav-button">
+                    <span class="material-symbols-outlined">star</span>
+                </button>
+                {#each $favourites as favourite, index}
+                    <button class="nav-button" on:click={() => {selected_favourite.set(index); navigate_page("plan")}}><span class="material-symbols-outlined">star</span> {favourite.name}</button>
+                {/each}
+            </Dropdown>
+        </li>
         <li>
             <Dropdown let:toggle>
                 <button slot="toggle_button" on:click={toggle} class="nav-button">
diff --git a/client/src/components/Plan.svelte b/client/src/components/Plan.svelte
index 2ab8ec6..0fc433c 100644
--- a/client/src/components/Plan.svelte
+++ b/client/src/components/Plan.svelte
@@ -4,7 +4,7 @@
     import Rooms from "./Rooms.svelte";
     import {notifications} from '../notifications.js';
     import { swipe } from 'svelte-gestures';
-    import {indexed_db, preferences, settings, title} from '../stores.js';
+    import {indexed_db, preferences, settings, title, selected_favourite, favourites} from '../stores.js';
     import {arraysEqual, cache_plan, customFetch, format_date, get_from_db, get_school_plan_count, navigate_page} from "../utils.js";
     import Dropdown from '../base_components/Dropdown.svelte';
 
@@ -94,7 +94,7 @@
         week_letter = info.week;
     }
 
-    function load_plan(date, revision=".newest", enabled_dates) {
+    function load_plan(school_num, date, revision=".newest", enabled_dates) {
         if (enabled_dates === null || enabled_dates === undefined) {
             return;
         }
@@ -204,10 +204,13 @@
         if (!preferences_apply) {
             return lessons
         }
-        if (!(plan_value in $preferences)) {
+        //if (!(plan_value in $preferences)) {
+        //    return lessons
+        //}
+        if ($selected_favourite === -1) {
             return lessons
         }
-        let cur_preferences = $preferences[plan_value] || [];
+        let cur_preferences = $favourites[$selected_favourite].preferences || [];
         let new_lessons = [];
         for (const lesson of lessons) {
             if (!(cur_preferences.includes(lesson.class_number))) {
@@ -273,7 +276,7 @@
         // console.log("Mounted Plan.svelte");
     });
 
-    $: $indexed_db, load_plan(date, selected_revision, enabled_dates);
+    $: $indexed_db, load_plan(school_num, date, selected_revision, enabled_dates);
     $: load_lessons_check_plan(plan_data, plan_type, plan_value, $settings.use_grouped_form_plans);
 
     $: if (plan_type === "teachers") {
@@ -301,7 +304,7 @@
 <div class:plan={plan_type !== "room_overview"} class:extra-height={extra_height}>
     {#if plan_type !== "room_overview"}
         {#if show_title && info && plan_type && plan_value}
-            {#if plan_type === "forms" && (plan_value in $preferences)}
+            {#if plan_type === "forms" && ($selected_favourite !== -1)}
                 <button on:click={() => {preferences_apply = !preferences_apply}} class="plus-btn">{preferences_apply ? "+" : "-"}</button>
             {/if}
                 <h1 class="plan-heading">
diff --git a/client/src/stores.js b/client/src/stores.js
index 3a01f89..9cca4e8 100644
--- a/client/src/stores.js
+++ b/client/src/stores.js
@@ -9,4 +9,11 @@ export const preferences = writable({});
 export const active_modal = writable("");
 export const notifications_list = writable([]);
 export const pwa_prompt = writable();
-export const new_changelogs_available = writable(false);
\ No newline at end of file
+export const new_changelogs_available = writable(false);
+// TODO: as soon as this is connected to the endpoint, this needs to be cached and there needs to be a fallback
+export const favourites = writable([
+    {"school_num": "10000000", "name": "Mein Plan", "priority": 0, "plan_type": "forms", "plan_value": "5a", "preferences": ["166"]},
+    {"school_num": "10000000", "name": "Plan von Freund", "priority": 0, "plan_type": "forms", "plan_value": "5b", "preferences": []},
+    {"school_num": "10000000", "name": "Klassenlehrerplan", "priority": 0, "plan_type": "teachers", "plan_value": "Sipp", "preferences": []},
+]);
+export const selected_favourite = writable(0);

From 019fc608e56f45c8b1bb97a6916df09507561f45 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 15:10:22 +0200
Subject: [PATCH 25/61] fix #197, favourite backend start

---
 client/src/components/Navbar.svelte        | 18 ++++++-
 client/src/components/SchoolManager.svelte | 62 +++++++++++++---------
 endpoints/api.py                           | 14 +++--
 utils.py                                   | 47 ++++++++++++++--
 4 files changed, 105 insertions(+), 36 deletions(-)

diff --git a/client/src/components/Navbar.svelte b/client/src/components/Navbar.svelte
index 134c1bd..b6011da 100644
--- a/client/src/components/Navbar.svelte
+++ b/client/src/components/Navbar.svelte
@@ -15,6 +15,7 @@
                 notifications.danger(error.message);
             });
     }
+    $: console.log(selected_favourite);
 </script>
 
 <nav transition:fly={{y:-64}}>
@@ -26,11 +27,24 @@
         <li>
             <Dropdown let:toggle>
                 <button slot="toggle_button" on:click={toggle} class="nav-button">
-                    <span class="material-symbols-outlined">star</span>
+                    {#if $selected_favourite !== -1}
+                        <!-- TODO: make different if some favourite selected -->
+                        <span class="material-symbols-outlined">star</span>
+                    {:else}
+                        <span class="material-symbols-outlined">star</span>
+                    {/if}
                 </button>
                 {#each $favourites as favourite, index}
-                    <button class="nav-button" on:click={() => {selected_favourite.set(index); navigate_page("plan")}}><span class="material-symbols-outlined">star</span> {favourite.name}</button>
+                    <button class="nav-button" on:click={() => {selected_favourite.set(index); navigate_page("plan")}}>
+                        {#if $selected_favourite === index}
+                            <!-- TODO: make different if selected -->
+                            <span class="material-symbols-outlined">star</span>
+                        {:else}
+                            <span class="material-symbols-outlined">star</span>
+                        {/if}
+                    ({index}) {favourite.name}</button>
                 {/each}
+                <button class="nav-button" on:click={() => navigate_page("favourites")}><span class="material-symbols-outlined">account_circle</span> Favoriten wählen</button>
             </Dropdown>
         </li>
         <li>
diff --git a/client/src/components/SchoolManager.svelte b/client/src/components/SchoolManager.svelte
index e129373..3f61b58 100644
--- a/client/src/components/SchoolManager.svelte
+++ b/client/src/components/SchoolManager.svelte
@@ -13,6 +13,7 @@
     export let plan_value;
 
     let authorize_school_id;
+    let authorize_school_data = {};
     let username = "schueler";
     let password = "";
     let schools = [];
@@ -68,18 +69,22 @@
 
     function authorize_school() {
         get_authorized_schools();
-        console.log(username, password);
         if (!isObjectInList(authorize_school_id, school_id_arr)) {
             notifications.danger("Schule unbekannt (kontaktiere uns, um deine Schule hinzuzufügen)")
             return
         }
-        if (username === "") {
-            notifications.danger("Bitte gib einen Nutzernamen an");
-            return
-        }
-        if (password === "") {
-            notifications.danger("Bitte gib ein Passwort an");
-            return
+        if (authorize_school_data.creds_needed) {
+            if (username === "") {
+                notifications.danger("Bitte gib einen Nutzernamen an");
+                return
+            }
+            if (password === "") {
+                notifications.danger("Bitte gib ein Passwort an");
+                return
+            }
+        } else {
+            username = "";
+            password = "";
         }
         let formData = new FormData();
         formData.append('username', username);
@@ -107,13 +112,13 @@
         );
     }
 
-    function get_school_name_by_id(school_id) {
+    function get_school_by_id(school_id) {
         for (let school of schools) {
             if (school.id === school_id.toString()) {
-                return school.display_name;
+                return school
             }
         }
-        return "";
+        return {};
     }
 
     get_schools();
@@ -132,6 +137,7 @@
         ["Autorisiert", authorized_schools],
         ["Unautorisiert", unauthorized_schools]
     ];
+    $: authorize_school_data = get_school_by_id(authorize_school_id);
 </script>
 
 <main>
@@ -173,21 +179,25 @@
         <button on:click={() => {school_auth_visible = false;}} type="reset" id="back_button">
             <span class="material-symbols-outlined">keyboard_backspace</span>
         </button>
-        <h1 class="responsive-heading">{authorize_school_id ? get_school_name_by_id(authorize_school_id) : "Schul"}-Login</h1>
-        <span class="responsive-text">Trage hier die Zugangsdaten <strong>für deine Schule</strong> ein, <strong>nicht die deines Accounts</strong>.<br>(dieselben wie in der <div title="🤢" style="display: inline-block;">VpMobil24-App</div>)</span>
-        <label for="school_username">Nutzername</label>
-        <div class="input_icon">
-            <img src="/public/base_static/images/user-solid-white.svg" alt="User Icon">
-            <input disabled={!school_auth_visible} autocomplete="off" name="school_username" bind:value={username} type="text" required class="textfield" placeholder="Nutzername"/>
-        </div>
-        <label for="school_password">Schul-Passwort</label>
-        <div class="input_icon password_field">
-            <img src="/public/base_static/images/lock-solid-white.svg" alt="Lock Icon">
-            <button type="button" on:click={() => {password_visible = !password_visible}} tabindex="-1">
-                <span class="material-symbols-outlined">{password_visible ? "visibility_off" : "visibility"}</span>
-            </button>
-            <input disabled={!school_auth_visible} autocomplete="off" name="school_password" on:input={(event) => {password = event.target.value}} type={password_visible ? "text" : "password"} required class="textfield" placeholder="Schul-Passwort"/>
-        </div>
+        <h1 class="responsive-heading">{authorize_school_id ? authorize_school_data.display_name : "Schul"}-Login</h1>
+        {#if authorize_school_data.creds_needed}
+            <span class="responsive-text">Trage hier die Zugangsdaten <strong>für deine Schule</strong> ein, <strong>nicht die deines Accounts</strong>.<br>(dieselben wie in der <div title="🤢" style="display: inline-block;">VpMobil24-App</div>)</span>
+            <label for="school_username">Nutzername</label>
+            <div class="input_icon">
+                <img src="/public/base_static/images/user-solid-white.svg" alt="User Icon">
+                <input disabled={!school_auth_visible} autocomplete="off" name="school_username" bind:value={username} type="text" required class="textfield" placeholder="Nutzername"/>
+            </div>
+            <label for="school_password">Schul-Passwort</label>
+            <div class="input_icon password_field">
+                <img src="/public/base_static/images/lock-solid-white.svg" alt="Lock Icon">
+                <button type="button" on:click={() => {password_visible = !password_visible}} tabindex="-1">
+                    <span class="material-symbols-outlined">{password_visible ? "visibility_off" : "visibility"}</span>
+                </button>
+                <input disabled={!school_auth_visible} autocomplete="off" name="school_password" on:input={(event) => {password = event.target.value}} type={password_visible ? "text" : "password"} required class="textfield" placeholder="Schul-Passwort"/>
+            </div>
+        {:else}
+            <span class="responsive-text">(Für diese Schule benötigst du keine Zugangsdaten)</span>
+        {/if}
         <Button type="submit" background="var(--accent-color)">Autorisieren</Button>
     </form>
     {/if}
diff --git a/endpoints/api.py b/endpoints/api.py
index 4c31d4e..9fd8e0b 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -90,7 +90,8 @@ def plan(school_num: str) -> Response:
             "exams": json.loads(cache.get_plan_file(date, revision, "exams.json")),
             "grouped_form_plans": json.loads(cache.get_plan_file(date, revision, "grouped_form_plans.json")),
         }
-    except FileNotFoundError:
+    except FileNotFoundError as e:
+        print(e)
         return send_error("Invalid date or revision.")
 
     return send_success(data)
@@ -113,6 +114,9 @@ def authorize(school_num: str) -> Response:
         f.write(f"New auth attempt for {request.form.get('school_num')}\nargs: {request.args}\nbody: {request.form}")
     if not school_data:
         return send_error("Schulnummer unbekannt, falls du eine Schule hinzufügen möchtest, nimm bitte Kontakt mit uns auf")
+    if school_data["hosting"]["creds"] == {}:
+        current_user.authorize_school(school_num)
+        return send_success()
     username = request.form.get("username")
     if username is None:
         return send_error("Kein Nutzername für die Schule angegeben")
@@ -179,9 +183,13 @@ def preferences(school_num: str) -> Response:
 
         current_preferences.setdefault(school_num, {})[request.args["form"]] = stored_classes
 
-        current_user.set_user_preferences(current_preferences)
+        return current_user.set_user_preferences(current_preferences)
 
-        return send_success()
+
+@api.route(f"/favourites", methods=["GET", "POST"])
+@login_required
+def favourites(school_num):
+    return ""
 
 
 @api.route(f"/api/v69.420/changelog", methods=["GET", "POST"])
diff --git a/utils.py b/utils.py
index 9a52853..9abd94a 100644
--- a/utils.py
+++ b/utils.py
@@ -1,4 +1,5 @@
 import threading
+from pathlib import Path
 from typing import List
 
 import pymongo
@@ -14,6 +15,7 @@
 from dotenv import load_dotenv
 from discord_webhook import DiscordWebhook, DiscordEmbed
 
+import backend.cache
 from var import *
 
 load_dotenv()
@@ -95,15 +97,47 @@ def update_settings(self, user_settings=DEFAULT_SETTINGS) -> Response:
         users.update_one({'_id': ObjectId(self.mongo_id)}, {"$set": {'settings': new_settings}})
         return send_success()
 
-    def set_user_preferences(self, preferences):
+    def set_user_preferences(self, preferences) -> Response:
         users.update_one({'_id': ObjectId(self.mongo_id)}, {'$set': {'preferences': preferences}})
-        return "Success"
+        return send_success()
 
     # get setting for user, if setting not set get default setting
     def get_setting(self, setting_key):
         self.get_user()
         return self.user.get("settings", {}).get(setting_key, DEFAULT_SETTINGS.get(setting_key, None))
 
+    def get_favourites(self) -> Response:
+        return send_success(self.user.get("favourites", {}))
+    """
+        what does a favourite need:
+            -> name by user (default "Favourit {n}")
+            -> priority
+            -> school_id, plan_type, plan_value
+    """
+
+    def set_favourites(self, favourites) -> Response:
+        new_favourites = []
+        for cur_favourite in favourites:
+            favourite = {elem: cur_favourite.get(elem) for elem in ["school_num", "name", "priority", "plan_type", "plan_value"]}
+            for key in favourite:
+                if not favourite[key]:
+                    return send_error(f"{key} nicht angegeben")
+            if favourite["school_num"] not in self.get_authorized_schools():
+                return send_error("Schule nicht autorisiert")
+            if len(favourite["name"]) > 40:
+                return send_error("Name zu lang")
+            if favourite["plan_type"] not in ["forms", "teachers", "rooms", "free_rooms"]:
+                return send_error("invalide Planart")
+            cache = backend.cache.Cache(Path(".cache") / favourite["school_num"])
+            if favourite["plan_type"] == "free_rooms":
+                favourite["plan_value"] = None
+            else:
+                if favourite["plan_value"] not in json.loads(cache.get_meta_file(f"{favourite['plan_type']}.json"))[favourite["plan_type"]]:
+                    return send_error("invalider Plan")
+            new_favourites.append(favourite)
+        users.update_one({'_id': ObjectId(self.mongo_id)}, {"$set": {'favourites': new_favourites}})
+        return send_success(new_favourites)
+
 
 def get_user(user_id):
     try:
@@ -169,13 +203,16 @@ def get_all_schools():
             "$project": {
                 #"_id": False,
                 "count": False,
-                "hosting": False,
+                #"hosting": False,
                 "comment": False,
             }
         }
     ]
-
-    return list(creds.aggregate(pipeline))
+    schools_list = list(creds.aggregate(pipeline))
+    for ind, elem in enumerate(schools_list):
+        schools_list[ind]["creds_needed"] = True if elem["hosting"]["creds"] else False
+        del schools_list[ind]["hosting"]
+    return schools_list
 
 
 def get_all_schools_by_number():

From d5162b9874660e0685302882ee970ecf7b331a99 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 15:41:34 +0200
Subject: [PATCH 26/61] bug fix for 2 favourites with same plan_value

---
 client/src/components/Plan.svelte | 2 +-
 client/src/stores.js              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/components/Plan.svelte b/client/src/components/Plan.svelte
index 0fc433c..5d80eb1 100644
--- a/client/src/components/Plan.svelte
+++ b/client/src/components/Plan.svelte
@@ -292,7 +292,7 @@
     }
     
     $: date && enabled_dates && update_date_btns();
-    $: preferences_apply, lessons = render_lessons(all_lessons);
+    $: preferences_apply, $selected_favourite, lessons = render_lessons(all_lessons);
     $: loading_failed = (cache_loading_failed && network_loading_failed && !loading);
     $: available_plan_version = data_from_cache ? "cached" : !network_loading_failed ? caching_successful ? "network_cached" : "network_uncached" : null;
     $: location.hash = gen_location_hash(school_num, date, plan_type, plan_value);
diff --git a/client/src/stores.js b/client/src/stores.js
index 9cca4e8..1e82d61 100644
--- a/client/src/stores.js
+++ b/client/src/stores.js
@@ -12,8 +12,8 @@ export const pwa_prompt = writable();
 export const new_changelogs_available = writable(false);
 // TODO: as soon as this is connected to the endpoint, this needs to be cached and there needs to be a fallback
 export const favourites = writable([
-    {"school_num": "10000000", "name": "Mein Plan", "priority": 0, "plan_type": "forms", "plan_value": "5a", "preferences": ["166"]},
-    {"school_num": "10000000", "name": "Plan von Freund", "priority": 0, "plan_type": "forms", "plan_value": "5b", "preferences": []},
+    {"school_num": "10000000", "name": "Mein Plan", "priority": 0, "plan_type": "forms", "plan_value": "12", "preferences": ["140", "97", "157", "96", "131", "88"]},
+    {"school_num": "10000000", "name": "Plan von Freund", "priority": 0, "plan_type": "forms", "plan_value": "12", "preferences": ["140", "97", "157", "96", "130", "88"]},
     {"school_num": "10000000", "name": "Klassenlehrerplan", "priority": 0, "plan_type": "teachers", "plan_value": "Sipp", "preferences": []},
 ]);
 export const selected_favourite = writable(0);

From 73079b81577ba420049aa3c70a63d8386e050262 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 15:49:34 +0200
Subject: [PATCH 27/61] fix #203

---
 backend/lesson_info.py    | 20 ++++++++++----------
 backend/models.py         |  2 +-
 backend/plan_processor.py |  2 +-
 backend/vplan_utils.py    | 12 +++++++-----
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index 780bc99..eff2337 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -156,7 +156,7 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
 class MovedFrom(SerializeMixin, ParsedLessonInfoMessage):
     plan_type: typing.Literal["forms", "teachers", "rooms"]
     plan_value: set[str]
-    periods: list[int]
+    periods: set[int]
     date: datetime.date | None
 
     def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSegment]:
@@ -170,7 +170,7 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
                         type=self.plan_type,
                         value=sorted(self.plan_value),
                         date=lesson_date,
-                        periods=self.periods
+                        periods=sorted(self.periods)
                     )
                 )
             ]
@@ -184,7 +184,7 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
                         type=self.plan_type,
                         value=sorted(self.plan_value),
                         date=self.date,
-                        periods=self.periods
+                        periods=sorted(self.periods)
                     )
                 )
             ]
@@ -251,7 +251,7 @@ def _course_text_segments(self, date: datetime.date, periods: list[int] | None)
 @dataclasses.dataclass
 class MovedTo(SerializeMixin, AbstractParsedLessonInfoMessageWithCourseInfo):
     date: datetime.date | None
-    periods: list[int]
+    periods: set[int]
 
     def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSegment]:
         if self.date is None:
@@ -264,13 +264,13 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
                         type=self.plan_type,
                         value=sorted(self.plan_value),
                         date=lesson_date,
-                        periods=self.periods
+                        periods=sorted(self.periods)
                     )
                 )
             ]
         elif self.date < lesson_date:
             return [
-                *self._course_text_segments(self.date, self.periods),
+                *self._course_text_segments(self.date, sorted(self.periods)),
                 LessonInfoTextSegment(" gehalten am "),
                 LessonInfoTextSegment(
                     f"{de_weekday_to_str(self.date.weekday())} ({self.date.strftime('%d.%m.%Y')}) "
@@ -279,13 +279,13 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
                         type=self.plan_type,
                         value=sorted(self.plan_value),
                         date=self.date,
-                        periods=self.periods
+                        periods=sorted(self.periods)
                     )
                 )
             ]
         else:
             return [
-                *self._course_text_segments(self.date, self.periods),
+                *self._course_text_segments(self.date, sorted(self.periods)),
                 LessonInfoTextSegment(" verlegt nach "),
                 LessonInfoTextSegment(
                     f"{de_weekday_to_str(self.date.weekday())} ({self.date.strftime('%d.%m.%Y')}) "
@@ -294,7 +294,7 @@ def _to_text_segments(self, lesson_date: datetime.date) -> list[LessonInfoTextSe
                         type=self.plan_type,
                         value=sorted(self.plan_value),
                         date=self.date,
-                        periods=self.periods
+                        periods=sorted(self.periods)
                     )
                 )
             ]
@@ -433,7 +433,7 @@ def _parse_form_plan_message(info: str, lesson: models.Lesson) -> tuple[ParsedLe
         return MovedFrom(
             plan_type="forms",
             plan_value=lesson.forms,
-            periods=[int(match.group("period_begin"))],
+            periods={int(match.group("period_begin"))},
             date=None
         ), match
     elif match := _InfoParsers.instead_of.match(info):
diff --git a/backend/models.py b/backend/models.py
index e0df233..fae798d 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -456,7 +456,7 @@ def _group_lesson_info(
                         new_message = copy.deepcopy(message1)
                         # noinspection PyTypeHints
                         new_message.parsed: lesson_info.MovedFrom | lesson_info.MovedTo
-                        new_message.parsed.periods += parsed2.periods
+                        new_message.parsed.periods |= parsed2.periods
                         new_message.parsed.original_messages += parsed2.original_messages
                         new_message.parsed.plan_value |= parsed2.plan_value
                         new_paragraph.append(new_message)
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index e8f74b8..6d1a88b 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "89"
+    VERSION = "90"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger
diff --git a/backend/vplan_utils.py b/backend/vplan_utils.py
index 5fe9631..7927b71 100644
--- a/backend/vplan_utils.py
+++ b/backend/vplan_utils.py
@@ -216,7 +216,9 @@ def forms_to_str(forms: typing.Iterable[str]) -> str:
     return parsed_forms_to_str([ParsedForm.from_str(form) for form in forms])
 
 
-def periods_to_block_label(periods: list[int]) -> str:
+def periods_to_block_label(periods: typing.Iterable[int]) -> str:
+    periods = list(set(periods))
+
     periods.sort()
 
     rests = {
@@ -246,11 +248,11 @@ def period_str_to_int(string: str) -> int:
         return list(range(period_str_to_int(begin), period_str_to_int(end) + 1))
 
 
-def parse_periods(period_str: str) -> list[int]:
-    return sum([_parse_periods(p) for p in period_str.split(",")], [])
+def parse_periods(period_str: str) -> set[int]:
+    return set(sum([_parse_periods(p) for p in period_str.split(",")], []))
 
 
-def parse_absent_element(element: str) -> tuple[str, list[int]]:
+def parse_absent_element(element: str) -> tuple[str, set[int]]:
     """Parse a string like the following: "label (1-2,4)" into label and periods."""
 
     segments = element.rsplit("(", 1)
@@ -258,7 +260,7 @@ def parse_absent_element(element: str) -> tuple[str, list[int]]:
     label = segments[0].strip()
 
     if len(segments) == 1:
-        periods = []
+        periods = set()
     else:
         periods = parse_periods(segments[1][:-1])
 

From ef5afbdcfb923ef3cad59b920484f7a5c555769b Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sun, 1 Oct 2023 16:08:38 +0200
Subject: [PATCH 28/61] fix teacher extraction

---
 backend/lesson_info.py    | 3 +++
 backend/plan_processor.py | 9 ++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index eff2337..3f512c7 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -682,6 +682,9 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
                      logger: logging.Logger) -> dict[str, teacher_model.Teacher]:
     out: dict[str, teacher_model.Teacher] = {}
 
+    for teacher_abbreviation in lesson.teachers or ():
+        out[teacher_abbreviation] = teacher_model.Teacher(teacher_abbreviation)
+
     if lesson._is_scheduled:
         return out
 
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 6d1a88b..04a3e0e 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "90"
+    VERSION = "91"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger
@@ -133,10 +133,8 @@ def compute_plans(self, date: datetime.date, timestamp: datetime.datetime):
 
             all_forms = self.meta_extractor.forms()
             all_forms_parsed = [ParsedForm.from_str(f) for f in all_forms]
-            students_plan_extractor.teacher_abbreviation_by_surname |= (
-                {-i: t.abbreviation for i, t in enumerate(self.meta_extractor.teachers())} |
-                self.teachers.abbreviation_by_surname()
-            )
+            students_plan_extractor.teacher_abbreviation_by_surname = self.teachers.abbreviation_by_surname()
+
             self.cache.store_plan_file(
                 date, timestamp,
                 json.dumps(students_plan_extractor.info_data(all_forms_parsed)),
@@ -210,6 +208,7 @@ def update_meta(self):
         self.cache.store_meta_file(json.dumps(data), "meta.json")
         self.cache.store_meta_file(json.dumps(self.meta_extractor.dates_data()), "dates.json")
 
+        self.add_teachers({t.abbreviation: t for t in self.meta_extractor.teachers()})
         self.scrape_teachers()
         self.update_forms()
         self.update_rooms()

From 5d93ecc30c208209a63df30a4d2e828c9a093fa3 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 16:15:59 +0200
Subject: [PATCH 29/61] remove print statements, metadata database

---
 endpoints/api.py |  3 ---
 server.py        | 27 ++++++++++++++++++++++++---
 utils.py         |  8 +++++++-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/endpoints/api.py b/endpoints/api.py
index 9fd8e0b..53092ed 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -26,7 +26,6 @@
 def schools() -> Response:
     # school_data = get_all_schools_by_number()
     school_data = get_all_schools()
-    print(school_data)
     return send_success(school_data)
 
 
@@ -91,7 +90,6 @@ def plan(school_num: str) -> Response:
             "grouped_form_plans": json.loads(cache.get_plan_file(date, revision, "grouped_form_plans.json")),
         }
     except FileNotFoundError as e:
-        print(e)
         return send_error("Invalid date or revision.")
 
     return send_success(data)
@@ -171,7 +169,6 @@ def preferences(school_num: str) -> Response:
 
         try:
             data = json.loads(request.data)
-            print(data)
         except json.JSONDecodeError:
             return send_error("Invalid JSON data.")
 
diff --git a/server.py b/server.py
index bed2ac1..ef4b314 100644
--- a/server.py
+++ b/server.py
@@ -1,14 +1,17 @@
 from __future__ import annotations
 
-from flask import send_from_directory, Response
-from flask_login import LoginManager
+import time
+
+from flask import send_from_directory, Response, request
+from flask_login import LoginManager, current_user
 from flask_wtf.csrf import CSRFProtect, generate_csrf
 from flask_compress import Compress
+from bson import ObjectId
 
 from endpoints.authorization import authorization
 from endpoints.api import api
 
-from utils import User, AddStaticFileHashFlask, get_user, send_error, update_database
+from utils import User, AddStaticFileHashFlask, get_user, send_error, update_database, meta_to_database
 from var import *
 
 
@@ -37,6 +40,24 @@
 app.register_blueprint(api)
 
 
+@app.after_request
+def after_request(resp):
+    if request.path.startswith("/public"):
+        return resp
+    request_data = {
+        "time": time.time(),
+        "host": request.host,
+        "path": request.full_path,
+        "method": request.method,
+        "user-agent": request.user_agent.string,
+        "ip": request.remote_addr,
+    }
+    if current_user:
+        request_data["userId"] = ObjectId(current_user.get_id())
+    meta_to_database(request_data)
+    return resp
+
+
 @login_manager.user_loader
 def user_loader(user_id: str) -> User | None:
     tmp_user = get_user(user_id)
diff --git a/utils.py b/utils.py
index 9abd94a..6eed145 100644
--- a/utils.py
+++ b/utils.py
@@ -24,6 +24,7 @@
 users = db["users"]
 creds = db["creds"]
 schools = db["schools"]
+meta = db["meta"]
 
 
 # RESPONSE WRAPPERS
@@ -118,7 +119,7 @@ def get_favourites(self) -> Response:
     def set_favourites(self, favourites) -> Response:
         new_favourites = []
         for cur_favourite in favourites:
-            favourite = {elem: cur_favourite.get(elem) for elem in ["school_num", "name", "priority", "plan_type", "plan_value"]}
+            favourite = {elem: cur_favourite.get(elem) for elem in ["school_num", "name", "priority", "plan_type", "plan_value", "preferences"]}
             for key in favourite:
                 if not favourite[key]:
                     return send_error(f"{key} nicht angegeben")
@@ -317,6 +318,11 @@ def update_database():
     update_school_authorization_count()
 
 
+@run_in_background
+def meta_to_database(request_data):
+    meta.insert_one(request_data)
+
+
 if __name__ == "__main__":
     # json_to_mongo()
     ...

From f670fab04e953467f851391a1677bfec4aed0dc9 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 20:16:21 +0200
Subject: [PATCH 30/61] favourites now in backend

only major bug that seems to be left:
 - no change of school possible first try
missing feature:
 - prioritizing favourites
---
 client/src/App.svelte               | 37 +++++++++++++++++++----------
 client/src/Favourites.svelte        | 33 ++++++++++++++++++-------
 client/src/components/Navbar.svelte |  1 -
 client/src/stores.js                |  6 +----
 client/src/utils.js                 | 14 +++++++++++
 endpoints/api.py                    | 12 +++++++---
 utils.py                            | 24 ++++++++++++++-----
 7 files changed, 91 insertions(+), 36 deletions(-)

diff --git a/client/src/App.svelte b/client/src/App.svelte
index 3637fcb..6722e56 100644
--- a/client/src/App.svelte
+++ b/client/src/App.svelte
@@ -8,7 +8,7 @@
     import AboutUs from "./components/AboutUs.svelte";
     import Favourites from "./Favourites.svelte";
     import SveltyPicker from 'svelty-picker';
-    import {get_settings, group_rooms, update_colors, navigate_page, init_indexed_db, clear_plan_cache} from "./utils.js";
+    import {get_settings, group_rooms, update_colors, navigate_page, init_indexed_db, clear_plan_cache, get_favourites} from "./utils.js";
     import {notifications} from './notifications.js';
     import {logged_in, title, current_page, preferences, settings, active_modal, pwa_prompt, indexed_db, selected_favourite, favourites} from './stores.js'
     import SchoolManager from "./components/SchoolManager.svelte";
@@ -269,34 +269,43 @@
 
     function select_plan(favourites, selected_favourite) {
         // check if selected_favourite is in favourites (selected_favourite is the index)
-        if (selected_favourite === -1) {
-            plan_type = "";
-            plan_value = "";
-        }
-        if (selected_favourite !== null && favourites[selected_favourite]) {
+        if (selected_favourite !== -1 && favourites[selected_favourite]) {
             selected_favourite = favourites[selected_favourite];
             school_num = selected_favourite.school_num;
             localStorage.setItem('school_num', school_num);
             plan_type = selected_favourite.plan_type;
             plan_value = selected_favourite.plan_value;
+            selected_form = null;
+            selected_teacher = null;
+            selected_room = null;
         }
-
     }
 
     $: select_plan($favourites, $selected_favourite);
+    function reset_favourite() {
+        selected_favourite.set(-1);
+    }
+    // reset favourite when selecting new thing
+    $: selected_form && reset_favourite();
+    $: selected_teacher && reset_favourite();
+    $: selected_room && reset_favourite();
     $: if ($selected_favourite !== -1) {
-        if ($favourites[$selected_favourite].plan_value !== plan_value) {
-            selected_favourite.set(-1);
-        } else if ($favourites[$selected_favourite].plan_type !== plan_type) {
+        // check if selected_favourite is in favourites
+        if ($favourites.length <= $selected_favourite) {
             selected_favourite.set(-1);
         }
     }
+    // CHANGE THIS FOR SETTING IF FIRST FAVOURITE SHOULD BE SELECTED
+    /*$: if ($favourites.length !== 0 && $selected_favourite === -1) {
+        selected_favourite.set(0);
+    }*/
 
 
     $logged_in = localStorage.getItem('logged_in') === 'true';
     init_vars();
     check_login_status();
     refresh_plan_vars();
+    get_favourites();
 
     $: $logged_in && init_indexed_db();
     $: !$logged_in && logout();
@@ -338,7 +347,7 @@
         }
         if(new_location === "") {new_location = "plan";}
         navigate_page(new_location);
-        if(new_location.startsWith("plan")) {
+        if (new_location.startsWith("plan")) {
             refresh_plan_vars();
         }
     });
@@ -414,7 +423,11 @@
                     <!-- Show room overview -->
                     <div class="control" id="c5">
                         <Button on:click={() => {
-                            set_plan("room_overview", "");
+                            //set_plan("room_overview", "");
+                            reset_favourite();
+                            console.log("going to room overview");
+                            plan_type = "room_overview";
+                            plan_value = "";
                         }}>Freie Räume</Button>
                     </div>
                 </div>
diff --git a/client/src/Favourites.svelte b/client/src/Favourites.svelte
index 02e8345..599d0bf 100644
--- a/client/src/Favourites.svelte
+++ b/client/src/Favourites.svelte
@@ -1,5 +1,5 @@
 <script>
-    import {customFetch, load_meta} from "./utils.js";
+    import {customFetch, get_favourites, load_meta} from "./utils.js";
     import Select from "./base_components/Select.svelte";
     import Button from "./base_components/Button.svelte";
     import {onMount} from "svelte";
@@ -54,17 +54,20 @@
         - duplicated courses are unified: for each course c1 that already exists as course c0, the pair c1: c0 is put into an object -> later, the check-value of c1 is set to that of c0
     */
     function load_favourites() {
+        get_favourites()
+            .then(data => {
+                let temp_fav = data;
+                temp_fav = temp_fav.map(item => ({ ...item, preferences: (
+                        item.preferences ? item.preferences.reduce((obj, preference) => ({ ...obj, [preference]: false }), {}): {}
+                    )}));
+                cur_favourites = temp_fav;
+            })
         // change preferences to dict
-        let temp_fav = $favourites;
-        favourites.set(temp_fav);
-        temp_fav = temp_fav.map(item => ({ ...item, preferences: item.preferences.reduce((obj, preference) => ({ ...obj, [preference]: false }), {}) }));
-        cur_favourites = temp_fav;
     }
     function save_favourites() {
         let new_favourites = [];
         for (let favourite = 0; favourite < cur_favourites.length; favourite++) {
             let cur_favourite = {...cur_favourites[favourite]};
-            console.log(duplicated_courses_match, favourite);
             // check if favourite in duplicated_courses_match
             if (duplicated_courses_match.hasOwnProperty(favourite)) {
                 for (const cur_key of Object.keys(duplicated_courses_match[favourite])) {
@@ -74,9 +77,21 @@
             cur_favourite.preferences = Object.keys(cur_favourite.preferences).filter(key => cur_favourite.preferences[key] === false);
             new_favourites.push(cur_favourite);
         }
-        console.log(new_favourites);
         favourites.set(new_favourites);
         // now the post request
+        customFetch("/api/v69.420/favourites", {
+            method: "POST",
+            body: JSON.stringify(new_favourites),
+            headers: {
+                "Content-Type": "application/json"
+            }
+        })
+            .then(data => {
+                notifications.success("Favoriten gespeichert.");
+            })
+            .catch(error => {
+                notifications.danger(error.message);
+            })
     }
 
     // FAVOURITE MANAGEMENT
@@ -85,7 +100,7 @@
     }
     // clear everything except for the school num of a favourite
     function clear_favourite(favourite) {
-        cur_favourites[favourite] = {"school_num": cur_favourites[favourite].school_num, "name": "", "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}
+        cur_favourites[favourite] = {"school_num": cur_favourites[favourite].school_num, "name": cur_favourites[favourite].name, "priority": 0, "plan_type": "", "plan_value": "", "preferences": {}}
     }
     // delete a favourite
     function delete_favourite(favourite) {
@@ -268,7 +283,7 @@
 
 
 
-        {:else if cur_favourites[favourite].plan_type !== "free_rooms"}
+        {:else if cur_favourites[favourite].plan_type !== "room_overview"}
             <Select data={get_values(cur_favourites[favourite].school_num, cur_favourites[favourite].plan_type, all_meta)} grouped={false} bind:selected_id={cur_favourites[favourite].plan_value} data_name="{cur_favourites[favourite].plan_type}">Klasse/Lehrer/Raum auswählen</Select>
         {/if}
         <button on:click={() => {delete_favourite(favourite)}}>Favorit löschen</button>
diff --git a/client/src/components/Navbar.svelte b/client/src/components/Navbar.svelte
index b6011da..bc18210 100644
--- a/client/src/components/Navbar.svelte
+++ b/client/src/components/Navbar.svelte
@@ -15,7 +15,6 @@
                 notifications.danger(error.message);
             });
     }
-    $: console.log(selected_favourite);
 </script>
 
 <nav transition:fly={{y:-64}}>
diff --git a/client/src/stores.js b/client/src/stores.js
index 1e82d61..68b69b5 100644
--- a/client/src/stores.js
+++ b/client/src/stores.js
@@ -11,9 +11,5 @@ export const notifications_list = writable([]);
 export const pwa_prompt = writable();
 export const new_changelogs_available = writable(false);
 // TODO: as soon as this is connected to the endpoint, this needs to be cached and there needs to be a fallback
-export const favourites = writable([
-    {"school_num": "10000000", "name": "Mein Plan", "priority": 0, "plan_type": "forms", "plan_value": "12", "preferences": ["140", "97", "157", "96", "131", "88"]},
-    {"school_num": "10000000", "name": "Plan von Freund", "priority": 0, "plan_type": "forms", "plan_value": "12", "preferences": ["140", "97", "157", "96", "130", "88"]},
-    {"school_num": "10000000", "name": "Klassenlehrerplan", "priority": 0, "plan_type": "teachers", "plan_value": "Sipp", "preferences": []},
-]);
+export const favourites = writable([]);
 export const selected_favourite = writable(0);
diff --git a/client/src/utils.js b/client/src/utils.js
index c389744..373884f 100644
--- a/client/src/utils.js
+++ b/client/src/utils.js
@@ -1,6 +1,7 @@
 import {current_page, indexed_db, settings} from "./stores.js";
 import {notifications} from "./notifications.js";
 import { get } from "svelte/store";
+import { favourites } from "./stores.js";
 
 const MAX_CACHED_PLANS = 10; // 2 Weeks
 
@@ -446,3 +447,16 @@ export async function load_meta(school_num) {
             }
         })
 }
+
+export function get_favourites() {
+    return customFetch("/api/v69.420/favourites")
+        .then(data => {
+            localStorage.setItem("favourites", JSON.stringify(data));
+            favourites.set(data);
+            return data
+        }).catch(error => {
+            console.log("Favourites couldn't be loaded.");
+            favourites.set(JSON.parse(localStorage.getItem("favourites")))
+            return JSON.parse(localStorage.getItem("favourites"))
+        })
+}
\ No newline at end of file
diff --git a/endpoints/api.py b/endpoints/api.py
index 53092ed..af6def7 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -183,10 +183,16 @@ def preferences(school_num: str) -> Response:
         return current_user.set_user_preferences(current_preferences)
 
 
-@api.route(f"/favourites", methods=["GET", "POST"])
+@api.route(f"/api/v69.420/favourites", methods=["GET", "POST"])
 @login_required
-def favourites(school_num):
-    return ""
+def favourites() -> Response:
+    if request.method == "GET":
+        return send_success(current_user.get_user().get("favourites", []))
+    try:
+        data = json.loads(request.data)
+    except json.JSONDecodeError:
+        return send_error("Invalid JSON data.")
+    return current_user.set_favourites(data)
 
 
 @api.route(f"/api/v69.420/changelog", methods=["GET", "POST"])
diff --git a/utils.py b/utils.py
index 6eed145..74e058a 100644
--- a/utils.py
+++ b/utils.py
@@ -121,20 +121,32 @@ def set_favourites(self, favourites) -> Response:
         for cur_favourite in favourites:
             favourite = {elem: cur_favourite.get(elem) for elem in ["school_num", "name", "priority", "plan_type", "plan_value", "preferences"]}
             for key in favourite:
-                if not favourite[key]:
+                if favourite[key] is None:
+                    if favourite["plan_type"] == "room_overview" and key == "plan_value":
+                        continue
                     return send_error(f"{key} nicht angegeben")
             if favourite["school_num"] not in self.get_authorized_schools():
                 return send_error("Schule nicht autorisiert")
             if len(favourite["name"]) > 40:
                 return send_error("Name zu lang")
-            if favourite["plan_type"] not in ["forms", "teachers", "rooms", "free_rooms"]:
+            if not isinstance(favourite["priority"], int) or favourite["priority"] < 0 or favourite["priority"] > 100:
+                return send_error("Priorität muss eine Zahl zwischen 0 und 100 sein")
+            if favourite["plan_type"] not in ["forms", "teachers", "rooms", "room_overview"]:
                 return send_error("invalide Planart")
             cache = backend.cache.Cache(Path(".cache") / favourite["school_num"])
-            if favourite["plan_type"] == "free_rooms":
+            if favourite["plan_type"] == "room_overview":
                 favourite["plan_value"] = None
-            else:
-                if favourite["plan_value"] not in json.loads(cache.get_meta_file(f"{favourite['plan_type']}.json"))[favourite["plan_type"]]:
-                    return send_error("invalider Plan")
+                favourite["preferences"] = None
+                new_favourites.append(favourite)
+                continue
+            if favourite["plan_value"] not in json.loads(cache.get_meta_file(f"{favourite['plan_type']}.json"))[favourite["plan_type"]]:
+                return send_error("invalider Plan (Klasse/Lehrer/Raum) existiert nicht")
+            if favourite["plan_type"] != "forms":
+                favourite["preferences"] = None
+                new_favourites.append(favourite)
+                continue
+            available_preferences = json.loads(cache.get_meta_file("forms.json"))["forms"][favourite["plan_value"]]["class_groups"].keys()
+            favourite["preferences"] = [elem for elem in favourite["preferences"] if elem in available_preferences]
             new_favourites.append(favourite)
         users.update_one({'_id': ObjectId(self.mongo_id)}, {"$set": {'favourites': new_favourites}})
         return send_success(new_favourites)

From db0f12fefe6ab8494cf34b727ea270a57183ce80 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 20:42:19 +0200
Subject: [PATCH 31/61] remove localhost requests from metadata

---
 client/src/Favourites.svelte | 6 +++---
 server.py                    | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/src/Favourites.svelte b/client/src/Favourites.svelte
index 599d0bf..b537753 100644
--- a/client/src/Favourites.svelte
+++ b/client/src/Favourites.svelte
@@ -56,13 +56,13 @@
     function load_favourites() {
         get_favourites()
             .then(data => {
+                // change preferences to dict
                 let temp_fav = data;
                 temp_fav = temp_fav.map(item => ({ ...item, preferences: (
-                        item.preferences ? item.preferences.reduce((obj, preference) => ({ ...obj, [preference]: false }), {}): {}
-                    )}));
+                    item.preferences ? item.preferences.reduce((obj, preference) => ({ ...obj, [preference]: false }), {}): {}
+                )}));
                 cur_favourites = temp_fav;
             })
-        // change preferences to dict
     }
     function save_favourites() {
         let new_favourites = [];
diff --git a/server.py b/server.py
index ef4b314..db83d73 100644
--- a/server.py
+++ b/server.py
@@ -44,6 +44,8 @@
 def after_request(resp):
     if request.path.startswith("/public"):
         return resp
+    if request.host == "localhost:5000" or request.host == "127.0.0.1:5000" or request.remote_addr == "127.0.0.1":
+        return resp
     request_data = {
         "time": time.time(),
         "host": request.host,

From 886c772f37a4767fc2a32caaf75e3c62cfef6512 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 22:56:37 +0200
Subject: [PATCH 32/61] fix school change bug

---
 client/src/App.svelte             |  6 +++---
 client/src/components/Plan.svelte | 11 +++++++----
 endpoints/api.py                  |  1 +
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/client/src/App.svelte b/client/src/App.svelte
index 6722e56..063c6a8 100644
--- a/client/src/App.svelte
+++ b/client/src/App.svelte
@@ -84,8 +84,8 @@
         revision_arr = [];
     }
 
-    function get_meta() {
-        load_meta(school_num)
+    function get_meta(tmp_school_num) {
+        load_meta(tmp_school_num)
             .then(data => {
                 if (!data) {
                     return
@@ -310,7 +310,7 @@
     $: $logged_in && init_indexed_db();
     $: !$logged_in && logout();
     $: school_num && (api_base = `/api/v69.420/${school_num}`);
-    $: school_num && get_meta();
+    $: get_meta(school_num);
     $: all_revisions = [".newest"].concat((meta?.dates || {})[date] || []);
     //$: school_num && get_preferences();
     $: all_rooms && (grouped_rooms = group_rooms(all_rooms));
diff --git a/client/src/components/Plan.svelte b/client/src/components/Plan.svelte
index 5d80eb1..a41430b 100644
--- a/client/src/components/Plan.svelte
+++ b/client/src/components/Plan.svelte
@@ -74,8 +74,10 @@
         }
         // Check the validity of the plan value
         if((plan_type === "rooms" || plan_type === "teachers") && (!Object.keys(meta[plan_type]).includes(entity))) {
-            reset_plan_vars();
-            return;
+            if (meta.school_num === school_num) {
+                reset_plan_vars();
+                return;
+            }
         } else if((plan_type === "forms") && !Object.keys(meta.forms.forms).includes(entity)) {
             reset_plan_vars();
             return;
@@ -142,7 +144,8 @@
                 data_from_cache = false;
             })
             .catch(error => {
-                console.error(error);
+                console.log(error.message);
+                //console.error(error);
                 loading = false;
                 network_loading_failed = true;
         });
@@ -277,7 +280,7 @@
     });
 
     $: $indexed_db, load_plan(school_num, date, selected_revision, enabled_dates);
-    $: load_lessons_check_plan(plan_data, plan_type, plan_value, $settings.use_grouped_form_plans);
+    $: meta && load_lessons_check_plan(plan_data, plan_type, plan_value, $settings.use_grouped_form_plans);
 
     $: if (plan_type === "teachers") {
         if (meta.teachers) {
diff --git a/endpoints/api.py b/endpoints/api.py
index af6def7..ecff5ca 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -47,6 +47,7 @@ def meta(school_num) -> Response:
     date = find_closest_date(dates)
 
     return send_success({
+        "school_num": school_num,
         "meta": meta_data,
         "teachers": teachers_data,
         "forms": forms_data,

From 1369e434dfffd819b48b28ed4655ef97a08b7255 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Sun, 1 Oct 2023 23:13:19 +0200
Subject: [PATCH 33/61] fix last fixed bug again

---
 client/src/components/Plan.svelte | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/src/components/Plan.svelte b/client/src/components/Plan.svelte
index a41430b..6fea987 100644
--- a/client/src/components/Plan.svelte
+++ b/client/src/components/Plan.svelte
@@ -79,8 +79,10 @@
                 return;
             }
         } else if((plan_type === "forms") && !Object.keys(meta.forms.forms).includes(entity)) {
-            reset_plan_vars();
-            return;
+            if (meta.school_num === school_num) {
+                reset_plan_vars();
+                return;
+            }
         }
 
         let plan_key = use_grouped_form_plans ? "grouped_form_plans": "plans";

From 8d8f3f51e580748a9b1c638b0f8a87f942b08011 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Mon, 2 Oct 2023 00:24:45 +0200
Subject: [PATCH 34/61] remove preferences

---
 client/src/App.svelte                         |  16 +-
 client/src/{ => components}/Favourites.svelte |  20 +-
 client/src/components/Navbar.svelte           |   2 -
 client/src/components/Plan.svelte             |   5 +-
 client/src/components/Preferences.svelte      | 195 ------------------
 client/src/stores.js                          |   1 -
 client/src/utils.js                           |   1 +
 endpoints/api.py                              |  37 ----
 utils.py                                      |   4 -
 9 files changed, 16 insertions(+), 265 deletions(-)
 rename client/src/{ => components}/Favourites.svelte (95%)
 delete mode 100644 client/src/components/Preferences.svelte

diff --git a/client/src/App.svelte b/client/src/App.svelte
index 5444729..7f228af 100644
--- a/client/src/App.svelte
+++ b/client/src/App.svelte
@@ -6,13 +6,12 @@
     import Navbar from "./components/Navbar.svelte";
     import Settings from "./components/Settings.svelte";
     import AboutUs from "./components/AboutUs.svelte";
-    import Favourites from "./Favourites.svelte";
+    import Favourites from "./components/Favourites.svelte";
     import SveltyPicker from 'svelty-picker';
     import {get_settings, group_rooms, update_colors, navigate_page, init_indexed_db, clear_plan_cache, get_favourites} from "./utils.js";
     import {notifications} from './notifications.js';
-    import {logged_in, title, current_page, preferences, settings, active_modal, pwa_prompt, indexed_db, selected_favourite, favourites} from './stores.js'
+    import {logged_in, title, current_page, settings, active_modal, pwa_prompt, indexed_db, selected_favourite, favourites} from './stores.js'
     import SchoolManager from "./components/SchoolManager.svelte";
-    import Preferences from "./components/Preferences.svelte";
     import Changelog from "./components/Changelog.svelte";
     import Select from "./base_components/Select.svelte";
     import Contact from "./components/Contact.svelte";
@@ -126,16 +125,6 @@
         );
     }
 
-    /*function get_preferences() {
-        customFetch(`${api_base}/preferences`)
-            .then(data => {
-                preferences.set(data);
-            })
-            .catch(error => {
-                console.error("Preferences konnten nicht geladen werden.");
-            })
-    }*/
-
     function choose(choices) {
         var index = Math.floor(Math.random() * choices.length);
         return choices[index];
@@ -377,7 +366,6 @@
 
 <Settings />
 <Changelog />
-<Preferences bind:api_base bind:grouped_forms bind:course_lists bind:school_num />
 
 <div id="page-container">
     <main>
diff --git a/client/src/Favourites.svelte b/client/src/components/Favourites.svelte
similarity index 95%
rename from client/src/Favourites.svelte
rename to client/src/components/Favourites.svelte
index 494b397..91fd773 100644
--- a/client/src/Favourites.svelte
+++ b/client/src/components/Favourites.svelte
@@ -1,11 +1,11 @@
 <script>
-    import {customFetch, get_favourites, load_meta} from "./utils.js";
-    import Select from "./base_components/Select.svelte";
-    import Button from "./base_components/Button.svelte";
+    import {customFetch, get_favourites, load_meta} from "../utils.js";
+    import Select from "../base_components/Select.svelte";
+    import Button from "../base_components/Button.svelte";
     import {onMount} from "svelte";
-    import {notifications} from "./notifications.js";
+    import {notifications} from "../notifications.js";
 
-    import {favourites} from "./stores.js";
+    import {favourites} from "../stores.js";
 
     let cur_favourites = [];
     let all_schools = {};
@@ -19,7 +19,10 @@
     onMount(() => {
         get_schools();
         get_authorized_schools();
-        load_favourites();
+        get_favourites()
+            .then(data => {
+                load_favourites()
+            });
     });
 
 
@@ -56,9 +59,10 @@
     function load_favourites() {
         // change preferences to dict
         let temp_fav = $favourites;
-        favourites.set(temp_fav);
-        temp_fav = temp_fav.map(item => ({ ...item, preferences: item.preferences.reduce((obj, preference) => ({ ...obj, [preference]: false }), {}) }));
+        console.log(temp_fav);
+        temp_fav = temp_fav.map(item => ({ ...item, preferences: (item.preferences || []).reduce((obj, preference) => ({ ...obj, [preference]: false }), {}) }));
         cur_favourites = temp_fav;
+        console.log(cur_favourites);
     }
     function save_favourites() {
         let new_favourites = [];
diff --git a/client/src/components/Navbar.svelte b/client/src/components/Navbar.svelte
index b6011da..7539060 100644
--- a/client/src/components/Navbar.svelte
+++ b/client/src/components/Navbar.svelte
@@ -15,7 +15,6 @@
                 notifications.danger(error.message);
             });
     }
-    $: console.log(selected_favourite);
 </script>
 
 <nav transition:fly={{y:-64}}>
@@ -55,7 +54,6 @@
 
                 <button class="nav-button" on:click={() => $active_modal = "settings"}><span class="material-symbols-outlined">settings</span> Einstellungen</button>
                 <button class="nav-button" on:click={() => navigate_page("school_manager")}><span class="material-symbols-outlined">school</span> Schule wechseln</button>
-                <button class="nav-button" on:click={() => $active_modal = "preferences"}><span class="material-symbols-outlined">account_circle</span> Unterricht wählen</button>
                 <button class="nav-button" on:click={() => $active_modal = "changelog"}><span class="material-symbols-outlined" class:new_notification={$new_changelogs_available}>assignment</span> Changelog {#if $new_changelogs_available}✨{/if}</button>
                 <button class="nav-button" on:click={() => navigate_page("favourites")}><span class="material-symbols-outlined">account_circle</span> Favoriten wählen</button>
                 <button class="nav-button" on:click={() => navigate_page("contact")}><span class="material-symbols-outlined">contact_page</span> Kontaktiere uns</button>
diff --git a/client/src/components/Plan.svelte b/client/src/components/Plan.svelte
index 6fea987..8a04618 100644
--- a/client/src/components/Plan.svelte
+++ b/client/src/components/Plan.svelte
@@ -4,7 +4,7 @@
     import Rooms from "./Rooms.svelte";
     import {notifications} from '../notifications.js';
     import { swipe } from 'svelte-gestures';
-    import {indexed_db, preferences, settings, title, selected_favourite, favourites} from '../stores.js';
+    import {indexed_db, settings, title, selected_favourite, favourites} from '../stores.js';
     import {arraysEqual, cache_plan, customFetch, format_date, get_from_db, get_school_plan_count, navigate_page} from "../utils.js";
     import Dropdown from '../base_components/Dropdown.svelte';
 
@@ -209,9 +209,6 @@
         if (!preferences_apply) {
             return lessons
         }
-        //if (!(plan_value in $preferences)) {
-        //    return lessons
-        //}
         if ($selected_favourite === -1) {
             return lessons
         }
diff --git a/client/src/components/Preferences.svelte b/client/src/components/Preferences.svelte
deleted file mode 100644
index ec5bda2..0000000
--- a/client/src/components/Preferences.svelte
+++ /dev/null
@@ -1,195 +0,0 @@
-<script>
-    import Button from "../base_components/Button.svelte";
-    import Modal from "../base_components/Modal.svelte";
-    import Select from "../base_components/Select.svelte";
-    import {notifications} from "../notifications.js";
-    import {preferences, active_modal} from '../stores.js';
-    import {customFetch, navigate_page} from "../utils.js";
-
-    export let api_base;
-    export let grouped_forms;
-    export let course_lists;
-    export let school_num;
-
-    let selected_form = null;
-    let class_groups_by_subject = [];
-    let allItems = [];
-    let selection = {};
-    let current_form_preferences = [];
-    let select_arr = [];
-    // used to match every course that exists duplicated to one id -> see set_preferences
-    let duplicated_courses_match = {};
-
-    function create_select_arr(grouped_forms) {
-        select_arr = []
-        for (const [form_group, forms] of Object.entries(grouped_forms)) {
-            let converted_forms = [];
-            for(let form of forms) {
-                converted_forms.push({"id": form, "display_name": form});
-            }
-            select_arr.push([form_group, converted_forms]);
-        }
-    }
-
-    function sort_courses_by_subject(obj) {
-        const courses_by_subject = {};
-
-        Object.entries(obj).forEach(([class_number, class_data]) => {
-            const subject = class_data.subject;
-            if (courses_by_subject[subject] === undefined) {
-                courses_by_subject[subject] = [];
-            }
-            class_data.class_number = class_number;
-            // this is for the duplicated forms
-            let object_exists = false;
-            for (const obj of courses_by_subject[subject]) {
-                if (
-                    Object.keys(class_data)
-                        .filter(key => key !== "class_number")
-                        .every(key => obj[key] === class_data[key])
-                ) {
-                    duplicated_courses_match[class_number] = obj.class_number;
-                    object_exists = true;
-                    break;
-                }
-            }
-            if (!object_exists) {
-                courses_by_subject[subject].push(class_data);
-            }
-        });
-
-        Object.values(courses_by_subject).map(class_datas => class_datas.sort((data1, data2) => data2.group?.localeCompare(data1.group)));
-
-        return courses_by_subject;
-    }
-
-    function getFalse(obj) {
-        const falseItems = [];
-        for (const key in obj) {
-            if (obj.hasOwnProperty(key) && obj[key] === false) {
-                falseItems.push(key);
-            }
-        }
-        return falseItems;
-    }
-
-    function updateCourses() {
-        if (selected_form === null) {
-            return
-        }
-        allItems = Object.keys(course_lists[selected_form].class_groups);
-        current_form_preferences = $preferences[selected_form] || [];
-        selection = {};
-        for (const item of allItems) {
-            selection[item] = !current_form_preferences.includes(item);
-        }
-    }
-
-    function setPreferences() {
-        for (const cur_key of Object.keys(duplicated_courses_match)) {
-            selection[cur_key] = selection[duplicated_courses_match[cur_key]]
-        }
-        customFetch(`${api_base}/preferences?` + new URLSearchParams({"form": selected_form}), {
-            method: "POST",
-            body: JSON.stringify(getFalse(selection))
-        })
-            .then(data => {
-                notifications.success("Kurse gespeichert!", 2000);
-            })
-            .catch(error => {
-                notifications.danger(error.message);
-            })
-    }
-
-    function select_all_part(courses) {
-        for (const course in courses) {
-            let key = courses[course].class_number;
-            if (selection.hasOwnProperty(key)) {
-                selection[key] = true;
-            }
-        }
-    }
-
-    function select_none_part(courses) {
-        for (const course in courses) {
-            let key = courses[course].class_number;
-            if (selection.hasOwnProperty(key)) {
-                selection[key] = false;
-            }
-        }
-    }
-
-    function onopen() {
-        if(!school_num) {
-            notifications.danger("Du musst eine Schule auswählen um deinen Unterricht zu wählen!");
-            navigate_page('school_manager');
-            $active_modal = "";
-            return;
-        }
-        updateCourses();
-    }
-
-    $: class_groups_by_subject = selected_form != null ? sort_courses_by_subject(course_lists[selected_form].class_groups) : [];
-    $: create_select_arr(grouped_forms)
-    $: selected_form, updateCourses();
-</script>
-
-<Modal id="preferences" onopen={onopen} full_height={true} onclose={() => {selected_form = null;}}>
-    <h1 class="responsive-heading">Unterrichtswahl</h1>
-    <Select data={select_arr} grouped={true} bind:selected_id={selected_form} data_name="Klassen">Klasse auswählen</Select>
-    {#if selected_form != null}
-        <ul class="responsive-text">
-            {#each Object.entries(class_groups_by_subject).sort(([subj1, _], [subj2, __]) => subj1.localeCompare(subj2)).sort(([_, courses1], [__, courses2]) => courses2.length - courses1.length) as [subject, courses]}
-                {#if courses.length === 1}
-                    <li>{subject}:<input
-                            type="checkbox"
-                            bind:checked={selection[courses[0].class_number]}
-                    />
-                        {courses[0].class_number}
-                        {courses[0].teacher} |
-                        {courses[0].subject}
-                        {#if courses[0].group != null}
-                            ({courses[0].group})
-                        {/if}
-                    </li>
-                {:else}
-                    <li>
-                        {subject}
-                        {#if courses.length > 2}
-                        <Button class="inline-flex" on:click={() => {select_all_part(courses)}}>Alle Auswählen</Button>
-                        <Button class="inline-flex" on:click={() => {select_none_part(courses)}}>Keinen Auswählen</Button>
-                        {/if}
-                    </li>
-                    <ul>
-                        {#each courses as course}
-                            <li>
-                                <input
-                                    type="checkbox"
-                                    bind:checked={selection[course.class_number]}
-                                />
-                                {course.class_number}
-                                {course.teacher} |
-                                {course.subject}
-                                {#if course.group != null}
-                                    ({course.group})
-                                {/if}
-                            </li>
-                        {/each}
-                    </ul>
-                {/if}
-            {/each}
-        </ul>
-    {/if}
-    <svelte:fragment slot="footer">
-        {#if selected_form != null}
-            <Button on:click={() => {setPreferences(); $active_modal = "";}} background="var(--accent-color)" small={true}>Speichern</Button>
-        {/if}
-        <Button on:click={() => {$active_modal = ""}} small={true}>Abbrechen</Button>
-    </svelte:fragment>
-</Modal>
-
-<style lang="scss">
-    :global(.inline-flex) {
-        display: inline-flex !important;
-    }
-</style>
\ No newline at end of file
diff --git a/client/src/stores.js b/client/src/stores.js
index 68b69b5..8e23cd7 100644
--- a/client/src/stores.js
+++ b/client/src/stores.js
@@ -5,7 +5,6 @@ export const title = writable("");
 export const logged_in = writable(false);
 export const current_page = writable("plan");
 export const settings = writable({});
-export const preferences = writable({});
 export const active_modal = writable("");
 export const notifications_list = writable([]);
 export const pwa_prompt = writable();
diff --git a/client/src/utils.js b/client/src/utils.js
index 373884f..9ae8e55 100644
--- a/client/src/utils.js
+++ b/client/src/utils.js
@@ -453,6 +453,7 @@ export function get_favourites() {
         .then(data => {
             localStorage.setItem("favourites", JSON.stringify(data));
             favourites.set(data);
+            console.log(data);
             return data
         }).catch(error => {
             console.log("Favourites couldn't be loaded.");
diff --git a/endpoints/api.py b/endpoints/api.py
index 0e3cef7..114d7f8 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -147,43 +147,6 @@ def instant_authorize(school_num: str) -> Response:
     return send_success()
 
 
-@api.route(f"{API_BASE_URL}/preferences", methods=['GET', 'POST'])
-@login_required
-def preferences(school_num: str) -> Response:
-    cache = backend.cache.Cache(Path(".cache") / school_num)
-
-    current_preferences = current_user.get_user().get("preferences", {})
-
-    if request.method == "GET":
-        if "form" in request.args:
-            return send_success(current_preferences.get(school_num, {}).get(request.args["form"], []))
-        else:
-            return send_success(current_preferences.get(school_num, {}))
-
-    elif request.method == "POST":
-        try:
-            class_groups = json.loads(cache.get_meta_file("forms.json"))["forms"][request.args["form"]]["class_groups"]
-        except KeyError:
-            return send_error(f"Invalid or missing form {request.args.get('form')!r}!")
-
-        stored_classes = []
-
-        try:
-            data = json.loads(request.data)
-        except json.JSONDecodeError:
-            return send_error("Invalid JSON data.")
-
-        for requested_class in data:
-            if requested_class not in class_groups:
-                continue
-
-            stored_classes.append(requested_class)
-
-        current_preferences.setdefault(school_num, {})[request.args["form"]] = stored_classes
-
-        return current_user.set_user_preferences(current_preferences)
-
-
 @api.route(f"/api/v69.420/favourites", methods=["GET", "POST"])
 @login_required
 def favourites() -> Response:
diff --git a/utils.py b/utils.py
index 74e058a..9626e4c 100644
--- a/utils.py
+++ b/utils.py
@@ -98,10 +98,6 @@ def update_settings(self, user_settings=DEFAULT_SETTINGS) -> Response:
         users.update_one({'_id': ObjectId(self.mongo_id)}, {"$set": {'settings': new_settings}})
         return send_success()
 
-    def set_user_preferences(self, preferences) -> Response:
-        users.update_one({'_id': ObjectId(self.mongo_id)}, {'$set': {'preferences': preferences}})
-        return send_success()
-
     # get setting for user, if setting not set get default setting
     def get_setting(self, setting_key):
         self.get_user()

From 9c0394aab4443915ac1cd55c5359dfa100c51e2a Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Mon, 2 Oct 2023 00:25:09 +0200
Subject: [PATCH 35/61] utilities for future school parsers

---
 backend/schools/school_utils.py | 41 +++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 backend/schools/school_utils.py

diff --git a/backend/schools/school_utils.py b/backend/schools/school_utils.py
new file mode 100644
index 0000000..031dbb9
--- /dev/null
+++ b/backend/schools/school_utils.py
@@ -0,0 +1,41 @@
+def is_kuerzel_in_name(name, kuerzel):
+    name = name.lower()
+    abbreviation = kuerzel.lower()
+    if abbreviation[0] != name[0]:
+        return False
+    name_index = 0
+    abbreviation_index = 0
+    while abbreviation_index < len(abbreviation):
+        char = abbreviation[abbreviation_index]
+        char_index = name.find(char, name_index)
+        if char_index == -1:
+            return False
+        name_index = char_index + 1
+        abbreviation_index += 1
+    return True
+
+
+def names_kuerzel(kuerzels, names):
+    names_match = {}
+    for name in names:
+        names_match[name] = []
+        for kuerzel in kuerzels:
+            if is_kuerzel_in_name(name.split(" ")[-1], kuerzel):
+                names_match[name].append(kuerzel)
+    # problem: the kuerzel seem very indefinitive...
+    """# error detection should be implemented here (e.g. 2 names that both only have 1 valid kuerzel)
+    definite_kuerzel = []
+    for name, values in names_match.items():
+        if len(values) == 0:
+            names_match[name] = None
+        if len(values) == 1:
+            if values[0] not in definite_kuerzel:
+                definite_kuerzel.append(values[0])
+            else:
+                print(f"conflict for kuerzel {values[0]}")
+            names_match[name] = values[0]
+    # for name, values in names_match.items():
+    #     if type(values) == list:
+    #         names_match[name] = [value for value in values if value not in definite_kuerzel]
+    """
+    return names_match

From 47a85e88b586b6bcc2b5f75bff53f3df3db2b8f8 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Mon, 2 Oct 2023 01:31:29 +0200
Subject: [PATCH 36/61] small enhancements

---
 client/src/components/Navbar.svelte |  6 +++---
 client/src/utils.js                 | 12 +++++++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/src/components/Navbar.svelte b/client/src/components/Navbar.svelte
index 7539060..85046b1 100644
--- a/client/src/components/Navbar.svelte
+++ b/client/src/components/Navbar.svelte
@@ -41,7 +41,7 @@
                         {:else}
                             <span class="material-symbols-outlined">star</span>
                         {/if}
-                    ({index}) {favourite.name}</button>
+                    {favourite.name}</button>
                 {/each}
                 <button class="nav-button" on:click={() => navigate_page("favourites")}><span class="material-symbols-outlined">account_circle</span> Favoriten wählen</button>
             </Dropdown>
@@ -53,10 +53,10 @@
                 </button>
 
                 <button class="nav-button" on:click={() => $active_modal = "settings"}><span class="material-symbols-outlined">settings</span> Einstellungen</button>
-                <button class="nav-button" on:click={() => navigate_page("school_manager")}><span class="material-symbols-outlined">school</span> Schule wechseln</button>
-                <button class="nav-button" on:click={() => $active_modal = "changelog"}><span class="material-symbols-outlined" class:new_notification={$new_changelogs_available}>assignment</span> Changelog {#if $new_changelogs_available}✨{/if}</button>
                 <button class="nav-button" on:click={() => navigate_page("favourites")}><span class="material-symbols-outlined">account_circle</span> Favoriten wählen</button>
+                <button class="nav-button" on:click={() => navigate_page("school_manager")}><span class="material-symbols-outlined">school</span> Schule wechseln</button>
                 <button class="nav-button" on:click={() => navigate_page("contact")}><span class="material-symbols-outlined">contact_page</span> Kontaktiere uns</button>
+                <button class="nav-button" on:click={() => $active_modal = "changelog"}><span class="material-symbols-outlined" class:new_notification={$new_changelogs_available}>assignment</span> Changelog {#if $new_changelogs_available}✨{/if}</button>
                 <button on:click={logout} class="nav-button"><span class="material-symbols-outlined">logout</span> Logout</button>
             </Dropdown>
         </li>
diff --git a/client/src/utils.js b/client/src/utils.js
index 9ae8e55..4b766e9 100644
--- a/client/src/utils.js
+++ b/client/src/utils.js
@@ -453,11 +453,13 @@ export function get_favourites() {
         .then(data => {
             localStorage.setItem("favourites", JSON.stringify(data));
             favourites.set(data);
-            console.log(data);
-            return data
         }).catch(error => {
-            console.log("Favourites couldn't be loaded.");
-            favourites.set(JSON.parse(localStorage.getItem("favourites")))
-            return JSON.parse(localStorage.getItem("favourites"))
+            console.log("Favourites couldn't be loaded from server.");
+            // check if favourites in localstorage
+            if(!localStorage.getItem("favourites")) {
+                favourites.set([])
+            } else {
+                favourites.set(JSON.parse(localStorage.getItem("favourites")))
+            }
         })
 }
\ No newline at end of file

From 4347fdb0a41483c41888c2e8e2e3d9c89d1f72a3 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Mon, 2 Oct 2023 21:17:12 +0200
Subject: [PATCH 37/61] indiware file download

---
 .gitignore       |  3 ++-
 indiware_data.py | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 indiware_data.py

diff --git a/.gitignore b/.gitignore
index a75a36b..a970621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,4 +166,5 @@ backend/schools/private_data
 creds.json
 proxies.json
 
-/test_scripts
\ No newline at end of file
+/test_scripts
+/downloaded_files
\ No newline at end of file
diff --git a/indiware_data.py b/indiware_data.py
new file mode 100644
index 0000000..54bd05d
--- /dev/null
+++ b/indiware_data.py
@@ -0,0 +1,31 @@
+import requests
+import os
+from bs4 import BeautifulSoup
+from urllib.parse import unquote
+
+
+def download_path(base_url, cur_path):
+    print(f"{base_url}/{cur_path}")
+    r = requests.get(f"{base_url}/{cur_path}")
+    os.makedirs(f"downloaded_files/{cur_path}", exist_ok=True)
+    soup = BeautifulSoup(r.text, features="html.parser")
+    links = soup.find_all("a")
+    links = [link["href"] for link in links if link.text.strip() != "Parent Directory" and link.get("href")]
+    print(links)
+    for link in links:
+        if link.endswith("/"):
+            download_path(base_url=base_url, cur_path=f"{cur_path}/{link}")
+        else:
+            download_link = f"{base_url}/{cur_path}{link}"
+            print(f"getting {download_link}")
+            r = requests.get(download_link)
+            with open(f"downloaded_files/{cur_path}{unquote(link)}", "wb+") as f:
+                f.write(r.content)
+
+
+def download_indiware_service_data():
+    download_path(base_url="https://www.indiware.de", cur_path="service")
+
+
+if __name__ == "__main__":
+    download_indiware_service_data()
\ No newline at end of file

From 926908b0b666d8701325fa76cf0255a758a60fc3 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Mon, 2 Oct 2023 23:11:15 +0200
Subject: [PATCH 38/61] update school tester

---
 test.py | 92 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 57 insertions(+), 35 deletions(-)

diff --git a/test.py b/test.py
index 90342f5..1a9f8db 100644
--- a/test.py
+++ b/test.py
@@ -1,46 +1,68 @@
-from typing import Tuple
+import os
+from typing import Dict, Tuple
+from dotenv import load_dotenv
 
 import requests
-from base64 import b64encode
+
+load_dotenv()
+
+
+def match_status_code(code) -> Tuple[bool, bool]:
+    if code == 200:
+        return True, True
+    elif code == 401:
+        return True, False
+    elif code == 404:
+        return False, False
+    else:
+        raise ValueError(f"status code unknown: {code}")
+
+
+def get_other_servers() -> Dict[str, str]:
+    url = f"https://www.stundenplan24.de/extern/links24k.txt"
+    username = os.getenv("LINKS24_USER")
+    password = os.getenv("LINKS24_PASSWORD")
+    print(username, password)
+    r = requests.get(url, auth=(username, password))
+    return {elem.split("=")[0]: elem.split("=")[1].strip() for elem in r.text.split("\n")}
 
 
 class SchoolCandidate:
-    def __init__(self, abbreviation: str, school_num: str, username: str, password: str,
-                 server: str = "www.stundenplan24.de"):
-        self.abbreviation = abbreviation
-        self.school_num = school_num
-        self.username = username
-        self.password = password
-        self.server = server
-        self.school_exists = None
-        self.is_valid = None
-
-    def get_other_servers(self):
-        ...
+    test_url: str = ""
+    school_exists: bool = False
+    is_valid: bool = False
+    servers: Dict[str, str] = {}
+    needs_password: bool = True
+
+    def __init__(self, abbreviation: str, school_num: str, username: str, password: str, test: bool = True):
+        self.abbreviation: str = abbreviation
+        self.school_num: str = school_num
+        self.username: str = username
+        self.password: str = password
+        self.servers = get_other_servers()
+        self.test_url = self.servers[school_num] if self.school_num in self.servers else f"https://www.stundenplan24.de/{self.school_num}/mobil/"
+        self.test() if test else ...
 
     def test(self) -> Tuple[bool, bool]:
-        url = f"https://{self.server}/{self.school_num}/mobil/"
-        headers = {
-            "Authorization": f"Basic {b64encode(f'{self.username}:{self.password}'.encode('utf-8')).decode('utf-8')}"
-        }
-        r = requests.get(url, headers=headers)
-        self.school_exists = False
-        self.is_valid = False
-        if r.status_code == 200:
-            self.school_exists = True
-            self.is_valid = True
-        elif r.status_code == 401:
-            self.school_exists = True
-        elif r.status_code == 404:
-            ...
+        # testing doesnw really work apparently
+        r = requests.get(self.test_url)
+        self.school_exists, self.is_valid = match_status_code(r.status_code)
+        if self.school_exists:
+            self.needs_password = False
+            return self.school_exists, self.is_valid
+        r = requests.get(self.test_url, auth=(self.username, self.password))
+        self.school_exists, self.is_valid = match_status_code(r.status_code)
         return self.school_exists, self.is_valid
 
 
 if __name__ == "__main__":
-    i = SchoolCandidate(
-        "ostwald2",
-        "10001329",
-        "schueler",
-        "testpasswort"
-    ).test()
-    print(i)
+    servers = get_other_servers()
+    for server_id, server_link in servers.items():
+        print(server_id, server_link)
+        """i = SchoolCandidate(
+            "",
+            server_id,
+            "",
+            ""
+        )"""
+        #print(i.needs_password)

From 2d9b84f370ad986284ed689f3379f0c054a90fa6 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Tue, 3 Oct 2023 16:54:09 +0200
Subject: [PATCH 39/61] fix #208, start implementation of #82

---
 endpoints/api.py           | 34 +++++++++++++++++++++++++--
 endpoints/authorization.py |  1 -
 test.py => school_test.py  | 48 ++++++++++++++++++++++++--------------
 utils.py                   |  7 +++---
 var.py                     |  3 ---
 5 files changed, 66 insertions(+), 27 deletions(-)
 rename test.py => school_test.py (56%)

diff --git a/endpoints/api.py b/endpoints/api.py
index 114d7f8..3e4710c 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -1,10 +1,10 @@
 from typing import List
 
 import json
+import os
 import datetime
 from pathlib import Path
 
-from discord_webhook import DiscordEmbed
 from flask import Blueprint, request, Response
 from flask_login import login_required, current_user
 from endpoints.authorization import school_authorized
@@ -12,9 +12,11 @@
 import backend.cache
 import backend.load_plans
 from backend.vplan_utils import find_closest_date
-from utils import send_success, send_error, get_all_schools_by_number, get_all_schools
+from utils import send_success, send_error, get_all_schools
 from utils import get_school_by_id
 from utils import webhook_send, BetterEmbed
+from utils import VALID_SCHOOLS
+from school_test import SchoolCandidate
 
 from var import *
 
@@ -225,3 +227,31 @@ def contact() -> Response:
     webhook_send("WEBHOOK_CONTACT", embeds=[embed])
     return send_success()
 
+
+@api.route(f"/api/v69.420/add_school", methods=["POST"])
+@login_required
+def add_school() -> Response:
+    data = json.loads(request.data)
+    school_num = data.get("school_num")
+    if not school_num:
+        return send_error("Keine Schulnummer angegeben")
+    if school_num in VALID_SCHOOLS:
+        return send_error("Schule schon vorhanden")
+    display_name = data.get("display_name")
+    if not display_name:
+        return send_error("Kein Schulname angegeben")
+    username = data.get("username")
+    if not username:
+        return send_error("Kein Nutzername angegeben")
+    pw = data.get("pw")
+    if not pw:
+        return send_error("Kein Passwort angegeben")
+
+    candidate = SchoolCandidate("", school_num, username, pw)
+    if not candidate.school_exists:
+        return send_error("Schule existiert nicht")
+    if not candidate.is_valid:
+        return send_error("Nutzername oder Passwort falsch")
+
+    return send_success("Die Daten sind korrekt, wir werden nun innerhalb weniger Tage deine Schule hinzufügen.")
+
diff --git a/endpoints/authorization.py b/endpoints/authorization.py
index b0ca860..8729811 100644
--- a/endpoints/authorization.py
+++ b/endpoints/authorization.py
@@ -2,7 +2,6 @@
 from flask import Blueprint, request, session, Response
 from flask_login import login_required, current_user, login_user, logout_user
 
-import json
 import time
 from random import choice
 
diff --git a/test.py b/school_test.py
similarity index 56%
rename from test.py
rename to school_test.py
index 1a9f8db..ce78a30 100644
--- a/test.py
+++ b/school_test.py
@@ -10,7 +10,7 @@
 def match_status_code(code) -> Tuple[bool, bool]:
     if code == 200:
         return True, True
-    elif code == 401:
+    elif code == 401 or code == 403:
         return True, False
     elif code == 404:
         return False, False
@@ -18,11 +18,11 @@ def match_status_code(code) -> Tuple[bool, bool]:
         raise ValueError(f"status code unknown: {code}")
 
 
+# returns a dict with keys school nums and values urls
 def get_other_servers() -> Dict[str, str]:
     url = f"https://www.stundenplan24.de/extern/links24k.txt"
     username = os.getenv("LINKS24_USER")
     password = os.getenv("LINKS24_PASSWORD")
-    print(username, password)
     r = requests.get(url, auth=(username, password))
     return {elem.split("=")[0]: elem.split("=")[1].strip() for elem in r.text.split("\n")}
 
@@ -34,35 +34,47 @@ class SchoolCandidate:
     servers: Dict[str, str] = {}
     needs_password: bool = True
 
-    def __init__(self, abbreviation: str, school_num: str, username: str, password: str, test: bool = True):
+    def __init__(self, abbreviation: str, school_num: str, username: str, password: str, test: bool = True) -> None:
         self.abbreviation: str = abbreviation
         self.school_num: str = school_num
         self.username: str = username
         self.password: str = password
-        self.servers = get_other_servers()
+        self.servers = SERVERS
         self.test_url = self.servers[school_num] if self.school_num in self.servers else f"https://www.stundenplan24.de/{self.school_num}/mobil/"
         self.test() if test else ...
 
     def test(self) -> Tuple[bool, bool]:
-        # testing doesnw really work apparently
-        r = requests.get(self.test_url)
+        try:
+            r = requests.get(self.test_url)
+        except requests.exceptions.ConnectionError or requests.exceptions.SSLError:
+            return self.school_exists, self.is_valid
         self.school_exists, self.is_valid = match_status_code(r.status_code)
-        if self.school_exists:
+        if not self.school_exists:
+            return self.school_exists, self.is_valid
+        if self.is_valid:
             self.needs_password = False
             return self.school_exists, self.is_valid
-        r = requests.get(self.test_url, auth=(self.username, self.password))
+        try:
+            r = requests.get(self.test_url, auth=(self.username, self.password))
+        except requests.exceptions.ConnectionError or requests.exceptions.SSLError:
+            self.school_exists = False
+            return self.school_exists, self.is_valid
         self.school_exists, self.is_valid = match_status_code(r.status_code)
         return self.school_exists, self.is_valid
 
+    def __repr__(self) -> str:
+        return f"SchoolCandidate(abbreviation={self.abbreviation}, school_num={self.school_num}, username={self.username}, password={self.password}, test_url={self.test_url}, school_exists={self.school_exists}, is_valid={self.is_valid}, needs_password={self.needs_password})"
+
+
+SERVERS = get_other_servers()
+
+
+def test_other_servers():
+    for server in SERVERS:
+        i = SchoolCandidate("", server, "", "")
+
 
 if __name__ == "__main__":
-    servers = get_other_servers()
-    for server_id, server_link in servers.items():
-        print(server_id, server_link)
-        """i = SchoolCandidate(
-            "",
-            server_id,
-            "",
-            ""
-        )"""
-        #print(i.needs_password)
+    print(
+        SchoolCandidate("", "123456578", "schueler", "testpasswort")
+    )
diff --git a/utils.py b/utils.py
index 9626e4c..8d73d8d 100644
--- a/utils.py
+++ b/utils.py
@@ -9,8 +9,8 @@
 import contextlib
 import hashlib
 
-from flask import Flask, Response, jsonify, request
-from flask_login import UserMixin, current_user
+from flask import Flask, Response, jsonify
+from flask_login import UserMixin
 
 from dotenv import load_dotenv
 from discord_webhook import DiscordWebhook, DiscordEmbed
@@ -23,7 +23,7 @@
 db = pymongo.MongoClient(os.getenv("MONGO_URL") if os.getenv("MONGO_URL") else "", 27017).vplan
 users = db["users"]
 creds = db["creds"]
-schools = db["schools"]
+VALID_SCHOOLS = [elem["_id"] for elem in list(creds.find({}))]
 meta = db["meta"]
 
 
@@ -324,6 +324,7 @@ def add_cleaned_field(self, name: str, value: str, inline: bool = True) -> None:
 def update_database():
     add_database_icons()
     update_school_authorization_count()
+    VALID_SCHOOLS = [elem["_id"] for elem in list(creds.find({}))]
 
 
 @run_in_background
diff --git a/var.py b/var.py
index d024281..0463da4 100644
--- a/var.py
+++ b/var.py
@@ -1,9 +1,6 @@
-import os
 import re
-import json
 
 
-VALID_SCHOOLS = os.listdir(".cache")
 API_BASE_URL = "/api/v69.420/<school_num>"
 AUTH_PATH = "/auth"
 

From 94263f9753bc8b084e078a83e0926bc06325d587 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Tue, 3 Oct 2023 16:55:31 +0200
Subject: [PATCH 40/61] fix von dummheit

---
 utils.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils.py b/utils.py
index 8d73d8d..6ffd81d 100644
--- a/utils.py
+++ b/utils.py
@@ -2,6 +2,8 @@
 from pathlib import Path
 from typing import List
 
+import os
+import json
 import pymongo
 from bson import ObjectId
 from werkzeug.security import safe_join

From 9399898f4c1a92e1ca01fce30a9eaf64133dcb61 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Tue, 3 Oct 2023 16:58:59 +0200
Subject: [PATCH 41/61] nochmal

---
 server.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server.py b/server.py
index db83d73..14dbb97 100644
--- a/server.py
+++ b/server.py
@@ -2,6 +2,7 @@
 
 import time
 
+import os
 from flask import send_from_directory, Response, request
 from flask_login import LoginManager, current_user
 from flask_wtf.csrf import CSRFProtect, generate_csrf

From eb4c854a65fa93ef66070b3ff5e28f42e775a6af Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Tue, 3 Oct 2023 18:03:43 +0200
Subject: [PATCH 42/61] fix #82

---
 client/src/components/SchoolManager.svelte | 52 +++++++++++++++++++++-
 endpoints/api.py                           | 26 ++++++++---
 2 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/client/src/components/SchoolManager.svelte b/client/src/components/SchoolManager.svelte
index 3f61b58..3e55927 100644
--- a/client/src/components/SchoolManager.svelte
+++ b/client/src/components/SchoolManager.svelte
@@ -26,6 +26,12 @@
     let school_id_arr = [];
     let password_visible = false;
 
+    let school_add_visible = false;
+    let add_school_name = "";
+    let add_school_num = "";
+    let add_school_username = "";
+    let add_school_password = "";
+
     function isObjectInList(object, list) {
         return list.some(item => item.toString() === object.toString());
     }
@@ -113,7 +119,11 @@
     }
 
     function get_school_by_id(school_id) {
+        if (!school_id) {
+            return {};
+        }
         for (let school of schools) {
+            console.log(school);
             if (school.id === school_id.toString()) {
                 return school
             }
@@ -138,10 +148,36 @@
         ["Unautorisiert", unauthorized_schools]
     ];
     $: authorize_school_data = get_school_by_id(authorize_school_id);
+
+    function add_school() {
+        console.log(add_school_name, add_school_num, add_school_username, add_school_password);
+
+        let formData = new FormData();
+        formData.append('display_name', add_school_name);
+        formData.append('school_num', add_school_num);
+        formData.append('username', add_school_username);
+        formData.append('pw', add_school_password);
+        let tmp_api_base = `/api/v69.420/${authorize_school_id}`;
+        customFetch(`/api/v69.420/add_school`, {
+            method: 'POST',
+            body: formData
+        })
+            .then(data => {
+                notifications.success(data);
+                school_add_visible = false;
+                add_school_name = "";
+                add_school_num = "";
+                add_school_username = "";
+                add_school_password = "";
+            })
+            .catch(error => {
+                notifications.danger(error.message);
+            });
+    }
 </script>
 
 <main>
-    {#if !school_auth_visible}
+    {#if !school_auth_visible && !school_add_visible}
     <form transition:fly|local={{x: -600}} on:submit|preventDefault={() => {
             if (authorize_school_id) {
                 if(isObjectInList(authorize_school_id, authorized_school_ids) || is_admin) {
@@ -174,7 +210,7 @@
         }}>Schule autorisieren <span class="material-symbols-outlined">login</span></Button>
         {/if}
     </form>
-    {:else}
+    {:else if !school_add_visible}
     <form transition:fly|local={{x: 600}} on:submit|preventDefault={authorize_school}>
         <button on:click={() => {school_auth_visible = false;}} type="reset" id="back_button">
             <span class="material-symbols-outlined">keyboard_backspace</span>
@@ -200,7 +236,19 @@
         {/if}
         <Button type="submit" background="var(--accent-color)">Autorisieren</Button>
     </form>
+    {:else}
+        <form transition:fly|local={{x: 600}} on:submit|preventDefault={add_school}>
+            <button on:click={() => {school_add_visible = false;}} type="reset" id="back_button">
+                <span class="material-symbols-outlined">keyboard_backspace</span>
+            </button>
+            <label for="add_school_name">Name der Schule: (z.B. Max-Mustermann-Gymnasium Löbau)</label><input type="text" name="add_school_name" id="" bind:value={add_school_name}>
+            <label for="add_school_num">Schulnummer: (z.B. 10000000)</label><input type="text" name="add_school_num" id="" bind:value={add_school_num}>
+            <label for="add_school_username">Nutzername: (schueler/lehrer)</label><input type="text" name="add_school_username" id="" bind:value={add_school_username}>
+            <label for="add_school_password">Passwort:</label><input type="text" name="" id="add_school_password" bind:value={add_school_password}>
+            <Button type="submit" background="var(--accent-color)">Hinzufügen</Button>
+        </form>
     {/if}
+    <label for="add_toggle">Schule Hinzufügen?</label><input type="checkbox" name="add_toggle" id="" bind:checked={school_add_visible}>
 </main>
 
 <style lang="scss">
diff --git a/endpoints/api.py b/endpoints/api.py
index 3e4710c..3985953 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -231,23 +231,35 @@ def contact() -> Response:
 @api.route(f"/api/v69.420/add_school", methods=["POST"])
 @login_required
 def add_school() -> Response:
-    data = json.loads(request.data)
+    data = request.form
     school_num = data.get("school_num")
-    if not school_num:
+    if school_num is None:
         return send_error("Keine Schulnummer angegeben")
-    if school_num in VALID_SCHOOLS:
-        return send_error("Schule schon vorhanden")
+    # commented out so people can submit teacher passwords or new passwords
+    #if school_num in VALID_SCHOOLS:
+    #    return send_error("Schule schon vorhanden")
     display_name = data.get("display_name")
-    if not display_name:
+    if display_name is None:
         return send_error("Kein Schulname angegeben")
     username = data.get("username")
-    if not username:
+    if username is None:
         return send_error("Kein Nutzername angegeben")
     pw = data.get("pw")
-    if not pw:
+    if pw is None:
         return send_error("Kein Passwort angegeben")
+    if not school_num and not username and not pw:
+        return send_error("Bitte gib alle Daten an")
 
     candidate = SchoolCandidate("", school_num, username, pw)
+    embed = BetterEmbed(title="Neue Schulanfrage!", color="ffffff", inline=False)
+    embed.add_embed_field("Schulnummer:", school_num, inline=False)
+    embed.add_embed_field("Schulname:", display_name, inline=False)
+    embed.add_embed_field("Nutzername:", username, inline=False)
+    embed.add_cleaned_field("Passwort:", f"||```{pw}```||", inline=False)
+    embed.add_embed_field("Schule existiert:", str(candidate.school_exists), inline=False)
+    embed.add_embed_field("Daten korrekt:", str(candidate.is_valid), inline=False)
+    embed.add_embed_field("Benötigt Passwort:", str(candidate.needs_password), inline=False)
+    webhook_send("WEBHOOK_ADD_SCHOOL", embeds=[embed])
     if not candidate.school_exists:
         return send_error("Schule existiert nicht")
     if not candidate.is_valid:

From f7b0ff1a2cb56e03bfffddc3b58a62ad1ce39c38 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Tue, 3 Oct 2023 19:52:02 +0200
Subject: [PATCH 43/61] starting to implement #47

---
 backend/default_plan.py   | 53 +++++++++++++++++++++++++++++++++++++++
 backend/models.py         | 49 ++++++++++++++++++++++++++----------
 backend/plan_extractor.py |  8 +++---
 backend/plan_processor.py |  6 +++++
 4 files changed, 100 insertions(+), 16 deletions(-)
 create mode 100644 backend/default_plan.py

diff --git a/backend/default_plan.py b/backend/default_plan.py
new file mode 100644
index 0000000..7fb71a5
--- /dev/null
+++ b/backend/default_plan.py
@@ -0,0 +1,53 @@
+from __future__ import annotations
+
+import copy
+import dataclasses
+import typing
+
+from . import models
+
+
+@dataclasses.dataclass
+class DefaultPlanInfo:
+    unchanged_lessons: list[models.Lesson] = dataclasses.field(default_factory=list)
+    week: int | None = None
+
+    @classmethod
+    def from_lessons(cls, lessons: typing.Iterable[models.Lesson]) -> DefaultPlanInfo:
+        out = cls()
+
+        for lesson in lessons:
+            if len(lesson.parsed_info.paragraphs) != 0:
+                continue
+
+            if not lesson._is_scheduled or lesson.is_internal or lesson.subject_changed:
+                continue
+
+            lesson = copy.deepcopy(lesson)
+
+            if lesson.teacher_changed:
+                lesson.teachers = None
+
+            if lesson.room_changed:
+                lesson.rooms = None
+
+            if lesson.forms_changed:
+                lesson.forms = None
+                assert False, f"{cls.__name__}.from_lessons() only supports lessons from form plans."
+
+            out.unchanged_lessons.append(lesson)
+
+        return out
+
+    def serialize(self):
+        return {
+            "unchanged_lessons": [lesson.serialize() for lesson in self.unchanged_lessons],
+            "week": self.week
+        }
+
+    @classmethod
+    def deserialize(cls, data):
+        return cls(
+            unchanged_lessons=[models.Lesson.deserialize(lesson) for lesson in data["unchanged_lessons"]],
+            week=data["week"]
+        )
diff --git a/backend/models.py b/backend/models.py
index fae798d..045fb8b 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -86,24 +86,45 @@ def create_internal(cls, date: datetime.date, plan_type: typing.Literal["forms",
         )
 
     def serialize(self) -> dict:
+        assert len(self.parsed_info.paragraphs) == 0
         return {
             "periods": sorted(self.periods),
+            "begin": self.begin.strftime("%H:%M") if self.begin else None,
+            "end": self.end.strftime("%H:%M") if self.end else None,
             "forms": sorted(self.forms),
             "teachers": sorted(self.teachers) if self.teachers is not None else None,
             "rooms": sorted(self.rooms) if self.rooms is not None else None,
             "course": self.course,
-            "begin": self.begin.strftime("%H:%M") if self.begin else None,
-            "end": self.end.strftime("%H:%M") if self.end else None,
             "subject_changed": self.subject_changed,
             "teacher_changed": self.teacher_changed,
             "room_changed": self.room_changed,
+            "forms_changed": self.forms_changed,
             "takes_place": self.takes_place,
             "is_internal": self.is_internal,
-            "class_data": repr(self.class_),
-            "info": self.parsed_info.serialize(self._lesson_date),
-            "origin_plan_type": self._origin_plan_type,
+            "_origin_plan_lesson_id": self._origin_plan_lesson_id,
         }
 
+    @classmethod
+    def deserialize(cls, data):
+        return cls(
+            periods=set(data["periods"]),
+            begin=datetime.datetime.strptime(data["begin"], "%H:%M").time() if data["begin"] else None,
+            end=datetime.datetime.strptime(data["end"], "%H:%M").time() if data["end"] else None,
+            forms=set(data["forms"]) if data["forms"] is not None else None,
+            teachers=set(data["teachers"]) if data["teachers"] is not None else None,
+            rooms=set(data["rooms"]) if data["rooms"] is not None else None,
+            course=data["course"],
+            parsed_info=ParsedLessonInfo([]),
+            class_=None,
+            subject_changed=data["subject_changed"],
+            teacher_changed=data["teacher_changed"],
+            room_changed=data["room_changed"],
+            forms_changed=data["forms_changed"],
+            takes_place=data["takes_place"],
+            is_internal=data["is_internal"],
+            _origin_plan_lesson_id=data["_origin_plan_lesson_id"],
+        )
+
 
 @dataclasses.dataclass
 class ClassData(indiware_mobil.Class):
@@ -477,11 +498,11 @@ def _group_lesson_info(
         out.sort_original()
         return out
 
-    def group_blocks_and_lesson_info(self, plan_type: typing.Literal["forms", "teachers", "rooms"]) -> Lessons:
+    def group_blocks_and_lesson_info(self, origin_plan_type: typing.Literal["forms", "teachers", "rooms"]) -> Lessons:
         assert all(len(x.periods) <= 1 for x in self.lessons), \
             "Lessons must be ungrouped. (Must only have one period.)"
 
-        if plan_type == "forms":
+        if origin_plan_type == "forms":
             sort_key = lambda x: (
                 x.takes_place,
                 x.course or "",
@@ -493,7 +514,7 @@ def group_blocks_and_lesson_info(self, plan_type: typing.Literal["forms", "teach
                 x.forms or set(),
                 x.periods or set(),
             )
-        elif plan_type == "teachers":
+        elif origin_plan_type == "teachers":
             sort_key = lambda x: (
                 x.takes_place,
                 x.course or "",
@@ -504,7 +525,7 @@ def group_blocks_and_lesson_info(self, plan_type: typing.Literal["forms", "teach
                 x.teachers or set(),
                 x.periods or set(),
             )
-        elif plan_type == "rooms":
+        elif origin_plan_type == "rooms":
             sort_key = lambda x: (
                 x.takes_place,
                 x.course or "",
@@ -523,13 +544,15 @@ def group_blocks_and_lesson_info(self, plan_type: typing.Literal["forms", "teach
         grouped: list[Lesson] = []
 
         for lesson in sorted_lessons:
+            assert lesson._origin_plan_type == origin_plan_type
+
             for previous_lesson in grouped[-1:-4:-1]:
                 can_get_grouped = (
                     lesson.course == previous_lesson.course
                     and lesson.takes_place == previous_lesson.takes_place
                 )
 
-                for remaining_plan_value in {"forms", "teachers", "rooms"} - {plan_type}:
+                for remaining_plan_value in {"forms", "teachers", "rooms"} - {origin_plan_type}:
                     can_get_grouped &= (
                         getattr(lesson, remaining_plan_value) == getattr(previous_lesson, remaining_plan_value)
                     )
@@ -544,11 +567,11 @@ def group_blocks_and_lesson_info(self, plan_type: typing.Literal["forms", "teach
                 can_get_grouped &= previous_lesson_block == current_lesson_block
 
                 if can_get_grouped:
-                    if plan_type == "forms":
+                    if origin_plan_type == "forms":
                         previous_lesson.forms |= lesson.forms
-                    elif plan_type == "teachers":
+                    elif origin_plan_type == "teachers":
                         previous_lesson.teachers |= lesson.teachers
-                    elif plan_type == "rooms":
+                    elif origin_plan_type == "rooms":
                         previous_lesson.rooms |= lesson.rooms
                     else:
                         raise NotImplementedError
diff --git a/backend/plan_extractor.py b/backend/plan_extractor.py
index d814b0b..b2cf5ce 100644
--- a/backend/plan_extractor.py
+++ b/backend/plan_extractor.py
@@ -8,7 +8,7 @@
 
 from stundenplan24_py import indiware_mobil, substitution_plan
 
-from . import lesson_info
+from . import lesson_info, default_plan
 from .lesson_info import process_additional_info
 from .teacher import Teacher, Teachers
 from .models import Lesson, Lessons, Plan
@@ -178,6 +178,9 @@ def add_lessons_for_unavailable_from_subst_plan(self):
 
                 self.plan.lessons.lessons.append(lesson)
 
+    def default_plan(self) -> default_plan.DefaultPlanInfo:
+        return default_plan.DefaultPlanInfo.from_lessons(self.plan.lessons)
+
 
 class SubPlanExtractor:
     def __init__(self, forms_plan: Plan, plan_type: typing.Literal["forms", "rooms", "teachers"],
@@ -187,14 +190,13 @@ def __init__(self, forms_plan: Plan, plan_type: typing.Literal["forms", "rooms",
         self.forms_lessons_grouped = (
             forms_plan.lessons
             .filter_plan_type_messages(plan_type)
-            .group_blocks_and_lesson_info("forms")
+            .group_blocks_and_lesson_info(origin_plan_type="forms")
         )
 
         if self.plan_type in ("rooms", "teachers"):
             self.forms_lessons_grouped = self.forms_lessons_grouped.filter(lambda l: not l.is_internal)
 
         self.resolve_teachers_in_lesson_info(teacher_abbreviation_by_surname)
-
         self.extrapolate_lesson_times(self.forms_lessons_grouped)
 
     def resolve_teachers_in_lesson_info(self, teacher_abbreviation_by_surname: dict[str, str]):
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 04a3e0e..0ca99a5 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -85,6 +85,12 @@ def compute_plans(self, date: datetime.date, timestamp: datetime.datetime):
                 }, default=PlanLesson.serialize),
                 "plans.json"
             )
+            self.cache.store_plan_file(
+                date, timestamp,
+                json.dumps(students_plan_extractor.default_plan().serialize()),
+                "_default_plan.json"
+            )
+
             self.cache.store_plan_file(
                 date, timestamp,
                 json.dumps(students_plan_extractor.form_plan_extractor.grouped_form_plans(),

From 084c71ac0487707d078ec595c5539110396794b5 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Tue, 3 Oct 2023 20:07:33 +0200
Subject: [PATCH 44/61] fix #210, add support for teacher names with
 apostrophes, automatically convert any inside-word-placed acute or grave
 accents to apostrophes in lesson info

---
 backend/lesson_info.py    | 6 ++++--
 backend/plan_processor.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index 3f512c7..115ca9b 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -19,8 +19,9 @@
 
 
 class _InfoParsers:
-    _teacher_name = (r"[A-ZÄÖÜ][a-zäöüß]+(?: [A-ZÄÖÜ][a-zäöüß]+(?:-[A-ZÄÖÜ][a-zäöüß]+)?\.?)*"
-                     r"(?: [A-ZÄÖÜ][a-zäöüß]+(?:-[A-ZÄÖÜ][a-zäöüß]+)?)")
+    _teacher_name = (r"[A-ZÄÖÜ][a-zäöüß]+"
+                     r"(?: (?:[A-ZÄÖÜ]')?[A-ZÄÖÜ][a-zäöüß]+(?:-[A-ZÄÖÜ][a-zäöüß]+)?\.?)*"
+                     r"(?: (?:[A-ZÄÖÜ]')?[A-ZÄÖÜ][a-zäöüß]+(?:-[A-ZÄÖÜ][a-zäöüß]+)?)")
     _teacher_abbreviation = r"[A-ZÄÖÜ][A-ZÄÖÜa-zäöüß]{2,}"
     _teacher = fr"(?:{_teacher_name})|(?:{_teacher_abbreviation})"
 
@@ -507,6 +508,7 @@ def _parse_message(info: str, lesson: models.Lesson, plan_type: typing.Literal["
                    ) -> ParsedLessonInfoMessage:
     info = info.strip()
     info = re.sub(r"(?<=\w)/ ", "/", info)  # remove spaces after slashes like in G/ R/ W
+    info = re.sub(r"\b[´`]\b", "'", info)
 
     if plan_type == "forms":
         parsed_info, match = _parse_form_plan_message(info, lesson)
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 0ca99a5..752436f 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "91"
+    VERSION = "92"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger

From 506ef2194ab509bd6f715865c965fcc5c56d2053 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Tue, 3 Oct 2023 20:48:19 +0200
Subject: [PATCH 45/61] fix missing json import in authorization.py

---
 endpoints/authorization.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/endpoints/authorization.py b/endpoints/authorization.py
index 8729811..ed3e2fd 100644
--- a/endpoints/authorization.py
+++ b/endpoints/authorization.py
@@ -3,6 +3,7 @@
 from flask_login import login_required, current_user, login_user, logout_user
 
 import time
+import json
 from random import choice
 
 from werkzeug.security import generate_password_hash, check_password_hash

From 47298b88fd2ece1151363b3e345b291e6b041789 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Tue, 3 Oct 2023 20:55:42 +0200
Subject: [PATCH 46/61] add underscore to subject lesson info parsing allowed
 chars, also invalidate class data when lesson info contains MovedFrom

---
 backend/lesson_info.py    | 2 +-
 backend/models.py         | 2 +-
 backend/plan_processor.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index 115ca9b..4e187d0 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -27,7 +27,7 @@ class _InfoParsers:
 
     # teacher a,teacher b
     _teachers = fr"{_teacher}(?:, ?{_teacher})*"
-    _course = r"([A-Za-z0-9ÄÖÜäöüß\/-]{2,8})"  # maybe be more strict?
+    _course = r"([A-Za-z0-9ÄÖÜäöüß\/-_]{2,8})"  # maybe be more strict?
     _period = r"St\.(?P<periods>(?P<period_begin>\d{1,2})(?:-(?P<period_end>\d{1,2}))?)"
     _form = _parse_form_pattern.pattern
 
diff --git a/backend/models.py b/backend/models.py
index 045fb8b..c941839 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -678,7 +678,7 @@ def from_form_plan(cls, form_plan: indiware_mobil.IndiwareMobilPlan) -> Plan:
 
                 for paragraph in current_lesson.parsed_info.paragraphs:
                     for moved_to_message in paragraph.messages:
-                        if isinstance(moved_to_message.parsed, lesson_info.MovedTo):
+                        if isinstance(moved_to_message.parsed, (lesson_info.MovedTo, lesson_info.MovedFrom)):
                             # if lessons are moved, class data no longer represents the scheduled lesson
                             class_data = None
                             current_lesson.class_ = None
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 752436f..eda1e14 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "92"
+    VERSION = "93"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger

From e0addf528a24e69ce3a1650cd16604a3f2d5dfb1 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Tue, 3 Oct 2023 21:10:57 +0200
Subject: [PATCH 47/61] support nobility titles

---
 backend/lesson_info.py    | 1 +
 backend/plan_processor.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index 4e187d0..66d209d 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -21,6 +21,7 @@
 class _InfoParsers:
     _teacher_name = (r"[A-ZÄÖÜ][a-zäöüß]+"
                      r"(?: (?:[A-ZÄÖÜ]')?[A-ZÄÖÜ][a-zäöüß]+(?:-[A-ZÄÖÜ][a-zäöüß]+)?\.?)*"
+                     r"(?: van)?"
                      r"(?: (?:[A-ZÄÖÜ]')?[A-ZÄÖÜ][a-zäöüß]+(?:-[A-ZÄÖÜ][a-zäöüß]+)?)")
     _teacher_abbreviation = r"[A-ZÄÖÜ][A-ZÄÖÜa-zäöüß]{2,}"
     _teacher = fr"(?:{_teacher_name})|(?:{_teacher_abbreviation})"
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index eda1e14..40e132d 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "93"
+    VERSION = "94"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger

From 2856865a75c909b5f46b65f6f4bd5b183ce0a021 Mon Sep 17 00:00:00 2001
From: ArtrenH <79058115+ArtrenH@users.noreply.github.com>
Date: Wed, 4 Oct 2023 00:48:07 +0200
Subject: [PATCH 48/61] small enhancement

---
 endpoints/api.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/endpoints/api.py b/endpoints/api.py
index 3985953..33f8f4d 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -235,9 +235,6 @@ def add_school() -> Response:
     school_num = data.get("school_num")
     if school_num is None:
         return send_error("Keine Schulnummer angegeben")
-    # commented out so people can submit teacher passwords or new passwords
-    #if school_num in VALID_SCHOOLS:
-    #    return send_error("Schule schon vorhanden")
     display_name = data.get("display_name")
     if display_name is None:
         return send_error("Kein Schulname angegeben")
@@ -259,11 +256,15 @@ def add_school() -> Response:
     embed.add_embed_field("Schule existiert:", str(candidate.school_exists), inline=False)
     embed.add_embed_field("Daten korrekt:", str(candidate.is_valid), inline=False)
     embed.add_embed_field("Benötigt Passwort:", str(candidate.needs_password), inline=False)
+    if school_num in VALID_SCHOOLS:
+        embed.add_embed_field("Bemerkung:", "Schule schon vorhanden", inline=False)
     webhook_send("WEBHOOK_ADD_SCHOOL", embeds=[embed])
     if not candidate.school_exists:
         return send_error("Schule existiert nicht")
     if not candidate.is_valid:
         return send_error("Nutzername oder Passwort falsch")
 
+    if school_num in VALID_SCHOOLS:
+        return send_error("Schule schon bekannt, Daten trotzdem übermittelt.")
     return send_success("Die Daten sind korrekt, wir werden nun innerhalb weniger Tage deine Schule hinzufügen.")
 

From 90557f29e6ef5c63296db34a0ba8de0cde0f2293 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Wed, 4 Oct 2023 18:50:16 +0200
Subject: [PATCH 49/61] fix lesson grouping

---
 backend/models.py         | 25 ++++++++++++-------------
 backend/plan_processor.py |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/backend/models.py b/backend/models.py
index c941839..548e401 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -505,35 +505,34 @@ def group_blocks_and_lesson_info(self, origin_plan_type: typing.Literal["forms",
         if origin_plan_type == "forms":
             sort_key = lambda x: (
                 x.takes_place,
-                x.course or "",
-                x.teachers or set(),
-                x.rooms or set(),
+                x.course or x.class_opt.group or "",
+                tuple(x.rooms or set()),
+                tuple(x.teachers or set()),
                 x.parsed_info.lesson_group_sort_key(),
-                x.class_opt.group or "",
 
-                x.forms or set(),
-                x.periods or set(),
+                tuple(x.forms or set()),
+                tuple(x.periods or set()),
             )
         elif origin_plan_type == "teachers":
             sort_key = lambda x: (
                 x.takes_place,
                 x.course or "",
-                x.rooms or set(),
-                x.forms or set(),
+                tuple(x.rooms or set()),
+                tuple(x.forms or set()),
                 x.parsed_info.lesson_group_sort_key(),
 
-                x.teachers or set(),
-                x.periods or set(),
+                tuple(x.teachers or set()),
+                tuple(x.periods or set()),
             )
         elif origin_plan_type == "rooms":
             sort_key = lambda x: (
                 x.takes_place,
                 x.course or "",
-                x.teachers or set(),
-                x.forms or set(),
+                tuple(x.teachers or set()),
+                tuple(x.forms or set()),
                 x.parsed_info.lesson_group_sort_key(),
 
-                x.rooms or set(),
+                tuple(x.rooms or set()),
                 x.periods or set(),
             )
         else:
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 40e132d..fc83a28 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "94"
+    VERSION = "95"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger

From 6337d452007c49695d5bc3c75371185978480115 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Wed, 4 Oct 2023 19:03:22 +0200
Subject: [PATCH 50/61] support teacher names with multiple hyphens per name
 component

---
 backend/lesson_info.py    | 4 ++--
 backend/plan_processor.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index 66d209d..2f3ab58 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -20,9 +20,9 @@
 
 class _InfoParsers:
     _teacher_name = (r"[A-ZÄÖÜ][a-zäöüß]+"
-                     r"(?: (?:[A-ZÄÖÜ]')?[A-ZÄÖÜ][a-zäöüß]+(?:-[A-ZÄÖÜ][a-zäöüß]+)?\.?)*"
+                     r"(?: (?:[A-ZÄÖÜ]')?[A-ZÄÖÜ][a-zäöüß]+(?:-[A-ZÄÖÜ][a-zäöüß]+)*\.?)*"
                      r"(?: van)?"
-                     r"(?: (?:[A-ZÄÖÜ]')?[A-ZÄÖÜ][a-zäöüß]+(?:-[A-ZÄÖÜ][a-zäöüß]+)?)")
+                     r"(?: (?:[A-ZÄÖÜ]')?[A-ZÄÖÜ][a-zäöüß]+(?:-[A-ZÄÖÜ][a-zäöüß]+)*)")
     _teacher_abbreviation = r"[A-ZÄÖÜ][A-ZÄÖÜa-zäöüß]{2,}"
     _teacher = fr"(?:{_teacher_name})|(?:{_teacher_abbreviation})"
 
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index fc83a28..89a2476 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "95"
+    VERSION = "96"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger

From 05f6b41e1a42901af15f1fa7a0b02662c6191604 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Wed, 4 Oct 2023 19:08:44 +0200
Subject: [PATCH 51/61] parse "selbst." info message

---
 backend/lesson_info.py    | 2 +-
 backend/plan_processor.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index 2f3ab58..994773d 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -73,7 +73,7 @@ class _InfoParsers:
     # selbst. (v), Aufgaben stehen im LernSax, bitte zu Hause bearbeiten
     # selbst. (v), Aufgaben stehen im LernSax
     # selbst. (v), Aufgaben wurden erteilt, bitte zu Hause erledigen
-    independent = re.compile(rf'selbst\. \(.\)')
+    independent = re.compile(rf'selbst\.(?: \(.\))?')
 
     tasks_in_lernsax = re.compile(rf'Aufgaben stehen im LernSax')
     tasks_were_given = re.compile(rf'Aufgaben wurden erteilt')
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 89a2476..1a0259f 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "96"
+    VERSION = "97"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger

From 052400637df0172996bf2edc409d3837e6a96952 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Wed, 4 Oct 2023 19:46:18 +0200
Subject: [PATCH 52/61] fix additional info form parsing for thomas

---
 backend/lesson_info.py    | 7 ++++++-
 backend/plan_processor.py | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index 994773d..4905dbd 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -832,7 +832,12 @@ def validator(match: re.Match) -> list[LessonInfoTextSegment] | None:
                         form_match = existing_form
                         break
                 elif MajorMinorParsedForm == type(parsed_form) == type(existing_form):
-                    if existing_form[0].lower() == parsed_form[0].lower() and existing_form[2] == parsed_form[2]:
+                    try:
+                        is_match = int(existing_form[0]) == int(parsed_form[0].lower())
+                    except ValueError:
+                        is_match = existing_form[0].lower() == parsed_form[0].lower()
+
+                    if is_match and existing_form[2] == parsed_form[2]:
                         form_match = existing_form
                         break
 
diff --git a/backend/plan_processor.py b/backend/plan_processor.py
index 1a0259f..32c87d0 100644
--- a/backend/plan_processor.py
+++ b/backend/plan_processor.py
@@ -15,7 +15,7 @@
 
 
 class PlanProcessor:
-    VERSION = "97"
+    VERSION = "98"
 
     def __init__(self, cache: Cache, school_number: str, *, logger: logging.Logger):
         self._logger = logger

From 68051f79d3118837dcebde1d1d76ae102c08c7d2 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Wed, 4 Oct 2023 19:46:41 +0200
Subject: [PATCH 53/61] remove warning when teacher abbreviation is skipped

---
 backend/lesson_info.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index 4905dbd..8d5754f 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -702,8 +702,8 @@ def extract_teachers(lesson: models.Lesson, classes: dict[str, models.Class], *,
                 surname = next(iter(message.parsed._teachers))
                 course = message.parsed.course
 
+                # TODO: Better discrimination criteria between teacher surname and abbreviation
                 if len(surname.split()) == 1:
-                    logger.debug(f"Skipping teacher \"surname\" {surname!r}.")
                     continue
 
                 _class: dict[str, models.Class] = {

From 76670ddc7883582fa0741d70e10d9fe408f890e7 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sat, 7 Oct 2023 00:43:30 +0200
Subject: [PATCH 54/61] remove store_plan_file_link function

---
 backend/cache.py | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/backend/cache.py b/backend/cache.py
index 02421a6..f98fdd7 100644
--- a/backend/cache.py
+++ b/backend/cache.py
@@ -34,24 +34,6 @@ def remove_plan_file(self, day: datetime.date, timestamp: datetime.datetime | st
         path = self.get_plan_path(day, timestamp) / filename
         path.unlink(missing_ok=True)
 
-    def store_plan_file_link(
-        self,
-        day: datetime.date,
-        timestamp: datetime.datetime | str,
-        filename: str,
-        to_timestamp: datetime.datetime | str,
-        to_filename: str
-    ):
-        """Create a symlink to a plan file in the cache."""
-
-        path = self.get_plan_path(day, timestamp) / filename
-        to_path = self.get_plan_path(day, to_timestamp) / to_filename
-
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        path.unlink(missing_ok=True)
-        path.symlink_to(to_path)
-
     def get_plan_file(self,
                       day: datetime.date,
                       timestamp: datetime.datetime | str,

From 2c93ccd309e9d15851bd15b7aa21e14391c295d0 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sat, 7 Oct 2023 00:43:57 +0200
Subject: [PATCH 55/61] put alphanum forms in "Sonstige" category

---
 backend/vplan_utils.py | 12 ++++++++----
 client/src/App.svelte  |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/backend/vplan_utils.py b/backend/vplan_utils.py
index 7927b71..3591dd8 100644
--- a/backend/vplan_utils.py
+++ b/backend/vplan_utils.py
@@ -93,13 +93,17 @@ def form_sort_key(major: str | None):
         return float("inf"), 0, major
 
 
-def group_forms(forms: list[str]) -> dict[str, list[str]]:
+def group_forms(forms: list[str]) -> dict[str | None, list[str]]:
     groups: dict[str | None, list[str]] = defaultdict(list)
 
-    for form in forms:
-        group_name, *_ = ParsedForm.from_str(form)
+    for form_str in forms:
+        form = ParsedForm.from_str(form_str)
+        if isinstance(form, MajorMinorParsedForm):
+            group_name = form.major
+        else:
+            group_name = None
 
-        groups[group_name].append(form)
+        groups[group_name].append(form_str)
 
     return {k: v for k, v in sorted(groups.items(), key=lambda x: form_sort_key(x[0]))}
 
diff --git a/client/src/App.svelte b/client/src/App.svelte
index 7f228af..7e4c3c8 100644
--- a/client/src/App.svelte
+++ b/client/src/App.svelte
@@ -198,7 +198,7 @@
             for(let form of forms) {
                 converted_forms.push({"id": form, "display_name": form});
             }
-            form_arr.push([form_group, converted_forms]);
+            form_arr.push([form_group !== "null" ? form_group : "Sonstige", converted_forms]);
         }
     }
 

From b159dc7e1ab421439c8a10dd6523b8ea3ee9b6db Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sat, 7 Oct 2023 00:46:05 +0200
Subject: [PATCH 56/61] collapse multiple spaces in additional info

---
 backend/lesson_info.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/lesson_info.py b/backend/lesson_info.py
index 8d5754f..34b9649 100644
--- a/backend/lesson_info.py
+++ b/backend/lesson_info.py
@@ -767,7 +767,8 @@ def process_additional_info_line(text: str, parsed_existing_forms: list[ParsedFo
         return []
     # TODO: Dates, Rooms
     # remove spaces after slashes like in 5/ 3
-    text = re.sub(r"(?<=\w)/ {1,3}", "/", text.strip())
+    text = re.sub(r"\b/ {1,3}\b", "/", text.strip())
+    text = re.sub(r"\b {1,3}\b", " ", text.strip())
 
     funcs = (
         lambda s: add_fuzzy_teacher_links(s, teacher_abbreviation_by_surname, date),

From c57e32f88695d887a6c027fc397b71416cfec934 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sat, 7 Oct 2023 00:47:34 +0200
Subject: [PATCH 57/61] fix
 PlanExtractor.add_lessons_for_unavailable_from_subst_plan

---
 backend/models.py         | 8 ++++----
 backend/plan_extractor.py | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/models.py b/backend/models.py
index 548e401..73f65dd 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -370,6 +370,7 @@ def _to_plan_lessons(lessons: list[Lesson], plan_type: typing.Literal["forms", "
             l.course if l.course else "",
         ))
 
+        # TODO: potentially multiple NTP lessons per TPL lesson bc they get grouped
         for taking_place_lesson in lessons:
             if not taking_place_lesson.takes_place:
                 continue
@@ -386,9 +387,9 @@ def _to_plan_lessons(lessons: list[Lesson], plan_type: typing.Literal["forms", "
                     # @formatter:off
                     is_match = (
                         (taking_place_lesson.course != not_taking_place_lesson.course) in ((True, False) if taking_place_lesson._origin_plan_type != plan_type and taking_place_lesson.subject_changed else (taking_place_lesson.subject_changed,))
-                        and (True if taking_place_lesson._origin_plan_type != plan_type and taking_place_lesson.teacher_changed else (not taking_place_lesson.teachers.issuperset(not_taking_place_lesson.teachers or set())) == taking_place_lesson.teacher_changed)
-                        and (True if taking_place_lesson._origin_plan_type != plan_type and taking_place_lesson.room_changed else (not taking_place_lesson.rooms.issuperset(not_taking_place_lesson.rooms or set())) == taking_place_lesson.room_changed)
-                        and (True if taking_place_lesson._origin_plan_type != plan_type and taking_place_lesson.forms_changed else (not taking_place_lesson.forms.issuperset(not_taking_place_lesson.forms or set())) == taking_place_lesson.forms_changed)
+                        and (True if taking_place_lesson.teachers is None or taking_place_lesson._origin_plan_type != plan_type and taking_place_lesson.teacher_changed else (not taking_place_lesson.teachers.issuperset(not_taking_place_lesson.teachers or set())) == taking_place_lesson.teacher_changed)
+                        and (True if taking_place_lesson.rooms is None or taking_place_lesson._origin_plan_type != plan_type and taking_place_lesson.room_changed else (not taking_place_lesson.rooms.issuperset(not_taking_place_lesson.rooms or set())) == taking_place_lesson.room_changed)
+                        and (True if taking_place_lesson.forms is None or taking_place_lesson._origin_plan_type != plan_type and taking_place_lesson.forms_changed else (not taking_place_lesson.forms.issuperset(not_taking_place_lesson.forms or set())) == taking_place_lesson.forms_changed)
                     )
                     # @formatter:on
 
@@ -418,7 +419,6 @@ def _to_plan_lessons(lessons: list[Lesson], plan_type: typing.Literal["forms", "
 
     def to_plan_lessons(self, plan_type: typing.Literal["forms", "teachers", "rooms"], plan_value: set[str]
                         ) -> list[PlanLesson]:
-
         lessons_by_periods: dict[frozenset[int], list[Lesson]] = defaultdict(list)
         for lesson in self:
             lessons_by_periods[frozenset(lesson.periods)].append(lesson)
diff --git a/backend/plan_extractor.py b/backend/plan_extractor.py
index b2cf5ce..0a1b350 100644
--- a/backend/plan_extractor.py
+++ b/backend/plan_extractor.py
@@ -147,7 +147,7 @@ def add_lessons_for_unavailable_from_subst_plan(self):
                 info = f"{teacher_name}{' den ganzen Tag' if not periods else ''} abwesend laut Vertretungsplan"
                 lesson = Lesson.create_internal(self.plan.indiware_plan.date)
                 lesson.periods = {period}
-                lesson.current_teachers = {teacher_abbreviation}
+                lesson.teachers = {teacher_abbreviation}
                 lesson.info = info
                 lesson.parsed_info = lesson_info.create_literal_parsed_info(info)
                 self.plan.lessons.lessons.append(lesson)
@@ -159,8 +159,8 @@ def add_lessons_for_unavailable_from_subst_plan(self):
                 info = f"Raum {room}{' den ganzen Tag' if not periods else ''} nicht verfügbar laut Vertretungsplan"
                 lesson = Lesson.create_internal(self.plan.indiware_plan.date)
                 lesson.periods = {period}
-                lesson.current_rooms = {room_str}
-                lesson.current_course = "Belegt"
+                lesson.rooms = {room_str}
+                lesson.course = "Belegt"
                 lesson.info = info
                 lesson.parsed_info = lesson_info.create_literal_parsed_info(info)
                 self.plan.lessons.lessons.append(lesson)
@@ -172,7 +172,7 @@ def add_lessons_for_unavailable_from_subst_plan(self):
                 info = f"Klasse {form}{' den ganzen Tag' if not periods else ''} abwesend laut Vertretungsplan"
                 lesson = Lesson.create_internal(self.plan.indiware_plan.date)
                 lesson.periods = {period}
-                lesson.current_forms = {form}
+                lesson.forms = {form}
                 lesson.info = info
                 lesson.parsed_info = lesson_info.create_literal_parsed_info(info)
 

From 9593b4067b7c9bbf68e5f85c42a731517a29d942 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sat, 7 Oct 2023 00:49:54 +0200
Subject: [PATCH 58/61] refactor Lessons.group_by

---
 backend/models.py | 52 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/backend/models.py b/backend/models.py
index 73f65dd..ac242f1 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -321,28 +321,53 @@ def create(cls, taking_place_lesson: Lesson | None, not_taking_place_lesson: Les
 
 @dataclasses.dataclass
 class Lessons:
-    lessons: list[Lesson]
+    lessons: list[Lesson] = dataclasses.field(default_factory=list)
 
-    def group_by(self, *attributes: str, include_none: bool = False) -> dict[str, Lessons]:
-        grouped_i = defaultdict(set)
+    _T = typing.TypeVar("_T")
+
+    def group_by_key(self, key: typing.Callable[[Lesson], typing.Iterable[_T]]) -> dict[_T, Lessons]:
+        lesson_i_by_category = defaultdict(set)
 
         for lesson_i, lesson in enumerate(self.lessons):
+            for category in key(lesson):
+                lesson_i_by_category[category].add(lesson_i)
+
+        return {category: Lessons([self.lessons[i] for i in indices])
+                for category, indices in lesson_i_by_category.items()}
+
+    @typing.overload
+    def group_by(self, *attributes: tuple[str, ...], include_none: bool = False) -> dict[tuple[typing.Any, ...], Lessons]:
+        ...
+
+    def group_by(self, *attributes: str, include_none: bool = False) -> dict[typing.Any, Lessons]:
+        def key(lesson: Lesson) -> list:
+            out = []
             for attribute in attributes:
-                value = getattr(lesson, attribute)
+                if isinstance(attribute, tuple):
+                    category = []
+                    for attr in attribute:
+                        value = getattr(lesson, attr)
 
-                if not include_none and value is None:
-                    continue
+                        if isinstance(value, (list, set)):
+                            value = tuple(value)
 
-                if not isinstance(value, (list, set)):
-                    value = [value]
+                        category.append(value)
 
-                for element in value:
-                    grouped_i[element].add(lesson_i)
+                    out.append(tuple(category))
+                else:
+                    value = getattr(lesson, attribute)
 
-        grouped = {attribute: [self.lessons[i] for i in indices] for attribute, indices in grouped_i.items()}
+                    if not include_none and value is None:
+                        continue
 
-        return {attribute: Lessons(sorted(lessons, key=lambda x: list(x.periods)[0]))
-                for attribute, lessons in grouped.items()}
+                    if not isinstance(value, (list, set)):
+                        value = [value]
+
+                    out += value
+
+            return out
+
+        return self.group_by_key(key=key)
 
     @staticmethod
     def _to_plan_lessons(lessons: list[Lesson], plan_type: typing.Literal["forms", "teachers", "rooms"],
@@ -574,6 +599,7 @@ def group_blocks_and_lesson_info(self, origin_plan_type: typing.Literal["forms",
                         previous_lesson.rooms |= lesson.rooms
                     else:
                         raise NotImplementedError
+
                     previous_lesson.parsed_info = grouped_additional_info
                     previous_lesson.periods |= lesson.periods
                     previous_lesson.begin = min(filter(lambda x: x, (previous_lesson.begin, lesson.begin)),

From b2b1f848f8e29de0df1e9e2bb8ba09ae1b6dd5a3 Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sat, 7 Oct 2023 00:50:05 +0200
Subject: [PATCH 59/61] simplify code

---
 backend/load_plans.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/load_plans.py b/backend/load_plans.py
index 564f3f0..26b777b 100644
--- a/backend/load_plans.py
+++ b/backend/load_plans.py
@@ -83,7 +83,7 @@ async def get_clients(session: aiohttp.ClientSession | None = None,
         # create crawler
         p = PlanCrawler(plan_downloader, plan_processor)
 
-        clients |= {school_name: p}
+        clients[school_name] = p
 
     return clients
 

From 414136a869e075b06a67129fb943a3e831a4a56c Mon Sep 17 00:00:00 2001
From: Belissimo_T <bela.tollking@gmail.com>
Date: Sat, 7 Oct 2023 00:51:58 +0200
Subject: [PATCH 60/61] bump stundenplan24-wrapper version

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index db144be..9ab51e7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ Flask-WTF~=1.1.1
 Flask-Compress~=1.13
 pymongo~=4.3.3
 python-dotenv~=1.0.0
-stundenplan24-wrapper@ git+https://github.com/Belissimo-T/stundenplan24-wrapper@43da4688
+stundenplan24-wrapper@ git+https://github.com/Belissimo-T/stundenplan24-wrapper@63cf2049
 Werkzeug~=2.3.6
 discord-webhook~=1.3.0
 brotlicffi~=1.1.0.0
\ No newline at end of file

From 1dac12e0e602b2f1927825f34efa05e83b52ed8b Mon Sep 17 00:00:00 2001
From: OfficialFreak <npfreak@t-online.de>
Date: Sun, 15 Oct 2023 21:20:15 +0200
Subject: [PATCH 61/61] Fixed Layout Breaking

---
 client/src/components/Plan.svelte | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/client/src/components/Plan.svelte b/client/src/components/Plan.svelte
index 8a04618..75cd4ae 100644
--- a/client/src/components/Plan.svelte
+++ b/client/src/components/Plan.svelte
@@ -386,7 +386,7 @@
                                         </Dropdown>
                                     </div>
                                 {:else}
-                                    <button class="no-btn-visuals">{text_segment.text}</button>
+                                    {text_segment.text}
                                 {/if}
                             {/each}
                         </div>
@@ -405,11 +405,11 @@
 </div>
 
 <style lang="scss">
-    .inline-wrapper {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        row-gap: .1em;
+    .inline-wrapper > * {
+        font-size: inherit;
+        color: var(--text-color);
+        white-space: pre-wrap;
+        word-break: break-word;
     }
 
     .info-spacer {
@@ -488,10 +488,6 @@
         padding: 0;
         margin: 0;
         text-align: start;
-        font-size: inherit;
-        color: var(--text-color);
-        white-space: pre;
-        word-break: break-all;
     }
 
     .clickable {