From 5c7364b16fe171bf945c05ebe2855ba1f9cd21c4 Mon Sep 17 00:00:00 2001 From: Marcos Roriz Date: Sat, 26 Jun 2021 00:50:11 -0300 Subject: [PATCH 1/5] Adding RPM binaries --- package.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8413ae2..4da10e0 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,20 @@ "icon": "./src/renderer/img/icones/setelogo.png" } } + }, + { + "name": "@electron-forge/maker-rpm", + "config": { + "options": { + "categories": [ + "Education" + ], + "icon": "./src/renderer/img/icones/setelogo.png", + "requires": [ + "readline" + ] + } + } } ] } @@ -140,4 +154,4 @@ "eslint-plugin-import": "^2.22.0", "eslint-plugin-jsx-a11y": "^6.3.1" } -} +} \ No newline at end of file From 03f4ef2fb46e72c626dfc76b65bd7d982fe260af Mon Sep 17 00:00:00 2001 From: Marcos Roriz Date: Sat, 26 Jun 2021 03:07:25 -0300 Subject: [PATCH 2/5] Added sudo apt-get update to Ubuntu build --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 1b8236a..2d48182 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ for: - image: Ubuntu init: # Install basic packages in Ubuntu - - sh: sudo apt-get install -y fakeroot dpkg rpm + - sh: sudo apt-get update && sudo apt-get install -y fakeroot dpkg rpm - matrix: only: From 37cf41ed585bc33915378563488b353fbb145ffb Mon Sep 17 00:00:00 2001 From: Marcos Roriz Date: Sat, 26 Jun 2021 18:24:17 -0300 Subject: [PATCH 3/5] Updated linux binaries --- appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2d48182..58f7b90 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -89,7 +89,9 @@ artifacts: - path: "\\out\\make\\wix\\x64\\sete.msi" name: WinBinaries - path: "\\out\\make\\deb\\x64\\sete*" - name: UbuntuBinaries + name: DebBinaries + - path: "\\out\\make\\rpm\\x64\\sete*" + name: RpmBinaries - path: "\\out\\make\\sete*" name: MacBinaries @@ -101,7 +103,7 @@ deploy: draft: true auth_token: secure: gx5sdTH7NlaxbamcdboCQP+/+ue/zygB78gyfN9f7R0qIb+ZP7Ap1AFjNqYFELfC - artifact: WinBinaries, UbuntuBinaries, MacBinaries + artifact: WinBinaries, DebBinaries, RpmBinaries, MacBinaries on: branch: master APPVEYOR_REPO_TAG: true From ea8874ac6e70e568074d095a2a12fcc78b162d73 Mon Sep 17 00:00:00 2001 From: Marcos Roriz Date: Fri, 27 Aug 2021 10:15:05 -0300 Subject: [PATCH 4/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bcfdd68..38486c9 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ O Sistema Eletrônico de Gestão do Transporte Escolar (SETE) é um software de ## Baixando o Sete Para baixar o _software_, basta clicar na versão abaixo do seu sistema operacional. -baixar sete para windows      baixar sete para mac      baixar sete para linux

+baixar sete para windows      baixar sete para mac      baixar sete para linux

From 942d4a8f536194e117399d3e5e5139df2b996d9e Mon Sep 17 00:00:00 2001 From: Otoniel Oliveira Date: Wed, 19 Jan 2022 17:44:50 -0300 Subject: [PATCH 5/5] =?UTF-8?q?Refact:=20Corre=C3=A7=C3=A3o=20dos=20alunos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/modules/rota/rota-dados-ctrl.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/renderer/modules/rota/rota-dados-ctrl.js b/src/renderer/modules/rota/rota-dados-ctrl.js index 0546450..3512084 100644 --- a/src/renderer/modules/rota/rota-dados-ctrl.js +++ b/src/renderer/modules/rota/rota-dados-ctrl.js @@ -541,7 +541,11 @@ var adicionarDadosAlunoEscolaTabelaEMapa = () => { dataTableListaDeAlunos.row.add(prox_aluno); dataTableListaDeAlunosNumerada.row.add(prox_aluno); - dist = ol.sphere.getDistance(ponto_atual, alunosComGPS[0].COORD); + if (alunosComGPS.length !== 0) { + dist = ol.sphere.getDistance(ponto_atual, alunosComGPS[0].COORD); + } else { + break; + } } }