count files instead of specimens on dashboard
authorTom Clegg <tom@clinicalfuture.com>
Wed, 17 Jul 2013 18:26:21 +0000 (14:26 -0400)
committerTom Clegg <tom@clinicalfuture.com>
Wed, 17 Jul 2013 18:26:21 +0000 (14:26 -0400)
apps/workbench/app/views/users/home.html.erb
sdk/cli/bin/arv-run-pipeline-instance

index 7ae47eb28e619a5f3ffa898cd1110d5d0e2026df..fddd76c610331f84c22521d9387dcc7018a46caf 100644 (file)
     <div class="clearfix">
       <h4>Account summary</h4>
       <div class="well clearfix">
-        <% [Human, Specimen, Trait, Collection, PipelineTemplate, PipelineInstance].each do |aclass| %>
+        <% [Human, Trait, Collection, 'File', PipelineTemplate, PipelineInstance].each do |aclass| %>
         <div class="col span2 centerme">
           <span class="bigfatnumber">
-            <% if [Human, Specimen, Trait, Collection].index aclass  %>
-            <%= aclass.limit(4000).where({}).count %>
+            <% if aclass == 'File' %>
+            <%= Collection.limit(4000).where({}).collect(&:files).flatten(1).count %>
             <% else %>
-            <%= aclass.limit(1000).where({owner_uuid:current_user.uuid}).count %>
+            <%= aclass.limit(4000).where({}).count %>
             <% end %>
           </span>
           <br />
           <%= raw(aclass.to_s.pluralize.underscore.gsub '_', '&nbsp;') %>
         </div>
-<% end %>
+        <% end %>
       </div>
     </div>
   </div>
index 0842225cb826860ae73e125514067e33221b0eb5..251d378da28c49b833b65421a72c8282a27238e6 100755 (executable)
@@ -280,7 +280,7 @@ class JobCache
     if j.is_a? Hash and j[:uuid]
       @cache[j[:uuid]] = j
     else
-      debuglog "create job: #{j[:errors] rescue nil}"
+      debuglog "create job: #{j[:errors] rescue nil}", 0
       nil
     end
   end
@@ -429,7 +429,7 @@ class WhRunPipelineInstance
                 debuglog "component #{cname} new job #{job[:uuid]}"
                 c[:job] = job
               else
-                debuglog "component #{cname} new job failed: #{job[:errors]}"
+                debuglog "component #{cname} new job failed"
               end
             end
           end