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

Merge branch 'administativePages' into 'dev'

Browse Source 
changing button telemetry color

See merge request kluppsoftware/smart-energia-web!96
This commit is contained in:
José Corte 2022-07-01 18:52:13 +00:00
commit 4e53cf68b4
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

14
src/components/graph/Chart2.tsx
View File

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

10
src/components/header/Header.tsx
View File

@ -25,17 +25,17 @@ export default function Header({name, admin, children}: headerInterface) {
{children}
</section>
<section>
<div className='icon' >
<p>
olá, {name}
</p>
</div>
{
!admin && profile_picture?
<Image src={profile_picture} height={100} width={108}/>
:
<Image src='https://kluppdevelopment.s3.sa-east-1.amazonaws.com/avatars/zcgw6O0FxZgxRmIs97WMcUddKurQJcIqSxBLStSc.png' height={75} width={108}/>
}
<div className='icon' >
<p>
olá, {name}
</p>
</div>
</section>
</HeaderView>
)

3
src/pages/industryInfo/index.tsx
View File

@ -60,10 +60,9 @@ export default function industryInfo({userName}: any) {
<Header name={userName}>
<PageTitle title='Info Setorial' subtitle='Clique em "Baixar PDF", para fazer download do PDF' />
</Header>
<p>Um resumo das atualizações gerais do Setor Elétrico, com dados sobre geração consumo, demanda, meteorologia baseadas em informações do ONS, CCEE, ANEEL, 10 Maiores Jornais e Revistas e CPTEC</p>
<button onClick={() => handleDownloadPdf()}>Baixar PDF</button>
<p>Um resumo das atualizações gerais do Setor Elétrico, com dados sobre geração consumo, demanda, meteorologia baseadas em informações do ONS, CCEE, ANEEL, 10 Maiores Jornais e Revistas e CPTEC</p>
</IndustryInfoView>
)
}