From 96b5605af604ff04875efdafec0f90c98f68b74e Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Tue, 17 May 2022 17:42:27 -0300 Subject: [PATCH] add datasets sets --- src/components/graph/Chart.tsx | 8 +++++--- src/components/graph/LineBarChart.tsx | 21 ++++++++------------- src/components/graph/LineChart.tsx | 14 +++++++++----- src/components/sidebar/Sidebar.tsx | 10 +++++----- src/pages/telemetria.tsx | 12 +++++++----- 5 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/components/graph/Chart.tsx b/src/components/graph/Chart.tsx index 63e0ac3..c932f71 100644 --- a/src/components/graph/Chart.tsx +++ b/src/components/graph/Chart.tsx @@ -33,9 +33,11 @@ interface ChartInterface { data2: any, single?: any label: any, + dataset1?: string, + dataset2?: string } -export default function Chart({ title, data1, data2, label, subtitle }: ChartInterface) { +export default function Chart({ title, data1, data2, label, subtitle, dataset1, dataset2 }: ChartInterface) { const labels = label; @@ -43,12 +45,12 @@ export default function Chart({ title, data1, data2, label, subtitle }: ChartInt labels, datasets: [ { - label: '2020', + label: dataset1? dataset1 : '2020', data: data1.map(value => value), backgroundColor: '#C2D5FB', }, { - label: '2021', + label: dataset2? dataset2 : '2021', data: data2.map(value => value), backgroundColor: '#255488', }, diff --git a/src/components/graph/LineBarChart.tsx b/src/components/graph/LineBarChart.tsx index 77a38ca..cdc9c11 100644 --- a/src/components/graph/LineBarChart.tsx +++ b/src/components/graph/LineBarChart.tsx @@ -64,10 +64,13 @@ interface LineBarChartInterface { data2: any, data3: any, red?: any, - label: any + label: any, + dataset1?: string, + dataset2?: string, + dataset3?: string } -export function LineBarChart({ title, subtitle, data1, data2, data3, label, red }: LineBarChartInterface) { +export function LineBarChart({ title, subtitle, data1, data2, data3, label, red, dataset1, dataset2, dataset3 }: LineBarChartInterface) { const chartRef = useRef(null); const labels = label @@ -77,29 +80,21 @@ export function LineBarChart({ title, subtitle, data1, data2, data3, label, red datasets: [ { type: 'line' as const, - label: 'Dataset 1', + label: dataset1? dataset1 : 'Dataset 1', borderColor: red? '#f00' : '#0c9200', borderWidth: 2, fill: false, data: data1.map(value => value), }, - // { - // type: 'line' as const, - // label: 'Dataset 1', - // borderColor: '#f00', - // borderWidth: 2, - // fill: false, - // data: data4.map(value => value), - // }, { type: 'bar' as const, - label: 'Dataset 2', + label: dataset2? dataset2 : 'Dataset 2', backgroundColor: '#255488', data: data2.map(value => value), }, { type: 'bar' as const, - label: 'Dataset 2', + label: dataset3? dataset3 : 'Dataset 2', backgroundColor: '#C2D5FB', data: data3.map(value => value), }, diff --git a/src/components/graph/LineChart.tsx b/src/components/graph/LineChart.tsx index 9560c98..4e683c9 100644 --- a/src/components/graph/LineChart.tsx +++ b/src/components/graph/LineChart.tsx @@ -62,9 +62,13 @@ interface ChartInterface { data3?: any, data4?: any, label: any, + dataset1: string, + dataset2: string, + dataset3: string, + dataset4: string } -export default function LineChart({ title, subtitle, data1, data2, data3, data4, label }: ChartInterface) { +export default function LineChart({ title, subtitle, data1, data2, data3, data4, label, dataset1, dataset2, dataset3, dataset4 }: ChartInterface) { const options = { responsive: true, plugins: { @@ -84,25 +88,25 @@ export default function LineChart({ title, subtitle, data1, data2, data3, data4, labels, datasets: [ { - label: 'Dataset 1', + label: dataset1? dataset1 : 'Dataset 1', data: data1.map(value => value), borderColor: 'rgb(53, 162, 235)', backgroundColor: 'rgba(53, 162, 235, 0.5)', }, { - label: 'Dataset 2', + label: dataset2? dataset2 : 'Dataset 2', data: data2.map(value => value), borderColor: 'rgb(255, 114, 32)', backgroundColor: 'rgba(255, 145, 0, 0.5)', }, { - label: 'Dataset 3', + label: dataset3? dataset3 : 'Dataset 3', data: data3.map(value => value), borderColor: 'rgb(109, 109, 109)', backgroundColor: 'rgba(90, 90, 90, 0.5)', }, { - label: 'Dataset4', + label: dataset4? dataset4 : 'Dataset4', data: data4.map(value => value), borderColor: 'rgb(255, 166, 0)', backgroundColor: 'rgba(255, 187, 0, 0.5)', diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index d2d3447..5058884 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -28,17 +28,17 @@ export default function Sidebar() {
  • {'Visão Geral'}
  • setEconomiaDrawer(!economiaDrawer)} className={router.pathname=='/grossSavings' || router.pathname=='/accumulatedSavings' || router.pathname=='/estimatedCost' || router.pathname=='/costIndicator' ? 'actualPath' : null } >{'Economia >'}
    • -
  • Economia Bruta
    • -
  • Economia Acumulada
    • -
  • Custo Estimado
    • -
  • Custo R/MWh
    • +
  • Economia Bruta
    • +
  • Economia Acumulada
    • +
  • Custo Estimado
    • +
  • Custo R/MWh
  • {'Telemetria >'}
  • {'Resumo de Op. '}
  • {'Notícias >'}
  • {'Info Setorial >'}
    • {/*
  • {'Consumo'}
    • */} -
  • {'Notificação >'}
    • +
  • {'Notificações >'}
  • {'Sobre Nós >'}
  • {'FAQ >'}
    • diff --git a/src/pages/telemetria.tsx b/src/pages/telemetria.tsx index 59f3bf7..a32f970 100644 --- a/src/pages/telemetria.tsx +++ b/src/pages/telemetria.tsx @@ -107,11 +107,13 @@ export default function Telemetria() {

    - Fonte: Dados coletados do Sistema de Coleta de Dados - de Energia - SCDE da Câmara de Comercialização
    - Energia Elétrica – CCEE, sendo que as quantidades aqui - informadas são de responsabilidade
    do agente de - medição - Distribuidora. + + Fonte: Dados coletados do Sistema de Coleta de Dados + de Energia - SCDE da Câmara de Comercialização
    + Energia Elétrica – CCEE, sendo que as quantidades aqui + informadas são de responsabilidade
    do agente de + medição - Distribuidora. +