diff --git a/anwendung/src/components/CalendarSideBar.jsx b/anwendung/src/components/CalendarSideBar.jsx index c1cc640..db2ad48 100644 --- a/anwendung/src/components/CalendarSideBar.jsx +++ b/anwendung/src/components/CalendarSideBar.jsx @@ -1,22 +1,28 @@ +import {useEffect} from "react"; + let startParts = [] let endParts = [] const months = [["Januar", 31], ["Februar", 28], ["März", 31], ["April", 30], ["Mai", 31], ["Juni", 30], ["Juli", 31], ["August", 31], ["September", 30], ["Oktober", 31], ["November", 30], ["Dezember", 31]] const days = months.map((month => month[1])) let result = [] -let check = true let startDate let calculatedDay = [] const weekdays = ["Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"] export default function BasicDateCalendar(p) { - if (check) { + + useEffect(() => { + startParts = [] + endParts = [] + result = [] + calculatedDay = [] + startDate = new Date(p.startyear, 0 ,p.startday) let endDate = new Date(p.endyear, 0 , p.endday) let startString = startDate.getDate() + "." + (startDate.getMonth() + 1) + "." + p.startyear let endString = endDate.getDate() + "." + (endDate.getMonth() + 1) + "." + p.endyear generateCalendar(startString, endString) - check = false - } + }) return (
diff --git a/anwendung/src/components/CalenderView.jsx b/anwendung/src/components/CalenderView.jsx index d0b3564..0894dc2 100644 --- a/anwendung/src/components/CalenderView.jsx +++ b/anwendung/src/components/CalenderView.jsx @@ -27,6 +27,11 @@ export default function CalenderView(p) { const [update, setUpdate] = useState(false) const scrollRef = useRef(null); + const[startDayCalenderSideBar, setStartDayCalenderSideBar] = useState(0) + const[startYearCalenderSideBar, setStartYearCalenderSideBar] = useState(2000) + const[endDayCalenderSideBar, setEndDayCalenderSideBar] = useState(0) + const[endYearCalenderSideBar, setEndYearCalenderSideBar] = useState(2000) + function readEntries() { let url = baseURL + "/entries?semesterid=" + localStorage.getItem("currentsid") + "&daynumber=" + currentWeekStartDay + "&yearnumber=" + currentYear + "&sessionid=" + localStorage.getItem("sessionid"); @@ -311,7 +316,12 @@ export default function CalenderView(p) { fetch(url).then(r => r.json()).then(s => { currentWeekStartDay = s.startday - new Date(s.startyear, 0, s.startday).getUTCDay(); currentYear = s.startyear; + setStartYearCalenderSideBar(currentYear) + setEndYearCalenderSideBar(s.endyear) + semesterStart = s.startday; + setStartDayCalenderSideBar(semesterStart) + setEndDayCalenderSideBar(s.endday) }).then(readEntries) scrollRef.current.scrollTop = 600; @@ -376,7 +386,7 @@ export default function CalenderView(p) { alignItems: "center" }}>
- +