From 010a978779db3d1a1d068db94031cd52ea786741 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Thu, 28 Jan 2021 09:14:38 +0100 Subject: [PATCH] =?UTF-8?q?Pr=C3=BCfung=20f=C3=BCr=20Beginn=20Zeiterfassun?= =?UTF-8?q?g=20oben=20bei=20der=20Uhr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/counter_tag.cpython-38.pyc | Bin 22991 -> 23275 bytes standards/templatetags/counter_tag.py | 20 +++++++++++++++++- users/templates/users/base.html | 3 ++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index fc5ad0420df9d657918e4ee59b4d2449e2c8d3ff..e62d98eafeac3405dbae0272ec4878f5e05e9ced 100644 GIT binary patch delta 3605 zcmai0dr*|u72o^qw{LgBeXtAc@(K?Z5tLV01&YW+Fd!=UiW%MVtq3jZt|W@#~-jVk=z=&`OV2=27FS;;Fi8`RSS$sK7*o3df6YLKmNQri9S zQ*~>U`mC~9P**7?Ka8t=cES6+GAO8Pm95H;x2m9CPKvVsOxZ3LS{0QaHp`wk!Tt+n zr=YeeDrHx2L$eAF$_Jv7URDl@rCvq1OywOOS*-~r!qJ4-0SWC~fFqQG5LOMbJ*s}D zuzsnJ^{G0f4)sP2cPkQpOSnfHGP^6oub;P=H-1d&2i{mst&{Bs(!hr9R1MtsfVojk-~@2yofFoXzlJ&LJ{rvdBDFB|10gAI=dCG3C2_BSoBe9ZzqpOZkUyp zqirSk(_w9z!)}+zeG4NShQ5~r{$y~KI~X)jGV8NLTtjSZekPjzg25OqndvH8sOv4W&Cv49wXS?B4riXn1 zf6aW2y$>&D<+8(YCd=hKgbZG7G@%OcY01MBL8!Dd_SJCBIL5ab3m75WF#y z5f#o-5PWarN<B~3-Zw9BiT;&F^pyJU;Z*FI!KCi(SUxJ zC;Uj1i3$Jv#|C97Y&u-EsevX)(DmdS4gPR5qd^M{fcAPjxwWwvr zKf%T7Y<3>z>s+uSH{Ptq{t^;BM&h5spIjcekXy<|AtrCFLq}_(Ct*q2sV6ahN$?Ei z&0~LrD|ue_nTT@yY>P97xF<}S;5ITI87ZGV%GhQ2c1|KipDMSIFYa zQGc^&F8b%6i6HYyg2?B~a3Fs^y9j^JFJ$qMT;OC^MQj%pbh2T1qrhj+AQPg|mzkaw zGyVnnYlHa0*UdS!hy#y?-x3Yws@VW{3WJs#NQ-E@xxcF|z^_BNsD;gjQ$-%>b~KcC zi)La(W)v64&L@!!71AHM-Z^OEwvv!IqCW5htWloAMr{Shr*NSJ4Q z82&ZSYl>zc={ySQrR!N3wwLBHCmb(5P$N`Oc5G44&IoPMXN2a8Kg?XJQf?(DMJj6| zQdr?8{EirSpwr*ph5dqCX#J3Is(=3$8=H_P_10g)D>2bqbhl;jy{MoPcL zA%1)sk7{+ZDzRREy;A zjM#MANq$8=Or+0s_=(p}9#I`cpceoiffW@=2~%Q7L>n#J3F2T!MG1Qe#wvU)X+)Z@ zX4BnBZ|0Pb{5rukh^tJM_Nl;EIZr!ElzI`cpI17jU7@qjMVd;IVYJc-Co8QoR;U*) zSDt5X7+z4J6=r0^*9+#vzDm1C355T{P*|0cH4F7c^qT{I-rlvoJECdtqLQ%L%4#u2|@_RUmQV*|u8l zd?pm;mC&)!ols6fEkeDFwI#$#c8S+c3O=!LVcx?s$+RjI*=D@>+o#KnUw@BJQGlWg z>T+ETBs$tC?+cD)y#Bu6dbSWQ)}?AI$=o`)SC{QtHMzq&VG8b8Bq9Q9>V2j%;w4Rd zJ`B}o#;yOKkVyOqVz=QdYS6_e<;hH9R;I-(kvB#yNHQBn_Aknp*bTVUP|U7FY-6$Z z8aft9g3lY=u%WS&CBtWpTv#j$CTWVr(6-rH)3b z*eMz9A|soS<~4F3&Lifh{hK=jU12Q1aBpZz>6&QcWa)}4AQzOSx!5dWX#@KRt}XSk z4mj8Bfs$pd=G)|yNF<4OPEg$@U3+WD9}MR4jSQMvoS<%YnD0*E>_X032sX#DAPhEF zm{r)_?@Q^ywdLk+w9>2LHZms&1ueB$Ws^K1THQ4ALdzH%p!Yg|li)3acM0Aj_<-O; zf>Q(^6VSthpCu5t_63@KLhvcUC4vaSRe~=FZV}ujxI-{baF0MoF*UFpL?=x}OG=`d zmtYP-0YM=_5kWEBS>Y}#rRf5KT7r6lMFdX}G!oFmoOcj(5_A#t5QM1AVdF{*TMk=R R4jJ?^Ga7LuLGr32{{_8jXq^B6 delta 3298 zcmZuz3viRi5!U^Zem!hS*m@WgECI#{*~Skr7Pi5*aQ(pGU}D1*rxPLk3tL9A;3S7Y zO=)Y|8PZM*-cBFWPI1zdI)N0Z6H*9GoTMZq1c+%Gs7M0Mw9Pol(55BR4jG`kCxg`z zjs8#n?c=+>y}dns{46^^%FJs`CZh^JZ~tAl;UB&G%rjZR(ZW`BmeL(;3%PseC_PGe zw`!1e!X9;3mXZ-%FQkts+f&k;>PnmPO=WPmsxu%oyOnQ|23j<(EJYRU62eE7@1)GP zYjPcmO4%Ff?obKMK4nN~df<>|L{@a|D(}J39&P+Sr$k{*ehm1l#it&h_+B_Vd-=-w zJGBGaUY(-atmZWd{eX6mG1Y*EWcV1St9p$-)lSXUnncEcM$ryRUy*joJ9RjcCrA37 zvLX-Y2V@wS)9X%ZxA1UZf)C>qNnJeD73)*tNm&U$9E~Yn1IT%0(3n@4zn)o_N%}elypMX$)rM;h=#m?XqE~M8;`~{@=8kEhm+mDlB8W%r-0{FVe>3*Ix zCkd(v_7UtSpegw8;0N;-+IM{c_lt0O-f4YO-pE72&2bp<)UZA9p(mHU0^0e<*chCg zUtIbUaV#LP5p)m?6Fi0Bl~eIQMuNu)UIwSPiv0}Mdfn_4^jdRa$lD|To@_Iqt}qW0 z#nYU^RWs$9)Tct|k3w^Shdm8j3heAP_;$gtbBstab`=*K7Li7=^q~T`g%+LEg&ygO z^eZ9$5^OED<_L1_WM0Wp1otZZxUgi#F=UFHQAitEz%;mZM%+ODI$SM0kbQuxe}&-H zr7|f9Wg_GU;b@V=euQ2R6C5S@4Z$e9TQnP!b*tz;b_Sda9`sG|Xj1zyOm-<6eDi8K z)%3kQhZZcbUZ4o|s8&g4Nfg$bSOK=7V#P$X{}Y*5Djy-SIz{;gzVjpS(_(kdWg^PN zu?j0S8>w)i5~P z0o8oc5KjboA`plqyc+(0I$fww2?V-@23i-*T}^siwFcK5;9Efke=}yLp~e)#J5QP3_baO;DRsTy7+E9noNub-9N`7wvD=$I2gMG ziz^>=-z4i>2%Xt@!sD^NKp-3s^u!`z>_Pkz9Ik9-C*Wpfz34@_fs?(cwQ3Ekh5c0? zjRvvcZ0x&Xrmx>qx-6JSOL}Q#BKcWtN6y} zAUw&Ex@fqsKM{)GU{%-#J2tQv|!t8Kv*+`?9jjD5px->t&L!Te75?`#CgXA#{mytRr+N6|FxB{0l0O)i@;db{SAtV`6?7%^m!#Zr3H(;H3rAwJ^6jU=KadRgj} zn^53&OtmU*K_&MR6cC&ypyhHi==^Rbl29s=U?DC#(y5?l&~O6|F<)YLtR$e$&wmZQ zewQ;XEhNk$bvA(w9``R{KZ48tN_i#U%%<>fC z1WEn&P!Mm|O|hgFcO9!nMro%Z5{tz{N-z<^OYeIPjcfw`*igtyfHj6J26cMXFGQIQ z_B7^6r3~71IdH1cVzEq_U<+C#Oe%F*I_{=GO2N{UZ?cmOR;Eg&=H=jT+J-mE@us5e znIxA0^#O%`y4Vg3R4GO6*4~D597_zT1p;YN|5G* zhLh#6xNbth(S(%x`5=8w{pkvmGm(7FQHwbsFU;fHJM%-7OvVre#&rYMGn{|H3A^g`phrtE*F z*={9m|LFd8r`fJ&XnoHSyg=|G!7Bu(2wo$2o!|_?n*?VG&J(;vFi!9e!9{}i2tFXV zMsS_r-vl=ZJ}035&vgWLwhK|TBkCsHLr_9cMzD}z5kWaZr-Kf7ez; z((%Nhg`c2-pqXF=K?}huf*?T;!DfO8L5x7!D!PD0zZCzR_eVlhldAXwFtmPHYrw19 J0o9#H{tMxD6JY=V diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index 7882219..04d9fdd 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -341,6 +341,16 @@ def getactualworkingday(user): returnstat = list(wd)[0].start return returnstat +@register.simple_tag +def getIsUserStartTime(user): + + today = date.today() + starttime = False + if today >= user.usertime.usetime_start: + starttime = True + + return starttime + # Berechnet die gesamte Arbeitszeit im Monat und gibt diese zurück @register.simple_tag def loadmonthwork(nextmonth, user): @@ -356,8 +366,16 @@ def loadmonthwork(nextmonth, user): for ele in workdays.all(): if ele.end != None: - print(ele) finalsum += (ele.end - ele.start).seconds + + breaksum = 0 + for ele in workdays.all(): + for b in ele.breaks.all(): + if(b.end != None): + breaksum += (b.end - b.start).seconds + + finalsum -= breaksum + mon, sec = divmod(finalsum, 60) hr, mon = divmod(mon, 60) #return ("%d Stunden und %02d:%02d" % (hr, mon, sec)) diff --git a/users/templates/users/base.html b/users/templates/users/base.html index bed69c1..5c6162d 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -429,7 +429,8 @@