From 7dd76db5bad02c9ac67cf59b760aaf97178aa602 Mon Sep 17 00:00:00 2001
From: Welton Moura <weltonmoura@live.com>
Date: Sat, 28 Jun 2025 18:54:44 -0300
Subject: [PATCH] =?UTF-8?q?refactor:altera=C3=A7=C3=A3o=20modal=20de=20obs?=
 =?UTF-8?q?=20do=20pedido=20na=20tela=20viewcomanda?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comandas/templates/viewcomanda.html       |  15 ----
 gestaoRaul/db.sqlite3                         | Bin 348160 -> 348160 bytes
 gestaoRaul/templates/static/base.js           |   2 +
 .../static/comandas/js/viewcomanda.js         |  84 ++++++++++++------
 4 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html
index c1a1961..d46ef9b 100644
--- a/gestaoRaul/comandas/templates/viewcomanda.html
+++ b/gestaoRaul/comandas/templates/viewcomanda.html
@@ -196,21 +196,6 @@ Detalhes {{comanda.name}}
           </div>
           
 
-          
-          <dialog id="modal-obs" style="display: none;">
-            <article>
-              <h2>Observação do Pedido</h2>
-              <p>Observações do pedido que serão enviadas para o preparo na cozinha.</p>
-              <textarea placeholder="Ex.: pedido sem cebola. para viagem." name="obs" id="obs"></textarea>
-              <div>
-                <div style="display: flex;gap: 10px;">
-                  <button type="submit" class="btn-primary" onclick="addOrder()" >OK</button>
-                  <button type="button" class="btn-cancel" onclick="closeModalObs()">Cancela</button>
-        </div>
-    </article>
-      </dialog>
-
-
       
 <dialog id="payment-comanda" style="display: none;" >
   <article>
diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3
index 7762e6fdbf83d2e76332ba87cb89bbb0cd41b505..dd384d29d65637a08d02a4feb58f2b20213320f3 100644
GIT binary patch
delta 294
zcmZozAlk4%bb>VF_K7mijN2O%S`!$zCNM3EXZ$*yIe|%u@z-{>1g7(RT>NhtSQ%KD
zIT@|C|IcG$-^lo7JG%mNJtGtQm+c*j%sFfv?95C|tn~~JrvFiAwrAeJ;4wK+z@@!O
zgL!+C21~0sqr`TO1eQh)105?a21f=_22KW1P9p;&Q(XfyT_ZCELklYtODjV&Jp)ri
z6AOc^{KS0!09QW-hV45uSSlE~4J|?1WEmJ4M5iaFvj|W3&tef|gDOeOVp*`1k$pP5
z0IMq#6Z>{Q0oI+2GL5W_3ET|ojzGY`$i(EEnwh8&kY99o`QgR+(>H!)5uL6o${MkK
lf)ML#Miy2k1_z*vZKm%QVRdKWWMQZV^2)c@in2Ca0RVJwPKp2k

delta 285
zcmZozAlk4%bb>VF+=(*IjB^_kS`!$zCNM3EXZ$stIe|%u@#}WA1g7(RTrA9-j8^<_
z8CV&%|IcG$-^lo9JG%mNJtGrG(e@5S<{UN-Pd{hZ;9v*s>3`Ij?U}0>EG7pEnDDSO
zGcmE&Gd$qfz`)U7r@_3vPJ^Y>oKa*uM*>SDhk>3I7lR{%C<7;hB&U&qk*ThMnXZwU
zf}w?#iKUgHnVx~Ep^1e-R(@iBfMcYmpZoTm87viyoW_<QZL$oE)8o@wM5p^_u?Vt3
z6{KacELh4oVLH12t1A;L({?`r)}4%#69hW9PY_~#&B(&Z!r%aOna%XwBCPJb6^#kp
c47`p&z`)2feZyB4vFR2<tP$I5MOmAz0DG8Ag#Z8m

diff --git a/gestaoRaul/templates/static/base.js b/gestaoRaul/templates/static/base.js
index d533da5..10a7897 100644
--- a/gestaoRaul/templates/static/base.js
+++ b/gestaoRaul/templates/static/base.js
@@ -182,6 +182,8 @@ function openFullscreen() {
     var feedbackMsg = Swal.fire({
         color: 'white',
         title: message,
+        // toast: true,
+        // position: 'top',
         text: subMessage || '',
         icon: icon || 'info',
         background: 'rgb(23, 38, 54)',
diff --git a/gestaoRaul/templates/static/comandas/js/viewcomanda.js b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
index 00de60a..25741c5 100644
--- a/gestaoRaul/templates/static/comandas/js/viewcomanda.js
+++ b/gestaoRaul/templates/static/comandas/js/viewcomanda.js
@@ -6,7 +6,7 @@ function openModal() {
 if (textField) {
   setTimeout(() => {
     textField.focus();
-  }, 500); // 50ms de delay (ajuste conforme necessário)
+  }, 500);
 }
   textField.value = '';
 }
@@ -22,9 +22,6 @@ function openModalAlter() {
     document.getElementById('Modal-alter-comanda').style.display = 'block';
     var name = document.getElementById('name-comanda').innerText.replace('Nome: ','').replace(' | ', '')
     var mesa = document.getElementById('h-mesaId').value
-    console.log(name)
-    console.log(mesa)
-
     var fildName =  document.getElementById('nameComanda')
     fildName.value = name
     var fildMesa =  document.getElementById('select-mesa')
@@ -34,12 +31,56 @@ function openModalAlter() {
 function closeModalAlter() {
     document.getElementById('Modal-alter-comanda').style.display = 'none';
 }
-function openModalObs(id) {
-    document.getElementById('modal-obs').style.display = 'block';
-    idd = document.getElementById('id-temp').value = id;
-    obs = document.getElementById('obs').value;
-    textField = document.getElementById('obs')
-    textField.focus()
+async function openModalObs(id) {
+  var obsPrint = document.getElementById(id+'-obsOrder')
+  var order = obsPrint.value.split('|');
+  const inputOptions = new Promise((resolve) => {
+ 
+    resolve({
+      "Para viagem": "Para Viagem",
+      "Meia Porção": "Meia Porção",
+      "Com Leite": "Com Leite",
+      "Sem Cebola": "Sem Cebola",
+      "Com Ovo": "Com Ovo",
+    });
+ 
+});
+
+const { value: obs } = await Swal.fire({
+  title: "Observações rápidas",
+  input: "radio",
+  color: 'white',
+  confirmButtonText: "Enviar ou Digitar Outra",
+  showCancelButton: true,
+  cancelButtonText: "Cancelar",
+  inputOptions,
+  theme: "dark",
+  inputValidator: async (value) => {
+
+    if (!value) {
+        const { value: text } = await Swal.fire({
+        input: "textarea",
+        title: "Observação do Pedido",
+        inputValue:order[1],
+        theme: "dark",
+        background: 'rgb(23, 38, 54)',
+        confirmButtonColor: 'linear-gradient(145deg, #1E2A3B, #2C3E50)', 
+        color: 'white',
+        showCancelButton: true,
+        inputAttributes: {
+          "aria-label": "Type your message here"
+        }});
+        
+        if (text) {
+          addOrder(id, text)
+          }
+    }
+  }
+});
+if (obs) {
+  addOrder(id, obs)
+}
+
 
 }
 
@@ -66,20 +107,14 @@ function close_modal_conta_client() {
     document.getElementById('conta-cliente').style.display = 'none';
 }
 
-
 function close_modal_payment_parcial() {
     document.getElementById('payment-parcial').style.display = 'none';
 }
+
 function close_modal_payment_comanda() {
     document.getElementById('payment-comanda').style.display = 'none';
 }
 
-function closeModalObs() {
-    document.getElementById('modal-obs').style.display = 'none';
-}
-
-
-
 function imprimirFichas() {
     const element = document.getElementById("list-products-comanda");
     const style = `<style>
@@ -140,7 +175,6 @@ function printOrder(id) {
 
   }
 
-
 function imprimirConta() {
   reloadPage();
     const element = document.getElementById("list-products-comanda");
@@ -265,14 +299,12 @@ function troco(){
 }
 
 
-function addOrder(){
-  var obs = document.getElementById('obs')
-  id = document.getElementById('id-temp').value
+function addOrder(id, obs){
   var obsPrint = document.getElementById(id+'-obsOrder')
   var order = obsPrint.value.split('|');
   var newOrder = '';
 
-  fetch(`/comandas/editOrders/${id}/${obs.value}`, {
+  fetch(`/comandas/editOrders/${id}/${obs}`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -281,22 +313,18 @@ function addOrder(){
     .then(response => response.json())
     .then(data => {
       if(data.status == 'ok'){
-        showToast('✅Pedido atualizado com sucesso!😁','success')
-        obs.value = ''
         order[1] = data.obs;
         for(var i = 0; i < order.length; i++){
           newOrder += order[i] + '|';
           }
         obsPrint.value = newOrder;
-        document.getElementById('modal-obs').style.display = 'none';
-      
+        feedback('Obsevação alterada com sucesso!😁','success');
     }
   })
   .catch(error => {
     console.log(error)
-    showToast('❌Ocorreu um erro!😢','error')
+    feedback('❌Ocorreu um erro!😢','error','Erro: ' + error.message);
   });
-
 }