diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-03-10 19:01:41 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-03-10 19:01:41 +0100 |
| commit | 78cb7eccbf7bc828c7e26adcb497d913e54d6b7c (patch) | |
| tree | 6080aa47f8b5379e46df6699e3f5d98ed282dd2b | |
| parent | a2713051fc6f3462f42b8f695a15041651433f78 (diff) | |
| parent | cb87e305c2dd254a15aed4133d089ad295e04919 (diff) | |
Merge branch 'hotfix/v1.0.1' into development
| -rw-r--r-- | application.rb | 4 | ||||
| -rw-r--r-- | model.rb | 2 | ||||
| -rwxr-xr-x | public/javascripts/toxcreate.js | 12 | ||||
| -rw-r--r-- | views/model.haml | 3 |
4 files changed, 16 insertions, 5 deletions
diff --git a/application.rb b/application.rb index 1771661..364471a 100644 --- a/application.rb +++ b/application.rb @@ -70,7 +70,7 @@ get '/login' do end get '/models/?' do - @models = ToxCreateModel.all.reverse + @models = ToxCreateModel.all.to_a.reverse subjectstring = session[:subjectid] ? "?subjectid=#{CGI.escape(session[:subjectid])}" : "" haml :models, :locals=>{:models=>@models, :subjectstring => subjectstring} end @@ -151,7 +151,7 @@ get '/model/:id/:view/?' do end get '/predict/?' do - @models = ToxCreateModel.all.reverse + @models = ToxCreateModel.all.to_a.reverse @models = @models.collect{|m| m if m.status == 'Completed'}.compact haml :predict end @@ -87,7 +87,6 @@ def status #end end =end -=begin def validation_status begin @@ -137,6 +136,7 @@ def status end end +=begin def process LOGGER.debug self.to_yaml diff --git a/public/javascripts/toxcreate.js b/public/javascripts/toxcreate.js index 410778f..94d944d 100755 --- a/public/javascripts/toxcreate.js +++ b/public/javascripts/toxcreate.js @@ -119,8 +119,18 @@ $(function() { if(/^\d+$/.test(reload_id)) loadModel(reload_id, 'validation'); }; }); +//<<<<<<< HEAD //var validationCheck = setTimeout('checkValidation()',15000); - var validationCheck = setTimeout('checkValidation()',5000); + //var validationCheck = setTimeout('checkValidation()',5000); +//======= + $("input.model_validation_qmrf").each(function(){ + if(!$(this).val().match(/Completed|Error/)) { + reload_id = this.id.replace("model_validation_qmrf_",""); + if(/^\d+$/.test(reload_id)) loadModel(reload_id, 'model'); + }; + }); + var validationCheck = setTimeout('checkValidation()',15000); +//>>>>>>> d1ad229730f6e6043fe6e7a150e05ffa41e3cec2 } }); diff --git a/views/model.haml b/views/model.haml index e1bdd99..5addcb0 100644 --- a/views/model.haml +++ b/views/model.haml @@ -75,7 +75,8 @@ %em (experts) - if model.uri %dt Model: - %dd + %dd{:id => "model_qmrf_#{model.id}"} + %input{ :id => "model_validation_qmrf_#{model.id}", :type => "hidden", :value => "#{model.validation_qmrf_status}", :class => "model_validation_qmrf" } -#%a{:href => "#{model.uri}.rdf"} RDF/XML -#, - if model.validation_qmrf_uri |