Skip to content

Commit

Permalink
Add goal report metadata for overview. (#14164)
Browse files Browse the repository at this point in the history 
* Add goal report metadata for overview.

* Fix some tests + correct goal name.

* another tweak to the name

* Update expected files.
  • Loading branch information
@diosmosis
diosmosis authored Mar 7, 2019
1 parent e6a9dfa commit 7153700
Show file tree
Hide file tree
Showing 12 changed files with 973 additions and 4 deletions.
353 changes: 353 additions & 0 deletions ...hItems_schedrep_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
View file

Large diffs are not rendered by default.

332 changes: 332 additions & 0 deletions ...erWithItems_schedrep_html_tables_only__ScheduledReports.generateReport_week.original.html
View file

Large diffs are not rendered by default.

37 changes: 37 additions & 0 deletions ...commerceOrderWithItems_schedrep_in_csv__ScheduledReports.generateReport_week.original.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,43 @@ label,nb_conversions,revenue
121-364 days,0,$ 0
365+ days,0,$ 0

Goals Overview
nb_conversions,nb_visits_converted,revenue,conversion_rate
4,2,$ 13351.11,40%

Goals Overview - Visits to Conversion
label,nb_conversions
1 visit,1
2 visits,0
3 visits,0
4 visits,0
5 visits,0
6 visits,0
7 visits,0
8 visits,0
9-14 visits,0
15-25 visits,0
26-50 visits,0
51-100 visits,0
101+ visits,0

Goals Overview - Days to Conversion
label,nb_conversions
0 days,1
1 day,0
2 days,0
3 days,0
4 days,0
5 days,0
6 days,0
7 days,0
8-14 days,0
15-30 days,0
31-60 days,0
61-120 days,0
121-364 days,0
365+ days,0

Goal title match triggered ONCE
nb_conversions,nb_visits_converted,revenue,conversion_rate
1,1,$ 10,20%
Expand Down
Binary file modified ...rWithItems_schedrep_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf
View file
Binary file not shown.
13 changes: 12 additions & 1 deletion plugins/Goals/Reports/Base.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

use Piwik\API\Request;
use Piwik\Common;
use Piwik\Piwik;
use Piwik\Plugins\Goals\API;
use Piwik\Plugins\Goals\Goals;

Expand All @@ -22,7 +23,7 @@ protected function init()
$this->categoryId = 'Goals_Goals';
}

protected function addReportMetadataForEachGoal(&$availableReports, $infos, $goalNameFormatter)
protected function addReportMetadataForEachGoal(&$availableReports, $infos, $goalNameFormatter, $isGoalSummaryReport = false)
{
$idSite = $this->getIdSiteFromInfos($infos);
$goals = $this->getGoalsForIdSite($idSite);
Expand All @@ -37,6 +38,16 @@ protected function addReportMetadataForEachGoal(&$availableReports, $infos, $goa
$availableReports[] = $this->buildReportMetadata();
}

// for goal overview
if ($isGoalSummaryReport) {
$this->name = Piwik::translate('Goals_GoalsOverview');
} else {
$this->name = $goalNameFormatter(['name' => Piwik::translate('Goals_GoalsOverview')]);
}
$this->parameters = ['idGoal' => 0];
$this->order = $this->orderGoal;
$availableReports[] = $this->buildReportMetadata();

$this->init();
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/Goals/Reports/Get.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,6 @@ public function configureReportMetadata(&$availableReports, $infos)

$this->addReportMetadataForEachGoal($availableReports, $infos, function ($goal) {
return Piwik::translate('Goals_GoalX', $goal['name']);
});
}, $isSummary = true);
}
}
89 changes: 89 additions & 0 deletions ...tDays_schedrep_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,21 @@ <h2 style="color:#212121;font-family:-apple-system, BlinkMacSystemFont, &#039;Se
<a href="#Goals_getDaysToConversion" style="text-decoration:none; color: #0d0d0d;">
Days to Conversion
</a>
</li>
<li style="font-size:15px;line-height:24px;">
<a href="#Goals_get_idGoal--0" style="text-decoration:none; color: #0d0d0d;">
Goals Overview
</a>
</li>
<li style="font-size:15px;line-height:24px;">
<a href="#Goals_getVisitsUntilConversion_idGoal--0" style="text-decoration:none; color: #0d0d0d;">
Goals Overview - Visits to Conversion
</a>
</li>
<li style="font-size:15px;line-height:24px;">
<a href="#Goals_getDaysToConversion_idGoal--0" style="text-decoration:none; color: #0d0d0d;">
Goals Overview - Days to Conversion
</a>
</li>
<li style="font-size:15px;line-height:24px;">
<a href="#ExampleUI_getTemperatures" style="text-decoration:none; color: #0d0d0d;">
Expand Down Expand Up @@ -5622,6 +5637,80 @@ <h2 id="Goals_getDaysToConversion" style=" color:#0d0d0d;font-family:-apple-syst

There is no data for this report.

<h2 id="Goals_get_idGoal--0" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;">
Goals Overview
</h2>

<img alt=""
src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAEfklEQVR4nO3cS1biQABA0ehxJ+x/SayFHtCHTufHE+IHuHckEqoqTuqRCG+n02nYw+FwOB6Pew01DMM9o+24mIebHQC+yPvhcDhv0heTh/f71IDnHfeGTffqLLufFwC8lPefXsD38e4fAO7xMQzD8XhcvKI+fmu+uOMuvne//PL8kvPD8R2HyQHz114Oni/gvM75auezLK4kLmA86WTGxTEXB9yYBQAe0cfaE5ONeXGf3t4jLzcaJkdODhiPOdmeFxew2DfzWcYP136+esrz38/HWRw8zggAD+Tv7YnJ2/rfLG7AO+7T20MtPqsSAHg+/640rN2k+Kxf/g+Jlzy67UwfJa0AYHertyduM7ksf8MB32DjNse237B4APgp/3164uabFM+3g37FGT3fXwmAl7J6pWHxwwtrB4yv+c+3xvGzvUuuLmBjlo3DNj7UsHhGG0uaDFgWCQCP622vb4R8PuX+hU9GAPA6dv6fhkfnsgEArHGlAQBIXuhrpAGAe4gGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBAIhoAgEQ0AACJaAAAEtEAACSiAQBIRAMAkIgGACARDQBA8gczQRugNvGghAAAAABJRU5ErkJggg=="
height="200"
width="700"
margin="0 auto"/>

<br/>
<br/>

<table style="border-collapse:collapse; border:1px solid rgb(231,231,231); padding:5px;">
<thead style="background-color: #f2f2f2;">
<th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
&nbsp;Name&nbsp;&nbsp;
</th>
<th style="border-bottom:1px solid rgb(231,231,231);font-size: 15px;text-align: left;font-weight:normal;padding:13px 0 13px 10px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; text-align:right;">
&nbsp;Value&nbsp;&nbsp;
</th>
</thead>
<tbody>

<tr style=";">
<td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
Conversions </td>
<td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
0
</td>
</tr>

<tr style="background-color: #f2f2f2;">
<td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
Visits with Conversions </td>
<td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
0
</td>
</tr>

<tr style=";">
<td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
Revenue </td>
<td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
$ 0
</td>
</tr>

<tr style="background-color: #f2f2f2;">
<td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
Conversion Rate </td>
<td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;">
0%
</td>
</tr>
</tbody>
</table>
<p style="width: 100%; text-align:center;">
<a style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif;; text-decoration:none; font-size: 9pt;" href="#reportTop">
Back to top &#8593;
</a></p>

<h2 id="Goals_getVisitsUntilConversion_idGoal--0" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;">
Goals Overview - Visits to Conversion
</h2>

There is no data for this report.

<h2 id="Goals_getDaysToConversion_idGoal--0" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;">
Goals Overview - Days to Conversion
</h2>

There is no data for this report.

<h2 id="ExampleUI_getTemperatures" style=" color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, &#039;Segoe UI&#039;, Roboto, Oxygen-Sans, Cantarell, &#039;Helvetica Neue&#039;, sans-serif; font-size: 24pt; font-weight:normal; margin:45px 0 30px 0;">
Data tables
</h2>
Expand Down
Loading

0 comments on commit 7153700

Please sign in to comment.