Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<a href="https://github.com/marcosroriz/sete/releases/download/v1.6.0/sete_1.6.0_windows64.msi"><img src="https://files.cercomp.ufg.br/weby/up/767/o/baixarwindows.png" alt="baixar sete para windows" width="200" height="81" /></a>&nbsp; &nbsp; &nbsp;&nbsp;<a href="https://github.com/marcosroriz/sete/releases/download/v1.6.0/sete_1.6.0_mac64.dmg"><img src="https://files.cercomp.ufg.br/weby/up/767/o/baixarmac.png" alt="baixar sete para mac" width="200" height="81" /></a>&nbsp; &nbsp; &nbsp;&nbsp;<a href="https://github.com/marcosroriz/sete/releases/download/v1.6.0/sete_1.6.0_linux64.deb"><img src="https://files.cercomp.ufg.br/weby/up/767/o/baixarlinux.png" alt="baixar sete para linux" width="200" height="81" /></a></p>
<a href="https://github.com/marcosroriz/sete/releases/download/Sete-v.1.7.0/sete_1.7.0_windows64.msi"><img src="https://files.cercomp.ufg.br/weby/up/767/o/baixarwindows.png" alt="baixar sete para windows" width="200" height="81" /></a>&nbsp; &nbsp; &nbsp;&nbsp;<a href="https://github.com/marcosroriz/sete/releases/download/Sete-v.1.7.0/sete_1.7.0_mac64.dmg"><img src="https://files.cercomp.ufg.br/weby/up/767/o/baixarmac.png" alt="baixar sete para mac" width="200" height="81" /></a>&nbsp; &nbsp; &nbsp;&nbsp;<a href="https://github.com/marcosroriz/sete/releases/download/Sete-v.1.7.0/sete_1.7.0_linux64.deb"><img src="https://files.cercomp.ufg.br/weby/up/767/o/baixarlinux.png" alt="baixar sete para linux" width="200" height="81" /></a></p>



Expand Down
8 changes: 5 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand Down
16 changes: 15 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
}
]
}
Expand Down Expand Up @@ -140,4 +154,4 @@
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsx-a11y": "^6.3.1"
}
}
}
6 changes: 5 additions & 1 deletion src/renderer/modules/rota/rota-dados-ctrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}

Expand Down