chore: Info-Blöcke werden pro Tag zusammengefasst (#293)

* fixed * fixed
Vertretungsapp · Sep 8, 2024 · 76a1c4f · 76a1c4f
1 parent 559f5f9
commit 76a1c4f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/src/lib/cache/cacheHelper.ts b/src/lib/cache/cacheHelper.ts
@@ -91,18 +91,16 @@ export function getAllTeachers(credentials: Credentials): string[] {
 	return getAllEntities(credentials, PlanTypePlural.TEACHER);
 }
 
-export function getAllInfos(credentials: Credentials): Array<{ info: string; date: Date }> {
+export function getAllInfos(credentials: Credentials): { infos: string[]; date: Date }[] {
 	const plans = getPlans(credentials.schoolnumber);
-	const infos: Array<{ info: string; date: Date }> = [];
+	const information: Array<{ infos: string[]; date: Date }> = [];
 	plans.forEach((plan) => {
 		if (plan.info) {
-			plan.info.forEach((info) => {
-				infos.push({ info, date: new Date(plan.date) });
-			});
+			information.push({ infos: plan.info, date: new Date(plan.date) });
 		}
 	});
-	infos.sort((a, b) => a.date.getTime() - b.date.getTime());
-	return infos.filter((info) => info.date.getTime() >= new Date().setHours(0, 0, 0, 0));
+	information.sort((a, b) => a.date.getTime() - b.date.getTime());
+	return information.filter((info) => info.date.getTime() >= new Date().setHours(0, 0, 0, 0));
 }
 
 function isLessonTimetableValid(lesson: PlannedLesson): boolean {

diff --git a/src/lib/components/favorites/NextLessonWidget.svelte b/src/lib/components/favorites/NextLessonWidget.svelte
@@ -40,7 +40,7 @@
 
 {#if primary}
 	<a href={getHrefLink(primary.name, primary.type)}>
-		<div class="max-h-[20%] space-y-2 overflow-y-auto">
+		<div class="max-h-[30%] space-y-2 overflow-y-auto">
 			{#if lessons.length !== 0}
 				{#each lessons as lesson}
 					{#key lesson.id}

diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
@@ -49,25 +49,26 @@
 
 <p>{greeting}</p>
 
-<div class="py-4"></div>
+<div class="py-5"></div>
 
 {#if data.infos.length > 0}
 	<h3>Informationen</h3>
-	<div class="max-h-[40%] overflow-y-auto">
+	<div class="max-h-[25%] overflow-y-auto">
 		{#each data.infos as info}
 			<div class="bg-display mb-2 rounded-lg p-4">
-				<p class="text-xs font-bold">{info.date.toLocaleDateString()}</p>
-				<p>{info.info}</p>
+				<p class="text-sm font-bold">{info.date.toLocaleDateString()}</p>
+				<!-- eslint-disable-next-line svelte/no-at-html-tags	-->
+				<p class="">{@html info.infos.join('<br>')}</p>
 			</div>
 		{/each}
 	</div>
 
-	<div class="py-4"></div>
+	<div class="py-5"></div>
 {/if}
 
 <NextLessonWidget primary={data.primaryFavorite} favorites={data.favorites} />
 
-<div class="py-4"></div>
+<div class="py-5"></div>
 
 <h3>Deine Favoriten</h3>
 <FavoritesDisplay favorites={data.favorites} />