diff --git a/src/components/BottomTableComponent.js b/src/components/BottomTableComponent.js
index 3622f8cceace2c61f1c8d106785780ef415747a3..7e694ae22eee695e8168dba18512052086b74520 100644
--- a/src/components/BottomTableComponent.js
+++ b/src/components/BottomTableComponent.js
@@ -26,6 +26,7 @@ import attention from '../img/attention.svg';
import reload from '../img/reload.svg';
import sortingArrow from '../img/sorting-arrow.svg';
import downWhiteArrow from '../img/down-arrow-white.svg';
+import downloadIcon from '../img/download-icon.svg'
import { useSortBy, useTable } from 'react-table'
@@ -108,7 +109,7 @@ function BottomTableComponent(props) {
const evadido = tableData.reduce((sum, item) => sum + item.evadido, 0)
const trancado = tableData.reduce((sum, item) => sum + item.trancado, 0)
const concluinte = tableData.reduce((sum, item) => sum + item.concluinte, 0)
- const taxaEvasao = ((evadido/(cursando+concluinte+evadido+trancado))*100).toFixed(2)
+ const taxaEvasao = ((cursando + concluinte + evadido + trancado) > 0) ? ((evadido/(cursando+concluinte+evadido+trancado))*100).toFixed(2) : 0
const totalObjectSituation = {
cursando: cursando,
@@ -331,9 +332,9 @@ function BottomTableComponent(props) {
return (
{
curso: name,
- concluintes: course.finished_total.toLocaleString('pt-BR'),
- nao_concluintes: course.not_finished_total.toLocaleString('pt-BR'),
- total: total.toLocaleString('pt-BR'),
+ concluintes: course.finished_total?.toLocaleString('pt-BR'),
+ nao_concluintes: course.not_finished_total?.toLocaleString('pt-BR'),
+ total: total?.toLocaleString('pt-BR'),
}
)
} else if (indicatorName === 'situacao_ingressantes') {
@@ -342,11 +343,11 @@ function BottomTableComponent(props) {
return (
{
curso: name,
- cursando: course.cursando.toLocaleString('pt-BR'),
- evadido: course.evadido.toLocaleString('pt-BR'),
- trancado: course.trancado.toLocaleString('pt-BR'),
- concluinte: course.concluinte.toLocaleString('pt-BR'),
- taxaEvasao: course.taxa_evasao ? course.taxa_evasao.toLocaleString('pt-BR', localeOptions) : 0,
+ cursando: course.cursando?.toLocaleString('pt-BR'),
+ evadido: course.evadido?.toLocaleString('pt-BR'),
+ trancado: course.trancado?.toLocaleString('pt-BR'),
+ concluinte: course.concluinte?.toLocaleString('pt-BR'),
+ taxaEvasao: course.taxa_evasao ? course.taxa_evasao?.toLocaleString('pt-BR', localeOptions) : 0,
}
)
} else if (indicatorName === 'situacao_matriculas') {
@@ -355,10 +356,10 @@ function BottomTableComponent(props) {
return (
{
curso: name,
- cursando: course.cursando.toLocaleString('pt-BR'),
- evadido: course.evadido.toLocaleString('pt-BR'),
- trancado: course.trancado.toLocaleString('pt-BR'),
- concluinte: course.concluinte.toLocaleString('pt-BR'),
+ cursando: course.cursando?.toLocaleString('pt-BR'),
+ evadido: course.evadido?.toLocaleString('pt-BR'),
+ trancado: course.trancado?.toLocaleString('pt-BR'),
+ concluinte: course.concluinte?.toLocaleString('pt-BR'),
}
)
} else {
@@ -369,11 +370,11 @@ function BottomTableComponent(props) {
return (
{
curso: name,
- inscritos: course.inscritos_total.toLocaleString('pt-BR'),
- vagas: course.vagas_totais.toLocaleString('pt-BR'),
- ingressantes: course.ingresso_curso.toLocaleString('pt-BR'),
- inscritos_por_vagas: aB ? aB.toLocaleString('pt-BR', localeOptions) : 0,
- ingresso_por_vagas: cB ? cB.toLocaleString('pt-BR', localeOptions) : 0,
+ inscritos: course.inscritos_total?.toLocaleString('pt-BR'),
+ vagas: course.vagas_totais?.toLocaleString('pt-BR'),
+ ingressantes: course.ingresso_curso?.toLocaleString('pt-BR'),
+ inscritos_por_vagas: aB ? aB?.toLocaleString('pt-BR', localeOptions) : 0,
+ ingresso_por_vagas: cB ? cB?.toLocaleString('pt-BR', localeOptions) : 0,
}
)
}
@@ -471,7 +472,7 @@ function BottomTableComponent(props) {
download="tabela.csv"
className="download-button"
>
- Baixar
+ <img className="download-icon" src={downloadIcon} alt="Download"/>
</a>
<div className="table-container">
<div className="table-overflow-container">
diff --git a/src/components/Charts/BarChartComponent.js b/src/components/Charts/BarChartComponent.js
index c950eec7293a6c9f73fb7afd5e30ccc21dc24af7..d504c97b36424d8b2094235e68e277547dda65ea 100644
--- a/src/components/Charts/BarChartComponent.js
+++ b/src/components/Charts/BarChartComponent.js
@@ -35,7 +35,6 @@ function BarChartComponent(props) {
// const { title, data, education } = props;
const { title, years, chartLocation, dimension_data, dims, loading,
filtersLocation, filtersEducation, disciplines, contrastSet, horizontalChart } = props;
-
const [selectedFilters, setSelectedFilters] = useState([]);
const [isOpen, setIsOpen] = useState(false);
const [noDataComponentToggle, setNoDataComponentToggle] = useState(false);
@@ -84,8 +83,8 @@ function BarChartComponent(props) {
mode: contrastSet ? 'dark' : 'light',
},
dataLabels: {
- enabled: true,
- formatter: value => value.toLocaleString('pt-BR'),
+ enabled: false,
+ formatter: value => value?.toLocaleString('pt-BR'),
style: {
colors: contrastSet ? ['#fff'] : ['#000'],
},
@@ -150,7 +149,7 @@ function BarChartComponent(props) {
},
xaxis: {
labels: {
- formatter: value => value.toLocaleString('pt-BR'),
+ formatter: value => value?.toLocaleString('pt-BR'),
minHeight: 80,
rotateAlways: true,
}
@@ -207,7 +206,6 @@ function BarChartComponent(props) {
formattedFilters + ', ' + mappedFilters[idx][jdx]
}
}
-
setSelectedFilters(formattedFilters)
}, [filtersEducation])
@@ -220,14 +218,14 @@ function BarChartComponent(props) {
newOptions.yaxis.labels.style.colors = '#fff';
newOptions.chart.background = '#000';
newOptions.theme.mode = 'dark';
- newOptions.dataLabels.style.colors = ['#fff'];
+ // newOptions.dataLabels.style.colors = ['#fff'];
} else {
newOptions.legend.labels.colors = '#3c3c3b';
newOptions.xaxis.labels.style.colors = '#3c3c3b';
newOptions.yaxis.labels.style.colors = '#3c3c3b';
newOptions.chart.background = '#fff';
newOptions.theme.mode = 'light';
- newOptions.dataLabels.style.colors = ['#000'];
+ // newOptions.dataLabels.style.colors = ['#000'];
}
return newOptions;
@@ -267,7 +265,7 @@ function BarChartComponent(props) {
newOptions.xaxis.categories.push(last_year);
}
- newOptions.yaxis.labels.formatter = value => value.toLocaleString('pt-BR');
+ newOptions.yaxis.labels.formatter = value => value?.toLocaleString('pt-BR');
if (location.pathname === routes.adequacao_disciplina) {
let adequacyPercentages = []
@@ -311,7 +309,7 @@ function BarChartComponent(props) {
newOptions.grid.xaxis.lines.show = true
newOptions.xaxis.labels.rotateAlways = true
newOptions.xaxis.labels.minHeight = 80
- newOptions.xaxis.labels.formatter = value => value.toLocaleString('pt-BR');
+ newOptions.xaxis.labels.formatter = value => value?.toLocaleString('pt-BR');
}
setChartSeries(dataArray);
@@ -335,7 +333,7 @@ function BarChartComponent(props) {
newOptions.grid.xaxis.lines.show = true
newOptions.xaxis.labels.rotateAlways = true
newOptions.xaxis.labels.minHeight = 80
- newOptions.xaxis.labels.formatter = value => value.toLocaleString('pt-BR');
+ newOptions.xaxis.labels.formatter = value => value?.toLocaleString('pt-BR');
}
if (location.pathname === routes.situacao_ingressantes) {
@@ -397,7 +395,7 @@ function BarChartComponent(props) {
newOptions.responsive[0].options.xaxis.labels.formatter = value => value + '%';
newOptions.yaxis.forceNiceScale = false;
} else {
- newOptions.yaxis.labels.formatter = value => value.toLocaleString('pt-BR');
+ newOptions.yaxis.labels.formatter = value => value?.toLocaleString('pt-BR');
newOptions.yaxis.forceNiceScale = true;
}
@@ -430,7 +428,7 @@ function BarChartComponent(props) {
}
for (i = 0; i < size; i++) {
if (location.pathname === routes.adequacao_disciplina) {
- newSeries[i].data[i] = ((suitable[i] / total[i]) * 100).toFixed(1)
+ newSeries[i].data[i] = total[i] !== 0 ? ((suitable[i] / total[i]) * 100).toFixed(1) : 0
} else {
newSeries[i].data[i] = total[i] - suitable[i]
}
@@ -463,6 +461,15 @@ function BarChartComponent(props) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [loading, filtersLocation, contrastSet]);
+ function generateSubtitle() {
+ let data = props.data;
+ let tempString = `${chartLocation} - `
+ tempString = tempString.concat(`${data[0]?.year} a ${data[data?.length - 1]?.year}`)
+
+ return tempString;
+ }
+
+
return (
<>
{ loading ?
@@ -476,9 +483,7 @@ function BarChartComponent(props) {
:
<div className={`bar-chart-container ${contrastSet ? "high-contrast-bar-chart" : ""}`}>
{
- years[0] === years[1] ?
- <h4 className="bar-chart-subtitle">{`${chartLocation} - ${years[0]}`}</h4> :
- <h4 className="bar-chart-subtitle">{`${chartLocation} - ${years[0]} a ${years[1]}`}</h4>
+ <h4 className="bar-chart-subtitle">{ generateSubtitle() }</h4>
}
{
selectedFilters !== '' &&
diff --git a/src/components/Charts/PieChartComponent.js b/src/components/Charts/PieChartComponent.js
index 4bd51b541bef0e5081f6ad5178bf521bba1263a3..9d1e561f02345bd3d470ba9e5fbdb14ca1329ebf 100644
--- a/src/components/Charts/PieChartComponent.js
+++ b/src/components/Charts/PieChartComponent.js
@@ -46,8 +46,10 @@ function PieChartComponent(props) {
let newSeries = [];
data.forEach((item) => {
- newLabels.push(item[dim + "_name"]);
- newSeries.push(item["total"]);
+ if (!newLabels.includes(item[dim + "_name"])) {
+ newLabels.push(item[dim + "_name"]);
+ newSeries.push(item["total"]);
+ }
});
if (pathLocation.pathname === routes.adequacao_disciplina) {
@@ -118,12 +120,12 @@ function PieChartComponent(props) {
newOptions.labels = labels
newOptions.plotOptions.pie.donut.labels.total.formatter = (w) => {
- return w.globals.seriesTotals.reduce((a, b) => a + b, 0).toLocaleString('pt-BR');
+ return w.globals.seriesTotals.reduce((a, b) => a + b, 0)?.toLocaleString('pt-BR');
}
newOptions.tooltip.y.formatter = (value, opts) => {
const total = opts.globals.seriesTotals.reduce((a, b) => a + b, 0)
const percent = ((value / total) * 100).toFixed(1)
- return value.toLocaleString('pt-BR') + ` (${percent}%)`
+ return value?.toLocaleString('pt-BR') + ` (${percent}%)`
}
if (pathLocation.pathname === routes.adequacao_disciplina) {
@@ -250,7 +252,7 @@ function PieChartComponent(props) {
formatter: (w) => {
return w.globals.seriesTotals.reduce((a, b) => {
return a + b;
- }, 0).toLocaleString('pt-BR');
+ }, 0)?.toLocaleString('pt-BR');
},
},
value: {
@@ -265,7 +267,7 @@ function PieChartComponent(props) {
labels: labels,
dataLabels: {
enabled: true,
- formatter: value => value.toLocaleString('pt-BR'),
+ formatter: value => value?.toLocaleString('pt-BR'),
style: {
colors: ['#000'],
},
@@ -275,7 +277,7 @@ function PieChartComponent(props) {
formatter: (value, opts) => {
const total = opts.globals.seriesTotals.reduce((a, b) => a + b, 0)
const percent = ((value / total) * 100).toFixed(1)
- return value.toLocaleString('pt-BR') + ` (${percent}%)`
+ return value?.toLocaleString('pt-BR') + ` (${percent}%)`
},
},
},
diff --git a/src/components/Map/LegendComponent.js b/src/components/Map/LegendComponent.js
index 831ab2d20aed25e167dc4d08da68c37df6c04028..548c320c947282948622dfd0900d0cf90dafacb2 100644
--- a/src/components/Map/LegendComponent.js
+++ b/src/components/Map/LegendComponent.js
@@ -51,6 +51,7 @@ class LegendComponent extends MapControl {
componentDidMount() {
this.legend = L.control({ position: "bottomright" });
+
this.legend.update = () => {
let title = '<h4 class="legend-title">'
if (this.props.title)
diff --git a/src/components/Map/MapComponent.js b/src/components/Map/MapComponent.js
index b8570323940bec04cd9f6e1f727c55a3a08e5538..091f35e0eb11388ef170dc4bf5b237d4e57e9fa5 100644
--- a/src/components/Map/MapComponent.js
+++ b/src/components/Map/MapComponent.js
@@ -421,7 +421,7 @@ function MapComponent(props) {
titleValue = finishedDataObj.length !== 0 ? finishedDataObj[0].total.toLocaleString('pt-BR') : '0'
} else if (path[4] === 'situacao_ingressantes') {
const maxYearDataObj = mapTitleData.filter(item => item.year === titleYear)
- percentEvaded = maxYearDataObj.length !== 0 ? maxYearDataObj[0].taxa_evasao.toFixed(1) : 0
+ percentEvaded = maxYearDataObj.length !== 0 ? maxYearDataObj[0]?.taxa_evasao?.toFixed(1) : 0
if (percentEvaded === '0.0') percentEvaded = 0
} else if (path[4] === 'situacao_matriculas') {
const maxYearDataObj = mapTitleData.filter(item => item.year === titleYear)
@@ -462,6 +462,8 @@ function MapComponent(props) {
case 'concluintes_licenciatura':
return titleLocation + ' tem ' + titleValue + ' concluintes em cursos de licenciatura, ' + titleYear
case 'situacao_ingressantes':
+ if (percentEvaded === undefined)
+ percentEvaded = 0;
return titleLocation + ' tem ' + percentEvaded + '% de evasão em cursos de licenciatura, ' + titleYear
case 'situacao_matriculas':
return titleLocation + ' tem ' + maxYearCoursing + ' matrÃculas cursando, ' + maxYearEvaded + ' evadidos, ' +
diff --git a/src/components/NoDataComponent.js b/src/components/NoDataComponent.js
index 96ead1b863d16c5a7c67a5bb7729da1d4da913e4..d597f450668b606cf7645e3806e4604f944de850 100644
--- a/src/components/NoDataComponent.js
+++ b/src/components/NoDataComponent.js
@@ -25,7 +25,7 @@ import '../css/NoDataComponent.scss';
import attention from '../img/attention.svg';
import reload from '../img/reload.svg';
-import iconClose from '../img/close.svg';
+// import iconClose from '../img/close.svg';
function NoDataComponent(props) {
Modal.setAppElement('#root');
@@ -36,13 +36,13 @@ function NoDataComponent(props) {
className={`no-data-modal ${contrastSet ? "high-contrast-no-data-modal" : ""}`}
overlayClassName='modal-overlay'
isOpen={props.open}
- onRequestClose={() => props.closeModal(props.openFunction)}
+ // onRequestClose={() => props.closeModal(props.openFunction)}
>
- <div className="modal-header-container">
+ {/* <div className="modal-header-container">
<button onClick={() => props.closeModal(props.openFunction)} >
<img alt="Fechar" src={iconClose} />
</button>
- </div>
+ </div> */}
<img className="attention-icon" alt="Atenção" src={attention} />
<h2>
Ops, parece que não possuÃmos dados desta
diff --git a/src/components/Pages/TeamComponent.js b/src/components/Pages/TeamComponent.js
index 7ace0888e504413648abc53a24184eaaa30b3f79..3ea3464b997c478612492abdfec008b9d305223d 100644
--- a/src/components/Pages/TeamComponent.js
+++ b/src/components/Pages/TeamComponent.js
@@ -55,7 +55,7 @@ function TeamComponent(){
<p>Profª Maria Tereza Carneiro Soares</p>
</div>
<div className="coordination">
- <h1>Coordenação Geral</h1>
+ <h1>Coordenação Geral (2016-2020)</h1>
<h2>Profa. Simone Medida</h2>
<p>Setor de Ciências Exatas</p>
</div>
@@ -64,27 +64,19 @@ function TeamComponent(){
</Grid>
<Grid className="teachers-container">
- <h1>Docentes</h1>
+ <h1>Docentes Coordenadores</h1>
<Grid className="teachers">
- <Grid className="teacher-item">
- <h2>Profa. Gabriela Schneider</h2>
- <p>Educação / DEPLAE / Laboratório de Dados Educacionais</p>
- </Grid>
<Grid className="teacher-item">
<h2>Profa. Adriana Dragone Silveira</h2>
- <p>Educação / DEPLAE / Laboratório de Dados Educacionais</p>
+ <p>UFPR / Departamento de Planejamento e Administração Escolar</p>
</Grid>
<Grid className="teacher-item">
- <h2>Prof. Thiago Alves</h2>
- <p>UFG / Laboratório de Dados Educacionais</p>
- </Grid>
- <Grid className="teacher-item">
- <h2>Prof. Marcos Didonet Del Fabro</h2>
- <p>Informática / Laboratório de Dados Educacionais / C3SL</p>
+ <h2>Profa. Gabriela Schneider</h2>
+ <p>UFPR / Departamento de Planejamento e Administração Escolar</p>
</Grid>
<Grid className="teacher-item">
- <h2>Prof. Silvana Phillippi Camboim</h2>
- <p>Programa de Pós-Graduação em Geodésia</p>
+ <h2>Prof. Thiago Alves</h2>
+ <p>UFG / Faculdade de Administração, Ciências Contábeis e Ciências Econômicas</p>
</Grid>
</Grid>
</Grid>
@@ -93,42 +85,51 @@ function TeamComponent(){
<img src={teamAnalysis} alt="Equipe" className="img-team-2"/>
<Grid className="data-container">
<Grid className="educational-data">
- <h1>Análise de dados educacionais</h1>
+ <h1>Analistas de dados educacionais</h1>
<Grid className="educational-data-text">
+ <Grid className="educational-data-item">
+ <h2>Alessandra Biscaia de Andrade</h2>
+ <p>UFPR / Pós-graduando em educação</p>
+ </Grid>
<Grid className="educational-data-item">
<h2>Andréa Polena</h2>
- <p>Laboratório de Dados Educacionais</p>
+ <p>UFPR / Pós-graduando em educação</p>
</Grid>
<Grid className="educational-data-item">
<h2>Jaqueline Aparecida Cardoso</h2>
- <p>Laboratório de Dados Educacionais</p>
+ <p>Pós-graduando em educação</p>
</Grid>
<Grid className="educational-data-item">
- <h2>Alessandra Biscaia de Andrade</h2>
- <p>Laboratório de Dados Educacionais</p>
+ <h2>Raphael Cardoso</h2>
+ <p>Pós-graduando em educação</p>
</Grid>
</Grid>
</Grid>
- <Grid className="spacial-data">
- <h1>Análise de dados espaciais</h1>
- <Grid className="spacial-data-item">
- <h2>Gabriele Silveira Camara</h2>
- <p>Programa de Pós-Graduação em Geodésia</p>
- </Grid>
- </Grid>
</Grid>
</Grid>
<Grid className="development-container">
- <h1>Equipe de Desenvolvimento da Plataforma</h1>
+ <h1>Equipe de Desenvolvimento da Plataforma - C3SL</h1>
+ <h1>Docentes Coordenadores</h1>
+ <Grid className="coordenators-container">
+ <Grid className='coordenators-item'>
+ <h2>Prof. Marcos Sfair Sunye</h2>
+ <p>UFPR / Departamento de Informática</p>
+ </Grid>
+ <Grid className="coordenators-item">
+ <h2>Prof. Marcos Didonet <br/> (2015 - 2021)</h2>
+ <p>UFPR / Departamento de Informática</p>
+ </Grid>
+ </Grid>
+ <h1>Estudantes</h1>
<Grid className="developers-container">
<Grid className="developers-item">
- <h2>Fernando Claudecir Erd <br/> (2018 - 2020)</h2>
- <p>Laboratório de Dados Educacionais / C3SL</p>
+ <h2>Fernando Gbur dos Santos</h2>
+ <p>UFPR/ Graduando em Computação</p>
</Grid>
<Grid className="developers-item">
<h2>Guiusepe Oneda Dal Pai</h2>
- <p>Laboratório de Dados Educacionais / C3SL</p>
+ <p>UFPR/ Graduando em Computação</p>
</Grid>
<Grid className="developers-item">
<h2>Henrique Varella Ehrenfried</h2>
@@ -136,40 +137,59 @@ function TeamComponent(){
</Grid>
<Grid className="developers-item">
<h2>João Pedro Kieras Oliveira</h2>
- <p>Laboratório de Dados Educacionais / C3SL</p>
+ <p>UFPR/ Graduando em Computação</p>
</Grid>
<Grid className="developers-item">
- <h2>João Pedro Picolo <br/> (2020)</h2>
- <p>Laboratório de Dados Educacionais / C3SL</p>
+ <h2>Lucas Soni Teixeira</h2>
+ <p>UFPR/ Graduando em Computação</p>
</Grid>
<Grid className="developers-item">
- <h2>João Victor Winandy Ponaco <br/> (2019)</h2>
- <p>Laboratório de Dados Educacionais / C3SL</p>
+ <h2>Pietro Polinari Cavassin</h2>
+ <p>UFPR/ Graduando em Computação</p>
</Grid>
+ </Grid>
+ </Grid>
+
+ <Grid className='specialdata-container'>
+ <h1>Equipe de Dados Especiais- Free Geospatial Laboratory</h1>
+ <h1>Docente Coordenadora</h1>
+ <Grid className='specialdata-item'>
+ <h2>Prof. Silvana Phillippi Camboim</h2>
+ <p>Programa de Pós-Graduação em Geodésia</p>
+ </Grid>
+ </Grid>
+
+ <Grid className="design-container">
+ <h1>Design</h1>
+ <h2>Giulia Morgan Riva</h2>
+ </Grid>
+
+ <Grid className="development-container">
+ <h1>Ex-integrantes</h1>
+ <Grid className="developers-container">
<Grid className="developers-item">
- <h2>Lucas Soni Teixeira</h2>
- <p>Laboratório de Dados Educacionais / C3SL</p>
+ <h2>Fernando Claudecir Erd</h2>
+ <p>[C3SL/UFPR]</p>
</Grid>
<Grid className="developers-item">
- <h2>Miguel Angelo Neumann Salerno</h2>
- <p>Laboratório de Dados Educacionais / C3SL</p>
+ <h2>João Pedro Picolo</h2>
+ <p>[C3SL/UFPR]</p>
</Grid>
<Grid className="developers-item">
- <h2>Pietro Polinari Cavassin</h2>
- <p>Laboratório de Dados Educacionais / C3SL</p>
+ <h2>João Victor Winandy Ponaco</h2>
+ <p>[C3SL/UFPR]</p>
</Grid>
<Grid className="developers-item">
- <h2>Victor Picussa <br/> (2019 - 2020)</h2>
- <p>Laboratório de Dados Educacionais / C3SL</p>
+ <h2>Miguel Angelo Neumann Salerno</h2>
+ <p>[C3SL/UFPR]</p>
</Grid>
+ <Grid className="developers-item">
+ <h2>Victor Picussa</h2>
+ <p>[C3SL/UFPR]</p>
+ </Grid>
</Grid>
</Grid>
- <Grid className="design-container">
- <h1>Design</h1>
- <h2>Giulia Morgan Riva</h2>
- </Grid>
-
</Grid>
</Grid>
);
diff --git a/src/config.js b/src/config.js
index 006298e8ed5ece9165073c0c16fa1ac8d3934624..c02403482fe4141851ba491e600bd1a99cc796ea 100644
--- a/src/config.js
+++ b/src/config.js
@@ -4,9 +4,9 @@ const simcaq_dev = "https://simcaqdev.c3sl.ufpr.br/api/v1/";
const simcaq_hom = "https://simcaqhom.c3sl.ufpr.br/api/v1/";
const simcaq_prod = "https://simcaq.c3sl.ufpr.br/api/v1/";
-const lde_dev = "https://dadoseducacionaisdev.c3sl.ufpr.br/api/v1/";
-const lde_hom = "https://dadoseducacionaishom.c3sl.ufpr.br/api/v1/";
-const lde_prod = "https://dadoseducacionais.c3sl.ufpr.br/api/v1/";
+const lde_dev = "https://simcaqdev.c3sl.ufpr.br/api/v1/";
+const lde_hom = "https://simcaqhom.c3sl.ufpr.br/api/v1/";
+const lde_prod = "https://simcaq.c3sl.ufpr.br/api/v1/";
if (process.env.REACT_APP_STAGE === "homologa") {
conf.api = simcaq_hom;
diff --git a/src/css/BottomTableComponent.scss b/src/css/BottomTableComponent.scss
index 0a7c1c536bcd9e1825e90c6c9be65908774d30dd..9613f1dfa4b4354c576049f0888cceb436c69022 100644
--- a/src/css/BottomTableComponent.scss
+++ b/src/css/BottomTableComponent.scss
@@ -160,8 +160,7 @@
}
.download-button {
- padding: 2px 8px;
- background-color: #7a60a6;
+ padding: 5px 5px 0 5px;
color: #fff;
text-decoration: none;
font-family: 'Nunito';
diff --git a/src/css/Charts/PieChartComponent.scss b/src/css/Charts/PieChartComponent.scss
index f23c0a78bc63bc6e7092c37f67f1b62e84d74137..b751f9ab393e39fee03481696e043ae19e21ea71 100644
--- a/src/css/Charts/PieChartComponent.scss
+++ b/src/css/Charts/PieChartComponent.scss
@@ -1,184 +1,181 @@
.pie-chart-content-container {
- border-radius: 10px;
- box-shadow: 0 0 8px rgba(0, 0, 0, 0.2);
+ border-radius: 10px;
+ box-shadow: 0 0 8px rgba(0, 0, 0, 0.2);
+ height: 100%;
+ font-family: "Montserrat";
+ background: #fff;
+ // background-color: blue;
+ // display: flex;
+ // justify-content: space-between;
+
+ .spinner-grid-pie {
+ height: 650px;
+ width: 340px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .data-content-container {
+ padding: 20px;
+ box-sizing: border-box;
height: 100%;
- font-family: 'Montserrat';
- background: #fff;
- // background-color: blue;
- // display: flex;
- // justify-content: space-between;
-
- .spinner-grid-pie {
- height: 650px;
- width: 340px;
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
- .data-content-container {
- padding: 20px;
- box-sizing: border-box;
- height: 100%;
- display: flex;
- flex-direction: column;
-
- .top-pie-container {
- font-family: 'Nunito';
-
- height: inherit;
- display: flex;
- flex-direction: column;
- justify-content: space-evenly;
-
- h3 {
- margin: 0;
- color: #3c3c3b;
- text-align: center;
- font-weight: 600;
- line-height: 30px;
+ display: flex;
+ flex-direction: column;
+
+ .top-pie-container {
+ font-family: "Nunito";
+
+ height: inherit;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
+
+ h3 {
+ margin: 0;
+ color: #3c3c3b;
+ text-align: center;
+ font-weight: 600;
+ line-height: 26px;
+ }
+
+ h4 {
+ margin: 8px 0 4px 0;
+ text-align: center;
+ font-weight: 400;
+ color: #3c3c3b;
+ }
+
+ .pie-chart-container {
+ .no-data-container {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin-top: 50px;
+
+ .attention-icon {
+ height: 80px;
+ width: 80px;
+ }
+
+ h2,
+ h3 {
+ text-align: center;
+ font-size: 16px;
+ line-height: 24px;
+ font-family: "Montserrat";
+ font-style: normal;
+ font-weight: 400;
+ }
+
+ .reload-page {
+ margin-top: 10px;
+ padding: 6px 12px 8px 12px;
+ background-color: #fecb3b;
+ color: #fff;
+ font-family: "Nunito";
+ font-size: 18px;
+ font-weight: bold;
+ border: 0;
+ border-radius: 10px;
+ transition: filter 0.2s;
+ cursor: pointer;
+
+ &:hover {
+ filter: brightness(0.9);
}
- h4 {
- margin: 8px 0 4px 0;
- text-align: center;
- font-weight: 400;
- color: #3c3c3b;
+ .reload-icon {
+ margin-right: 10px;
+ vertical-align: middle;
+ padding: 0;
}
+ }
+ }
+ }
+
+ p {
+ font-family: "Montserrat";
+ margin: 0;
+ font-size: 11px;
+ color: #5a5a5a;
+ }
+
+ // the apexcharts css below is hardcoded for the
+ // pie chart responsivity to work properly
+ .pie-chart-container .apexcharts-canvas {
+ .apexcharts-legend {
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+
+ .apexcharts-legend-series {
+ width: 100%;
+ }
+ }
- .pie-chart-container {
- .no-data-container {
- display: flex;
- flex-direction: column;
- align-items: center;
- margin-top: 50px;
-
- .attention-icon {
- height: 80px;
- width: 80px;
- }
-
- h2, h3 {
- text-align: center;
- font-size: 16px;
- line-height: 24px;
- font-family: 'Montserrat';
- font-style: normal;
- font-weight: 400;
- }
-
- .reload-page {
- margin-top: 10px;
- padding: 6px 12px 8px 12px;
- background-color: #fecb3b;
- color: #fff;
- font-family: 'Nunito';
- font-size: 18px;
- font-weight: bold;
- border: 0;
- border-radius: 10px;
- transition: filter 0.2s;
- cursor: pointer;
-
- &:hover {
- filter: brightness(0.9);
- }
-
- .reload-icon {
- margin-right: 10px;
- vertical-align: middle;
- padding: 0;
- }
- }
- }
- }
+ .apexcharts-tooltip {
+ max-width: 200px;
+ white-space: unset;
- p {
- font-family: 'Montserrat';
- margin: 0;
- font-size: 11px;
- color: #5a5a5a;
- }
+ .apexcharts-active {
+ padding-bottom: 0;
+ }
- // the apexcharts css below is hardcoded for the
- // pie chart responsivity to work properly
- .pie-chart-container .apexcharts-canvas {
- .apexcharts-legend {
- align-items: center;
-
- .apexcharts-legend-series {
- width: 100%;
- }
- }
-
- .apexcharts-tooltip {
- max-width: 200px;
- white-space: unset;
-
- .apexcharts-active {
- padding-bottom: 0;
- }
-
- .apexcharts-tooltip-series-group .apexcharts-tooltip-text {
- text-align: center;
- }
- }
- }
+ .apexcharts-tooltip-series-group .apexcharts-tooltip-text {
+ text-align: center;
+ }
}
+ }
}
+ }
}
.high-contrast-pie-chart {
- box-shadow: 0 0 0 2px #fff;
- background: #000;
+ box-shadow: 0 0 0 2px #fff;
+ background: #000;
- .data-content-container .top-pie-container h3,
- .data-content-container .top-pie-container h4,
- .data-content-container p {
- color: #fff;
- }
+ .data-content-container .top-pie-container h3,
+ .data-content-container .top-pie-container h4,
+ .data-content-container p {
+ color: #fff;
+ }
- .data-content-container .pie-chart-container .no-data-container {
- color: #fff;
-
- .attention-icon {
- filter: brightness(0)
- saturate(100%)
- invert(92%)
- sepia(36%)
- saturate(1268%)
- hue-rotate(350deg)
- brightness(109%)
- contrast(106%);
- }
+ .data-content-container .pie-chart-container .no-data-container {
+ color: #fff;
- .reload-page {
- background-color: #ffff00 !important;
- color: #000 !important;
+ .attention-icon {
+ filter: brightness(0) saturate(100%) invert(92%) sepia(36%)
+ saturate(1268%) hue-rotate(350deg) brightness(109%) contrast(106%);
+ }
- .reload-icon {
- filter: brightness(0);
- }
- }
+ .reload-page {
+ background-color: #ffff00 !important;
+ color: #000 !important;
+
+ .reload-icon {
+ filter: brightness(0);
+ }
}
+ }
}
@media (max-width: 1500px) {
- .pie-chart-content-container .data-content-container {
- .top-pie-container {
- h3 {
- font-size: 18px;
- }
-
- h4 {
- font-size: 16px;
- margin-top: 5px;
- }
- }
+ .pie-chart-content-container .data-content-container {
+ .top-pie-container {
+ h3 {
+ font-size: 18px;
+ }
+
+ h4 {
+ font-size: 16px;
+ margin-top: 5px;
+ }
+ }
- p {
- margin-top: 20px;
- text-align: center;
- }
+ p {
+ margin-top: 20px;
+ text-align: center;
}
+ }
}
diff --git a/src/css/TeamComponent.scss b/src/css/TeamComponent.scss
index 4321e6f87be9a1d706897bb91250a05c8da72634..72db0c92346f42b5f2ee1effea04ed88cb8a26c7 100644
--- a/src/css/TeamComponent.scss
+++ b/src/css/TeamComponent.scss
@@ -180,9 +180,32 @@
color: #29bdef;
}
+ .coordenators-container {
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ grid-row-gap: 20px;
+ align-items: center;
+
+ .coordenators-item {
+ font-family: "Montserrat";
+ padding: 0 50px;
+
+ h2 {
+ margin-bottom: 5px;
+ font-size: 16px;
+ }
+
+ p {
+ margin: 0;
+ font-size: 14px;
+ }
+ }
+ }
+
+
.developers-container {
display: grid;
- grid-template-columns: 1fr 1fr 1fr 1fr;
+ grid-template-columns: 1fr 1fr 1fr;
grid-row-gap: 20px;
align-items: center;
@@ -203,20 +226,45 @@
}
}
- .design-container {
+ .specialdata-container {
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 50px;
h1 {
- color: #7a60a6;
+ color:#7a60a6;
}
- h2 {
+ .specialdata-item {
+ text-align: center;
font-family: "Montserrat";
+
+ h2 {
+ margin-bottom: 5px;
font-size: 16px;
- margin-top: 0;
+ }
+
+ p {
+ margin: 0;
+ font-size: 14px;
+ }
+ }
+ }
+
+ .design-container {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin-bottom: 50px;
+
+ h1 {
+ color: #7a60a6;
+ }
+ h2 {
+ font-family: "Montserrat";
+ font-size: 16px;
+ margin-top: 0;
}
}
}
diff --git "a/src/img/Bot\303\265es brancoDownloadButton.svg" "b/src/img/Bot\303\265es brancoDownloadButton.svg"
new file mode 100644
index 0000000000000000000000000000000000000000..6f4e6002424ccf884047efab85c5549af0dbc686
--- /dev/null
+++ "b/src/img/Bot\303\265es brancoDownloadButton.svg"
@@ -0,0 +1,5 @@
+<svg width="107" height="36" viewBox="0 0 107 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="107" height="36" rx="10" fill="white"/>
+<path d="M24 18L28 22M28 22L32 18M28 22L28 10M20 18L20 26L36 26L36 18" stroke="#808080" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M51.952 17.192C52.6027 17.3733 53.104 17.6987 53.456 18.168C53.8187 18.6373 54 19.224 54 19.928C54 20.8987 53.664 21.656 52.992 22.2C52.3307 22.7333 51.4027 23 50.208 23H46.128C45.872 23 45.6693 22.9307 45.52 22.792C45.3813 22.6427 45.312 22.4453 45.312 22.2V12.52C45.312 12.2747 45.3813 12.0827 45.52 11.944C45.6693 11.7947 45.872 11.72 46.128 11.72H50.032C51.1947 11.72 52.1013 11.9813 52.752 12.504C53.4133 13.016 53.744 13.736 53.744 14.664C53.744 15.2613 53.584 15.7787 53.264 16.216C52.9547 16.6533 52.5173 16.9787 51.952 17.192ZM46.928 16.6H49.776C51.3547 16.6 52.144 16.0027 52.144 14.808C52.144 14.2107 51.9467 13.768 51.552 13.48C51.168 13.192 50.576 13.048 49.776 13.048H46.928V16.6ZM50.032 21.672C50.8533 21.672 51.456 21.5227 51.84 21.224C52.224 20.9253 52.416 20.4613 52.416 19.832C52.416 19.192 52.2187 18.7173 51.824 18.408C51.44 18.088 50.8427 17.928 50.032 17.928H46.928V21.672H50.032ZM59.2438 15C60.2784 15 61.0464 15.2613 61.5478 15.784C62.0598 16.3067 62.3158 17.1013 62.3158 18.168V22.312C62.3158 22.5573 62.2464 22.7493 62.1078 22.888C61.9691 23.016 61.7771 23.08 61.5318 23.08C61.2971 23.08 61.1104 23.0107 60.9718 22.872C60.8331 22.7333 60.7638 22.5467 60.7638 22.312V21.72C60.5611 22.168 60.2571 22.5147 59.8518 22.76C59.4571 22.9947 58.9931 23.112 58.4598 23.112C57.9478 23.112 57.4784 23.0107 57.0518 22.808C56.6251 22.5947 56.2891 22.3013 56.0438 21.928C55.8091 21.5547 55.6918 21.1387 55.6918 20.68C55.6918 20.1147 55.8358 19.672 56.1238 19.352C56.4224 19.0213 56.9078 18.7867 57.5798 18.648C58.2624 18.5093 59.1958 18.44 60.3798 18.44H60.7478V17.976C60.7478 17.3787 60.6251 16.9467 60.3798 16.68C60.1344 16.4133 59.7398 16.28 59.1958 16.28C58.8224 16.28 58.4704 16.328 58.1398 16.424C57.8091 16.52 57.4464 16.6587 57.0518 16.84C56.7638 17 56.5611 17.08 56.4438 17.08C56.2838 17.08 56.1504 17.0213 56.0438 16.904C55.9478 16.7867 55.8997 16.6373 55.8997 16.456C55.8997 16.296 55.9424 16.1573 56.0278 16.04C56.1238 15.912 56.2731 15.7893 56.4758 15.672C56.8491 15.4693 57.2864 15.3093 57.7878 15.192C58.2891 15.064 58.7744 15 59.2438 15ZM58.7478 21.912C59.3344 21.912 59.8144 21.7147 60.1878 21.32C60.5611 20.9147 60.7478 20.3973 60.7478 19.768V19.352H60.4598C59.6278 19.352 58.9878 19.3893 58.5398 19.464C58.0918 19.5387 57.7718 19.6667 57.5798 19.848C57.3878 20.0187 57.2918 20.2693 57.2918 20.6C57.2918 20.984 57.4304 21.2987 57.7078 21.544C57.9851 21.7893 58.3318 21.912 58.7478 21.912ZM65.3423 23.08C65.1076 23.08 64.9103 23.016 64.7503 22.888C64.6009 22.76 64.5263 22.568 64.5263 22.312V15.816C64.5263 15.56 64.6009 15.368 64.7503 15.24C64.9103 15.1013 65.1076 15.032 65.3423 15.032C65.5769 15.032 65.7689 15.1013 65.9183 15.24C66.0676 15.368 66.1423 15.56 66.1423 15.816V22.312C66.1423 22.568 66.0676 22.76 65.9183 22.888C65.7689 23.016 65.5769 23.08 65.3423 23.08ZM65.3423 13.464C65.0329 13.464 64.7876 13.3787 64.6063 13.208C64.4249 13.0373 64.3343 12.8133 64.3343 12.536C64.3343 12.2587 64.4249 12.04 64.6063 11.88C64.7876 11.7093 65.0329 11.624 65.3423 11.624C65.6409 11.624 65.8809 11.7093 66.0623 11.88C66.2543 12.04 66.3503 12.2587 66.3503 12.536C66.3503 12.8133 66.2596 13.0373 66.0783 13.208C65.8969 13.3787 65.6516 13.464 65.3423 13.464ZM74.9773 21.784C75.1373 21.944 75.2173 22.1307 75.2173 22.344C75.2173 22.5467 75.1426 22.7227 74.9933 22.872C74.8546 23.0107 74.6839 23.08 74.4813 23.08C74.2786 23.08 74.0919 22.9893 73.9213 22.808L71.4733 20.056L69.0413 22.808C68.8706 22.9893 68.6839 23.08 68.4813 23.08C68.2786 23.08 68.1026 23.0053 67.9533 22.856C67.8146 22.7067 67.7453 22.5307 67.7453 22.328C67.7453 22.1253 67.8199 21.944 67.9693 21.784L70.4973 19L68.0973 16.328C67.9373 16.1467 67.8573 15.9653 67.8573 15.784C67.8573 15.5813 67.9319 15.4107 68.0813 15.272C68.2306 15.1227 68.4013 15.048 68.5933 15.048C68.7959 15.048 68.9826 15.1387 69.1533 15.32L71.4733 17.944L73.7933 15.32C73.9639 15.1387 74.1559 15.048 74.3693 15.048C74.5613 15.048 74.7319 15.1227 74.8813 15.272C75.0306 15.4107 75.1053 15.5813 75.1053 15.784C75.1053 15.9867 75.0253 16.168 74.8653 16.328L72.4653 19L74.9773 21.784ZM80.0406 15C81.0753 15 81.8433 15.2613 82.3446 15.784C82.8566 16.3067 83.1126 17.1013 83.1126 18.168V22.312C83.1126 22.5573 83.0433 22.7493 82.9046 22.888C82.766 23.016 82.574 23.08 82.3286 23.08C82.094 23.08 81.9073 23.0107 81.7686 22.872C81.63 22.7333 81.5606 22.5467 81.5606 22.312V21.72C81.358 22.168 81.054 22.5147 80.6486 22.76C80.254 22.9947 79.79 23.112 79.2566 23.112C78.7446 23.112 78.2753 23.0107 77.8486 22.808C77.422 22.5947 77.086 22.3013 76.8406 21.928C76.606 21.5547 76.4886 21.1387 76.4886 20.68C76.4886 20.1147 76.6326 19.672 76.9206 19.352C77.2193 19.0213 77.7046 18.7867 78.3766 18.648C79.0593 18.5093 79.9926 18.44 81.1766 18.44H81.5446V17.976C81.5446 17.3787 81.422 16.9467 81.1766 16.68C80.9313 16.4133 80.5366 16.28 79.9926 16.28C79.6193 16.28 79.2673 16.328 78.9366 16.424C78.606 16.52 78.2433 16.6587 77.8486 16.84C77.5606 17 77.358 17.08 77.2406 17.08C77.0806 17.08 76.9473 17.0213 76.8406 16.904C76.7446 16.7867 76.6966 16.6373 76.6966 16.456C76.6966 16.296 76.7393 16.1573 76.8246 16.04C76.9206 15.912 77.07 15.7893 77.2726 15.672C77.646 15.4693 78.0833 15.3093 78.5846 15.192C79.086 15.064 79.5713 15 80.0406 15ZM79.5446 21.912C80.1313 21.912 80.6113 21.7147 80.9846 21.32C81.358 20.9147 81.5446 20.3973 81.5446 19.768V19.352H81.2566C80.4246 19.352 79.7846 19.3893 79.3366 19.464C78.8886 19.5387 78.5686 19.6667 78.3766 19.848C78.1846 20.0187 78.0886 20.2693 78.0886 20.6C78.0886 20.984 78.2273 21.2987 78.5046 21.544C78.782 21.7893 79.1286 21.912 79.5446 21.912ZM89.4191 15.032C89.9311 15 90.1871 15.2187 90.1871 15.688C90.1871 15.9227 90.1285 16.0987 90.0111 16.216C89.8938 16.3333 89.6911 16.4027 89.4031 16.424L88.9231 16.472C88.2511 16.536 87.7498 16.7707 87.4191 17.176C87.0991 17.5813 86.9391 18.072 86.9391 18.648V22.312C86.9391 22.568 86.8645 22.76 86.7151 22.888C86.5658 23.016 86.3738 23.08 86.1391 23.08C85.9045 23.08 85.7071 23.016 85.5471 22.888C85.3978 22.76 85.3231 22.568 85.3231 22.312V15.8C85.3231 15.5547 85.3978 15.368 85.5471 15.24C85.7071 15.1013 85.9045 15.032 86.1391 15.032C86.3525 15.032 86.5285 15.1013 86.6671 15.24C86.8165 15.368 86.8911 15.5493 86.8911 15.784V16.552C87.1045 16.0827 87.4138 15.7253 87.8191 15.48C88.2245 15.2347 88.6831 15.0907 89.1951 15.048L89.4191 15.032Z" fill="#808080"/>
+</svg>
diff --git a/src/img/download-icon.svg b/src/img/download-icon.svg
new file mode 100644
index 0000000000000000000000000000000000000000..cdfcfc8f659dc85c428c590bc2859a8afbbe5fe6
--- /dev/null
+++ b/src/img/download-icon.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 9L9 13M9 13L13 9M9 13L9 1M1 9L1 17L17 17L17 9" stroke="#808080" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>