-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1699 from prefeiturasp/release/8.1.0
Release/8.1.0
- Loading branch information
Showing
35 changed files
with
1,189 additions
and
698 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
src/componentes/Globais/LegendaInformaçãoAssociacao/ModalLegendaInformacaoAssociacao.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import React, {Fragment} from "react"; | ||
| import {Button, Modal} from "react-bootstrap"; | ||
|
|
||
| export const ModalLegendaInformacaoAssociacao = (propriedades) => { | ||
|
|
||
| const opcoes = [ | ||
| { | ||
| id: 1, | ||
| class: "fundo-cor-cinza-neutral-03 texto-cor-branco", | ||
| texto: "Associação encerrada", | ||
| descricao: "Indica que a associação foi encerrada." | ||
| } | ||
| ] | ||
|
|
||
| return ( | ||
| <Fragment> | ||
| <Modal centered size="lg" | ||
| show={ | ||
| propriedades.show | ||
| } | ||
| onHide={ | ||
| propriedades.onHide | ||
| }> | ||
| <Modal.Header> | ||
| <Modal.Title style={ | ||
| {fontWeight: 'bold'} | ||
| }> | ||
| { | ||
| propriedades.titulo | ||
| }</Modal.Title> | ||
| </Modal.Header> | ||
| <Modal.Body> { | ||
| opcoes.map((tag) => { | ||
| return ( | ||
| <div className="row ml-2 pb-4" key={tag.id}> | ||
| <div className="col-3"> | ||
| <span className={`tag-informacoes-associacao-encerrada ${tag.class}`}> | ||
| {tag.texto} | ||
| </span> | ||
| </div> | ||
|
|
||
| <div className="col"> | ||
| <p>{tag.descricao}</p> | ||
| </div> | ||
| </div> | ||
| ) | ||
| }) | ||
| } </Modal.Body> | ||
| <Modal.Footer> | ||
| <Button variant={ | ||
| propriedades.primeiroBotaoCss ? propriedades.primeiroBotaoCss : "info" | ||
| } | ||
| onClick={ | ||
| propriedades.primeiroBotaoOnclick | ||
| }> | ||
| { | ||
| propriedades.primeiroBotaoTexto | ||
| } </Button> | ||
| </Modal.Footer> | ||
| </Modal> | ||
| </Fragment> | ||
| ) | ||
|
|
||
| } |
17 changes: 17 additions & 0 deletions
17
src/componentes/Globais/LegendaInformaçãoAssociacao/legendaInformacoesAssociacao.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| .tag-informacoes-associacao-encerrada { | ||
| display: flex; | ||
| flex: 1; | ||
| justify-content: center; | ||
| padding-left: 2px; | ||
| padding-right: 2px; | ||
| border-radius: 5px; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .fundo-cor-cinza-neutral-03 { | ||
| background-color: #9B9C9C; | ||
| } | ||
|
|
||
| .texto-cor-branco { | ||
| color: #fff; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,57 @@ | ||
| import React from "react"; | ||
| import {Column} from "primereact/column"; | ||
| import {DataTable} from "primereact/datatable"; | ||
| import {FontAwesomeIcon} from "@fortawesome/react-fontawesome"; | ||
| import {faInfoCircle} from "@fortawesome/free-solid-svg-icons"; | ||
| import useTagInformacaoAssociacaoEncerradaTemplate from "../../../hooks/Globais/TagsInformacoesAssociacoes/useTagInformacaoAssociacaoEncerradaTemplate"; | ||
|
|
||
| export const TabelaAssociacoes = ({associacoes, rowsPerPage, unidadeEscolarTemplate, acoesTemplate, setShowModalLegendaInformacao}) =>{ | ||
| const tagInformacaoAssociacaoEncerrada = useTagInformacaoAssociacaoEncerradaTemplate() | ||
|
|
||
| export const TabelaAssociacoes = ({associacoes, rowsPerPage, unidadeEscolarTemplate, acoesTemplate}) =>{ | ||
| return( | ||
| <DataTable | ||
| value={associacoes} | ||
| className="mt-3 container-tabela-associacoes" | ||
| paginator={associacoes.length > rowsPerPage} | ||
| rows={rowsPerPage} | ||
| paginatorTemplate="PrevPageLink PageLinks NextPageLink" | ||
| autoLayout={true} | ||
| selectionMode="single" | ||
| > | ||
| <Column field="unidade.codigo_eol" header="Código Eol" /> | ||
| <Column | ||
| field="unidade.nome_com_tipo" | ||
| header="Unidade escolar" | ||
| body={unidadeEscolarTemplate} | ||
| /> | ||
| <Column | ||
| field="uuid" | ||
| header="Ações" | ||
| body={acoesTemplate} | ||
| /> | ||
| </DataTable> | ||
| <> | ||
| <div className="d-flex justify-content-end"> | ||
| <button | ||
| onClick={()=> setShowModalLegendaInformacao(true)} | ||
| className="btn btn-link link-green" | ||
| style={{padding: '0px', textDecoration: 'none'}} | ||
| > | ||
| <FontAwesomeIcon | ||
| style={{fontSize: '18px', marginRight: "4px", paddingTop: "2px"}} | ||
| icon={faInfoCircle} | ||
| /> | ||
| <span>Legenda informação</span> | ||
| </button> | ||
| </div> | ||
|
|
||
| <DataTable | ||
| value={associacoes} | ||
| className="mt-3 container-tabela-associacoes" | ||
| paginator={associacoes.length > rowsPerPage} | ||
| rows={rowsPerPage} | ||
| paginatorTemplate="PrevPageLink PageLinks NextPageLink" | ||
| autoLayout={true} | ||
| selectionMode="single" | ||
| > | ||
| <Column field="unidade.codigo_eol" header="Código Eol" /> | ||
| <Column | ||
| field="unidade.nome_com_tipo" | ||
| header="Unidade educacional" | ||
| body={unidadeEscolarTemplate} | ||
| /> | ||
| <Column | ||
| field="informacao" | ||
| header="Informações" | ||
| style={{width: '15%'}} | ||
| className="align-middle text-center" | ||
| body={tagInformacaoAssociacaoEncerrada} | ||
| /> | ||
| <Column | ||
| field="uuid" | ||
| header="Ações" | ||
| body={acoesTemplate} | ||
| /> | ||
| </DataTable> | ||
| </> | ||
| ); | ||
| }; |
Oops, something went wrong.