From e10c88e9cb290819d481342aa62a86f56daf2d85 Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Fri, 8 Jul 2022 17:52:06 -0300 Subject: [PATCH 1/8] pld table fix --- .../graph/grossAnualChart/GrossAnualChart.tsx | 2 +- src/pages/estimatedCost/index.tsx | 1 + src/pages/pld/index.tsx | 10 +++++----- src/pages/resumoOperacao/index.tsx | 13 +++++++------ src/styles/layouts/pld/PldView.ts | 6 +++--- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/components/graph/grossAnualChart/GrossAnualChart.tsx b/src/components/graph/grossAnualChart/GrossAnualChart.tsx index 58f36a8..9225adc 100644 --- a/src/components/graph/grossAnualChart/GrossAnualChart.tsx +++ b/src/components/graph/grossAnualChart/GrossAnualChart.tsx @@ -74,7 +74,7 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar sum += data; }); const percentage = (dataProps[ctx.dataIndex].econ_percentual*100).toFixed(0)+"%"; - const result = `${spacement(parseInt(value).toLocaleString('pt-br'))}${percentage}\n${parseInt(value).toLocaleString('pt-br')}` + const result = `${spacement(parseInt(value).toLocaleString('pt-br'))} ${percentage}\n${parseInt(value).toLocaleString('pt-br')}` return value==null? null : result }, diff --git a/src/pages/estimatedCost/index.tsx b/src/pages/estimatedCost/index.tsx index 1b05e39..2f41e09 100644 --- a/src/pages/estimatedCost/index.tsx +++ b/src/pages/estimatedCost/index.tsx @@ -72,6 +72,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { "fields": ["cod_smart_unidade", "codigo_scde"], "distinct": true }).then(res => { + console.log(res.data.data) clients = res.data.data }).catch(res => { // console.log(res) diff --git a/src/pages/pld/index.tsx b/src/pages/pld/index.tsx index 640a836..ee0c33b 100644 --- a/src/pages/pld/index.tsx +++ b/src/pages/pld/index.tsx @@ -210,13 +210,13 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { }, []) return ( -
+
Smart Energia - PLD
- +
setPage(nv)} aria-label=""> @@ -236,7 +236,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { - + @@ -301,7 +301,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { }
Mês

(R$/MWh)

Mês Nordeste

(R$/MWh)

 Norte

(R$/MWh)

 Sudeste

(R$/MWh)
-
+ {/*
setPage(1)} className="btn btn-1"> @@ -314,7 +314,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) {

Valores Horários

-
+
*/} diff --git a/src/pages/resumoOperacao/index.tsx b/src/pages/resumoOperacao/index.tsx index 21a85ca..0a539cb 100644 --- a/src/pages/resumoOperacao/index.tsx +++ b/src/pages/resumoOperacao/index.tsx @@ -20,7 +20,7 @@ import data from '../../services/dados.json' import getAPIClient from '../../services/ssrApi'; import { Pagination, TableHeader, TableView } from '../../styles/layouts/ResumoOperacao/ResumoOperacaoView'; -export default function ResumoOperacao({tableData, clientsData, userName, clientMonth}: any) { +export default function ResumoOperacao({tableData, clients, userName, clientMonth}: any) { const csvData = tableData; const [month, setMonth] = useState(''); @@ -114,7 +114,7 @@ export default function ResumoOperacao({tableData, clientsData, userName, client > Todas { - clientsData.map((value) => { + clients.map((value) => { return {value.cod_smart_unidade} }) } @@ -195,7 +195,6 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { const { ['user-name']: userName } = parseCookies(ctx) let tableData = []; - let clientsData = []; let clientMonth = []; await apiClient.post('/operation/summary', { @@ -206,6 +205,8 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { // console.log(res) }) + let clients = []; + await apiClient.post('/units', { "filters": [ {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]}, @@ -215,9 +216,9 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { "distinct": true }).then(res => { console.log(res.data.data) - clientsData = res.data.data + clients = res.data.data }).catch(res => { - console.log(res) + // console.log(res) }) await apiClient.post('/operation', { @@ -244,7 +245,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { return { props: { tableData, - clientsData, + clients, clientMonth, userName } diff --git a/src/styles/layouts/pld/PldView.ts b/src/styles/layouts/pld/PldView.ts index 027f242..c9fa789 100644 --- a/src/styles/layouts/pld/PldView.ts +++ b/src/styles/layouts/pld/PldView.ts @@ -11,7 +11,7 @@ export const PldTableView = styled.main` } thead { - border-radius: 8px!important; + /* border-radius: 2px!important; */ } } @@ -120,12 +120,12 @@ export const PldTableView = styled.main` table, th:last-child{ border: transparent; - border-top-right-radius: 20px; + border-top-right-radius: 8px; } table, th:first-child { border: transparent; - border-top-left-radius: 20px; + border-top-left-radius: 8px; } h3{ From 205f344260fe85c6d53cddd0c2b1ba372b8f524e Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Sun, 10 Jul 2022 21:32:01 -0300 Subject: [PATCH 2/8] fixes --- package.json | 1 + src/components/graph/LineBarChart.tsx | 4 +- .../graph/cativoXLivreChart/index.tsx | 2 +- .../graph/costIndicatorChart/index.tsx | 4 +- .../graph/grossAnualChart/GrossAnualChart.tsx | 13 +- .../grossMensalChart/GrossMensalChart.tsx | 2 +- src/pages/chartTelemetry/index.tsx | 6 +- src/pages/pld/index.tsx | 97 +++---- src/pages/resumoOperacao/index.tsx | 58 ++--- src/pages/telemetria/index.tsx | 12 +- src/services/charts/telemetry/getDemand.ts | 4 +- .../charts/telemetry/getDiscretization.ts | 4 +- .../charts/telemetry/getPowerFactor.ts | 4 +- src/styles/globals.ts | 38 ++- .../ResumoOperacao/ResumoOperacaoView.ts | 41 +-- .../AccumulatedSavingsView.ts | 1 + .../economy/grossSavings/GrossSavings.ts | 10 - src/styles/layouts/pld/PldView.ts | 94 +++---- yarn.lock | 246 +++++++++++++++++- 19 files changed, 419 insertions(+), 222 deletions(-) diff --git a/package.json b/package.json index 48c1f94..a213691 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "react-icons": "^4.3.1", "react-input-mask": "^2.0.4", "react-pdf-thumbnail": "^0.1.0", + "sharp": "^0.30.7", "styled-components": "^5.3.5", "tinymce": "^6.0.3", "yup": "^0.32.11" diff --git a/src/components/graph/LineBarChart.tsx b/src/components/graph/LineBarChart.tsx index 17363e7..945da91 100644 --- a/src/components/graph/LineBarChart.tsx +++ b/src/components/graph/LineBarChart.tsx @@ -114,8 +114,10 @@ export function LineBarChart({ title, subtitle, data1, data2, data3, label, red, }, }; + console.log(label.length) + const data = data2? { - labels, + labels: label.length < 28? ['1', '2', '3', '4', '5', '6', '7', '8', '8', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'] : label, datasets: [ { type: 'line' as const, diff --git a/src/components/graph/cativoXLivreChart/index.tsx b/src/components/graph/cativoXLivreChart/index.tsx index c959a8e..8aa4508 100644 --- a/src/components/graph/cativoXLivreChart/index.tsx +++ b/src/components/graph/cativoXLivreChart/index.tsx @@ -93,7 +93,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data plugins: { datalabels: { display: true, - color: barLabel? 'black' : "rgba(255, 255, 255, 0)", + color: '#255488', // backgroundColor: '#255488', anchor: "end", offset: -20, diff --git a/src/components/graph/costIndicatorChart/index.tsx b/src/components/graph/costIndicatorChart/index.tsx index 58596c0..c1cb013 100644 --- a/src/components/graph/costIndicatorChart/index.tsx +++ b/src/components/graph/costIndicatorChart/index.tsx @@ -43,13 +43,11 @@ export default function CostIndicatorChart({ title, data1, data2, label, subtitl responsive: true, scales: { x: { - stacked: true, grid: { display: false } }, y: { - stacked: true, grid: { display: false } @@ -58,7 +56,7 @@ export default function CostIndicatorChart({ title, data1, data2, label, subtitl plugins: { datalabels: { display: true, - color: 'black', + color: '#255488', formatter: (value, ctx) => { let sum = 0; const dataArr = ctx.chart.data.datasets[0].data; diff --git a/src/components/graph/grossAnualChart/GrossAnualChart.tsx b/src/components/graph/grossAnualChart/GrossAnualChart.tsx index 9225adc..151be0e 100644 --- a/src/components/graph/grossAnualChart/GrossAnualChart.tsx +++ b/src/components/graph/grossAnualChart/GrossAnualChart.tsx @@ -6,6 +6,7 @@ import { Bar, Chart } from 'react-chartjs-2'; import { GrossAnualChartView } from './GrossAnualChartView'; import ChartTitle from '../ChartTitle'; +import { blue } from '@mui/material/colors'; ChartJS.register( CategoryScale, @@ -79,19 +80,19 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar return value==null? null : result }, display: true, - color: barLabel? 'black' : "rgba(255, 255, 255, 0)", + color: '#255488', anchor: "end", offset: -60, align: "start", font: { - size: !miniature? 22 : 10 + size: !miniature? 22 : 10, } }, legend: { position: 'bottom' as const, labels: { font: { - size: 16 + size: 16, } } }, @@ -115,6 +116,8 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar { type: 'bar', label: dataset, + stacked: true, + data: dataProps.map((value, index) => { if (!value.dad_estimado) return parseFloat(value.economia_acumulada).toFixed(2) @@ -125,14 +128,12 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar }, { type: 'bar', + stacked: true, label: 'Estimado', data: dataProps.map((value, index) => { if (value.dad_estimado) return parseFloat(value.economia_acumulada).toFixed(2) }), - datalabels: { - display: false - }, backgroundColor: (value, ctx) => { return draw('diagonal-right-left', '#C2d5fb'); }, diff --git a/src/components/graph/grossMensalChart/GrossMensalChart.tsx b/src/components/graph/grossMensalChart/GrossMensalChart.tsx index 47c5264..ecbdaeb 100644 --- a/src/components/graph/grossMensalChart/GrossMensalChart.tsx +++ b/src/components/graph/grossMensalChart/GrossMensalChart.tsx @@ -73,7 +73,7 @@ export default function GrossMensalChart({ title, data1, data2, label, subtitle, plugins: { datalabels: { display: true, - color: 'black', + color: '#255488', formatter: (value, ctx) => { let sum = 0; const dataArr = ctx.chart.data.datasets[0].data; diff --git a/src/pages/chartTelemetry/index.tsx b/src/pages/chartTelemetry/index.tsx index 47cf5c7..0ef6827 100644 --- a/src/pages/chartTelemetry/index.tsx +++ b/src/pages/chartTelemetry/index.tsx @@ -35,9 +35,9 @@ export default function chartTelemetry({userName}) { function getChartsData() { console.log(token) - getPowerFactorData("PRAXCUENTR101P", "2022-01-01", "2022-01-31", "med_5min") - .then(result => setFatorPotenciaData(result)) - .catch(exception => console.log(exception)) + // getPowerFactorData("PRAXCUENTR101P", "2022-01-01", "2022-01-31", "med_5min") + // .then(result => setFatorPotenciaData(result)) + // .catch(exception => console.log('exeption', exception)) getDiscretization("PRAXCUENTR101P", "2022-01-01", "2022-01-31", "med_5min") .then(result => setDiscretizedConsumptionDataReativa(result)) diff --git a/src/pages/pld/index.tsx b/src/pages/pld/index.tsx index ee0c33b..938faf7 100644 --- a/src/pages/pld/index.tsx +++ b/src/pages/pld/index.tsx @@ -49,7 +49,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { // rendering page const [page, setPage] = useState(0) - const [month, setMonth] = useState((dateFormated.getUTCMonth()+1).toString()) + const [month, setMonth] = useState(new Date().toLocaleDateString().slice(3, 10)) const [dataByDay, setDataByDay] = useState([]) @@ -69,6 +69,8 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { }; const handleChangeDay = (event: SelectChangeEvent) => { setMonth(event.target.value); + console.log(new Date().toLocaleDateString().slice(3, 10)) + console.log('select', event.target.value) }; const handleChangeDate = (newValue: Date | null) => { @@ -78,11 +80,12 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { }; function getDataByDay() { + console.log(month) api.post('/pld/daily', { "limit": 20, "offset": 0, "filters": [ - {"type" : "=", "field" : "mes_ref", "value": `${month}/2022`, "row": true}, + {"type" : "=", "field" : "mes_ref", "value": month, "row": true}, {"type" : "=", "field" : "pld.submercado", "value": select} ], "order": [{ "field": "day_calc", "direction": "asc" }] @@ -98,7 +101,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { "limit": 20, "offset": 0, "filters": [ - {"type" : "=", "field" : "dia_num", "value": date, "row": true}, + {"type" : "=", "field" : "dia_num", "value": date.toLocaleDateString().split('/').reverse().join('-'), "row": true}, {"type" : "=", "field" : "submercado", "value": "SUL"} ], "order": [{ "field": "hour", "direction": "asc" }] @@ -112,7 +115,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { "limit": 20, "offset": 0, "filters": [ - {"type" : "=", "field" : "dia_num", "value": date, "row": true}, + {"type" : "=", "field" : "dia_num", "value": date.toLocaleDateString().split('/').reverse().join('-'), "row": true}, {"type" : "=", "field" : "submercado", "value": "SUDESTE"} ], "order": [{ "field": "hour", "direction": "asc" }] @@ -126,7 +129,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { "limit": 20, "offset": 0, "filters": [ - {"type" : "=", "field" : "dia_num", "value": date, "row": true}, + {"type" : "=", "field" : "dia_num", "value": date.toLocaleDateString().split('/').reverse().join('-'), "row": true}, {"type" : "=", "field" : "submercado", "value": "NORTE"} ], "order": [{ "field": "hour", "direction": "asc" }] @@ -140,7 +143,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { "limit": 20, "offset": 0, "filters": [ - {"type" : "=", "field" : "dia_num", "value": date, "row": true}, + {"type" : "=", "field" : "dia_num", "value": date.toLocaleDateString().split('/').reverse().join('-'), "row": true}, {"type" : "=", "field" : "submercado", "value": "NORDESTE"} ], "order": [{ "field": "hour", "direction": "asc" }] @@ -192,13 +195,9 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { data.push(row.join(";")); } - downloadCSVFile(data.join("\n"), filename); + downloadCSVFile(data.join("\n").replace('(R$/MWh)', ''), filename); } - // const handleTabChange = (event: React.SyntheticEvent, newValue: number) => { - // setPages(newValue); - // }; - useEffect(() => { getDataByHour() getDataByDay() @@ -225,12 +224,15 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) {
- { - const html = document.querySelector("table").outerHTML; - htmlToCSV(html, "tabela_PLD.csv"); - }} title='Download'/> + + { + const html = document.querySelector("table").outerHTML; + htmlToCSV(html, "tabela_PLD.csv"); + }} title='Download'/> +
+ @@ -249,51 +251,51 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { return <> - - - - + + + + }) } - - - - - + + + + + { tableData.result.map((data, index) => { if (index === 0) { return <> - + - - - - + + + + } else if (index===1) { return <> - - - - + + + + } else if (index===2) { return <> - - - - - + + + + + } @@ -358,12 +360,16 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { Nenhum { clientMonth.sort((a, b) => { - if (parseFloat(a.mes_ref.slice(3,4)) > parseFloat(b.mes_ref.slice(3,4))) return 1 - if (parseFloat(a.mes_ref.slice(3,4)) < parseFloat(b.mes_ref.slice(3,4))) return -1 + if (parseFloat(a.mes_ref.slice(0, 2)) < parseFloat(b.mes_ref.slice(0, 2))) + if (parseFloat(a.mes_ref.slice(3, 7)) > parseFloat(b.mes_ref.slice(3, 7))) return -1 + else return 1 + if (parseFloat(a.mes_ref.slice(0, 2)) > parseFloat(b.mes_ref.slice(0, 2))) + if (parseFloat(a.mes_ref.slice(3, 7)) < parseFloat(b.mes_ref.slice(3, 7))) return 1 + else return -1 return 0 }).map((data, index) => { - return {data.mes_ref} + return {data.mes_ref} }) } @@ -372,7 +378,9 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { { + return value.day_formatted + })} title='' subtitle='' /> @@ -381,8 +389,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) {
-

Selecione a data:

- {/* setDate(value.target.value)}/> */} + {/*

Selecione a data:

*/}
diff --git a/src/pages/resumoOperacao/index.tsx b/src/pages/resumoOperacao/index.tsx index 0a539cb..2c408c9 100644 --- a/src/pages/resumoOperacao/index.tsx +++ b/src/pages/resumoOperacao/index.tsx @@ -29,6 +29,8 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont const monthLabels = ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'ago', 'set', 'out', 'nov', 'dez'] + const { ['user-id']: id } = parseCookies() + const handleChangeMonth = (event: SelectChangeEvent) => { setMonth(event.target.value); }; @@ -60,7 +62,7 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont } useEffect(() => { - console.log(month) + console.log(unidade) if (unidade!=='' || month!==''){ api.post('/operation/summary', month && !unidade? { "filters": [ @@ -80,9 +82,7 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont } : {} ).then(res => { setTableDataState(res.data.data) - }).catch(res => { - // console.log(res) - }) + }).catch(res => console.log(res)) } else { setTableDataState(tableData) } @@ -98,7 +98,6 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont
-

Filtrar por Unidade e/ou Mês

Selecionar unidade:

@@ -115,7 +114,7 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont Todas { clients.map((value) => { - return {value.cod_smart_unidade} + return {value.unidade} }) } @@ -137,7 +136,7 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont Todos { clientMonth.map((value) => { - return {value.mes} + return {value.mes} }) } @@ -169,13 +168,13 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont tableDataState.map((value, index) => { if (value.mes.slice(4,7) != '2020') return
- - - - - - - + + + + + + + }) } @@ -201,26 +200,10 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { "filters": [] }).then(res => { tableData = res.data.data - }).catch(res => { - // console.log(res) }) let clients = []; - await apiClient.post('/units', { - "filters": [ - {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]}, - {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": id} - ], - "fields": ["cod_smart_unidade", "codigo_scde"], - "distinct": true - }).then(res => { - console.log(res.data.data) - clients = res.data.data - }).catch(res => { - // console.log(res) - }) - await apiClient.post('/operation', { "filters": [ {"type" : ">=", "field":"dados_te.mes", "value":1, "interval": "year"} @@ -229,6 +212,21 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { "distinct": true }).then(res => { clientMonth = res.data.data + }) + + await apiClient.post('/units', { + "filters": [ + {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": 180201211}, + {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]} + ], + "fields": [ + "unidade", + "cod_smart_unidade", + "codigo_scde"], + "distinct": true + }).then(res => { + console.log(res.data) + clients = res.data.data }).catch(res => { // console.log(res) }) diff --git a/src/pages/telemetria/index.tsx b/src/pages/telemetria/index.tsx index 5ffc7c8..c291849 100644 --- a/src/pages/telemetria/index.tsx +++ b/src/pages/telemetria/index.tsx @@ -267,7 +267,7 @@ export default function Telemetria({userName, clients}: any) { {/* RSZFNAENTR101P COMENTARIO DE OPÇAO COM DADOS TESTES */} { clients.map((value) => { - return {value.cod_smart_unidade} + return {value.unidade} }) } @@ -420,12 +420,16 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.post('/units', { "filters": [ - {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]}, - {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": id} + {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": 180201211}, + {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]} ], - "fields": ["cod_smart_unidade", "codigo_scde"], + "fields": [ + "unidade", + "cod_smart_unidade", + "codigo_scde"], "distinct": true }).then(res => { + console.log(res.data) clients = res.data.data }).catch(res => { // console.log(res) diff --git a/src/services/charts/telemetry/getDemand.ts b/src/services/charts/telemetry/getDemand.ts index 8a191e5..101e881 100644 --- a/src/services/charts/telemetry/getDemand.ts +++ b/src/services/charts/telemetry/getDemand.ts @@ -8,14 +8,14 @@ export async function getDemand( discretization: string ) { const { '@smartAuth-token': token } = parseCookies() - const { data } = await axios.post('https://smart-energia-api.herokuapp.com/api/telemetry/powerFactor', { + const { data } = await axios.post('https://smart-energia-api.herokuapp.com/api/telemetry/demand', { "filters": [ {"type" : "=", "field": `${discretization}.ponto`, "value": unity}, {"type" : "between", "field": ["dia_num"], "value": [startDate, endDate]} ] }, { headers: { - 'Authorization': `Bearer ${token}` + 'Authorization': `Bearer 1260|RHfh3uMsEfHwCTqxKOhy1CEIr34UIln9OFdf5Fc8` } }) diff --git a/src/services/charts/telemetry/getDiscretization.ts b/src/services/charts/telemetry/getDiscretization.ts index fa6d51a..bf515bc 100644 --- a/src/services/charts/telemetry/getDiscretization.ts +++ b/src/services/charts/telemetry/getDiscretization.ts @@ -8,14 +8,14 @@ export async function getDiscretization( discretization: string ) { const { '@smartAuth-token': token } = parseCookies() - const { data } = await axios.post('https://smart-energia-api.herokuapp.com/api/telemetry/powerFactor', { + const { data } = await axios.post('https://smart-energia-api.herokuapp.com/api/telemetry/discretization', { "type": discretization, "filters": [ {"type" : "=", "field": "med_5min.ponto", "value": unity} ] }, { headers: { - 'Authorization': `Bearer ${token}` + 'Authorization': `Bearer 1260|RHfh3uMsEfHwCTqxKOhy1CEIr34UIln9OFdf5Fc8` } } ) diff --git a/src/services/charts/telemetry/getPowerFactor.ts b/src/services/charts/telemetry/getPowerFactor.ts index e835cfc..c2e141c 100644 --- a/src/services/charts/telemetry/getPowerFactor.ts +++ b/src/services/charts/telemetry/getPowerFactor.ts @@ -9,14 +9,14 @@ export async function getPowerFactorData( ) { const { '@smartAuth-token': token } = parseCookies() console.log(token.replace(/"/g, '')) - const { data } = await axios.post('https://smart-energia-api.herokuapp.com/api/telemetry/powerFactor', { + const { data } = await axios.post('http://smart-energia-api.herokuapp.com/api/telemetry/powerFactor', { "filters": [ {"type" : "=", "field": "med_5min.ponto", "value": "PRAXCUENTR101P"}, {"type" : "between", "field": "dia_num", "value": ["2022-01-01", "2022-01-31"]} ] }, { headers: { - 'Authorization': `Bearer ${token}` + 'Authorization': `Bearer 1260|RHfh3uMsEfHwCTqxKOhy1CEIr34UIln9OFdf5Fc8` } }) return data.data diff --git a/src/styles/globals.ts b/src/styles/globals.ts index 45436b1..31e1ea4 100644 --- a/src/styles/globals.ts +++ b/src/styles/globals.ts @@ -52,16 +52,15 @@ export const GlobalStyle = createGlobalStyle` .MuiInputBase-input, .MuiInputBase-inputAdornedEnd, .css-nxo287-MuiInputBase-input-MuiOutlinedInput-input{ - /* background-color: red!important; */ - /* border: none!important; - outline: 0 */ - height: 45px; + /* background-color: red; */ + /* position: relative; */ + height:68px; } .MuiFormControl-root, .MuiTextField-root, .css-1u3bzj6-MuiFormControl-root-MuiTextField-root { - margin-top: 8px; + /* margin-top: 8px; */ } .MuiOutlinedInput-input, @@ -84,10 +83,37 @@ export const GlobalStyle = createGlobalStyle` .MuiIconButton-edgeEnd, .MuiIconButton-sizeMedium, .css-1yq5fb3-MuiButtonBase-root-MuiIconButton-root { - margin-bottom: 5px; width: 30px; height: 30px; } } + .MuiInputLabel-root + .MuiInputLabel-formControl, .MuiInputLabel-animated, + .MuiInputLabel-shrink, + .MuiInputLabel-outlined, + .MuiFormLabel-root, + .MuiFormLabel-colorPrimary, + .MuiFormLabel-filled, + .css-1sumxir-MuiFormLabel-root-MuiInputLabel-root { + color: rgba(0, 0, 0, 0.6); + font-family: "Roboto","Helvetica","Arial",sans-serif; + font-weight: 400; + font-size: 1rem; + line-height: 1.4375em; + letter-spacing: 0.00938em; + padding: 0; + position: relative; + display: block; + transform-origin: top left; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: calc(133% - 24px); + position: absolute; + left: 0; + user-select: none; + z-index: 1; + pointer-events: auto; + } `; diff --git a/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts b/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts index cc1453d..c95ba0b 100644 --- a/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts +++ b/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts @@ -60,13 +60,7 @@ export const TableView = styled.div` background-color: #254F7F; } - .tg .tg-uulg{ - background-color:#efefef; - color:#abafb3; - font-size:14px; - text-align:center; - vertical-align:top - } + .tg .tg-gceh{ background-color:#efefef; color:#6a707e; @@ -74,31 +68,6 @@ export const TableView = styled.div` text-align:center; vertical-align:top; } - .tg .tg-0tzy{ - color:#abafb3; - font-size:14px; - text-align:center; - vertical-align:top - } - .tg .tg-hq65{color:#6a707e; - font-size:14px; - text-align:center; - vertical-align:top - } - - .tg .tg-baqh{ - text-align:center; - vertical-align:top - } - .tg .tg-0lax{ - text-align:left; - vertical-align:top - } - .tg .tg-womg{ - background-color:#dddfe1; - text-align:center; - vertical-align:top - } h3{ font-weight: 600; @@ -114,16 +83,12 @@ export const TableView = styled.div` table, th:last-child{ border: transparent; - border-top-right-radius: 20px; + border-top-right-radius: 8px; } table, th:first-child { border: transparent; - border-top-left-radius: 20px; - } - - .radius { - background-color: red!important; + border-top-left-radius: 8px; } `; diff --git a/src/styles/layouts/economy/accumulatedSavings/AccumulatedSavingsView.ts b/src/styles/layouts/economy/accumulatedSavings/AccumulatedSavingsView.ts index 8ea5176..4cba73d 100644 --- a/src/styles/layouts/economy/accumulatedSavings/AccumulatedSavingsView.ts +++ b/src/styles/layouts/economy/accumulatedSavings/AccumulatedSavingsView.ts @@ -12,6 +12,7 @@ export const AccumulatedSavingsView = styled.main` align-items: center; canvas { + width: 80%; } } ` diff --git a/src/styles/layouts/economy/grossSavings/GrossSavings.ts b/src/styles/layouts/economy/grossSavings/GrossSavings.ts index 15d10ac..9c952a4 100644 --- a/src/styles/layouts/economy/grossSavings/GrossSavings.ts +++ b/src/styles/layouts/economy/grossSavings/GrossSavings.ts @@ -6,16 +6,6 @@ export const GrossSavingsView = styled.main` width: 100%; - span { - color: #969BA0; - - font-family: 'Poppins'; - font-style: normal; - font-weight: 500; - font-size: 16px; - line-height: 24px; - } - section { display: flex; justify-content: center; diff --git a/src/styles/layouts/pld/PldView.ts b/src/styles/layouts/pld/PldView.ts index c9fa789..57932b6 100644 --- a/src/styles/layouts/pld/PldView.ts +++ b/src/styles/layouts/pld/PldView.ts @@ -1,23 +1,26 @@ import styled from "styled-components" -export const PldTableView = styled.main` +export const PldTableView = styled.div` width: 100%; border-radius: 8px!important; + border-color:#DDDFE1; + border-style:solid; + border-width: 1px; + + background-color: #EFEFEF; + + margin-top: 38px; + table { p { font-size: 12px; } - - thead { - /* border-radius: 2px!important; */ - } } .actual { font-weight: bold!important; - background-color: red!important; } .tg{ @@ -25,7 +28,6 @@ export const PldTableView = styled.main` border-spacing:0; font-family:Poppins; width: 100%; - } .tg td{ @@ -39,6 +41,7 @@ export const PldTableView = styled.main` word-break:normal; } + .tg th{ border-color:#DDDFE1; border-style:solid; @@ -53,7 +56,7 @@ export const PldTableView = styled.main` .tg .tg-8oo6{ font-size:20px; text-align:center; - vertical-align:top; + vertical-align:center; padding: 10px 18px; text-align: center; @@ -62,60 +65,25 @@ export const PldTableView = styled.main` background-color: #254F7F; } .tg .tg-uulg{ - background-color:#efefef; font-size:14px; text-align:center; - vertical-align:top + vertical-align:top; + + :first-child { + background-color: red; + } + :last-child { + border-right-color: transparent; + } } + .tg .tg-gceh{ - background-color:#efefef; font-size:14px; text-align:center; - vertical-align:top - } - .tg .tg-0tzy{ - font-size:14px; - text-align:center; - vertical-align:top - } - .tg .tg-hq65{ - font-size:14px; - text-align:center; - vertical-align:top - } - - .tg .tg-baqh{ - text-align:center; - vertical-align:top - } - .tg .tg-0lax{ - text-align:left; - vertical-align:top - } - .tg .tg-womg{ - background-color:#dddfe1; - text-align:center; - vertical-align:top - } - - .green { - background-color: #0F9D58!important; - color: black!important; - } - - .dullGreen { - background-color: #AED094!important; - color: black!important; - } - - .red { - background-color: #DB4437!important; - color: black!important; - } - - .dullRed { - background-color: #FFAA95!important; - color: black!important; + vertical-align:top; + :first-child { + border-left-color: transparent; + } } table, th:last-child{ @@ -257,27 +225,33 @@ export const PldGraphView = styled.main` flex-direction: row; + padding-bottom: 13px; + p { margin: 0; } } .toolsbar2 { display: flex; - justify-content: center; + justify-content: flex-start; align-items: flex-start!important; flex-direction: column; + margin-bottom: 9px; + + /* transform: translateY(-8px); */ + p { margin: 0; } } input { - width: 20rem; + width: 16.6rem; height: 3.5rem; - padding: 14px; + /* padding: 14px; */ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-weight: 400; @@ -307,6 +281,8 @@ export const PldGraphView = styled.main` width: 100%; } + + footer { label { cursor: pointer; diff --git a/yarn.lock b/yarn.lock index 0bca23b..d6e7e71 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1880,6 +1880,11 @@ balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + bin-links@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.1.tgz#cc70ffb481988b22c527d3e6e454787876987a49" @@ -1895,6 +1900,15 @@ binary-extensions@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" +bl@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" @@ -1924,6 +1938,14 @@ browserslist@^4.20.2, browserslist@^4.20.3: node-releases "^2.0.3" picocolors "^1.0.0" +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + builtins@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" @@ -1996,6 +2018,11 @@ chartjs-plugin-datalabels@^2.0.0: resolved "https://registry.yarnpkg.com/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.0.0.tgz#caacefb26803d968785071eab012dde8746c5939" integrity sha512-WBsWihphzM0Y8fmQVm89+iy99mmgejmj5/jcsYqwxSioLRL/zqJ4Scv/eXq5ZqvG3TpojlGzZLeaOaSvDm7fwA== +chownr@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" + integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== + chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" @@ -2080,14 +2107,30 @@ color-name@1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" -color-name@~1.1.4: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" +color-string@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" + integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" +color@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a" + integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A== + dependencies: + color-convert "^2.0.1" + color-string "^1.9.0" + colorette@^2.0.16: version "2.0.16" resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz" @@ -2218,6 +2261,18 @@ debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-is@^0.1.3: version "0.1.4" resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz" @@ -2247,6 +2302,11 @@ depd@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" +detect-libc@^2.0.0, detect-libc@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" + integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== + dezalgo@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81" @@ -2310,6 +2370,13 @@ encoding@^0.1.13: dependencies: iconv-lite "^0.6.2" +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + env-paths@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" @@ -2597,6 +2664,11 @@ execa@^5.1.1: signal-exit "^3.0.3" strip-final-newline "^2.0.0" +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + faker@5.5.3: version "5.5.3" resolved "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz" @@ -2679,6 +2751,11 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + fs-extra@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" @@ -2751,6 +2828,11 @@ get-user-locale@^1.2.0: dependencies: lodash.once "^4.1.1" +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw== + glob-parent@^5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" @@ -2924,6 +3006,11 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + ignore-walk@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776" @@ -2960,7 +3047,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.3: +inherits@2, inherits@^2.0.3, inherits@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" @@ -2968,6 +3055,11 @@ ini@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.0.tgz#2f6de95006923aa75feed8894f5686165adc08f1" +ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + init-package-json@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69" @@ -3011,6 +3103,11 @@ is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz" +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + is-bigint@^1.0.1: version "1.0.4" resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz" @@ -3522,6 +3619,11 @@ mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" @@ -3534,7 +3636,7 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.6: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6: version "1.2.6" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz" @@ -3592,6 +3694,11 @@ minizlib@^2.1.1, minizlib@^2.1.2: minipass "^3.0.0" yallist "^4.0.0" +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: + version "0.5.3" + resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" + integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== + mkdirp-infer-owner@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316" @@ -3629,6 +3736,11 @@ nanoid@^3.1.30: version "3.3.4" resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz" +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" @@ -3659,6 +3771,18 @@ next@12.1.6: "@next/swc-win32-ia32-msvc" "12.1.6" "@next/swc-win32-x64-msvc" "12.1.6" +node-abi@^3.3.0: + version "3.22.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.22.0.tgz#00b8250e86a0816576258227edbce7bbe0039362" + integrity sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w== + dependencies: + semver "^7.3.5" + +node-addon-api@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501" + integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA== + node-gyp@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.0.0.tgz#e1da2067427f3eb5bb56820cb62bc6b1e4bd2089" @@ -3929,7 +4053,7 @@ object.values@^1.1.5: define-properties "^1.1.3" es-abstract "^1.19.1" -once@^1.3.0: +once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" dependencies: @@ -4088,6 +4212,24 @@ postcss@8.4.5: picocolors "^1.0.0" source-map-js "^1.0.1" +prebuild-install@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45" + integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw== + dependencies: + detect-libc "^2.0.0" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^3.3.0" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^4.0.0" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" @@ -4138,6 +4280,14 @@ property-expr@^2.0.4: resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4" integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA== +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + punycode@^2.1.0: version "2.1.1" resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz" @@ -4150,6 +4300,16 @@ queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + react-calendar@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/react-calendar/-/react-calendar-3.7.0.tgz#951d56e91afb33b1c1e019cb790349fbffcc6894" @@ -4247,7 +4407,7 @@ read@1, read@^1.0.7, read@~1.0.7: dependencies: mute-stream "~0.0.4" -readable-stream@^3.6.0: +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" dependencies: @@ -4388,14 +4548,14 @@ rxjs@^7.5.5: dependencies: tslib "^2.1.0" +safe-buffer@^5.0.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -4432,6 +4592,20 @@ shallowequal@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz" +sharp@^0.30.7: + version "0.30.7" + resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.7.tgz#7862bda98804fdd1f0d5659c85e3324b90d94c7c" + integrity sha512-G+MY2YW33jgflKPTXXptVO28HvNOo9G3j0MybYAHeEmby+QuD2U98dT6ueht9cv/XDqZspSpIhoSW+BAKJ7Hig== + dependencies: + color "^4.2.3" + detect-libc "^2.0.1" + node-addon-api "^5.0.0" + prebuild-install "^7.1.1" + semver "^7.3.7" + simple-get "^4.0.1" + tar-fs "^2.1.1" + tunnel-agent "^0.6.0" + shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" @@ -4454,6 +4628,27 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^4.0.0, simple-get@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543" + integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA== + dependencies: + decompress-response "^6.0.0" + once "^1.3.1" + simple-concat "^1.0.0" + +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg== + dependencies: + is-arrayish "^0.3.1" + slash@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" @@ -4615,6 +4810,11 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== + styled-components@^5.3.5: version "5.3.5" resolved "https://registry.npmjs.org/styled-components/-/styled-components-5.3.5.tgz" @@ -4658,6 +4858,27 @@ supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" +tar-fs@^2.0.0, tar-fs@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + +tar-stream@^2.1.4: + version "2.2.0" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + tar@^6.1.0, tar@^6.1.11, tar@^6.1.2: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" @@ -4731,6 +4952,13 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== + dependencies: + safe-buffer "^5.0.1" + type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz" From 51f442d3af26bfcef5e3cb5d92af05ac4aa0e789 Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Mon, 11 Jul 2022 15:02:57 -0300 Subject: [PATCH 3/8] and more fixes --- package.json | 1 + .../buttons/gradientButton/GradientButton.tsx | 3 - .../gradientButton/GradientButtonView.ts | 44 +-- .../graph/cativoXLivreChart/index.tsx | 12 +- .../graph/grossAnualChart/GrossAnualChart.tsx | 4 +- .../grossMensalChart/GrossMensalChart.tsx | 2 +- .../grossMensalChart/GrossMensalChartView.ts | 7 +- src/components/sidebar/Sidebar.tsx | 45 +-- src/components/sidebar/SidebarView.ts | 8 +- src/contexts/menu/MenuContext.tsx | 22 ++ src/pages/_app.tsx | 41 +-- src/pages/aboutUs/index.tsx | 2 +- src/pages/chartTelemetry/index.tsx | 41 +-- src/pages/costIndicator/index.tsx | 40 ++- src/pages/dashboard/index.tsx | 13 +- src/pages/economy/index.tsx | 270 ++++++++++++++++++ src/pages/estimatedCost/index.tsx | 36 ++- src/pages/pld/index.tsx | 62 ++-- src/pages/resumoOperacao/index.tsx | 80 +++--- src/pages/telemetria/index.tsx | 69 +++-- .../charts/telemetry/getPowerFactor.ts | 4 +- .../ResumoOperacao/ResumoOperacaoView.ts | 47 ++- .../AccumulatedSavingsView.ts | 4 - src/styles/layouts/pld/PldView.ts | 12 + tsconfig.json | 2 +- yarn.lock | 37 ++- 26 files changed, 661 insertions(+), 247 deletions(-) create mode 100644 src/contexts/menu/MenuContext.tsx create mode 100644 src/pages/economy/index.tsx diff --git a/package.json b/package.json index a213691..8531239 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "axios": "^0.27.2", "chart.js": "^3.7.1", "chartjs-plugin-datalabels": "^2.0.0", + "chartjs-plugin-style": "^0.5.0", "date-fns": "^2.28.0", "eslint-plugin-react": "^7.29.4", "eslit": "^6.0.0", diff --git a/src/components/buttons/gradientButton/GradientButton.tsx b/src/components/buttons/gradientButton/GradientButton.tsx index 27ed1aa..6f61eda 100644 --- a/src/components/buttons/gradientButton/GradientButton.tsx +++ b/src/components/buttons/gradientButton/GradientButton.tsx @@ -21,9 +21,6 @@ export default function GradientButton({ title, description, orange, purple, gre return ( handleClick()}> - - -

{description}

 diff --git a/src/components/buttons/gradientButton/GradientButtonView.ts b/src/components/buttons/gradientButton/GradientButtonView.ts index 53039a5..3e0c97c 100644 --- a/src/components/buttons/gradientButton/GradientButtonView.ts +++ b/src/components/buttons/gradientButton/GradientButtonView.ts @@ -37,33 +37,9 @@ export const GradientButtonView = styled.button` transform: scale(1.1); } - svg { - width: 404px; - left: 0; - position: absolute; - top: 0; - height: 110px; - } - - rect { - fill: none; - stroke: #fff; - stroke-width: 2; - stroke-dasharray: 422, 0; - transition: all 0.35s linear; - } - :hover { background: rgba($red, 0); letter-spacing: 1px; - - - rect { - stroke-width: 5; - stroke-dasharray: 15, 310; - stroke-dashoffset: 48; - transition: all 1.35s cubic-bezier(0.19, 1, 0.22, 1); - } } * { @@ -72,21 +48,11 @@ export const GradientButtonView = styled.button` } p { - :first-child { - font-family: 'Poppins'; - font-style: normal; - font-weight: 700; - font-size: calc(20px); + font-family: 'Poppins'; + font-style: normal; + font-weight: 700; + font-size: 11px; - text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); - } - :last-child { - font-family: 'Poppins'; - font-style: normal; - font-weight: 700; - font-size: 11px; - - text-transform: uppercase; - } + text-transform: uppercase; } ` diff --git a/src/components/graph/cativoXLivreChart/index.tsx b/src/components/graph/cativoXLivreChart/index.tsx index 8aa4508..1ba2fd2 100644 --- a/src/components/graph/cativoXLivreChart/index.tsx +++ b/src/components/graph/cativoXLivreChart/index.tsx @@ -107,7 +107,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data dataArr.map(data => { sum += data; }); - const result = `${(parseFloat(value)).toLocaleString('pt-br')}` + const result = `${(parseInt(value)).toLocaleString('pt-br')}` return value==null? null : result } @@ -136,7 +136,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data }, borderWidth: 2, fill: false, - data: chartData.map(value => value.economia_mensal), + data: chartData.map(value => parseInt(value.economia_mensal)), }, { type: 'bar' as const, @@ -146,7 +146,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data }, data: chartData.map(value => { if (!value.dad_estimado) - return value.custo_cativo + return parseInt(value.custo_cativo) }), }, { @@ -158,7 +158,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data }, data: chartData.map(value => { if (!value.dad_estimado) - return value.custo_livre + return parseInt(value.custo_livre) }), }, { @@ -167,7 +167,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data backgroundColor: pattern.draw('diagonal', '#C2D5FB'), data: chartData.map(value => { if (value.dad_estimado) - return value.custo_cativo + return parseInt(value.custo_cativo) }), }, { @@ -176,7 +176,7 @@ export function CativoXLivreChart({ title, subtitle, chartData, label, red, data backgroundColor: pattern.draw('diagonal', '#255488'), data: chartData.map(value => { if (value.dad_estimado) - return value.custo_livre + return parseInt(value.custo_livre) }), } ], diff --git a/src/components/graph/grossAnualChart/GrossAnualChart.tsx b/src/components/graph/grossAnualChart/GrossAnualChart.tsx index 151be0e..ee7f3b1 100644 --- a/src/components/graph/grossAnualChart/GrossAnualChart.tsx +++ b/src/components/graph/grossAnualChart/GrossAnualChart.tsx @@ -92,7 +92,7 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar position: 'bottom' as const, labels: { font: { - size: 16, + size: 12, } } }, @@ -144,7 +144,7 @@ export function GrossAnulChart({ title, subtitle, dataProps, label, dataset, bar return ( - + ) } diff --git a/src/components/graph/grossMensalChart/GrossMensalChart.tsx b/src/components/graph/grossMensalChart/GrossMensalChart.tsx index ecbdaeb..3a20a45 100644 --- a/src/components/graph/grossMensalChart/GrossMensalChart.tsx +++ b/src/components/graph/grossMensalChart/GrossMensalChart.tsx @@ -132,7 +132,7 @@ export default function GrossMensalChart({ title, data1, data2, label, subtitle, + data={data} type={'bar'} height={'156'}/> ) } diff --git a/src/components/graph/grossMensalChart/GrossMensalChartView.ts b/src/components/graph/grossMensalChart/GrossMensalChartView.ts index 28abf0c..2302e81 100644 --- a/src/components/graph/grossMensalChart/GrossMensalChartView.ts +++ b/src/components/graph/grossMensalChart/GrossMensalChartView.ts @@ -1,14 +1,11 @@ import styled from "styled-components" export const GrossMensalChartView = styled.div` - width: 100%; + width: 90%; - div{ - /* margin-top: 10px; */ - } + transform: translateY(-25px); @media (max-width: 900px) { min-width: 20rem } - ` diff --git a/src/components/sidebar/Sidebar.tsx b/src/components/sidebar/Sidebar.tsx index 12e3a27..8c8c167 100644 --- a/src/components/sidebar/Sidebar.tsx +++ b/src/components/sidebar/Sidebar.tsx @@ -2,13 +2,17 @@ import Box from '@mui/material/Box'; import Button from '@mui/material/Button'; import Modal from '@mui/material/Modal'; import Typography from '@mui/material/Typography'; -import { GetServerSideProps } from 'next'; + import Image from 'next/image' import Link from 'next/link' + import { useRouter } from 'next/router' import { parseCookies } from 'nookies'; import React, { useContext, useEffect, useState } from 'react' + import { AuthContext } from '../../contexts/AuthContext'; +import { MenuContext } from '../../contexts/menu/MenuContext'; + import { api } from '../../services/api'; import RenderIf from '../../utils/renderIf'; @@ -30,6 +34,8 @@ const style = { }; export default function Sidebar() { + const {pldMenu, setPldMenu, economyMenu, setEconomyMenu} = useContext(MenuContext) + const [open, setOpen] = useState(false); const handleOpen = () => setOpen(true); const handleClose = () => setOpen(false); @@ -37,6 +43,8 @@ export default function Sidebar() { const { signOut } = useContext(AuthContext) const [ economiaDrawer, setEconomiaDrawer ] = useState(false) + const [ pldDrawer, setPldDrawer ] = useState(false) + const [ notificationsCount, setNotificationsCount ] = useState(0) const [ viewModal, setViewModal ] = useState(false) @@ -97,7 +105,7 @@ export default function Sidebar() { - +
setViewModal(!viewModal)} >
@@ -106,17 +114,22 @@ 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 Anual
    • -
  • Economia Bruta Mensal
    • -
  • Cativo x Livre Mensal
    • -
  • Custo R$/MWh
    • -
    +
  • setEconomiaDrawer(!economiaDrawer)} className={router.pathname=='/grossSavings' || router.pathname=='/accumulatedSavings' || router.pathname=='/estimatedCost' || router.pathname=='/costIndicator' ? 'actualPath' : null } >{'Economia'}
    • + {/*
    +
  • setEconomyMenu(0)} className={economyMenu===0? 'actualPathDrawer' : null}>Economia Bruta Anual
    • +
  • setEconomyMenu(1)} className={economyMenu===1? 'actualPathDrawer' : null}>Economia Bruta Mensal
    • +
  • setEconomyMenu(2)} className={economyMenu===2? 'actualPathDrawer' : null}>Cativo x Livre Mensal
    • +
  • setEconomyMenu(3)} className={economyMenu===3? 'actualPathDrawer' : null}>Custo R$/MWh
    • +
    */}
  • {'Telemetria'}
  • {'Resumo de Op. '}
  • {'Notícias'}
    • -
  • {'PLD'}
    • +
  • setPldDrawer(!pldDrawer)} className={router.pathname=='/pld'? 'actualPath' : null}>{'PLD >'}
    • +
    +
  • setPldMenu(0)} className={pldMenu==0? 'actualPathDrawer' : null}>PLD Histórico
    • +
  • setPldMenu(1)} className={pldMenu===1? 'actualPathDrawer' : null}>Valores Diários
    • +
  • setPldMenu(2)} className={pldMenu===2? 'actualPathDrawer' : null}>Valores Horários
    • +
  • {'Info Setorial'}
    • {/*
  • {'Consumo'}
    • */}
  • {'Notificações'}

    {notificationsCount}

    • @@ -124,15 +137,15 @@ export default function Sidebar() {
  • {'FAQ'}
    • - + Deseja realmente sair ?
    @@ -141,7 +154,7 @@ export default function Sidebar() {
    -     +
{data.year_month_formatted}{parseFloat(data.nordeste).toLocaleString('pt-br',{currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.norte).toLocaleString('pt-br',{currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.sudeste).toLocaleString('pt-br',{currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.sul).toLocaleString('pt-br',{currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.nordeste).toLocaleString('pt-br',{currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}{parseFloat(data.norte).toLocaleString('pt-br',{currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}{parseFloat(data.sudeste).toLocaleString('pt-br',{currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}{parseFloat(data.sul).toLocaleString('pt-br',{currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}
Máximo{parseFloat(data.nordeste_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.norte_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.sudeste_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.sul_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.nordeste_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}{parseFloat(data.norte_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}{parseFloat(data.sudeste_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}{parseFloat(data.sul_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}
Mínimo{parseFloat(data.nordeste_min).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.norte_min).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.sudeste_min).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.sul_min).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.nordeste_min).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}{parseFloat(data.norte_min).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}{parseFloat(data.sudeste_min).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}{parseFloat(data.sul_min).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}
Desv. Padrão{parseFloat(data.nordeste_desv_pad).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.norte_desv_pad).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.sudeste_desv_pad).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.sul_desv_pad).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}Desv. Padrão{parseFloat(data.nordeste_desv_pad).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.norte_desv_pad).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.sudeste_desv_pad).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(data.sul_desv_pad).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}
{value.mes}{value.cod_smart_unidade}{value.operacao}{parseFloat(value.montante_nf).toLocaleString('pt-br')}{value.contraparte}{parseFloat(value.preco_nf).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(value.nf_c_icms).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{value.mes}{value.cod_smart_unidade}{value.operacao}{parseFloat(value.montante_nf).toLocaleString('pt-br')}{value.contraparte}{parseFloat(value.preco_nf).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(value.nf_c_icms).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}
@@ -259,19 +260,32 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { }) } - - - - - - - + +
+ {/*
+
setPage(1)} className="btn btn-1"> + + + +

Valores Diários

+
+
setPage(2)} className="btn btn-1"> + + + +

Valores Horários

+
+
*/} + + + + { tableData.result.map((data, index) => { if (index === 0) { return <> - - + + @@ -303,25 +317,11 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { }
Máximo
Máximo {parseFloat(data.nordeste_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})} {parseFloat(data.norte_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})} {parseFloat(data.sudeste_max).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2, maximumFractionDigits: 2})}
- {/*
-
setPage(1)} className="btn btn-1"> - - - -

Valores Diários

-
-
setPage(2)} className="btn btn-1"> - - - -

Valores Horários

-
-
*/} {/* grafico de grafico por seleção de data (mês)*/} - +
@@ -386,7 +386,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { {/* grafico de grafico por seleção de data INTEIRA*/} - +
{/*

Selecione a data:

*/} diff --git a/src/pages/resumoOperacao/index.tsx b/src/pages/resumoOperacao/index.tsx index 2c408c9..6efd3d0 100644 --- a/src/pages/resumoOperacao/index.tsx +++ b/src/pages/resumoOperacao/index.tsx @@ -18,7 +18,7 @@ import { api } from '../../services/api'; // import { dados } from '../services/DadosTabelaResumoOperacao'; import data from '../../services/dados.json' import getAPIClient from '../../services/ssrApi'; -import { Pagination, TableHeader, TableView } from '../../styles/layouts/ResumoOperacao/ResumoOperacaoView'; +import { Pagination, TableBodyView, TableHeader, TableView } from '../../styles/layouts/ResumoOperacao/ResumoOperacaoView'; export default function ResumoOperacao({tableData, clients, userName, clientMonth}: any) { const csvData = tableData; @@ -100,13 +100,12 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont
-

Selecionar unidade:

Unidades Todos { - clientMonth.map((value) => { + clientMonth.sort((a, b) => { + if (parseFloat(a.mes.slice(0, 2)) < parseFloat(b.mes.slice(0, 2))) + if (parseFloat(a.mes.slice(3, 7)) > parseFloat(b.mes.slice(3, 7))) return -1 + else return 1 + if (parseFloat(a.mes.slice(0, 2)) > parseFloat(b.mes.slice(0, 2))) + if (parseFloat(a.mes.slice(3, 7)) < parseFloat(b.mes.slice(3, 7))) return 1 + else return -1 + + return 0 + }).map((value) => { return {value.mes} }) } @@ -151,38 +158,37 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont }}/>
- - - - - - - - - - - - - - { - tableDataState.map((value, index) => { - if (value.mes.slice(4,7) != '2020') - return - - - - - - - - - }) - } - -
Mês Unidade OperaçãoMontante (MWh)ContrapartePreço(R$/MWh)ValorNF/Crédito(R$)
{value.mes}{value.cod_smart_unidade}{value.operacao}{parseFloat(value.montante_nf).toLocaleString('pt-br')}{value.contraparte}{parseFloat(value.preco_nf).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(value.nf_c_icms).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}
-
- -
+ + + + + + + + + + + + + + + { + tableDataState.map((value, index) => { + if (value.mes.slice(4,7) != '2020') + return + + + + + + + + + }) + } + +
Mês Unidade OperaçãoContraparteMontante (MWh)Preço(R$/MWh)ValorNF/Crédito(R$)
{value.mes}{value.cod_smart_unidade}{value.operacao}{value.contraparte}{parseFloat(value.montante_nf).toLocaleString('pt-br')}{parseFloat(value.preco_nf).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}{parseFloat(value.nf_c_icms).toLocaleString('pt-br',{style: 'currency', currency: 'BRL', minimumFractionDigits: 2})}
+ ) } diff --git a/src/pages/telemetria/index.tsx b/src/pages/telemetria/index.tsx index c291849..f7d6f3c 100644 --- a/src/pages/telemetria/index.tsx +++ b/src/pages/telemetria/index.tsx @@ -274,41 +274,6 @@ export default function Telemetria({userName, clients}: any) {
- {/*
-

Data inicial

- setStartDate(value.target.value)} min="2021-01-01"/> -
*/} - - -
-

Data inicial

- } - /> -
-
-

Data final

- } - /> -
- - - {/*
-

Data final

- setEndDate(value.target.value)} min="2021-01-01"/> -
*/} -

Discretização

@@ -332,6 +297,40 @@ export default function Telemetria({userName, clients}: any) {
+ + +
+

Data inicial

+ } + /> +
+
+

Data final

+ } + /> +
+ + { setSend(true) getTableData() diff --git a/src/services/charts/telemetry/getPowerFactor.ts b/src/services/charts/telemetry/getPowerFactor.ts index c2e141c..95d0333 100644 --- a/src/services/charts/telemetry/getPowerFactor.ts +++ b/src/services/charts/telemetry/getPowerFactor.ts @@ -14,9 +14,9 @@ export async function getPowerFactorData( {"type" : "=", "field": "med_5min.ponto", "value": "PRAXCUENTR101P"}, {"type" : "between", "field": "dia_num", "value": ["2022-01-01", "2022-01-31"]} ] -}, { + }, { headers: { - 'Authorization': `Bearer 1260|RHfh3uMsEfHwCTqxKOhy1CEIr34UIln9OFdf5Fc8` + 'Authorization': `Bearer 1292|E4jbc5ZWmgCCBMOVn4PvPx56MUbf4nUg5MNgxjmP` } }) return data.data diff --git a/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts b/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts index c95ba0b..eb4eaf5 100644 --- a/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts +++ b/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts @@ -62,7 +62,7 @@ export const TableView = styled.div` } .tg .tg-gceh{ - background-color:#efefef; + background-color: transparent; color:#6a707e; font-size:14px; text-align:center; @@ -81,7 +81,11 @@ export const TableView = styled.div` width: 10rem; } - table, th:last-child{ + table, th { + vertical-align: middle; + } + + table, th:last-child { border: transparent; border-top-right-radius: 8px; } @@ -90,6 +94,13 @@ export const TableView = styled.div` border: transparent; border-top-left-radius: 8px; } + + table, td { + border: transparent; + border-top-left-radius: 8px; + + text-overflow: ellipsis; + } `; export const TableHeader = styled.section` @@ -156,3 +167,35 @@ export const NewTableLine = styled.section` margin: 0 0 10px 0; } ` + +export const TableBodyView = styled.section` + border-radius: 8px; + + background-color: #EFEFEF; + + width: 100%; + + border: rgb(221,223,225); + border-style:solid; + border-width: 1px; + + tr { + :last-child { + /* background-color: red; */ + + border-bottom-color: transparent; + + td { + :first-child { + border-left-color: transparent; + border-bottom-color: transparent; + /* background-color: red; */ + } + :last-child { + border-right-color: transparent; + border-bottom-color: transparent; + } + } + } + } +` diff --git a/src/styles/layouts/economy/accumulatedSavings/AccumulatedSavingsView.ts b/src/styles/layouts/economy/accumulatedSavings/AccumulatedSavingsView.ts index 4cba73d..fc32ca8 100644 --- a/src/styles/layouts/economy/accumulatedSavings/AccumulatedSavingsView.ts +++ b/src/styles/layouts/economy/accumulatedSavings/AccumulatedSavingsView.ts @@ -10,9 +10,5 @@ export const AccumulatedSavingsView = styled.main` display: flex; justify-content: center; align-items: center; - - canvas { - width: 80%; - } } ` diff --git a/src/styles/layouts/pld/PldView.ts b/src/styles/layouts/pld/PldView.ts index 57932b6..d791b1e 100644 --- a/src/styles/layouts/pld/PldView.ts +++ b/src/styles/layouts/pld/PldView.ts @@ -195,6 +195,18 @@ export const PldTableView = styled.div` transform: translateY(-6px); } } + + .space { + background-color: #F7F7F7; + + border-color: transparent; + + border-bottom-color: #DDDFE1; + + height: 15px!important; + + padding: 0!important; + } ` export const PldGraphView = styled.main` diff --git a/tsconfig.json b/tsconfig.json index 3e0b9b3..2096761 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -19,7 +19,7 @@ "isolatedModules": true, "jsx": "preserve" }, - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "additional.d.ts"], + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "additional.d.ts", "src/contexts/economy/EconomyContext.tss"], "exclude": [ "node_modules" ] diff --git a/yarn.lock b/yarn.lock index d6e7e71..a03ea27 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2009,15 +2009,45 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" +"chart.js@>= 2.6.0 < 3": + version "2.9.4" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684" + integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A== + dependencies: + chartjs-color "^2.1.0" + moment "^2.10.2" + chart.js@^3.7.1: version "3.7.1" resolved "https://registry.npmjs.org/chart.js/-/chart.js-3.7.1.tgz" +chartjs-color-string@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71" + integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A== + dependencies: + color-name "^1.0.0" + +chartjs-color@^2.1.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0" + integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w== + dependencies: + chartjs-color-string "^0.6.0" + color-convert "^1.9.3" + chartjs-plugin-datalabels@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.0.0.tgz#caacefb26803d968785071eab012dde8746c5939" integrity sha512-WBsWihphzM0Y8fmQVm89+iy99mmgejmj5/jcsYqwxSioLRL/zqJ4Scv/eXq5ZqvG3TpojlGzZLeaOaSvDm7fwA== +chartjs-plugin-style@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/chartjs-plugin-style/-/chartjs-plugin-style-0.5.0.tgz#ba31deb016cf0d29c73e420bb40778f89cdfabd4" + integrity sha512-QWMWRGpkexgMTHZg2l1OVtnSkElGNAM0MchozG/ucU6NW0xXINS/YsIE2tl7nG1nwZA2FH/myVbI4uMguIAXPA== + dependencies: + chart.js ">= 2.6.0 < 3" + chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -2091,7 +2121,7 @@ cmd-shim@^5.0.0: dependencies: mkdirp-infer-owner "^2.0.0" -color-convert@^1.9.0: +color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" dependencies: @@ -3711,6 +3741,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" +moment@^2.10.2: + version "2.29.4" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== + ms@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" From 4861eee0ad264bd59810781b5a09531a868a048f Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Mon, 11 Jul 2022 15:37:31 -0300 Subject: [PATCH 4/8] fix --- src/pages/pld/index.tsx | 8 +- src/styles/layouts/pld/PldView.ts | 208 ++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+), 4 deletions(-) diff --git a/src/pages/pld/index.tsx b/src/pages/pld/index.tsx index e282817..f5dfb7b 100644 --- a/src/pages/pld/index.tsx +++ b/src/pages/pld/index.tsx @@ -17,7 +17,7 @@ import PageTitle from '../../components/pageTitle/PageTitle'; import { api } from '../../services/api'; import { EvolucaoPld } from '../../services/evolucaoPld'; import getAPIClient from '../../services/ssrApi'; -import { GoBack, PldGraphView, PldTableView, TableHeader } from '../../styles/layouts/pld/PldView' +import { GoBack, PldGraphView, PldTableMinMaxView, PldTableView, TableHeader } from '../../styles/layouts/pld/PldView' import RenderIf from '../../utils/renderIf' import Tabs from '@mui/material/Tabs'; @@ -277,7 +277,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) {
*/} - + { @@ -317,7 +317,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { }
- + {/* grafico de grafico por seleção de data (mês)*/} @@ -410,7 +410,7 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) { {pageYPosition > 300 && - + } diff --git a/src/styles/layouts/pld/PldView.ts b/src/styles/layouts/pld/PldView.ts index d791b1e..e4c1557 100644 --- a/src/styles/layouts/pld/PldView.ts +++ b/src/styles/layouts/pld/PldView.ts @@ -1,5 +1,213 @@ import styled from "styled-components" +export const PldTableMinMaxView = styled.div` + width: 100%; + + border-radius: 8px!important; + + border-color:#DDDFE1; + border-style:solid; + border-width: 1px; + + background-color: #EFEFEF; + + margin-top: 15px; + + table { + p { + font-size: 12px; + } + } + + .actual { + font-weight: bold!important; + } + + .tg{ + border-collapse:collapse; + border-spacing:0; + font-family:Poppins; + width: 100%; + } + + .tg td{ + border-color:#DDDFE1; + border-style:solid; + border-width:1px; + font-family:Poppins; + font-size: 10px; + overflow:hidden; + padding:17px 30px; + word-break:normal; + } + + + .tg th{ + border-color:#DDDFE1; + border-style:solid; + border-width:1px; + font-family:Poppins; + font-size:10px; + font-weight:500; + overflow:hidden; + padding:10px 5px; + word-break:normal; + } + .tg .tg-8oo6{ + font-size:20px; + text-align:center; + vertical-align:center; + padding: 10px 18px; + text-align: center; + + color: white; + + background-color: #254F7F; + } + .tg .tg-uulg{ + font-size:14px; + text-align:center; + vertical-align:top; + + :first-child { + background-color: red; + } + :last-child { + border-right-color: transparent; + } + } + + .tg .tg-gceh{ + font-size:14px; + text-align:center; + vertical-align:top; + :first-child { + border-left-color: transparent; + } + } + + table, th:last-child{ + border: transparent; + border-top-right-radius: 8px; + } + + table, th:first-child { + border: transparent; + border-top-left-radius: 8px; + } + + h3{ + font-weight: 600; + font-size: 22px; + line-height: 54px; + + color: #254F7F; + } + + .images { + display: flex; + justify-content: space-around; + align-items: center; + + margin: 40px; + } + + section { + display: flex; + justify-content: center; + align-items: center; + + article { + position: relative; + + display: flex; + justify-content: center; + align-items: center; + + width: 40%; + height: 8rem; + + margin: 40px; + + background: #255488; + color: white; + + border-radius: 8px; + box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -webkit-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + -moz-box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; + + cursor: pointer; + + background: darken($red, 1.5%); + + background: linear-gradient(200.69deg, #254f7f 9%, #3183e0 98%), #FFFFFF; + + :hover { + transition: all 0.2s linear; + transform: scale(1.1); + } + + svg { + height: 100%; + left: 0; + position: absolute; + top: 0; + width: 100%; + } + + rect { + fill: none; + stroke: #fff; + stroke-width: 2; + stroke-dasharray: 422, 0; + transition: all 0.35s linear; + } + } + + .btn-1:hover { + background: rgba($red, 0); + letter-spacing: 1px; + + + rect { + stroke-width: 5; + stroke-dasharray: 15, 310; + stroke-dashoffset: 48; + transition: all 1.35s cubic-bezier(0.19, 1, 0.22, 1); + } + } + } + + footer { + label { + cursor: pointer; + margin: 20px; + } + } + + .btnDownload{ + width: fit-content; + margin-bottom: 15px; + :hover { + position: relative; + transition: all 0.2s linear; + transform: translateY(-6px); + } + } + + .space { + background-color: #F7F7F7; + + border-color: transparent; + + border-bottom-color: #DDDFE1; + + height: 15px!important; + + padding: 0!important; + } +` export const PldTableView = styled.div` width: 100%; From 4401878f24d4f4fbec49372aded09c44dc53533d Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Mon, 11 Jul 2022 16:09:24 -0300 Subject: [PATCH 5/8] fix units --- src/pages/costIndicator/index.tsx | 5 +++-- src/pages/economy/index.tsx | 3 ++- src/pages/estimatedCost/index.tsx | 4 ++-- src/pages/resumoOperacao/index.tsx | 28 ++++++++++++++++++++++++---- src/pages/telemetria/index.tsx | 5 +++-- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/pages/costIndicator/index.tsx b/src/pages/costIndicator/index.tsx index 959bd63..3e87bbe 100644 --- a/src/pages/costIndicator/index.tsx +++ b/src/pages/costIndicator/index.tsx @@ -95,7 +95,8 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) const { ['user-name']: userName } = parseCookies(ctx) - const { ['user-client_id']: id } = parseCookies(ctx) + const { ['user-client_id']: client_id } = parseCookies(ctx) + let graphData = []; @@ -103,7 +104,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.post('/units', { "filters": [ - {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": 180201211}, + {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": client_id}, {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]} ], "fields": [ diff --git a/src/pages/economy/index.tsx b/src/pages/economy/index.tsx index dde650d..86869a0 100644 --- a/src/pages/economy/index.tsx +++ b/src/pages/economy/index.tsx @@ -190,6 +190,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) const { ['user-name']: userName } = parseCookies(ctx) + const { ['user-client_id']: client_id } = parseCookies(ctx) let anual = []; @@ -217,7 +218,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.post('/units', { "filters": [ - {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": 180201211}, + {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": client_id}, {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]} ], "fields": [ diff --git a/src/pages/estimatedCost/index.tsx b/src/pages/estimatedCost/index.tsx index a6652f5..8c25309 100644 --- a/src/pages/estimatedCost/index.tsx +++ b/src/pages/estimatedCost/index.tsx @@ -76,14 +76,14 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) const { ['user-name']: userName } = parseCookies(ctx) - const { ['user-client_id']: id } = parseCookies(ctx) + const { ['user-client_id']: client_id } = parseCookies(ctx) let graphData = []; let clients = []; await apiClient.post('/units', { "filters": [ - {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": 180201211}, + {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": client_id}, {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]} ], "fields": [ diff --git a/src/pages/resumoOperacao/index.tsx b/src/pages/resumoOperacao/index.tsx index 6efd3d0..27d4b85 100644 --- a/src/pages/resumoOperacao/index.tsx +++ b/src/pages/resumoOperacao/index.tsx @@ -20,6 +20,10 @@ import data from '../../services/dados.json' import getAPIClient from '../../services/ssrApi'; import { Pagination, TableBodyView, TableHeader, TableView } from '../../styles/layouts/ResumoOperacao/ResumoOperacaoView'; +import Fab from '@mui/material/Fab'; + +import NavigationIcon from '@mui/icons-material/Navigation'; + export default function ResumoOperacao({tableData, clients, userName, clientMonth}: any) { const csvData = tableData; @@ -38,6 +42,13 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont setUnidade(event.target.value); }; + const [ pageYPosition, setPageYPosition ] = useState(0); + + function getPageYAfterScroll(){ + setPageYPosition(window.scrollY); + console.log(window.scrollY) + } + function downloadCSVFile(csv, filename) { const csv_file = new Blob(["\ufeff",csv], {type: "text/csv"}); const download_link = document.createElement("a"); @@ -88,6 +99,10 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont } }, [month, unidade]) + useEffect(() => { + window?.addEventListener('scroll', getPageYAfterScroll); + }, []) + return ( @@ -97,7 +112,7 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont -
+
@@ -173,7 +188,7 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont { - tableDataState.map((value, index) => { + tableDataState?.map((value, index) => { if (value.mes.slice(4,7) != '2020') return {value.mes} @@ -189,6 +204,11 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont + {pageYPosition > 300 && + + + + } ) } @@ -196,7 +216,7 @@ export default function ResumoOperacao({tableData, clients, userName, clientMont export const getServerSideProps: GetServerSideProps = async (ctx) => { const apiClient = getAPIClient(ctx) const { ['@smartAuth-token']: token } = parseCookies(ctx) - const { ['user-id']: id } = parseCookies(ctx) + const { ['user-client_id']: client_id } = parseCookies(ctx) const { ['user-name']: userName } = parseCookies(ctx) let tableData = []; @@ -222,7 +242,7 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { await apiClient.post('/units', { "filters": [ - {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": 180201211}, + {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": client_id}, {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]} ], "fields": [ diff --git a/src/pages/telemetria/index.tsx b/src/pages/telemetria/index.tsx index f7d6f3c..3ee4058 100644 --- a/src/pages/telemetria/index.tsx +++ b/src/pages/telemetria/index.tsx @@ -412,14 +412,15 @@ export default function Telemetria({userName, clients}: any) { export const getServerSideProps: GetServerSideProps = async (ctx) => { const { ['@smartAuth-token']: token } = parseCookies(ctx) const { ['user-name']: userName } = parseCookies(ctx) - const { ['user-client_id']: id } = parseCookies(ctx) + const { ['user-client_id']: client_id } = parseCookies(ctx) + const apiClient = getAPIClient(ctx) let clients = [] await apiClient.post('/units', { "filters": [ - {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": 180201211}, + {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": client_id}, {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]} ], "fields": [ From 664c7b32bc55878e635c7883e95cff6bc3a57987 Mon Sep 17 00:00:00 2001 From: joseCorte-exe Date: Mon, 11 Jul 2022 16:27:29 -0300 Subject: [PATCH 6/8] fixing telemetry style --- src/pages/telemetria/index.tsx | 6 ++++-- src/styles/layouts/Telemetria/TelemetriaView.ts | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/pages/telemetria/index.tsx b/src/pages/telemetria/index.tsx index 3ee4058..6dbc9fe 100644 --- a/src/pages/telemetria/index.tsx +++ b/src/pages/telemetria/index.tsx @@ -251,7 +251,7 @@ export default function Telemetria({userName, clients}: any) {

Unidade

- + Unidade