diff --git a/src/master/jobmgr.py b/src/master/jobmgr.py index 476ec77..5097c03 100644 --- a/src/master/jobmgr.py +++ b/src/master/jobmgr.py @@ -360,7 +360,7 @@ class JobMgr(): if job.username != user: return [False, "Wrong User!"] jobdata = json.loads(str(job)) - tasks = job.tasks.all() + tasks = job.tasks.order_by(Batchtask.idx).all() tasksdata = [json.loads(str(t)) for t in tasks] jobdata['tasks'] = tasksdata return [True, jobdata] diff --git a/web/templates/batch/batch_create.html b/web/templates/batch/batch_create.html index 5f77c87..469f560 100644 --- a/web/templates/batch/batch_create.html +++ b/web/templates/batch/batch_create.html @@ -235,14 +235,14 @@ +'
' +'
MB' +'
' - +'' + +'' +'
' +'
' - +'' + +'' +'
' +'
' +'
' - +'' + +'' +'
' +'
' +'' diff --git a/web/templates/batch/batch_info.html b/web/templates/batch/batch_info.html index 8b24321..c0e8d57 100644 --- a/web/templates/batch/batch_info.html +++ b/web/templates/batch/batch_info.html @@ -115,6 +115,115 @@
+ +
+
+
+
+

Tasks Configs

+ +
+ + +
+
+
+ {% for task in jobinfo['tasks'] %} +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% if task['config']['runon'] == 'all' %} + + {% else %} + + {% endif %} + {% if 'atSameTime' in task['config'].keys() %} + + {% else %} + + {% endif %} + {% if task['config']['image'] == 'base_base_base' %} + + + + {% else %} + + + + {% endif %} + + +
CPU CoresMemoryGPUDiskVNode NumberMax Retry Times
{{ task['config']['cpuSetting'] }}{{ task['config']['memorySetting'] }} MB{{ task['config']['gpuSetting'] }}{{ task['config']['diskSetting'] }} MB{{ task['config']['vnodeCount'] }}{{ task['config']['retryCount'] }}
Running PathExpire TimeStdout Redirect PathStderr Redirect PathDependencyCommand
{{ task['config']['srcAddr'] }}{{ task['config']['expTime'] }} seconds{{ task['config']['stdOutRedPth'] }}{{ task['config']['stdErrRedPth'] }}{{ task['config']['dependency'] }}{{ task['config']['command'] }}
Run onStart at the Same TimeImage NameImage OwnerImage Type
all vnodesmaster vnodeTrueFalsebasedockletpublic{{ task['config']['image'].split('_')[0] }}{{ task['config']['image'].split('_')[1] }}{{ task['config']['image'].split('_')[2] }}
+
+
+
+
+ {% endfor %} +
+
+
+
{% endblock %} {% block script_src %}