Merge branch 'master' into 3605-improved-dashboard

[arvados.git] / apps / workbench / app / models / job.rb

diff --git a/apps/workbench/app/models/job.rb b/apps/workbench/app/models/job.rb
index 9e9c0967871ba4e6408a79c1855b87460f156694..1006660696d000f7ed8f85cfc63cc09148fe36e8 100644 (file)
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@ -38,6 +38,30 @@ class Job < ArvadosBase
     arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
   end
 
+  def self.queue_size
+    arvados_api_client.api("jobs/", "queue_size", {"_method"=> "GET"})[:queue_size] rescue 0
+  end
+
+  def state
+    Job::state(self)
+  end
+
+  def self.state job
+    if not job[:cancelled_at].nil?
+      "Canceled"
+    elsif not job[:finished_at].nil? or not job[:success].nil?
+      if job[:success]
+        "Completed"
+      else
+        "Failed"
+      end
+    elsif job[:running]
+      "Running"
+    else
+      "Queued"
+    end
+  end
+
   def textile_attributes
     [ 'description' ]
   end