From cab0b3adc4b6f368d0ce45a450df446ffd38884b Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Fri, 17 Dec 2021 11:02:06 +0000
Subject: [PATCH] fix display of lecture week in booking plans for semesters
starting lectures in the middle of a week, re #453
---
resources/assets/javascripts/lib/resources.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/resources/assets/javascripts/lib/resources.js b/resources/assets/javascripts/lib/resources.js
index 417eb172324..a2060294054 100644
--- a/resources/assets/javascripts/lib/resources.js
+++ b/resources/assets/javascripts/lib/resources.js
@@ -737,13 +737,17 @@ class Resources
static updateBookingPlanDateInfos(plan_begin, plan_end, semester = null)
{
if (semester) {
- let show_lecture_week = plan_begin.getTime()/1000 >= semester.seminars_begin && plan_begin.getTime()/1000 < semester.seminars_end;
+ let show_lecture_week = plan_end.getTime()/1000 >= semester.seminars_begin && plan_end.getTime()/1000 < semester.seminars_end;
$(".booking-plan-header").data('semester', semester);
$("#booking-plan-header-semname").text(semester.title);
if (show_lecture_week) {
let sem_week = Math.floor((plan_end.getTime() / 1000 - 10800 - semester.seminars_begin) / 604800) + 1;
- $("#booking-plan-header-semweek").text(sem_week);
- $("#booking-plan-header-semweek-part").show();
+ if (sem_week > 0) {
+ $("#booking-plan-header-semweek").text(sem_week);
+ $("#booking-plan-header-semweek-part").show();
+ } else {
+ $("#booking-plan-header-semweek-part").hide();
+ }
} else {
$("#booking-plan-header-semweek-part").hide();
}
--
GitLab