X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4e501ab0ba22d9d34d478d32638d53e99ecb9a6c..c8744fe549cd813f325716c3ff072c78f4b660a3:/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 f314c658ce..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("<div class=\"progress\" style=\"width:100px\"><div class=\"bar bar-success\" style=\"width:#{pj[:percent_done]}%\"></div><div class=\"bar\" style=\"width:#{pj[:percent_running]}%\"></div></div>")
-    elsif pj[:progress]
-      raw("<div class=\"progress\" style=\"width:100px\"><div class=\"bar\" style=\"width:#{pj[:progress]*100}%\"></div></div>")
-    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] : {}
@@ -61,23 +77,24 @@ module PipelineInstancesHelper
           pj[:progress] = 0.0
         end
       end
-      if pj[:job]
-        if pj[:job][:success]
-          pj[:result] = 'complete'
-          pj[:complete] = true
-          pj[:progress] = 1.0
-        elsif pj[:job][:finished_at]
-          pj[:result] = 'failed'
-          pj[:failed] = true
-        elsif pj[:job][:started_at]
-          pj[:result] = 'running'
-        else
-          pj[:result] = 'queued'
-        end
+      if pj[:job][:success]
+        pj[:result] = 'complete'
+        pj[:complete] = true
+        pj[:progress] = 1.0
+      elsif pj[:job][:finished_at]
+        pj[:result] = 'failed'
+        pj[:failed] = true
+      elsif pj[:job][:started_at]
+        pj[:result] = 'running'
+      elsif pj[:job][:uuid]
+        pj[:result] = 'queued'
+      else
+        pj[:result] = 'none'
       end
       pj[:job_id] = pj[:job][:uuid]
-      pj[:script] = pj[:job][:script]
-      pj[:script_version] = pj[:job][:script_version]
+      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)
       ret << pj