diff --git a/public/assets/smart-energia-terms-image.png b/public/assets/smart-energia-terms-image.png new file mode 100644 index 0000000..ffbc8f6 Binary files /dev/null and b/public/assets/smart-energia-terms-image.png differ diff --git a/src/components/administrativeTables/ClientsTable.tsx b/src/components/administrativeTables/ClientsTable.tsx index f39feb3..259bdb2 100644 --- a/src/components/administrativeTables/ClientsTable.tsx +++ b/src/components/administrativeTables/ClientsTable.tsx @@ -284,13 +284,7 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface const formData = new FormData() - const [clientEdit, setClientEdit] = useState({ - name: String, - email: String, - password: String, - password_confirmation: String, - client_id: Number - }) + const [clientEdit, setClientEdit] = useState({}) const [logo, setLogo] = useState(false) const [imageURLS, setImageURLs] = useState([]) const [images, setImages] = useState([] as any) @@ -298,6 +292,7 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface const [openEditUserModal, setOpenEditUserModal] = useState(false); const [selectedClient, setSelectedClient] = useState(2); + const [search, setSearch] = useState('') useEffect(() => { if (images.length < 1) return @@ -348,6 +343,7 @@ export default function ClientTable({ clients, onChange }: ClientsTableInterface Não foi possivel encontrar unidades do client! + setSearch(e.target.value)} placeholder='persquisar por nome:' /> {stableSort(clients, getComparator(order, orderBy)) + .filter(client => client.name.toLowerCase().includes(search.toLowerCase())) .slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage) .map((row, index) => { const isItemSelected = isSelected(row.id); diff --git a/src/components/graph/grossAnualChart/GrossAnualChart.tsx b/src/components/graph/grossAnualChart/GrossAnualChart.tsx index bd85d0a..e029ed0 100644 --- a/src/components/graph/grossAnualChart/GrossAnualChart.tsx +++ b/src/components/graph/grossAnualChart/GrossAnualChart.tsx @@ -82,9 +82,6 @@ export function GrossAnualChart({ title, subtitle, dataProps = [], label, datase 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')}${spacement(parseInt(value).toLocaleString('pt-br'))}` - console.log(value == null ? null : result) - console.log(dataProps) - return value == null ? null : result }, display: true, @@ -143,7 +140,7 @@ export function GrossAnualChart({ title, subtitle, dataProps = [], label, datase return 0 }) }, - data: [].concat(dataProps.filter(value => value.dad_estimado === true).map((value, index) => { + data: [].concat(dataProps.filter(value => value.dad_estimado === true).slice(0, 7).map((value, index) => { return parseFloat(value?.economia_acumulada) })), borderRadius: 10, diff --git a/src/components/graph/grossMensalChart/GrossMensalChart.tsx b/src/components/graph/grossMensalChart/GrossMensalChart.tsx index 6ca13f2..cd348de 100644 --- a/src/components/graph/grossMensalChart/GrossMensalChart.tsx +++ b/src/components/graph/grossMensalChart/GrossMensalChart.tsx @@ -36,22 +36,6 @@ export default function GrossMensalChart({ subtitle, miniature }: ChartInterface) { - function spacement(string) { - const spaces = - string.length === 1 - ? '' - : string.length === 2 - ? '' - : string.length === 3 - ? ' ' - : string.length === 4 - ? ' ' - : string.length === 5 - ? ' ' - : '' - return spaces - } - const [lastDataS, setLastData] = useState('') useEffect(() => { let lastData = '0' diff --git a/src/pages/administrative/clients/index.tsx b/src/pages/administrative/clients/index.tsx index 9341b80..aaeb309 100644 --- a/src/pages/administrative/clients/index.tsx +++ b/src/pages/administrative/clients/index.tsx @@ -156,6 +156,7 @@ export default function clients({ clients, userName }) { setLogo(e.target.files[0]) } + return (
@@ -140,7 +141,8 @@ export default function Dashboard({ grossAnualGraph, grossAnualYears, grossMensa value?.mes.slice(0, 4).includes(costIndicator[0].mes.slice(0, 4))).map(value => value?.custo_unit && !!parseInt(value?.custo_unit) ? value.custo_unit : null)} data2={costIndicator?.filter((value, index) => value?.mes.slice(0, 4).includes(costIndicator[costIndicator.length - 1].mes.slice(0, 4))).map(value => value?.custo_unit && !!parseInt(value?.custo_unit) ? value.custo_unit : null)} - years={[costIndicator[0].mes.slice(0, 4), costIndicator[costIndicator.length - 1].mes.slice(0, 4)]} + // years={[costIndicator[0].mes.slice(0, 4), costIndicator[costIndicator.length - 1].mes.slice(0, 4)]} + years={[previousYear, currentYear]} label={months} miniature /> @@ -155,6 +157,7 @@ export default function Dashboard({ grossAnualGraph, grossAnualYears, grossMensa Termos de uso +

Bem-vindo ao Smart Energy View, a Plataforma Web da SMART ENERGIA! @@ -184,8 +187,6 @@ export default function Dashboard({ grossAnualGraph, grossAnualYears, grossMensa A divulgação não autorizada das informações adquiridas nesta plataforma (ou seu uso), de forma integral ou parcial, é proibida, não sendo permitido o compartilhamento dos acessos e senhas ou qualquer informação que tiver acesso junto a esta plataforma, sendo que o acesso a esta plataforma é restrito e individual.

- ‌ -

Destacamos que os resultados informados são meramente indicativos, não vinculantes a resultados e que as premissas disponibilizadas na plataforma são as mesmas utilizadas nos Energys Reports e estudos encaminhados.

diff --git a/src/pages/economy/index.tsx b/src/pages/economy/index.tsx index d28a187..0c8743a 100644 --- a/src/pages/economy/index.tsx +++ b/src/pages/economy/index.tsx @@ -5,28 +5,28 @@ import Select from '@mui/material/Select'; import { GetServerSideProps } from 'next'; import Head from 'next/head'; import { parseCookies } from 'nookies'; -import React, { useContext, useEffect, useState } from 'react' +import { useContext, useEffect, useState } from 'react'; -import Header from '../../components/header/Header' +import Header from '../../components/header/Header'; import PageTitle from '../../components/pageTitle/PageTitle'; import { api } from '../../services/api'; import getAPIClient from '../../services/ssrApi'; -import { TableHeader } from '../../styles/layouts/pld/PldView' -import RenderIf from '../../utils/renderIf' +import { TableHeader } from '../../styles/layouts/pld/PldView'; +import RenderIf from '../../utils/renderIf'; -import Tabs from '@mui/material/Tabs'; import Tab from '@mui/material/Tab'; +import Tabs from '@mui/material/Tabs'; -import { MenuContext } from '../../contexts/menu/MenuContext'; -import { GrossAnualChart } from '../../components/graph/grossAnualChart/GrossAnualChart'; -import GrossMensalChart from '../../components/graph/grossMensalChart/GrossMensalChart'; +import AccumulatedEconomyTitle from '../../components/accumulatedEconomyTitle/AccumulatedEconomyTitle'; import { CativoXLivreChart } from '../../components/graph/cativoXLivreChart'; import CostIndicatorChart from '../../components/graph/costIndicatorChart'; +import { GrossAnualChart } from '../../components/graph/grossAnualChart/GrossAnualChart'; +import GrossMensalChart from '../../components/graph/grossMensalChart/GrossMensalChart'; +import { MenuContext } from '../../contexts/menu/MenuContext'; import { EconomyView } from '../../styles/layouts/economy/economy'; -import AccumulatedEconomyTitle from '../../components/accumulatedEconomyTitle/AccumulatedEconomyTitle'; -export default function economy({userName, anual, years, brutaMensal, catLiv, clients, indicatorCost}: any) { - const {economyMenu, setEconomyMenu} = useContext(MenuContext) +export default function economy({ userName, anual, years, brutaMensal, catLiv, clients, indicatorCost }: any) { + const { economyMenu, setEconomyMenu } = useContext(MenuContext) const [unity, setUnity] = useState(''); @@ -34,7 +34,7 @@ export default function economy({userName, anual, years, brutaMensal, catLiv, cl const [indicatorDataState, setIndicatorDataState] = useState(null); const currentYear = new Date().getUTCFullYear() - const previousYear = new Date().getUTCFullYear()-1 + const previousYear = new Date().getUTCFullYear() - 1 const months = [ 'Jan', @@ -54,166 +54,169 @@ export default function economy({userName, anual, years, brutaMensal, catLiv, cl const [lastDataBruta, setLastDataBruta] = useState('') useEffect(() => { let lastData = '0' - let index=0 + let index = 0 if (economyMenu) { while (index < brutaMensal.length) { if (!brutaMensal[index].dad_estimado) - lastData=brutaMensal[index].economia_acumulada + lastData = brutaMensal[index].economia_acumulada index++ } } else { while (index < anual.length) { if (!anual[index].dad_estimado) - lastData=anual[index].economia_acumulada + lastData = anual[index].economia_acumulada index++ } } setLastDataBruta(`${parseFloat(lastData).toFixed(3)}`) }, [economyMenu]) + useEffect(() => { + console.log(indicatorDataState) + }, [indicatorDataState]) async function getChartsWithUnity() { - await api.post('/economy/estimates', unity!==''?{ + await api.post('/economy/estimates', unity !== '' ? { "filters": [ - {"type" : "=", "field":"dados_cadastrais.cod_smart_unidade", "value": unity === "default" ? unity : unity} + { "type": "=", "field": "dados_cadastrais.cod_smart_unidade", "value": unity === "default" ? unity : unity } ] - }:{}).then(res => { + } : {}).then(res => { setCatLivDataState(res.data.data) }) - await api.post('/economy/MWh', unity!==''?{ + await api.post('/economy/MWh', unity !== '' ? { "filters": [ - {"type" : "=", "field":"dados_cadastrais.cod_smart_unidade", "value": unity === "default"? unity : unity} + { "type": "=", "field": "dados_cadastrais.cod_smart_unidade", "value": unity === "default" ? unity : unity } ] - }:{}).then(res => { + } : {}).then(res => { setIndicatorDataState(res.data.data) }) } useEffect(() => { getChartsWithUnity() - console.log(brutaMensal) }, [unity]) return ( -
+
Smart Energia - Economia -
+
- +
setEconomyMenu(nv)} aria-label=""> - - - - + + + +
{ - economyMenu === 0 || economyMenu === 1? -

Economia Bruta Estimada e Acumulada Anual - Valores em R$ x mil

- : - economyMenu === 2? -

Comparativo de Custo Estimado - Valores em R$ x mil

- : -

Indicador de Custo - Valores em R$/MWh

+ economyMenu === 0 || economyMenu === 1 ? +

Economia Bruta Estimada e Acumulada Anual - Valores em R$ x mil

+ : + economyMenu === 2 ? +

Comparativo de Custo Estimado - Valores em R$ x mil

+ : +

Indicador de Custo - Valores em R$/MWh

} { - economyMenu===0 || economyMenu===1? - + economyMenu === 0 || economyMenu === 1 ? + : null }
{ - typeof window === 'undefined' || typeof window === undefined? null : - <> - -
- + +
+ -
- + dataProps={anual} + label={years} barLabel bruta + /> +
+ - -
- -
- + +
+ +
+ - -
- - Unidade - - -
-
- -
- + +
+ + Unidade + + +
+
+ +
+ - -
- - Unidade - - -
-
- value?.mes.slice(0, 4).includes(previousYear)).map(value => value?.custo_unit && !!parseInt(value?.custo_unit)? value.custo_unit : null)} - data2={indicatorDataState?.filter(value => value?.mes.slice(0, 4).includes(currentYear)).map(value => value?.custo_unit && !!parseInt(value?.custo_unit)? value.custo_unit : null)} - label={months} - /> -
- - + +
+ + Unidade + + +
+
+ value?.mes.slice(0, 4).includes(previousYear)).map(value => value?.custo_unit && !!parseInt(value?.custo_unit) ? value.custo_unit : null)} + data2={indicatorDataState?.filter(value => value?.mes.slice(0, 4).includes(currentYear)).map(value => value?.custo_unit && !!parseInt(value?.custo_unit) ? value.custo_unit : null)} + years={[previousYear, currentYear]} + label={months} + /> +
+ + }
@@ -246,15 +249,15 @@ export const getServerSideProps: GetServerSideProps = async (ctx) => { let clients = []; await apiClient.post('/units', { - "filters": [ - {"type" : "=", "field": "dados_cadastrais.cod_smart_cliente", "value": client_id}, - {"type" : "not_in", "field": "dados_cadastrais.codigo_scde", "value":["0P"]} - ], - "fields": [ - "unidade", - "cod_smart_unidade", - "codigo_scde"], - "distinct": true + "filters": [ + { "type": "=", "field": "dados_cadastrais.cod_smart_cliente", "value": client_id }, + { "type": "not_in", "field": "dados_cadastrais.codigo_scde", "value": ["0P"] } + ], + "fields": [ + "unidade", + "cod_smart_unidade", + "codigo_scde"], + "distinct": true }).then(res => { clients = res.data.data })