diff --git a/src/components/graph/LineBarChart.tsx b/src/components/graph/LineBarChart.tsx index 945da91..39f026d 100644 --- a/src/components/graph/LineBarChart.tsx +++ b/src/components/graph/LineBarChart.tsx @@ -114,7 +114,7 @@ export function LineBarChart({ title, subtitle, data1, data2, data3, label, red, }, }; - console.log(label.length) + console.log(data3) const data = data2? { labels: label.length < 28? ['1', '2', '3', '4', '5', '6', '7', '8', '8', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'] : label, @@ -146,7 +146,7 @@ export function LineBarChart({ title, subtitle, data1, data2, data3, label, red, backgroundColor: (value, ctx) => { return hashurado? parseInt(value.dataIndex+1) <= currentTime.getMonth()? '#255488' : pattern.draw('diagonal', '#255488') : '#255488' }, - data: data2.map(value => value.value), + data: data3.map(value => value.value), }, ], } : { @@ -158,8 +158,8 @@ export function LineBarChart({ title, subtitle, data1, data2, data3, label, red, borderColor: red? '#f00' : '#0c9200', borderWidth: 2, - fill: false, - data: data1.map(value => value.value), + fill: true, + data: data1.map(value => value), }, { type: 'bar' as const, diff --git a/src/components/graph/costIndicatorChart/index.tsx b/src/components/graph/costIndicatorChart/index.tsx index c1cb013..387a840 100644 --- a/src/components/graph/costIndicatorChart/index.tsx +++ b/src/components/graph/costIndicatorChart/index.tsx @@ -63,7 +63,7 @@ export default function CostIndicatorChart({ title, data1, data2, label, subtitl dataArr.map(data => { sum += data; }); - const result = `${parseInt(value).toLocaleString('pt-br')}` + const result = `${(parseFloat(value)/10).toLocaleString('pt-br').slice(0, 4)}` return value==null? null : result }, diff --git a/src/components/graph/grossAnualChart/GrossAnualChart.tsx b/src/components/graph/grossAnualChart/GrossAnualChart.tsx index ee7f3b1..734a93b 100644 --- a/src/components/graph/grossAnualChart/GrossAnualChart.tsx +++ b/src/components/graph/grossAnualChart/GrossAnualChart.tsx @@ -1,12 +1,11 @@ import { BarElement, CategoryScale, Chart as ChartJS, Legend, LinearScale, Title, Tooltip } from 'chart.js'; import ChartDataLabels from 'chartjs-plugin-datalabels'; -import { draw, generate } from 'patternomaly' -import React from 'react'; -import { Bar, Chart } from 'react-chartjs-2'; +import { draw } from 'patternomaly' +import React, { useEffect } from 'react'; +import { Chart } from 'react-chartjs-2'; import { GrossAnualChartView } from './GrossAnualChartView'; import ChartTitle from '../ChartTitle'; -import { blue } from '@mui/material/colors'; ChartJS.register( CategoryScale, @@ -29,25 +28,20 @@ interface SingleBarInterface{ bruta?: boolean | undefined } -export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, barLabel, miniature, bruta }: SingleBarInterface) { +export function GrossAnualChart({ title, subtitle, dataProps, label, dataset, barLabel, miniature, bruta }: SingleBarInterface) { function spacement(string) { - let spaces = '⠀' - let i=Math.abs(string) + const spaces = string.length===1?'' : string.length===2? '⠀⠀⠀⠀' : string.length===3? '⠀⠀⠀' : string.length===4? '⠀⠀' : string.length===5? '⠀' : '' - while (i <= 1) { - i-- - spaces = spaces + `⠀` - } + console.log(string.length) return spaces } const options: any = { responsive: true, - is3D: true, scales: { x: { - grouped: false, + stacked: true, font: { size: 20 }, @@ -56,6 +50,7 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar } }, y: { + stacked: true, grid: { display: false } @@ -75,14 +70,14 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar sum += data; }); const percentage = (dataProps[ctx.dataIndex].econ_percentual*100).toFixed(0)+"%"; - const result = `${spacement(parseInt(value).toLocaleString('pt-br'))} ${percentage}\n${parseInt(value).toLocaleString('pt-br')}` + const result = `${spacement(parseInt(value).toLocaleString('pt-br'))}${percentage}\n${parseInt(value).toLocaleString('pt-br')}${spacement(parseInt(value).toLocaleString('pt-br'))}` return value==null? null : result }, display: true, color: '#255488', anchor: "end", - offset: -60, + offset: !miniature? -55 : -30, align: "start", font: { size: !miniature? 22 : 10, @@ -105,7 +100,7 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar let labels: string[]; if (bruta) { - labels = label.map(value => value.replace('2021', 'Até 2021')) + labels = [`Até ${new Date().getFullYear()-1}`, `${new Date().getFullYear()}`] } else { labels = label } @@ -117,26 +112,20 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar type: 'bar', label: dataset, stacked: true, - - data: dataProps.map((value, index) => { - if (!value.dad_estimado) - return parseFloat(value.economia_acumulada).toFixed(2) + data: dataProps.filter(value => value.dad_estimado === false).map((value, index) => { + return parseFloat(value.economia_acumulada) }), - backgroundColor: (value, ctx) => { - return '#255488' - }, + backgroundColor: '#255488' }, { type: 'bar', stacked: true, label: 'Estimado', - data: dataProps.map((value, index) => { + data: dataProps.filter(value => value.ano === '2022').map((value, index) => { if (value.dad_estimado) - return parseFloat(value.economia_acumulada).toFixed(2) + return parseFloat(value.economia_acumulada) }), - backgroundColor: (value, ctx) => { - return draw('diagonal-right-left', '#C2d5fb'); - }, + backgroundColor: draw('diagonal-right-left', '#C2d5fb'), }, ], } diff --git a/src/components/graph/grossMensalChart/GrossMensalChart.tsx b/src/components/graph/grossMensalChart/GrossMensalChart.tsx index 3a20a45..6a184f3 100644 --- a/src/components/graph/grossMensalChart/GrossMensalChart.tsx +++ b/src/components/graph/grossMensalChart/GrossMensalChart.tsx @@ -43,13 +43,9 @@ interface ChartInterface { export default function GrossMensalChart({ title, data1, data2, label, subtitle, miniature }: ChartInterface) { function spacement(string) { - let spaces = '⠀' - let i=Math.abs(string) + const spaces = string.length===1?'' : string.length===2? '⠀⠀⠀⠀' : string.length===3? '⠀⠀⠀' : string.length===4? '⠀⠀' : string.length===5? '⠀' : '' - while (i <= 1) { - i-- - spaces = spaces + `⠀` - } + console.log(string.length) return spaces } diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index b87ed41..325241f 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -119,7 +119,7 @@ export default function Sidebar() {