From f35d29f56c1eb715cc66514b4c0d0803938c70b9 Mon Sep 17 00:00:00 2001 From: Zan <62830223+Zan1456@users.noreply.github.com> Date: Mon, 12 Jan 2026 20:09:41 +0100 Subject: [PATCH] fix custom homework --- timetable/timetable.js | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/timetable/timetable.js b/timetable/timetable.js index 94a4519..fcd57b5 100644 --- a/timetable/timetable.js +++ b/timetable/timetable.js @@ -160,7 +160,7 @@ } function getLessonKey(lesson) { - return `${lesson.subject}_${lesson.startTime}_${lesson.day}`; + return `${lesson.subject}_${lesson.startTime}_${lesson.date}`; } async function updateHomeworkIconsFromCookie() { @@ -410,6 +410,7 @@ originalTeacher: "", room: "", day: dayIndex, + date: weekDates[dayIndex]?.fullDate || eventDate.toISOString().split('T')[0], isSubstituted: false, isCancelled: false, hasHomework: false, @@ -446,9 +447,9 @@ "Ismeretlen tantárgy"; if (startTimeStr && subject) { - const isCancelled = event.isElmaradt || event.Elmaradt || event.cancelled || event.isCancelled || + const isCancelled = event.isElmaradt || event.Elmaradt || event.cancelled || event.isCancelled || event.oraType === 6 || (event.title && event.title.toLowerCase().includes('elmarad')); - + const lesson = { startTime: startTimeStr, endTime: endTimeStr, @@ -457,14 +458,15 @@ originalTeacher: event.helyettesitoId ? teacher : "", room: room, day: dayIndex, + date: weekDates[dayIndex]?.fullDate || eventDate.toISOString().split('T')[0], isSubstituted: !!event.helyettesitoId, isCancelled: isCancelled, hasHomework: event.hasHaziFeladat || false, testInfo: event.hasBejelentettSzamonkeres ? event.Tema || LanguageManager.t("timetable.test_indicator") : "", - testId: event.hasBejelentettSzamonkeres && event.BejelentettSzamonkeresIdList && event.BejelentettSzamonkeresIdList.length > 0 - ? event.BejelentettSzamonkeresIdList[0] + testId: event.hasBejelentettSzamonkeres && event.BejelentettSzamonkeresIdList && event.BejelentettSzamonkeresIdList.length > 0 + ? event.BejelentettSzamonkeresIdList[0] : null, testDetails: "", homeworkDetails: "", @@ -619,11 +621,15 @@ ${ (() => { - const lessonKey = `${lesson.subject}_${lesson.startTime}_${lesson.day}`; - const hasCustomHomework = customHomework[lessonKey] && customHomework[lessonKey].length > 0; - const hasCustomTests = customTests[lessonKey] && customTests[lessonKey].length > 0; + const lessonKey = `${lesson.subject}_${lesson.startTime}_${lesson.date}`; + const customHomeworkItems = customHomework[lessonKey] || []; + const customTestItems = customTests[lessonKey] || []; + const hasCustomHomework = customHomeworkItems.length > 0; + const hasCustomTests = customTestItems.length > 0; + const allCustomHomeworkCompleted = hasCustomHomework && customHomeworkItems.every(hw => hw.completed); + const allCustomTestsCompleted = hasCustomTests && customTestItems.every(test => test.completed); const hasAnyIndicators = lesson.hasHomework || lesson.testInfo || hasCustomHomework || hasCustomTests; - + return hasAnyIndicators ? `