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 
preparando para release

See merge request kluppsoftware/smart-energia-web!99
This commit is contained in:
José Corte 2022-07-05 13:37:51 +00:00
commit 346b66f96e
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,11 +89,11 @@ 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>0? value.custo_unit : ''), data: data1.map(value => value.custo_unit>0? value.custo_unit : null),
// backgroundColor: '#255488' 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', '#255488');
}, // },
}, },
{ {
label: dataset2? dataset2 : '2022', label: dataset2? dataset2 : '2022',

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

@ -8,7 +8,6 @@ export const ChartCardView = styled.article`
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
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) ;

2
src/pages/aboutUs/index.tsx
View File

@ -18,7 +18,7 @@ export default function aboutUs({userName, text}) {
<Header name={userName}/> <Header name={userName}/>
<Banner title='Quem Somos' subtitle='Soluções inteligentes em Gestão de Energia' imgSource='/assets/banners/aboutUsBanner.png' /> <Banner title='Quem Somos' subtitle='Soluções inteligentes em Gestão de Energia' imgSource='/assets/banners/aboutUsBanner.png' />
<section dangerouslySetInnerHTML={{__html: text[0].about}}/> <section dangerouslySetInnerHTML={{__html: text[0]?.about}}/>
<article> <article>
<aside> <aside>
<h2>Apoio a projetos sociais</h2> <h2>Apoio a projetos sociais</h2>

8
src/pages/pld/index.tsx
View File

@ -202,6 +202,14 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) {
if (parseFloat(a.year_month_formatted.slice(0,2)) > parseFloat(b.year_month_formatted.slice(1,2))) return 1 if (parseFloat(a.year_month_formatted.slice(0,2)) > parseFloat(b.year_month_formatted.slice(1,2))) return 1
if (parseFloat(a.year_month_formatted.slice(0,2)) < parseFloat(b.year_month_formatted.slice(1,2))) return -1 if (parseFloat(a.year_month_formatted.slice(0,2)) < parseFloat(b.year_month_formatted.slice(1,2))) return -1
return 0
}).sort((a, b) => {
if (parseFloat(a.year_month_formatted.slice(3,7)) > parseFloat(b.year_month_formatted.slice(3,7))) return 1
if (parseFloat(a.year_month_formatted.slice(3,7)) < parseFloat(b.year_month_formatted.slice(3,7))) return -1
console.log(a.year_month_formatted.slice(3,7))
console.log(b.year_month_formatted.slice(3,7))
return 0 return 0
}).map(data => { }).map(data => {
return <> return <>

2
src/pages/resumoOperacao/index.tsx
View File

@ -127,7 +127,7 @@ export default function ResumoOperacao({tableData, clientsData, userName, client
<MenuItem value={''}>Todos</MenuItem> <MenuItem value={''}>Todos</MenuItem>
{ {
clientMonth.map((value) => { clientMonth.map((value) => {
return <MenuItem key={1} value={value.mes}>{monthLabels[parseFloat(value.mes.slice(3, 4))-1]}</MenuItem> return <MenuItem key={1} value={value.mes}>{value.mes}</MenuItem>
}) })
} }
</Select> </Select>

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

@ -11,8 +11,8 @@ export const AboutUsView = styled.main`
align-items: center; align-items: center;
aside { aside {
position: absolute; position: relative;
margin-bottom: 150px; /* margin-bottom: 150px; */
display: flex; display: flex;
justify-content: center; justify-content: center;