welton/RRBEC
1
0
Fork 0
mirror of https://github.com/welton89/RRBEC.git synced 2026-04-05 13:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug: page orders resolvido

Browse Source
This commit is contained in:
Welton Moura
2025-01-22 19:08:34 -03:00
parent 04e78a0f79
commit 80aebd2030
7 changed files with 204 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
gestaoRaul/db.sqlite3
View File

Binary file not shown.

BIN
gestaoRaul/orders/__pycache__/views.cpython-310.pyc
View File

Binary file not shown.

177
gestaoRaul/orders/templates/orders.html
View File

@@ -25,7 +25,6 @@
<h1>Pedidos cozinha</h1> <h1>Pedidos cozinha</h1>
<div id="list-orders"> <div id="list-orders">
<div class="tab"> <div class="tab">
@@ -37,106 +36,106 @@
<div id="etapas"> <div id="etapas">
<div id="Fila" class="tabcontent"> <div id="Fila" class="tabcontent">
{% for order in orders %} {% for order in orders %}
{% if order.preparing == None and order.productComanda != Null %} {% if order.preparing == None and order.productComanda != Null %}
<div class="m-card" <div class="m-card"
{% if order.productComanda == Null %} {% if order.productComanda == Null %}
style="background-color: rgb(253, 69, 69);" style="background-color: rgb(253, 69, 69);"
{% elif order.obs != '' %} {% elif order.obs != '' %}
style="background-color: rgb(243, 165, 75);" style="background-color: rgb(243, 165, 75);"
{% endif %} {% endif %}
> >
<h4>{{order.id_product.name}}</h4> <h4>{{order.id_product.name}}</h4>
<h4>{{order.obs}} </h4> <h4>{{order.obs}} </h4>
<h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4> <h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4>
<h4> Atendente: {{order.id_comanda.user.first_name}} </h4> <h4> Atendente: {{order.id_comanda.user.first_name}} </h4>
<h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4> <h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4>
<button onclick="delayTab(event, 'Fila')" <button onclick="delayTab('Fila')"
hx-get="{% url 'preparing' order.id %} " hx-trigger="click" hx-target="#etapas" hx-get="{% url 'preparing' order.id %} " hx-trigger="click" hx-target="#etapas"
>Preparar</button> >Preparar</button>
</div>
{% endif %}
{% endfor %}
</div> </div>
{% endif %}
{% endfor %}
</div>
<div id="Preparo" class="tabcontent"> <div id="Preparo" class="tabcontent">
{% for order in orders %} {% for order in orders %}
{% if order.finished == None and order.preparing != None %} {% if order.finished == None and order.preparing != None %}
<div class="m-card"
<div class="m-card" {% if order.productComanda == Null %}
{% if order.productComanda == Null %} style="background-color: rgb(253, 69, 69);"
style="background-color: rgb(253, 69, 69);" {% elif order.obs != '' %}
{% elif order.obs != '' %} style="background-color: rgb(243, 165, 75);"
style="background-color: rgb(243, 165, 75);" {% endif %}
{% endif %} >
> <h4>{{order.id_product.name}}</h4>
<h4>{{order.id_product.name}}</h4> <h4>{{order.obs}} </h4>
<h4>{{order.obs}} </h4> <h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4>
<h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4> <h4> Atendente: {{order.id_comanda.user.first_name}} </h4>
<h4> Atendente: {{order.id_comanda.user.first_name}} </h4> <h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4>
<h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4> <button onclick="delayTab( 'Preparo')"
<button onclick="delayTab(event, 'Preparo')" hx-get="{% url 'finished' order.id %} " hx-trigger="click" hx-target="#etapas"
hx-get="{% url 'finished' order.id %} " hx-trigger="click" hx-target="#etapas" >Finalizar</button>
>Finalizar</button> </div>
{% endif %}
{% endfor %}
</div> </div>
{% endif %}
{% endfor %}
</div>
<div id="Finalizado" class="tabcontent"> <div id="Finalizado" class="tabcontent">
{% for order in orders %} {% for order in orders %}
{% if order.delivered == None and order.finished != None %} {% if order.delivered == None and order.finished != None %}
<div class="m-card"
<div class="m-card" {% if order.productComanda == Null %}
{% if order.productComanda == Null %} style="background-color: rgb(253, 69, 69);"
style="background-color: rgb(253, 69, 69);" {% elif order.obs != '' %}
{% elif order.obs != '' %} style="background-color: rgb(243, 165, 75);"
style="background-color: rgb(243, 165, 75);" {% endif %}
{% endif %} >
> <h4>{{order.id_product.name}}</h4>
<h4>{{order.id_product.name}}</h4> <h4>{{order.obs}} </h4>
<h4>{{order.obs}} </h4> <h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4>
<h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4> <h4> Atendente: {{order.id_comanda.user.first_name}} </h4>
<h4> Atendente: {{order.id_comanda.user.first_name}} </h4> <h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4>
<h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4> <button onclick="delayTab( 'Finalizado')"
<button onclick="delayTab(event, 'Finalizado')" hx-get="{% url 'delivered' order.id %} " hx-trigger="click" hx-target="#etapas"
hx-get="{% url 'delivered' order.id %} " hx-trigger="click" hx-target="#etapas" >Entregar</button>
>Entregar</button> </div>
{% endif %}
{% endfor %}
</div> </div>
{% endif %}
{% endfor %}
</div>
<div id="Entregue" class="tabcontent"> <div id="Entregue" class="tabcontent">
{% for order in orders %} {% for order in orders %}
{% if order.delivered != None %} {% if order.delivered != None %}
<div class="m-card"
<div class="m-card" {% if order.productComanda == Null %}
{% if order.productComanda == Null %} style="background-color: rgb(253, 69, 69);"
style="background-color: rgb(253, 69, 69);" {% elif order.obs != '' %}
{% elif order.obs != '' %} style="background-color: rgb(243, 165, 75);"
style="background-color: rgb(243, 165, 75);" {% endif %}
{% endif %} >
> <h4>{{order.id_product.name}}</h4>
<h4>{{order.id_product.name}}</h4> <h4>{{order.obs}} </h4>
<h4>{{order.obs}} </h4> <h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4>
<h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4> <h4> Atendente: {{order.id_comanda.user.first_name}} </h4>
<h4> Atendente: {{order.id_comanda.user.first_name}} </h4> <h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4>
<h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4> </div>
<!-- <button>Preparar</button> --> {% endif %}
{% endfor %}
</div> </div>
</div> </div>
{% endif %}
{% endfor %}
</div>
</div> </div>
<dialog id="loading" >
<div class="loading">
<img src="{% static 'midia/icons/loading.svg' %}" alt="">
</div>
<br><br>
<h1>Carregando...</h1>
</dialog>
<script src="{% static 'orders/js/orders.js' %}"></script> {% endblock %} <script src="{% static 'orders/js/orders.js' %}"></script> {% endblock %}
</body> </body>

139
gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html
View File

@@ -10,93 +10,92 @@
<div id="Fila" class="tabcontent"> <div id="Fila" class="tabcontent">
{% for order in orders %} {% for order in orders %}
{% if order.preparing == None and order.productComanda != Null %} {% if order.preparing == None and order.productComanda != Null %}
<div class="m-card" <div class="m-card"
{% if order.productComanda == Null %} {% if order.productComanda == Null %}
style="background-color: rgb(253, 69, 69);" style="background-color: rgb(253, 69, 69);"
{% elif order.obs != '' %} {% elif order.obs != '' %}
style="background-color: rgb(243, 165, 75);" style="background-color: rgb(243, 165, 75);"
{% endif %} {% endif %}
> >
<h4>{{order.id_product.name}}</h4> <h4>{{order.id_product.name}}</h4>
<h4>{{order.obs}} </h4> <h4>{{order.obs}} </h4>
<h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4> <h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4>
<h4> Atendente: {{order.id_comanda.user.first_name}} </h4> <h4> Atendente: {{order.id_comanda.user.first_name}} </h4>
<h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4> <h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4>
<button onclick="delayTab(event, 'Fila')" <button onclick="delayTab('Fila')"
hx-get="{% url 'preparing' order.id %} " hx-trigger="click" hx-target="#etapas" hx-get="{% url 'preparing' order.id %} " hx-trigger="click" hx-target="#etapas"
>Preparar</button> >Preparar</button>
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
<div id="Preparo" class="tabcontent"> <div id="Preparo" class="tabcontent">
{% for order in orders %} {% for order in orders %}
{% if order.finished == None and order.preparing != None %} {% if order.finished == None and order.preparing != None %}
<div class="m-card" <div class="m-card"
{% if order.productComanda == Null %} {% if order.productComanda == Null %}
style="background-color: rgb(253, 69, 69);" style="background-color: rgb(253, 69, 69);"
{% elif order.obs != '' %} {% elif order.obs != '' %}
style="background-color: rgb(243, 165, 75);" style="background-color: rgb(243, 165, 75);"
{% endif %} {% endif %}
> >
<h4>{{order.id_product.name}}</h4> <h4>{{order.id_product.name}}</h4>
<h4>{{order.obs}} </h4> <h4>{{order.obs}} </h4>
<h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4> <h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4>
<h4> Atendente: {{order.id_comanda.user.first_name}} </h4> <h4> Atendente: {{order.id_comanda.user.first_name}} </h4>
<h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4> <h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4>
<button onclick="delayTab(event, 'Preparo')" <button onclick="delayTab('Preparo')"
hx-get="{% url 'finished' order.id %} " hx-trigger="click" hx-target="#etapas" hx-get="{% url 'finished' order.id %} " hx-trigger="click" hx-target="#etapas"
>Finalizar</button> >Finalizar</button>
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>
<div id="Finalizado" class="tabcontent"> <div id="Finalizado" class="tabcontent">
{% for order in orders %} {% for order in orders %}
{% if order.delivered == None and order.finished != None %} {% if order.delivered == None and order.finished != None %}
<div class="m-card"
<div class="m-card" {% if order.productComanda == Null %}
{% if order.productComanda == Null %} style="background-color: rgb(253, 69, 69);"
style="background-color: rgb(253, 69, 69);" {% elif order.obs != '' %}
{% elif order.obs != '' %} style="background-color: rgb(243, 165, 75);"
style="background-color: rgb(243, 165, 75);" {% endif %}
{% endif %} >
> <h4>{{order.id_product.name}}</h4>
<h4>{{order.id_product.name}}</h4> <h4>{{order.obs}} </h4>
<h4>{{order.obs}} </h4> <h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4>
<h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4> <h4> Atendente: {{order.id_comanda.user.first_name}} </h4>
<h4> Atendente: {{order.id_comanda.user.first_name}} </h4> <h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4>
<h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4> <button onclick="delayTab('Finalizado')"
<button onclick="delayTab(event, 'Finalizado')" hx-get="{% url 'delivered' order.id %} " hx-trigger="click" hx-target="#etapas"
hx-get="{% url 'delivered' order.id %} " hx-trigger="click" hx-target="#etapas" >Entregar</button>
>Entregar</button> </div>
</div> {% endif %}
{% endif %}
{% endfor %} {% endfor %}
</div> </div>
<div id="Entregue" class="tabcontent"> <div id="Entregue" class="tabcontent">
{% for order in orders %} {% for order in orders %}
{% if order.delivered != None %} {% if order.delivered != None %}
<div class="m-card" <div class="m-card"
{% if order.productComanda == Null %} {% if order.productComanda == Null %}
style="background-color: rgb(253, 69, 69);" style="background-color: rgb(253, 69, 69);"
{% elif order.obs != '' %} {% elif order.obs != '' %}
style="background-color: rgb(243, 165, 75);" style="background-color: rgb(243, 165, 75);"
{% endif %} {% endif %}
> >
<h4>{{order.id_product.name}}</h4> <h4>{{order.id_product.name}}</h4>
<h4>{{order.obs}} </h4> <h4>{{order.obs}} </h4>
<h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4> <h4>{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}} </h4>
<h4> Atendente: {{order.id_comanda.user.first_name}} </h4> <h4> Atendente: {{order.id_comanda.user.first_name}} </h4>
<h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4> <h4>{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}</h4>
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</div> </div>

7
gestaoRaul/templates/static/midia/icons/loading.svg Normal file
View File

@@ -0,0 +1,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 392.14 392.14" xml:space="preserve" fill="#808080" stroke="#808080" stroke-width="0.00392138">
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

47
gestaoRaul/templates/static/orders/css/orders.css
View File

@@ -1,24 +1,22 @@
/* .grid-container {
display: grid;
grid-template-columns: repeat(3, 2fr);
gap: 20px;
max-width: 800px;
margin: 0 auto;
}
.card { @keyframes girar {
width: 120px; from {
height: 120px; transform: rotate(0deg);
background-color: #f2f2f2; }
border-radius: 15px; to {
box-shadow: 5px 5px 10px rgba(0, 0, 0, 0.2); transform: rotate(360deg);
text-align: center; }
line-height: 120px; }
font-size: 20px;
font-weight: bold; .loading {
color: #333;
transition: transform 0.2s; align-items: center;
}*/ align-content: center;
align-self: center;
margin: 0 auto;
animation: girar 4s infinite linear;
}
.m-card { .m-card {
/* width: 50px; */ /* width: 50px; */
height: 100%; height: 100%;
@@ -40,7 +38,6 @@
} }
.tab { .tab {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@@ -49,7 +46,6 @@
border-bottom: 2px solid #cccccc93; border-bottom: 2px solid #cccccc93;
} }
/* Estilo para cada aba */
.tab button { .tab button {
width: 24%; width: 24%;
background-color: #4446d636; background-color: #4446d636;
@@ -60,15 +56,12 @@
border-radius: 20px 20px 0px 0px; border-radius: 20px 20px 0px 0px;
} }
/* Estilo para a aba ativa */
.tab button.active { .tab button.active {
background-color: #4446d6; background-color: #4446d6;
} }
/* Estilo para o conteúdo das abas */
.tabcontent { .tabcontent {
/* display: none; */ display: none;
padding: 6px 12px; padding: 6px 12px;
/* border: 1px solid #ccc; */
/* border-top: none; */
} }

24
gestaoRaul/templates/static/orders/js/orders.js
View File

@@ -15,6 +15,12 @@ function openTab(evt, etapa) {
// console.log(evt.currentTarget.className += " active"); // 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"); tabcontent = document.getElementsByClassName("tabcontent");
for (i = 0; i < tabcontent.length; i++) { for (i = 0; i < tabcontent.length; i++) {
@@ -23,7 +29,17 @@ function openTab(evt, etapa) {
tabcontent[0].style.display = "block"; tabcontent[0].style.display = "block";
function delayTab(evt,tab){ function delayTab(tab){
setTimeout(function() { document.getElementById('Fila').style.display = "none";
openTab(evt, tab);}, 200); 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');