From 1ccc4c798d95133cde1d4558318f0640a772526a Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 4 Jun 2018 22:56:28 +0200
Subject: pushing test tasks into queue

---
 app/client/dashboard/dashboard.component.js | 4 ++--
 app/client/dashboard/tasklist.component.js  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/client/dashboard')

diff --git a/app/client/dashboard/dashboard.component.js b/app/client/dashboard/dashboard.component.js
index 0081d67..64a8848 100644
--- a/app/client/dashboard/dashboard.component.js
+++ b/app/client/dashboard/dashboard.component.js
@@ -36,12 +36,12 @@ class Dashboard extends Component {
           <div className='column'>
             {!!queue.completed.length &&
               <Group title='Completed Tasks'>
-                <TaskList tasks={queue.completed.map(id => task.id)} />
+                <TaskList tasks={queue.completed.map(id => tasks[id])} />
               </Group>
             }
             {!!queue.queue.length &&
               <Group title='Upcoming Tasks'>
-                <TaskList tasks={queue.queue.map(id => task.id)} />
+                <TaskList tasks={queue.queue.map(id => tasks[id])} />
               </Group>
             }
           </div>
diff --git a/app/client/dashboard/tasklist.component.js b/app/client/dashboard/tasklist.component.js
index e5b1171..487e73d 100644
--- a/app/client/dashboard/tasklist.component.js
+++ b/app/client/dashboard/tasklist.component.js
@@ -10,6 +10,7 @@ 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 
@@ -22,7 +23,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.epochs} ep.</div>
+	        <div class='epochs'>{task.epoch} ep.</div>
 	        <div class='eta'>{eta}</div>
 		   	</div>
 	   	)
-- 
cgit v1.2.3-70-g09d2