From b7a1587da8308e121bcc8d72975c4f84833d2d22 Mon Sep 17 00:00:00 2001 From: emile Date: Thu, 20 Feb 2025 21:15:44 +0200 Subject: [PATCH] new --- .DS_Store | Bin 8196 -> 8196 bytes osinaweb/.DS_Store | Bin 10244 -> 14340 bytes osinaweb/db.sqlite3 | Bin 2142208 -> 2142208 bytes osinaweb/osinacore/.DS_Store | Bin 10244 -> 10244 bytes .../__pycache__/models.cpython-310.pyc | Bin 17451 -> 17451 bytes .../add/__pycache__/views.cpython-310.pyc | Bin 16706 -> 17119 bytes osinaweb/osinacore/add/views.py | 14 +++++++++++++- .../edit/__pycache__/views.cpython-310.pyc | Bin 12637 -> 12629 bytes osinaweb/osinacore/models.py | 5 ----- .../partials/recent-activities.html | 3 ++- osinaweb/static/.DS_Store | Bin 10244 -> 10244 bytes osinaweb/static/js/.DS_Store | Bin 10244 -> 10244 bytes 12 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.DS_Store b/.DS_Store index a67d9ec8e4f0dccc3439c1451998abbc3f0f18f8..d93c0b3e67be39c551d9dac6a2ee308b34c29deb 100644 GIT binary patch delta 156 zcmZp1XmOa}FUrfnz`)4BAi&_6lb@WFlb;0S3v5hW%)XhOgM~vAB+bI0$B@pD$xwo< z1Sq~9i1q%10RzKi9)aVG+b3TUC{z=#t~RmMQLr?r)lsN6G%&Z&Q82ZzsIBGX5LMQ< q4vNpt$<52}oSY*l&)79tP()<&0>KPMCOwADT*8`+o1;WlaRUG`RVm{D delta 147 zcmZp1XmOa}FUZ5dz`)4BAi$85ZWx@LpIfl8a2or>2Eonj94s7+Jd;fXjx+9<{70bB zU81_$$kI$l!PwHGR!5=Q(#SwZ!Nl0Cww9AaR9W9TC_XzUH!r^nXdcK&pqXI63#DOH h_v8h_BAbs3W-v0PF4$}+tjW09nCA-fW_F3c>;PB;A|(I- diff --git a/osinaweb/.DS_Store b/osinaweb/.DS_Store index c79a6df226032510da434ad1048d2d045012cb4a..a865cf68d858205ecce6c4ad1b46403c5b947a98 100644 GIT binary patch delta 571 zcmZn(Xem%&U|?W$DortDU@!nOIe-{M3-ADmHUQwxj9)1{0j z3o{CDRuZ_+giq1ty~1UT_!LZjFZu?r{B-dWpzEH4oG8d>Dh6~i7lR%{I?#(HK%CBy z2lQ|eL#k&^esWSyeiBd~!<(CVB!t=d(L!c2i&O&+uNh1ZkTSs`XFM6nLA;ETte`*y z#uhh_a7B(WV7R_#p3JYJ%L$5_13=6$*@j1&hY1qB7GQxKm5G~A%7igtbDR>EaIdZ9 R-b+wV@#*55so7p*7 zI2ffs>Ne{N-e;P8P@x>5*nYCGsNm)sBB_k%;y=XR0EPBVUMNw-D7x7}L708Aim>ox zB>|bqCW_ub;XFxJpaXzF0qA4~S7fJey!f7ZGQWu~4@es1%myHy>|-L$sR3kwL<}b9 Pm`vPksH((-W@_3DlR>w;S8xu#_$sULjVXT0H7VC`RGamemMHn&sM_hSbg1c z5^fvo^t=Ee{lX3JFnoV(f5Yl#$?s7#kEY0KW5}n3RKpuI3|&l zvo+cHm$IInX2MK|67fg4fK=u1;ldm7AjTv;TLAD>Ox$xmpF2*W^gY z;lPs&II{l#|4`@EuHxDUS8Zj$kovz+`#g3EW;d{53j+qtPo7=btS*>(9+3_t_tS5e zG2&$){!P3i{z3em_^xzDXe0 zpD3R|9i^V5zC!g=eN=`@qPFX_hAzHMyR8$~>DM3{`c8R$9^IfZ7z^F7@B1+!3|Wp5 z_NtTM9!J0b0UITG7JSj#_%b^Q;X2fEk`0sFbpfDn{g4e+&sHQOq-$QKQ8WAsF2(0j zd>$=eT|dcIRnzoL$Q82$?LD$wiBI*84+{>+t7%Rw|+7rJP+$@Z5>2hi^uiG#?=1A9y4af z(t(t&J>9Lx4(`gD-N^%Kc&Oxs&iX6m{IL@PhKS+9SYRDHQ5N4W@VI!J&bcq(Ur-}h~3laczmzNP?Ud9>K=5VtOl_dg>=QM z8h%69Tf2G^eexILDKnkjHoz7#c>i!||8Oi8kD+fPX~7&4Gm85kYvMcxYDf)u1BR*x zl-UfP91sd=%%J@~13B4;zK0|MllX*We;yMhq#IsC@%a^XHj}Lm0N`Dc2I6h;rubVi zFS-_DJc3b%KZCnOIzkFX>ZWz{7V9SQU-%1a^ftTH!QyLP4#EV0 z=)w_cku`ZzDuW%|IH;y?0^!fxA+E{!SLYe$ey7hVIDYPU*3ssm*`Kn5Y_t6%`&s)z zdn0p)ImM(Ig}y1C6Q2=-{3QPhznfply(66B#<_7zepMQwt*_r=WfB!XVwYR5+-AQ9 zmka95&a*4VLxvIZ1--#wP*d@U5VhVpE44!s(>#nu&q)hW+j(hKX*o2#eD=Il|7i2T zZW zsMF06tw4B_Kg}I=CLHV88s_ix8`PMshkTxBwPdC8(?s21_240@<8WvAU%g}mjmpvX zY~pj9jL^Z@V|`h5|G_PNK2MwB>(~`frZT;;9hE7*|K8%0H zJl~^NT0MHzF}J-|T!s%Cs)&nJwGrYnYjdRPb%8F8kcEBux*b&*ORc&c@|(@JHgFEN znfx3HO<03+!;4oqqJ@17=)Er%n;j3GdOmhN8h(MkfTGRm`z;#^DF!^jhRg5iCn}9_ z4bvms$8waeSoH@qV^ddVj~*_V3}`9EPECjn(=*`QAl!a_#j7ZqZuqByS_^v_5WH7K LjrG=Xxmx%KG>vSC delta 2029 zcma)+duS9#9LIO|b=kX{-Ahce#^f%W)I9ah*}J{lyHiPGELufOs95TwCf1}%8F7REREN@_X8m8f8gl^ zkK$Wr%&b-ox9)X&1DbAx4PV$B@R-O%L38(DYizI;P_a}T8EoaNkWkGqK#$pbcw+An zDypRgO06{BoK(mED0DHnpeNFc@CezKjAR!hu7h0I0Ogb zMR+@&8OegYg=1NK@}@LhOMC&2xi@a_j@vuqc6i{HG*$#w9I(z5j=*(r2X+i`#iv$V zAK9JEdM2k3G_CohskU`f+s39XO>0UaVU{pzA%J)tv`%wDCNmGL-CEc9S=KI2U^0uq zI_-njPd7BTtko8`#7;mfm5s_yPCzK#O+1arjp#XpVT8hd5+YSR*xJ5JIGHx@;-pi+jC0!5^fQT&-$HOtox`;rBFGjGD-K*tfrL%Pk4keX}p z>4q0@A@cC7x)5+x(T{QeIW-&4Kd(-sqt(gLSLfAAzNsqOm>epHRWSq6Hx?nlVQ^T@ zwW5$2vi|<8D%$XJiU%2Cf6(Jce#0LET=G7cG>Mvy!U#B#bUQqs>xJ&R8y$(N$gg^ z=k*0Pu9=Z)ZV z5^MH3Nwd$@U63(Vsi41%wPAamYd%@h;JPNqDpt9u3Q5H(?M5~CE{M~=t$j@kqX<~% W9%`{LA*rSW;9jg2liR&ok^Db;r4I%G diff --git a/osinaweb/osinacore/.DS_Store b/osinaweb/osinacore/.DS_Store index a53abd4d3594e0a5520d34e428832477d6d20cab..f8ee0539e902850e31b993d53f430c8df62e8386 100644 GIT binary patch delta 77 zcmV-T0J8stP=rvhoe}}Jlb#ZBCKr2qG&w9FIW&DNAbT+|H#jUHH8?nZeF+E^BQHBr jUu$e_Zf}W`{1G1kinCV}une;WAp8WAtPw1;FBR7U#7h|= delta 38 ucmZn(XbIRbS7@?=SQ)#qrH+D;k?G{QVh)=lgxB(HW>@&dviZLVGcy4B+zg-q diff --git a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc index 30ec5955c66cd2c951af469a06daee3de60affdc..def09b2576ee0264744e3575bcba9e19315d2b6e 100644 GIT binary patch delta 457 zcmWNMPe_vi96){3&AIw=Hf5V`x|++Dg@0Ic)VKAQE?p`;bSRqy6?Kpb%0^x)a8_jT zV;E9UP%;uC`7x}lsOT_q1VI@=r358)3%djbeedv&58gzUi7ZCHVYtdH;-{w$J0^`| z6?o)KMHaW%?04}?-rj>({@E|nBo`e?f?9O^hIW1Gyak=w>%xYq>7`)^>jgt$za*;1 zIUsY@d#d`Z^of8anRoiN+uaNYb)d!vyXD&Q633<2^MaESsy#%%4Aqtxl%Be?Wb|!a z7Ys|4_dS7RPg5p0nm=PmCNe^$x>iLYAhDJqYV=8q0TFqNAypJ4R+|?&KWo-#n>nVnqEH$qF>@p z7?XvrXI#e!m zNKhRTOFG2Mf_{twqfuU@pNqej+N};s6c+S7hv)dfGixzxVO}&%_cojE!GZp)r{;xh zymC3)!XpmjA%2-Ly70+A;}!wA>5NgOY3C+1>zwO8gtf^F}(#qRgpPmV!lTE&t3XDfB;JSyTRb zSk*+u4*01zDh+t2qg9>oTh^;zV#wXV3I&n~j*_eHntG^|P;HW3`l{B12Ki7oPEg|Y z%k0xwgA+n}yfFwZdVbG-XxFK|yR$g0FAlWAfc|N6K!^T4_z{wl4oxtk@#Ybj)YU^S zxF?zLYec6bL!erIH~}e{Y)P{vz0oG#i$o{viN@G-9_hDO2$rPu$agZzQG4Qt=C^H! OU+O#d69{CT;>6Y&R diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc index adc921fac7473adaf2cdd443ad64d6892eef39b1..9bd17d34e42a01427c2e8beea7f55c28fbf3dc10 100644 GIT binary patch delta 1550 zcmZvcTWl0%6vyYx%+7ANd+WB_E3|7vX-hA3v8A+bmsS#AFi3!CTpre?Gg)@qy)g4t zq?w_?h8L2?#1k~pXm&9^_(C)d81ISthEPN88tH^fv##0y2gvsL4RyZL^5X3qcI zzHesVe-gep2)?}6>lXOu&i>a^i<#Gam)iV6e(B3+d!RhUA?t5!~k`ZL_}75%EG1eTixiZfLu!KySXi$T@PZ+WKOteQ9E z=Q2U{&4J~8M96t$f#0p!mj!{os$h8^6>_jwU?J0Oil)c(s{T3I@|nJ3ZHW{Cvx1kd zdO@=MOfvnfuE^_9&Wxf4O<$&7t)6pO0W&bO9KagXnpxN`s3B8IgH^>EO+l?St7fI` zLTBBUPEn`5i~H3i(-JJ5)e;FZJH>c?A)n5%M1m!ai9{l480l0_Qxhy74;U<|v;U}V zH_Nl+Wcg0qzibaICo`t9>3~lVzKilQ)1e)t3-8VA6X{$kygNUo8^hsgaW`Mtunh)Y zUmbxVY;LdZ4o7$Cv2fHVBy-{MNnU@Xm1$3~o|LX>xt_tkzSh{ZGrE@iG3;-jfF>-q z_r`4RR_c3foTVR6vwe0&GQ}fOd?s7kK9#jAs4rEUWJz1%I@`P4uAz< z>dm}ay^8P-;cdck!iOBTqujUc%%*cwOfzif-@*TkUY?wK)%{!^4~$Rgy2iJXHkN$) z8@RP&+v+XcsfaEJf+ETwf_&E_$xE^%E_oa-@PG^I!7bv^j^=vsYwm|rcw^0ja0X*tqwoOEbhW`*e7Wmz z=wG@1F^OvkXYir!zH&q>9_bGAs1LeFVJDAj!j>L4oWqM9D{AzQxVBT-qVq!)mP?() zc+X3)2k-VY!1?+5-j&dDK;$nXWp#@lK8h%cd_d){OLj?a&@WJ?=Ksq?IVo&9jD?jo zcw}t`p5}S$B+%{o_P!>7i?}J$#+i<6h7ul&w8N$O&m&n8uHxqYCb)vB{%vp)-|QcQ z1-#S07Or9Uz=*O)nHMlW5Q0TKIB=QInOeUGZsKR__ul(6Id2hu;fM!~sX`&opKw(x z@CQB1&rZKa-tP(Jty{#|!3f;IV}t8q9B9fyalsLjc?q2@+wsPrN-e0zn)YZV@YC{^8*l0lawY zzWq>*EV>ig@N~2b!gwe8Zm2x4Q|H0EImG%K6d2SN;xeA@G@(V(*5``zys$MR14@qSLW!D{mulnooy;u-7 z;+a?kR-wG{6W;l!8xL(bL5kCavxIYm^Mnfon{bJsP`XM&n6L_;8$AHMxMFPeUq*hx AX#fBK delta 1247 zcmZ{jYiJx*6vyYxOlD_iH?Pg6ZknWB7uIx}?Z)kDnq**zW<*4U`9 zWB9#=x2C7(8GTvnzW0VsHDt6|Dutw~ZnYJxEleNS6_!Rwh)fWqMPG6?2Y!oNqi;xAe_RB(JpAi=~%5t(-l=Nnx7_fKR&u;U*O-);zRE0 zXPhG7VAPLFtfpua!p>NbtOjFU@Gx10VSxe1Hs*Qy?90=q0_0)|f3KBr_J57;jK5U-;(tn~o>aP0EPZiyK3)s(F<#jkCTfXZ zn8dzB1Dv1To5;%bU(kR@<$RTjGkzcp_;UF%J{c*~ z8cPd1OFJ$uaqDG9(R3Mut#P=DeXY%K1Yd4_L%t4h?=ppzG% zx1kzz0=3&-O{_?>za`%U0DP_eS#V)x$Kz0g*^Wl=ZS-rR>03&a`a$b8_NamM`O>&IDY?k2>3uH#k94lEgIzZM789i$Btm zd(AFmisGQvK!QJ6#m?d{oLL{hC%Sx)z|pQa1aP|R9B7#DKG1TU1@ny4j0MIS##zQ9 X<2>UQV};>o^8jw^*#{v!)^pcC?HEv3 diff --git a/osinaweb/osinacore/add/views.py b/osinaweb/osinacore/add/views.py index 1d493c42..39017f9a 100644 --- a/osinaweb/osinacore/add/views.py +++ b/osinaweb/osinacore/add/views.py @@ -522,6 +522,18 @@ def add_daily_report(request): user = request.user today = date.today() statuses = Status.objects.filter(staff=user.staffprofile, date_time__date=today) + # Calculate total time worked for today + total_time = PointActivity.objects.filter( + point__task__assigned_to=user.staffprofile, + start_time__date=today + ).aggregate(Sum('total_time'))['total_time__sum'] or timedelta() + + total_seconds = int(total_time.total_seconds()) + hours = total_seconds // 3600 + minutes = (total_seconds % 3600) // 60 + seconds = total_seconds % 60 + total_time_text = f'Total working hours: {hours}h {minutes}m {seconds}s' + if request.method == 'POST': text = request.POST.get('text') current_datetime = datetime.now() @@ -540,7 +552,7 @@ def add_daily_report(request): ) dailyreport.save() - status_text = f'Added my daily report.' + status_text = f'Added my daily report.
{total_time_text}' status = Status(text=status_text, date_time=timezone.now(), staff=request.user.staffprofile, type='Daily Report', type_id=dailyreport.id) status.save() diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc index 3ce92b3b3d24168fde068ae85091f7d29042ad1c..cb8b619b79f51e5ec34431e269a4c562297cc8d2 100644 GIT binary patch delta 804 zcma*jKS%;m90%~8W#;9TWSU88W}>20OAt*#QxG-O)R1Y4T=b9EBMNMY=BBqskkS9r z^l}P{hKBwP4K*0GH$+>|BHh=<>yHQb;dhUF_kG`cjyy!f8Br9z-1JDSD!68V3BVY$9KIU;c(-_CW1Xu&dAOo`Ux@UlN7LT!w zg&hUIxug?tm)BubWe$2gPyI~mgnzp&NI=U#!34Swyj z*?w=&3qGql`_I0oh{*DFk5x|iKUAG9rFAa&8u(ejqRt-l+M8-=GeUl>&+Wk>;}3;R wG7r9?@N(OKh0Ry^y6TUQd92;yAIaEMEPsvZ2Hb)>@cl#j+rxz9c&a1)1=&2oD*ylh delta 784 zcma)&O-lk%6ox(1q~qAwq?IOWX%jMN6hYA@2wFsoR<St8SeK zh2LOuyyn#THHeyI8+i|mF)~ZWgDy5jwa98P19|cke0F$&hX%$A9GF=s(pjyOiNAtn$fh)TaxJoyl3 z#4oqQIe~~%EZ{>CQ9_91*5fn^T?5d6h4($gK84((*5i2*@wYf>3;D$=xreZibaa{- zwW2AZW?5K>r?psoR!e4*TJ}pFn_nO<=^V|*b%_6(BZ-d*3c0zqIkv*Crhk0fD!y;9 zYsr|B?aWWRt+mQ@|7KVEOcx5IB@z`slSQp>Z%$)9@>1ok#*C@AR`m}1RVD40-JGCy XV6BohoxtAXgOU;H$pRSUpttw|h@H0- diff --git a/osinaweb/osinacore/models.py b/osinaweb/osinacore/models.py index cfdaa7be..25be9240 100644 --- a/osinaweb/osinacore/models.py +++ b/osinaweb/osinacore/models.py @@ -12,12 +12,7 @@ from asgiref.sync import async_to_sync from channels.layers import get_channel_layer from datetime import timedelta - - # Create your models here. - - - class Reference(models.Model): name = models.CharField(max_length=50) date = models.DateField() diff --git a/osinaweb/osinacore/templates/details_templates/partials/recent-activities.html b/osinaweb/osinacore/templates/details_templates/partials/recent-activities.html index 2e962e1a..e5911ee6 100644 --- a/osinaweb/osinacore/templates/details_templates/partials/recent-activities.html +++ b/osinaweb/osinacore/templates/details_templates/partials/recent-activities.html @@ -166,7 +166,8 @@