1
0
mirror of https://github.com/Sonarr/Sonarr.git synced 2025-11-06 09:19:38 +02:00

New: Store Task StartTime, Show Duration in UI

Closes #5266
This commit is contained in:
Qstick
2019-12-15 00:34:45 -05:00
committed by Mark McDowall
parent 11e6e12676
commit b98ce7fb17
12 changed files with 63 additions and 9 deletions

View File

@@ -5,6 +5,7 @@
}
.lastExecution,
.lastDuration,
.nextExecution {
composes: cell from '~Components/Table/Cells/TableRowCell.css';

View File

@@ -7,6 +7,7 @@ import TableRow from 'Components/Table/TableRow';
import { icons } from 'Helpers/Props';
import formatDate from 'Utilities/Date/formatDate';
import formatDateTime from 'Utilities/Date/formatDateTime';
import formatTimeSpan from 'Utilities/Date/formatTimeSpan';
import styles from './ScheduledTaskRow.css';
function getFormattedDates(props) {
@@ -91,6 +92,8 @@ class ScheduledTaskRow extends Component {
name,
interval,
lastExecution,
lastStartTime,
lastDuration,
nextExecution,
isQueued,
isExecuting,
@@ -108,6 +111,7 @@ class ScheduledTaskRow extends Component {
const executeNow = !isDisabled && moment().isAfter(nextExecution);
const hasNextExecutionTime = !isDisabled && !executeNow;
const duration = moment.duration(interval, 'minutes').humanize().replace(/an?(?=\s)/, '1');
const hasLastStartTime = moment(lastStartTime).isAfter('2010-01-01');
return (
<TableRow>
@@ -125,6 +129,21 @@ class ScheduledTaskRow extends Component {
{lastExecutionTime}
</TableRowCell>
{
!hasLastStartTime &&
<TableRowCell className={styles.lastDuration}>-</TableRowCell>
}
{
hasLastStartTime &&
<TableRowCell
className={styles.lastDuration}
title={lastDuration}
>
{formatTimeSpan(lastDuration)}
</TableRowCell>
}
{
isDisabled &&
<TableRowCell className={styles.nextExecution}>-</TableRowCell>
@@ -169,6 +188,8 @@ ScheduledTaskRow.propTypes = {
name: PropTypes.string.isRequired,
interval: PropTypes.number.isRequired,
lastExecution: PropTypes.string.isRequired,
lastStartTime: PropTypes.string.isRequired,
lastDuration: PropTypes.string.isRequired,
nextExecution: PropTypes.string.isRequired,
isQueued: PropTypes.bool.isRequired,
isExecuting: PropTypes.bool.isRequired,

View File

@@ -22,6 +22,11 @@ const columns = [
label: 'Last Execution',
isVisible: true
},
{
name: 'lastDuration',
label: 'Last Duration',
isVisible: true
},
{
name: 'nextExecution',
label: 'Next Execution',