Merge pull request mautic#7919 from kuzmany/fix-report-group-stats

All columns for agregators in Reports
MajesteitBart · Mar 11, 2020 · 7e67bdc · 7e67bdc
2 parents 9eca7f7 + a0daaa2
commit 7e67bdc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/app/bundles/PageBundle/EventListener/ReportSubscriber.php b/app/bundles/PageBundle/EventListener/ReportSubscriber.php
@@ -133,6 +133,10 @@ public function onReportBuilder(ReportBuilderEvent $event)
             $hitPrefix   = 'ph.';
             $redirectHit = 'r.';
             $hitColumns  = [
+                $hitPrefix.'id' => [
+                    'label' => 'mautic.page.report.hits.id',
+                    'type'  => 'int',
+                ],
                 $hitPrefix.'date_hit' => [
                     'label'          => 'mautic.page.report.hits.date_hit',
                     'type'           => 'datetime',

diff --git a/app/bundles/PageBundle/Translations/en_US/messages.ini b/app/bundles/PageBundle/Translations/en_US/messages.ini
@@ -124,6 +124,7 @@ mautic.page.report.variant_hits="A/B test hit count"
 mautic.page.report.variant_parent_id="A/B test parent ID"
 mautic.page.report.variant_parent_title="A/B test parent title"
 mautic.page.report.variant_start_date="A/B test start date"
+mautic.page.report.hits.id="Page hit ID"
 mautic.report.group.videos="Videos"
 mautic.video.hits="Video hits"
 mautic.page.report.hits.time_watched="Time watched"

diff --git a/app/bundles/ReportBundle/Assets/js/report.js b/app/bundles/ReportBundle/Assets/js/report.js
@@ -368,7 +368,7 @@ Mautic.getHighestIndex = function (selector) {
     var selectorChildren = mQuery('#' + selector + ' > div');
 
     selectorChildren.each(function() {
-        var index = mQuery(this).attr('id').split('_')[2];
+        var index = parseInt(mQuery(this).attr('id').split('_')[2]);
         highestIndex = (index > highestIndex) ? index : highestIndex;
     });
 

diff --git a/app/bundles/ReportBundle/Form/Type/ReportType.php b/app/bundles/ReportBundle/Form/Type/ReportType.php
@@ -247,7 +247,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'type'    => 'aggregator',
                         'label'   => false,
                         'options' => [
-                            'columnList' => $groupByColumns->choices,
+                            'columnList' => $columns->choices,
                             'required'   => false,
                         ],
                         'allow_add'    => true,