diff options
| -rw-r--r-- | application.rb | 7 | ||||
| -rw-r--r-- | public/javascripts/google_analytics_lazar.js | 7 | ||||
| -rw-r--r-- | views/layout.haml | 1 | ||||
| -rw-r--r-- | views/prediction.haml | 20 |
4 files changed, 24 insertions, 11 deletions
diff --git a/application.rb b/application.rb index e3ccba4..895b0c2 100644 --- a/application.rb +++ b/application.rb @@ -34,7 +34,12 @@ get '/predict/?' do @models = OpenTox::Model::Validation.all @models = @models.delete_if{|m| m.model.name =~ /\b(Net cell association)\b/} @endpoints = @models.collect{|m| m.endpoint}.sort.uniq - @models.count <= 0 ? (haml :info) : (haml :predict) + if @models.count > 0 + rodent_index = 0 + @models.each_with_index{|model,idx| rodent_index = idx if model.species =~ /Rodent/} + @models.insert(rodent_index-1,@models.delete_at(rodent_index)) + end + @models.count > 0 ? (haml :predict) : (haml :info) end get '/predict/modeldetails/:model' do diff --git a/public/javascripts/google_analytics_lazar.js b/public/javascripts/google_analytics_lazar.js new file mode 100644 index 0000000..01ccc6e --- /dev/null +++ b/public/javascripts/google_analytics_lazar.js @@ -0,0 +1,7 @@ +(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-73247946-2', 'auto'); +ga('send', 'pageview');
\ No newline at end of file diff --git a/views/layout.haml b/views/layout.haml index 5e76d85..9b13e2f 100644 --- a/views/layout.haml +++ b/views/layout.haml @@ -16,6 +16,7 @@ %script{:src=>"/javascripts/jquery.tablesorter.min.js"} %script{:src=>"/javascripts/jquery.tablesorter.widgets.js"} %script{:src=>"/javascripts/lazar-gui.js"} + %script{:src=>"/javascripts/google_analytics_lazar.js"} %body %noscript %div{ :style=>"width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"} diff --git a/views/prediction.haml b/views/prediction.haml index 80b4d16..8c4af6f 100644 --- a/views/prediction.haml +++ b/views/prediction.haml @@ -89,17 +89,17 @@ = "#{prediction[:probabilities].keys[1]}: #{prediction[:probabilities].values[1].signif(3)}" / show warnings and info - %p - - if !prediction[:info].blank? - %b Info: - %br - %p=prediction[:info].sub(/\'.*\'/,"").sub(/,/, ",<br>") - - if !prediction[:warnings].blank? - %b Warnings: - - prediction[:warnings].uniq.each do |warning| + -#%p + - if !prediction[:info].blank? + %b Info: %br - %p=warning.sub(/,/, ",<br>") - /%p=warning.sub(/substances/, "substances<br>").sub(/prediction\:/, "prediction\:<br>") + %p=prediction[:info].sub(/\'.*\'/,"").sub(/,/, ",<br>") + - if !prediction[:warnings].blank? + %b Warnings: + - prediction[:warnings].uniq.each do |warning| + %br + %p=warning.sub(/,/, ",<br>") + /%p=warning.sub(/substances/, "substances<br>").sub(/prediction\:/, "prediction\:<br>") - else %br - if !prediction[:info].blank? |