Bugs behiben

standards/templatetags/counter_tag.py

@@ -32,6 +32,18 @@ def incvar():
 	b += 1
 	return ''
 
+@register.filter(name="has_group_byname")
+def has_group_byname(user, groupname):
+	in_group = False
+	if(user.profile.agency.module_recoverdir):
+		agroup = AgencyGroup.objects.filter(agency=user.profile.agency, agencygroupname=groupname)[0]
+		for g in user.groups.all():
+			if g.name == agroup.group.name:
+				print("HIER")
+				in_group = True
+
+	return in_group
+
 
 @register.filter(name='has_group')
 def has_group(user, group_name):
@@ -77,6 +89,7 @@ def usergperm(user, perm):
 		stat = True
 	return stat
 
+
 @register.filter(name="useringroupbyid")
 def is_member(id, groupname):
 	usertocheck = User.objects.get(pk=id)

timemanagement/templates/timemanagement/timemanagement_management.html

@@ -12,11 +12,13 @@
 
 
 {% if user|usergperm:"absencemanager" %}
-<div >    
+<div>
   <ul class="nav nav-tabs " id="absencetabs" role="tablist" >
+  {% if user.usertime.usetime == True %}
   <li class="nav-item">
     <a class="nav-link" id="userown-tab" data-toggle="tab" href="#userown" role="tab" aria-controls="userown" aria-selected="false">Meine Zeiterfassung</a>
   </li>
+  {% endif %}
   <li class="nav-item ml-auto">
     <a class="nav-link" id="team-tab" data-toggle="tab" href="#team" role="tab" aria-controls="team" aria-selected="false">Mitarbeiterübersicht</a>
   </li>
@@ -122,6 +124,12 @@ $(document).ready(function(){
         $('#userown').tab('show');
     }
 
+    {% if user.usertime.usetime == False and user|usergperm:"absencemanager" %} 
+    $(".nav-link").removeClass("active");
+
+    $("#team").addClass("active");
+    $('#team-tab').tab('show');
+    {% endif %}
 
 });
 
@@ -134,7 +142,7 @@ $('#absencetabs a').on('click', function (e) {
 
   </script>
 
-{% if user.usertime.usetime_start == None %}
+{% if user.usertime.usetime_start == None and user|usergperm:"absencemanager" == False %}
 <div class="modal fade" tabindex="-1" role="dialog" data-backdrop="static" id="missingdatainfo">
   <div class="modal-dialog" role="document">
     <div class="modal-content">

users/templates/users/base.html

@@ -208,7 +208,8 @@
       </li>
       {% endif %}
 
-      {% if request.user.profile.agency.module_recoverdir and request.user|usergperm:"recoverdirmanager" %}
+      {% if request.user.profile.agency.module_recoverdir and request.user|has_group_byname:"Notfallhilfe" %}
+      
       {% if active_link == 'recoverdir' %}
       <li class="nav-item active">
         {% else%}
@@ -233,6 +234,7 @@
       }
     </style>
     <div id="bottom_info" style="z-index: -200">
+
       <hr class="sidebar-divider d-none d-md-block">
       {% if request.user.is_staff %}
       <li class="nav-item">