Commit 94a2e0ae authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'GGMAC' into 'master'

Ggmac

See merge request !1224
parents 749c9ba8 1d76151b
......@@ -444,7 +444,7 @@ export default class DashboardFinancial extends React.Component {
if (this.state.report.value == 'summary') {
companyRev.push(item.periode)
mbRev.push(Number(item.value))
mrRev.push(Number(item.gp_margin))
mrRev.push(Number(item.gp_margin).toFixed(1))
} else {
companyRev.push(handleName(item.company))
mbRev.push(Number(item.value_mb))
......@@ -502,7 +502,6 @@ export default class DashboardFinancial extends React.Component {
max: maxRev,
interval: intervalRev,
axisLabel: {
formatter: '{value}%',
interval: 0,
// rotate: 10,
textStyle: {
......@@ -581,7 +580,7 @@ export default class DashboardFinancial extends React.Component {
if (this.state.report.value == 'summary') {
companyTPAT.push(item.periode)
mbTPAT.push(Number(item.value))
mrTPAT.push(Number(item.gp_margin))
mrTPAT.push(Number(item.gp_margin).toFixed(1))
} else {
companyTPAT.push(handleName(item.company))
mbTPAT.push(Number(item.value_mb))
......@@ -706,7 +705,7 @@ export default class DashboardFinancial extends React.Component {
if (this.state.report.value == 'summary') {
companyEBITDA.push(item.periode)
mbEBITDA.push(Number(item.value))
mrEBITDA.push(Number(item.gp_margin))
mrEBITDA.push(Number(item.gp_margin).toFixed(1))
} else {
companyEBITDA.push(handleName(item.company))
mbEBITDA.push(Number(item.value_mb))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment