From d1ad229730f6e6043fe6e7a150e05ffa41e3cec2 Mon Sep 17 00:00:00 2001
From: ch <ch@ot-test.in-silico.ch>
Date: Sun, 19 Sep 2010 08:25:33 +0200
Subject: javascript for qmrf editor (has to be fixed)

---
 public/javascripts/toxcreate.js | 6 ++++++
 views/model.haml                | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/toxcreate.js b/public/javascripts/toxcreate.js
index d1ed490..b2f5421 100755
--- a/public/javascripts/toxcreate.js
+++ b/public/javascripts/toxcreate.js
@@ -85,6 +85,12 @@ $(function() {
           if(/^\d+$/.test(reload_id)) loadModel(reload_id, 'validation');
         };
     });
+    $("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);
   }
 });
diff --git a/views/model.haml b/views/model.haml
index 0c8ea8f..79287f0 100644
--- a/views/model.haml
+++ b/views/model.haml
@@ -53,7 +53,8 @@
           %a{:href => "#{model.feature_dataset}.yaml"} YAML
           %em  (experts, dataset too large for Excel)
         %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
           -#,
           - unless model.validation_qmrf_uri.nil?
-- 
cgit v1.2.3


From cb87e305c2dd254a15aed4133d089ad295e04919 Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Thu, 10 Mar 2011 19:00:37 +0100
Subject: ToxCreateModel methods reactivated

---
 application.rb | 4 ++--
 model.rb       | 2 +-
 2 files changed, 3 insertions(+), 3 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
diff --git a/model.rb b/model.rb
index 7d22a4d..7b91bab 100644
--- a/model.rb
+++ b/model.rb
@@ -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
-- 
cgit v1.2.3