From f2912140b930dbedd4dde5dfbf955a47e32e84a3 Mon Sep 17 00:00:00 2001 From: gebele Date: Fri, 23 Sep 2016 09:54:08 +0000 Subject: stage commit before tablesorter theme fix; deactivated coating input; added uniprot link for Proteomics --- application.rb | 3 +++ views/predict.haml | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/application.rb b/application.rb index 86fdb1f..5df466c 100644 --- a/application.rb +++ b/application.rb @@ -1,6 +1,7 @@ require 'rdiscount' $ambit_search = "http://data.enanomapper.net/substance?type=name&search=" + configure :development do $logger = Logger.new(STDOUT) end @@ -22,6 +23,8 @@ get '/predict/?' do prediction_models.each{|m| m.model[:feature_selection_algorithm_parameters]["category"] == "P-CHEM" ? @prediction_models[0] = m : @prediction_models[1] = m} @prediction_models.each_with_index{|m,idx| idx == 0 ? m[:pc_model] = true : m[:pcp_model] = true} nanoparticles = OpenTox::Nanoparticle.all.select{|n| n.core["name"] == "Au" || n.core["name"] == "Ag"} + ## helper for preselect nanos with more than 12 pc_descriptors but take too much time for now + #example = nanoparticles.collect{|n| n if n.physchem_descriptors.size > 16 && (arr = n.physchem_descriptors.collect{|k,v| OpenTox::Feature.find(k).category == "P-CHEM"}; arr.size > 12 )}.compact example = nanoparticles.collect{|n| n if n.physchem_descriptors.size > 16}.compact pcp = example.sample @example_pcp = pcp diff --git a/views/predict.haml b/views/predict.haml index 81383b1..9dc0d97 100644 --- a/views/predict.haml +++ b/views/predict.haml @@ -90,7 +90,8 @@ %option{:selected => ("selected" if example.core["name"] == "Au")} Au %input{:id=>"input_core",:type=>"hidden",:name=>"in_core",:value=>"#{example.core}"} %h5 Coating - %input.input-sm.form-control{:id=>"coating",:type=>"text",:name=>"input_coating",:value=>example.coating[0]["name"]} + %input.input-sm.form-control{:id=>"coating",:type=>"text",:disabled=>"disabled",:name=>"coating",:value=>example.coating[0]["name"]} + %input.input-sm.form-control{:id=>"coating",:type=>"hidden",:name=>"input_coating",:value=>example.coating[0]["name"]} %input{:id=>"input_coating",:type=>"hidden",:name=>"in_coating",:value=>example.coating} // prediction model id %input{:id=>"prediction_model",:type=>"hidden",:name=>"prediction_model",:value=>m.id} @@ -103,7 +104,11 @@ - name = feature.name - val = v[1] - id = id + 1 - %h5= name + - if feature.category == "Proteomics" + %h5 + %a{:href=>"http://www.uniprot.org/uniprot/#{name}", :rel=>"external"}= name + - else + %h5= name // input physchem parameters %input.input-sm.form-control{:id=>id,:type=>"text",:name=>"input_value_#{id}",:value=>val[0]} %input{:id=>id,:type=>"hidden",:name=>"input_key_#{id}",:value=>v[0]} -- cgit v1.2.3