diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js index 065a96dcd..fd020cfa1 100644 --- a/assets/js/dashboard/stats/visitor-graph.js +++ b/assets/js/dashboard/stats/visitor-graph.js @@ -6,21 +6,21 @@ import numberFormatter from '../number-formatter' import { isToday, shiftMonths, formatMonth } from '../date' import * as api from '../api' -function dataSets(graphData, ctx) { +function mainSet(plot, present_index, ctx) { var gradient = ctx.createLinearGradient(0, 0, 0, 300); gradient.addColorStop(0, 'rgba(101,116,205, 0.2)'); gradient.addColorStop(1, 'rgba(101,116,205, 0)'); - if (graphData.present_index) { - var dashedPart = graphData.plot.slice(graphData.present_index - 1); - var dashedPlot = (new Array(graphData.plot.length - dashedPart.length)).concat(dashedPart) - for(var i = graphData.present_index; i < graphData.plot.length; i++) { - graphData.plot[i] = undefined + if (present_index) { + var dashedPart = plot.slice(present_index - 1); + var dashedPlot = (new Array(plot.length - dashedPart.length)).concat(dashedPart) + for(var i = present_index; i < plot.length; i++) { + plot[i] = undefined } return [{ label: 'Visitors', - data: graphData.plot, + data: plot, borderWidth: 3, borderColor: 'rgba(101,116,205)', pointBackgroundColor: 'rgba(101,116,205)', @@ -38,7 +38,7 @@ function dataSets(graphData, ctx) { } else { return [{ label: 'Visitors', - data: graphData.plot, + data: plot, borderWidth: 3, borderColor: 'rgba(101,116,205)', pointBackgroundColor: 'rgba(101,116,205)', @@ -47,6 +47,57 @@ function dataSets(graphData, ctx) { } } +function compareSet(plot, present_index, ctx) { + var gradient = ctx.createLinearGradient(0, 0, 0, 300); + gradient.addColorStop(0, 'rgba(255, 68, 87, .2)'); + gradient.addColorStop(1, 'rgba(255, 68, 87, 0)'); + + if (present_index) { + var dashedPart = plot.slice(present_index - 1); + var dashedPlot = (new Array(plot.length - dashedPart.length)).concat(dashedPart) + for(var i = present_index; i < plot.length; i++) { + plot[i] = undefined + } + + return [{ + label: 'Conversions', + data: plot, + borderWidth: 3, + borderColor: 'rgba(255, 68, 87, 1)', + pointBackgroundColor: 'rgba(255, 68, 87, 1)', + backgroundColor: gradient, + }, + { + label: 'Conversions', + data: dashedPlot, + borderWidth: 3, + borderDash: [5, 10], + borderColor: 'rgba(255, 68, 87, 1)', + pointBackgroundColor: 'rgba(255, 68, 87, 1)', + backgroundColor: gradient, + }] + } else { + return [{ + label: 'Conversions', + data: plot, + borderWidth: 3, + borderColor: 'rgba(101,116,205)', + pointBackgroundColor: 'rgba(101,116,205)', + backgroundColor: gradient, + }] + } +} + +function dataSets(graphData, ctx) { + const dataSets = mainSet(graphData.plot, graphData.present_index, ctx) + + if (graphData.compare_plot) { + return dataSets.concat(compareSet(graphData.compare_plot, graphData.present_index, ctx)) + } else { + return dataSets + } +} + const MONTHS = [ "January", "February", "March", "April", "May", "June", "July", @@ -87,31 +138,39 @@ class LineGraph extends React.Component { animation: false, legend: {display: false}, responsive: true, - elements: {line: {tension: 0.1}, point: {radius: 0}}, + elements: {line: {tension: 0}, point: {radius: 0}}, onClick: this.onClick.bind(this), tooltips: { mode: 'index', intersect: false, xPadding: 10, yPadding: 10, - titleFontSize: 16, + titleFontSize: 18, footerFontSize: 14, - footerFontColor: '#e6e8ff', + bodyFontSize: 14, backgroundColor: 'rgba(25, 30, 56)', + titleMarginBottom: 8, + bodySpacing: 6, + footerMarginTop: 8, + xPadding: 16, + yPadding: 12, + multiKeyBackground: 'none', callbacks: { title: function(dataPoints) { const data = dataPoints[0] - const formatDate = dateFormatter(graphData) - if (graphData.interval === 'month') { - return data.yLabel.toLocaleString() + ' visitors in ' + formatDate(data.xLabel) - } else if (graphData.interval === 'date') { - return data.yLabel.toLocaleString() + ' visitors on ' + formatDate(data.xLabel) - } else if (graphData.interval === 'hour') { - return data.yLabel.toLocaleString() + ' visitors at ' + formatDate(data.xLabel) + return dateFormatter(graphData)(data.xLabel) + }, + beforeBody: function() { + this.drawnLabels = {} + }, + label: function(item) { + const dataset = this._data.datasets[item.datasetIndex] + if (!this.drawnLabels[dataset.label]) { + this.drawnLabels[dataset.label] = true + return ` ${item.yLabel} ${dataset.label}` } }, - label: function() {}, - afterBody: function(dataPoints) { + footer: function(dataPoints) { if (graphData.interval === 'month') { return 'Click to view month' } else if (graphData.interval === 'date') { diff --git a/lib/plausible/stats/stats.ex b/lib/plausible/stats/stats.ex index 6b9e30497..fe7da7588 100644 --- a/lib/plausible/stats/stats.ex +++ b/lib/plausible/stats/stats.ex @@ -29,37 +29,59 @@ defmodule Plausible.Stats do end) groups = Repo.all( - from e in base_query(site, query), + from e in base_query(site, %{query | filters: %{}}), group_by: 1, order_by: 1, select: {fragment("date_trunc('month', ? at time zone 'utc' at time zone ?)", e.timestamp, ^site.timezone), count(e.user_id, :distinct)} ) |> Enum.into(%{}) |> transform_keys(fn dt -> NaiveDateTime.to_date(dt) end) + compare_groups = if query.filters["goal"] do + Repo.all( + from e in base_query(site, query), + group_by: 1, + order_by: 1, + select: {fragment("date_trunc('month', ? at time zone 'utc' at time zone ?)", e.timestamp, ^site.timezone), count(e.user_id, :distinct)} + ) |> Enum.into(%{}) + |> transform_keys(fn dt -> NaiveDateTime.to_date(dt) end) + end + present_index = Enum.find_index(steps, fn step -> step == Timex.now(site.timezone) |> Timex.to_date |> Timex.beginning_of_month end) plot = Enum.map(steps, fn step -> groups[step] || 0 end) + compare_plot = compare_groups && Enum.map(steps, fn step -> compare_groups[step] || 0 end) labels = Enum.map(steps, fn step -> Timex.format!(step, "{ISOdate}") end) - {plot, labels, present_index} + {plot, compare_plot, labels, present_index} end def calculate_plot(site, %Query{step_type: "date"} = query) do steps = Enum.into(query.date_range, []) groups = Repo.all( - from e in base_query(site, query), + from e in base_query(site, %{ query | filters: %{} }), group_by: 1, order_by: 1, select: {fragment("date_trunc('day', ? at time zone 'utc' at time zone ?)", e.timestamp, ^site.timezone), count(e.user_id, :distinct)} ) |> Enum.into(%{}) |> transform_keys(fn dt -> NaiveDateTime.to_date(dt) end) + compare_groups = if query.filters["goal"] do + Repo.all( + from e in base_query(site, query), + group_by: 1, + order_by: 1, + select: {fragment("date_trunc('day', ? at time zone 'utc' at time zone ?)", e.timestamp, ^site.timezone), count(e.user_id, :distinct)} + ) |> Enum.into(%{}) + |> transform_keys(fn dt -> NaiveDateTime.to_date(dt) end) + end + present_index = Enum.find_index(steps, fn step -> step == Timex.now(site.timezone) |> Timex.to_date end) steps_to_show = if present_index, do: present_index + 1, else: Enum.count(steps) plot = Enum.map(steps, fn step -> groups[step] || 0 end) |> Enum.take(steps_to_show) + compare_plot = compare_groups && Enum.map(steps, fn step -> compare_groups[step] || 0 end) labels = Enum.map(steps, fn step -> Timex.format!(step, "{ISOdate}") end) - {plot, labels, present_index} + {plot, compare_plot, labels, present_index} end def calculate_plot(site, %Query{step_type: "hour"} = query) do @@ -85,7 +107,7 @@ defmodule Plausible.Stats do steps_to_show = if present_index, do: present_index + 1, else: Enum.count(steps) plot = Enum.map(steps, fn step -> groups[step] || 0 end) |> Enum.take(steps_to_show) labels = Enum.map(steps, fn step -> NaiveDateTime.to_iso8601(step) end) - {plot, labels, present_index} + {plot, [], labels, present_index} end def pageviews_and_visitors(site, query) do diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex index e98bca76f..7bc407fc9 100644 --- a/lib/plausible_web/controllers/api/stats_controller.ex +++ b/lib/plausible_web/controllers/api/stats_controller.ex @@ -12,10 +12,11 @@ defmodule PlausibleWeb.Api.StatsController do {pageviews, visitors} = Stats.pageviews_and_visitors(site, query) {change_pageviews, change_visitors} = Stats.compare_pageviews_and_visitors(site, query, {pageviews, visitors}) conversion_rate = if query.filters["goal"], do: Stats.conversion_rate(site, query) - {plot, labels, present_index} = Task.await(plot_task) + {plot, compare_plot, labels, present_index} = Task.await(plot_task) json(conn, %{ plot: plot, + compare_plot: compare_plot, labels: labels, present_index: present_index, pageviews: pageviews,