diff --git a/module/chart/js/common.js b/module/chart/js/common.js index 715932d691..0f258b38b7 100644 --- a/module/chart/js/common.js +++ b/module/chart/js/common.js @@ -17,6 +17,12 @@ function ajaxGetChart(check = true, chart = DataStorage.chart, echart = window.e var data = JSON.parse(resp); if(echart) { + if(chartParams.settings[0].type == 'waterpolo') + { + data.series[0].label.formatter = function(params) { return (params.value * 100).toFixed(2) + '%';}; + data.tooltip.formatter = function(params) { return (params.value * 100).toFixed(2) + '%';}; + } + echart.resize(); echart.clear(); echart.setOption(data, true); diff --git a/module/chart/model.php b/module/chart/model.php index f585c3f418..ec3412b2e1 100644 --- a/module/chart/model.php +++ b/module/chart/model.php @@ -620,9 +620,9 @@ class chartModel extends model $molecule = $this->dao->query($moleculeSQL)->fetch(); $denominator = $this->dao->query($denominatorSQL)->fetch(); - $percent = round($molecule->count / $denominator->count, 2); + $percent = round($molecule->count / $denominator->count, 4); - $series = array(array('type' => 'liquidFill', 'data' => array($percent), 'outline' => array('show' => false), 'label' => array('fontSize' => 30))); + $series = array(array('type' => 'liquidFill', 'data' => array($percent), 'outline' => array('show' => false), 'label' => array('fontSize' => 26))); $tooltip = array('show' => true); $options = array('series' => $series, 'tooltip' => $tooltip);