fix merge issue
This commit is contained in:
@@ -7,7 +7,6 @@ import {
|
|||||||
RunningWithErrors,
|
RunningWithErrors,
|
||||||
Schedule,
|
Schedule,
|
||||||
ThumbDown,
|
ThumbDown,
|
||||||
Timelapse,
|
|
||||||
} from '@mui/icons-material'
|
} from '@mui/icons-material'
|
||||||
import { Avatar, Box, Card, Chip, IconButton, Typography } from '@mui/joy'
|
import { Avatar, Box, Card, Chip, IconButton, Typography } from '@mui/joy'
|
||||||
import moment from 'moment'
|
import moment from 'moment'
|
||||||
@@ -15,15 +14,6 @@ import { useLocalization } from '../../contexts/LocalizationContext'
|
|||||||
import { TASK_COLOR } from '../../utils/Colors.jsx'
|
import { TASK_COLOR } from '../../utils/Colors.jsx'
|
||||||
import PendingBadge from '../components/PendingBadge'
|
import PendingBadge from '../components/PendingBadge'
|
||||||
|
|
||||||
const getCompletedChip = historyEntry => {
|
|
||||||
if (
|
|
||||||
historyEntry.status === 0 ||
|
|
||||||
historyEntry.status === 5 ||
|
|
||||||
historyEntry.status === 6
|
|
||||||
) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
const formatTime = seconds => {
|
const formatTime = seconds => {
|
||||||
if (typeof seconds !== 'number' || isNaN(seconds) || seconds < 0) return null
|
if (typeof seconds !== 'number' || isNaN(seconds) || seconds < 0) return null
|
||||||
const h = Math.floor(seconds / 3600)
|
const h = Math.floor(seconds / 3600)
|
||||||
|
|||||||
Reference in New Issue
Block a user