diff --git a/src/master/jobmgr.py b/src/master/jobmgr.py
index 70e9105..3a57633 100644
--- a/src/master/jobmgr.py
+++ b/src/master/jobmgr.py
@@ -105,11 +105,17 @@ class JobMgr(threading.Thread):
job = self.job_map[job_id]
logger.debug('job_id: %s, user: %s' % (job_id, job.user))
if job.user == user:
+ all_tasks = job.raw_job_info['tasks']
+ tasks_instCount = {}
+ for task in all_tasks.keys():
+ tasks_instCount[task] = int(all_tasks[task]['instCount'])
res.append({
'job_name': job.job_name,
'job_id': job.job_id,
'status': job.status,
- 'create_time': job.create_time
+ 'create_time': job.create_time,
+ 'tasks': list(all_tasks.keys()),
+ 'tasks_instCount': tasks_instCount
})
return res
diff --git a/web/templates/batch/batch_list.html b/web/templates/batch/batch_list.html
index 853d89b..9a809b5 100644
--- a/web/templates/batch/batch_list.html
+++ b/web/templates/batch/batch_list.html
@@ -50,72 +50,16 @@
+ {% for taskid in job_info['tasks'] %}
+ {% for instid in range(job_info['tasks_instCount'][taskid]) %}
- | 10 |
- 10 |
- 10 |
- 10 |
-
-
- | 10 |
- 10 |
- 10 |
- 10 |
-
-
- | 10 |
- 10 |
- 10 |
- 10 |
-
-
- | 10 |
- 10 |
- 10 |
- 10 |
-
-
- | 10 |
- 10 |
- 10 |
- 10 |
-
-
- | 10 |
- 10 |
- 10 |
- 10 |
-
-
- | 10 |
- 10 |
- 10 |
- 10 |
-
-
- | 10 |
- 10 |
- 10 |
- 10 |
-
-
- | 10 |
- 10 |
- 10 |
- 10 |
-
-
- | 10 |
- 10 |
- 10 |
- 10 |
-
-
- | 10 |
- 10 |
- 10 |
- 10 |
+ {{ taskid }} |
+ {{ instid }} |
+ Stdout |
+ Stderr |
+ {% endfor %}
+ {% endfor %}