Bug für öffnen der Abwesenheiten fix

timemanagement/templates/timemanagement/realtime_dropdown.html

@@ -170,7 +170,6 @@ Gleitzeitkonto:
 	}
 
 	function startBreak(){
-
 		isbreak = true;
 		$("#timemanagement_clock").click(function(e){
 		   e.stopPropagation();

timemanagement/templates/timemanagement/rendered_table.html

@@ -260,35 +260,12 @@
 
 <script type="text/javascript">
 
-function loadNewAbsenceByUser(userid){
-  $("#chooseUserForNewAbsence").modal("toggle");  
-  recalculateChoosenDays(userid);
-}
-
-function showNewAbsenceByUser(){
-
- $("#chooseUserForNewAbsence").modal("toggle");   
-}
-
-
 var choosenyear = "{{activeyear}}";
 
-function goFastToMonth(month){
-  location.href = "/tm/abs/" + month +"/" + choosenyear
-}
-
-document.getElementById("choosenyear").addEventListener("change", function(){
-  choosenyear = $('#choosenyear :selected').val();
-})
-
 $(function () {
   $('[data-toggle="tooltip"]').tooltip()
 })
 
-function fastChangeModal(){
-  $("#fastjumpmodal").modal("toggle");
-}
-
 
 //Set required repr or not
 document.getElementById("id_reason").addEventListener("change", function(){
@@ -334,47 +311,9 @@ document.getElementById("id_reason").addEventListener("change", function(){
   $("#id_prevyear").val("{{prevyear}}")
   $("#id_nextyear").val("{{nextyear}}")
 
-function prevMonth(){
+document.getElementById("choosenyear").addEventListener("change", function(){
-  $.ajax(
+  choosenyear = $('#choosenyear :selected').val();
-  {
+})
-    type: "GET",
-    url: "{% url 'tm-ajax' %}",
-    data:{
-      action : "getrenderedtable",
-      activeyear : {{prevyear}},
-      activemonth : {{prevmonth}}
-    },
-    beforeSend: function(request) {
-    	$("#overlay").fadeIn();
-        request.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-    },
-    success : function(data){
-    	$("#overlay").fadeOut();
-      $("#rendered_table").html(data);
-    }
-  });
-}
-
-
-function nextMonth(){
-  $.ajax({
-    type: "GET",
-    url: "{% url 'tm-ajax' %}",
-    data:{
-      action : "getrenderedtable",
-      activeyear : {{nextyear}},
-      activemonth : {{nextmonth}}
-    },
-    beforeSend: function(request) {
-    	$("#overlay").fadeIn();
-      	request.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-    },
-    success : function(data){
-    	$("#overlay").fadeOut();
-      $("#rendered_table").html(data)
-    }
-  });
-}
 
 
 var selectedElements = [];
@@ -744,6 +683,73 @@ $( function() {
     }
   });
 } );
+
+/*
+  Functions for Kalendar
+*/
+/*
+function prevMonth(){
+  $.ajax(
+  {
+    type: "GET",
+    url: "{% url 'tm-ajax' %}",
+    data:{
+      action : "getrenderedtable",
+      activeyear : {{prevyear}},
+      activemonth : {{prevmonth}}
+    },
+    beforeSend: function(request) {
+    	$("#overlay").fadeIn();
+        request.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+    },
+    success : function(data){
+    	$("#overlay").fadeOut();
+      $("#rendered_table").html(data);
+    }
+  });
+}
+
+
+function nextMonth(){
+  $.ajax({
+    type: "GET",
+    url: "{% url 'tm-ajax' %}",
+    data:{
+      action : "getrenderedtable",
+      activeyear : {{nextyear}},
+      activemonth : {{nextmonth}}
+    },
+    beforeSend: function(request) {
+    	$("#overlay").fadeIn();
+      	request.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+    },
+    success : function(data){
+    	$("#overlay").fadeOut();
+      $("#rendered_table").html(data)
+    }
+  });
+}
+
+
+function fastChangeModal(){
+  $("#fastjumpmodal").modal("toggle");
+}
+
+
+function loadNewAbsenceByUser(userid){
+  $("#chooseUserForNewAbsence").modal("toggle");  
+  recalculateChoosenDays(userid);
+}
+
+function showNewAbsenceByUser(){
+
+ $("#chooseUserForNewAbsence").modal("toggle");   
+}
+
+function goFastToMonth(month){
+  location.href = "/tm/abs/" + month +"/" + choosenyear
+}
+*/
   </script>
 
   

timemanagement/templates/timemanagement/tm_ab_management.html

@@ -573,6 +573,77 @@ $('#absencetabs a').on('click', function (e) {
     localStorage.setItem('activeTabAbsence', lastview_name);          
   });
 
+
+
+
+
+
+  function prevMonth(){
+  $.ajax(
+  {
+    type: "GET",
+    url: "{% url 'tm-ajax' %}",
+    data:{
+      action : "getrenderedtable",
+      activeyear : {{prevyear}},
+      activemonth : {{prevmonth}}
+    },
+    beforeSend: function(request) {
+    	$("#overlay").fadeIn();
+        request.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+    },
+    success : function(data){
+    	$("#overlay").fadeOut();
+      $("#rendered_table").html(data);
+    }
+  });
+}
+
+
+function nextMonth(){
+  $.ajax({
+    type: "GET",
+    url: "{% url 'tm-ajax' %}",
+    data:{
+      action : "getrenderedtable",
+      activeyear : {{nextyear}},
+      activemonth : {{nextmonth}}
+    },
+    beforeSend: function(request) {
+    	$("#overlay").fadeIn();
+      	request.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+    },
+    success : function(data){
+    	$("#overlay").fadeOut();
+      $("#rendered_table").html(data)
+    }
+  });
+}
+
+/*
+
+  Functions for Kalender
+*/
+function fastChangeModal(){
+  $("#fastjumpmodal").modal("toggle");
+}
+
+
+function loadNewAbsenceByUser(userid){
+  $("#chooseUserForNewAbsence").modal("toggle");  
+  recalculateChoosenDays(userid);
+}
+
+function showNewAbsenceByUser(){
+
+ $("#chooseUserForNewAbsence").modal("toggle");   
+}
+
+function goFastToMonth(month){
+  location.href = "/tm/abs/" + month +"/" + choosenyear
+}
+
+
 </script>