diff --git a/src/components/graph/Chart.tsx b/src/components/graph/Chart.tsx index 7e4f656..6cb8590 100644 --- a/src/components/graph/Chart.tsx +++ b/src/components/graph/Chart.tsx @@ -1,5 +1,7 @@ import React, { useState, useEffect } from 'react' +import { draw, generate } from 'patternomaly' + import { Bar, Line } from 'react-chartjs-2'; import { Chart as ChartJS, @@ -54,9 +56,7 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, plugins: { datalabels: { display: true, - color: (value, ctx) => { - return value.dataset.label==='2021'? 'black' : 'white' - }, + color: 'black', formatter: (value, ctx) => { let sum = 0; const dataArr = ctx.chart.data.datasets[0].data; @@ -67,13 +67,10 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, return value==null? null : result }, - anchor: "start", - offset: 20, + anchor: "end", align: "end", - rotation: -90, font: { size: !miniature? 15 : 10, - weight: !miniature? 800 : 100 } }, legend: { @@ -93,12 +90,16 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, { label: dataset1? dataset1 : '2021', data: data1.map(value => value.custo_unit), - backgroundColor: '#C2D5FB', + backgroundColor: (value, ctx) => { + return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); + }, }, { label: dataset2? dataset2 : '2022', data: data2.map(value => value.custo_unit), - backgroundColor: '#255488', + backgroundColor: (value, ctx) => { + return data2[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); + }, } ], } diff --git a/src/components/graph/Chart2.tsx b/src/components/graph/Chart2.tsx index 5609835..c190a16 100644 --- a/src/components/graph/Chart2.tsx +++ b/src/components/graph/Chart2.tsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react' +import React from 'react' import { Bar, Line } from 'react-chartjs-2'; import { @@ -11,9 +11,9 @@ import { Legend } from 'chart.js' -import faker from 'faker' +import { draw, generate } from 'patternomaly' + import { ChartView } from './ChartView'; -import RenderIf from '../../utils/renderIf'; import ChartTitle from './ChartTitle'; // import { data } from './LineBarChart'; @@ -92,14 +92,17 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1, { label: dataset1? dataset1 : '2021', data: data1.map(value => value.economia_acumulada? value.economia_acumulada : 0), - backgroundColor: '#255488', + backgroundColor: (value, ctx) => { + return data2[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); + }, }, - data2? { label: dataset2? dataset2 : '2022', data: data2.map(value => value.economia_acumulada? value.economia_acumulada : 0), - backgroundColor: '#C2D5FB', - } : null + backgroundColor: (value, ctx) => { + return data2[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); + }, + } ], } diff --git a/src/components/graph/SingleBar.tsx b/src/components/graph/SingleBar.tsx index 5fe0cb7..432561b 100644 --- a/src/components/graph/SingleBar.tsx +++ b/src/components/graph/SingleBar.tsx @@ -95,7 +95,7 @@ export function SingleBar({ title, subtitle, dataProps, label, dataset, barLabel return parseFloat(value.economia_acumulada).toFixed(2) }), backgroundColor: (value, ctx) => { - return dataProps[value.dataIndex]?.dad_estimado == false ? '#255488' : '#C2d5fb' + return dataProps[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); }, }, { diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx index ac9273c..ccde447 100644 --- a/src/pages/_document.tsx +++ b/src/pages/_document.tsx @@ -37,7 +37,7 @@ export default class MyDocument extends Document { return ( - + diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx index 3330e01..724a890 100644 --- a/src/pages/dashboard/index.tsx +++ b/src/pages/dashboard/index.tsx @@ -61,27 +61,27 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
- + - + value.mes.slice(3, 8).includes('2021'))} data2={grossMensalGraph.filter((value, index) => value.mes.slice(3, 8).includes('2022'))} label={months} miniature/> - + - + value.mes.slice(4, 8).includes('2021'))} // data1={graphData} diff --git a/src/pages/pld/index.tsx b/src/pages/pld/index.tsx index 53f707d..43819cd 100644 --- a/src/pages/pld/index.tsx +++ b/src/pages/pld/index.tsx @@ -130,13 +130,13 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { function handleColorNorte(value, region) { if (value <= tableData.result[1].norte_min) - return 'green' + return '' else if (value >= tableData.result[0][`${region}_max`]) - return 'red' + return '' else if (tableData.result[0][`${region}_max`] - value > tableData.result[0][`${region}_max`]/2) - return 'dullGreen' + return '' else if (tableData.result[1][`${region}_min`] - value <= tableData.result[1][`${region}_min`]) - return 'dullRed' + return '' } function downloadCSVFile(csv, filename) { diff --git a/src/pages/resumoOperacao/index.tsx b/src/pages/resumoOperacao/index.tsx index 3fa95a8..0776159 100644 --- a/src/pages/resumoOperacao/index.tsx +++ b/src/pages/resumoOperacao/index.tsx @@ -147,7 +147,12 @@ export default function ResumoOperacao({tableData, clientsData, userName, client { - tableDataState.map((value, index) => { + tableDataState.sort((a, b) => { + if (parseFloat(a.mes.slice(0,2)) > parseFloat(b.mes.slice(1,2))) return 1 + if (parseFloat(a.mes.slice(0,2)) < parseFloat(b.mes.slice(1,2))) return -1 + + return 0 + }).map((value, index) => { return <> {value.mes} diff --git a/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts b/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts index 2e6db5b..af7db9a 100644 --- a/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts +++ b/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts @@ -56,12 +56,15 @@ export const TableView = styled.div` word-break:normal; } .tg .tg-8oo6{ - color:#464a53; - font-size:13px; + font-size:14px; text-align:center; vertical-align:top; padding: 10px 18px; text-align: center; + + color: white; + + background-color: #254F7F; } .tg .tg-uulg{ background-color:#efefef; diff --git a/src/styles/layouts/pld/PldView.ts b/src/styles/layouts/pld/PldView.ts index 028b35e..f4703a8 100644 --- a/src/styles/layouts/pld/PldView.ts +++ b/src/styles/layouts/pld/PldView.ts @@ -39,11 +39,15 @@ export const PldTableView = styled.main` word-break:normal; } .tg .tg-8oo6{ - font-size:13px; + font-size:20px; text-align:center; vertical-align:top; padding: 10px 18px; text-align: center; + + color: white; + + background-color: #254F7F; } .tg .tg-uulg{ background-color:#efefef; diff --git a/yarn.lock b/yarn.lock index 1775cec..2bdaf7b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4008,6 +4008,7 @@ path-type@^4.0.0: patternomaly@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/patternomaly/-/patternomaly-1.3.2.tgz#70b8db17d7318ab1471cc43f94011bb866c54d09" + integrity sha512-70UhA5+ZrnNgdfDBKXIGbMHpP+naTzfx9vPT4KwIdhtWWs0x6FWZRJQMXXhV2jcK0mxl28FA/2LPAKArNG058Q== pdfjs-dist@^2.7.570: version "2.14.305"