From 4906da2bf0def113edbdb57145fc66144a6199da Mon Sep 17 00:00:00 2001 From: Eder Moraes <54563944+edermcastro@users.noreply.github.com> Date: Wed, 9 Jul 2025 21:03:42 -0300 Subject: [PATCH] =?UTF-8?q?altera=C3=A7=C3=B5es=20no=20comportamento=20do?= =?UTF-8?q?=20inicio=20do=20atendimento,=20janela=20carregada=20somente=20?= =?UTF-8?q?depois=20das=20op=C3=A7=C3=B5es=20selecionadas.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 12 ++++++++---- package.json | 2 +- renderer.js | 8 ++++---- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/main.js b/main.js index 220e9c1..7065f1a 100644 --- a/main.js +++ b/main.js @@ -416,8 +416,7 @@ ipcMain.on('chamar-fila', async () => { return proximos.length; } - const requestData = async () =>{ - + const showMainWindow = () => { if (mainWin) { if (!mainWin.isVisible()) { mainWin.show(); @@ -432,6 +431,11 @@ ipcMain.on('chamar-fila', async () => { mainWin.focus(); }); } + } + + const requestData = async () =>{ + + const colabId = await getSelectedOperatorId(); @@ -457,10 +461,9 @@ ipcMain.on('chamar-fila', async () => { response.on('end', () => { try { const parsedData = JSON.parse(rawData); - console.log(parsedData); - if (response.statusCode === 200) { mainWin.webContents.send('select-atend-id', parsedData.data); + if (parsedData.data && (parsedData.data.Status === 'Fila' || parsedData.data.Status === 'Chamado')) { showMainWindow(); } else if(parsedData.data && parsedData.data.Status === 'Atendendo'){ let options2 = { 'title': 'Precisa finalizar antes de chamar o próximo.', @@ -473,6 +476,7 @@ ipcMain.on('chamar-fila', async () => { dialog.showMessageBox(floatingWin, options2).then(result => { if(result.response){ mainWin.webContents.send('show-observation'); + showMainWindow(); } else { mainWin.hide(); }; diff --git a/package.json b/package.json index d843cbb..e4962d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "autoatendcolab", - "version": "1.0.9", + "version": "1.1.0", "main": "main.js", "isBuildNow": true, "scripts": { diff --git a/renderer.js b/renderer.js index 757e1bf..1d38ab2 100644 --- a/renderer.js +++ b/renderer.js @@ -79,10 +79,10 @@ window.electronAPI.selectAtendID((data)=>{ nextButton.disabled = true; if(!data){ queueNumber.innerHTML = 'Ninguem aguardando atendimento, fechando a janela em alguns segundos...'; - setTimeout(() => { - localStorage.removeItem('proximos'); - window.close(); - },5000); + // setTimeout(() => { + // localStorage.removeItem('proximos'); + // window.close(); + // },5000); return; } // Reseta a view para a lista sempre que os dados são carregados ao clicar no botão para abrir a janela