From 3c92a84b00ee04fbae900f268dcb09ec9dea1326 Mon Sep 17 00:00:00 2001 From: rayane maria dos santos Date: Mon, 14 Aug 2023 16:16:30 -0300 Subject: [PATCH 1/2] feat(48773): Trata contas encerradas no select de contas --- .../DadosDasContas/TabelaContasEncerradas/index.js | 6 +++--- .../PrestacaoDeContas/DetalheDasPrestacoes/index.js | 8 +++++--- .../escolas/PrestacaoDeContas/SelectPeriodoConta.js | 8 ++++++-- src/services/escolas/Associacao.service.js | 4 ++-- src/utils/FormataData.js | 8 +++++++- 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/componentes/dres/Associacoes/DadosDasAssociacoes/DadosDasContas/TabelaContasEncerradas/index.js b/src/componentes/dres/Associacoes/DadosDasAssociacoes/DadosDasContas/TabelaContasEncerradas/index.js index d4b164e61..581d9efbf 100644 --- a/src/componentes/dres/Associacoes/DadosDasAssociacoes/DadosDasContas/TabelaContasEncerradas/index.js +++ b/src/componentes/dres/Associacoes/DadosDasAssociacoes/DadosDasContas/TabelaContasEncerradas/index.js @@ -10,7 +10,7 @@ export const TabelaContasEncerradas = ({ const dataTemplate = (rowData, column) => { return (
- {rowData.solicitacao_encerramento ? moment(rowData.solicitacao_encerramento.data_aprovacao).format('DD/MM/YYYY') : '-'} + {rowData.solicitacao_encerramento ? moment(rowData.solicitacao_encerramento.data_de_encerramento_na_agencia).format('DD/MM/YYYY') : '-'}
) }; @@ -29,8 +29,8 @@ export const TabelaContasEncerradas = ({ - diff --git a/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js b/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js index 1a0598fa5..53ebee473 100644 --- a/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js +++ b/src/componentes/escolas/PrestacaoDeContas/DetalheDasPrestacoes/index.js @@ -114,7 +114,6 @@ export const DetalheDasPrestacoes = () => { const carregaTabelas = async () => { await getTabelasReceita().then(response => { - setContasAssociacao(response.data.contas_associacao); setAcoesAssociacao(response.data.acoes_associacao); }).catch(error => { console.log(error); @@ -128,7 +127,10 @@ export const DetalheDasPrestacoes = () => { }; const carregaContas = async () => { - await getContas().then(response => { + setLoading(true); + let period_uuid = periodoConta ? periodoConta.periodo : ''; + await getContas(period_uuid).then(response => { + setContasAssociacao(response); const files = JSON.parse(localStorage.getItem('periodoConta')); if (files && files.conta !== "") { const conta = response.find(conta => conta.uuid === files.conta); @@ -136,7 +138,7 @@ export const DetalheDasPrestacoes = () => { } }).catch(error => { console.log(error); - }) + }).finally(() => setLoading(false)) }; const conciliar = useCallback(async (rateio_uuid) => { diff --git a/src/componentes/escolas/PrestacaoDeContas/SelectPeriodoConta.js b/src/componentes/escolas/PrestacaoDeContas/SelectPeriodoConta.js index adf64441a..6a6fb8568 100644 --- a/src/componentes/escolas/PrestacaoDeContas/SelectPeriodoConta.js +++ b/src/componentes/escolas/PrestacaoDeContas/SelectPeriodoConta.js @@ -1,5 +1,6 @@ import React from "react"; import {exibeDataPT_BR} from "../../../utils/ValidacoesAdicionaisFormularios"; +import {formataData} from "../../../utils/FormataData"; export const SelectPeriodoConta = ({periodoConta, handleChangePeriodoConta, periodosAssociacao, contasAssociacao}) => { return( @@ -27,7 +28,7 @@ export const SelectPeriodoConta = ({periodoConta, handleChangePeriodoConta, peri - +
@@ -44,7 +45,10 @@ export const SelectPeriodoConta = ({periodoConta, handleChangePeriodoConta, peri > {contasAssociacao && contasAssociacao.map((conta)=> - + )}
diff --git a/src/services/escolas/Associacao.service.js b/src/services/escolas/Associacao.service.js index 7280311a2..3e909595e 100644 --- a/src/services/escolas/Associacao.service.js +++ b/src/services/escolas/Associacao.service.js @@ -81,8 +81,8 @@ export const consultarCpfResponsavel = async (cpf) => { return (await api.get(`/api/membros-associacao/cpf-responsavel/?cpf=${cpf}&associacao_uuid=${localStorage.getItem(ASSOCIACAO_UUID)}`, authHeader)) }; -export const getContas = async () => { - return (await api.get(`/api/associacoes/${localStorage.getItem(ASSOCIACAO_UUID)}/contas/`, authHeader)).data +export const getContas = async (periodo_uuid = '') => { + return (await api.get(`/api/associacoes/${localStorage.getItem(ASSOCIACAO_UUID)}/contas/?periodo_uuid=${periodo_uuid}`, authHeader)).data }; export const getContasEncerradas = async () => { diff --git a/src/utils/FormataData.js b/src/utils/FormataData.js index f882554d6..3c2751d41 100644 --- a/src/utils/FormataData.js +++ b/src/utils/FormataData.js @@ -1,3 +1,5 @@ +import moment from "moment"; + export const formataDataParaPadraoYYYYMMDD = (data) => { const date = new Date(data); const ano = date.getFullYear(); @@ -14,4 +16,8 @@ export const formataDataYYYYMMDDParaApresentacao = (data) => { const ano = date.getFullYear(); return `${dia < 10 ? "0" : ""}${dia}/${mes < 10 ? "0" : ""}${mes}/${ano}`; -} \ No newline at end of file +} + +export const formataData = (data, formato = 'DD/MM/YYYY') => { + return moment(data).format(formato); +}; \ No newline at end of file From e2f02f74b5730f97560bf1fd267bc4d6580a808e Mon Sep 17 00:00:00 2001 From: rayane maria dos santos Date: Mon, 14 Aug 2023 17:21:56 -0300 Subject: [PATCH 2/2] feat(48764): Modifica chamada de contas em resumo de recursos para UE E DRE --- src/componentes/Globais/Dashborard/SelectConta.js | 9 +++++++-- src/componentes/Globais/Dashborard/index.js | 15 +++++++-------- src/services/Dashboard.service.js | 4 ++++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/componentes/Globais/Dashborard/SelectConta.js b/src/componentes/Globais/Dashborard/SelectConta.js index 8026cc180..de919d394 100644 --- a/src/componentes/Globais/Dashborard/SelectConta.js +++ b/src/componentes/Globais/Dashborard/SelectConta.js @@ -1,10 +1,12 @@ import React from "react"; +import {formataData} from "../../../utils/FormataData"; export const SelectConta = ({handleChangeConta, selectConta, tiposConta}) =>{ + return( <>
-

Tipo de conta:

+

Conta:

diff --git a/src/componentes/Globais/Dashborard/index.js b/src/componentes/Globais/Dashborard/index.js index e85fbf437..91a07cdc6 100644 --- a/src/componentes/Globais/Dashborard/index.js +++ b/src/componentes/Globais/Dashborard/index.js @@ -4,14 +4,13 @@ import {DashboardCardInfoConta} from "./DashboardCardInfoConta"; import {SelectPeriodo} from "./SelectPeriodo"; import {SelectConta} from "./SelectConta"; import {getPeriodosAteAgoraForaImplantacaoDaAssociacao, getStatusPeriodoPorData} from "../../../services/escolas/PrestacaoDeContas.service"; -import {getAcoesAssociacao, getAcoesAssociacaoPorPeriodoConta, getTabelas} from "../../../services/Dashboard.service"; -import {exibeDataPT_BR, getCorStatusPeriodo} from "../../../utils/ValidacoesAdicionaisFormularios"; +import {getAcoesAssociacao, getAcoesAssociacaoPorPeriodoConta, getContas} from "../../../services/Dashboard.service"; +import {exibeDataPT_BR} from "../../../utils/ValidacoesAdicionaisFormularios"; import Loading from "../../../utils/Loading"; import {BarraDeStatusPeriodoAssociacao} from "./BarraDeStatusPeriodoAssociacao"; import "./dashboard.scss" import {ASSOCIACAO_UUID} from "../../../services/auth.service"; import {visoesService} from "../../../services/visoes.service"; -import {getPeriodosDePrestacaoDeContasDaAssociacao} from "../../../services/escolas/Associacao.service"; export const Dashboard = () => { let uuid_associacao; @@ -67,12 +66,12 @@ export const Dashboard = () => { useEffect(() => { - const carregaTabelas = async () => { - let tabela = await getTabelas(uuid_associacao); - setTiposConta(tabela.contas_associacao); + const carregaContasAssociacao = async () => { + let contas = await getContas(uuid_associacao, selectPeriodo); + setTiposConta(contas); }; - carregaTabelas() - }, [uuid_associacao]); + carregaContasAssociacao() + }, [uuid_associacao, selectPeriodo]); useEffect(()=>{ diff --git a/src/services/Dashboard.service.js b/src/services/Dashboard.service.js index 9ffb2a297..5f5b9f15e 100644 --- a/src/services/Dashboard.service.js +++ b/src/services/Dashboard.service.js @@ -19,3 +19,7 @@ export const getAcoesAssociacaoPorPeriodoConta = async (associacao_uuid, periodo export const getTabelas = async (associacao_uuid) =>{ return (await api.get(`api/receitas/tabelas/?associacao_uuid=${associacao_uuid}`, authHeader)).data }; + +export const getContas = async (associacao_uuid, periodo_uuid = '') => { + return (await api.get(`/api/associacoes/${associacao_uuid}/contas/?periodo_uuid=${periodo_uuid}`, authHeader)).data +}; \ No newline at end of file