Skip to content

fix: arruma visualizacao da ficha tombo #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edvaldoszy merged 1 commit into from
Aug 18, 2025
Merged

fix: arruma visualizacao da ficha tombo #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions src/controllers/fichas-tombos-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ export default function fichaTomboController(request, response, next) {
const { tombo_id: tomboId } = request.params;
const { qtd } = request.query;

if (qtd < 1) {
Promise.reject(new Error('Quantidade inválida'));
} else if (qtd > 3) {
Promise.reject(new Error('Quantidade máxima de 3 itens excedida'));
}

Promise.resolve()
.then(() => {
const include = [
Expand Down Expand Up @@ -97,7 +103,7 @@ export default function fichaTomboController(request, response, next) {
model: LocalColeta,
include: [
{
required: true,
required: false,
model: Cidade,
include: {
required: true,
Expand All @@ -123,10 +129,11 @@ export default function fichaTomboController(request, response, next) {

const where = {
ativo: true,
hcf: tomboId,
hcf: parseInt(tomboId),
};

return Tombo.findOne({ include, where });
const tombo = Tombo.findOne({ include, where });
return tombo;
})
.then(tombo => {
if (!tombo) {
Expand Down Expand Up @@ -197,9 +204,9 @@ export default function fichaTomboController(request, response, next) {
const coletores = `${tombo.coletore.nome}${tombo.coletor_complementar ? tombo.coletor_complementar.complementares : ''}`;

const localColeta = tombo.local_coleta;
const { cidade } = localColeta;
const { estado } = cidade;
const { pais } = estado;
const cidade = localColeta.cidade || '';
const estado = cidade?.estado || '';
const pais = estado?.pais || '';

const romanos = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X', 'XI', 'XII'];
const dataTombo = new Date(tombo.data_tombo);
Expand Down
Loading