From 6633110140bbdf8a68ea6266e049947523be6338 Mon Sep 17 00:00:00 2001
From: Welton Moura <weltonmoura@live.com>
Date: Tue, 7 Jan 2025 20:00:06 -0300
Subject: [PATCH] ordem add produtos na comanda

---
 .../__pycache__/htmx_views.cpython-310.pyc    | Bin 2275 -> 2352 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 1362 -> 1715 bytes
 gestaoRaul/comandas/htmx_views.py             |   6 ++-
 .../comandas/templates/viewcomanda.html       |   2 +-
 gestaoRaul/comandas/views.py                  |  14 ++++++-
 gestaoRaul/db.sqlite3                         | Bin 241664 -> 241664 bytes
 .../htmx_components/htmx_list_products.html   |   3 +-
 .../static/comandas/js/viewcomanda.js         |  35 +++++++++---------
 8 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/gestaoRaul/comandas/__pycache__/htmx_views.cpython-310.pyc b/gestaoRaul/comandas/__pycache__/htmx_views.cpython-310.pyc
index 1c171bce9eccabffeb636ccf5eed206c21367ab7..54b7e704657afb7301748e0e53ec3dae99386f6f 100644
GIT binary patch
delta 1018
zcmZ8g&rj4)5bo=b*Y0k2`56|G6%<XVfSfS#sIVbKvupwhagEv3_PG>x+cNEvU`im-
z|KMFo)FT(8C(r%~dhC^W@Z{N>Z`u_i-Q?TpyqP!Od^5cm`8-+<%H^UYo~NIVJK>k|
zFyX(HGHLJyQhU*nj@3k2lU|y~TB7Y~uCgyfEm1$vMEgjHbTAU@iR7w@nh;kzliw;^
zl0_SDDiO26*<A`DaQjYdk#xwnd#v5|oWPH5&yTkGDS5JMq{@1IJ5@R?23>GS_2AVW
zbK)qauf1-}Af>hwdxuQ?havM_kVTY5QythrpG7g4S=OLVt7Lb(&Aes=B|IYGxdaou
zDDO-Ri+7V$h)N7n6hHZNl)xnK$$et-3pv^!5&?iwFpjBO2%f|8iaLy;{{})<a%fPp
z?F2pBcWt<ZM>CkGXGd`W6X?pIivFVQx&v~f{F_qcR2vam_co?5jv!1U)C5=splD~5
zDrjZAZVD@<F6%O(4U&Z02)QUQ#^0;eM|aS3$p+@|^%|3LV7=gw4altK9Zd7zYL(1$
zU8|qm6G<)FeEfW)v3{<BhId?2Nof?@aX*4t;XYS#Wl$7Ade>{2PB)0ypa$L>VPh3S
ziAi8lm=3c4_b9?pBwo{W{zH4XiSa32eYUw(UrW`^X1xKHaKQq?wWi9z0<j{4N_caG
zdtDKeRtc3wwPn6T&nVsrQ~VEIJjvuV;-iqYL;EN#xh!(P3u7<vVM&Cg#$dXUWkLb-
zE=9=4lMN+P=V}-R#?2z!N5GCO<4UAf3F|fOqaIuG<9tw=Zn!(yv|5GG?uf6&|9^$}
ucYTbk@SpmOK+SmfU=kDVBFrOT$FPjBf^elyzJdI!F;^%UMWbNoX5laRoZuJ$

delta 963
zcmZWnyKWOf6!mx?UcWYuaT170VxGowc%*=W4w-<Ez;==X;l`|XC&41#UGA)r99c>M
zJ;k&s)3}3{f|h^S7K!iR-q{t7z}6nkJu`FW+{f4IujO)3E*CQRJO6Qb#J-g)%+@h7
z@$29xwq=`bJdTW6#?xlnjCuN5_LFvyX&K!UTW|;5cXvYwyonpN*kH+b#(X#&xq%-!
zBVU{}<(_t3{$!iXl)qV{30V|v>2VJDhY1%E6fur-sREFbc?PQTRrYm>Jd~KtstjuK
zdv?N#@_{Da+epI_!7@T@gfMb>qML&X@hb#McqtVgy204-JqOllt4{ZlH=_WmL@BsL
ze8KU&ev*(aZGBB|AS)|uU3T=hr>k_B5nLv?g3!tXIR)jbOe<w>4Og-0@narw<rFq(
zPvvhapM&MpT_-U&9C@%wXa1UmEebCfY?5dV_&E5;Q<LdsvLncX%__{2b-gY<<Kf{o
zWCmvc$(tA5=W_!L3>QXYQ$$WQ5pWghxt0`<>IP)~;=35eCHFWGJbjLI1*L5>la=J2
z(U4o_qaM+**?HMJ*nJx7z5Z?&ZXpHa`(M2>@F3)VDtHG^2x`C03QT8aw#1+<&&@NF
zG+|Xf%WZF{np)8`<ipUJ#zl_{7e-+;3VdkEFS(V|MH5s{R3}u@G%HC5ELu^<aGO9w
zXjzNg2Sw8FJJT`uqoft88Z<PjAA@}89O0Pz|IdznA8pZ2n$!;75i~M3j<JntS%}yk
rteJ&>*pd6z=X*6$ZV=ogph`fSfUaMtS~8<j&)>)!R>8_!xl;ZQuf@YF

diff --git a/gestaoRaul/comandas/__pycache__/views.cpython-310.pyc b/gestaoRaul/comandas/__pycache__/views.cpython-310.pyc
index 6d10ef0c0db52725d9bfac318538bae2c5f176b7..8d2635e7b3e33251ee139c4eece3b55bd2c8efde 100644
GIT binary patch
literal 1715
zcmZ8hOK;>v5O%lQkMVet*(4h_JOl?gSRy$fA;d!nm<=ls%tqO8z#24irp>I4ACvB$
ztTysUNa31)u!ouB9{4Bxg1&O%FK~#c>hZ7-Tkh_v>aME(>MPg1USPrV_n(XD`!38V
zy!=oQzJgD37`VkrVU;8%C5<UTnHF}*Vpck_V`RH<OE30HKlY8xicT5Cfmu66w+!PD
z)-Lz{u;L!~c?ae#9`G*A+dO<^MZJF@k`+<yinQXX(7s4{Cen!loinKCmD1!}SbKxI
zOe&t}trJo6`9!sHM6}mxV99<=Wilb?vwdus;i}dEK6wO#vT~ABPB@)XZr_jvQFcz2
zY-KH|avF=XhBTBr&*-%c3A#hg9-bTzwR`gQ&)*FnL?jNRO4MAA$60mNo2=84M~_um
zK%V|ap`8+Pk&!Dfy!Ptz9Bw7G`)gLHREQ30?W8CKq8{1W6Y0e~l}dyliyjQmEwKaB
zzn>328~r3xAxBTrLe-=D^<-YAm6D^=({GLkqbZz9>eFOij5g6nms$Em9?hN_Zx~Br
z8apH)JH+T-L8%KiA3lT9U$AJb+*%S&R)`O6$Tb0U?40F@4F%L}<$&aZgcvgAp}h1t
zTamn@0?w|9>T>6raQB8TL+-86hogG1YYVV;r`E!2ocq=<_ZEKR!o0iaG@X3A@wtCs
z{YJ$PAoY32ti0u&rn4f%y7=_sV;(GmhQSFRP6myi@8r9mSc~A|RP90ix{cj1(0e?5
z#!L-+!?-g`L{g?o)X#~g8AsZ*SZQyzW|Z!=i}AREy->{HVxCkg;|WhStLien>K?vO
zi8leLGl6Wo>LcE*!!;F{*arhfspPz@wWDg46xwfN$mp)N9~_@)dzvb3XO%KM5nFIb
zcsOk1aaLqfY4<WIfEwCQstUXSeHiX=aED(D=$rBRQ-K8(eRB%)*KRUV*(J`i88nx8
z15M6MWRrBwxvsc_NA99NXp<jj+$1jELhZiER@HJ`CYc;xf}4!jQoIAkcxQ8!F{V%@
zU}&*awI(z1HabTFuZLZ9*hQQM>z=_><%ckY#3x($QkS@d-MW<B28@B$C-;D{^mls8
zY@cqCeJT#&z$@HE6c7%>-S1)X8h6)BrYpkj1M3wYvo(*Q-)-*P&;@JQ(p_1^QXY4&
z33R_Vyb2M^!xo*Zu1pJP<3sFiQ+crm5hE%-fJrl>#{P|b%}yRZIuq}LAl}0Pn{ZuT
z^Fv@Vxl9HAo+4*m2jjv+7gz-RSFJ1Y8ic)xNPz+^h!Jd)7%?P!03kx@Q}GcfhEZSl
zd7f0$`ba*mg__KjG=(=&|F`k;qq62{AzzRx-fr(JHzrKk&@$fMRDEMY+Qp&y*=<zj
ps+g3imdWNNBAELaHuzsa<av>Pi9IBd4}Ggo`ZUCQ*uEDY{0Ecxrh@<g

delta 770
zcmX|9O>fgc5cS$?d*j$iNIz&r8$jZKh3El<kSai`O2rM3no|%$#=8_-aU8~Ok&vSv
z${7^-$^lM@GhFxs`~Z&o4>)q<#*7nKYu~Qln;pNI_1EC1*U5vxGjM!P)ltgloh>$;
zU%P(53~5L{7Flc5!o4k>x5mhmt`xYoWlMUv`m%j!g#Ir&ADY?$HIWLm03{PpaXJ5f
z#zysBwtJpqgm&}iDYAujUL@mE0l4)$wi&cg1M=|2fNuSb?cF3s;4B=3KJ!?g0dX-y
z_%|qk=046Mt*@H5c2oXQd@^RX<TIz@_l>7w=2lMSrmfVwZOoikm&<mA#Z*?sk;kGw
z@G}cbaO*$j_64ByZ+a(*dL8FkG?CHH%Q72>99HV7H8}OP_26Krts_-xE18r)RY9A;
zCh!T!G6V?PokA{;<5JsGNMZ#hlA(YO1@tMvTYlwPB4LHtRf2VbHPROe${e~xb#D;%
zNNAJA{e?x+3QFfQ!8-VOj5oV=69)AU{{HkFig-JG5@kyBOchbn%us0l_|f4IHc*F6
z0+*nvr@1d)L?;R?I&Lp)U&Ot3DFu1HMB$C`g+Y34`~@+ns8kDwgJ>Itf|}#ARWwLO
zg$Y-Xco+utZ+mNF)Lpis*vWFK#>JwwcD?7UJ)w?{eER5rwK3ZKHv<%#RLdsOYvZOd
aBJN<i<FUF&H(OBWdq&Un$$}+Zzw;NFz@eW2

diff --git a/gestaoRaul/comandas/htmx_views.py b/gestaoRaul/comandas/htmx_views.py
index f017cf7..15b24c8 100644
--- a/gestaoRaul/comandas/htmx_views.py
+++ b/gestaoRaul/comandas/htmx_views.py
@@ -8,7 +8,11 @@ from typePay.models import TypePay
 
 def listProduct(request, comanda_id):
     product = request.GET.get("search-product")
-    products = Product.objects.filter(name__icontains=product)
+    allProducts = Product.objects.filter(name__icontains=product)
+    products = []
+    for p in allProducts:
+        if p.active == True:
+            products.append(p)
     return render(request, "htmx_components/htmx_list_products.html", {"products": products,'comanda_id':comanda_id})
 
 def addProduct(request, product_id, comanda_id):
diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html
index 1603de5..844ba61 100644
--- a/gestaoRaul/comandas/templates/viewcomanda.html
+++ b/gestaoRaul/comandas/templates/viewcomanda.html
@@ -21,7 +21,7 @@ Detalhes {{comanda.name}}
 <body>
   <div class="grid-container" >
     <div>
-      <button class="primary" id="openModal"
+      <button class="primary" id="openModal" onclick="openModal()"
       {%  if comanda.status != 'OPEN'%}
        disabled
        {% endif %}
diff --git a/gestaoRaul/comandas/views.py b/gestaoRaul/comandas/views.py
index bdba303..06511b7 100644
--- a/gestaoRaul/comandas/views.py
+++ b/gestaoRaul/comandas/views.py
@@ -1,4 +1,5 @@
 from django.shortcuts import render, redirect
+from django.db.models import Count, F
 
 from comandas.models import Comanda, ProductComanda
 from products.models import Product
@@ -17,12 +18,23 @@ def viewComanda(request):
     comanda_id = int(id)
     comanda = Comanda.objects.get(id=comanda_id)
     consumo = ProductComanda.objects.filter(comanda=comanda_id)
+
+    produtos_mais_vendidos = list(ProductComanda.objects.values('product').annotate(
+    quantidade=Count('product'),
+    nome=F('product__name') ).order_by('-quantidade'))
+
     products = Product.objects.all()
+    products_ordenados = []
+    for produto in produtos_mais_vendidos:
+        for p in products:
+            if p.name == produto['nome'] and p.active == True:
+                products_ordenados.append(p)
     total = 0
+
     for produto in consumo:
         total += produto.product.price
   
-    return render(request, 'viewcomanda.html', {'comanda': comanda, 'consumo': consumo, 'total': total, 'products': products})
+    return render(request, 'viewcomanda.html', {'comanda': comanda, 'consumo': consumo, 'total': total, 'products': products_ordenados})
 
 
 
diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3
index 3c440d0ba314ae9484f5d840801f2a14a9508c3a..d9d155b2d01c34a80d471166448476515e876dc2 100644
GIT binary patch
delta 2116
zcmb_cYitx%6uysn?C#t<Q^8UN31wjsY#HXcv%9FYk$@B}NP~ump$gHYC4GRrf@F$x
zFvdSDK?eyxFbIE)p^cFVR4grz0tMO{{bNZ)B1TaYF`^QD-Pr*tq{LvHo5?rl&bjxV
z^PTV9mh*DUd3nni+6w@f&fYA0VScg$d)sRpRXDJzUwy4#g+afHsugJ(9|x771VC`V
zKkgA!D$K83G^cuYFz-?HVRH;AKeN>!7mzmey;9z~ju}pCJdt<@^a<^NHqcr+k`nSO
z`H_4}F3?4EE}coI(aCgtP;?lzLV@PP5p3x~G7LWIMi)hn{D~@qJ*Ut#<O&!f9t}j$
zA3<LPXCpWh!D%`g$UN$etWy!3jNk-K1Cd8Pp(UZ?5gd)+2z?3266%hut_TiC&?!t}
zD=7LnGzD}h1RizJRpD+2BkKTtA3PAOJA>Xp5A_KaPb$bL={vfW_Rz7Uha4uG$x^bA
zRFkYIiJb5UnMfy+vBAWCGzuo9uf$UN7yXR@zhVHX0uiNi(x-mI0GcGwx5E)^89)>U
z9iJdi<fNbAwqWMx=v7$YB^L1#NBts32(+QT0`5ZvW@=D@84;Z(3Xp3eW=c?jnL2dx
zy6Xv22E=g@HDW|fF)C0~gpQEKK)xrUMnOZV5vQQeF#Vc{8Y!YiLLH<Ih_Q&81Uf)=
zGin;np&l2;g7jj17UTK&iZ9mUt`YDOJO+2c_3&w^gUjK_SC;sfYjFi9)S;t(+eUn^
ze|7~v9w;y1HIPk$Mt`6lj}G2lijN~CZ3>pZh)Z~m2`>5}Sy{s{<r+3o6?%>ddg^hG
zvoQeGXb=c{g^j{u!4XFAKkz5`-TVgr8Q$P2_YK$0?c`Q-PjTg(h%ewncsm;OM>XLF
zgHLc5xlV2ew~Cw3mBC6*z+d7HyiHlI%$BbyNo7#kujFwfuEHq{;27{rK3_VIeO+WN
z1EHZA_Eb%usyU^Gk+b!juB(QvnU>DiP4FHULML>ala{m7s%{&WW%FPk+iHh@tqG6k
z*zv3U_O*DVzo8k6L9Q9U0$u8X?Zcd8IXT-=ZOhC!4nHpG%_^L9TR5hfvob0RM$>dj
zOnNi#;1tHJ*^Z`3#Yyk6Tb#yT&x~!QWmP-NQprd~)Wc4)wM@9RgzKR1)#DVD{q|+7
zvYqu<^jRerpjPRh88hfzjSmW(d<~=uxduBo;3bfi81jCT%a)CFvE}Doe4oF>#YR=q
ztGFegA@SI1I-AuUN0O4>j5|3QYFbM>2Fu?cba6QZL97K|Roqw;&|@hee<tsfUzeB3
zGvv|q3hk%w(arREI-M4?+pL%DB^$}J#3qV#NjfI&lGaNLB~6kNUnjZ}I}>XX3lilC
zF@7k%J-#wt9iI~CVqe4##@>uo#ZpS1NobZ*dSkGRhdduVSF}fTlir-+;{Go(ieCV!
zyVZ$%L%08fP=?gyrcVB)cx884y_BDH@q=)>-{|7vA|~#vnzk%WcX+0NY+*JO4UN>r
z)HL4Twi2iOj+J<Yf3*pxf~ha#8sz`pjNd{Y@+;Rey)pgCIO)O23Omndo!9NRtj2R)
zW&g0O+E&iYs7A)IZJUoz@a7e&czd5SCtY<c)6_K{v`z4;@8D$^VPj>?G`kIw-jhQV
z@$k)?#mebvHIp$7N9Svj-V;N-ZaOhaY}L^nJ8ke{*hIxPyOhi@4&8LjtQIb<8g{9k
Rvsp%ZI%8z{lD)fd(cg<S(hvXu

delta 1229
zcmZ|OU2GIp6ae6R&zYZYJ9BS~U=a%~3#AzBbY^#F+bu?IBG#ZOHE1GOVQHagY1)Fc
zPz1NOtUmDK8ug|P{yp#@FKsb0N|m;f+C+o2L}Ox&f(bE36Tt_o62-G!H9lx2H($<~
zGm~@A-08a{`Yws*Z?#V{#@5qH(1Og`YJPGw+3E1J12fKZGY$`C9B7aRt6-tf5_RYf
zsL(bwZfFQL-3f2+&ExVndW_Ws)(HF{m!?Z7s6Kj2e*PP5${1yKx7}eU?JdFT2{_7w
zQ<IR-)yyQU2;Tbuu9%v=8%Bc@A3+tQssw+6F<dM7<HSnAcN5D5ZzXOLd>3H}zLU@e
zZ=qKI5WJa~7kmeCRq!P7o#5MvZv@{)%nAM&@u}cV#CgFVB|a2<D={wk7UCVjA0do2
z$iarQ24TSaS#%h)4>MDTGr8#9EJ5#iI0j`?MohO~u&3?i*0eQYJ!`dC4_ggZn^|CL
z#_#s(z?p%YxnY*sH|$?j!z?(ee-_pRr)D9<)rDCaz}Q7do0`=GW^m6J(9cu#yoe7-
ziFc9xWHtE=Sw;4d6=aGmC7&jX$s?pB50fVOl$3CTJVefuz2uMNLGoMj0Qoi9Lw-(n
zlNZSSQr-sB*$r;a&7dGRg8~?{_A)asH-mi0&7k8;m`?Ff5O2ay5R)L4nZ(IOMw`*b
zuKoMU)D^31NxZu-l5paYYQNeSY?v{<Qq_$@shJDRY_QDo{DhagtzG^r<9RhT3pLtU
zF5|{yf7iUUkSTG!xa;O>I$0g#5OE`ZrR!C?v9drm;{mP~^<Y=<a|`YVU@T~F#bO=9
zN2MCwiHp_v9yC=!4~Eo058fC2v<IcOL}u77Hm_kPZp3n=V+5xmqvBoI(P*47Qv5SM
z!jJJ*UdK!9G_*rKtmM~?t%h$D>fh^A`fGZx{*Yd!=WAEAacxNJ)*7{S^g;tK;~2gu
z+hx7DF2iz8&Sf&I)bSy#P#0gpuhhN!@C@~~PE9<COVtBA@SHM-upEY0soRHeUvO>+
zH-j2^74Hu|?m;@2;WVhagSa?2egwC33fHR#2WeZwgD6y43M(j;$fdTWFsjktxlv70
zMNy=dzDYFU`-zwyqICH}+NN}k<3-(=>*)omVGzq-?xT~%gS<ZcRoYaDG#%>vw9LF!
z)HNVe;dH5yojm_%@_v~ct@Yem*K^!N)c50dcR0P`zlz*MtsirI&-G%y9S*0L|4&gY
f;lv_tG?K74WLv1sYiDv+zA4kPIVgM`ugX6GRvaOE

diff --git a/gestaoRaul/templates/htmx_components/htmx_list_products.html b/gestaoRaul/templates/htmx_components/htmx_list_products.html
index cb73ea3..a94e512 100644
--- a/gestaoRaul/templates/htmx_components/htmx_list_products.html
+++ b/gestaoRaul/templates/htmx_components/htmx_list_products.html
@@ -1,9 +1,8 @@
 
 
 {% for product in products %}
-{{co}}
 
-<article  style="background-color: #293552;" hx-get="{% url 'addProduct' product.id comanda_id %} " hx-trigger="click" hx-target="#list-products-comanda">
+<article onclick="addProductComanda({{product.id}})" style="background-color: #293552;" hx-get="{% url 'addProduct' product.id comanda_id %} " hx-trigger="click" hx-target="#list-products-comanda">
         {{product.name}} <br>
         R$ {{product.price}}
        </article>
diff --git a/gestaoRaul/templates/static/comandas/js/viewcomanda.js b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
index 489b378..cd05dd7 100644
--- a/gestaoRaul/templates/static/comandas/js/viewcomanda.js
+++ b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
@@ -2,6 +2,7 @@
 
 function openModal() {
     document.getElementById('Modal-add-product').style.display = 'block';
+    // document.getElementById('Modal-add-product').setAttribute();
 }
 
 
@@ -44,7 +45,7 @@ function imprimirFichas() {
     if (element) {
       var content = element.innerHTML;
     //   console.log(content);
-      content = content.replace(/<button[^>]*>(?:(?!<\/button>)[\s\S])*<\/button>/gi,'');
+      content = content.replace(/<img[^>]*>(?:(?!<\/img>)[\s\S])*<\/img>/gi,'');
       content = content.replace(/<th[^>]*>(?:(?!<\/th>)[\s\S])*<\/th>/gi,'');
       content = content.replace(/<\/tr>/g,'</tr><tr><td colspan="2" style="font-size: 12px">'+dateString+'</td></tr>');
       console.log(content);
@@ -78,7 +79,7 @@ function imprimirConta() {
     if (element) {
       var content = element.innerHTML;
     //   console.log(content);
-      content = content.replace(/<button[^>]*>(?:(?!<\/button>)[\s\S])*<\/button>/gi,'');
+      content = content.replace(/<img[^>]*>(?:(?!<\/img>)[\s\S])*<\/img>/gi,'');
       content = content.replace(/<th[^>]*>(?:(?!<\/th>)[\s\S])*<\/th>/gi,'');
       // content = content.replace(/<\/tr>/g,'</tr><tr><td colspan="2" style="font-size: 12px">'+dateString+'</td></tr>');
       console.log(content);
@@ -106,19 +107,17 @@ function backPage() {
 }
   
 
-document.onkeydown = teclado
+// document.onkeydown = teclado
 
-function teclado(event){
-  if (event.keyCode == 65){
-    openModal()
-  }
-  else if (event.keyCode == 73){
-    imprimirFichas()
-  }
-  // else if (event.keyCode == 70){
-  //   imprimirConta()
-  // }
-}
+// function teclado(event){
+//   if (event.keyCode == 65){
+//     openModal()
+//   }
+//   else if (event.keyCode == 73){
+//     imprimirFichas()
+//   }
+
+// }
 
 
 function addProductComanda(productId) {
@@ -134,11 +133,11 @@ function addProductComanda(productId) {
 
 
 
-document.getElementById('openModal').addEventListener('click', openModal);
+// document.getElementById('openModal').addEventListener('click', openModal);
 
-document.getElementById('productForm').addEventListener('submit', function(event) {
-    event.preventDefault(); 
-});
+// document.getElementById('productForm').addEventListener('submit', function(event) {
+//     event.preventDefault(); 
+// });
 
 
  
\ No newline at end of file