From 3b662336a0da1f09ea8cb7819622491b18e7dc41 Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Wed, 29 Jul 2020 18:41:44 +0200 Subject: [PATCH] Bugs von Basti --- .../__pycache__/counter_tag.cpython-38.pyc | Bin 15739 -> 15849 bytes standards/templatetags/counter_tag.py | 4 +- .../timemanagement/rendered_table.html | 277 +++++++++--------- .../timemanagement/timemanagement_update.html | 2 +- timemanagement/views.py | 5 +- users/templates/users/base.html | 6 + 6 files changed, 150 insertions(+), 144 deletions(-) diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index a7482e82228ada0460b218da3492da3d86d5f608..92dfcc94a5cfa5d361fb2c85aa6a6f312ceaccac 100644 GIT binary patch delta 3246 zcmai$4RBP|7037PS2mk$J~w1T5|Wi9@<@aT29f|{h!KPuLrJK>6xYqZP27C!nwt%h zHkcra0>+5Pf|h;&wxmI+A5mv4mgx-bFxE0ScBUQQXzNsI#o|zAblRy}d;a%rvay8e zPWG4k&N=s-bMHO(y#4$;7r*P-622#cC>bpAb#-rhB`% zl^WCjA?~2l%Zq74`YRRd*Ap(TUkMuJ^A!}W_lK^WE-#n*hF7ttfb7Wq*W0@sYDV! zzh?brW|P>=;Wvv`iey#gsG#otcrdC5rLMw`XElm#^l{c%aW}nFUQFk+mxva!=G??w zo)ZxvI+}BWH{|x*Ric;2>-|zkNI%d4L>QV)c46GjFzB<~IuWDA-Yp_bd%Y`N_rSs~ zyXc&ElaQ<^riQ#_h3znQhhn|G;b=V2KDb5-mbCFg`shI3+%)LrLZFLY&08zt^q;&Q zPOE#)`kWSsvGo&9Ie_tYIy>b*PooWiwz7{e_VFNBfVkGYOeMHT0M7}cvuB{r*K;Z zA{aO|84m>X;Go2`g!Ag^di5tCB4453X}YGH3w=d>FjAI#cr;-%eeZ+x0k!Nsg*D=_ zsUVdIvegxi>Sl-$*dc$p7kG%Fd88NPeOQE+T*Q6|9|hD^P;p1_h`4f8#d@J=sTiXV ziwfif5ywjI%9&oOe3GrSH1qf?ldDSx9f2=(SO;M`wLaQVx?Vg@hf5EtA}}qmGV^GZ z+swqNK&tBNmSg~&ijflD5$YMx!!y=60^?*j$IRM*>M1(uUn>sNXZ{!SW=)b#UANtN zoJ~W5R%aGb>-_rVKfuf%GC2JajHd(0A3^GnKZf)e@C@)1;HRoS{y4u%jB_n|$yc^j zdD2qMa+)wKs-mKPA~n*k)0yvL4Sh2xzb0I z<>lfece=JFb#YbkqR!j+fHPrstumZ255;iv4UES^_k=^;Tzh>LHR2`JIDcKSLj3%R z>+|xG+pns(98RBCt6X(`+3+MkhPW)JKMo$b_h@9lEK!P01%wy#UNNg1^_T6Wr_kC@6t0E_O@Q%7xI zlL_6Xr&9KUyh``~YB(L6o;DSFMw02&vLL_Grh5>jf#bxTL-yV5soVazkU8-b^QpkX zi?y{{v_Kbt$T; zbzZG8tJDvNHq+Oz3IX3!l9@48!6?Bih<=sXtC(j`W@Y+UW-eKaDOtd^3QYD{O4)(K zaQDPIJHz@we^{Cq^94-X%`hmW)w|oRkBAJBZk4a88*@tQb^VN$oboQJUf3i~tHR&A z@QgS^&6Rr#U&l;mOa`N!VR;G<_D&fdDI8-k=*@Uh1i;6#MC^swQz>JzuF> z>ijJm%X4P!-cTmqdZzsb!SBA%B2BzZql;Ryl3VgNOn*<87Wr7^Slm2!9|W^5n0gkM z&l!Pw4}&kd+EdsYG`@I{e{A@x1EP<1RhK#&V78yet5=D4CofccL>k)6#jp4yU#Bl` zoOg}>RK3JsgH16!@mM_A6G(J%!^SULiL0i$&DNn}A7Oz!3LK+7OP&;$CJUGD5)JB@ zRl9v3y7vHt{~LeRNB)`rsh>ickOwjT3q#AD@uF<~KExjY9|Ec;T&t3&Ie#wl+2cc@KA7OM6_`5o^Lp8UF%e9UYhb-;T5$&pX-I$qWg3{}M zCDzcndQE&l|Ev!TuSU2g;8x%cU?cD?;7(vOuno8y2m!r743Iz^7y@iL z&Td{-*NkcmjSKXAmMLa?$b2nx` zgjWdXrnTfQcS)1Gq*=4FhA%(MH8E`mDcbNBc0XoVi%+QqHdCeX|rE zRMuqN>kasNC8muUuda5hKe>}~@>~|(G_AwfqB{ z#y4h2NNBaJ)>32|G)sYnz=Z8_iwR4s4EnladZC*~HwwxFbg5vic!H+SIz0g6dV=Nm zczFG9CbjJUZC*YOQ|c^d@hD-6M8B;zFOeJz`lFFROtVb(3GIErlMIhdUt65&3fGE* zsy`er+?qKas@%_7TB@G@@`>msoT~j&$vOblvH0ljqIKdBJy&#C6@i{kM5eN@n@u0h z3Z$yOR!ulSRuajan~ zzo3=r`P4kez2y6t{WOC^xYdb#2GS(?EHsV)M}Z##&#M}FcTR;k&h_Y^oMMl%q$TSm zbzAp5F<}Zt;@o~0LG*Kj-bDbOYecwMRcWP7X6~MP7EEK>vT@+y(--j zm^`HxwR~>zz{~vT=b9YyEa!2Lo8HewZPdp1ME(-0zhZbYxxL1s5xyd0 z-i~N@2=~kxid8j_xQ#bw%G?G<7AsJh6q0=D;( zbN+HMGTc1hE>h7Qu7AlN`6_kQ%(_EcIa=cqC+I>=PJRP?*!1JA9O-8qc8}1%Y7U7H zh6fky6!kxWM771=Ve}3FUw`GV`pDn%KlPJE6A~R(zRS?ECS7RFPeFVIxC*G_d#A=D z6Hr0=^d0##1bgVrqB(_=niGVo^}UDDpMdvOnvxdZC9Vx`SZos0KV)f( zMDkVA#BWi3%FVwEvgyMmYsJTW$AoL4su>gJ-k@)^8@+)VfkVR!j>;+M*u%qP9-l;PR`awxz4Zr=vYHg?_zsrt#l;-~3`}f%t5^nT`s* z?p)(d1NFHth_6vyohGhOu+BSB4=?CwvJq$k?g2If-vI6f?gzF4KA;om0wTaRU^~zY z^Z}0myMRI9G2jW{AaDpcY~Uj&k70Nmcmen^a1wYCcnNqJI18Ku&I7LjuLBo>H-XE* b2=D=L4fq(i0ek{{3Va6KWDLK)Y_9k(cO3p} diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index 185a289..ffa623b 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -430,9 +430,9 @@ def getabscenceday(loggeduser, user, daytocheck): returnstat = False if(loggeduser.has_perm("users.absencemanager")): - absencedays = Absence.objects.filter(agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(agency=user.profile.agency, user=user, start__lt=daytocheck) & Absence.objects.filter(agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(agency=user.profile.agency, user=user, end=daytocheck) + absencedays = Absence.objects.filter(confirm_status=0, agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(confirm_status=0, agency=user.profile.agency, user=user, start__lt=daytocheck) & Absence.objects.filter(confirm_status=0, agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(confirm_status=0, agency=user.profile.agency, user=user, end=daytocheck) else: - absencedays = (Absence.objects.filter(agency=user.profile.agency, user=loggeduser, confirm_status=1) | Absence.objects.filter(agency=user.profile.agency, user=user, confirm_status=0)) & (Absence.objects.filter(agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(agency=user.profile.agency, user=user, start__lt=daytocheck) & Absence.objects.filter(agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(agency=user.profile.agency, user=user, end=daytocheck) ) + absencedays = (Absence.objects.filter(agency=user.profile.agency, user=loggeduser, confirm_status=1) | Absence.objects.filter(agency=user.profile.agency, user=user, confirm_status=0)) & (Absence.objects.filter(agency=user.profile.agency, user=user, start=daytocheck) | (Absence.objects.filter(agency=user.profile.agency, user=user, start__lt=daytocheck, confirm_status=0) & Absence.objects.filter(agency=user.profile.agency, user=user, end__gt=daytocheck)) | Absence.objects.filter(agency=user.profile.agency, user=user, end=daytocheck, confirm_status=0) ) if(len(absencedays) > 0): returnstat = list(absencedays)[0] diff --git a/timemanagement/templates/timemanagement/rendered_table.html b/timemanagement/templates/timemanagement/rendered_table.html index 957f917..16b5c86 100644 --- a/timemanagement/templates/timemanagement/rendered_table.html +++ b/timemanagement/templates/timemanagement/rendered_table.html @@ -1,6 +1,6 @@ {% load counter_tag %} - + {% for da in days_this_month %} - {% isfreeday user da as isfree %} + {% isfreeday user da as isfree %} {% endfor %} - + {% for us in usersofagency %} {% setdateforloopcounter forloop.counter %} {% getactdateforloopcounter as actfcounter %} - - {% for da in days_this_month %} + {% for da in days_this_month %} {% isfreeday user da as isfree %} {% isfreedayname user da as isfreename %} - {% getabscenceday user us da as abday %} - {% startdatecheck us da as startdatecheck %} - {% getthisdaynotworking us da as thisdaynotworking %} + {% getabscenceday user us da as abday %} + {% startdatecheck us da as startdatecheck %} + {% getthisdaynotworking us da as thisdaynotworking %} {% if isfree %} - - {% endfor %} + {% endfor %} {% endfor %}
@@ -9,71 +9,71 @@
{{da|date:"d D"}}
- + + {{us.get_full_name}} - {% if user|usergperm:"absencemanager" %} + {% if user|usergperm:"absencemanager" %} {% kontingent us as userkontingent %} {{userkontingent}} {% endif %} + {% elif startdatecheck == False %} {% elif thisdaynotworking == True %} - - {% elif abday != False %} - + + {% elif abday != False %} + {% if abday.confirm_status == 0 %} - {% if user|usergperm:"absencemanager" %} + {% if user|usergperm:"absencemanager" %} {% elif abday.user == user %} - + {% endif %} data-toggle="tooltip" data-placement="top" title="{% if abday.user == user %} {{abday.reason.name}} {% else %} Abwesend {% endif %} {% if abday.representator != None %} | Vertreter {{abday.representator.first_name}} {{abday.representator.last_name}} {% endif %} "> {% else %} - - {% endif %} + {% endif %} data-toggle="tooltip" data-placement="top" title="{% if abday.user == user %} {{abday.reason.name}} {% else %} Abwesend {% endif %} {% if abday.representator != None %} | Vertreter {{abday.representator.first_name}} {{abday.representator.last_name}} {% endif %} "> + {% endif %} {% elif abday.confirm_status == 1 %} - {% if user|usergperm:"absencemanager" %} - {% else %} - + {% endif %} data-toggle="tooltip" data-placement="top" title="Nicht bestätigt | {% if abday.user == user %} {{abday.reason.name}} {% else %} Abwesend {% endif %} {% if abday.representator != None %} | Vertreten durch {{abday.representator.first_name}} {{abday.representator.last_name}} {% endif %}"> {% endif %} {% else %} {% endif %} - + {% elif today == da %} @@ -158,13 +158,13 @@ {% else %} {% if da.weekday == 5 or da.weekday == 6 %} - - {% else %} - + + {% else %} + {% endif %} {% endif %}
@@ -179,7 +179,7 @@ .partialfilling.negative { background-image: linear-gradient(to left, #36b9cc 0%, #36b9cc 17%, #36b9cc 33%, #36b9cc 67%, #36b9cc 83%, #36b9cc 100%); /* your gradient */ background-position: 100% 100%; -} +} .partialfilling_nf { background-image: linear-gradient(to right, #858796 0%, #858796 17%, #858796 33%, #858796 67%, #858796 83%, #858796 100%); /* your gradient */ @@ -188,7 +188,7 @@ .partialfilling_nf.negative_nf { background-image: linear-gradient(to left, #858796 0%, #858796 17%, #858796 33%, #858796 67%, #858796 83%, #858796 100%); /* your gradient */ background-position: 100% 100%; -} +} @@ -212,15 +212,15 @@ {% getsomemonths as months %} - {% for m in months %} - {% endfor %} -
+
-
+
@@ -229,12 +229,12 @@ - - - diff --git a/timemanagement/templates/timemanagement/timemanagement_update.html b/timemanagement/templates/timemanagement/timemanagement_update.html index e9f82ac..b5413ff 100644 --- a/timemanagement/templates/timemanagement/timemanagement_update.html +++ b/timemanagement/templates/timemanagement/timemanagement_update.html @@ -34,7 +34,7 @@ {{forloop.counter}} {{break.start|date:"H:i"}} {{break.end|date:"H:i"}} - + {% endfor %} diff --git a/timemanagement/views.py b/timemanagement/views.py index 5f019b6..ffdd255 100644 --- a/timemanagement/views.py +++ b/timemanagement/views.py @@ -134,8 +134,7 @@ def AbsenceManagmenet(request, activemonth=False, activeyear=False): if(request.method == "POST"): ''' - Nachdem eine neue Abwesenheit gespeichert wurde, geht es zur normalen Seite zurück, jedoch mit den Daten des - aktuell angezeigten Monate/Jahr + Nachdem eine neue Abwesenheit gespeichert wurde, geht es zur normalen Seite zurück, jedoch mit den Daten des aktuell angezeigten Monate/Jahr ''' if(request.POST.get("form_type") == "absenceform"): @@ -332,7 +331,7 @@ def TimeManagement(request, activemonth=False, activeyear=False): "days_this_month" : get_datetime_range(int(active_year), int(activemonth)), "workdays" : Workday.objects.filter(agency=request.user.profile.agency, user=request.user, start__month=activemonth, start__year=active_year).order_by("start").exclude(end=None), "userhasworkdays" : user_has_workdays - } + } return render(request, 'timemanagement/timemanagement_management.html', context) diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 039a3f8..53c39ed 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -170,6 +170,12 @@ {% endif %} + + {% if request.user.profile.agency.module_timemanagement %} {% if active_link == 'abscence' %}