Skip to content

Fix reports timestamps for all browsers #1348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 17, 2023
Merged

Fix reports timestamps for all browsers #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e801f5d
Fix reports timestamps
joanagmaia Aug 16, 2023
6b23b3e
Fix displayFormats for all granularities
joanagmaia Aug 16, 2023
96fc0e1
Fix total widget date format
joanagmaia Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions frontend/src/modules/report/templates/template-chart-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ const defaultChartOptions = (config) => ({
time: config.xType === 'time' && {
displayFormats: {
day: 'MMM DD, YYYY',
week: 'MMM DD, YYYY',
month: 'MMM DD, YYYY',
year: 'MMM DD, YYYY',
},
},
ticks: {
Expand Down
7 changes: 5 additions & 2 deletions frontend/src/modules/widget/components/activity/widget-total-activities.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ import ACTIVITIES_REPORT, { TOTAL_ACTIVITIES_WIDGET } from '@/modules/report/tem
import {
mapGetters,
} from '@/shared/vuex/vuex.helpers';
import { getTimeGranularityFromPeriod } from '@/utils/reports';
import { getTimeGranularityFromPeriod, parseAxisLabel } from '@/utils/reports';
import {
TOTAL_ACTIVITIES_QUERY,
} from '@/modules/widget/widget-queries';
Expand All @@ -95,12 +95,15 @@ const props = defineProps({
});

const period = ref(SEVEN_DAYS_PERIOD_FILTER);
const granularity = computed(() => getTimeGranularityFromPeriod(period.value));

const widgetChartOptions = chartOptions('area', {
legendPlugin: false,
xTicksCallback: (
value,
) => parseAxisLabel(value, granularity.value),
});

const granularity = computed(() => getTimeGranularityFromPeriod(period.value));
const datasets = computed(() => [
{
name: TOTAL_ACTIVITIES_WIDGET.name,
Expand Down
7 changes: 5 additions & 2 deletions frontend/src/modules/widget/components/member/widget-total-members.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ import {
mapGetters,
mapActions,
} from '@/shared/vuex/vuex.helpers';
import { getTimeGranularityFromPeriod } from '@/utils/reports';
import { getTimeGranularityFromPeriod, parseAxisLabel } from '@/utils/reports';
import {
TOTAL_MEMBERS_QUERY,
TOTAL_MEMBERS_FILTER,
Expand All @@ -122,11 +122,14 @@ const drawerExpanded = ref();
const drawerDate = ref();
const drawerTitle = ref();

const granularity = computed(() => getTimeGranularityFromPeriod(period.value));
const widgetChartOptions = chartOptions('area', {
legendPlugin: false,
xTicksCallback: (
value,
) => parseAxisLabel(value, granularity.value),
});

const granularity = computed(() => getTimeGranularityFromPeriod(period.value));
const datasets = computed(() => [
{
name: 'Total members',
Expand Down