From a7bc35379d847da797b0cc53c360e0e1294aba30 Mon Sep 17 00:00:00 2001 From: Samuel Zielke Date: Sat, 1 Feb 2025 23:41:37 +0100 Subject: [PATCH] =?UTF-8?q?BugFix:=20Wechseln=20in=20Januar=20nicht=20m?= =?UTF-8?q?=C3=B6glich=20-=20da=20Monat=20"13"=20gesucht=20wird.=20Nun=20Z?= =?UTF-8?q?ahlen=20und=20Regeln=20angepasst.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/app/js/home.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/static/app/js/home.js b/app/static/app/js/home.js index da52656..4159eb5 100644 --- a/app/static/app/js/home.js +++ b/app/static/app/js/home.js @@ -157,11 +157,12 @@ SETMonthGoalSaveButton.addEventListener('click', () => { }) -async function getActualDataAndFillView(monat = currentDate.getMonth() + 1, jahr = currentDate.getFullYear()) { +async function getActualDataAndFillView(monat = currentDate.getMonth(), jahr = currentDate.getFullYear()) { try { // Einfüfen des aktuellen Monats - document.getElementById('actualMonthName').innerHTML = monate[monat - 1]; + document.getElementById('actualMonthName').innerHTML = monate[monat !== 12 ? monat : 0]; + console.log(monat) // Settings vor ausfüllen @@ -177,7 +178,7 @@ async function getActualDataAndFillView(monat = currentDate.getMonth() + 1, jahr }); // Filter funktion aufrufen und entsprechend mit dem aktuellen Datum füllen - const filteredEntries = await filterEntriesByMonthYear(monat, jahr); + const filteredEntries = await filterEntriesByMonthYear(monat === 12 ? 1 : monat + 1, jahr); // Tabelle mit den aktuellen informationen füllen (funktion triggern und Daten übergeben) fillTableWithEntries(filteredEntries) @@ -381,29 +382,31 @@ document.getElementById('dashbord_month_area').addEventListener('click', () =>{ document.getElementById('MonthNameOfActual').innerHTML = "Monat:" // document.getElementById('actualMonthName').innerHTML = monate[new Date().getMonth()]; diffMonth = 0; - getActualDataAndFillView(new Date().getMonth() + diffMonth + 1) + getActualDataAndFillView(new Date().getMonth() + diffMonth) } }) document.getElementById('btn-month-before').addEventListener('click', () =>{ + // console.log(diffMonth) if (diffMonth === 0) { diffMonth = 11; - getActualDataAndFillView(new Date().getMonth() + diffMonth + 1) + getActualDataAndFillView(new Date().getMonth() + diffMonth) } else { diffMonth = ((monate[new Date().getMonth() + diffMonth]) != 'September') ? diffMonth - 1 : diffMonth; // document.getElementById('actualMonthName').innerHTML = monate[new Date().getMonth() + diffMonth]; - getActualDataAndFillView(new Date().getMonth() + diffMonth + 1) + getActualDataAndFillView(new Date().getMonth() + diffMonth) }; + // console.log(diffMonth) }); document.getElementById('btn-month-next').addEventListener('click', () =>{ if (diffMonth === 11) { diffMonth = 0; - getActualDataAndFillView(new Date().getMonth() + diffMonth + 1) + getActualDataAndFillView(new Date().getMonth() + diffMonth) } else { diffMonth = ((monate[new Date().getMonth() + diffMonth]) != 'August') ? diffMonth + 1 : diffMonth; // document.getElementById('actualMonthName').innerHTML = monate[new Date().getMonth() + diffMonth]; - getActualDataAndFillView(new Date().getMonth() + diffMonth + 1) + getActualDataAndFillView(new Date().getMonth() + diffMonth) }; })