diff --git a/timetable/timetable.js b/timetable/timetable.js index fcd57b5..5707a9c 100644 --- a/timetable/timetable.js +++ b/timetable/timetable.js @@ -506,26 +506,6 @@ return timeA - timeB; }, ); - - const timeDurations = {}; - times.forEach(time => { - const lessonsAtTime = regularLessons.filter(l => l.startTime === time); - let maxDuration = 45; - - lessonsAtTime.forEach(lesson => { - if (lesson.endTime) { - const startMinutes = helper.convertTimeToMinutes(lesson.startTime); - const endMinutes = helper.convertTimeToMinutes(lesson.endTime); - const duration = endMinutes - startMinutes; - if (duration > maxDuration) { - maxDuration = duration; - } - } - }); - - timeDurations[time] = maxDuration; - }); - const days = [ LanguageManager.t("timetable.monday"), LanguageManager.t("timetable.tuesday"), @@ -583,27 +563,24 @@ return lastTime; }); - const duration = timeDurations[time] || 45; - const slotHeight = Math.max(84, (duration / 45) * 100); - return ` -
${time}
+
${time}
${Array(5) .fill() .map((_, dayIndex) => { const dayLessons = regularLessons.filter( (l) => l.startTime === time && l.day === dayIndex, ); - + const lastLessonTime = lastLessonTimes[dayIndex]; const isAfterLastLesson = lastLessonTime && helper.convertTimeToMinutes(time) > helper.convertTimeToMinutes(lastLessonTime); - + if (dayLessons.length === 0 && isAfterLastLesson) { - return `
`; + return `
`; } - + return ` -
+
${dayLessons.length === 0 ? '
' : ''} ${dayLessons .map(