Merge branch 'administativePages' into 'dev'

add milhar separator graphs

See merge request kluppsoftware/smart-energia-web!83
This commit is contained in:
José Corte 2022-06-28 18:58:35 +00:00
commit 796b57e705
3 changed files with 21 additions and 4 deletions

View File

@ -49,7 +49,16 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1,
datalabels: { datalabels: {
display: true, display: true,
color: barLabel? 'black' : "rgba(255, 255, 255, 0)", color: barLabel? 'black' : "rgba(255, 255, 255, 0)",
formatter: Math.round, formatter: (value, ctx) => {
let sum = 0;
const dataArr = ctx.chart.data.datasets[0].data;
dataArr.map(data => {
sum += data;
});
const result = `${parseFloat(value).toLocaleString('pt-br')}`
return value==null? null : result
},
anchor: "end", anchor: "end",
offset: -20, offset: -20,
align: "start", align: "start",

View File

@ -78,7 +78,6 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red
const currentTime = new Date(); const currentTime = new Date();
const labels = label const labels = label
const options: any = { const options: any = {
@ -88,12 +87,21 @@ export function LineBarChart2({ title, subtitle, data1, data2, data3, label, red
display: true, display: true,
color: barLabel? 'black' : "rgba(255, 255, 255, 0)", color: barLabel? 'black' : "rgba(255, 255, 255, 0)",
// backgroundColor: '#255488', // backgroundColor: '#255488',
formatter: Math.round,
anchor: "end", anchor: "end",
offset: -20, offset: -20,
align: "start", align: "start",
font: { font: {
size: 12 size: 12
},
formatter: (value, ctx) => {
let sum = 0;
const dataArr = ctx.chart.data.datasets[0].data;
dataArr.map(data => {
sum += data;
});
const result = `${parseFloat(value).toLocaleString('pt-br')}`
return value==null? null : result
} }
}, },
legend: { legend: {

View File

@ -46,7 +46,7 @@ export function SingleBar({ title, subtitle, dataProps, label, dataset, barLabel
sum += data; sum += data;
}); });
const percentage = (dataProps[ctx.dataIndex].econ_percentual*100).toFixed(0)+"%"; const percentage = (dataProps[ctx.dataIndex].econ_percentual*100).toFixed(0)+"%";
const result = `${parseFloat(value).toFixed(0)}\n ${percentage}` const result = `${parseFloat(value).toLocaleString('pt-br')}\n ${percentage}`
return value==null? null : result return value==null? null : result
}, },