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
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
POSTGRES_USER: $PG_USERNAME
POSTGRES_PASSWORD: $PG_PASSWORD
volumes:
- postgres_data:/var/lib/postgresql/data
- postgres_data:/var/lib/postgresql
ports:
- ${PG_PORT:-5432}:5432
shm_size: 128mb
Expand Down
1 change: 1 addition & 0 deletions src/controllers/darwincore-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ const obterModeloDarwinCoreLotes = async (limit, offset, request, response) => {
},
{
model: Coletor,
as: 'coletor',
},
{
model: ColetorComplementar,
Expand Down
1 change: 1 addition & 0 deletions src/controllers/fichas-tombos-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ export default function fichaTomboController(request, response, next) {
const include = [
{
model: Coletor,
as: 'coletor',
},
{
model: Identificador,
Expand Down
3 changes: 2 additions & 1 deletion src/controllers/pendencias-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,7 @@ export const visualizarAlteracaoOperador = (json, alteracao, transaction) => {
include: [
{
model: Coletor,
as: 'coletor',
},
{
model: Herbario,
Expand Down Expand Up @@ -1889,7 +1890,7 @@ export async function visualizar(request, response, next) {
include: [
{ model: Variedade }, { model: Especie }, { model: Familia },
{ model: Subfamilia }, { model: Genero }, { model: Subespecie },
{ model: Herbario }, { model: Tipo }, { model: Coletor }, { model: ColetorComplementar, as: 'coletor_complementar' },
{ model: Herbario }, { model: Tipo }, { model: Coletor, as: 'coletor' }, { model: ColetorComplementar, as: 'coletor_complementar' },
{ model: Solo }, { model: Relevo }, { model: Vegetacao }, { model: ColecaoAnexa }, { model: FaseSucessional },
{
model: LocalColeta,
Expand Down
1 change: 1 addition & 0 deletions src/controllers/relatorios-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,7 @@ export const obtemDadosDoRelatorioDeColetaPorColetorEIntervaloDeData = async (re
},
{
model: Coletor,
as: 'coletor',
where: whereColetor,
required: true,
attributes: ['id', 'nome'],
Expand Down
1 change: 1 addition & 0 deletions src/controllers/splinker-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ const obterModeloSPlinkerLotes = async (limit, offset, request, response) => {
},
{
model: Coletor,
as: 'coletor',
},
{
model: Identificador,
Expand Down
3 changes: 3 additions & 0 deletions src/controllers/tombos-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,7 @@ export const listagem = (request, response, next) => {
let include = [
{
model: Coletor,
as: 'coletor',
attributes: ['id', 'nome'],
required: false,
},
Expand Down Expand Up @@ -838,6 +839,7 @@ export async function listagemTombosPorIdentificador(request, response, next) {
},
{
model: Coletor,
as: 'coletor',
attributes: ['id', 'nome'],
required: false,
},
Expand Down Expand Up @@ -1198,6 +1200,7 @@ export const obterTombo = async (request, response, next) => {
},
{
model: Coletor,
as: 'coletor',
attributes: ['id', 'nome'],
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/services/tombos-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export function selecionaObjetoCompletoTomboPorId(condicoes, transacao) {
{
required: true,
model: Coletor,
through: { attributes: [] },
as: 'coletor',
},
],

Expand Down
Loading