Skip to content

HCF-API-465 #471

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

Open
als-v wants to merge 1 commit into
base: development
Choose a base branch
from
Open

HCF-API-465 #471

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
18 changes: 15 additions & 3 deletions src/controllers/dashboard-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,18 @@ const calcularPorcentagem = (atual, passado) => {
const formatarRanking = (dadosQuery, aliasTabela) => {
return dadosQuery.map(item => {
const info = item[aliasTabela] || item[aliasTabela.charAt(0).toUpperCase() + aliasTabela.slice(1)];
let nome = info?.nome || info?.sigla || 'N/A';

if (aliasTabela === 'especie') {
const generoInfo = item.genero || item.Genero;

if (generoInfo?.nome) {
nome = `${generoInfo.nome} ${nome}`;
}
}

return {
nome: info?.nome || info?.sigla || 'N/A',
nome: nome,
total: parseInt(item.get('quantidade'), 10) || 0,
};
});
Expand Down Expand Up @@ -69,8 +78,11 @@ export const tomboInfo = async (request, response, next) => {
Tombo.findAll({
where: { ...condicaoBase, especie_id: { [Op.not]: null } },
attributes: ['especie_id', [Sequelize.fn('COUNT', Sequelize.col('tombos.hcf')), 'quantidade']],
include: [{ model: Especie, as: 'especie', attributes: ['nome'] }],
group: ['especie_id', 'especie.id'],
include: [
{ model: Especie, as: 'especie', attributes: ['nome'] },
{ model: Genero, as: 'genero', attributes: ['nome'] },
],
group: ['especie_id', 'especie.id', 'genero.id', 'genero.nome'],
order: [[Sequelize.literal('quantidade'), 'DESC']],
limit: 5,
}), // rankEspecies
Expand Down
Loading