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) }; })