CSGOWTF/csgowtf
3
2
Fork 1
Code Issues 18 Pull Requests Projects Releases 7 Wiki Activity

fixed date bug that displayed 1 hours instead of 1 hour

Browse Source
This commit is contained in:
cnachtigall1991
2021-10-17 22:54:57 +02:00
parent 6310295795
commit dbc104f837
1 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/utils/DateTime.js
View File

@@ -1,48 +1,50 @@
import {DateTime, Duration} from "luxon/build/es6/luxon"; import {DateTime, Duration} from "luxon/build/es6/luxon";
export const FormatDuration = (d) => { export const FormatDuration = (d) => {
const duration = Duration.fromObject({hours: 0, minutes: 0, seconds: d}).normalize().toObject() const duration = Duration.fromObject({hours: 0, minutes: 0, seconds: d}).normalize().toObject()
if (duration.hours > 1) if (duration.hours > 1)
return `${duration.hours} h ${duration.minutes} min` return `${duration.hours} h ${duration.minutes} min`
else if (duration.hours < 1) else if (duration.hours < 1)
return `${duration.minutes} min` return `${duration.minutes} min`
} }
export const FormatFullDuration = (d) => { export const FormatFullDuration = (d) => {
const duration = Duration.fromObject({hours: 0, minutes: 0, seconds: d}).normalize() const duration = Duration.fromObject({hours: 0, minutes: 0, seconds: d}).normalize()
if (duration.hours > 1) if (duration.hours > 1)
return duration.toFormat('hh:mm:ss') return duration.toFormat('hh:mm:ss')
else if (duration.hours < 1) else if (duration.hours < 1)
return duration.toFormat('mm:ss') return duration.toFormat('mm:ss')
} }
export const FormatDate = (date) => { export const FormatDate = (date) => {
const matchDate = DateTime.fromISO(date) const matchDate = DateTime.fromISO(date)
const diff = DateTime.now().diff(matchDate) const diff = DateTime.now().diff(matchDate)
if (diff.as('days') > 10) if (diff.as('days') > 10)
return matchDate.toLocaleString({weekday: 'short', day: '2-digit', month: '2-digit', year: 'numeric'}) return matchDate.toLocaleString({weekday: 'short', day: '2-digit', month: '2-digit', year: 'numeric'})
else if (diff.as('days') < 1) else if (diff.as('days') < 1)
if (diff.as('hours') < 1) if (diff.as('hours') < 1)
return Math.floor(diff.as('minutes')) + ' minutes ago' return Math.floor(diff.as('minutes')) + ' minutes ago'
else else if (Math.floor(diff.as('hours')) === 1)
return Math.floor(diff.as('hours')) + ' hours ago' return Math.floor(diff.as('hours')) + ' hour ago'
else else
return Math.floor(diff.as('days')) + ' days ago' return Math.floor(diff.as('hours')) + ' hours ago'
else
return Math.floor(diff.as('days')) + ' days ago'
} }
export const FormatFullDate = (date) => { export const FormatFullDate = (date) => {
const matchDate = DateTime.fromISO(date) const matchDate = DateTime.fromISO(date)
return matchDate.toLocaleString({ return matchDate.toLocaleString({
weekday: 'short', weekday: 'short',
day: '2-digit', day: '2-digit',
month: '2-digit', month: '2-digit',
year: 'numeric', year: 'numeric',
hour: '2-digit', hour: '2-digit',
minute: '2-digit', minute: '2-digit',
second: '2-digit' second: '2-digit'
}) })
} }