Skip to content
Merged
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
4 changes: 2 additions & 2 deletions src/controllers/locais-coleta-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export const buscarFasesSucessionais = (request, response, next) => {

export const cadastrarLocalColeta = async (request, response, next) => {
try {
const dados = pick(request.body, ['descricao', 'complemento', 'cidade_id', 'fase_sucessional_id']);
const dados = pick(request.body, ['descricao', 'cidade_id', 'fase_sucessional_id']);
const localColeta = await LocalColeta.create(dados);
response.status(201).json(localColeta);
} catch (error) {
Expand Down Expand Up @@ -321,7 +321,7 @@ export const buscarLocalColetaPorId = async (request, response, next) => {
export const atualizarLocalColeta = async (request, response, next) => {
try {
const { id } = request.params;
const dados = pick(request.body, ['descricao', 'complemento', 'cidade_id', 'fase_sucessional_id']);
const dados = pick(request.body, ['descricao', 'cidade_id', 'fase_sucessional_id']);
const [updated] = await LocalColeta.update(dados, {
where: { id },
});
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/relatorios-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export const obtemDadosDoRelatorioDeColetaPorLocalEIntervaloDeData = async (req,
},
{
model: LocalColeta,
attributes: ['id', 'descricao', 'complemento'],
attributes: ['id', 'descricao'],
where: whereLocal,
required: true,
},
Expand Down Expand Up @@ -578,7 +578,7 @@ export const obtemDadosDoRelatorioDeLocalDeColeta = async (req, res, next) => {
},
{
model: LocalColeta,
attributes: ['id', 'descricao', 'complemento'],
attributes: ['id', 'descricao'],
where: whereLocal,
required: true,
include: {
Expand Down
4 changes: 1 addition & 3 deletions src/helpers/formata-dados-relatorio.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ const defineNomeCientifico = dado => {
export const formatarDadosParaRelatorioDeColetaPorLocalEIntervaloDeData = dados => {
const romanos = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X', 'XI', 'XII'];
const dadosFormatados = dados.map(dado => ({
local: dado.locais_coletum?.complemento
? `${dado.locais_coletum.descricao} ${dado.locais_coletum.complemento}`
: dado.locais_coletum?.descricao,
local: dado.locais_coletum?.descricao,
data: `${String(dado.data_coleta_dia).padStart(2, '0')}/${romanos[dado.data_coleta_mes - 1]}/${dado.data_coleta_ano}`,
tombo: dado?.hcf,
numeroColeta: dado.numero_coleta || '-',
Expand Down
5 changes: 1 addition & 4 deletions src/models/LocalColeta.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ export default (Sequelize, DataTypes) => {
type: DataTypes.TEXT,
allowNull: true,
},
complemento: {
type: DataTypes.TEXT,
allowNull: true,
},

cidade_id: {
type: DataTypes.INTEGER,
allowNull: true,
Expand Down
6 changes: 1 addition & 5 deletions src/validators/localColeta-cadastro.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@ export default {
notEmpty: true,
errorMessage: 'Descrição é obrigatória.',
},
complemento: {
in: ['body'],
isString: true,
optional: true,
},

cidade_id: {
in: ['body'],
isInt: true,
Expand Down
4 changes: 1 addition & 3 deletions src/views/ficha-tombo.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,7 @@
</div>
<div>
<b class="fs-14">Local de Coleta:</b>
<% if (localColeta && localColeta.complemento) { %>
<%- localColeta.complemento %>
<% } %>

<% if (localColeta && localColeta.descricao) { %>
<%- localColeta.descricao %>
<% } %>
Expand Down
Loading