From 71987620c28ccfe0c79bcc3e71bd155def35d053 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Wed, 16 Dec 2020 18:26:01 +0100
Subject: [PATCH] Abwesenheit hinzu Button bug behoben

---
 .../__pycache__/counter_tag.cpython-38.pyc    | Bin 20193 -> 20193 bytes
 standards/templatetags/counter_tag.py         |   2 +-
 .../timemanagement/rendered_table.html        |   5 +++++
 .../timemanagement_management.html            |   2 --
 .../timemanagement/tm_ab_management.html      |  20 +++++++++++++++++-
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 5d253414860a62c4736e282618d831c62c5d1b10..a1e6c40a4e447addc5dd7cf75f4d371f4334f3ae 100644
GIT binary patch
delta 83
zcmaDjm+|3TM&3|fUM>b8ka4&b&%TlO9-AQ}kjDhX&Oltu10-q~QW(t{Y8g_Pf*Dpa
Z`@IAyC=v$|G9W@?@<ub^&HC({+yTt|5c>cC

delta 54
zcmaDjm+|3TM&3|fUM>b8m?C~Ho@FENJ+{f0Y-9yiGW)$`1d0}kg9r(R$ro+KH|w)+
Gat8pkV-IQo

diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 8e8d408..0531c76 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -28,7 +28,7 @@ def getvar():
 
 @register.simple_tag
 def incvar():
-	global b
+	global user
 	b += 1
 	return ''
 
diff --git a/timemanagement/templates/timemanagement/rendered_table.html b/timemanagement/templates/timemanagement/rendered_table.html
index 159bac5..4341eb1 100644
--- a/timemanagement/templates/timemanagement/rendered_table.html
+++ b/timemanagement/templates/timemanagement/rendered_table.html
@@ -227,6 +227,8 @@
 
 <!-- Modal with all users for OnClick-Add-Absence -->
 {% if user|usergperm:"absencemanager" %}      
+<script type="text/javascript">
+</script>
 <div class="modal fade" tabindex="-1" id="chooseUserForNewAbsence" data-backdrop="static">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
@@ -263,6 +265,7 @@ function loadNewAbsenceByUser(userid){
 }
 
 function showNewAbsenceByUser(){
+
  $("#chooseUserForNewAbsence").modal("toggle");   
 }
 
@@ -737,3 +740,5 @@ $( function() {
   });
 } );
   </script>
+
+  
diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html
index 664cb5b..1e55c8d 100644
--- a/timemanagement/templates/timemanagement/timemanagement_management.html
+++ b/timemanagement/templates/timemanagement/timemanagement_management.html
@@ -9,8 +9,6 @@
   <hr>
 
 
-
-
 {% if user|usergperm:"absencemanager" %}
 <div>
   <ul class="nav nav-tabs " id="absencetabs" role="tablist" >
diff --git a/timemanagement/templates/timemanagement/tm_ab_management.html b/timemanagement/templates/timemanagement/tm_ab_management.html
index 999ed96..aca7c69 100644
--- a/timemanagement/templates/timemanagement/tm_ab_management.html
+++ b/timemanagement/templates/timemanagement/tm_ab_management.html
@@ -9,7 +9,7 @@
 <div class="content-section col-12">
   <h3>Abwesenheiten{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Bearbeiten Sie hier Ihre Abwesenheiten." class="far fa-question-circle"></i></small>{% endif %}   
   <!--<small><i onclick="javascript:$('#youtubevideoinformation').modal('toggle');" class="far fa-play-circle"></i></small>-->
-    <button class="btn btn-primary btn-sm" {% if user|usergperm:"absencemanager" %} onclick="javascript:showNewAbsenceByUser()" {% else %} onclick="javascript:loadNewAbsenceByUser({{request.user.pk}})" {% endif %} style="float: right;"><i class="fas fa-plus"></i>&nbsp;Abwesenheit</button> 
+    <button class="btn btn-primary btn-sm" {% if user|usergperm:"absencemanager" %} onclick="javascript:showNewAbsenceByUser()" {% else %} onclick="javascript:loadNewAbsenceByUser({{request.user.pk}})" {% endif %} style="float: right;" id="newabscencebtn"><i class="fas fa-plus"></i>&nbsp;Abwesenheit</button> 
   </h3>  
   <hr>  
   <div >    
@@ -429,6 +429,13 @@ $(document).ready(function(){
    var activeTab = localStorage.getItem('activeTabAbsence');
        
     if(activeTab){       
+      if(activeTab != "team"){
+        $("#newabscencebtn").prop("disabled", true);
+      }
+      else{
+        $("#newabscencebtn").prop("disabled", false);
+      }
+
 
      if($('#' + activeTab).find().prevObject.length != 0){
         $('#' + activeTab).tab('show');         
@@ -455,6 +462,12 @@ $(document).ready(function(){
 $('#absencetabs a').on('click', function (e) {
     e.preventDefault();
     lastview_name = $(this)[0]['hash'].substring(1);
+    if(lastview_name != "team"){
+      $("#newabscencebtn").prop("disabled", true);
+    }
+    else{
+      $("#newabscencebtn").prop("disabled", false);
+    }
     localStorage.setItem('activeTabAbsence', lastview_name);          
   });
 
@@ -504,4 +517,9 @@ $('#absencetabs a').on('click', function (e) {
 </script>
 {% endif %}
 
+
+
+
+
+
 {% endblock content %}