Adds option to format metrics in export overlay

matomo-org · May 31, 2018 · 89d936c · 89d936c
1 parent 3c47e97
commit 89d936c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
@@ -308,6 +308,7 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'CoreHome_DataTableExcludeAggregateRows';
         $translationKeys[] = 'CoreHome_Default';
         $translationKeys[] = 'CoreHome_PageOf';
+        $translationKeys[] = 'CoreHome_FormatMetrics';
         $translationKeys[] = 'CoreHome_FlattenDataTable';
         $translationKeys[] = 'CoreHome_UnFlattenDataTable';
         $translationKeys[] = 'CoreHome_ExternalHelp';

diff --git a/plugins/CoreHome/angularjs/report-export/reportexport.directive.js b/plugins/CoreHome/angularjs/report-export/reportexport.directive.js
@@ -117,6 +117,10 @@
                         exportUrlParams.expanded = 1;
                     }
 
+                    if (scope.optionFormatMetrics) {
+                        exportUrlParams.format_metrics = 1;
+                    }
+
                     if (dataTable.param.pivotBy) {
                         exportUrlParams.pivotBy = dataTable.param.pivotBy;
                         exportUrlParams.pivotByColumnLimit = 20;
@@ -166,12 +170,13 @@
                     var popover   = Piwik_Popover.showLoading('Export');
                     var formats   = JSON.parse(scope.reportFormats);
 
-                    scope.reportType     = 'default';
-                    scope.reportLimit    = dataTable.param.filter_limit > 0 ? dataTable.param.filter_limit : 100;
-                    scope.reportLimitAll = dataTable.param.filter_limit == -1 ? 'yes' : 'no';
-                    scope.optionFlat     = dataTable.param.flat;
-                    scope.optionExpanded = 1;
-                    scope.hasSubtables   = dataTable.param.flat == 1 || dataTable.numberOfSubtables > 0;
+                    scope.reportType          = 'default';
+                    scope.reportLimit         = dataTable.param.filter_limit > 0 ? dataTable.param.filter_limit : 100;
+                    scope.reportLimitAll      = dataTable.param.filter_limit == -1 ? 'yes' : 'no';
+                    scope.optionFlat          = dataTable.param.flat;
+                    scope.optionExpanded      = 1;
+                    scope.optionFormatMetrics = 0;
+                    scope.hasSubtables        = dataTable.param.flat == 1 || dataTable.numberOfSubtables > 0;
 
                     scope.availableReportFormats = {
                         default: formats,

diff --git a/plugins/CoreHome/angularjs/report-export/reportexport.popover.html b/plugins/CoreHome/angularjs/report-export/reportexport.popover.html
@@ -18,6 +18,11 @@
              ng-model="$parent.optionExpanded" ng-show="$parent.hasSubtables && !$parent.optionFlat"
         >
         </div>
+        <div piwik-field uicontrol="checkbox" name="option_format_metrics"
+             title="{{ 'CoreHome_FormatMetrics'|translate }}"
+             ng-model="$parent.optionFormatMetrics"
+        >
+        </div>
     </div>
 
     <div class="col l6">

diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json
@@ -25,6 +25,7 @@
         "ExcludeRowsWithLowPopulation": "All rows are shown %s Exclude low population",
         "ExternalHelp": "Help (opens in new tab)",
         "FlattenDataTable": "The report is hierarchical %s Make it flat",
+        "FormatMetrics": "Format metrics",
         "HomeShortcut": "Home",
         "HowMuchIsPiwikWorth": "How much is Matomo worth to you?",
         "IncludeRowsWithLowPopulation": "Rows with low population are hidden %s Show all rows",