rbbt-rest 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 019b238df0884dac2b1bd0c4c97588d9c0ddf295
-  data.tar.gz: dbb37b58e7d10dc8a2fd82e4636eb006427733fe
+  metadata.gz: 8db963775de32c02478cd10401cee25e3b055839
+  data.tar.gz: e4216c00bc0da8690857b8ed7df7624dbdd54117
 SHA512:
-  metadata.gz: 3645c2891ebaf8ccbfd1afd8a938b3b2e1a186fe3f6115b53cd62d978337293da74524065d9d25624e96207b5adecea1f70f90d1bac2bda4a157f2c9b2d91b8e
-  data.tar.gz: 5eb156ff821ac00db1b6ddd0949ff4e7f9e85e2161e97b1a52cf408ad4f27baab472b463b972a2775764ba7da67b58d77c81651e58b4fa9db0c9776d7ad08a8d
+  metadata.gz: 0f665d500e52385938b2e444e36c4d0b8c00dc46265aa9dd543921dab6c075f950673ddf6cfdbbd268c093a408e0e0e3cffb922d50537a88e9ea0e2b07fe9cb7
+  data.tar.gz: 6e3eb710ef63297a148e7d1143fc1187eabf8e5bd6328d425973cb30cdb943fdf2e41a6296f840c4c5d1ee2d1ee0ed535ae9b40f6949fa63f9d2e72dfcc65733

data/lib/rbbt/rest/workflow.rb

@@ -43,7 +43,7 @@ module Sinatra
       get "/#{workflow.to_s}" do
         case format
         when :html
-          workflow_render('tasks', workflow)
+          workflow_render('tasks', workflow, nil, @clean_params)
         when :json
           content_type "application/json"
           {:exec => workflow.exec_exports, :synchronous => workflow.synchronous_exports, :asynchronous => workflow.asynchronous_exports}.to_json

data/share/views/layout/coda.haml

@@ -21,6 +21,7 @@
       success: function(data, stat, req){
         if (req.status == 202){
           $('#content').html(data)
+          update_rbbt()
           window.setTimeout(reload, wait_timeout);
         }else{
           window.location = main_url;
@@ -33,6 +34,7 @@
         }else{
           $('#content').html(jqXHR.responseText)
         }
+        update_rbbt()
       }})
     }
 

data/share/views/public/js/_ajax_replace.js

@@ -124,7 +124,21 @@ function replace_object(object, href, embedd, complete){
         href = remove_parameter(href, '_update');
         href = remove_parameter(href, '_');
         var reload_seconds = reload_time(object);
-
+        var progress = $(data).find('.progress')
+        var percent = undefined
+        var counts = undefined
+        
+        if (progress.length > 0)
+          if (progress.is('.percent'))
+            percent = progress.attr('data-value')
+          else
+            counts = progress.attr('data-value')
+          
+
+        if (percent !== undefined){
+          bar = $('.ui.progress.teal.indicator').attr('data-value', percent).attr('data-total', 100)
+          object.prepend(bar)
+        }
         if (reload_seconds == "STOP"){
           var a =$('<a href="#">').html("insist").click(function(){
             replace_object(object, href, embedd, complete)

data/share/views/public/js/rbbt/actions.js

@@ -100,9 +100,9 @@ $.widget("rbbt.action_controller", {
           var message = response.find('.step_messages li:first').html()
 
           if (undefined === message){
-            action_div.html("<span class='loading'>Loading [" + stat + "] ...</span>");
+            action_div.html("<span class='loading ui message'>Loading [" + stat + "] ...</span>");
           }else{
-            action_div.html("<span class='loading'>Loading [" + stat + ": " + message + "] ...</span>");
+            action_div.html("<span class='loading ui message'>Loading [" + stat + ": " + message + "] ...</span>");
           };
         }
       }else{ 

data/share/views/wait.haml

@@ -5,9 +5,31 @@
 
   %span.status= job.status
 
-  %hr
+
+  - if job.file(:progress).exists?
+    - progress = job.file(:progress).yaml
+    - if progress[:last_percent]
+      .ui.teal.step.percent.progress.indicating(data-value="#{progress[:last_percent]}" data-total=100)
+        .bar
+          .progress
+        .label= progress[:desc]
+        :deferjs
+          $('.step.progress').progress()
+    - else
+      - ticks = progress[:ticks]
+      - max_ticks = ticks  * 1.2
+      .ui.teal.step.progress(data-value=ticks data-total=max_ticks)
+        .bar
+          .progress
+        .label= progress[:desc]
+        :deferjs
+          $('.step.progress').progress({label: 'ratio',text:{ratio: '{value}'}})
+  - else
+    %hr
 
   %ul.step_messages.clean_list
     - job.messages.reverse.each do |line|
       - next if line.nil? or line.strip.empty?
       %li= line
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake