From 51ccc268a1cd3ee33f0a3a803e5d5e53d3975a9c Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Mon, 20 Jun 2022 11:51:04 -0300 Subject: [PATCH] adding pld maps and percentage in charts --- src/components/graph/LineBarChart2.tsx | 10 +- src/components/graph/SingleBar.tsx | 5 +- src/components/mapCard/MapCard.tsx | 6 +- src/contexts/AuthContext.tsx | 11 +- src/pages/accumulatedSavings.tsx | 3 +- src/pages/administrative/clients/index.tsx | 4 +- src/pages/costIndicator.tsx | 4 +- src/pages/dashboard.tsx | 44 +++++--- src/pages/estimatedCost.tsx | 38 ++++++- src/pages/grossSavings.tsx | 4 +- src/pages/resumoOperacao.tsx | 123 ++++++++++++--------- 11 files changed, 164 insertions(+), 88 deletions(-) diff --git a/src/components/graph/LineBarChart2.tsx b/src/components/graph/LineBarChart2.tsx index 3b8472a..2f346ed 100644 --- a/src/components/graph/LineBarChart2.tsx +++ b/src/components/graph/LineBarChart2.tsx @@ -119,24 +119,24 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red }, borderWidth: 2, fill: false, - data: data1.map(value => value), + data: data1.map(value => value.economia_mensal), }, { type: 'bar' as const, label: dataset2? dataset2 : 'Dataset 2', backgroundColor: (value, ctx) => { - return hashurado? parseInt(value.dataIndex+1) <= currentTime.getMonth()? '#C2D5FB' : pattern.draw('diagonal', '#C2D5FB') : '#C2D5FB' + return hashurado? data1[value.dataIndex].dad_estimado == false? '#C2D5FB' : pattern.draw('diagonal', '#C2D5FB') : '#C2D5FB' }, - data: data3.map(value => value), + data: data3.map(value => value.custo_cativo), }, { type: 'bar' as const, label: dataset3? dataset3 : 'Dataset 2', // backgroundColor: '#255488', backgroundColor: (value, ctx) => { - return hashurado? parseInt(value.dataIndex+1) <= currentTime.getMonth()? '#255488' : pattern.draw('diagonal', '#255488') : '#255488' + return hashurado? data1[value.dataIndex].dad_estimado == false? '#255488' : pattern.draw('diagonal', '#255488') : '#255488' }, - data: data2.map(value => value), + data: data2.map(value => value.custo_livre), }, ], } : { diff --git a/src/components/graph/SingleBar.tsx b/src/components/graph/SingleBar.tsx index 1bb3815..b3e4f58 100644 --- a/src/components/graph/SingleBar.tsx +++ b/src/components/graph/SingleBar.tsx @@ -50,7 +50,7 @@ export function SingleBar({ title, subtitle, dataProps, label, dataset, dataset1 dataArr.map(data => { sum += data; }); - const percentage = (value*100 / sum).toFixed(0)+"%"; + const percentage = (dataProps[ctx.dataIndex].econ_percentual*100).toFixed(0)+"%"; const result = `${value}\n ${percentage}` return value==null? null : result @@ -82,10 +82,9 @@ export function SingleBar({ title, subtitle, dataProps, label, dataset, dataset1 { label: dataset, data: dataProps.map((value, index) => { - return value.economia_acumulada + return parseFloat(value.economia_acumulada).toFixed(2) }), backgroundColor: (value, ctx) => { - console.log(dataProps[value.dataIndex]) return dataProps[value.dataIndex].dad_estimado == false ? '#255488' : '#C2d5fb' }, }, diff --git a/src/components/mapCard/MapCard.tsx b/src/components/mapCard/MapCard.tsx index 10085d5..b1c5c06 100644 --- a/src/components/mapCard/MapCard.tsx +++ b/src/components/mapCard/MapCard.tsx @@ -15,9 +15,11 @@ export default function MapCard({ title, subtitle, statistic, imgSource, date }: return ( - +
-

{title}

+

{ + subtitle==='SUL'? 'S' : subtitle==='NORTE'? 'N' : subtitle==='NORDESTE'? 'NE' : subtitle==='SUDESTE'? 'SE/CO' : title + }

{subtitle} { date? diff --git a/src/contexts/AuthContext.tsx b/src/contexts/AuthContext.tsx index c422e20..7b1a415 100644 --- a/src/contexts/AuthContext.tsx +++ b/src/contexts/AuthContext.tsx @@ -36,15 +36,18 @@ export function AuthProvider({children}: {children: React.ReactNode}) { password }) - if (token) { + if (token) setCookie(undefined, '@smartAuth-token', token, { maxAge: 60 * 60 * 1, // 1 hour }) - } - if (user.role) { + if (user.role) setCookie(undefined, 'user-role', user.role) - } + + if (user.id) + setCookie(undefined, 'user-id', user.id) + + console.log(user) if (!exception) { if (user.role == 2) { diff --git a/src/pages/accumulatedSavings.tsx b/src/pages/accumulatedSavings.tsx index 6131c3f..6be7e0e 100644 --- a/src/pages/accumulatedSavings.tsx +++ b/src/pages/accumulatedSavings.tsx @@ -37,7 +37,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.post('/economy/grossMonthly').then(res => { graphData = res.data.data - console.log(graphData[0].mes) + // console.log(graphData[0].mes) }).catch(res => { console.log(res) }) @@ -53,7 +53,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { } } - return { props: { graphData, diff --git a/src/pages/administrative/clients/index.tsx b/src/pages/administrative/clients/index.tsx index 7a612e6..868a09c 100644 --- a/src/pages/administrative/clients/index.tsx +++ b/src/pages/administrative/clients/index.tsx @@ -213,9 +213,9 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { let clients = []; await apiClient.get('/user').then(res => { - console.log(res) + // console.log(res) clients = res.data.data - console.log(clients) + // console.log(clients) }).catch(res => { // console.log(res) }) diff --git a/src/pages/costIndicator.tsx b/src/pages/costIndicator.tsx index 405c453..1c6204c 100644 --- a/src/pages/costIndicator.tsx +++ b/src/pages/costIndicator.tsx @@ -13,7 +13,7 @@ import getAPIClient from '../services/ssrApi' import { CostIndicatorView } from '../styles/layouts/economy/costIndicator/CostIndicatorView' function addMissingMonths(data) { - console.log(data[0].mes.slice(1, 1)) + // console.log(data[0].mes.slice(1, 1)) } function verifyDataByYear(data) { @@ -24,7 +24,7 @@ function verifyDataByYear(data) { } export default function CostIndicator({graphData}: any) { - console.log(graphData.filter((value, index) => value.mes.slice(3, 7).includes('2021')).map(value => value.custo_unit)) + // console.log(graphData.filter((value, index) => value.mes.slice(3, 7).includes('2021')).map(value => value.custo_unit)) return ( diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx index c485f0d..5fe576a 100644 --- a/src/pages/dashboard.tsx +++ b/src/pages/dashboard.tsx @@ -23,8 +23,7 @@ import { parseCookies } from 'nookies' import { GetServerSideProps } from 'next' import getAPIClient from '../services/ssrApi' -export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensalGraph, grossMensalYears} : any) { - +export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensalGraph, grossMensalYears, acumulatedGraph, mapsInfo} : any) { return ( @@ -36,10 +35,15 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
- + { + mapsInfo.map(value => { + return + }) + } + {/* - + */}
@@ -60,17 +64,19 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal - - - - + + + + ) @@ -82,23 +88,32 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { let grossAnualGraph = []; let grossMensalGraph = []; - - + let acumulatedGraph = []; + let mapsInfo = []; await apiClient.post('/economy/grossAnnual').then(res => { grossAnualGraph = res.data.data - console.log(grossAnualGraph[0]) }).catch(res => { console.log(res) }) await apiClient.post('/economy/grossMonthly').then(res => { grossMensalGraph = res.data.data - }).catch(res => { console.log(res) }) + await apiClient.post('/economy/estimates').then(res => { + acumulatedGraph = res.data.data + }).catch(res => { + console.log(res) + }) + + await apiClient.post('/pld/overview').then(res => { + mapsInfo = res.data.data + }).catch(res => { + console.log(res) + }) const grossMensalYears = grossMensalGraph.map((value) => value.mes) const grossAnualYears = grossAnualGraph.map((value) => value.ano) @@ -112,13 +127,14 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { } } - return { props: { grossAnualGraph, grossAnualYears, grossMensalYears, grossMensalGraph, + acumulatedGraph, + mapsInfo } } } diff --git a/src/pages/estimatedCost.tsx b/src/pages/estimatedCost.tsx index 73b5538..135da99 100644 --- a/src/pages/estimatedCost.tsx +++ b/src/pages/estimatedCost.tsx @@ -1,4 +1,6 @@ +import { GetServerSideProps } from 'next' import Head from 'next/head' +import { parseCookies } from 'nookies' import React from 'react' import Chart from '../components/graph/Chart' @@ -7,9 +9,10 @@ import { LineBarChart2 } from '../components/graph/LineBarChart2' import Header from '../components/header/Header' import PageTitle from '../components/pageTitle/PageTitle' import { ConsumoEstimado } from '../services/consumoEstimado' +import getAPIClient from '../services/ssrApi' import { EstimatedCostView } from '../styles/layouts/economy/estimatedCost/EstimatedCostView' -export default function EstimatedCost() { +export default function EstimatedCost({graphData}: any) { return ( @@ -18,8 +21,39 @@ export default function EstimatedCost() {
- +
) } + +export const getServerSideProps: GetServerSideProps = async (ctx) => { + const apiClient = getAPIClient(ctx) + const { ['@smartAuth-token']: token } = parseCookies(ctx) + + let graphData = []; + + await apiClient.post('/economy/estimates').then(res => { + graphData = res.data.data + console.log(graphData) + }).catch(res => { + console.log(res) + }) + + if (!token) { + return { + redirect: { + destination: '/', + permanent: false + } + } + } + + return { + props: { + graphData, + } + } +} diff --git a/src/pages/grossSavings.tsx b/src/pages/grossSavings.tsx index adf3d8a..b79e939 100644 --- a/src/pages/grossSavings.tsx +++ b/src/pages/grossSavings.tsx @@ -13,7 +13,7 @@ import getAPIClient from '../services/ssrApi' import { GrossSavingsView } from '../styles/layouts/economy/grossSavings/GrossSavings' function addMissingMonths(data) { - console.log(data[0].mes.slice(1, 1)) + // console.log(data[0].mes.slice(1, 1)) } function verifyDataByYear(data) { @@ -51,7 +51,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.post('/economy/grossAnnual').then(res => { graphData = res.data.data - console.log(graphData[0]) + // console.log(graphData[0]) }).catch(res => { console.log(res) }) diff --git a/src/pages/resumoOperacao.tsx b/src/pages/resumoOperacao.tsx index 43eadd5..3a1a6cb 100644 --- a/src/pages/resumoOperacao.tsx +++ b/src/pages/resumoOperacao.tsx @@ -3,8 +3,10 @@ import FormControl from '@mui/material/FormControl'; import InputLabel from '@mui/material/InputLabel'; import MenuItem from '@mui/material/MenuItem'; import Select, { SelectChangeEvent } from '@mui/material/Select'; +import { GetServerSideProps } from 'next'; import Head from 'next/head'; -import React, { useEffect } from 'react'; +import { parseCookies } from 'nookies'; +import React, { useEffect, useState } from 'react'; // import Teste from '../files/teste.csv'; import { CSVDownload, CSVLink } from "react-csv"; @@ -12,30 +14,25 @@ import BasicButton from '../components/buttons/basicButton/BasicButton'; import Header from '../components/header/Header'; import PageTitle from '../components/pageTitle/PageTitle'; import Sidebar from '../components/sidebar/Sidebar'; +import { api } from '../services/api'; // import { dados } from '../services/DadosTabelaResumoOperacao'; import data from '../services/dados.json' +import getAPIClient from '../services/ssrApi'; import { Pagination, TableView } from '../styles/layouts/ResumoOperacao/ResumoOperacaoView'; export default function ResumoOperacao() { const csvData = [ - // ["firstname", "lastname", "email"], - // ["Ahmed", "Tomi", "ah@smthing.co.com"], - // ["Raed", "Labes", "rl@smthing.co.com"], - // ["Yezzi", "Min l3b", "ymin@cocococo.com"], - - - [ "value", "unidade1", "name", "Unidade-1", "operacao", "Compra", "montante", "130,00", "contraparte", "cOPEL COM I5", "preco", "234,67", "valorNF", "38.257,15" ], [ "value", "unidade2", "name", "Unidade-2", "operacao", "Compra", "montante", "20,00", "contraparte", "EMEWE I5", "preco", "234,67", "valorNF", "38.257,15"], [ "value", "unidade3", "name", "Unidade-3", "operacao", "Compra", "montante", "30,00", "contraparte", "EMEWE I5", "preco", "234,67", "valorNF", "38.257,15" ], [ "value", "unidade4", "name", "Unidade-4", "operacao", "Compra", "montante", "40,00", "contraparte", "COPEL COM I5", "preco", "234,67", "valorNF", "38.257,15" ], [ "value", "unidade5", "name", "Unidade-5", "operacao", "Compra", "montante", "500,00","contraparte", "COPEL COM I5", "preco", "234,67", "valorNF", "38.257,15" ], [ "value", "unidade6", "name", "Unidade-6", "operacao", "Compra", "montante", "300,00", "contraparte", "COPEL COM I5", "preco","234,67", "valorNF", "965,95" ] - ]; - const [month, setMonth] = React.useState(''); - const [unidade, setUnidade] = React.useState(''); + const [month, setMonth] = useState(''); + const [unidade, setUnidade] = useState(''); + const [tableData, setTableData] = useState([]); const handleChangeMonth = (event: SelectChangeEvent) => { setMonth(event.target.value); @@ -45,12 +42,18 @@ export default function ResumoOperacao() { }; useEffect(() => { - // console.log(data.unidades) - // data.unidades.map((value) => { - // console.log(`olha o valor ${value.name}`) - // }) - // console.log(unidade) - console.log(data.unidades.filter((value, index)=> value.value.includes(unidade))) + api.post('/operation', { + "filters": [ + {"type" : "=", "field": "mes", "value": `${month}/2022`}, + {"type" : "=", "field": "dados_te.cod_smart_unidade", "value": 180103211002} + ] + }).then(res => { + setTableData(res.data.data) + console.log(tableData) + }).catch(res => { + console.log(res) + }) + console.log(tableData) }, [month, unidade]) return( @@ -90,19 +93,18 @@ export default function ResumoOperacao() { label="Month" onChange={handleChangeMonth} > - Janeiro - Fevereiro - Março - Abril - Março - Maio - Junho - Julho - Agosto - Setembro - Outubro - Novembro - Dezembro + Janeiro + Fevereiro + Março + Abril + Maio + Junho + Julho + Agosto + Setembro + Outubro + Novembro + Dezembro
@@ -119,26 +121,17 @@ export default function ResumoOperacao() { { - data.unidades.filter((value, index)=> value.value.includes(unidade)).map((value, index) => { - if (index%2===0) { - return - {value.name} - {value.operacao} - {value.montante} - {value.contraparte} - {value.preco} - {value.valorNF} - - } else { - return - {value.name} - {value.operacao} - {value.montante} - {value.contraparte} - {value.preco} - {value.valorNF} - - } + tableData.map((value, index) => { + return <> + + {value.cod_smart_unidade} + {value.operacao} + {value.montante_nf} + {value.contraparte} + {value.nf_c_icms} + {value.preco_nf} + + }) } @@ -152,3 +145,33 @@ export default function ResumoOperacao() { ) } + +export const getServerSideProps: GetServerSideProps = async (ctx) => { + const apiClient = getAPIClient(ctx) + const { ['@smartAuth-token']: token } = parseCookies(ctx) + const { ['user-id']: id } = parseCookies(ctx) + + let tableData = []; + + await apiClient.post(`/user/${id}`).then(res => { + tableData = res.data.data + console.log(tableData) + }).catch(res => { + console.log(res) + }) + + if (!token) { + return { + redirect: { + destination: '/', + permanent: false + } + } + } + + return { + props: { + tableData, + } + } +}