mirrors/thunderhub
1
0
Fork 0
mirror of https://github.com/apotdevin/thunderhub.git synced 2025-02-23 22:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Graphs should be bucketed per day (#420)

Browse source 
Co-authored-by: Anthony Potdevin <31413433+apotdevin@users.noreply.github.com>
This commit is contained in:
mutatrum 2022-04-04 10:45:41 +02:00 • committed by GitHub
parent 311a62d4d6
commit 280f00b97e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/client/src/components/chart/BarChart.tsx
View file

@ -53,10 +53,11 @@ const amountOfXTicks = (width: number) => {
}
};
const parseDate = timeParse('%Y-%m-%d');
const format = timeFormat('%b %d');
const formatDate = (date: string) => format(parseDate(date) as Date);
const parseDate = timeParse('%Y-%m-%dT%H:%M:%S.%L%Z');
const formatDate = timeFormat('%b %d');
const formatTime = timeFormat('%H:%M');
const tickFormatDate = (date: string) => formatDate(parseDate(date) as Date);
const tickFormatTime = (date: string) => formatTime(parseDate(date) as Date);
const tooltipStyles = {
...defaultStyles,
@ -196,7 +197,7 @@ const Chart = ({
<AxisBottom
numTicks={amountOfXTicks(width)}
top={yMax + margin.top}
tickFormat={formatDate}
tickFormat={data.length == 24 ? tickFormatTime : tickFormatDate}
scale={xScale}
stroke={axisColor}
tickStroke={axisColor}

36
src/client/src/views/dashboard/widgets/helpers.tsx
View file

@ -84,7 +84,7 @@ export const getByTime = (array: ArrayType, time: number): any[] => {
const isDay = time <= 1;
const today = new Date();
const today = isDay ? new Date().setMinutes(0, 0, 0) : new Date().setHours(0, 0, 0, 0);
array.forEach((transaction: ArrayType[0]) => {
if (!transaction?.__typename) return;
@ -93,8 +93,8 @@ export const getByTime = (array: ArrayType, time: number): any[] => {
if (!transaction.is_confirmed || !transaction.confirmed_at) return;
const difference = isDay
? 24 - differenceInHours(today, new Date(transaction.confirmed_at))
: time - differenceInDays(today, new Date(transaction.confirmed_at));
? differenceInHours(today, new Date(transaction.confirmed_at).setMinutes(0, 0, 0))
: differenceInDays(today, new Date(transaction.confirmed_at).setHours(0, 0, 0, 0));
transactions.push({
difference,
@ -105,8 +105,8 @@ export const getByTime = (array: ArrayType, time: number): any[] => {
if (!transaction.is_confirmed) return;
const difference = isDay
? 24 - differenceInHours(today, new Date(transaction.created_at))
: time - differenceInDays(today, new Date(transaction.created_at));
? differenceInHours(today, new Date(transaction.created_at).setMinutes(0, 0, 0))
: differenceInDays(today, new Date(transaction.created_at).setHours(0, 0, 0, 0));
transactions.push({
difference,
@ -115,12 +115,12 @@ export const getByTime = (array: ArrayType, time: number): any[] => {
});
} else if (transaction.__typename === 'Forward') {
const difference = isDay
? 24 - differenceInHours(today, new Date(transaction.created_at))
: time - differenceInDays(today, new Date(transaction.created_at));
? differenceInHours(today, new Date(transaction.created_at).setMinutes(0, 0, 0))
: differenceInDays(today, new Date(transaction.created_at).setHours(0, 0, 0, 0));
transactions.push({
difference,
date: transaction.created_at,
date: new Date(transaction.created_at).toISOString(),
tokens: Number(transaction.tokens),
fee: Number(transaction.fee),
});
@ -133,7 +133,7 @@ export const getByTime = (array: ArrayType, time: number): any[] => {
const final: any[] = [];
const differences = Array.from(
{ length: isDay ? 25 : time + 1 },
{ length: isDay ? 24 : time },
(_, i) => i
);
@ -145,12 +145,8 @@ export const getByTime = (array: ArrayType, time: number): any[] => {
amount: 0,
fee: 0,
date: isDay
? subHours(today, 24 - Number(key))
.toISOString()
.slice(0, 10)
: subDays(today, time - Number(key))
.toISOString()
.slice(0, 10),
? subHours(today, Number(key)).toISOString()
: subDays(today, Number(key)).toISOString(),
});
return;
}
@ -164,12 +160,8 @@ export const getByTime = (array: ArrayType, time: number): any[] => {
date: total.date
? total.date
: isDay
? subHours(today, 24 - Number(key))
.toISOString()
.slice(0, 10)
: subDays(today, time - Number(key))
.toISOString()
.slice(0, 10),
? subHours(today, Number(key)).toISOString()
: subDays(today, Number(key)).toISOString(),
};
},
{
@ -183,5 +175,5 @@ export const getByTime = (array: ArrayType, time: number): any[] => {
final.push(reduced);
});
return final;
return final.reverse();
};