From 2483dfd9e5746f091d2d8cf2434494f02ca37e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20=C5=A0tamcar?= <filip.stamcar@hotmail.com>
Date: Fri, 27 Sep 2024 21:11:08 +0200
Subject: [PATCH] Make current date and time overlay reactive

---
 website/src/components/TimetableDisplay.vue | 19 +++++++++++++------
 website/src/utils/days.ts                   | 11 +++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/website/src/components/TimetableDisplay.vue b/website/src/components/TimetableDisplay.vue
index 10749bb..715fa36 100644
--- a/website/src/components/TimetableDisplay.vue
+++ b/website/src/components/TimetableDisplay.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
+import { useIntervalFn } from '@vueuse/core'
 import { storeToRefs } from 'pinia'
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 
 import TimetableEmptyClassrooms from '@/components/TimetableEmptyClassrooms.vue'
 import TimetableLesson from '@/components/TimetableLesson.vue'
 import { useSessionStore } from '@/stores/session'
 import { EntityType, useSettingsStore } from '@/stores/settings'
 import { type MergedLesson, useTimetableStore } from '@/stores/timetable'
-import { getCurrentDay } from '@/utils/days'
+import { getCurrentDay, getIsWeekend } from '@/utils/days'
 import { localizedWeekdays } from '@/utils/localization'
 import { getCurrentTime, lessonTimes } from '@/utils/times'
 
@@ -25,9 +26,15 @@ const { lessons } = storeToRefs(useTimetableStore())
 const { showHoursInTimetable, highlightCurrentTime, enableLessonDetails } =
   storeToRefs(useSettingsStore())
 
-const isWeekend = [0, 6].includes(new Date().getDay())
-const currentDay = getCurrentDay()
-const currentTime = getCurrentTime()
+const isWeekend = ref(getIsWeekend())
+const currentDay = ref(getCurrentDay())
+const currentTime = ref(getCurrentTime())
+
+useIntervalFn(() => {
+  isWeekend.value = getIsWeekend()
+  currentDay.value = getCurrentDay()
+  currentTime.value = getCurrentTime()
+}, 30000)
 
 /**
  * Determines the range of lesson times that need to be displayed in the timetable.
@@ -48,7 +55,7 @@ function lessonStyles(dayIndex: number, timeIndex: number) {
   // prettier-ignore
   return {
     'bg-surface-highlighted': lessons.value[timeIndex][dayIndex]?.find(lesson => lesson.isSubstitution),
-    'current-time': highlightCurrentTime.value && !isWeekend && dayIndex === currentDay && timeIndex === currentTime,
+    'current-time': highlightCurrentTime.value && !isWeekend.value && dayIndex === currentDay.value && timeIndex === currentTime.value,
   }
 }
 
diff --git a/website/src/utils/days.ts b/website/src/utils/days.ts
index 406f06a..9e1ae74 100644
--- a/website/src/utils/days.ts
+++ b/website/src/utils/days.ts
@@ -22,6 +22,13 @@ export function getCurrentDay(): number {
   return currentDay - 1
 }
 
+/**
+ * Returns whether it is currently a weekend.
+ */
+export function getIsWeekend(): boolean {
+  return [0, 6].includes(new Date().getDay())
+}
+
 /**
  * Returns the weekdays of the week of the given date.
  *
@@ -54,5 +61,9 @@ export function getWeekdays(date: Date): Date[] {
  * Returns the ISO date string of the given date.
  */
 export function getISODate(date: Date): string {
+  // Make sure the date is UTC midnight, otherwise, conversion to ISO may be wrong
+  date = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()))
+
+  // Convert the date into ISO format and return the date part
   return date.toISOString().split('T')[0]
 }