From 04e78a0f7956e275195ddb38fb22f4e6a8827a28 Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Wed, 22 Jan 2025 16:59:26 -0300 Subject: [PATCH] =?UTF-8?q?bug:=20criei=20um=20bug=20na=20page=20orders?= =?UTF-8?q?=F0=9F=99=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gestaoRaul/db.sqlite3 | Bin 299008 -> 299008 bytes .../orders/__pycache__/views.cpython-313.pyc | Bin 2766 -> 2773 bytes gestaoRaul/orders/templates/orders.html | 15 ++- gestaoRaul/orders/views.py | 6 +- ...rs.html => htmx_list_orders_entregue.html} | 0 .../orders/htmx_list_orders_fila.html | 102 +++++++++++++++++ .../orders/htmx_list_orders_preparo.html | 103 ++++++++++++++++++ .../orders/htmx_list_orders_pronto.html | 103 ++++++++++++++++++ .../templates/static/orders/js/orders.js | 8 +- 9 files changed, 327 insertions(+), 10 deletions(-) rename gestaoRaul/templates/htmx_components/orders/{htmx_list_orders.html => htmx_list_orders_entregue.html} (100%) create mode 100644 gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html create mode 100644 gestaoRaul/templates/htmx_components/orders/htmx_list_orders_preparo.html create mode 100644 gestaoRaul/templates/htmx_components/orders/htmx_list_orders_pronto.html diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index 42e953c7c70f9f063dc6f9eb4fb675ad4ed3cd64..e4e98f7c83ae1d3b35b78886550e02f606130be4 100644 GIT binary patch delta 1631 zcmb7EZ)hAv6yKe>-Zq@K&pUe6klx*9Q&9}r%%7c|-K|(dK%@}Ug3?b0O^JW-U#OG_ zig%_+jw;fkuq7Y{f})}%rRY-PhpJ!vplL)AY*C9JY!ML=KS%{}cJ2a~#1v%UJ!al} zzu%jg_g-_M+*~N1>@&ws?HM)4&OG?EXS%PgdH0y&c<=CB@35Kn4x_8hynVpfXN@J+ zGJ5=m9#*)s(6SQis5)sbqg&IrmeD);hTC%U#)x5>j4&}o=n!KLjbhGY!aeB=E@c_J zt^VztnCFu~Ql2?E+c{B>L_`Lxj0akM+6i^&(l1i>jCg{JhzkY(!3w%Bmp2S!pFNpa z=g|{|%P?fm*wgl7>Y#ZZ&3^O=nk??gV-uBgZd>)Ym6NGbuAaQGiYBf0rkY$?MR#{L zwZy-GzO2Lh3jLq~f57+fEu4dsP_>uruVJq}VIQ^+CcD^E+mRwW;IuWc=9Q+Y|hbz{6VqHe{ z-94q9r+3z^`JNL!7mB~Hud|14{AWiR|BMFA#-qGo42+D77^+IpGgD7GM;?0W$Y<{z z-C8l!qr@kiby;3So#?E_{&#d%i47hLRb?#X5$^(4CZEJidXh$*kWCg5bKwaoXdue! z#b#K+D5@*yB)VO7jb%mP2Z0Q`EsB}NoO-fBSmbZUCov5?$^%KFjX^$(h3`d@vVfJ; zYtPW@F=rLa0wFhCOy%UqB=r0+l+tI4zq>KjwIhX3D5G1LsqlE{tFBedwHb0fW}^Cv zQL=@Z$1L&`wrczie4{fGSP%>81w@Kq-PEzDfAG0Vmx?e{%+*m}GpkNgU%oNPY_6!! zq*6wkUt7k0sNh32D%6+tkBSb+9siA@rjrP`-2D6^7J(P}JYs4j<=k}FFX&#hd&5xE zVcPiYujmzyD{w5a9PAWM!znlc$KiQ6mNEyA!tHsC%$zH<>i4yBxK?$hRgG#@CCQt^ zcuGOdCKka?WdY{lb$At8FbmV`>uhOy5Rymsif^}dS;Y_g28q@7&H{PND!!R7j^>M2HDAQHDm6QOB%Q0;nZW}Y zXUSR8l^OhiK0AYJtMAR=shSb@2tqp=(LQ8ZKJ{fMWt~)bEQozS=9~nAhk-~)nP2~( z@uklt-91*QNho;Lta`nQk6G#U2%O&N2s z9-ha~JJ6XB{?s?;@qPy(^ODJG@df_8!JRhRB?Q02_wWr|feF~9y#?HxaTnc1U0J~I z>WKy8)cPe>*(T?ptrC|5_%r~TK7db|qDw#EgB|Wy$jN0g37X5;j*T&zw(q2`_FpUI zZ`gwz+r(Hj8yt8)*^t#8KjLp~sBP5F4SZj7_P6cUrNj69v!fa>5w3iP%H@6 zt_Nct6S4Wph)^MEsJ0+7_64CV^p$9^RP8vPLl5sWkC{5^zBW1N4V7NdEf1bpm!O_+hR$Lx31`s=3!{w?k7;DA&1DMygP25u5y>Jy+L(y)n1`_+l7KVm z``A)De?qO0Ne)4@NDivj05R;vfCOrbVTm!^n00W${+RXRg-xv<(X)IZQa zQ0^bt=)z(d#4;p;2U60F2#=FCng0r;6z9jqdt2W-o-B{DxI9Gl3XFSerfOFdMY_IMRtgou?**;1Bo(Zov}F!>8~GT!m?vgp2SUd<~c3 ssqL0AYXW_^$0mu{8B3+vEtO`sRGQsVN%oSZn$YNEk6oSY$vpSyzsDF~EC2ui diff --git a/gestaoRaul/orders/__pycache__/views.cpython-313.pyc b/gestaoRaul/orders/__pycache__/views.cpython-313.pyc index 32f21e87b033a1e3f0892dc6d6532211c4e8ee3f..3ea10762c34d6ecb37ce1d80613c0e905726964c 100644 GIT binary patch delta 184 zcmX>ndR3J7GcPX}0}z;cO-!G&k++bA(QtA-i#lt3T4qk-pO>ij!5?9l#1@CpWPN2%sz8{E&SqlSc~UXJ!T_ i)elT;j46yCg&3FwW@uhyRQU+zBTETjk%FiK+X?`j#5ITj delta 163 zcmcaAdQO!0GcPX}0}yz;Xix9m$Xm$5s57~qMSb#WmR82f$%d@C{9Y$KE`-Hg@Q%IA z6L*0nZu2_UJ&a%}*~uO30T|LR*q1VS#4~Entregue +
+
{% for order in orders %} {% if order.preparing == None and order.productComanda != Null %} @@ -50,8 +52,8 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

-
{% endif %} @@ -75,8 +77,8 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

-
{% endif %} @@ -99,8 +101,8 @@

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

- {% endif %} @@ -125,6 +127,7 @@

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ {% endif %} {% endfor %} diff --git a/gestaoRaul/orders/views.py b/gestaoRaul/orders/views.py index 7662515..37c9ce1 100644 --- a/gestaoRaul/orders/views.py +++ b/gestaoRaul/orders/views.py @@ -19,7 +19,7 @@ def preparing(request, order_id): order.save() fifteen_hours_ago = timezone.now() - timezone.timedelta(hours=15) orders = Order.objects.filter(queue__gte=fifteen_hours_ago ) - return render(request, 'htmx_components/orders/htmx_list_orders.html',{'orders': orders}) + return render(request, 'htmx_components/orders/htmx_list_orders_fila.html',{'orders': orders}) @group_required(groupName='Cozinha') @@ -29,7 +29,7 @@ def finished(request, order_id): order.save() fifteen_hours_ago = timezone.now() - timezone.timedelta(hours=15) orders = Order.objects.filter(queue__gte=fifteen_hours_ago ) - return render(request, 'htmx_components/orders/htmx_list_orders.html',{'orders': orders}) + return render(request, 'htmx_components/orders/htmx_list_orders_fila.html',{'orders': orders}) @group_required(groupName='Garçom') def delivered(request, order_id): @@ -38,4 +38,4 @@ def delivered(request, order_id): order.save() fifteen_hours_ago = timezone.now() - timezone.timedelta(hours=15) orders = Order.objects.filter(queue__gte=fifteen_hours_ago ) - return render(request, 'htmx_components/orders/htmx_list_orders.html',{'orders': orders}) + return render(request, 'htmx_components/orders/htmx_list_orders_fila.html',{'orders': orders}) diff --git a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders.html b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_entregue.html similarity index 100% rename from gestaoRaul/templates/htmx_components/orders/htmx_list_orders.html rename to gestaoRaul/templates/htmx_components/orders/htmx_list_orders_entregue.html diff --git a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html new file mode 100644 index 0000000..957189c --- /dev/null +++ b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html @@ -0,0 +1,102 @@ + + + + + +
+ {% for order in orders %} + {% if order.preparing == None and order.productComanda != Null %} +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ + +
+ {% for order in orders %} + {% if order.finished == None and order.preparing != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ +
+ {% for order in orders %} + {% if order.delivered == None and order.finished != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ +
+ {% for order in orders %} + {% if order.delivered != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+
+ {% endif %} + {% endfor %} +
\ No newline at end of file diff --git a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_preparo.html b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_preparo.html new file mode 100644 index 0000000..8f986e6 --- /dev/null +++ b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_preparo.html @@ -0,0 +1,103 @@ + + + +
+ + + + +
+ +
+ {% for order in orders %} + {% if order.preparing == None and order.productComanda != Null %} +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ + +
+ {% for order in orders %} + {% if order.finished == None and order.preparing != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ +
+ {% for order in orders %} + {% if order.delivered == None and order.finished != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ +
+ {% for order in orders %} + {% if order.delivered != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
\ No newline at end of file diff --git a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_pronto.html b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_pronto.html new file mode 100644 index 0000000..8f986e6 --- /dev/null +++ b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_pronto.html @@ -0,0 +1,103 @@ + + + +
+ + + + +
+ +
+ {% for order in orders %} + {% if order.preparing == None and order.productComanda != Null %} +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ + +
+ {% for order in orders %} + {% if order.finished == None and order.preparing != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ +
+ {% for order in orders %} + {% if order.delivered == None and order.finished != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
+ +
+ {% for order in orders %} + {% if order.delivered != None %} + +
+

{{order.id_product.name}}

+

{{order.obs}}

+

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

+

Atendente: {{order.id_comanda.user.first_name}}

+

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

+ +
+ {% endif %} + {% endfor %} +
\ No newline at end of file diff --git a/gestaoRaul/templates/static/orders/js/orders.js b/gestaoRaul/templates/static/orders/js/orders.js index 7589b3c..c751686 100644 --- a/gestaoRaul/templates/static/orders/js/orders.js +++ b/gestaoRaul/templates/static/orders/js/orders.js @@ -20,4 +20,10 @@ function openTab(evt, etapa) { for (i = 0; i < tabcontent.length; i++) { tabcontent[i].style.display = "none"; } - tabcontent[0].style.display = "block"; \ No newline at end of file + tabcontent[0].style.display = "block"; + + + function delayTab(evt,tab){ + setTimeout(function() { + openTab(evt, tab);}, 200); + } \ No newline at end of file