Smart/smartEnergyView-frontend
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'telemetry' into 'dev'

Browse Source 
updates

See merge request kluppsoftware/smart-energia-web!125
This commit is contained in:
José Corte 2022-07-25 20:59:05 +00:00
commit 78cd3c1caa
12 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/NotificationQuestionsCard/NotificationQuestionsCardView.ts
View File

@ -10,8 +10,6 @@ export const FaqQuestionsCardHeader = styled.div`
flex-direction: row;
margin-top: 53px;
width: 100%;
cursor: pointer;

2
src/components/faqQuestionsCard/FaqQuestionsCardView.ts
View File

@ -10,7 +10,7 @@ export const FaqQuestionsCardHeader = styled.div`
flex-direction: row;
margin-top: 53px;
/* margin-bottom: 53px; */
width: 100%;
cursor: pointer;

2
src/components/graph/graphCard/ChartCardView.ts
View File

@ -13,7 +13,7 @@ export const ChartCardView = styled.article`
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) ;
border-radius: 20px;
border-radius: 10px;
background-color: #FFFFFF;

35
src/pages/telemetria/index.tsx
View File

@ -17,7 +17,6 @@ import { api } from '../../services/api';
import Snackbar from '@mui/material/Snackbar'
import MuiAlert, { AlertProps } from '@mui/material/Alert'
import getAPIClient from '../../services/ssrApi';
import router from 'next/router';
import { DemRegXDemConChart } from '../../components/graph/DemRegXDemConChart';
import Tabs from '@mui/material/Tabs';
@ -29,7 +28,6 @@ import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
import BasicButton from '../../components/buttons/basicButton/BasicButton';
import { DiscretizedConsumptionChart } from '../../components/graph/DiscretizedConsumptionChart';
import DiscretizedConsumptionChartLine from '../../components/graph/DiscretizedConsumptionChartLine';
import FatorPotenciaChart from '../../components/graph/fatorPotenciaChart';
import { getDiscretization } from '../../services/charts/telemetry/getDiscretization';
import { getPowerFactorData } from '../../services/charts/telemetry/getPowerFactor';
@ -103,6 +101,8 @@ export default function Telemetria({userName, clients}: any) {
const [tableData, setTableData] = useState(null)
const [loader, setLoader] = useState(false)
const [menu, setMenu] = useState(0);
const [showChart, setShowChart] = useState(false);
@ -136,9 +136,11 @@ export default function Telemetria({userName, clients}: any) {
setOpenSnackError(false)
setOpenSnackSuccess(true)
setOpen(false)
setLoader(true)
htmlToCSV(html, "telemetria.csv")
}).catch(res => {
setSend(false)
setLoader(false)
setException(true)
setOpenSnackError(true)
setOpenSnackSuccess(false)
@ -155,10 +157,8 @@ export default function Telemetria({userName, clients}: any) {
}).then(res => {
setDemRegXDemCon2(res.data.data)
htmlToCSV(html, "telemetria.csv")
}).catch(res => {
// console.log(res)
// router.push('/telemetria')
})
setLoader(true)
}
const [filters, setFilters] = useState()
@ -326,10 +326,10 @@ export default function Telemetria({userName, clients}: any) {
</LocalizationProvider>
<div className='select'>
<BasicButton title='Selecionar!' onClick={() => {
setSend(true)
setLoader(true)
getDiscretization(unity, startDate, endDate, discretization)
.then(result => {setDiscretizedConsumptionData(result); setSend(false)})
.catch(exception => {setSend(false); setOpenSnackFields(true)})
.then(result => {setDiscretizedConsumptionData(result); setSend(false); setLoader(false)})
.catch(exception => {setSend(false); setOpenSnackFields(true); setLoader(false)})
}}/>
</div>
</ChartFilters>
@ -423,10 +423,10 @@ export default function Telemetria({userName, clients}: any) {
</LocalizationProvider>
<div className='select'>
<BasicButton title='Selecionar!' onClick={() => {
setSend(true)
setLoader(true)
getDemand(unity, startDate, endDate, discretization)
.then(result => {setDemRegXDemCon(result); setSend(false)})
.catch(exception => {setSend(false); setOpenSnackFields(true)})
.then(result => {setDemRegXDemCon(result); setSend(false); setLoader(false)})
.catch(exception => {setSend(false); setOpenSnackFields(true); setLoader(false)})
}}/>
</div>
</ChartFilters>
@ -516,10 +516,10 @@ export default function Telemetria({userName, clients}: any) {
</LocalizationProvider>
<div className='select'>
<BasicButton title='Selecionar!' onClick={() => {
setSend(true)
setLoader(true)
getPowerFactorData(unity, startDate, endDate, discretization)
.then(result => {setFatorPotenciaData(result); setSend(false)})
.catch(exception => {setSend(false); setOpenSnackFields(true)})
.then(result => {setFatorPotenciaData(result); setSend(false); setLoader(false)})
.catch(exception => {setSend(false); setOpenSnackFields(true); setLoader(false)})
}}/>
</div>
</ChartFilters>
@ -578,10 +578,9 @@ export default function Telemetria({userName, clients}: any) {
</div>
<div style={{marginBottom: '8px'}}>
<BasicButton title='Selecionar!' onClick={() => {
setLoader(true)
setSend(true)
getDemand(unity, startDate, endDate, discretization)
.then(result => {setDiscretizedConsumptionData(result); setSend(false)})
.catch(exception => {setSend(false); setOpenSnackFields(true)})
getChartData()
}}/>
</div>
</ChartFilters>
@ -591,7 +590,7 @@ export default function Telemetria({userName, clients}: any) {
</RenderIf>
</RenderIf>
<RenderIf isTrue={startDate.toLocaleDateString()!=='' && endDate.toLocaleDateString()!=='' && tableData===null && exception === false && send}>
<RenderIf isTrue={loader}>
<div className='modal'>
<div id="preloader_1">
<span></span>

6
src/services/charts/telemetry/getDiscretization.ts
View File

@ -8,18 +8,14 @@ export async function getDiscretization(
unity: string,
startDate: Date,
endDate: Date,
discretization: string
discretization: string,
) {
const { data } = await api.post('/telemetry/discretization', {
"type": discretization,
// "type": "1_hora",
"filters": [
{"type" : "=", "field": "med_5min.ponto", "value": unity},
{"type" : "between", "field": "dia_num", "value": [startDate.toLocaleDateString().split('/').reverse().join('-'), endDate.toLocaleDateString().split('/').reverse().join('-')]}
]
// "filters": [
// {"type" : "=", "field": "med_5min.ponto", "value": "RSZFNAENTR101P"}
// ]
}
)

6
src/styles/layouts/Telemetria/TelemetriaView.ts
View File

@ -14,12 +14,10 @@ export const TelemetriaView = styled.main`
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) ;
border-radius: 20px;
border-radius: 10px;
background-color: #FFFFFF;
/* margin-top: 10px; */
.modal {
position: absolute;
@ -34,7 +32,7 @@ export const TelemetriaView = styled.main`
left: 0;
width: 100%;
height: 100vh;
height: 150vh;
z-index: 999;
}

2
src/styles/layouts/aboutUs/AboutUsView.ts
View File

@ -9,7 +9,7 @@ export const AboutUsView = styled.main`
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) ;
border-radius: 20px;
border-radius: 10px;
background-color: #FFFFFF;

2
src/styles/layouts/commonQuestions/FaqView.ts
View File

@ -12,7 +12,7 @@ export const FaqView = styled.main`
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) ;
border-radius: 20px;
border-radius: 10px;
background-color: #FFFFFF;

2
src/styles/layouts/economy/economy.ts
View File

@ -7,7 +7,7 @@ export const EconomyView = styled.main`
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) ;
border-radius: 20px;
border-radius: 10px;
background-color: #FFFFFF;

2
src/styles/layouts/industryInfo/IndustryInfoView.ts
View File

@ -9,7 +9,7 @@ export const IndustryInfoView = styled.main`
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) ;
border-radius: 20px;
border-radius: 10px;
background-color: #FFFFFF;

2
src/styles/layouts/news/NewsView.ts
View File

@ -15,7 +15,7 @@ export const NewsView = styled.main`
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) ;
border-radius: 20px;
border-radius: 10px;
background-color: #FFFFFF;

2
src/styles/layouts/pld/PldView.ts
View File

@ -432,7 +432,7 @@ export const PldGraphView = styled.main`
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) ;
border-radius: 20px;
border-radius: 10px;
background-color: #FFFFFF;