From 693b800f25f9a904010df965d84adc045be6c006 Mon Sep 17 00:00:00 2001 From: Zdeno Kuzmany Date: Thu, 3 Oct 2019 16:13:24 +0200 Subject: [PATCH 1/4] Add ratios to aggregators --- app/bundles/ReportBundle/Form/Type/ReportType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bundles/ReportBundle/Form/Type/ReportType.php b/app/bundles/ReportBundle/Form/Type/ReportType.php index e37635dd530..89994774651 100644 --- 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, From 16d7b4675ab547c0d774f1a020af2e84e2f332b3 Mon Sep 17 00:00:00 2001 From: Zdeno Kuzmany Date: Thu, 3 Oct 2019 16:27:46 +0200 Subject: [PATCH 2/4] Added Page hit ID to Page hits reports --- app/bundles/PageBundle/EventListener/ReportSubscriber.php | 4 ++++ app/bundles/PageBundle/Translations/en_US/messages.ini | 1 + 2 files changed, 5 insertions(+) diff --git a/app/bundles/PageBundle/EventListener/ReportSubscriber.php b/app/bundles/PageBundle/EventListener/ReportSubscriber.php index e46d58a4dba..9692e476fd7 100644 --- 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 index 6820a256c25..10296831387 100644 --- 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" From 085f47b1c2e91fae0f23d151047d6f37d52c7fa9 Mon Sep 17 00:00:00 2001 From: Zdeno Kuzmany Date: Tue, 8 Oct 2019 11:57:25 +0200 Subject: [PATCH 3/4] Fix lost index in aggregate column --- app/bundles/ReportBundle/Assets/js/report.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/bundles/ReportBundle/Assets/js/report.js b/app/bundles/ReportBundle/Assets/js/report.js index 859de8f32fc..d9d1113ccee 100644 --- a/app/bundles/ReportBundle/Assets/js/report.js +++ b/app/bundles/ReportBundle/Assets/js/report.js @@ -5,7 +5,7 @@ Mautic.reportOnLoad = function (container) { Mautic.activateSearchAutocomplete('list-search', 'report'); } - // Append an index of the number of filters on the edit form + // Append an index of the.371 number of filters on the edit form if (mQuery('div[id=report_filters]').length) { mQuery('div[id=report_filters]').attr('data-index', Mautic.getHighestIndex('report_filters')); mQuery('div[id=report_tableOrder]').attr('data-index', Mautic.getHighestIndex('report_tableOrder')); @@ -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; }); From a0daaa2660b635a92799184c6fc462c4fdefdcc5 Mon Sep 17 00:00:00 2001 From: Zdeno Kuzmany Date: Tue, 8 Oct 2019 12:07:25 +0200 Subject: [PATCH 4/4] Revert small change --- app/bundles/ReportBundle/Assets/js/report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/bundles/ReportBundle/Assets/js/report.js b/app/bundles/ReportBundle/Assets/js/report.js index d9d1113ccee..909d322676a 100644 --- a/app/bundles/ReportBundle/Assets/js/report.js +++ b/app/bundles/ReportBundle/Assets/js/report.js @@ -5,7 +5,7 @@ Mautic.reportOnLoad = function (container) { Mautic.activateSearchAutocomplete('list-search', 'report'); } - // Append an index of the.371 number of filters on the edit form + // Append an index of the number of filters on the edit form if (mQuery('div[id=report_filters]').length) { mQuery('div[id=report_filters]').attr('data-index', Mautic.getHighestIndex('report_filters')); mQuery('div[id=report_tableOrder]').attr('data-index', Mautic.getHighestIndex('report_tableOrder'));