Changes "This Month" view to Month-to-date for current month (#491)

* Initial MTD

* Adds FE support

* Removes broken Day to Time, debug statements

* Changelog

* Cleans up conditional
pull/510/head
Vignesh Joglekar 6 years ago committed by GitHub
parent 49c4ec2e9c
commit e2599ffcc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file.
- Improve site listing UX and design plausible/analytics#438
- Improve onboarding UX and design plausible/analytics#441
- Allows outbound link tracking script to use new tab redirection plausible/analytics#494
- "This Month" view is now Month-to-date for the current month plausible/analytics#491
### Fixed
- Do not error when activating an already activated account plausible/analytics#370

@ -67,3 +67,7 @@ export function isSameMonth(date1, date2) {
export function isToday(site, date) {
return formatISO(date) === formatISO(nowForSite(site))
}
export function isThisMonth(site, date) {
return formatMonthYYYY(date) === formatMonthYYYY(nowForSite(site))
}

@ -2,7 +2,7 @@ import React from 'react';
import Transition from "../transition.js";
import { withRouter, Link } from 'react-router-dom'
import Flatpickr from "react-flatpickr";
import {shiftDays, shiftMonths, formatDay, formatDayShort, formatMonthYYYY, formatISO, isToday, lastMonth, nowForSite, isSameMonth} from './date'
import {shiftDays, shiftMonths, formatDay, formatDayShort, formatMonthYYYY, formatISO, isToday, lastMonth, nowForSite, isSameMonth, isThisMonth} from './date'
import { navigateToQuery, QueryLink } from './query.js'
@ -87,7 +87,11 @@ class DatePicker extends React.Component {
} else if (query.period === '30d') {
return 'Last 30 days'
} else if (query.period === 'month') {
return formatMonthYYYY(query.date)
if (isThisMonth(site, query.date)) {
return 'Month to Date'
} else {
return formatMonthYYYY(query.date)
}
} else if (query.period === '6mo') {
return 'Last 6 months'
} else if (query.period === '12mo') {
@ -198,7 +202,7 @@ class DatePicker extends React.Component {
</div>
<div className="border-t border-gray-200 dark:border-gray-500"></div>
<div className="py-1">
{ this.renderLink('month', 'This month') }
{ this.renderLink('month', 'Month to Date') }
{ this.renderLink('month', 'Last month', {date: lastMonth(this.props.site)}) }
</div>
<div className="border-t border-gray-200 dark:border-gray-500"></div>

@ -6,7 +6,19 @@ defmodule Plausible.Stats.Query do
Map.put(query, :date_range, Date.range(new_date, new_date))
end
def shift_back(query) do
def shift_back(%__MODULE__{period: "month"} = query, site) do
{new_first, new_last} = if Timex.compare(Timex.now(site.timezone), query.date_range.first, :month) == 0 do # Querying current month to date
diff = Timex.diff(Timex.beginning_of_month(Timex.now(site.timezone)), Timex.now(site.timezone), :days) - 1
{query.date_range.first |> Timex.shift(days: diff), Timex.now(site.timezone) |> Timex.shift(days: diff)}
else
diff = Timex.diff(query.date_range.first, query.date_range.last, :days) - 1
{query.date_range.first |> Timex.shift(days: diff), query.date_range.last |> Timex.shift(days: diff)}
end
Map.put(query, :date_range, Date.range(new_first, new_last))
end
def shift_back(query, _site) do
diff = Timex.diff(query.date_range.first, query.date_range.last, :days) - 1
new_first = query.date_range.first |> Timex.shift(days: diff)
new_last = query.date_range.last |> Timex.shift(days: diff)

@ -77,13 +77,14 @@ defmodule PlausibleWeb.Api.StatsController do
end
defp fetch_top_stats(site, query) do
prev_query = Query.shift_back(query)
prev_query = Query.shift_back(query, site)
{pageviews, visitors} = Stats.pageviews_and_visitors(site, query)
{prev_pageviews, prev_visitors} = Stats.pageviews_and_visitors(site, prev_query)
bounce_rate = Stats.bounce_rate(site, query)
prev_bounce_rate = Stats.bounce_rate(site, prev_query)
change_bounce_rate = if prev_bounce_rate > 0, do: bounce_rate - prev_bounce_rate
visit_duration =
if !query.filters["page"] do
duration = Stats.visit_duration(site, query)

Loading…
Cancel
Save