lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2266 from mwillbanks/hotfix/metrics-average-always-sums

Browse Source 
Metrics: Calculation set to average always sums
This commit is contained in:
James Brooks
2017-01-02 14:16:15 +00:00
committed by GitHub
parent fede69b871 4e2c6bce0d
commit 8b5a4fce28
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/MetricPoint.php
View File

@@ -83,8 +83,6 @@ class MetricPoint extends Model implements HasPresenter
{
if ($this->metric->calc_type === Metric::CALC_SUM) {
return round((float) $value * $this->counter, $this->metric->places);
} elseif ($this->metric->calc_type === Metric::CALC_AVG) {
return round((float) $value * $this->counter, $this->metric->places);
}
return round((float) $value, $this->metric->places);

2
app/Repositories/Metric/AbstractMetricRepository.php
View File

@@ -85,7 +85,7 @@ abstract class AbstractMetricRepository
if (!isset($metric->calc_type) || $metric->calc_type == Metric::CALC_SUM) {
return "sum({$this->getMetricPointsTable()}.value * {$this->getMetricPointsTable()}.counter) AS value";
} elseif ($metric->calc_type == Metric::CALC_AVG) {
return "avg({$this->getMetricPointsTable()}.value * {$this->getMetricPointsTable()}.counter) AS value";
return "avg({$this->getMetricPointsTable()}.value) AS value";
} else {
return "sum({$this->getMetricPointsTable()}.value * {$this->getMetricPointsTable()}.counter) AS value";
}