Skip to content

Commit

Permalink
Merge pull request #2353 from prefeiturasp/develop
Browse files Browse the repository at this point in the history 
Posição em Develop 12/04/2024 às 09:35
  • Loading branch information
@mdiori
mdiori authored Apr 12, 2024
2 parents 6c64216 + 7960ef8 commit 198b7eb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
13 changes: 8 additions & 5 deletions ...ponentes/escolas/GeracaoDaAta/VisualizacaoDaAta/EdicaoAta/NovoFormularioEditaAta/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -841,16 +841,17 @@ export const NovoFormularioEditaAta = ({
<div className="row">
<div className='col-3 mt-4 ml-4' style={{ opacity: `${ehAdicaoPresente || !podeEditarAta ? "30%" : '100%'}` }}>
<div className="row">
<span className='mr-2'>Membro estava: </span>
<span className='mr-3' style={{whiteSpace: 'nowrap'}}>Membro estava: </span>
</div>
<div className="row">
<Switch
style={{width: '100%'}}
onChange={() => editaStatusDePresencaParticipante(membro.id)}
checked={membro.presente}
name="statusPresencaSwitch"
checkedChildren="Presente"
unCheckedChildren="Ausente"
className={`mt-2 switch-status-presidente form-control ${membro.presente ? "switch-status-presidente-checked" : ""}`}
className={`mt-2 switch-status-presidente ${membro.presente ? "switch-status-presidente-checked" : ""}`}
disabled={ehAdicaoPresente || !podeEditarAta}
/>
</div>
Expand All @@ -862,25 +863,27 @@ export const NovoFormularioEditaAta = ({
</div>
<div className="row">
<Switch
style={{width: '100%'}}
onChange={() => editaStatusDePresidenteDaReuniao(membro.id)}
checked={membro.presidente_da_reuniao}
name="statusPresidenteSwitch"
className={`mt-2 switch-status-presidente form-control ${membro.presidente_da_reuniao ? "switch-status-presidente-checked" : ""}`}
className={`mt-2 switch-status-presidente ${membro.presidente_da_reuniao ? "switch-status-presidente-checked" : ""}`}
disabled={ehAdicaoPresente || membro.secretario_da_reuniao || !podeEditarAta || !membro.presente}
/>
</div>
</div>

<div className='col-3 mt-4 ml-4' style={{ opacity: `${ehAdicaoPresente || !podeEditarAta ? "30%" : '100%'}` }}>
<div className='col-3 mt-4 ml-3' style={{ opacity: `${ehAdicaoPresente || !podeEditarAta ? "30%" : '100%'}` }}>
<div className="row">
<span className='mr-2'>Secretário: </span>
</div>
<div className="row">
<Switch
style={{width: '100%'}}
onChange={() => editaStatusDeSecretarioDaReuniao(membro.id)}
checked={membro.secretario_da_reuniao}
name="statusSecretarioSwitch"
className={`mt-2 switch-status-presidente form-control ${membro.secretario_da_reuniao ? "switch-status-presidente-checked" : ""}`}
className={`mt-2 switch-status-presidente ${membro.secretario_da_reuniao ? "switch-status-presidente-checked" : ""}`}
disabled={ehAdicaoPresente || membro.presidente_da_reuniao || !podeEditarAta || !membro.presente}
/>
</div>
Expand Down
2 changes: 2 additions & 0 deletions ...onentes/sme/Parametrizacoes/Estrutura/AcoesDasAssociacoes/ModalFormAcoesDasAssociacoes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from "react";
import {ModalFormParametrizacoesAcoesDaAssociacao} from "../../../../Globais/ModalBootstrap";
import AutoCompleteAssociacoes from "./AutoCompleteAssociacoes";
import { RetornaSeTemPermissaoEdicaoPainelParametrizacoes } from "../../../../sme/Parametrizacoes/RetornaSeTemPermissaoEdicaoPainelParametrizacoes";
import Spinner from "../../../../../assets/img/spinner.gif"

export const ModalFormAcoesDaAssociacao = (props) => {
const TEM_PERMISSAO_EDICAO_PAINEL_PARAMETRIZACOES = RetornaSeTemPermissaoEdicaoPainelParametrizacoes()
Expand Down Expand Up @@ -33,6 +34,7 @@ export const ModalFormAcoesDaAssociacao = (props) => {
) :
<>
<label htmlFor="selectedAcao">Unidade Educacional *</label>
{props.ĺoadingAssociacoes && <p>Carregando unidades <img alt="" src={Spinner} style={{height: "22px"}}/></p>}
<AutoCompleteAssociacoes
todasAsAcoesAutoComplete={props.todasAsAcoesAutoComplete}
recebeAcaoAutoComplete={props.recebeAcaoAutoComplete}
Expand Down
3 changes: 3 additions & 0 deletions src/componentes/sme/Parametrizacoes/Estrutura/AcoesDasAssociacoes/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const AcoesDasAssociacoes = () => {
const [tabelaAssociacoes, setTabelaAssociacoes] = useState({});
const [currentPage, setCurrentPage] = useState(1);
const [firstPage, setFirstPage] = useState(1);
const [ĺoadingAssociacoes, setLoadingAssociacoes] = useState(true);

const carregaTodasAsAcoes = useCallback(async (page=1, filtrar_por_nome_cod_eol='', filtrar_por_acao='', filtrar_por_status='', filtro_informacoes='') => {
setLoading(true);
Expand All @@ -52,6 +53,7 @@ export const AcoesDasAssociacoes = () => {

const fetchAssociacoes = async () => {
let todas_associacoes = await getAssociacoes();
setLoadingAssociacoes(false);
setTodasAsAcoesAutoComplete(todas_associacoes);
};

Expand Down Expand Up @@ -327,6 +329,7 @@ export const AcoesDasAssociacoes = () => {
primeiroBotaoTexto="Cancelar"
primeiroBotaoCss="outline-success"
todasAsAcoesAutoComplete={todasAsAcoesAutoComplete}
ĺoadingAssociacoes={ĺoadingAssociacoes}
/>
</section>
<section>
Expand Down

0 comments on commit 198b7eb

Please sign in to comment.