diff --git a/dasettings/templates/dasettings/user_content.html b/dasettings/templates/dasettings/user_content.html
index 69b27ec..32a644d 100644
--- a/dasettings/templates/dasettings/user_content.html
+++ b/dasettings/templates/dasettings/user_content.html
@@ -10,8 +10,8 @@
Nachname
E-Mail
Agenturfunktion
- Gleitzeit
- Letzter Login
+
Tätigkeit
Telefon
Mobil
@@ -25,7 +25,7 @@
{{ item.last_name }}
{{ item.email }}
{% if item.profile.func == None %}-{%else%}{{ item.profile.func }}{%endif%}
-
+
{{ item.profile.compfunc }}
{{ item.profile.phoneland }}
{{ item.profile.phonemobile }}
diff --git a/news/models.py b/news/models.py
index 32408ff..c73ca76 100644
--- a/news/models.py
+++ b/news/models.py
@@ -19,7 +19,7 @@ class News(models.Model):
go_online_on = models.DateTimeField(default=timezone.now, blank=True)
# Default date plus two weeks
- go_offline_on = models.DateTimeField(default=timezone.now, blank=True, null=True)
+ go_offline_on = models.DateTimeField(default=None, blank=True, null=True)
last_modified_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, related_name='news_mod_by', default=None)
last_modified_on = models.DateTimeField(default=timezone.now, blank=True)
diff --git a/news/templates/news/news_addnews.html b/news/templates/news/news_addnews.html
index dab28cd..a9e6ed9 100644
--- a/news/templates/news/news_addnews.html
+++ b/news/templates/news/news_addnews.html
@@ -25,9 +25,9 @@ $(document).ready(function() {
});
//Set offline-Datei plus 2 weeks
- today = new Date();
- today = new Date(today.setDate(today.getDate() + 14));
- $("#id_go_offline_on").data("DateTimePicker").date(today);
+ //today = new Date();
+ //today = new Date(today.setDate(today.getDate() + 14));
+ //$("#id_go_offline_on").data("DateTimePicker").date(today);
});
diff --git a/news/templates/news/news_management.html b/news/templates/news/news_management.html
index 50e8c79..491bc8d 100644
--- a/news/templates/news/news_management.html
+++ b/news/templates/news/news_management.html
@@ -53,13 +53,17 @@
{{news_single.name }}
{{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }}
{{ news_single.created_date }}
- {{ news_single.go_online_on|date:"d.m.Y, H:i"}} bis {{ news_single.go_offline_on|date:"d.m.Y, H:i"}}
+ {{ news_single.go_online_on|date:"d.m.Y, H:i"}} {% if news_single.go_offline_on != None %} bis {% endif %} {{ news_single.go_offline_on|date:"d.m.Y, H:i"}}
{% if news_single.created_by == request.user or perms.users.news_management %}
+
+
+
+
diff --git a/news/templates/news/news_management_SAVE.html b/news/templates/news/news_management_SAVE.html
deleted file mode 100644
index d7a72a9..0000000
--- a/news/templates/news/news_management_SAVE.html
+++ /dev/null
@@ -1,68 +0,0 @@
-{% extends "users/base.html" %}
-{% block content %}
-
-
News
-
-
- Hier können aktuelle Nachrichten für die Agentur erstellt und verwaltet werden.
-
-
-
-
-
-
-
-
-
-
-
- Titel
- Erstellt von
- Erstellt am
- Sichtbar von/bis
-
-
-
-
- {% for news_single in news %}
-
- {{news_single.name }}
- {{ news_single.created_by.first_name }} {{ news_single.created_by.last_name }}
- {{ news_single.created_date }}
- {{ news_single.go_online_on|date:"d.m.Y, H:i"}} bis {{ news_single.go_offline_on|date:"d.m.Y, H:i"}}
-
- {% if news_single.created_by == request.user or perms.users.news_management %}
-
- {% endif %}
-
-
-
- {% endfor %}
-
-
-
-
-
-{% endblock content %}
diff --git a/news/urls.py b/news/urls.py
index 9cbd455..13be753 100644
--- a/news/urls.py
+++ b/news/urls.py
@@ -14,6 +14,8 @@ urlpatterns = [
#path('ajax/loadtasks/', views.load_tasks, name='ajax_loadtasks'),
#path('standard/
/changestat', views.StandardChangePublic, name="standard-status"),
path('news//single', views.NewsSingle, name="news-single"),
+ path('newsga/', permission_required('users.modulenews')(views.NewsGoToArchiv), name="news-gotoarchiv"),
+
#path('standard//area', views.StandardArea, name="standard-area"),
#path('standard//task', views.StandardTask, name="standard-task")
]
diff --git a/news/views.py b/news/views.py
index 40b52e0..40264fc 100644
--- a/news/views.py
+++ b/news/views.py
@@ -18,7 +18,8 @@ class NewsManagement(LoginRequiredMixin, ListView):
# Change context and return for template-data
def get_context_data(self, **kwargs):
filterdate = timezone.now()
- news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-created_date')
+ news = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__gt=filterdate).order_by('-created_date') | News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__lt=filterdate).filter(go_offline_on__isnull=True).order_by('-created_date')
+
news_arch = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_offline_on__lt=filterdate).order_by('-created_date')
news_coming = News.objects.filter(agency__pk=self.request.user.profile.agency.pk).filter(go_online_on__gt=filterdate).order_by('-created_date')
@@ -74,6 +75,16 @@ def NewsAdd(request):
}
return render(request, 'news/news_addnews.html', context)
+@login_required
+def NewsGoToArchiv(request, pk):
+
+ news = News.objects.get(pk=pk)
+ news.go_offline_on = timezone.now()
+ news.save()
+
+
+ return redirect("news-management")
+
@login_required
def NewsUpdate(request, id):
news = News.objects.get(pk=id, agency=request.user.profile.agency)
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index f6b959a..2204fa2 100644
Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ
diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index b893c4e..82fc14e 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -435,8 +435,6 @@ def getabscenceday(loggeduser, user, daytocheck):
if(len(absencedays) > 0):
returnstat = list(absencedays)[0]
- print(absencedays)
-
return returnstat
@register.simple_tag
diff --git a/timemanagement/templates/timemanagement/rendered_table.html b/timemanagement/templates/timemanagement/rendered_table.html
index 552348a..2b8c551 100644
--- a/timemanagement/templates/timemanagement/rendered_table.html
+++ b/timemanagement/templates/timemanagement/rendered_table.html
@@ -226,7 +226,7 @@
-{% if user|usergperm:"absencemanager" %}
+{% if user|usergperm:"absencemanager" %}
@@ -236,14 +236,14 @@
×
-
+
Bitte wählen Sie den Mitarbeiter aus, für den Sie eine neue Abwesenheit anlegen wollen.
{% for us in usersofagency %}
{{us.get_full_name}}
-
+
{% endfor %}
diff --git a/timemanagement/templates/timemanagement/timemanagement_management.html b/timemanagement/templates/timemanagement/timemanagement_management.html
index 61e9288..12d4950 100644
--- a/timemanagement/templates/timemanagement/timemanagement_management.html
+++ b/timemanagement/templates/timemanagement/timemanagement_management.html
@@ -9,337 +9,43 @@
-
-
-
{{active_month}} {{active_year}}
-
+
+
+{% if user|usergperm:"absencemanager" %}
+
-
+
-
+
+
+ {% block tm_userown_team %}
+ {% include "timemanagement/timemanagement_teamview.html" %}
+ {% endblock %}
+
-
-
-
-
-
-
- Start
- Ende
- Arbeitszeit
- Pausen
- Gesamtzeit
- Gleitzeit
-
-
-
-
- {% for da in days_this_month %}
-
- {% getabscenceday request.user request.user da as abday %}
-
-
-
- {{da|date:"l"}}
-
-
- {{da|date:"d.m.y"}}
-
-
- {% if abday != False %}
- {{abday.reason}}
- {% if abday.start == da%}
- {% if abday.startday_info == "1" %}
- (nur Vormittags)
- {% for workday in workdays %}
- {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
- {{workday.start|date:"H:i"}} - {{workday.end|date:"H:i"}},
- {% getsumworkdayexcludebreak workday as sumworkday %}
- {{ sumworkday }},
- {% getsumbreak workday as sumbreakofday %}
- {{sumbreakofday}} min. ({{workday.breaks.all|length}}),
- {% getsumworkday workday as sumwd %}
- {{sumwd}},
- {% gettimeoveralldiff workday user as erg%}
- {% if erg.1 == 0 %}
- +{{erg.0}}
- {% elif erg.1 == 1 %}
- {{erg.0}}
- {% else %}
- -{{erg.0}}
- {% endif %}
-
- {% if breakmonthline < da %}
-
-
- {% endif %}
- {% endif %}
- {% endfor %}
-
-
-
- {% elif abday.startday_info == "2" %}
- (nur Nachmittags)
-
- {% for workday in workdays %}
- {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
- {{workday.start|date:"H:i"}} - {{workday.end|date:"H:i"}}
- {% getsumworkdayexcludebreak workday as sumworkday %}
- {{ sumworkday }},
- {% getsumbreak workday as sumbreakofday %}
- {{sumbreakofday}} min. ({{workday.breaks.all|length}}),
- {% getsumworkday workday as sumwd %}
- {{sumwd}},
- {% gettimeoveralldiff workday user as erg%}
- {% if erg.1 == 0 %}
- +{{erg.0}}
- {% elif erg.1 == 1 %}
- {{erg.0}}
- {% else %}
- -{{erg.0}}
- {% endif %}
-
- {% if breakmonthline < da %}
-
-
- {% endif %}
- {% endif %}
- {% endfor %}
-
- {% endif %}
- {% elif abday.end == da%}
- {% if abday.endday_info == "1" %}
- (nur Vormittags)
-
-
-
- {% for workday in workdays %}
- {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
- {{workday.start|date:"H:i"}} - {{workday.end|date:"H:i"}}
- {% getsumworkdayexcludebreak workday as sumworkday %}
- {{ sumworkday }},
- {% getsumbreak workday as sumbreakofday %}
- {{sumbreakofday}} min. ({{workday.breaks.all|length}}),
- {% getsumworkday workday as sumwd %}
- {{sumwd}},
- {% gettimeoveralldiff workday user as erg%}
- {% if erg.1 == 0 %}
- +{{erg.0}}
- {% elif erg.1 == 1 %}
- {{erg.0}}
- {% else %}
- -{{erg.0}}
- {% endif %}
-
- {% if breakmonthline < da %}
-
-
- {% endif %}
-
- {% endif %}
- {% endfor %}
-
- {% elif abday.endday_info == "2" %}
- (nur Nachmittags)
-
-
-
- {% for workday in workdays %}
- {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
- {{workday.start|date:"H:i"}} - {{workday.end|date:"H:i"}}
- {% getsumworkdayexcludebreak workday as sumworkday %}
- {{ sumworkday }},
- {% getsumbreak workday as sumbreakofday %}
- {{sumbreakofday}} min. ({{workday.breaks.all|length}}),
- {% getsumworkday workday as sumwd %}
- {{sumwd}},
- {% gettimeoveralldiff workday user as erg%}
- {% if erg.1 == 0 %}
- +{{erg.0}}
- {% elif erg.1 == 1 %}
- {{erg.0}}
- {% else %}
- -{{erg.0}}
- {% endif %}
-
- {% if breakmonthline < da %}
-
-
- {% endif %}
-
- {% endif %}
- {% endfor %}
-
- {% endif %}
- {% endif %}
-
- {% else %}
- {% if abday == False %}
- {% counterWDreset %}
- {% for workday in workdays %}
- {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
- {% getCounterWD as wd_counter %}
-
- {% if wd_counter > 0 %}
-
- {% endif %}
-
-
- {% counterWDUp %}
- {{workday.start|date:"H:i"}}
- {% endif %}
- {% endfor %}
- {% endif %}
- {% endif %}
-
- {% if abday == False %}
-
- {% counterWDreset %}
- {% for workday in workdays %}
- {% if workday.end|date:"d-m-y" == da|date:"d-m-y" %}
-
- {% getCounterWD as wd_counter %}
-
- {% if wd_counter > 0 %}
-
- {% endif %}
-
-
- {% counterWDUp %}
-
- {{workday.end|date:"H:i"}}
- {% endif %}
- {% endfor %}
-
-
-
- {% counterWDreset %}
- {% for workday in workdays %}
- {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
- {% getCounterWD as wd_counter %}
-
- {% if wd_counter > 0 %}
-
- {% endif %}
-
-
- {% counterWDUp %}
-
- {% getsumworkdayexcludebreak workday as sumworkday %}
- {{ sumworkday }}
- {% endif %}
- {% endfor %}
-
-
-
- {% counterWDreset %}
- {% for workday in workdays %}
- {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
- {% getCounterWD as wd_counter %}
-
- {% if wd_counter > 0 %}
-
- {% endif %}
-
- {% counterWDUp %}
-
- {% getsumbreak workday as sumbreakofday %}
- {{sumbreakofday}} min. ({{workday.breaks.all|length}})
- {% endif %}
- {% endfor %}
-
-
-
-
- {% counterWDreset %}
- {% for workday in workdays %}
- {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
- {% getCounterWD as wd_counter %}
-
- {% if wd_counter > 0 %}
-
- {% endif %}
-
-
- {% counterWDUp %}
-
- {% getsumworkday workday as sumwd %}
- {{sumwd}}
- {% endif %}
- {% endfor %}
-
-
-
-
- {% counterWDreset %}
- {% for workday in workdays %}
- {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
- {% getCounterWD as wd_counter %}
-
- {% if wd_counter > 0 %}
-
- {% endif %}
- {% counterWDUp %}
- {% gettimeoveralldiff workday user as erg%}
- {% if erg.1 == 0 %}
- +{{erg.0}}
- {% elif erg.1 == 1 %}
- {{erg.0}}
- {% else %}
- -{{erg.0}}
- {% endif %}
- {% endif %}
- {% endfor %}
-
-
-
-
- {% counterWDreset %}
- {% for workday in workdays %}
- {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
-
- {% getCounterWD as wd_counter %}
-
- {% if wd_counter > 0 %}
-
- {% endif %}
-
-
- {% counterWDUp %}
- {% if breakmonthline < da %}
-
-
- {% endif %}
- {% endif %}
- {% endfor %}
-
- {% else %}
-
- {% endif %}
-
- {% endfor %}
-
-
-
+
+{% else %}
+
+ {% block tm_userown_normal %}
+ {% include "timemanagement/timemanagement_singleview.html" %}
+ {% endblock %}
+{% endif %}
@@ -387,6 +93,45 @@
function fastChangeModal(){
$("#fastjumpmodal").modal("toggle");
}
+
+
+
+$(document).ready(function(){
+
+ var activeTab = localStorage.getItem('activeTabTimenagamenet');
+
+ if(activeTab != null){
+
+ if($('#' + activeTab + "-tab").find().prevObject.length != 0){
+
+ $('#' + activeTab).tab('show');
+ $(".nav-link").removeClass("active");
+
+ $("#" + activeTab + "-tab").addClass("active");
+
+ }
+ else{
+
+ $("#userown-tab").addClass("active");
+ $('#userown').tab('show');
+ }
+ }
+ else{
+
+ $("#userown-tab").addClass("active");
+ $('#userown').tab('show');
+ }
+
+
+});
+
+$('#absencetabs a').on('click', function (e) {
+ e.preventDefault();
+ lastview_name = $(this)[0]['hash'].substring(1);
+ localStorage.setItem('activeTabTimenagamenet', lastview_name);
+ });
+
+
{% if user.usertime.usetime_start == None %}
@@ -420,7 +165,7 @@
})
-{% elif userhasworkdays == False %}
+{% elif userhasworkdays == False and user.usertiem.usetime %}
diff --git a/timemanagement/templates/timemanagement/timemanagement_overview.html b/timemanagement/templates/timemanagement/timemanagement_overview.html
new file mode 100644
index 0000000..d5f2850
--- /dev/null
+++ b/timemanagement/templates/timemanagement/timemanagement_overview.html
@@ -0,0 +1 @@
+ÜBERSICHT
\ No newline at end of file
diff --git a/timemanagement/templates/timemanagement/timemanagement_singleview.html b/timemanagement/templates/timemanagement/timemanagement_singleview.html
new file mode 100644
index 0000000..b785bf8
--- /dev/null
+++ b/timemanagement/templates/timemanagement/timemanagement_singleview.html
@@ -0,0 +1,324 @@
+{% load counter_tag %}
+
+
+
{{active_month}} {{active_year}}
+
+
+
+
+
+
+
+
+
+ Start
+ Ende
+ Arbeitszeit
+ Pausen
+ Gesamtzeit
+ Gleitzeit
+
+
+
+
+ {% for da in days_this_month %}
+
+ {% getabscenceday request.user request.user da as abday %}
+
+
+
+ {{da|date:"l"}}
+
+
+ {{da|date:"d.m.y"}}
+
+
+ {% if abday != False %}
+ {{abday.reason}}
+ {% if abday.start == da%}
+ {% if abday.startday_info == "1" %}
+ (nur Vormittags)
+ {% for workday in workdays %}
+ {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {{workday.start|date:"H:i"}} - {{workday.end|date:"H:i"}},
+ {% getsumworkdayexcludebreak workday as sumworkday %}
+ {{ sumworkday }},
+ {% getsumbreak workday as sumbreakofday %}
+ {{sumbreakofday}} min. ({{workday.breaks.all|length}}),
+ {% getsumworkday workday as sumwd %}
+ {{sumwd}},
+ {% gettimeoveralldiff workday user as erg%}
+ {% if erg.1 == 0 %}
+ +{{erg.0}}
+ {% elif erg.1 == 1 %}
+ {{erg.0}}
+ {% else %}
+ -{{erg.0}}
+ {% endif %}
+
+ {% if breakmonthline < da %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+
+
+ {% elif abday.startday_info == "2" %}
+ (nur Nachmittags)
+
+ {% for workday in workdays %}
+ {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {{workday.start|date:"H:i"}} - {{workday.end|date:"H:i"}}
+ {% getsumworkdayexcludebreak workday as sumworkday %}
+ {{ sumworkday }},
+ {% getsumbreak workday as sumbreakofday %}
+ {{sumbreakofday}} min. ({{workday.breaks.all|length}}),
+ {% getsumworkday workday as sumwd %}
+ {{sumwd}},
+ {% gettimeoveralldiff workday user as erg%}
+ {% if erg.1 == 0 %}
+ +{{erg.0}}
+ {% elif erg.1 == 1 %}
+ {{erg.0}}
+ {% else %}
+ -{{erg.0}}
+ {% endif %}
+
+ {% if breakmonthline < da %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+ {% endif %}
+ {% elif abday.end == da%}
+ {% if abday.endday_info == "1" %}
+ (nur Vormittags)
+
+
+
+ {% for workday in workdays %}
+ {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {{workday.start|date:"H:i"}} - {{workday.end|date:"H:i"}}
+ {% getsumworkdayexcludebreak workday as sumworkday %}
+ {{ sumworkday }},
+ {% getsumbreak workday as sumbreakofday %}
+ {{sumbreakofday}} min. ({{workday.breaks.all|length}}),
+ {% getsumworkday workday as sumwd %}
+ {{sumwd}},
+ {% gettimeoveralldiff workday user as erg%}
+ {% if erg.1 == 0 %}
+ +{{erg.0}}
+ {% elif erg.1 == 1 %}
+ {{erg.0}}
+ {% else %}
+ -{{erg.0}}
+ {% endif %}
+
+ {% if breakmonthline < da %}
+
+
+ {% endif %}
+
+ {% endif %}
+ {% endfor %}
+
+ {% elif abday.endday_info == "2" %}
+ (nur Nachmittags)
+
+
+
+ {% for workday in workdays %}
+ {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {{workday.start|date:"H:i"}} - {{workday.end|date:"H:i"}}
+ {% getsumworkdayexcludebreak workday as sumworkday %}
+ {{ sumworkday }},
+ {% getsumbreak workday as sumbreakofday %}
+ {{sumbreakofday}} min. ({{workday.breaks.all|length}}),
+ {% getsumworkday workday as sumwd %}
+ {{sumwd}},
+ {% gettimeoveralldiff workday user as erg%}
+ {% if erg.1 == 0 %}
+ +{{erg.0}}
+ {% elif erg.1 == 1 %}
+ {{erg.0}}
+ {% else %}
+ -{{erg.0}}
+ {% endif %}
+
+ {% if breakmonthline < da %}
+
+
+ {% endif %}
+
+ {% endif %}
+ {% endfor %}
+
+ {% endif %}
+ {% endif %}
+
+ {% else %}
+ {% if abday == False %}
+ {% counterWDreset %}
+ {% for workday in workdays %}
+ {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {% getCounterWD as wd_counter %}
+
+ {% if wd_counter > 0 %}
+
+ {% endif %}
+
+
+ {% counterWDUp %}
+ {{workday.start|date:"H:i"}}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+ {% endif %}
+
+ {% if abday == False %}
+
+ {% counterWDreset %}
+ {% for workday in workdays %}
+ {% if workday.end|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {% getCounterWD as wd_counter %}
+
+ {% if wd_counter > 0 %}
+
+ {% endif %}
+
+
+ {% counterWDUp %}
+
+ {{workday.end|date:"H:i"}}
+ {% endif %}
+ {% endfor %}
+
+
+
+ {% counterWDreset %}
+ {% for workday in workdays %}
+ {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {% getCounterWD as wd_counter %}
+
+ {% if wd_counter > 0 %}
+
+ {% endif %}
+
+
+ {% counterWDUp %}
+
+ {% getsumworkdayexcludebreak workday as sumworkday %}
+ {{ sumworkday }}
+ {% endif %}
+ {% endfor %}
+
+
+
+ {% counterWDreset %}
+ {% for workday in workdays %}
+ {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {% getCounterWD as wd_counter %}
+
+ {% if wd_counter > 0 %}
+
+ {% endif %}
+
+ {% counterWDUp %}
+
+ {% getsumbreak workday as sumbreakofday %}
+ {{sumbreakofday}} min. ({{workday.breaks.all|length}})
+ {% endif %}
+ {% endfor %}
+
+
+
+
+ {% counterWDreset %}
+ {% for workday in workdays %}
+ {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {% getCounterWD as wd_counter %}
+
+ {% if wd_counter > 0 %}
+
+ {% endif %}
+
+
+ {% counterWDUp %}
+
+ {% getsumworkday workday as sumwd %}
+ {{sumwd}}
+ {% endif %}
+ {% endfor %}
+
+
+
+
+ {% counterWDreset %}
+ {% for workday in workdays %}
+ {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {% getCounterWD as wd_counter %}
+
+ {% if wd_counter > 0 %}
+
+ {% endif %}
+ {% counterWDUp %}
+ {% gettimeoveralldiff workday user as erg%}
+ {% if erg.1 == 0 %}
+ +{{erg.0}}
+ {% elif erg.1 == 1 %}
+ {{erg.0}}
+ {% else %}
+ -{{erg.0}}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+
+
+
+ {% counterWDreset %}
+ {% for workday in workdays %}
+ {% if workday.start|date:"d-m-y" == da|date:"d-m-y" %}
+
+ {% getCounterWD as wd_counter %}
+
+ {% if wd_counter > 0 %}
+
+ {% endif %}
+
+
+ {% counterWDUp %}
+ {% if breakmonthline < da %}
+
+
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+ {% else %}
+
+ {% endif %}
+
+ {% endfor %}
+
+
+
\ No newline at end of file
diff --git a/timemanagement/templates/timemanagement/timemanagement_teamview.html b/timemanagement/templates/timemanagement/timemanagement_teamview.html
new file mode 100644
index 0000000..715b5da
--- /dev/null
+++ b/timemanagement/templates/timemanagement/timemanagement_teamview.html
@@ -0,0 +1,72 @@
+{% load counter_tag %}
+
+
+
+
+ Vorname
+ Nachname
+ E-Mail
+ Agenturfunktion
+ Gleitzeit
+ Letzter Login
+
+
+
+
+
+ {% for item in usersofagency %}
+
+ {{item.first_name }}
+ {{ item.last_name }}
+ {{ item.email }}
+ {% if item.profile.func == None %}-{%else%}{{ item.profile.func }}{%endif%}
+
+ {% if item.usertime.usetime %}
+ {% loadaccounttime item as actualaccounttime %}
+ {% if actualaccounttime.1 == 0 %}
+ +{{actualaccounttime.0}}
+ {% else %}
+ -{{actualaccounttime.0}}
+ {% endif %}
+ {% else %}
+ -
+ {% endif %}
+
+ {% if item.last_login != Nonte %}{{ item.last_login }}{% endif %}
+
+ {% if item != request.user %}
+
+ {% endif %}
+
+
+ {% endfor %}
+
+
+
+
\ No newline at end of file
diff --git a/timemanagement/templates/timemanagement/tm_ab_management.html b/timemanagement/templates/timemanagement/tm_ab_management.html
index 3f23048..009dbc0 100644
--- a/timemanagement/templates/timemanagement/tm_ab_management.html
+++ b/timemanagement/templates/timemanagement/tm_ab_management.html
@@ -9,12 +9,10 @@
Abwesenheiten{% if request.user.profile.showtooltips %} {% endif %}
- {% if user|usergperm:"absencemanager" %} Abwesenheit {% endif %}
+ Abwesenheit
-
-
-