lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: timezone conversion in dashboard graph

Browse source
This commit is contained in:
Sérgio Salgado 2021-04-29 20:08:23 +01:00 • committed by Josh Harvey
parent b2b4fedf42
commit b24c65e8bc
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js
View file

@ -76,21 +76,25 @@ const SystemPerformance = () => {
const [selectedRange, setSelectedRange] = useState('Day')
const { data, loading } = useQuery(GET_DATA)
const fiatLocale = fromNamespace('locale')(data?.config).fiatCurrency
const timezone = fromNamespace('locale')(data?.config).timezone
const isInRangeAndNoError = getLastTimePeriod => t => {
if (t.error !== null) return false
if (!getLastTimePeriod) {
return (
t.error === null &&
moment(t.created).isBetween(ranges[selectedRange].right, moment())
moment
.utc(t.created)
.utcOffset(timezone.dstOffset)
.isBetween(ranges[selectedRange].right, moment())
)
}
return (
t.error === null &&
moment(t.created).isBetween(
ranges[selectedRange].left,
ranges[selectedRange].right
)
moment
.utc(t.created)
.utcOffset(timezone.dstOffset)
.isBetween(ranges[selectedRange].left, ranges[selectedRange].right)
)
}
@ -194,6 +198,7 @@ const SystemPerformance = () => {
<Scatterplot
timeFrame={selectedRange}
data={transactionsToShow}
timezone={timezone}
/>
</Grid>
</Grid>