X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ce408713e3067fc278a5a8f9c2d534567f65c636..4baccff09d5f8c48cc3c431365f1e029a8c40bb1:/apps/workbench/app/helpers/pipeline_instances_helper.rb
diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index fbce7f550b..c52d339158 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -1,4 +1,5 @@
module PipelineInstancesHelper
+
def pipeline_jobs object=nil
object ||= @object
if object.components[:steps].is_a? Array
@@ -15,22 +16,37 @@ module PipelineInstancesHelper
end
def render_pipeline_job pj
- if pj[:percent_done]
- pj[:progress_bar] = raw("
")
- elsif pj[:progress]
- raw("")
- end
+ pj[:progress_bar] = render partial: 'job_progress', locals: {:j => pj[:job]}
pj[:output_link] = link_to_if_arvados_object pj[:output]
pj[:job_link] = link_to_if_arvados_object pj[:job][:uuid]
pj
end
+
protected
def pipeline_jobs_newschool object
ret = []
i = -1
- object.components.each do |cname, c|
+
+ comp = []
+
+ template = PipelineTemplate.find(@object.pipeline_template_uuid) rescue nil
+ if template
+ order = PipelineTemplatesHelper::sort_components(template.components)
+ order.each do |k|
+ if object.components[k]
+ comp.push([k, object.components[k]])
+ end
+ end
+ else
+ object.components.each do |k, v|
+ comp.push([k, v])
+ end
+ end
+
+ comp.each do |cname, c|
+ puts cname, c
i += 1
pj = {index: i, name: cname}
pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
@@ -77,6 +93,7 @@ module PipelineInstancesHelper
end
pj[:job_id] = pj[:job][:uuid]
pj[:script] = pj[:job][:script] || c[:script]
+ pj[:script_parameters] = pj[:job][:script_parameters] || c[:script_parameters]
pj[:script_version] = pj[:job][:script_version] || c[:script_version]
pj[:output] = pj[:job][:output]
pj[:finished_at] = (Time.parse(pj[:job][:finished_at]) rescue nil)