Merge branch 'dev' of https://github.com/probablyjassin/studenplancam…

…pusdual into dev
probablyjassin · Oct 14, 2024 · f93b54b · f93b54b
2 parents b54838c + a6171e4
commit f93b54b
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/pages/stundenplan.vue b/pages/stundenplan.vue
@@ -9,7 +9,8 @@
 			</p>
 			<span class="mb-4 flex text-center items-center space-x-4">
 				<UPagination v-model="page" :total="data.length" />
-				<UButton 
+				<UButton
+					v-if="Object.keys(groupedByDay).indexOf(today.toString()) !== -1"
 					:class="{ 'opacity-0': page == Object.keys(groupedByDay).indexOf(today.toString())+1 }"
 					class="py-2"
 					@click="page = Object.keys(groupedByDay).indexOf(today.toString())+1">
@@ -36,7 +37,17 @@
 	const schedule = computed(() => Object.values(groupedByDay.value));
 
 	watch(groupedByDay.value, (newVal) => {
-		page.value = Object.keys(newVal).indexOf(today.toString())+1;
+		const todayIndex = Object.keys(newVal).indexOf(today.toString());
+		if (todayIndex !== -1) {
+			page.value = todayIndex + 1;
+		} else {
+			const futureDates = Object.keys(newVal).filter(date => Number(date) > today);
+			if (futureDates.length > 0) {
+				page.value = Object.keys(newVal).indexOf(futureDates[0]) + 1;
+			} else {
+				page.value = 1;
+			}
+		}
 	});
 
 	onMounted(async () => {