From 9ef5a15925914f35b6f2567db0bc688070cdf7dd Mon Sep 17 00:00:00 2001 From: Belissimo_T Date: Sat, 23 Mar 2024 23:29:14 +0100 Subject: [PATCH 1/2] fill negative horizontal space in week plan --- client/src/components/Weekplan/Day.svelte | 1 + client/src/components/Weekplan/Lesson.svelte | 1 + 2 files changed, 2 insertions(+) diff --git a/client/src/components/Weekplan/Day.svelte b/client/src/components/Weekplan/Day.svelte index 7ad3f07..1488a5e 100644 --- a/client/src/components/Weekplan/Day.svelte +++ b/client/src/components/Weekplan/Day.svelte @@ -424,6 +424,7 @@ gap: .4rem; padding: .2rem; box-sizing: border-box; + flex: 1 } .lessons-container { diff --git a/client/src/components/Weekplan/Lesson.svelte b/client/src/components/Weekplan/Lesson.svelte index f0ed15d..bd9602a 100644 --- a/client/src/components/Weekplan/Lesson.svelte +++ b/client/src/components/Weekplan/Lesson.svelte @@ -352,6 +352,7 @@ padding: .2rem .4rem; box-sizing: border-box; font-size: var(--card-font-size); + flex: 1; &::before { content: ""; From f13f383317b55f71e12504124db4d278947ab63c Mon Sep 17 00:00:00 2001 From: OfficialBrot <36410565+OfficialFreak@users.noreply.github.com> Date: Sun, 24 Mar 2024 15:15:45 +0100 Subject: [PATCH 2/2] Made previous commit a setting (+fix) --- client/src/components/Settings.svelte | 1 + client/src/components/Weekplan/Day.svelte | 13 ++++++++++--- client/src/components/Weekplan/Lesson.svelte | 7 +++++-- user_settings.py | 6 +++++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/client/src/components/Settings.svelte b/client/src/components/Settings.svelte index 9bf8fc9..333e571 100644 --- a/client/src/components/Settings.svelte +++ b/client/src/components/Settings.svelte @@ -85,6 +85,7 @@ Ausfallfarbe Externe Unterrichtszeiten Ausgefüllte Buttons (Bei Änderungen / Ausfall) + Unterrichtsstunden füllen die komplette Breite beim Wochenplan Regenbogen 🌈

Nerd Section

Planversion auswählbar machen diff --git a/client/src/components/Weekplan/Day.svelte b/client/src/components/Weekplan/Day.svelte index 1488a5e..3a656a7 100644 --- a/client/src/components/Weekplan/Day.svelte +++ b/client/src/components/Weekplan/Day.svelte @@ -233,14 +233,14 @@ {#each {length: block_count} as _, i}
{#if lessons[i][0].length > 0} -
+
{#each lessons[i][0] as lesson} {/each}
{/if} {#if lessons[i][1].length > 0 || lessons[i][2].length > 0} -
+
{#each lessons[i][1] as lesson} @@ -424,7 +424,10 @@ gap: .4rem; padding: .2rem; box-sizing: border-box; - flex: 1 + + &.filled_in_weekplan { + flex: 1 + } } .lessons-container { @@ -432,6 +435,10 @@ display: flex; flex-direction: column; + &.filled_in_weekplan { + flex: 1 + } + .lesson { height: var(--lesson-height); gap: .4rem; diff --git a/client/src/components/Weekplan/Lesson.svelte b/client/src/components/Weekplan/Lesson.svelte index bd9602a..e0b84d4 100644 --- a/client/src/components/Weekplan/Lesson.svelte +++ b/client/src/components/Weekplan/Lesson.svelte @@ -26,7 +26,7 @@ $: forms_changed = lesson.forms_changed && lesson.takes_place && !lesson.is_unplanned; -
+
{#if (lesson.info.length > 0) || (plan_type === "forms" && (forms.length > 1)) || (plan_type === "teachers" && (teachers.length > 1)) || (plan_type === "rooms" && (rooms.length > 1))}