projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17702: Federated lists supports cluster_id parameter
[arvados.git]
/
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 8bd04b09e84f138aff05d66ab16b015d97eec90e..8e89331cb6464512cb6991319399dc133b450a16 100644
(file)
--- a/
apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/
apps/workbench/app/helpers/pipeline_instances_helper.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
module PipelineInstancesHelper
def pipeline_jobs object=nil
module PipelineInstancesHelper
def pipeline_jobs object=nil
@@
-88,7
+92,7
@@
module PipelineInstancesHelper
c[:job][:uuid] if c.is_a?(Hash) and c[:job].is_a?(Hash)
}.compact
job = {}
c[:job][:uuid] if c.is_a?(Hash) and c[:job].is_a?(Hash)
}.compact
job = {}
- Job.where(uuid: jobuuids).each do |j|
+ Job.where(uuid: jobuuids).
with_count("none").
each do |j|
job[j[:uuid]] = j
end
job[j[:uuid]] = j
end
@@
-203,7
+207,7
@@
module PipelineInstancesHelper
end
else
if step[:progress] and
end
else
if step[:progress] and
- (re = step[:progress].match
/^(\d+)\+(\d+)\/(\d+)$/
)
+ (re = step[:progress].match
(/^(\d+)\+(\d+)\/(\d+)$/)
)
pj[:progress] = (((re[1].to_f + re[2].to_f/2) / re[3].to_f) rescue 0.5)
else
pj[:progress] = 0.0
pj[:progress] = (((re[1].to_f + re[2].to_f/2) / re[3].to_f) rescue 0.5)
else
pj[:progress] = 0.0