From 47b8be9670f413cd573f0dafd7248c0b08a7f55c Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Thu, 7 Oct 2021 19:39:17 +0200 Subject: [PATCH] Ansicht ADM --- adm/forms.py | 5 +- adm/templates/adm/adm_base.html | 11 ++++ adm/templates/adm/adm_tmworkday.html | 53 ++++++++++++++++++ adm/urls.py | 1 + adm/views.py | 11 ++++ .../__pycache__/counter_tag.cpython-38.pyc | Bin 24918 -> 25330 bytes standards/templatetags/counter_tag.py | 14 +++++ 7 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 adm/templates/adm/adm_tmworkday.html diff --git a/adm/forms.py b/adm/forms.py index aeacad6..2f245a7 100644 --- a/adm/forms.py +++ b/adm/forms.py @@ -22,11 +22,12 @@ class AdmWorkdayForm(forms.ModelForm): "start" : "Start", "end" : "Ende", "target" : "Zielarbeitszeit", - "freefield" : "Notiz" + "freefield" : "Notiz", + "delflag" : "Nicht berücksichtigen (delflag)" } fields = [ - "start", "end", "target", "freefield" + "start", "end", "target", "freefield", "delflag" ] widgets = { 'start': DatePickerInput(options={"format":'DD.MM.YYYY HH:mm', "locale":'de'}), diff --git a/adm/templates/adm/adm_base.html b/adm/templates/adm/adm_base.html index 6d03f8a..c5a6dc8 100644 --- a/adm/templates/adm/adm_base.html +++ b/adm/templates/adm/adm_base.html @@ -118,6 +118,17 @@ Benutzer + + {% if active_link == 'adm-tm-wd-bug' %} +
  • + {% else %} +
  • + {%endif%} + + + TM-WD-Bug +
    • +
  • diff --git a/adm/templates/adm/adm_tmworkday.html b/adm/templates/adm/adm_tmworkday.html new file mode 100644 index 0000000..fe6e9e3 --- /dev/null +++ b/adm/templates/adm/adm_tmworkday.html @@ -0,0 +1,53 @@ +{% extends "adm/adm_base.html" %} +{% block content %} +{% load adm_tags %} +{% load mathfilters %} +{% load humanize %} +{% load counter_tag %} +
    +

    Übersicht Arbeitstag und Abwesenheit +

    + + + + + + + + + {% for user in users %} + {% getADMAbsenceWorkdays user as workdays %} + + + + + {% endfor %} + +
    NameRelevante Arbeitstage
    {{user.username}} + {% for wd in workdays %} {{wd.pk}}, {% endfor %} +
    + +{% endblock content %} \ No newline at end of file diff --git a/adm/urls.py b/adm/urls.py index 2f0acda..b2d9a46 100644 --- a/adm/urls.py +++ b/adm/urls.py @@ -23,4 +23,5 @@ urlpatterns = [ path('wd//delete', AdmWorkdayDelete.as_view(), name="adm-workday-delete"), path('wd/break//delete', AdmBreakDelete.as_view(), name="adm-break-delete"), path('wd//break/add', AdmAddBreak.as_view(), name="adm-break-add"), + path('tmbug/', AdmTmWorkdayColl.as_view(), name="adm-tm-wd-bug"), ] diff --git a/adm/views.py b/adm/views.py index 39651ea..42ef70a 100644 --- a/adm/views.py +++ b/adm/views.py @@ -29,9 +29,20 @@ from django.template.loader import render_to_string from cloud.models import DataFile import math import requests +from digitaleagentur.timemanagement_utils import * # TODO: ADM-Oberfläche Auswertung machen, an welchen Tagen eines Mitarbeiters auch eine Abwesenheit +class AdmTmWorkdayColl(TemplateView): + template_name = "adm/adm_tmworkday.html" + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : "adm-tm-wd-bug"}) + + context.update({'users' : User.objects.all().order_by('username') }) + return context + ''' Prüfung, ob angemeldeter User Mitarbeiterstatus hat. IMMER PER DISPATCH EINBAUEN! ''' diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 55e1de7cb51dd4815d596974423abb179facb4a0..c550ae1e16145071bf7d2e1dd5773886d8c77aa0 100644 GIT binary patch delta 3749 zcmai%c~F!`7Qp8XGs6G@6+{t-`*H*U1ym3@A|f|LKn0}8zq&8XHt9k-V@Z9mlW%`L4Yp=blMx#V5iMIAzU;DXc zBh;_9dRJ@AuesX{LcfD8*bzGxA5QG0wjR@L*f~(29wnY9 z4W*-LEa@(zNESz(#j8Xk^4VcGBtycm{k+{!vSu^j`$Yhf4uEW8>v<6Geq z;(NJQ0K?3f%$P+W<;`49VQj}o;qzcO&WU(v_zeqQ#1CWAaCv0XV0C}wTv(6aMHb^% z(eDllA$kJ*R%%v6C&qd@a_`>_8Q#OCy^MVfwh)5-(No|RoEddy(9WTl2x+GoUdEp6 zAbc`58D6F3*aN*dCaw;S$fdbo=!0A0tZ)?X#?1w{J1sr}-~d)9%rNw^@q@S{A)FTT zXu_}IEEY|gKYl-pf$-26SCkc3o)uSZHi}+6J}C?i;-yK!a7g<5@1z)bpL~R2rnw{j zfHXGTH8nL${=_+wnf*mDHytG-CcI+~HpvA($g=kceO{gwJ<0-)_0-83aB;x8HL2dH zIIK-gR?8|O9m%2d7{v#SANvT4IM3n_85}kt-N{buPF#=^XiiLnOSn2X4Bd$!n%H*03;4u^hA%lNn<0&^=Fn&pgE4mn3P!E zU#W_-$AqGi^6ZE>eZ*RF4W)-s10iCm40aALpX#lwY_WG*74cZl`jN5Y-b3z#uq!nM zuHb>xKP-5STV5xay*(j$oIUX;k5Uo+QGJ}9ZB5NWu`Cs*s4m`NoMxP1yes4Qbg(y` zni^yHoJ1{vZ;m&iep=RyVUIc)(BYN$xX=rB@zW-spO!>tf>X`b3LpGrTEjH9_J4nbekd_efaO}sJXA`K>V1T=%;^#~N2`jFxr!l>y0&O>ZAA#alv_rb_I_@h zK_;7HGFr)bQ83nBl{X$5c*orQfgZu*mp4-%sNQWhN2g11K7=gFiZVGp_9QIgsrtBV zZHiT~yDX}~Wf854OPs*d`DVYXZ1oi59sGBGFGQoIVJz-@@`Xa_*_T?nyi((wUB)

    Jc2!T2rjvDyRO@~0?d?v*YH=xa3D%YfZ8qRZ?q$#b3jYS)^D>xIGa8I2Hlk2LrU4zv)!%FE{M)=FR zDD7%bi>W>jR$*g(nRe}(gdLhHJ3jG_Z>C@8Eus)^T zBlmn@@rVjYpz0|JJ6s~u(uc3+ z)veKW>qsYHjlLW9`gQB~0cbjkI$}ElyVn7I?t4|pOfvX!^%rs~`U$F^lTx0msfo{& z`3W(G8-|u%^^xaE-UH}7^i>356>1-PJjLl)O zi_)PEC%II_0ZI?1WSd`5p5N?L94*Sifi4X?S{MG`K%><`AOvbnUPc%V;yGUGZv1v} z8q{NGV=A$q75DOR!8GN>d zgRz3q#aPW)%UI9Yz~CLL##(KyHkZY&SXvc_t5YQNHQ8oyP_>N&P3+z&VHYu! delta 3287 zcmai$3s98T6~{RXyDY5uf(5}{9?ENZEr_7Nq96(=&jhgW!C+SQgRWV2nadKjGp)5I zHMZ73PsZA55}VZEBa(@;)h01bF`8HP8n8jX{QO-$Q~(@cBLT>@LjOm>*x z+59?)vTTS6>HeaE!RVnD%v z#y4rUhG2fP3D+kaf`>6`{->}Vx2DD5Y}0OX*l#L_;mLk+ig=U+#RA4p7(XLeLd7m_ zKSofn*<1o6_=7|0<8dp!O9s@uD6{pM-` zWNEc%1>z@(2?ib)R>m%zlT-t{u_Nh@?iXy>g9Qr;ac6SQ*WFi>SLwF!NFIJx7lY=M zeAtVPDJPQy?lhvzP&cVPLtc+qx6bLF%q4zFLfw`rC-E!RkU5{=){~5<7?a`!7121c zAQu}_PNh#pDRYH7Ak;xxhTZFYNWD8jAsSPy@HBF8dukr+lY2Rw6@mLwe*}mbX&vw! z*|x%A3{77JFZfocCjsn7XT}oUC}%%_qZx^G60c|MffLxBc|SahM>36JNQ1aFBO&ep zHT?QPujutU`&El3u!e&&4K$r=udbnSAp|1nHcQO+hCm5 ze2e`JashlY>C?i2ljLZr89cq;quE*k7qHv3L_?%dlGtR@|d@H<-*;-ae})N@({%X7GE@50{if}eTP2^7 zI`)pB7nNQ!r@K$V;^iu6@QLM4dMb4lX*&5-j8V455a#Qxhyw%H*T?^*pSXdKRwf$n zS-W_=(ga8Ga;3!(C<>n1ah$PYw{9+7GAh?D{X86B@l)_&eN{p>SEh)f5h3?k>(_W4 zLPvc+O|IYWbkltk5j=hjN2*pptnZzw1F%INx4gsh`s&%i#!^~t@l1J7v-NTKOr06>$e8`LA*?O?9oIm<=2!N^!Wk6jtFx^BC0l zHs5y>=o`Y(;(!}?rllCJ|Gc$W#}oD^;<*+Rwzu{}0>06@4CbS@Z5u@6j<);Z2wrLX z1Uh|Z)@A^-<7eM7HgXjQopm(lY9pH^QY@mjKWf0fnLq02OT#-f7*x&%4xBD$`2bk3 zwLMSEC$8Z3_HEFEJ2g%a2V|rH?xJfYv z-L?q)b=O**hn>EM_jMP7A0O$?Cm!ogCSK}JBYxF=Ys*#^c$l%BG0YfYJkHq7*voi^ zv5)Z_;|0bE#wo^G#suRW<2>U6<88*fjEjs*jK47ajQ2w58&zE8<_C;xjGK&GjN6QV zF}`HnVQ6ScB8r0$QCl#>)U2`!v6r@1ZP+P diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index 7ecf0b6..e4c2bbc 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -1110,3 +1110,17 @@ def getAbsenceLastHistory(absence): return absence.history.first() +# Gibt die Arbeitstage zurück, an denen auch eine Abwesenheit liegt +from digitaleagentur.timemanagement_utils import * +@register.simple_tag +def getADMAbsenceWorkdays(user): + workdays_final = [] + for absence in Absence.objects.filter(user=user): + for day in daterange(absence.start, absence.end): + # Arbeitstage an diesem Tag werden geladen + workdays = Workday.objects.filter(user=absence.user, start__day=day.day, start__month=day.month, start__year=day.year) + + # Wenn es Arbeitstage gibt, dann wird geprüft, ob die Abwesenheit diesen verändert hat. + for workday in workdays: + workdays_final.append(workday) + return workdays_final \ No newline at end of file