summaryrefslogtreecommitdiff
path: root/app/client/dashboard
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-06-05 00:24:59 +0200
committerJules Laplace <julescarbon@gmail.com>2018-06-05 00:24:59 +0200
commit8ddd82faf17b5c36f3e9888321bde06160d9eaf1 (patch)
tree2c2aaf116462252ce19281367231478a570d08d2 /app/client/dashboard
parent477f2489f2a1e91667f923c9d4681456a8e7a4c4 (diff)
task queuing workingggg
Diffstat (limited to 'app/client/dashboard')
-rw-r--r--app/client/dashboard/tasklist.component.js7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/client/dashboard/tasklist.component.js b/app/client/dashboard/tasklist.component.js
index 487e73d..49fc3fd 100644
--- a/app/client/dashboard/tasklist.component.js
+++ b/app/client/dashboard/tasklist.component.js
@@ -1,6 +1,7 @@
import { h, Component } from 'preact'
import { bindActionCreators } from 'redux'
import { connect } from 'react-redux'
+import * as util from '../util'
class TaskList extends Component {
constructor(props){
@@ -10,9 +11,6 @@ class TaskList extends Component {
const { title, tasks } = this.props
let time = 0
const taskList = tasks.map(task => {
- console.log(task)
- const eta = (time + (task.epochs) * 180 / 60) + " min."
- time += (task.epochs) * 180 / 60
let dataset_type, dataset_name
if (task.dataset.indexOf('/') !== -1) {
[dataset_type, dataset_name] = task.dataset.split('/')
@@ -23,8 +21,7 @@ class TaskList extends Component {
<div class='row'>
<div class='activity'>{task.activity} {task.module} {dataset_type}</div>
<div class='dataset'>{dataset_name}</div>
- <div class='epochs'>{task.epoch} ep.</div>
- <div class='eta'>{eta}</div>
+ <div className={"age " + util.carbon_date(task.updated_at)}>{util.get_age(task.updated_at)}</div>
</div>
)
})