From 80aebd20303dd56d0069e586254cbe3e37585839 Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Wed, 22 Jan 2025 19:08:34 -0300 Subject: [PATCH] bug: page orders resolvido --- gestaoRaul/db.sqlite3 | Bin 299008 -> 299008 bytes .../orders/__pycache__/views.cpython-310.pyc | Bin 1371 -> 1376 bytes gestaoRaul/orders/templates/orders.html | 177 +++++++++--------- .../orders/htmx_list_orders_fila.html | 139 +++++++------- .../templates/static/midia/icons/loading.svg | 7 + .../templates/static/orders/css/orders.css | 47 ++--- .../templates/static/orders/js/orders.js | 24 ++- 7 files changed, 204 insertions(+), 190 deletions(-) create mode 100644 gestaoRaul/templates/static/midia/icons/loading.svg diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index e4e98f7c83ae1d3b35b78886550e02f606130be4..450ea53c07b9233b73d47d8764df3814158955dd 100644 GIT binary patch delta 3224 zcmb7GTZkM*6z%TnnK8OkWoFeR8g(}N-t5*^RaaM4_hvIQMvaOgM&koS!3PRHa7A)YgQ)mGLH!U#QBi!5591@^Dku^Ky;YN4rzcs|`KSw1x9Z$F zb?&L&va7OXSLNR0{Ovndt}AT!=w<%1mtReNy7PT{j6bt;FXevY_7#(Nu9);&D<*>< zW=<&g?Dxn^WGgwHEXQBrNAN|szx-YKiSjMwTF?Hhx+}P}b;qvYrk?V;nZvx&bi?zP z)Tgh=u6imM>=mLaM9NgkW17TL==jK1?aAP+0Ie_V$V$%y&E=($5-NUKe6e_6@w(y} z#lfOi_`I;Yu%q?BGr=F>?5ewH(StpG!9+a4_=Me(r*V=pLA6#QPI}R*yCxP-Vp1eZ z*rf5rk~ocIEQH%>buMYP1CP;I>O{J%v0T=HBq`EJPytE8Q~+;uu_Q(l8OKK2q>)1< zah*ooCe23N;SDdA#i$X+Xm`G$MUq4UOeIn)O9BvlFr9!W3{{4U#K8^BC)GMhw^^DB zC5&QrtN!_{&Ln2i2rfHOaUv?HwV@TX4nylP&PuPrZQ~0u$76Ui-hfZVHEeJ{UWt!} z*)6XH*R+DygP!u{BJzXYkha4_JB+u(Y8xuySUZfi{~T$D;dU5mhrxCju%Qz6w=R7z zc*K|M%YS<07xD%9n7l~tCCB5Z@rPspUyRSkXW`TFNq7oNJb{PsiFi3)iVw%A{AX5u zKiJbc_Jd$gk1GweOGBY64TY{W6uQz-yEGKK(opD1L!m1Tg|0Ldy3$bSN<&cESziXv z`bFwBspGEwWhy0&xR4B*BBae) z4hULZag{`!i`+@1pgf5U%gw++xb2J>NaEcyQOYDul$J&V(0Frg4hYy)%5vMmiv!{b zjlm;~J?(;{xw~Qsl^PDz%@`~*)JP6J3_z=!YZid4HtNjF{2_jKu-lU+?;YiR$~VYNpS;q+EF)8BLgy{igBsBfmjM>O#~NtT>=n1 z2%HL&!~#4i90{NIP63U9vJa)PQS0>oq7HY{(>Y$iiB$y0%$FO-DbUO~=Xv3{({p=z zCJ#~vSXxB2gkx~vWvro8zUrb1Br7)Ch_I4)&mZJ#+w z4HT~TPCg_rqqQTva(4EMYLCDS=`fbE%`Q34!Z!zO*LhxP_@es9kPZ)w>!)O<%Zm80Skkc)kx6$R_( ztV@|tD|~hc2Cm&*Yn(=KPf&n!=>^|%w*j1UnWzLldf+)b>ib|*(A(wfKoV`;yf4^> zPAHRCJ@NgZk-cOOyvCoB56OGv9r7l5HLK3q56ZbZd6VE6^V|FMma96oaR$l)W0j~qU7_{iZShmRaSa`?#MBX#HO bM%0?!7;alxTzBTib51$Awe*_sr~bbI%r1SN delta 1746 zcmbW1Yitx%6vyvlx6=(X_wXtfy1-a8_<-r$dG2hD?NSw3D3nk%8qwHDB2lD?^76G% zYA{ft2I(Y3lZt#1BrPDB82M188vOz_2pTI$Frg8M7NdNSL_O1`1Z(w!bCdaJ?)jb9 zoinqsbNt56@$D6~{*829vYr@gw;g=)X@geo>@z0O)jJ0aN!`tptF}z8qS53kcBwh7 zYBdBtf)Gs>M=TdJv>&ziwGCQLXm+y3u(p$pjaoa|T9v2hz2Q6iSovM1nRV=} z)4RjBiW!5^Gvb-XC+cOQ`iMoPyjnDcN)KBXcJ{EQu)Bv3l+YwCnHIJ^!o8T&`FP-+TK`Jf_)7fu3Mx?+{SdhP1riI7sa zWY)=KE!S|&z;m3xTU?p7rC|rsv*ZYi9gmvnpPU*u=2s z0#m};0ajT$o+oatb8p(eGl5%`(Zq{v35z)>KCi#b+IU)pUIN$PDqMlfFaYOqTE2mk za2&pX-q0M3e{O^E&ux%ZLy{1Zs|tJnWVN~qM+y7}gK!Bh!0&JlzJ<@>EA;yWj*2$X zw#(#=yK1?5q?KDxqE(^myznUSdH*M4|7>x6XJ zQo~!&u@EY?TrcZ_ci}zg$HO@S%Z3*QDFfpW^>p;vPv;DkLEWJ;X!TGT)Eg>;dKHMg fM!hLp3X6GESe$4}mo(%ap1){rH13(i&oll4)Ipe= diff --git a/gestaoRaul/orders/__pycache__/views.cpython-310.pyc b/gestaoRaul/orders/__pycache__/views.cpython-310.pyc index 8cee6e7ba607e388c12c78b9d740cfb7eaff28f2..2b3471b8753d2cccc431f33196b5dc81e33b55a0 100644 GIT binary patch delta 39 tcmcc3^?-{vpO=@50SF?4C#KKY$h)11(QxunCUw^Mw9K5u&2O0UnE>4c3+w;@ delta 33 ncmaFBb(@PfpO=@50SHp$JJNeM@@{8h)R}ygNqzH2rhFyPedidos cozinha -
@@ -37,106 +36,106 @@
-
- {% 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"}}

- +
+ {% 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 %}
- {% 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"}}

- +
+ {% 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 %}
- {% 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"}}

- +
+ {% 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 %}
- {% 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"}}

- +
+ {% 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 %}
- {% endif %} - {% endfor %} -
- - - + +
+ +
+

+

Carregando...

+ {% endblock %} diff --git a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html index 957189c..51bce7a 100644 --- a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html +++ b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html @@ -10,93 +10,92 @@
{% 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 %} + {% 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 %} + {% 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 %} +
+

{{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 %} + {% 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 %} + {% 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 %} +
+

{{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/midia/icons/loading.svg b/gestaoRaul/templates/static/midia/icons/loading.svg new file mode 100644 index 0000000..283c6ee --- /dev/null +++ b/gestaoRaul/templates/static/midia/icons/loading.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/gestaoRaul/templates/static/orders/css/orders.css b/gestaoRaul/templates/static/orders/css/orders.css index a4cdb8e..ce9aad5 100644 --- a/gestaoRaul/templates/static/orders/css/orders.css +++ b/gestaoRaul/templates/static/orders/css/orders.css @@ -1,24 +1,22 @@ -/* .grid-container { - display: grid; - grid-template-columns: repeat(3, 2fr); - gap: 20px; - max-width: 800px; - margin: 0 auto; - } -.card { - width: 120px; - height: 120px; - background-color: #f2f2f2; - border-radius: 15px; - box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.2); - text-align: center; - line-height: 120px; - font-size: 20px; - font-weight: bold; - color: #333; - transition: transform 0.2s; - }*/ + @keyframes girar { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} + +.loading { + + align-items: center; + align-content: center; + align-self: center; + margin: 0 auto; + animation: girar 4s infinite linear; +} + .m-card { /* width: 50px; */ height: 100%; @@ -40,7 +38,6 @@ } - .tab { display: flex; justify-content: space-between; @@ -49,7 +46,6 @@ border-bottom: 2px solid #cccccc93; } -/* Estilo para cada aba */ .tab button { width: 24%; background-color: #4446d636; @@ -60,15 +56,12 @@ border-radius: 20px 20px 0px 0px; } -/* Estilo para a aba ativa */ .tab button.active { background-color: #4446d6; } -/* Estilo para o conteúdo das abas */ .tabcontent { - /* display: none; */ + display: none; padding: 6px 12px; - /* border: 1px solid #ccc; */ - /* border-top: none; */ + } \ 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 c751686..e8a9157 100644 --- a/gestaoRaul/templates/static/orders/js/orders.js +++ b/gestaoRaul/templates/static/orders/js/orders.js @@ -15,6 +15,12 @@ function openTab(evt, etapa) { // console.log(evt.currentTarget.className += " active"); } + function displayBlock(etapa) { + + document.getElementById('loading').style.display = "none"; + document.getElementById(etapa).style.display = "block"; + } + tabcontent = document.getElementsByClassName("tabcontent"); for (i = 0; i < tabcontent.length; i++) { @@ -23,7 +29,17 @@ function openTab(evt, etapa) { tabcontent[0].style.display = "block"; - function delayTab(evt,tab){ - setTimeout(function() { - openTab(evt, tab);}, 200); - } \ No newline at end of file + function delayTab(tab){ + document.getElementById('Fila').style.display = "none"; + document.getElementById('Preparo').style.display = "none"; + document.getElementById('Finalizado').style.display = "none"; + document.getElementById('Entregue').style.display = "none"; + document.getElementById('loading').style.display = "block"; + + + setTimeout(function() { + displayBlock(tab);}, 1000); + } + + + displayBlock('Fila'); \ No newline at end of file