mirror of
https://github.com/umami-software/umami.git
synced 2026-02-04 04:37:11 +01:00
Add timezone to report queries.
This commit is contained in:
parent
820ad69d60
commit
29a943df9c
7 changed files with 32 additions and 6 deletions
|
|
@ -172,6 +172,8 @@ export const labels = defineMessages({
|
|||
browser: { id: 'label.browser', defaultMessage: 'Browser' },
|
||||
device: { id: 'label.device', defaultMessage: 'Device' },
|
||||
pageTitle: { id: 'label.pageTitle', defaultMessage: 'Page title' },
|
||||
day: { id: 'label.day', defaultMessage: 'Day' },
|
||||
date: { id: 'label.date', defaultMessage: 'Date' },
|
||||
});
|
||||
|
||||
export const messages = defineMessages({
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ export const ReportContext = createContext(null);
|
|||
export function Report({ reportId, defaultParameters, children, ...props }) {
|
||||
const report = useReport(reportId, defaultParameters);
|
||||
|
||||
//console.log({ report });
|
||||
|
||||
return (
|
||||
<ReportContext.Provider value={{ ...report }}>
|
||||
<Page {...props} className={styles.container}>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,12 @@ import { useContext } from 'react';
|
|||
import { GridTable, GridColumn } from 'react-basics';
|
||||
import { ReportContext } from '../Report';
|
||||
import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
|
||||
import { useMessages } from 'hooks';
|
||||
import { dateFormat } from 'lib/date';
|
||||
import styles from './RetentionTable.module.css';
|
||||
|
||||
export function RetentionTable() {
|
||||
const { formatMessage, labels } = useMessages();
|
||||
const { report } = useContext(ReportContext);
|
||||
const { data } = report || {};
|
||||
|
||||
|
|
@ -19,21 +22,27 @@ export function RetentionTable() {
|
|||
return arr;
|
||||
}, []);
|
||||
|
||||
const days = Array(14).fill(null);
|
||||
const days = Array(32).fill(null);
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className={styles.table}>
|
||||
<div className={styles.row}>
|
||||
<div className={styles.date}>{formatMessage(labels.date)}</div>
|
||||
{days.map((n, i) => (
|
||||
<div key={i} className={styles.header}>
|
||||
Day {i}
|
||||
{formatMessage(labels.day)} {i}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
{dates.map((date, i) => {
|
||||
return (
|
||||
<div key={i} className={styles.row}>
|
||||
<div className={styles.date}>
|
||||
{dateFormat(date, 'P')}
|
||||
<br />
|
||||
{date}
|
||||
</div>
|
||||
{days.map((n, day) => {
|
||||
return (
|
||||
<div key={day} className={styles.cell}>
|
||||
|
|
|
|||
|
|
@ -26,3 +26,7 @@
|
|||
background: var(--blue100);
|
||||
border-radius: var(--border-radius);
|
||||
}
|
||||
|
||||
.date {
|
||||
min-width: 200px;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue