From 0d67f72159c1b554e4dbd746b0178bfa3ead3e03 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Mon, 20 Sep 2021 11:04:38 +0200 Subject: [PATCH] Bug Kalenderanzeige --- timemanagement/templates/timemanagement/rendered_table.html | 5 ++--- .../templates/timemanagement/tm_ab_management.html | 6 +++--- timemanagement/views.py | 3 +++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/timemanagement/templates/timemanagement/rendered_table.html b/timemanagement/templates/timemanagement/rendered_table.html index 21b7934..91b39cb 100644 --- a/timemanagement/templates/timemanagement/rendered_table.html +++ b/timemanagement/templates/timemanagement/rendered_table.html @@ -315,7 +315,6 @@ document.getElementById("choosenyear").addEventListener("change", function(){ choosenyear = $('#choosenyear :selected').val(); }) - var selectedElements = []; var active_row = ""; var sameday = false; @@ -689,7 +688,7 @@ $( function() { /* Functions for Kalendar */ -/* + function prevMonth(){ $.ajax( { @@ -751,7 +750,7 @@ function showNewAbsenceByUser(){ function goFastToMonth(month){ location.href = "/tm/abs/" + month +"/" + choosenyear } -*/ + diff --git a/timemanagement/templates/timemanagement/tm_ab_management.html b/timemanagement/templates/timemanagement/tm_ab_management.html index 74d64b8..b7d067c 100644 --- a/timemanagement/templates/timemanagement/tm_ab_management.html +++ b/timemanagement/templates/timemanagement/tm_ab_management.html @@ -572,8 +572,7 @@ $('#absencetabs a').on('click', function (e) { } localStorage.setItem('activeTabAbsence', lastview_name); }); - - +/* function prevMonth(){ $.ajax( { @@ -589,6 +588,7 @@ $('#absencetabs a').on('click', function (e) { request.setRequestHeader("X-Requested-With", "XMLHttpRequest"); }, success : function(data){ + console.log(data); $("#overlay").fadeOut(); $("#rendered_table").html(data); } @@ -615,7 +615,7 @@ function nextMonth(){ } }); } - +*/ /* Functions for Kalender diff --git a/timemanagement/views.py b/timemanagement/views.py index 8ebe3a3..60a1c4a 100644 --- a/timemanagement/views.py +++ b/timemanagement/views.py @@ -794,6 +794,9 @@ def TimeAjax(request): nextmonth = "" activemonth = int(request.GET["activemonth"]) activeyear = int(request.GET["activeyear"]) + + print(activemonth) + print(activeyear) #MONTH if(not activemonth or activemonth > 12 or activemonth < 1):