diff options
author | gebele <gebele@in-silico.ch> | 2017-11-09 16:10:20 +0000 |
---|---|---|
committer | gebele <gebele@in-silico.ch> | 2017-11-09 16:10:20 +0000 |
commit | 332c68dc1bc59538a8a749ef592d5700ba316357 (patch) | |
tree | 40d5f9305a8c8b0039c44538d59a626869f9a0e8 /views/batch.haml | |
parent | 31f1217be7162aac06aa262376f432f676928749 (diff) |
fixed cramer details;changed message for wrong file format
Diffstat (limited to 'views/batch.haml')
-rw-r--r-- | views/batch.haml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/views/batch.haml b/views/batch.haml index 0f0e3b9..c770247 100644 --- a/views/batch.haml +++ b/views/batch.haml @@ -29,11 +29,16 @@ var aClient = new HttpClient(); aClient.get(uri, function(res) { var response = JSON.parse(res); - progress(response['percent'],id); + if (model_id == "Cramer"){ + $("img.circle").show(); + }else{ + progress(response['percent'],id); + } if (response['percent'] == 100){ window.clearInterval(markers[id]); $("a#downbutton_"+id).removeClass("disabled"); $("a#detailsbutton_"+id).removeClass("disabled"); + $("img.circle").hide(); }; }); }; @@ -110,8 +115,11 @@ %a.btn.btn-default.btn-xs.disabled{:id => "downbutton_#{idx}", :href=>"#{to("/predict/csv/#{task}/#{model}/#{@filename}")}", :title=>"download", :style=>"font-size:small;"} %span.glyphicon.glyphicon-download-alt CSV - %div{:id=>"progress_#{idx}", :style=>"width:100%;height:3px;position:relative;background-color:#ccc;"} - %div{:id=>"bar_#{idx}", :style=>"background-color: #4CAF50;width:10px;height:3px;position:absolute;"} + - if model == "Cramer" + %img.h2{:src=>"/images/wait30trans.gif", :id=>"circle", :class=>"circle", :alt=>"wait", :style=>"display:none;"} + - if model != "Cramer" + %div{:id=>"progress_#{idx}", :style=>"width:100%;height:3px;position:relative;background-color:#ccc;"} + %div{:id=>"bar_#{idx}", :style=>"background-color: #4CAF50;width:10px;height:3px;position:absolute;"} - # increase interval timer for large datasets - ctimer = ((@compounds.size/1000) == 0 ? 1000 : ((@compounds.size/1000)*1000)) :javascript |