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

fixing more changes

Browse Source
This commit is contained in:
joseCorte-exe 2022-07-04 17:54:20 -03:00
parent fea40d3c4e
commit cecfd26402
6 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/graph/Chart.tsx
View File

@ -89,19 +89,19 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1,
datasets: [ datasets: [
{ {
label: dataset1? dataset1 : '2021', label: dataset1? dataset1 : '2021',
data: data1.map(value => value.custo_unit), data: data1.map(value => value.custo_unit>0? value.custo_unit : ''),
backgroundColor: '#C2d5fb' // backgroundColor: '#255488'
// backgroundColor: (value, ctx) => { backgroundColor: (value, ctx) => {
// return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb');
// }, },
}, },
{ {
label: dataset2? dataset2 : '2022', label: dataset2? dataset2 : '2022',
data: data2.map(value => value.custo_unit), data: data2.map(value => value.custo_unit>0? value.custo_unit : null),
backgroundColor: '#C2d5fb' // backgroundColor: '#C2d5fb'
// backgroundColor: (value, ctx) => { backgroundColor: (value, ctx) => {
// return data2[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb'); return data2[value.dataIndex]?.dad_estimado == false ? '#C2d5fb' : draw('diagonal-right-left', '#C2d5fb');
// }, },
} }
], ],
} }

4
src/components/graph/LineBarChart2.tsx
View File

@ -147,7 +147,7 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red
}, },
{ {
type: 'bar' as const, type: 'bar' as const,
label: dataset3? dataset3 : 'Dataset 2', label: dataset3? dataset3 : 'Dataset 3',
// backgroundColor: '#255488', // backgroundColor: '#255488',
backgroundColor: (value, ctx) => { backgroundColor: (value, ctx) => {
return hashurado? data1[value.dataIndex]?.dad_estimado == false? '#255488' : pattern.draw('diagonal', '#255488') : '#255488' return hashurado? data1[value.dataIndex]?.dad_estimado == false? '#255488' : pattern.draw('diagonal', '#255488') : '#255488'
@ -163,7 +163,7 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red
{ {
type: 'line', type: 'line',
label: 'Estimado', label: 'Estimado',
backgroundColor: pattern.draw('diagonal-right-left', '#C2d5fb'), backgroundColor: '#C2d5fb',
data: [], data: [],
} }
], ],

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

@ -8,7 +8,7 @@ export const ChartCardView = styled.article`
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
height: fit-content; max-height: 2rem;
background: #F8F8F8; background: #F8F8F8;
box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ; box-shadow: 0 0 11px rgba(0, 0, 0, 0.2) ;
@ -24,7 +24,7 @@ export const ChartCardView = styled.article`
background-color: black; background-color: black;
margin-bottom: 20px; margin-bottom: 10px;
} }
a { a {

7
src/pages/administrative/general.tsx
View File

@ -78,8 +78,9 @@ export default function index({userName, initialText}: any) {
Não cadastrado! Não cadastrado!
</Alert> </Alert>
</Snackbar> </Snackbar>
<Header name={userName} admin/> <Header name={userName} admin>
<PageTitle title='Sobre nós' subtitle='Alterar texto de sobre nós'/> <PageTitle title='Sobre nós' subtitle='Alterar texto de sobre nós'/>
</Header>
<div style={{width: '100%', display: 'flex', justifyContent: 'flex-start', alignItems: 'flex-start', marginTop: '30px', marginBottom: '10px'}}> <div style={{width: '100%', display: 'flex', justifyContent: 'flex-start', alignItems: 'flex-start', marginTop: '30px', marginBottom: '10px'}}>
<BasicButton title='Salvar Texto' onClick={() => handleRegisterAboutUs()}/> <BasicButton title='Salvar Texto' onClick={() => handleRegisterAboutUs()}/>
</div> </div>
@ -88,7 +89,7 @@ export default function index({userName, initialText}: any) {
<Editor <Editor
onInit={(evt, editor) => editorRef.current = editor} onInit={(evt, editor) => editorRef.current = editor}
onEditorChange={(newText) => setText(newText)} onEditorChange={(newText) => setText(newText)}
initialValue={initialText[0].about} initialValue={initialText[0]?.about}
init={{ init={{
height: 500, height: 500,
width: '100%', width: '100%',

4
src/pages/estimatedCost/index.tsx
View File

@ -3,8 +3,6 @@ import Head from 'next/head'
import { parseCookies } from 'nookies' import { parseCookies } from 'nookies'
import React from 'react' import React from 'react'
import Chart from '../../components/graph/Chart'
import { LineBarChart } from '../../components/graph/LineBarChart'
import { LineBarChart2 } from '../../components/graph/LineBarChart2' import { LineBarChart2 } from '../../components/graph/LineBarChart2'
import Header from '../../components/header/Header' import Header from '../../components/header/Header'
import PageTitle from '../../components/pageTitle/PageTitle' import PageTitle from '../../components/pageTitle/PageTitle'
@ -23,7 +21,7 @@ export default function EstimatedCost({graphData, userName}: any) {
</Header> </Header>
<section> <section>
<LineBarChart2 data1={graphData} data2={graphData} data3={graphData} <LineBarChart2 data1={graphData} data2={graphData} data3={graphData}
dataset1="Economia (R$)" dataset2='Cativo' dataset3='Livre' dataset1="Economia (R$)" dataset2='Est. Cativo' dataset3='Est. Livre'
label={ConsumoEstimado.label} title='' subtitle='' barLabel hashurado /> label={ConsumoEstimado.label} title='' subtitle='' barLabel hashurado />
</section> </section>
</EstimatedCostView> </EstimatedCostView>

2
src/styles/layouts/general/GeneralView.tsx
View File

@ -8,4 +8,6 @@ export const GeneralView = styled.main`
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
margin: 0;
` `