From 412eb763db10d08f857b459d320e4592a21d51b7 Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Fri, 24 Jan 2025 21:09:52 -0300 Subject: [PATCH] =?UTF-8?q?feat:=20notifica=C3=A7=C3=A3o=20gar=C3=A7om?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comandas/__pycache__/urls.cpython-310.pyc | Bin 1084 -> 1132 bytes .../__pycache__/views.cpython-310.pyc | Bin 2788 -> 3666 bytes gestaoRaul/comandas/urls.py | 1 + gestaoRaul/comandas/views.py | 40 +++++++++++++++++ gestaoRaul/db.sqlite3 | Bin 303104 -> 311296 bytes .../orders/__pycache__/urls.cpython-310.pyc | Bin 469 -> 517 bytes .../orders/__pycache__/views.cpython-310.pyc | Bin 1376 -> 2217 bytes gestaoRaul/orders/templates/orders.html | 4 +- gestaoRaul/orders/views.py | 41 ++---------------- .../templates/static/comandas/js/comandas.js | 7 +-- 10 files changed, 48 insertions(+), 45 deletions(-) diff --git a/gestaoRaul/comandas/__pycache__/urls.cpython-310.pyc b/gestaoRaul/comandas/__pycache__/urls.cpython-310.pyc index 4c1d3eed140a701bf1e7de05dfaf90fa2139c286..5962582d9d172c324e0317cb3328508d091d774b 100644 GIT binary patch delta 227 zcmdnP@rHvhpO=@50SFFrPD!_9oyaG{_->+hu23ptia;uB7FUX33VSbeI$IR?#8n{* zKvB6=<}9HUd9WyZlyE9{s<1gj6nBb3FoUMzWC6x)QapM2C7EfN$%)B{`TDoGk$9Vr zG8Qv3icGd-b`mP$0a|*CyR;~$AhDz*wJ5K6axb%-LXj{~I7%R+B)1|SNp2-Wkr+^- lNNn;kW?CxHyR;~$AhDz*wJ5K+hzDr! z<71q_eC3U;wIF9XPW~ky-O-&4J2+Y7ha6BmwgPlr36$nF@(pR>n=+U{l z?JzF6pvtpglO4-h*ehy&2meA_HslAuB1NV6&Xu|yXH9qM>fCc*y5BkHJE!dTJq^FR z{@)JoUDLFGQs?cTfzB`RRR2N4HO?|EXCY%G>zSS#p`m0WGjl7nlx${p?u1V6hOX*c zSugiOFZV-V_3bRk`(ZyHgag%gvZZ_&4wdX?*Yf3XS;@WZdcG2_DA~(y5VPog2$q9 zMa&ZsPb75KRyiwV!#;)VY?XOb@TeI)6eXWcWY@=5_Ewg}g@k173G4yE=_Wxme;rp5 z-h)F?&Zc7#Kc8WL{%;4L_aGAg_6S%!|mP1et7S9JG&1?Ec7ZF$yqfX zC&fvB(q5|CJd$~aTe@>aW99hlYGjKZPHmj>X$nlL#y&_g84EEWtr2CJupo_$#-WSF zl@u%JiyLUZ*2D&0uRq@UX#Y1=EUNt%aVE?C`{iVo1FvfT(W75(Z|xsqRa8ETX4(Gy z^!?)`eo<{szfijku}eiLEbAUyW=eMjr9Q?eA{0vhf>3LzcFs7vAbj+ioiU(eq-ILk z=s?Yo7J4>%grO;&)I4{Ap(T5y=O(wHx1~q(&V6oQur!c;Zl5tZ;LaK2?o0iAiT5sO zZ$}Qh_3oi|+N+)W+8@?Vz1qe5`l(<0>9yM9-n#Zo7r#YsnVU-LonNp03&iE~?dSKn ze;U*#R=8Lh)Ly!h-ngrs2G9Q}S7Fznwris{G199o-v7#0_8shoy=f%iHd2&dvqn!i zoXP2Md;-~yCNepW8)w?OZPV|B@wmV;*xY+Qiwc?Wh{ugtl!y@j&ZSCx6L<>p$&(>j zrQ5o77#l|^-><~`m_Y{@)hsU?OO`Uq8n-*EQVub?*%%MDpESl{EE^*!r1CAXN(Yen z#7%0*v&0%TKAOhNl1euAag@Qk8aFBm>=1 zQ7yhf9cwC*N!+??U#vqV-Xp!&-DsR}bqVop8X^Z4-=gtVbq85i<2*{L@i8_`cv*?> zVlZ5uUvNwxQA8N%kd|e`rs6xa4MjoQ+@cMAf^n-2Ji2l912lo|vH|`cwYtr0X1=j? z^NnYk%*B5VBl=(TH>N@JHgxeLEV>c|6o>SvAovWzJ3-KfgsvR+G8oAH5ey&=1M}hd zFO5^PHqV_4jcL;5))`YYauN`%cRH+I`&FEQ5AG02h}$@9WQgzM)tIDd%o*Zc#p$Tm zm=E_JKM^C0itkaQ46KY!)FOVOmQ~SlEGWiDR%;uzn?t*iVSY?A$;I9Uvp*3r+@XW> zhnP_XXaao*n1%{E@iQo{KxIO)fNCF|t5Bt2RB3iP1(;$9@avTklb}>12EfzDHZkwm zsdZu!fY)1q7y1NV_l+n1(HzDduCNn#@d+(jp7@Al1(rfb;dBX`!hxU>A5)_MGcN&a zAySjxbvk6VdCH^qAVwyXSJM!kvjFU`=tzQ$og)z`e`1UN z!oRw4;{wTv==4GdQ4;OiDF~U{9qm$2S3Rq?QdjnBpUP( z;hE|UDt47;_CSCMpF`X4+_EL56CbQm3ZPxc=r#MWVVeqXB<#=k9&g`oAs@6}xxl@# z4zezOHjF9Ys%eZ75ie@$E0(tbLquWFXk0S~@1$+lS4?`98B&a|5U z%RZx}-B(Kh2xUKOL zKJHwvrDaldsR|_>CBN|6L2@ADxEL!0#?fIJ1}c+Q57os&|4_`PB}!E66b5al<%SS- zWBDwJyP5Aeu)5k~98nPwt-x7VbhN151}tDY{x+((W#;}@cSv^M=+;}hUaM2P?2bNY z9NyONZO8>Yjf%r^b0(9lYJu}R)sd9b_WHw4QyrB;PG+)FSzobbGautmH}eumSC^GU zxYS`*&4*OzQ)v|7O(kivRJq@uL$N^DoVmYRnv2oDxPm#*1em!Vksh7 zib{}QDq>O@Uga)9#H_-+^_oj+SCT3!+@In$vn>9E9I^TkO`rvg(jfjir0(w;9&>Fx N>v&u|J&y&0{{aCHcZC1| delta 1249 zcmZ9L&ubGw6vs2!-We!>UxP>7eF5MIq_U+Y2fHjb2pC%l3U})39K;;A-oLB?sb$Nka zhqkg{27SMqCbZA!?H+^e=+i{h~JR%60ZJP4~5`fvhc z%{8jPh)};0Dc~fEW-~`@1&v;`1*yhaFW=*SQU<^DK>7bfkcE7w+* zFBCA1;%Z7FY2Aranq$iiVyfymBJ{*#Z?-;SvY{>Bdvgc$?VLx{Ej(kCv8A-1)1|n_ z`#C==etWZgS*^SpZj%lxz6huyRFmDK{k3! cookiesPronto: + return JsonResponse({ + 'notificacao': 'true', + 'pronto':len(ordersPronto), + 'titulo': ordersPronto[len(ordersPronto)-1].id_comanda.name, + 'corpo': ordersPronto[len(ordersPronto)-1].id_product.name, + }) + else: + return JsonResponse({ + 'notificacao': 'false', + 'pronto': len(ordersPronto), + }) + else: + return JsonResponse({ + 'notificacao': 'true', + 'pronto':len(ordersPronto), + 'titulo': ordersPronto[len(ordersPronto)-1].id_comanda.name, + 'corpo': ordersPronto[len(ordersPronto)-1].id_product.name, + }) + + + else: + return JsonResponse({ + 'notificacao': 'false', + 'pronto':len(ordersPronto), + }) diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index 732454178e28f321b6393ed64e6fa3fedf37be97..d8c3bbf6f8ccaead5d4e76822137ff296b31ddc7 100644 GIT binary patch delta 2579 zcmeHJ%TF6e827Fh0!i4VAxWhc!2(H|DDrA%XJ=nYqY^L=gK=dGC zDiI~BTB%J0*sxWiN;{5ktc2vJ{!YYk2mbxGDmRgj=6s&f8K<4gM; zfVzYQRno8sit5z&{IM$HOmQ1zb@Xu?2NL_cYg_mIUHwy4k-6!N(VbMY<4%6C{+)$P zu01_%%ui~HCYf>$DKoLD1d?Ggngt0I66dqy5d?IYzT%(k(Sx42DNhVfOwIeoX1wu4 zXly2Ax@Yi+1m-S{4_%0yznmRL=O;w$7J-OeKy(3x-#H9`HoRjKSFsw=ov* z1-b^jW@l!)y+0O8AlN;co_#tk)G^c{5-=1MO}^IJxRut(g>$Kps$LOOD#+%bDn~NW zWYEOPoSDgt10mwc2I6kF&y2MX`t#ovKJN8HkDi_hbdROPz##BNI^ad$)TJSpJLd|w z%X4E{Ej-uPA$NfbV|{_p=tV2Z*5kOEaHZQ$G6&DM~sbbf%hc0efFLiT|4upnbaQ&4%Q zlv^Qpnp|E5XxcM7 zmB7okQyD!Lpo(NoE<0`41QMac3P92kg8r=8TS8y3m=`R*z}TT}jVXsxbtno@1FDD` zoQ!JrlA_a+xDzDw3U^a*}z z`0S;z`K5eu;mSq-sNNMH4xyAgInu9mCI<}HY-$u6ojo2j;dddB>hOELQg1o}!}pJbK}{h*-Nx4VD<$r ud9rx4&tsaq#%}q0WJ~Dn&N)bT{%7ap`NhqXM5T^ze-b=zon5W7%=`mf7S@;m delta 951 zcmaizOHUI~6vt;ew*v)cu9TpN21W=E!8UVeI@6hn8p}gUc@&C?l>`Y;D5bQblv<1r z;v+7M1{h$36$>{e3NfR0fhHzyG=2f!3*Gq*SU{aAu+oIZO-{}^_x#TPe{*MMie}!~ zXG=-=8^bW)9CO-?oXH0-Lbf%JGtq$yUC|!p?1+4>tzmk&x7*?A z@C}3=!2sVi(lm~S{O874KA7J$wT1(SP6wY=O1(Giak9(x2$Kj@Wiu^Kau&yRnTg z+yAk$M61o<#}EHcs=bWx;HqP#^#0upZX8ScZicuqn`7O;ju4x;mOBe7i^@S71c^;+ zl3cVNBu|hS8PU5BY!J4-)_jcecs!WqSO9^7A_7Q#-kp?I{}{;H&jnCQ*$Lq8YuW4k zI1d7(krFSqYwapHtf58FOf~wlb;DsCw`dvNQmomRKsf~oAd^9?*`Q!qij-?o>N@i= zEw%&>6(dRE1*gcmSR@m812|RJv0JJ(zX9)*B*Eooi;dDr@+($I8FLJX#bQ2xoqwmd z*4Egz%hzr#0?EWGIXCyP#>$eZLhL)cr$W|1z)T6bl~{dtrfESLFqca|)xi1OzXBi! A%m4rY diff --git a/gestaoRaul/orders/__pycache__/urls.cpython-310.pyc b/gestaoRaul/orders/__pycache__/urls.cpython-310.pyc index 46143da0f4cd8abc98217d289a9747f88a49c0d1..f6b2e6c3e9c298db93abe58783f72e7a2bc31200 100644 GIT binary patch delta 167 zcmcc0+{&Vz&&$ij00b9)PEMcC$iVOz#6bp}K#l_t7pG0s4wgt|OyNys&f-YnOJVC} zPG^ncOyLh^&=i>1F;A|FCojJwGc7YYF*z|`{}wkA&rg$UvL>U2bP>p|Tim5ZIR%L& lC8&w6Q|8% z_S58?9K>iLc8j~TD5oH?q$IT{uXrUx5f4y(5zpkMj6OnqKqe0(4BGjHDf=KbFCR;yvb?@sf_ z;cu~J{ffrbp999HFyv1ls6|O`6(k`9bvw5UCvlAK|ORi4Ij(utQ!l(0##5%0$=J@mG?UTTG65DVdJHP-;B0V4k-ra2nC%8xZZG z;MKS<*pn&~j1CA!p8gOD55_tS`5_2posu(&IviPl|Qkl zOTCGmkz)r^^*1i&VC6aNyUQyfL1{dxSjGDNp<;(kj>*W?T~*}TuZ?aXY*?b5k{{>@ zPe@s=QsJXB;EzXaprrP9vRpACFv+f?13UqfO3&|PJBqQgZ?@~FLoV8wfF+jT@%u;X zYrXFzY}q@2puG1vA5;Y^mF#V8eRhAnH-s1|-%6{zS7+1P&)9)n9e=NzMlq zAMgUo0uOwzKHoj#&NHd{wWANfrshHnaNULhUd%%b?F^YRmm}~}bu<=ioQkX*YFDQF zOmuL!1r&HK=bpF$k0dmK`x(`q(ZnLoz*{kQQj42tz6k<1dVv|Y?FI?S6kvSww@`}L z;H`Ka#MNxY8|X#&>ukfFtjy#tqv9>}UC&jlpbtyrN;>a=iBZMdDA1|`5D!!F%g?;{ zkLg5E)fr&+FY=?gD?-o&NRo-KZuc+|xwZNRK(-x7r~8g1N$)^_Bp=EOcG6MxSYRK>Je+ccio zQ?0dZ-L^)pQTrCu{Wag*s7>3?-D9$C!OFSmyUufnXFUH~tnU2AD_nWdwM7d+)SX$$ z^!u4Ct2`IW;0AuVB~V)j58?Vs#lF=pl195qRP3yHF46;I-!sK$KS=5%dMF-V#N&i67VaoMXx!XvH1kZT}nMlafnqyr3ZlbG1>_sLDN zK*B%l0QK-s+q>e6YM+5-qr0GEI!enSU#(P@%ld24nY!dI7iv%`XfcadxyjhK0_z;px;F>!Ul<>zW}2~{#pP4 delta 731 zcmb7BJx|;~5cT-{vG&>K?g9w}6e1*~Sdp%U0;NeAi4+u3ESigU<2dr!m+_GTiBLd` z&}rNJf%^~q4CKz}S5=ZYjn=77+KOe`;l+3Z#(18OTs}PpuQkx_3$>W1~c*B<9S5>=`AN z{XHuk{A9-zS}`rg>aea9aSv4`6%upbqITg3GJOKu;OGn37G3&bZs9;*!uXPMRt5jFann$4QU>%PNqnENIpTcs(bJ4Yn~}9POq_8_Cb3 zDzAqJ)1qv67Jcb2zsTYm=^~rqxF(~ -
- +
+


Carregando...

diff --git a/gestaoRaul/orders/views.py b/gestaoRaul/orders/views.py index 01a5c9a..dea1766 100644 --- a/gestaoRaul/orders/views.py +++ b/gestaoRaul/orders/views.py @@ -47,21 +47,17 @@ def notificacao(request): fifteen_hours_ago = timezone.now() - timezone.timedelta(hours=15) ordersFila = Order.objects.filter(queue__gte=fifteen_hours_ago) ordersPronto = Order.objects.filter(queue__gte=fifteen_hours_ago, finished__isnull=False) - print(len(ordersFila)) - print(len(ordersPronto)) grupoCozinha = request.user.groups.filter(name='Cozinha').exists() - grupoGarcom = request.user.groups.filter(name='Garçom').exists() grupoGerente = request.user.groups.filter(name='Gerente').exists() - if grupoCozinha == True: + if grupoCozinha == True and grupoGerente == False: if 'fila' in request.COOKIES: cookiesFila = int(request.COOKIES['fila']) if len(ordersFila) > cookiesFila: return JsonResponse({ 'notificacao': 'true', 'fila': len(ordersFila), - 'pronto':len(ordersPronto), 'titulo': 'Pedido para: '+ ordersFila[len(ordersFila)-1].id_comanda.name, 'corpo': ordersFila[len(ordersFila)-1].id_product.name, }) @@ -69,51 +65,20 @@ def notificacao(request): return JsonResponse({ 'notificacao': 'false', 'fila': len(ordersFila), - 'pronto':len(ordersPronto), }) else: return JsonResponse({ 'notificacao': 'true', 'fila': len(ordersFila), - 'pronto':len(ordersPronto), 'titulo': 'Pedido para: '+ ordersFila[len(ordersFila)-1].id_comanda.name, 'corpo': ordersFila[len(ordersFila)-1].id_product.name, }) - elif grupoGarcom == True and grupoGerente == False: - - if 'pronto' in request.COOKIES: - cookiesPronto = int(request.COOKIES['pronto']) - if len(ordersPronto) > cookiesPronto: - return JsonResponse({ - 'notificacao': 'true', - 'fila': len(ordersPronto), - 'pronto':len(ordersPronto), - 'titulo': ordersPronto[len(ordersPronto)-1].id_comanda.name, - 'corpo': ordersPronto[len(ordersPronto)-1].id_product.name, - }) - else: - return JsonResponse({ - 'notificacao': 'false', - 'fila': len(ordersPronto), - }) - else: - return JsonResponse({ - 'notificacao': 'false', - 'fila': len(ordersPronto), - 'pronto':len(ordersPronto), - 'titulo': ordersPronto[len(ordersPronto)-1].id_comanda.name, - 'corpo': ordersPronto[len(ordersPronto)-1].id_product.name, - }) - - + else: return JsonResponse({ 'notificacao': 'false', - 'fila': len(ordersPronto), - 'pronto':len(ordersPronto), - 'titulo': ordersPronto[len(ordersPronto)-1].id_comanda.name, - 'corpo': ordersPronto[len(ordersPronto)-1].id_product.name, + 'fila': len(ordersFila), }) \ No newline at end of file diff --git a/gestaoRaul/templates/static/comandas/js/comandas.js b/gestaoRaul/templates/static/comandas/js/comandas.js index 57a19dc..570b78f 100644 --- a/gestaoRaul/templates/static/comandas/js/comandas.js +++ b/gestaoRaul/templates/static/comandas/js/comandas.js @@ -50,7 +50,7 @@ function mostrarNotificacao(titulo,corpo,grupo) { function notificacao(){ - var resposta = fetch(`/pedidos/notificacao/`, {method: 'GET', + var resposta = fetch(`/comandas/notificacao/`, {method: 'GET', headers: {'Content-Type': 'application/json', },}) .then(response => response.json()) @@ -60,17 +60,14 @@ function notificacao(){ document.cookie = `pronto=${data['pronto']}`; // navigator.vibrate(200); // navigator.vibrate([200, 100, 200]); - mostrarNotificacao(data['titulo'], data['corpo'],'Cozinha') + mostrarNotificacao(data['titulo'], data['corpo'],'Garçom') console.log(data['notificacao']) }else{ document.cookie = `pronto=${data['pronto']}`; console.log('falso') console.log(data['notificacao']) - console.log('notificação foi false') } - // var produtos_mais_vendidos = data.produtos_mais_vendidos - }) .catch(error => { alert('Erro verificar notificação:', error)