Merge branch 'administativePages' into 'dev'

Administative pages

See merge request kluppsoftware/smart-energia-web!65

src/pages/dashboard.tsx

@@ -15,6 +15,7 @@ import { dataEconomiaIndicador } from '../services/economiaIndicador'
 import { EconomiaAcumulada } from '../services/economiaAcumulada'
 import Chart from '../components/graph/Chart'
 import { LineBarChart } from '../components/graph/LineBarChart'
+import { LineBarChart2 } from '../components/graph/LineBarChart2'
 import { ConsumoEstimado } from '../services/consumoEstimado'
 import Head from 'next/head'
 import recoverUserInformation from '../services/auth'
@@ -22,7 +23,7 @@ import { parseCookies } from 'nookies'
 import { GetServerSideProps } from 'next'
 import getAPIClient from '../services/ssrApi'
 
-export default function Dashboard({grossAnualGraph, grossAnualYears} : any) {
+export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensalGraph, grossMensalYears} : any) {
 
   return (
     <DashboardView>
@@ -49,11 +50,17 @@ export default function Dashboard({grossAnualGraph, grossAnualYears} : any) {
           dataProps={grossAnualGraph}
           label={grossAnualYears} barLabel year/>
         </GraphCard>
+
         <GraphCard title='Economia Acumulado' subtitle='Economia Acumulada' singleBar>
-          <SingleBar title='Economia Bruta Estimada e Acumulada' subtitle='(Valores em R$)' dataset='Acumulada' dataset1='Estimado' label={EconomiaAcumulada.label}  dataProps={EconomiaAcumulada.data2} barLabel month/>
+          <SingleBar title='Economia Bruta Estimada e Acumulada' subtitle='(Valores em R$)'
+          dataset='Acumulada' dataset1='Estimado'
+          dataProps={grossMensalGraph}
+          label={grossMensalYears}
+          barLabel month/>
         </GraphCard>
+
         <GraphCard title='Custos Estimados' subtitle='Custos Estimados em R$/MWh' singleBar>
-          <LineBarChart data1={ConsumoEstimado.data2} data2={ConsumoEstimado.data} data3={ConsumoEstimado.data1} label={ConsumoEstimado.label} dataset1='Custo' dataset2='Cativo' dataset3='Livre' title='Custo Estimado' subtitle='(Valores em R$/MWh)' barLabel hashurado/>
+          <LineBarChart2 data1={ConsumoEstimado.data2} data2={ConsumoEstimado.data} data3={ConsumoEstimado.data1} label={ConsumoEstimado.label} dataset1='Custo' dataset2='Cativo' dataset3='Livre' title='Custo Estimado' subtitle='(Valores em R$/MWh)' barLabel hashurado/>
         </GraphCard>
         <GraphCard title='Indicador de Custo' subtitle='Valores em R$/ MWh'>
           <Chart title='Indicador de Custo' subtitle='(Valores em R$/MWh)' data1={dataEconomiaIndicador.data1} data2={dataEconomiaIndicador.data2} label={dataEconomiaIndicador.labels} barLabel/>
@@ -73,6 +80,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
   const { ['@smartAuth-token']: token } = parseCookies(ctx)
 
   let grossAnualGraph = [];
+  let grossMensalGraph = [];
 
 
 
@@ -83,8 +91,15 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
     console.log(res)
   })
 
+  await apiClient.post('/economy/grossMonthly').then(res => {
+    grossMensalGraph = res.data.data
+
+  }).catch(res => {
+    console.log(res)
+  })
 
 
+  const grossMensalYears = grossMensalGraph.map((value) => value.mes)
   const grossAnualYears = grossAnualGraph.map((value) => value.ano)
 
   if (!token) {
@@ -101,6 +116,8 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => {
     props: {
       grossAnualGraph,
       grossAnualYears,
+      grossMensalYears,
+      grossMensalGraph,
     }
   }
 }

src/pages/estimatedCost.tsx

@@ -3,6 +3,7 @@ import React from 'react'
 
 import Chart from '../components/graph/Chart'
 import { LineBarChart } from '../components/graph/LineBarChart'
+import { LineBarChart2 } from '../components/graph/LineBarChart2'
 import Header from '../components/header/Header'
 import PageTitle from '../components/pageTitle/PageTitle'
 import { ConsumoEstimado } from '../services/consumoEstimado'
@@ -17,7 +18,7 @@ export default function EstimatedCost() {
       <Header name='' />
       <PageTitle title='Cativo x Livre mensal' subtitle='Comparativo de Custo Estimado' />
       <section>
-        <LineBarChart data1={ConsumoEstimado.data2} data2={ConsumoEstimado.data} data3={ConsumoEstimado.data1} dataset1="Economia (R$)" dataset2='Cativo' dataset3='Livre' label={ConsumoEstimado.label} title='Custo Estimado' subtitle='' barLabel hashurado />
+        <LineBarChart2 data1={ConsumoEstimado.data2} data2={ConsumoEstimado.data} data3={ConsumoEstimado.data1} dataset1="Economia (R$)" dataset2='Cativo' dataset3='Livre' label={ConsumoEstimado.label} title='Custo Estimado' subtitle='' barLabel hashurado />
       </section>
     </EstimatedCostView>
   )