Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/76922
Change subject: fixed aggregation, added sum as default output
......................................................................
fixed aggregation, added sum as default output
Change-Id: Ie4697e82d0daf476cd9760a986065661d1bfd59e
---
M wikimetrics/models/report_nodes/aggregate_report.py
M wikimetrics/static/js/reportCreate.js
M wikimetrics/templates/reports.html
3 files changed, 11 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/22/76922/1
diff --git a/wikimetrics/models/report_nodes/aggregate_report.py
b/wikimetrics/models/report_nodes/aggregate_report.py
index b2b470c..fef5cf4 100644
--- a/wikimetrics/models/report_nodes/aggregate_report.py
+++ b/wikimetrics/models/report_nodes/aggregate_report.py
@@ -1,9 +1,12 @@
from wikimetrics.utils import stringify
from report import ReportNode
from multi_project_metric_report import MultiProjectMetricReport
+from celery.utils.log import get_task_logger
__all__ = ['AggregateReport']
+
+task_logger = get_task_logger(__name__)
class Aggregation(object):
@@ -60,21 +63,18 @@
def finish(self, multi_project_results):
aggregated_results = dict()
- # TODO: what in the world is going on with async / non-async results
- #multi_project_results = multi_project_results[0].result
-
if self.aggregate:
if self.aggregate_sum:
aggregated_results[Aggregation.SUM] = self.calculate(
multi_project_results,
Aggregation.SUM
)
- if self.aggregate_sum:
+ if self.aggregate_average:
aggregated_results[Aggregation.AVG] = self.calculate(
multi_project_results,
Aggregation.AVG
)
- if self.aggregate_sum:
+ if self.aggregate_std_deviation:
aggregated_results[Aggregation.STD] = self.calculate(
multi_project_results,
Aggregation.STD
diff --git a/wikimetrics/static/js/reportCreate.js
b/wikimetrics/static/js/reportCreate.js
index 8b690ee..35f02cd 100644
--- a/wikimetrics/static/js/reportCreate.js
+++ b/wikimetrics/static/js/reportCreate.js
@@ -180,9 +180,9 @@
function setAggregationOptions(list){
bareList = ko.utils.unwrapObservable(list);
ko.utils.arrayForEach(bareList, function(item){
- item.individualResults = ko.observable(true);
- item.aggregateResults = ko.observable(false);
- item.aggregateSum = ko.observable(false);
+ item.individualResults = ko.observable(false);
+ item.aggregateResults = ko.observable(true);
+ item.aggregateSum = ko.observable(true);
item.aggregateAverage = ko.observable(false);
item.aggregateStandardDeviation = ko.observable(false);
item.outputConfigured = ko.computed(function(){
diff --git a/wikimetrics/templates/reports.html
b/wikimetrics/templates/reports.html
index c86adea..1d00f29 100644
--- a/wikimetrics/templates/reports.html
+++ b/wikimetrics/templates/reports.html
@@ -24,9 +24,10 @@
<td data-bind="text: name, attr:{ title: parameters }"></td>
<td data-bind="if: status === 'SUCCESS'">
<div class="btn-group">
- <button class="btn btn-primary">Get Data</button>
<button class="btn btn-primary dropdown-toggle"
data-toggle="dropdown">
- <span class="caret"></span>
+ Get Data
+
+ <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a target="_blank" data-bind="attr: {href:
'/reports/result/' + result_key + '.json'}">as JSON</a></li>
--
To view, visit https://gerrit.wikimedia.org/r/76922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4697e82d0daf476cd9760a986065661d1bfd59e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <dandree...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
