From 51ccc268a1cd3ee33f0a3a803e5d5e53d3975a9c Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Mon, 20 Jun 2022 11:51:04 -0300 Subject: [PATCH 1/2] 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, + } + } +} From ce4ade1e95fe9c8645953d2e0295df21886e732c Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Mon, 20 Jun 2022 19:11:22 -0300 Subject: [PATCH 2/2] fixing issues pointed out in list --- .../administrativeTables/FaqTable.tsx | 15 +- src/components/graph/SingleBar.tsx | 2 +- src/components/header/Header.tsx | 12 +- src/components/sidebar/Sidebar.tsx | 2 +- src/contexts/AuthContext.tsx | 9 +- src/pages/aboutUs.tsx | 27 +++- src/pages/accumulatedSavings.tsx | 7 +- src/pages/administrative/clients/index.tsx | 14 +- src/pages/administrative/faq/index.tsx | 32 ++--- src/pages/administrative/general.tsx | 28 +++- .../administrative/notification/index.tsx | 10 +- src/pages/chartTelemetry.tsx | 27 +++- src/pages/consumption.tsx | 27 +++- src/pages/costIndicator.tsx | 6 +- src/pages/dashboard.tsx | 13 +- src/pages/estimatedCost.tsx | 6 +- src/pages/faq.tsx | 12 +- src/pages/grossSavings.tsx | 6 +- src/pages/industryInfo.tsx | 27 +++- src/pages/news.tsx | 27 +++- src/pages/notifications.tsx | 11 +- src/pages/pld/index.tsx | 135 ++++++++++-------- src/pages/resumoOperacao.tsx | 63 ++++---- src/pages/telemetria.tsx | 27 +++- src/styles/layouts/pld/PldView.ts | 3 +- 25 files changed, 366 insertions(+), 182 deletions(-) diff --git a/src/components/administrativeTables/FaqTable.tsx b/src/components/administrativeTables/FaqTable.tsx index cc0b09e..a7014bb 100644 --- a/src/components/administrativeTables/FaqTable.tsx +++ b/src/components/administrativeTables/FaqTable.tsx @@ -45,15 +45,6 @@ function createData( }; } -const rows = [ - createData('Como usar o sistema?', 'Você deve usar assim... e assado...', 'ativo'), - createData('Como usar o sistema', 'Você deve usar assim... e assado...', 'ativo'), - createData('Como usar o sistema?', 'Você deve usar assim... e assado...', 'ativo'), - createData('Como usar o sistema?', 'Você deve usar assim... e assado...', 'ativo'), - createData('Como usar o sistema?', 'Você deve usar assim... e assado...', 'ativo'), - createData('Como usar o sistema?', 'Você deve usar assim... e assado...', 'inativo'), -]; - function descendingComparator(a: T, b: T, orderBy: keyof T) { if (b[orderBy] < a[orderBy]) { return -1; @@ -183,8 +174,6 @@ export default function FaqTable({questionData, onChange}: FaqTableInterface) { const [dense, setDense] = useState(false); const [rowsPerPage, setRowsPerPage] = useState(5); - console.table(questionData) - console.table(rows) const handleRequestSort = ( event: React.MouseEvent, property: keyof Data, @@ -240,7 +229,7 @@ export default function FaqTable({questionData, onChange}: FaqTableInterface) { // Avoid a layout jump when reaching the last page with empty rows. const emptyRows = - page > 0 ? Math.max(0, (1 + page) * rowsPerPage - rows.length) : 0; + page > 0 ? Math.max(0, (1 + page) * rowsPerPage - questionData.length) : 0; return ( @@ -313,7 +302,7 @@ export default function FaqTable({questionData, onChange}: FaqTableInterface) {

- olá, {'josé'} + olá, {name}

- + ) diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index 271bf62..48df240 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -55,7 +55,7 @@ export default function Sidebar() {
  • {'Clientes >'}
    • -
  • {'Visão Geral'}
    • +
  • {'Sobre Nós'}
  • {'FAQ >'}
  • {'Notificações >'}

    25

    • diff --git a/src/contexts/AuthContext.tsx b/src/contexts/AuthContext.tsx index 7b1a415..f335f00 100644 --- a/src/contexts/AuthContext.tsx +++ b/src/contexts/AuthContext.tsx @@ -47,7 +47,10 @@ export function AuthProvider({children}: {children: React.ReactNode}) { if (user.id) setCookie(undefined, 'user-id', user.id) - console.log(user) + if (user.name) + setCookie(undefined, 'user-name', user.name) + + api.defaults.headers['Authorization'] = `Bearer ${token}` if (!exception) { if (user.role == 2) { @@ -59,10 +62,6 @@ export function AuthProvider({children}: {children: React.ReactNode}) { } else { return } - - api.defaults.headers['Authorization'] = `Bearer ${token}` - - setUser(user) } return ( diff --git a/src/pages/aboutUs.tsx b/src/pages/aboutUs.tsx index c4697fb..d0eb0a0 100644 --- a/src/pages/aboutUs.tsx +++ b/src/pages/aboutUs.tsx @@ -1,17 +1,19 @@ +import { GetServerSideProps } from 'next' import Head from 'next/head' import Image from 'next/image' +import { parseCookies } from 'nookies' import React from 'react' import Banner from '../components/banner/Banner' import Header from '../components/header/Header' import { AboutUsView } from '../styles/layouts/aboutUs/AboutUsView' -export default function aboutUs() { +export default function aboutUs({userName}) { return ( Smart Energia - About Us -
    +
    @@ -50,3 +52,24 @@ export default function aboutUs() { ) } + +export const getServerSideProps: GetServerSideProps = async (ctx) => { + const { ['@smartAuth-token']: token } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) + + if (!token) { + return { + redirect: { + destination: '/', + permanent: false + } + } + } + + return { + props: { + userName + } + } +} + diff --git a/src/pages/accumulatedSavings.tsx b/src/pages/accumulatedSavings.tsx index 6be7e0e..bce6a4c 100644 --- a/src/pages/accumulatedSavings.tsx +++ b/src/pages/accumulatedSavings.tsx @@ -12,13 +12,13 @@ import { dataEconomiaBruta } from '../services/economiaBruta' import getAPIClient from '../services/ssrApi' import { AccumulatedSavingsView } from '../styles/layouts/economy/accumulatedSavings/AccumulatedSavingsView' -export default function AccumulatedSavings({graphData, years}: any) { +export default function AccumulatedSavings({graphData, years, userName}: any) { return ( Smart Energia - Economia Acumulada -
    +
    { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) + let graphData = []; @@ -57,6 +59,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { props: { graphData, years, + userName } } } diff --git a/src/pages/administrative/clients/index.tsx b/src/pages/administrative/clients/index.tsx index 868a09c..6d3d430 100644 --- a/src/pages/administrative/clients/index.tsx +++ b/src/pages/administrative/clients/index.tsx @@ -43,7 +43,7 @@ const Alert = React.forwardRef(function Alert( return ; }); -export default function clients({clients}) { +export default function clients({clients, userName}) { const [client, setClient] = useState({ name: String, email: String, @@ -114,28 +114,28 @@ export default function clients({clients}) {
    - notificação cadastrada com sucesso! + Usuario cadastrada com sucesso! - Notificação não cadastrada! + Usuario não cadastrada! - notificação excluida com sucesso! + Usuario excluida com sucesso! - Notificação não excluida! + Usuario não excluida! -
    +
    @@ -209,6 +209,7 @@ export default function clients({clients}) { export const getServerSideProps: GetServerSideProps = async (ctx) => { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) let clients = []; @@ -232,6 +233,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { clients, + userName } } } diff --git a/src/pages/administrative/faq/index.tsx b/src/pages/administrative/faq/index.tsx index 592ac3a..0b057d2 100644 --- a/src/pages/administrative/faq/index.tsx +++ b/src/pages/administrative/faq/index.tsx @@ -51,11 +51,9 @@ const Alert = React.forwardRef(function Alert( type FaqInterface = { question: string; answer: string; - } -export default function Sidebar({faqData} : any ) { - +export default function Sidebar({faqData, userName} : any ) { const [openModalInativar, setOpenModalInativar] = useState(false) const [openSnackSuccess, setOpenSnackSuccess] = useState(false); const [openSnackError, setOpenSnackError] = useState(false); @@ -85,7 +83,7 @@ export default function Sidebar({faqData} : any ) { async function handleDeleteNotification(id: any) { await id.map((value) => { - api.delete(`/faq/${value}`).then(res => { + api.delete(`/faq/${value.id}`).then(res => { setOpenSnackSuccessDelete(true) setOpenModalInativar(false) window.location.reload() @@ -93,12 +91,9 @@ export default function Sidebar({faqData} : any ) { }) } - - const [faq, setFaq] = useState({ question: '', answer : '', - }) const [selectedfaq, setSelectedfaq] = useState([]) @@ -107,13 +102,12 @@ export default function Sidebar({faqData} : any ) { await api.post('/faq', { "question": question, "answer": answer, - - }).then(res => console.log(res.data)) + }).then(res => { + setOpenSnackSuccess(true) + window.location.reload() + }).catch(res => setOpenSnackError(true)) } - - - const [open, setOpen] = React.useState(false); const handleOpen = () => setOpen(true); const handleClose = () => setOpen(false); @@ -121,29 +115,29 @@ export default function Sidebar({faqData} : any ) { return ( <> -
    +
    - Notificação cadastrada com sucesso! + Pergunta cadastrada com sucesso! - Notificação não cadastrada! + Pergunta não cadastrada! - notificação excluida com sucesso! + Pergunta excluida com sucesso! - Notificação não excluida! + Pergunta não excluida! @@ -197,6 +191,7 @@ export default function Sidebar({faqData} : any ) { export const getServerSideProps: GetServerSideProps = async (ctx) => { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) let faqData = []; @@ -217,7 +212,8 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { - faqData + faqData, + userName } } } diff --git a/src/pages/administrative/general.tsx b/src/pages/administrative/general.tsx index b45eead..ec52d81 100644 --- a/src/pages/administrative/general.tsx +++ b/src/pages/administrative/general.tsx @@ -4,12 +4,15 @@ import MenuItem from '@mui/material/MenuItem'; import Select, { SelectChangeEvent } from '@mui/material/Select'; import TextField from '@mui/material/TextField'; import { Editor } from '@tinymce/tinymce-react' +import { GetServerSideProps } from 'next'; +import { parseCookies } from 'nookies'; import React, { useRef, useState } from 'react' import Header from '../../components/header/Header'; +import PageTitle from '../../components/pageTitle/PageTitle'; import { GeneralView } from '../../styles/layouts/general/GeneralView' -export default function index() { +export default function index({userName}: any) { const editorRef = useRef(null); const [text, setText] = useState(''); @@ -25,7 +28,8 @@ export default function index() { return ( -
    +
    +
    - Norte - Nordeste - Sul - Sudeste - + + Região + +
    - + + Dia + +
    - setPage('table')}>{'< voltar para tabela PLD'} + setPage('table')}>{'< Voltar para tabela PLD'}
    setDate(value.target.value)}/> - console.log()}/> + {/* console.log()}/> */}
    { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) + let tableData = []; @@ -315,6 +329,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { tableData, + userName } } } diff --git a/src/pages/resumoOperacao.tsx b/src/pages/resumoOperacao.tsx index 3a1a6cb..03a4e57 100644 --- a/src/pages/resumoOperacao.tsx +++ b/src/pages/resumoOperacao.tsx @@ -20,19 +20,12 @@ 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 = [ - [ "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" ] - ]; +export default function ResumoOperacao({tableData, userName}: any) { + const csvData = tableData; const [month, setMonth] = useState(''); const [unidade, setUnidade] = useState(''); - const [tableData, setTableData] = useState([]); + const [tableDataState, setTableDataState] = useState([]); const handleChangeMonth = (event: SelectChangeEvent) => { setMonth(event.target.value); @@ -42,26 +35,29 @@ export default function ResumoOperacao() { }; useEffect(() => { - 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) + if (unidade!=='' || month!==''){ + api.post('/operation', { + "filters": [ + {"type" : "=", "field": "mes", "value": `${month}/2022`}, + {"type" : "=", "field": "dados_te.cod_smart_unidade", "value": unidade} + ] + }).then(res => { + setTableDataState(res.data.data) + }).catch(res => { + console.log(res) + }) + } else { + setTableDataState(tableData) + } + }, [month, unidade]) - return( + return ( Smart Energia - Resumo de Operação -
    +

    Seletor Mês

    @@ -75,10 +71,10 @@ export default function ResumoOperacao() { label="Unidade" onChange={handleChangeUnidade} > - + Nenhum { - data.unidades.map((value) => { - return {value.name} + tableData.map((value) => { + return {value.cod_smart_unidade} }) } @@ -93,6 +89,7 @@ export default function ResumoOperacao() { label="Month" onChange={handleChangeMonth} > + Nenhum Janeiro Fevereiro Março @@ -121,7 +118,7 @@ export default function ResumoOperacao() { { - tableData.map((value, index) => { + tableDataState.map((value, index) => { return <> {value.cod_smart_unidade} @@ -150,16 +147,21 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) const { ['user-id']: id } = parseCookies(ctx) + const { ['user-name']: userName } = parseCookies(ctx) let tableData = []; - await apiClient.post(`/user/${id}`).then(res => { + await apiClient.post('/operation', { + "filters": [] + }).then(res => { + console.log(res.data.data) tableData = res.data.data - console.log(tableData) }).catch(res => { console.log(res) }) + console.log(tableData) + if (!token) { return { redirect: { @@ -172,6 +174,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { tableData, + userName } } } diff --git a/src/pages/telemetria.tsx b/src/pages/telemetria.tsx index c20530f..9a9adc8 100644 --- a/src/pages/telemetria.tsx +++ b/src/pages/telemetria.tsx @@ -15,11 +15,13 @@ import { start } from 'nprogress'; import LineChart from '../components/graph/LineChart'; import { FatorPotencia } from '../services/fatorPotencia'; import RenderIf from '../utils/renderIf'; +import { GetServerSideProps } from 'next'; +import { parseCookies } from 'nookies'; -export default function Telemetria() { +export default function Telemetria({userName}: any) { const [unity, setUnity] = React.useState(''); const [startDate, setStartDate] = React.useState(''); const [endDate, setEndDate] = React.useState(''); @@ -36,7 +38,7 @@ export default function Telemetria() { Smart Energia - Telemetria -
    +